diff options
| author | Setup Wizard Team <android-setup-team-eng@google.com> | 2019-12-31 20:58:11 +0800 |
|---|---|---|
| committer | Pasty Chang <pastychang@google.com> | 2019-01-03 02:45:20 +0000 |
| commit | 345d220b699eb61a85d0e9b69438a154d5d4bc46 (patch) | |
| tree | 24feade13468b26e490297aee2f487035bb88b4f /main | |
| parent | 545407a543787b20ff37e59c1bff7ce03e584a4b (diff) | |
| download | setupdesign-345d220b699eb61a85d0e9b69438a154d5d4bc46.tar.gz | |
Import updated Android Setupdesign Library 227351086
Test: mm
PiperOrigin-RevId: 227351086
Change-Id: I12fb273204bd0a999b813d3e33af0556263dc0fb
Diffstat (limited to 'main')
147 files changed, 1189 insertions, 1406 deletions
diff --git a/main/res/anim-ldrtl/suw_slide_back_in.xml b/main/res/anim-ldrtl/sud_slide_back_in.xml index 18e6e80..670c45b 100644 --- a/main/res/anim-ldrtl/suw_slide_back_in.xml +++ b/main/res/anim-ldrtl/sud_slide_back_in.xml @@ -16,7 +16,7 @@ --> <translate xmlns:android="http://schemas.android.com/apk/res/android" - android:duration="@integer/suwTransitionDuration" + android:duration="@integer/sudTransitionDuration" android:fromXDelta="100%" android:toXDelta="0%" android:interpolator="@android:anim/decelerate_interpolator" /> diff --git a/main/res/anim-ldrtl/suw_slide_back_out.xml b/main/res/anim-ldrtl/sud_slide_back_out.xml index a8d1ebf..a3715a3 100644 --- a/main/res/anim-ldrtl/suw_slide_back_out.xml +++ b/main/res/anim-ldrtl/sud_slide_back_out.xml @@ -16,7 +16,7 @@ --> <translate xmlns:android="http://schemas.android.com/apk/res/android" - android:duration="@integer/suwTransitionDuration" + android:duration="@integer/sudTransitionDuration" android:fromXDelta="0%" android:toXDelta="-100%" android:interpolator="@android:anim/decelerate_interpolator" /> diff --git a/main/res/anim/suw_slide_back_in.xml b/main/res/anim-ldrtl/sud_slide_next_in.xml index f0144c5..f55e4d0 100644 --- a/main/res/anim/suw_slide_back_in.xml +++ b/main/res/anim-ldrtl/sud_slide_next_in.xml @@ -16,7 +16,7 @@ --> <translate xmlns:android="http://schemas.android.com/apk/res/android" - android:duration="@integer/suwTransitionDuration" + android:duration="@integer/sudTransitionDuration" android:fromXDelta="-100%" android:toXDelta="0%" android:interpolator="@android:anim/decelerate_interpolator" /> diff --git a/main/res/anim/suw_slide_back_out.xml b/main/res/anim-ldrtl/sud_slide_next_out.xml index 3b68945..92c778e 100644 --- a/main/res/anim/suw_slide_back_out.xml +++ b/main/res/anim-ldrtl/sud_slide_next_out.xml @@ -16,7 +16,7 @@ --> <translate xmlns:android="http://schemas.android.com/apk/res/android" - android:duration="@integer/suwTransitionDuration" + android:duration="@integer/sudTransitionDuration" android:fromXDelta="0%" android:toXDelta="100%" android:interpolator="@android:anim/decelerate_interpolator" /> diff --git a/main/res/anim-ldrtl/suw_slide_next_in.xml b/main/res/anim/sud_slide_back_in.xml index f0144c5..f55e4d0 100644 --- a/main/res/anim-ldrtl/suw_slide_next_in.xml +++ b/main/res/anim/sud_slide_back_in.xml @@ -16,7 +16,7 @@ --> <translate xmlns:android="http://schemas.android.com/apk/res/android" - android:duration="@integer/suwTransitionDuration" + android:duration="@integer/sudTransitionDuration" android:fromXDelta="-100%" android:toXDelta="0%" android:interpolator="@android:anim/decelerate_interpolator" /> diff --git a/main/res/anim-ldrtl/suw_slide_next_out.xml b/main/res/anim/sud_slide_back_out.xml index 3b68945..92c778e 100644 --- a/main/res/anim-ldrtl/suw_slide_next_out.xml +++ b/main/res/anim/sud_slide_back_out.xml @@ -16,7 +16,7 @@ --> <translate xmlns:android="http://schemas.android.com/apk/res/android" - android:duration="@integer/suwTransitionDuration" + android:duration="@integer/sudTransitionDuration" android:fromXDelta="0%" android:toXDelta="100%" android:interpolator="@android:anim/decelerate_interpolator" /> diff --git a/main/res/anim/suw_slide_next_in.xml b/main/res/anim/sud_slide_next_in.xml index 18e6e80..670c45b 100644 --- a/main/res/anim/suw_slide_next_in.xml +++ b/main/res/anim/sud_slide_next_in.xml @@ -16,7 +16,7 @@ --> <translate xmlns:android="http://schemas.android.com/apk/res/android" - android:duration="@integer/suwTransitionDuration" + android:duration="@integer/sudTransitionDuration" android:fromXDelta="100%" android:toXDelta="0%" android:interpolator="@android:anim/decelerate_interpolator" /> diff --git a/main/res/anim/suw_slide_next_out.xml b/main/res/anim/sud_slide_next_out.xml index a8d1ebf..a3715a3 100644 --- a/main/res/anim/suw_slide_next_out.xml +++ b/main/res/anim/sud_slide_next_out.xml @@ -16,7 +16,7 @@ --> <translate xmlns:android="http://schemas.android.com/apk/res/android" - android:duration="@integer/suwTransitionDuration" + android:duration="@integer/sudTransitionDuration" android:fromXDelta="0%" android:toXDelta="-100%" android:interpolator="@android:anim/decelerate_interpolator" /> diff --git a/main/res/animator-ldrtl-v11/suw_slide_back_in.xml b/main/res/animator-ldrtl-v11/sud_slide_back_in.xml index a01dcd8..f15fb6b 100644 --- a/main/res/animator-ldrtl-v11/suw_slide_back_in.xml +++ b/main/res/animator-ldrtl-v11/sud_slide_back_in.xml @@ -20,7 +20,7 @@ not stripped out by proguard. --> <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - android:duration="@integer/suwTransitionDuration" + android:duration="@integer/sudTransitionDuration" android:interpolator="@android:interpolator/decelerate_quad" android:propertyName="xFraction" android:valueFrom="1.0" diff --git a/main/res/animator-ldrtl-v11/suw_slide_back_out.xml b/main/res/animator-ldrtl-v11/sud_slide_back_out.xml index 59760ca..d576509 100644 --- a/main/res/animator-ldrtl-v11/suw_slide_back_out.xml +++ b/main/res/animator-ldrtl-v11/sud_slide_back_out.xml @@ -20,7 +20,7 @@ not stripped out by proguard. --> <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - android:duration="@integer/suwTransitionDuration" + android:duration="@integer/sudTransitionDuration" android:interpolator="@android:interpolator/decelerate_quad" android:propertyName="xFraction" android:valueFrom="0" diff --git a/main/res/animator-ldrtl-v11/suw_slide_next_in.xml b/main/res/animator-ldrtl-v11/sud_slide_next_in.xml index a673f40..7b8099e 100644 --- a/main/res/animator-ldrtl-v11/suw_slide_next_in.xml +++ b/main/res/animator-ldrtl-v11/sud_slide_next_in.xml @@ -20,7 +20,7 @@ not stripped out by proguard. --> <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - android:duration="@integer/suwTransitionDuration" + android:duration="@integer/sudTransitionDuration" android:interpolator="@android:interpolator/decelerate_quad" android:propertyName="xFraction" android:valueFrom="-1.0" diff --git a/main/res/animator-ldrtl-v11/suw_slide_next_out.xml b/main/res/animator-ldrtl-v11/sud_slide_next_out.xml index 262e085..2206cc7 100644 --- a/main/res/animator-ldrtl-v11/suw_slide_next_out.xml +++ b/main/res/animator-ldrtl-v11/sud_slide_next_out.xml @@ -20,7 +20,7 @@ not stripped out by proguard. --> <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - android:duration="@integer/suwTransitionDuration" + android:duration="@integer/sudTransitionDuration" android:interpolator="@android:interpolator/decelerate_quad" android:propertyName="xFraction" android:valueFrom="0" diff --git a/main/res/animator-v11/suw_slide_back_in.xml b/main/res/animator-v11/sud_slide_back_in.xml index 1b8c68e..b90d374 100644 --- a/main/res/animator-v11/suw_slide_back_in.xml +++ b/main/res/animator-v11/sud_slide_back_in.xml @@ -19,7 +19,7 @@ setXFraction(float) and getXFraction methods implemented. Also make sure these 2 methods are not stripped out by proguard. --> <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android" - android:duration="@integer/suwTransitionDuration" + android:duration="@integer/sudTransitionDuration" android:interpolator="@android:interpolator/decelerate_quad" android:propertyName="xFraction" android:valueFrom="-1.0" diff --git a/main/res/animator-v11/suw_slide_back_out.xml b/main/res/animator-v11/sud_slide_back_out.xml index 9442096..02f9cf8 100644 --- a/main/res/animator-v11/suw_slide_back_out.xml +++ b/main/res/animator-v11/sud_slide_back_out.xml @@ -19,7 +19,7 @@ setXFraction(float) and getXFraction methods implemented. Also make sure these 2 methods are not stripped out by proguard. --> <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android" - android:duration="@integer/suwTransitionDuration" + android:duration="@integer/sudTransitionDuration" android:interpolator="@android:interpolator/decelerate_quad" android:propertyName="xFraction" android:valueFrom="0" diff --git a/main/res/animator-v11/suw_slide_next_in.xml b/main/res/animator-v11/sud_slide_next_in.xml index 195c8b1..504ce07 100644 --- a/main/res/animator-v11/suw_slide_next_in.xml +++ b/main/res/animator-v11/sud_slide_next_in.xml @@ -19,7 +19,7 @@ setXFraction(float) and getXFraction methods implemented. Also make sure these 2 methods are not stripped out by proguard. --> <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android" - android:duration="@integer/suwTransitionDuration" + android:duration="@integer/sudTransitionDuration" android:interpolator="@android:interpolator/decelerate_quad" android:propertyName="xFraction" android:valueFrom="1.0" diff --git a/main/res/animator-v11/suw_slide_next_out.xml b/main/res/animator-v11/sud_slide_next_out.xml index a910233..ad39923 100644 --- a/main/res/animator-v11/suw_slide_next_out.xml +++ b/main/res/animator-v11/sud_slide_next_out.xml @@ -19,7 +19,7 @@ setXFraction(float) and getXFraction methods implemented. Also make sure these 2 methods are not stripped out by proguard. --> <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android" - android:duration="@integer/suwTransitionDuration" + android:duration="@integer/sudTransitionDuration" android:interpolator="@android:interpolator/decelerate_quad" android:propertyName="xFraction" android:valueFrom="0" diff --git a/main/res/color-v23/suw_flat_button_highlight.xml b/main/res/color-v23/sud_flat_button_highlight.xml index cdb1305..c9c2353 100644 --- a/main/res/color-v23/suw_flat_button_highlight.xml +++ b/main/res/color-v23/sud_flat_button_highlight.xml @@ -17,5 +17,5 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:color="?android:attr/colorAccent" - android:alpha="?attr/suwButtonHighlightAlpha" /> + android:alpha="?attr/sudButtonHighlightAlpha" /> </selector> diff --git a/main/res/drawable-anydpi-v21/suw_navbar_ic_back.xml b/main/res/drawable-anydpi-v21/sud_navbar_ic_back.xml index d0bff09..a136be3 100644 --- a/main/res/drawable-anydpi-v21/suw_navbar_ic_back.xml +++ b/main/res/drawable-anydpi-v21/sud_navbar_ic_back.xml @@ -17,9 +17,9 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" - android:width="@dimen/suw_navbar_ic_intrinsic_size" - android:height="@dimen/suw_navbar_ic_intrinsic_size" - android:tint="?attr/suwNavBarTextColor" + android:width="@dimen/sud_navbar_ic_intrinsic_size" + android:height="@dimen/sud_navbar_ic_intrinsic_size" + android:tint="?attr/sudNavBarTextColor" android:viewportWidth="24" android:viewportHeight="24"> diff --git a/main/res/drawable-anydpi-v21/suw_navbar_ic_more.xml b/main/res/drawable-anydpi-v21/sud_navbar_ic_more.xml index f21205d..6bec22c 100644 --- a/main/res/drawable-anydpi-v21/suw_navbar_ic_more.xml +++ b/main/res/drawable-anydpi-v21/sud_navbar_ic_more.xml @@ -16,9 +16,9 @@ --> <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="@dimen/suw_navbar_ic_intrinsic_size" - android:height="@dimen/suw_navbar_ic_intrinsic_size" - android:tint="?attr/suwNavBarTextColor" + android:width="@dimen/sud_navbar_ic_intrinsic_size" + android:height="@dimen/sud_navbar_ic_intrinsic_size" + android:tint="?attr/sudNavBarTextColor" android:viewportWidth="24" android:viewportHeight="24"> diff --git a/main/res/drawable-anydpi-v21/suw_navbar_ic_next.xml b/main/res/drawable-anydpi-v21/sud_navbar_ic_next.xml index 714731d..dbf6661 100644 --- a/main/res/drawable-anydpi-v21/suw_navbar_ic_next.xml +++ b/main/res/drawable-anydpi-v21/sud_navbar_ic_next.xml @@ -17,9 +17,9 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" - android:width="@dimen/suw_navbar_ic_intrinsic_size" - android:height="@dimen/suw_navbar_ic_intrinsic_size" - android:tint="?attr/suwNavBarTextColor" + android:width="@dimen/sud_navbar_ic_intrinsic_size" + android:height="@dimen/sud_navbar_ic_intrinsic_size" + android:tint="?attr/sudNavBarTextColor" android:viewportWidth="24" android:viewportHeight="24"> diff --git a/main/res/drawable-hdpi/suw_navbar_ic_down_arrow.png b/main/res/drawable-hdpi/sud_navbar_ic_down_arrow.png Binary files differindex 3d7f83f..3d7f83f 100644 --- a/main/res/drawable-hdpi/suw_navbar_ic_down_arrow.png +++ b/main/res/drawable-hdpi/sud_navbar_ic_down_arrow.png diff --git a/main/res/drawable-hdpi/suw_navbar_ic_left_arrow.png b/main/res/drawable-hdpi/sud_navbar_ic_left_arrow.png Binary files differindex decccac..decccac 100644 --- a/main/res/drawable-hdpi/suw_navbar_ic_left_arrow.png +++ b/main/res/drawable-hdpi/sud_navbar_ic_left_arrow.png diff --git a/main/res/drawable-hdpi/suw_navbar_ic_right_arrow.png b/main/res/drawable-hdpi/sud_navbar_ic_right_arrow.png Binary files differindex 5ba56b7..5ba56b7 100644 --- a/main/res/drawable-hdpi/suw_navbar_ic_right_arrow.png +++ b/main/res/drawable-hdpi/sud_navbar_ic_right_arrow.png diff --git a/main/res/drawable-ldrtl/suw_navbar_ic_back.xml b/main/res/drawable-ldrtl/sud_navbar_ic_back.xml index e164e8a..cde0bc6 100644 --- a/main/res/drawable-ldrtl/suw_navbar_ic_back.xml +++ b/main/res/drawable-ldrtl/sud_navbar_ic_back.xml @@ -16,4 +16,4 @@ --> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/suw_navbar_ic_right_arrow" /> + android:src="@drawable/sud_navbar_ic_right_arrow" /> diff --git a/main/res/drawable-ldrtl/suw_navbar_ic_next.xml b/main/res/drawable-ldrtl/sud_navbar_ic_next.xml index 8a6e137..2d42cf5 100644 --- a/main/res/drawable-ldrtl/suw_navbar_ic_next.xml +++ b/main/res/drawable-ldrtl/sud_navbar_ic_next.xml @@ -16,4 +16,4 @@ --> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/suw_navbar_ic_left_arrow" /> + android:src="@drawable/sud_navbar_ic_left_arrow" /> diff --git a/main/res/drawable-mdpi/suw_navbar_ic_down_arrow.png b/main/res/drawable-mdpi/sud_navbar_ic_down_arrow.png Binary files differindex 5b1fa06..5b1fa06 100644 --- a/main/res/drawable-mdpi/suw_navbar_ic_down_arrow.png +++ b/main/res/drawable-mdpi/sud_navbar_ic_down_arrow.png diff --git a/main/res/drawable-mdpi/suw_navbar_ic_left_arrow.png b/main/res/drawable-mdpi/sud_navbar_ic_left_arrow.png Binary files differindex 1e2984a..1e2984a 100644 --- a/main/res/drawable-mdpi/suw_navbar_ic_left_arrow.png +++ b/main/res/drawable-mdpi/sud_navbar_ic_left_arrow.png diff --git a/main/res/drawable-mdpi/suw_navbar_ic_right_arrow.png b/main/res/drawable-mdpi/sud_navbar_ic_right_arrow.png Binary files differindex b8365e6..b8365e6 100644 --- a/main/res/drawable-mdpi/suw_navbar_ic_right_arrow.png +++ b/main/res/drawable-mdpi/sud_navbar_ic_right_arrow.png diff --git a/main/res/drawable-v21/suw_card_bg.xml b/main/res/drawable-v21/sud_card_bg.xml index f79ca4c..cad375d 100644 --- a/main/res/drawable-v21/suw_card_bg.xml +++ b/main/res/drawable-v21/sud_card_bg.xml @@ -22,8 +22,8 @@ tools:ignore="UnusedResources"> <corners - android:topLeftRadius="@dimen/suw_card_corner_radius" - android:topRightRadius="@dimen/suw_card_corner_radius" /> + android:topLeftRadius="@dimen/sud_card_corner_radius" + android:topRightRadius="@dimen/sud_card_corner_radius" /> <solid android:color="?android:attr/colorBackground" /> diff --git a/main/res/drawable-v21/suw_edit_text_bg_shape.xml b/main/res/drawable-v21/sud_edit_text_bg_shape.xml index ad55ec6..dca3d78 100644 --- a/main/res/drawable-v21/suw_edit_text_bg_shape.xml +++ b/main/res/drawable-v21/sud_edit_text_bg_shape.xml @@ -17,5 +17,5 @@ <shape xmlns:android="http://schemas.android.com/apk/res/android"> <corners android:topLeftRadius="4dp" android:topRightRadius="4dp"/> - <solid android:color="?attr/suwEditTextBackgroundColor"/> + <solid android:color="?attr/sudEditTextBackgroundColor"/> </shape>
\ No newline at end of file diff --git a/main/res/drawable-v21/suw_edittext_bg.xml b/main/res/drawable-v21/sud_edittext_bg.xml index b69c10b..8b352b7 100644 --- a/main/res/drawable-v21/suw_edittext_bg.xml +++ b/main/res/drawable-v21/sud_edittext_bg.xml @@ -18,7 +18,7 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_enabled="false"> <layer-list> - <item android:drawable="@drawable/suw_edit_text_bg_shape" android:bottom="1dp"/> + <item android:drawable="@drawable/sud_edit_text_bg_shape" android:bottom="1dp"/> <item android:gravity="bottom"> <shape> <size android:height="1dp"/> @@ -29,7 +29,7 @@ </item> <item android:state_focused="false" android:state_pressed="false"> <layer-list> - <item android:drawable="@drawable/suw_edit_text_bg_shape" android:bottom="1dp" /> + <item android:drawable="@drawable/sud_edit_text_bg_shape" android:bottom="1dp" /> <item android:gravity="bottom"> <shape> <size android:height="1dp"/> @@ -40,7 +40,7 @@ </item> <item> <layer-list> - <item android:drawable="@drawable/suw_edit_text_bg_shape" android:bottom="2dp" /> + <item android:drawable="@drawable/sud_edit_text_bg_shape" android:bottom="2dp" /> <item android:gravity="bottom"> <shape> <size android:height="2dp"/> diff --git a/main/res/drawable-v21/suw_fourcolor_progress_bar.xml b/main/res/drawable-v21/sud_fourcolor_progress_bar.xml index 2ac35ee..2ac35ee 100644 --- a/main/res/drawable-v21/suw_fourcolor_progress_bar.xml +++ b/main/res/drawable-v21/sud_fourcolor_progress_bar.xml diff --git a/main/res/drawable-v21/suw_navbar_btn_bg.xml b/main/res/drawable-v21/sud_navbar_btn_bg.xml index 198f7f0..198f7f0 100644 --- a/main/res/drawable-v21/suw_navbar_btn_bg.xml +++ b/main/res/drawable-v21/sud_navbar_btn_bg.xml diff --git a/main/res/drawable-xhdpi/suw_navbar_ic_down_arrow.png b/main/res/drawable-xhdpi/sud_navbar_ic_down_arrow.png Binary files differindex a7084c5..a7084c5 100644 --- a/main/res/drawable-xhdpi/suw_navbar_ic_down_arrow.png +++ b/main/res/drawable-xhdpi/sud_navbar_ic_down_arrow.png diff --git a/main/res/drawable-xhdpi/suw_navbar_ic_left_arrow.png b/main/res/drawable-xhdpi/sud_navbar_ic_left_arrow.png Binary files differindex 2d2046c..2d2046c 100644 --- a/main/res/drawable-xhdpi/suw_navbar_ic_left_arrow.png +++ b/main/res/drawable-xhdpi/sud_navbar_ic_left_arrow.png diff --git a/main/res/drawable-xhdpi/suw_navbar_ic_right_arrow.png b/main/res/drawable-xhdpi/sud_navbar_ic_right_arrow.png Binary files differindex 46abe31..46abe31 100644 --- a/main/res/drawable-xhdpi/suw_navbar_ic_right_arrow.png +++ b/main/res/drawable-xhdpi/sud_navbar_ic_right_arrow.png diff --git a/main/res/drawable-xxhdpi/suw_navbar_ic_down_arrow.png b/main/res/drawable-xxhdpi/sud_navbar_ic_down_arrow.png Binary files differindex ed3c3b0..ed3c3b0 100644 --- a/main/res/drawable-xxhdpi/suw_navbar_ic_down_arrow.png +++ b/main/res/drawable-xxhdpi/sud_navbar_ic_down_arrow.png diff --git a/main/res/drawable-xxhdpi/suw_navbar_ic_left_arrow.png b/main/res/drawable-xxhdpi/sud_navbar_ic_left_arrow.png Binary files differindex be42712..be42712 100644 --- a/main/res/drawable-xxhdpi/suw_navbar_ic_left_arrow.png +++ b/main/res/drawable-xxhdpi/sud_navbar_ic_left_arrow.png diff --git a/main/res/drawable-xxhdpi/suw_navbar_ic_right_arrow.png b/main/res/drawable-xxhdpi/sud_navbar_ic_right_arrow.png Binary files differindex d7bc4e3..d7bc4e3 100644 --- a/main/res/drawable-xxhdpi/suw_navbar_ic_right_arrow.png +++ b/main/res/drawable-xxhdpi/sud_navbar_ic_right_arrow.png diff --git a/main/res/drawable-xxxhdpi/suw_navbar_ic_down_arrow.png b/main/res/drawable-xxxhdpi/sud_navbar_ic_down_arrow.png Binary files differindex dcc1f3c..dcc1f3c 100644 --- a/main/res/drawable-xxxhdpi/suw_navbar_ic_down_arrow.png +++ b/main/res/drawable-xxxhdpi/sud_navbar_ic_down_arrow.png diff --git a/main/res/drawable-xxxhdpi/suw_navbar_ic_left_arrow.png b/main/res/drawable-xxxhdpi/sud_navbar_ic_left_arrow.png Binary files differindex a0ebbb9..a0ebbb9 100644 --- a/main/res/drawable-xxxhdpi/suw_navbar_ic_left_arrow.png +++ b/main/res/drawable-xxxhdpi/sud_navbar_ic_left_arrow.png diff --git a/main/res/drawable-xxxhdpi/suw_navbar_ic_right_arrow.png b/main/res/drawable-xxxhdpi/sud_navbar_ic_right_arrow.png Binary files differindex c98b882..c98b882 100644 --- a/main/res/drawable-xxxhdpi/suw_navbar_ic_right_arrow.png +++ b/main/res/drawable-xxxhdpi/sud_navbar_ic_right_arrow.png diff --git a/main/res/drawable/suw_card_bg_dark.xml b/main/res/drawable/sud_card_bg_dark.xml index cd115cf..7375bfe 100644 --- a/main/res/drawable/suw_card_bg_dark.xml +++ b/main/res/drawable/sud_card_bg_dark.xml @@ -19,8 +19,8 @@ xmlns:tools="http://schemas.android.com/tools" android:shape="rectangle"> <corners - android:topLeftRadius="@dimen/suw_card_corner_radius" - android:topRightRadius="@dimen/suw_card_corner_radius" /> + android:topLeftRadius="@dimen/sud_card_corner_radius" + android:topRightRadius="@dimen/sud_card_corner_radius" /> <!-- Ignore PrivateResource: This should be fixed --> <solid android:color="@color/background_material_dark" tools:ignore="PrivateResource" /> diff --git a/main/res/drawable/suw_card_bg_light.xml b/main/res/drawable/sud_card_bg_light.xml index cd40dbe..2794b0d 100644 --- a/main/res/drawable/suw_card_bg_light.xml +++ b/main/res/drawable/sud_card_bg_light.xml @@ -19,8 +19,8 @@ xmlns:tools="http://schemas.android.com/tools" android:shape="rectangle"> <corners - android:topLeftRadius="@dimen/suw_card_corner_radius" - android:topRightRadius="@dimen/suw_card_corner_radius" /> + android:topLeftRadius="@dimen/sud_card_corner_radius" + android:topRightRadius="@dimen/sud_card_corner_radius" /> <!-- Ignore PrivateResource: This should be fixed --> <solid android:color="@color/background_material_light" tools:ignore="PrivateResource" /> diff --git a/main/res/drawable/suw_ic_expand.xml b/main/res/drawable/sud_ic_expand.xml index 7e79f7d..125c98b 100644 --- a/main/res/drawable/suw_ic_expand.xml +++ b/main/res/drawable/sud_ic_expand.xml @@ -16,6 +16,6 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_checked="true" android:drawable="@drawable/suw_ic_expand_less" /> - <item android:drawable="@drawable/suw_ic_expand_more" /> + <item android:state_checked="true" android:drawable="@drawable/sud_ic_expand_less" /> + <item android:drawable="@drawable/sud_ic_expand_more" /> </selector> diff --git a/main/res/drawable/suw_ic_expand_less.xml b/main/res/drawable/sud_ic_expand_less.xml index ef717c1..ef717c1 100644 --- a/main/res/drawable/suw_ic_expand_less.xml +++ b/main/res/drawable/sud_ic_expand_less.xml diff --git a/main/res/drawable/suw_ic_expand_more.xml b/main/res/drawable/sud_ic_expand_more.xml index ff3a0c5..ff3a0c5 100644 --- a/main/res/drawable/suw_ic_expand_more.xml +++ b/main/res/drawable/sud_ic_expand_more.xml diff --git a/main/res/drawable/suw_layout_background.xml b/main/res/drawable/sud_layout_background.xml index affe95f..52451a5 100644 --- a/main/res/drawable/suw_layout_background.xml +++ b/main/res/drawable/sud_layout_background.xml @@ -19,6 +19,6 @@ with a suitable tileable background. --> <shape xmlns:android="http://schemas.android.com/apk/res/android"> - <solid android:color="@color/suw_color_accent_light" /> + <solid android:color="@color/sud_color_accent_light" /> </shape> diff --git a/main/res/drawable/suw_navbar_btn_bg_dark.xml b/main/res/drawable/sud_navbar_btn_bg_dark.xml index f4131e5..f4131e5 100644 --- a/main/res/drawable/suw_navbar_btn_bg_dark.xml +++ b/main/res/drawable/sud_navbar_btn_bg_dark.xml diff --git a/main/res/drawable/suw_navbar_btn_bg_light.xml b/main/res/drawable/sud_navbar_btn_bg_light.xml index 5d3bcfa..5d3bcfa 100644 --- a/main/res/drawable/suw_navbar_btn_bg_light.xml +++ b/main/res/drawable/sud_navbar_btn_bg_light.xml diff --git a/main/res/drawable/suw_navbar_ic_more.xml b/main/res/drawable/sud_navbar_ic_back.xml index 603e08d..2d42cf5 100644 --- a/main/res/drawable/suw_navbar_ic_more.xml +++ b/main/res/drawable/sud_navbar_ic_back.xml @@ -16,4 +16,4 @@ --> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/suw_navbar_ic_down_arrow" /> + android:src="@drawable/sud_navbar_ic_left_arrow" /> diff --git a/main/res/drawable/suw_navbar_ic_back.xml b/main/res/drawable/sud_navbar_ic_more.xml index 8a6e137..fb355b8 100644 --- a/main/res/drawable/suw_navbar_ic_back.xml +++ b/main/res/drawable/sud_navbar_ic_more.xml @@ -16,4 +16,4 @@ --> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/suw_navbar_ic_left_arrow" /> + android:src="@drawable/sud_navbar_ic_down_arrow" /> diff --git a/main/res/drawable/sud_navbar_ic_next.xml b/main/res/drawable/sud_navbar_ic_next.xml new file mode 100644 index 0000000..cde0bc6 --- /dev/null +++ b/main/res/drawable/sud_navbar_ic_next.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/sud_navbar_ic_right_arrow" /> diff --git a/main/res/drawable/suw_navbar_ic_next.xml b/main/res/drawable/suw_navbar_ic_next.xml deleted file mode 100644 index e164e8a..0000000 --- a/main/res/drawable/suw_navbar_ic_next.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2015 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/suw_navbar_ic_right_arrow" /> diff --git a/main/res/layout-v21/sud_progress_bar.xml b/main/res/layout-v21/sud_progress_bar.xml index cbb69ea..0219a93 100644 --- a/main/res/layout-v21/sud_progress_bar.xml +++ b/main/res/layout-v21/sud_progress_bar.xml @@ -20,6 +20,6 @@ style="?android:attr/progressBarStyleHorizontal" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/suw_progress_bar_margin_vertical" - android:layout_marginTop="@dimen/suw_progress_bar_margin_vertical" + android:layout_marginBottom="@dimen/sud_progress_bar_margin_vertical" + android:layout_marginTop="@dimen/sud_progress_bar_margin_vertical" android:indeterminate="true" /> diff --git a/main/res/layout/sud_glif_blank_template_card.xml b/main/res/layout/sud_glif_blank_template_card.xml index 8530c6d..eac860d 100644 --- a/main/res/layout/sud_glif_blank_template_card.xml +++ b/main/res/layout/sud_glif_blank_template_card.xml @@ -17,7 +17,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/suc_layout_status" - style="@style/SuwGlifCardBackground" + style="@style/SudGlifCardBackground" android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true" @@ -31,10 +31,10 @@ android:visibility="invisible" /> <com.google.android.setupdesign.view.IntrinsicSizeFrameLayout - style="@style/SuwGlifCardContainer" - android:layout_width="@dimen/suw_glif_card_width" + style="@style/SudGlifCardContainer" + android:layout_width="@dimen/sud_glif_card_width" android:layout_height="wrap_content" - android:height="@dimen/suw_glif_card_height"> + android:height="@dimen/sud_glif_card_height"> <include layout="@layout/sud_glif_blank_template_content" /> diff --git a/main/res/layout/sud_glif_blank_template_content.xml b/main/res/layout/sud_glif_blank_template_content.xml index b34e68c..1eaae13 100644 --- a/main/res/layout/sud_glif_blank_template_content.xml +++ b/main/res/layout/sud_glif_blank_template_content.xml @@ -22,12 +22,12 @@ android:orientation="vertical"> <ViewStub - android:id="@+id/suw_layout_sticky_header" + android:id="@+id/sud_layout_sticky_header" android:layout_width="match_parent" android:layout_height="wrap_content" /> <FrameLayout - android:id="@+id/suw_layout_content" + android:id="@+id/sud_layout_content" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" /> diff --git a/main/res/layout/sud_glif_footer_button_bar.xml b/main/res/layout/sud_glif_footer_button_bar.xml new file mode 100644 index 0000000..e0a796d --- /dev/null +++ b/main/res/layout/sud_glif_footer_button_bar.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (C) 2017 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<com.google.android.setupdesign.view.ButtonBarLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/sud_footer_button_bar" + style="@style/SudGlifButtonBar.Stackable" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> diff --git a/main/res/layout/sud_glif_header.xml b/main/res/layout/sud_glif_header.xml index c51e92d..df5ffeb 100644 --- a/main/res/layout/sud_glif_header.xml +++ b/main/res/layout/sud_glif_header.xml @@ -16,34 +16,34 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/SuwGlifHeaderContainer" + style="@style/SudGlifHeaderContainer" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> <ImageView - android:id="@+id/suw_layout_icon" - style="?attr/suwGlifIconStyle" + android:id="@+id/suc_layout_icon" + style="?attr/sudGlifIconStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@null" android:visibility="gone" /> <TextView - android:id="@+id/suw_layout_title" - style="@style/SuwGlifHeaderTitle" + android:id="@+id/suc_layout_title" + style="@style/SudGlifHeaderTitle" android:layout_width="match_parent" android:layout_height="wrap_content" /> <ViewStub - android:id="@+id/suw_layout_progress_stub" + android:id="@+id/sud_layout_progress_stub" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/suw_glif_progress_bar_margin_vertical" - android:layout_marginLeft="?attr/suwMarginSides" - android:layout_marginRight="?attr/suwMarginSides" - android:layout_marginTop="@dimen/suw_glif_progress_bar_margin_vertical" - android:inflatedId="@+id/suw_layout_progress" + android:layout_marginBottom="@dimen/sud_glif_progress_bar_margin_vertical" + android:layout_marginLeft="?attr/sudMarginSides" + android:layout_marginRight="?attr/sudMarginSides" + android:layout_marginTop="@dimen/sud_glif_progress_bar_margin_vertical" + android:inflatedId="@+id/sud_layout_progress" android:layout="@layout/sud_progress_bar" /> </LinearLayout> diff --git a/main/res/layout/sud_glif_list_template_card.xml b/main/res/layout/sud_glif_list_template_card.xml index 6e3a716..a1e7a36 100644 --- a/main/res/layout/sud_glif_list_template_card.xml +++ b/main/res/layout/sud_glif_list_template_card.xml @@ -17,7 +17,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/suc_layout_status" - style="@style/SuwGlifCardBackground" + style="@style/SudGlifCardBackground" android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true" @@ -31,10 +31,10 @@ android:visibility="invisible" /> <com.google.android.setupdesign.view.IntrinsicSizeFrameLayout - style="@style/SuwGlifCardContainer" - android:layout_width="@dimen/suw_glif_card_width" + style="@style/SudGlifCardContainer" + android:layout_width="@dimen/sud_glif_card_width" android:layout_height="wrap_content" - android:height="@dimen/suw_glif_card_height"> + android:height="@dimen/sud_glif_card_height"> <include layout="@layout/sud_glif_list_template_content" /> diff --git a/main/res/layout/sud_glif_list_template_content.xml b/main/res/layout/sud_glif_list_template_content.xml index 0145797..1a6b4cd 100644 --- a/main/res/layout/sud_glif_list_template_content.xml +++ b/main/res/layout/sud_glif_list_template_content.xml @@ -23,7 +23,7 @@ android:orientation="vertical"> <ViewStub - android:id="@+id/suw_layout_sticky_header" + android:id="@+id/sud_layout_sticky_header" android:layout_width="match_parent" android:layout_height="wrap_content" /> @@ -35,8 +35,8 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:scrollIndicators="?attr/suwScrollIndicators" - app:suwHeader="@layout/sud_glif_header" + android:scrollIndicators="?attr/sudScrollIndicators" + app:sudHeader="@layout/sud_glif_header" tools:ignore="UnusedAttribute" /> <ViewStub diff --git a/main/res/layout/sud_glif_loading_screen.xml b/main/res/layout/sud_glif_loading_screen.xml index 3bfbe07..ba26ffd 100644 --- a/main/res/layout/sud_glif_loading_screen.xml +++ b/main/res/layout/sud_glif_loading_screen.xml @@ -30,8 +30,8 @@ android:layout_weight="1"> <ProgressBar - android:id="@+id/suw_large_progress_bar" - style="@style/SuwFourColorIndeterminateProgressBar" + android:id="@+id/sud_large_progress_bar" + style="@style/SudFourColorIndeterminateProgressBar" android:layout_width="match_parent" android:layout_height="match_parent" /> diff --git a/main/res/layout/sud_glif_preference_recycler_view.xml b/main/res/layout/sud_glif_preference_recycler_view.xml index 15be177..e973e04 100644 --- a/main/res/layout/sud_glif_preference_recycler_view.xml +++ b/main/res/layout/sud_glif_preference_recycler_view.xml @@ -18,9 +18,9 @@ <com.google.android.setupdesign.view.HeaderRecyclerView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/suw_recycler_view" + android:id="@+id/sud_recycler_view" android:layout_width="match_parent" android:layout_height="match_parent" android:clipChildren="false" android:scrollbars="vertical" - app:suwHeader="@layout/sud_glif_header" /> + app:sudHeader="@layout/sud_glif_header" /> diff --git a/main/res/layout/sud_glif_preference_template_header.xml b/main/res/layout/sud_glif_preference_template_header.xml new file mode 100644 index 0000000..d736392 --- /dev/null +++ b/main/res/layout/sud_glif_preference_template_header.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (C) 2016 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + tools:ignore="UnusedResources"> + <!-- Ignore UnusedResources: can be used by clients --> + + <FrameLayout + android:id="@+id/sud_layout_content" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" /> + + <com.google.android.setupdesign.view.NavigationBar + android:id="@+id/sud_layout_navigation_bar" + style="@style/SudNavBarTheme" + android:layout_width="match_parent" + android:layout_height="@dimen/sud_navbar_height" /> + +</LinearLayout> diff --git a/main/res/layout/sud_glif_recycler_template_card.xml b/main/res/layout/sud_glif_recycler_template_card.xml index 8edf7ef..a76b47e 100644 --- a/main/res/layout/sud_glif_recycler_template_card.xml +++ b/main/res/layout/sud_glif_recycler_template_card.xml @@ -17,7 +17,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/suc_layout_status" - style="@style/SuwGlifCardBackground" + style="@style/SudGlifCardBackground" android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true" @@ -31,10 +31,10 @@ android:visibility="invisible" /> <com.google.android.setupdesign.view.IntrinsicSizeFrameLayout - style="@style/SuwGlifCardContainer" - android:layout_width="@dimen/suw_glif_card_width" + style="@style/SudGlifCardContainer" + android:layout_width="@dimen/sud_glif_card_width" android:layout_height="wrap_content" - android:height="@dimen/suw_glif_card_height"> + android:height="@dimen/sud_glif_card_height"> <include layout="@layout/sud_glif_recycler_template_content" /> diff --git a/main/res/layout/sud_glif_recycler_template_content.xml b/main/res/layout/sud_glif_recycler_template_content.xml index 64d7b2a..9ca640b 100644 --- a/main/res/layout/sud_glif_recycler_template_content.xml +++ b/main/res/layout/sud_glif_recycler_template_content.xml @@ -24,20 +24,20 @@ android:orientation="vertical"> <ViewStub - android:id="@+id/suw_layout_sticky_header" + android:id="@+id/sud_layout_sticky_header" android:layout_width="match_parent" android:layout_height="wrap_content" /> <!-- Ignore UnusedAttribute: scrollIndicators is new in M. Default to no indicators in older versions. --> <com.google.android.setupdesign.view.HeaderRecyclerView - android:id="@+id/suw_recycler_view" + android:id="@+id/sud_recycler_view" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" android:scrollbars="vertical" - android:scrollIndicators="?attr/suwScrollIndicators" - app:suwHeader="@layout/sud_glif_header" + android:scrollIndicators="?attr/sudScrollIndicators" + app:sudHeader="@layout/sud_glif_header" tools:ignore="UnusedAttribute" /> <ViewStub diff --git a/main/res/layout/sud_glif_template_card.xml b/main/res/layout/sud_glif_template_card.xml index 39c3340..0f2f145 100644 --- a/main/res/layout/sud_glif_template_card.xml +++ b/main/res/layout/sud_glif_template_card.xml @@ -17,7 +17,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/suc_layout_status" - style="@style/SuwGlifCardBackground" + style="@style/SudGlifCardBackground" android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true" @@ -31,10 +31,10 @@ android:visibility="invisible" /> <com.google.android.setupdesign.view.IntrinsicSizeFrameLayout - style="@style/SuwGlifCardContainer" - android:layout_width="@dimen/suw_glif_card_width" + style="@style/SudGlifCardContainer" + android:layout_width="@dimen/sud_glif_card_width" android:layout_height="wrap_content" - android:height="@dimen/suw_glif_card_height"> + android:height="@dimen/sud_glif_card_height"> <include layout="@layout/sud_glif_template_content" /> diff --git a/main/res/layout/sud_glif_template_content.xml b/main/res/layout/sud_glif_template_content.xml index 13e0e07..a72861e 100644 --- a/main/res/layout/sud_glif_template_content.xml +++ b/main/res/layout/sud_glif_template_content.xml @@ -23,19 +23,19 @@ android:orientation="vertical"> <ViewStub - android:id="@+id/suw_layout_sticky_header" + android:id="@+id/sud_layout_sticky_header" android:layout_width="match_parent" android:layout_height="wrap_content" /> <!-- Ignore UnusedAttribute: scrollIndicators is new in M. Default to no indicators in older versions. --> <com.google.android.setupdesign.view.BottomScrollView - android:id="@+id/suw_scroll_view" + android:id="@+id/sud_scroll_view" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" android:fillViewport="true" - android:scrollIndicators="?attr/suwScrollIndicators" + android:scrollIndicators="?attr/sudScrollIndicators" tools:ignore="UnusedAttribute"> <LinearLayout @@ -46,7 +46,7 @@ <include layout="@layout/sud_glif_header" /> <FrameLayout - android:id="@+id/suw_layout_content" + android:id="@+id/sud_layout_content" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" /> diff --git a/main/res/layout/sud_items_button_bar.xml b/main/res/layout/sud_items_button_bar.xml index 9f863be..8536338 100644 --- a/main/res/layout/sud_items_button_bar.xml +++ b/main/res/layout/sud_items_button_bar.xml @@ -16,7 +16,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/SuwItemContainer" + style="@style/SudItemContainer" android:layout_width="match_parent" android:layout_height="wrap_content" android:clipToPadding="false" diff --git a/main/res/layout/sud_items_default.xml b/main/res/layout/sud_items_default.xml index 5288452..4f3f3ac 100644 --- a/main/res/layout/sud_items_default.xml +++ b/main/res/layout/sud_items_default.xml @@ -17,21 +17,21 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - style="@style/SuwItemContainer" + style="@style/SudItemContainer" android:layout_width="match_parent" android:layout_height="wrap_content" android:baselineAligned="false" android:orientation="horizontal"> <FrameLayout - android:id="@+id/suw_items_icon_container" - android:layout_width="@dimen/suw_items_icon_container_width" + android:id="@+id/sud_items_icon_container" + android:layout_width="@dimen/sud_items_icon_container_width" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:gravity="start"> <ImageView - android:id="@+id/suw_items_icon" + android:id="@+id/sud_items_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" tools:ignore="ContentDescription" /> @@ -46,8 +46,8 @@ android:orientation="vertical"> <com.google.android.setupdesign.view.RichTextView - android:id="@+id/suw_items_title" - style="@style/SuwItemTitle" + android:id="@+id/sud_items_title" + style="@style/SudItemTitle" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="start" @@ -55,11 +55,11 @@ tools:ignore="UnusedAttribute" /> <com.google.android.setupdesign.view.RichTextView - android:id="@+id/suw_items_summary" - style="@style/SuwItemSummary" + android:id="@+id/sud_items_summary" + style="@style/SudItemSummary" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/suw_items_padding_bottom_extra" + android:layout_marginBottom="@dimen/sud_items_padding_bottom_extra" android:gravity="start" android:textAlignment="viewStart" android:visibility="gone" diff --git a/main/res/layout/sud_items_description.xml b/main/res/layout/sud_items_description.xml index 7f2ccb6..1caa5ee 100644 --- a/main/res/layout/sud_items_description.xml +++ b/main/res/layout/sud_items_description.xml @@ -17,7 +17,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - style="?attr/suwItemDescriptionStyle" + style="?attr/sudItemDescriptionStyle" android:layout_width="match_parent" android:layout_height="wrap_content" android:baselineAligned="false" @@ -26,14 +26,14 @@ <!-- Ignore UnusedResources: can be used by clients --> <FrameLayout - android:id="@+id/suw_items_icon_container" - android:layout_width="@dimen/suw_items_icon_container_width" + android:id="@+id/sud_items_icon_container" + android:layout_width="@dimen/sud_items_icon_container_width" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:gravity="start"> <ImageView - android:id="@+id/suw_items_icon" + android:id="@+id/sud_items_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" tools:ignore="ContentDescription" /> @@ -47,17 +47,17 @@ android:orientation="vertical"> <com.google.android.setupdesign.view.RichTextView - android:id="@+id/suw_items_title" - style="?attr/suwItemDescriptionTitleStyle" + android:id="@+id/sud_items_title" + style="?attr/sudItemDescriptionTitleStyle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra" - android:textAppearance="@style/TextAppearance.SuwDescription" + android:lineSpacingExtra="@dimen/sud_description_line_spacing_extra" + android:textAppearance="@style/TextAppearance.SudDescription" tools:ignore="UnusedAttribute" /> <com.google.android.setupdesign.view.RichTextView - android:id="@+id/suw_items_summary" - style="@style/SuwItemSummary" + android:id="@+id/sud_items_summary" + style="@style/SudItemSummary" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="start" diff --git a/main/res/layout/sud_items_expandable_switch.xml b/main/res/layout/sud_items_expandable_switch.xml index 1e81fab..f2cc80b 100644 --- a/main/res/layout/sud_items_expandable_switch.xml +++ b/main/res/layout/sud_items_expandable_switch.xml @@ -27,25 +27,25 @@ android:id="@+id/sud_items_expandable_switch_content" android:layout_width="0dp" android:layout_height="wrap_content" - style="@style/SuwItemContainer" + style="@style/SudItemContainer" android:layout_weight="1" android:background="?attr/selectableItemBackground" android:baselineAligned="false" android:orientation="horizontal" - android:paddingEnd="@dimen/suw_switch_content_padding_end" + android:paddingEnd="@dimen/sud_switch_content_padding_end" android:paddingLeft="?attr/listPreferredItemPaddingLeft" - android:paddingRight="@dimen/suw_switch_content_padding_end" + android:paddingRight="@dimen/sud_switch_content_padding_end" android:paddingStart="?attr/listPreferredItemPaddingLeft"> <FrameLayout - android:id="@+id/suw_items_icon_container" - android:layout_width="@dimen/suw_items_icon_container_width" + android:id="@+id/sud_items_icon_container" + android:layout_width="@dimen/sud_items_icon_container_width" android:layout_height="wrap_content" android:layout_gravity="top" android:gravity="start"> <ImageView - android:id="@+id/suw_items_icon" + android:id="@+id/sud_items_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" tools:ignore="ContentDescription" /> @@ -55,19 +55,19 @@ <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/suw_items_padding_bottom_extra" + android:layout_marginBottom="@dimen/sud_items_padding_bottom_extra" android:layout_weight="1" android:duplicateParentState="true" android:orientation="vertical"> <com.google.android.setupdesign.view.RichTextView - android:id="@+id/suw_items_title" - style="@style/SuwItemTitle" + android:id="@+id/sud_items_title" + style="@style/SudItemTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:drawablePadding="@dimen/suw_expand_arrow_drawable_padding" - android:drawableEnd="@drawable/suw_ic_expand" - android:drawableRight="@drawable/suw_ic_expand" + android:drawablePadding="@dimen/sud_expand_arrow_drawable_padding" + android:drawableEnd="@drawable/sud_ic_expand" + android:drawableRight="@drawable/sud_ic_expand" android:duplicateParentState="true" android:gravity="start" android:labelFor="@+id/sud_items_switch" @@ -75,8 +75,8 @@ tools:ignore="UnusedAttribute" /> <com.google.android.setupdesign.view.RichTextView - android:id="@+id/suw_items_summary" - style="@style/SuwItemSummary" + android:id="@+id/sud_items_summary" + style="@style/SudItemSummary" android:layout_width="match_parent" android:layout_height="wrap_content" android:duplicateParentState="true" @@ -92,18 +92,18 @@ <View android:id="@+id/sud_items_switch_divider" android:layout_width="1dp" - android:layout_height="@dimen/suw_switch_divider_height" + android:layout_height="@dimen/sud_switch_divider_height" android:layout_gravity="top" - android:layout_marginTop="@dimen/suw_switch_divider_padding_top" + android:layout_marginTop="@dimen/sud_switch_divider_padding_top" android:background="?android:attr/listDivider" /> <androidx.appcompat.widget.SwitchCompat android:id="@+id/sud_items_switch" - style="@style/SuwSwitchStyle.Divided" + style="@style/SudSwitchStyle.Divided" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="top" android:gravity="top" - android:paddingTop="@dimen/suw_switch_padding_top" /> + android:paddingTop="@dimen/sud_switch_padding_top" /> </LinearLayout> diff --git a/main/res/layout/sud_items_switch.xml b/main/res/layout/sud_items_switch.xml index 512e8d7..3826ae3 100644 --- a/main/res/layout/sud_items_switch.xml +++ b/main/res/layout/sud_items_switch.xml @@ -17,21 +17,21 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - style="@style/SuwItemContainer" + style="@style/SudItemContainer" android:layout_width="match_parent" android:layout_height="wrap_content" android:baselineAligned="false" android:orientation="horizontal"> <FrameLayout - android:id="@+id/suw_items_icon_container" - android:layout_width="@dimen/suw_items_icon_container_width" + android:id="@+id/sud_items_icon_container" + android:layout_width="@dimen/sud_items_icon_container_width" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:gravity="start"> <ImageView - android:id="@+id/suw_items_icon" + android:id="@+id/sud_items_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" tools:ignore="ContentDescription" /> @@ -41,13 +41,13 @@ <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/suw_items_padding_bottom_extra" + android:layout_marginBottom="@dimen/sud_items_padding_bottom_extra" android:layout_weight="1" android:orientation="vertical"> <com.google.android.setupdesign.view.RichTextView - android:id="@+id/suw_items_title" - style="@style/SuwItemTitle" + android:id="@+id/sud_items_title" + style="@style/SudItemTitle" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="start" @@ -56,8 +56,8 @@ tools:ignore="UnusedAttribute" /> <com.google.android.setupdesign.view.RichTextView - android:id="@+id/suw_items_summary" - style="@style/SuwItemSummary" + android:id="@+id/sud_items_summary" + style="@style/SudItemSummary" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="start" @@ -69,7 +69,7 @@ <androidx.appcompat.widget.SwitchCompat android:id="@+id/sud_items_switch" - style="@style/SuwSwitchStyle" + style="@style/SudSwitchStyle" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="center_vertical" /> diff --git a/main/res/layout/sud_items_switch_verbose.xml b/main/res/layout/sud_items_switch_verbose.xml index 509bfc7..13223d1 100644 --- a/main/res/layout/sud_items_switch_verbose.xml +++ b/main/res/layout/sud_items_switch_verbose.xml @@ -17,7 +17,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - style="@style/SuwItemContainer.Verbose" + style="@style/SudItemContainer.Verbose" android:layout_width="match_parent" android:layout_height="wrap_content" android:baselineAligned="false" @@ -27,14 +27,14 @@ <!-- Ignore UnusedResources: can be used by clients --> <FrameLayout - android:id="@+id/suw_items_icon_container" - android:layout_width="@dimen/suw_items_icon_container_width" + android:id="@+id/sud_items_icon_container" + android:layout_width="@dimen/sud_items_icon_container_width" android:layout_height="wrap_content" android:layout_gravity="top" android:gravity="start"> <ImageView - android:id="@+id/suw_items_icon" + android:id="@+id/sud_items_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" tools:ignore="ContentDescription" /> @@ -44,13 +44,13 @@ <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/suw_items_verbose_padding_bottom_extra" + android:layout_marginBottom="@dimen/sud_items_verbose_padding_bottom_extra" android:layout_weight="1" android:orientation="vertical"> <com.google.android.setupdesign.view.RichTextView - android:id="@+id/suw_items_title" - style="@style/SuwItemTitle.Verbose" + android:id="@+id/sud_items_title" + style="@style/SudItemTitle.Verbose" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="start" @@ -59,8 +59,8 @@ tools:ignore="UnusedAttribute" /> <com.google.android.setupdesign.view.RichTextView - android:id="@+id/suw_items_summary" - style="@style/SuwItemSummary" + android:id="@+id/sud_items_summary" + style="@style/SudItemSummary" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="start" @@ -72,7 +72,7 @@ <androidx.appcompat.widget.SwitchCompat android:id="@+id/sud_items_switch" - style="@style/SuwSwitchStyle" + style="@style/SudSwitchStyle" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="center_vertical" /> diff --git a/main/res/layout/sud_items_verbose.xml b/main/res/layout/sud_items_verbose.xml index 85e6885..210c41c 100644 --- a/main/res/layout/sud_items_verbose.xml +++ b/main/res/layout/sud_items_verbose.xml @@ -17,7 +17,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - style="@style/SuwItemContainer.Verbose" + style="@style/SudItemContainer.Verbose" android:layout_width="match_parent" android:layout_height="wrap_content" android:baselineAligned="false" @@ -26,14 +26,14 @@ <!-- Ignore UnusedResources: can be used by clients --> <FrameLayout - android:id="@+id/suw_items_icon_container" - android:layout_width="@dimen/suw_items_icon_container_width" + android:id="@+id/sud_items_icon_container" + android:layout_width="@dimen/sud_items_icon_container_width" android:layout_height="wrap_content" android:layout_gravity="top" android:gravity="start"> <ImageView - android:id="@+id/suw_items_icon" + android:id="@+id/sud_items_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@null" /> @@ -43,13 +43,13 @@ <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/suw_items_verbose_padding_bottom_extra" + android:layout_marginBottom="@dimen/sud_items_verbose_padding_bottom_extra" android:layout_weight="1" android:orientation="vertical"> <com.google.android.setupdesign.view.RichTextView - android:id="@+id/suw_items_title" - style="@style/SuwItemTitle.Verbose" + android:id="@+id/sud_items_title" + style="@style/SudItemTitle.Verbose" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="start" @@ -57,8 +57,8 @@ tools:ignore="UnusedAttribute" /> <com.google.android.setupdesign.view.RichTextView - android:id="@+id/suw_items_summary" - style="@style/SuwItemSummary" + android:id="@+id/sud_items_summary" + style="@style/SudItemSummary" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="start" diff --git a/main/res/layout/sud_list_header.xml b/main/res/layout/sud_list_header.xml index 5cda917..2f7a088 100644 --- a/main/res/layout/sud_list_header.xml +++ b/main/res/layout/sud_list_header.xml @@ -21,21 +21,21 @@ android:layout_height="wrap_content" android:clipToPadding="false" android:orientation="vertical" - android:elevation="@dimen/suw_header_elevation_hack" + android:elevation="@dimen/sud_header_elevation_hack" android:tag="stickyContainer" tools:ignore="UnusedAttribute"> <com.google.android.setupdesign.view.Illustration - android:id="@+id/suw_layout_decor" + android:id="@+id/sud_layout_decor" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/suw_layout_background" - android:elevation="@dimen/suw_title_area_elevation" + android:background="@drawable/sud_layout_background" + android:elevation="@dimen/sud_title_area_elevation" tools:ignore="UnusedAttribute"> <TextView - android:id="@+id/suw_layout_title" - style="@style/SuwHeaderTitle" + android:id="@+id/suc_layout_title" + style="@style/SudHeaderTitle" android:layout_width="match_parent" android:layout_height="wrap_content" android:tag="sticky" /> diff --git a/main/res/layout/sud_list_template_card.xml b/main/res/layout/sud_list_template_card.xml index ff93a02..e41988c 100644 --- a/main/res/layout/sud_list_template_card.xml +++ b/main/res/layout/sud_list_template_card.xml @@ -22,22 +22,22 @@ android:orientation="vertical"> <com.google.android.setupdesign.view.Illustration - android:id="@+id/suw_layout_decor" + android:id="@+id/sud_layout_decor" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:background="@drawable/suw_layout_background"> + android:background="@drawable/sud_layout_background"> <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:paddingLeft="@dimen/suw_card_port_margin_sides" - android:paddingRight="@dimen/suw_card_port_margin_sides"> + android:paddingLeft="@dimen/sud_card_port_margin_sides" + android:paddingRight="@dimen/sud_card_port_margin_sides"> <TextView - android:id="@+id/suw_layout_title" - style="@style/SuwCardTitle" + android:id="@+id/suc_layout_title" + style="@style/SudCardTitle" android:layout_width="match_parent" android:layout_height="wrap_content" /> @@ -45,8 +45,8 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:background="?attr/suwCardBackground" - android:elevation="@dimen/suw_card_elevation" + android:background="?attr/sudCardBackground" + android:elevation="@dimen/sud_card_elevation" tools:ignore="UnusedAttribute"> <ListView @@ -63,9 +63,9 @@ </com.google.android.setupdesign.view.Illustration> <com.google.android.setupdesign.view.NavigationBar - android:id="@+id/suw_layout_navigation_bar" - style="@style/SuwNavBarTheme" + android:id="@+id/sud_layout_navigation_bar" + style="@style/SudNavBarTheme" android:layout_width="match_parent" - android:layout_height="@dimen/suw_navbar_height" /> + android:layout_height="@dimen/sud_navbar_height" /> </LinearLayout> diff --git a/main/res/layout/sud_list_template_card_wide.xml b/main/res/layout/sud_list_template_card_wide.xml index d71dfbf..8152faf 100644 --- a/main/res/layout/sud_list_template_card_wide.xml +++ b/main/res/layout/sud_list_template_card_wide.xml @@ -22,11 +22,11 @@ android:orientation="vertical"> <com.google.android.setupdesign.view.Illustration - android:id="@+id/suw_layout_decor" + android:id="@+id/sud_layout_decor" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:background="@drawable/suw_layout_background"> + android:background="@drawable/sud_layout_background"> <LinearLayout android:layout_width="match_parent" @@ -35,19 +35,19 @@ android:weightSum="16"> <TextView - android:id="@+id/suw_layout_title" - style="@style/SuwCardTitle" + android:id="@+id/suc_layout_title" + style="@style/SudCardTitle" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/suw_card_land_header_text_margin_top" + android:layout_marginTop="@dimen/sud_card_land_header_text_margin_top" android:layout_weight="6" /> <FrameLayout android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="8" - android:background="?attr/suwCardBackground" - android:elevation="@dimen/suw_card_elevation" + android:background="?attr/sudCardBackground" + android:elevation="@dimen/sud_card_elevation" tools:ignore="UnusedAttribute"> <ListView @@ -64,9 +64,9 @@ </com.google.android.setupdesign.view.Illustration> <com.google.android.setupdesign.view.NavigationBar - android:id="@+id/suw_layout_navigation_bar" - style="@style/SuwNavBarTheme" + android:id="@+id/sud_layout_navigation_bar" + style="@style/SudNavBarTheme" android:layout_width="match_parent" - android:layout_height="@dimen/suw_navbar_height" /> + android:layout_height="@dimen/sud_navbar_height" /> </LinearLayout> diff --git a/main/res/layout/sud_list_template_header.xml b/main/res/layout/sud_list_template_header.xml index 4080675..ba5ca61 100644 --- a/main/res/layout/sud_list_template_header.xml +++ b/main/res/layout/sud_list_template_header.xml @@ -27,12 +27,12 @@ android:layout_height="0dp" android:layout_weight="1" android:clipChildren="false" - app:suwHeader="@layout/sud_list_header" /> + app:sudHeader="@layout/sud_list_header" /> <com.google.android.setupdesign.view.NavigationBar - android:id="@+id/suw_layout_navigation_bar" - style="@style/SuwNavBarTheme" + android:id="@+id/sud_layout_navigation_bar" + style="@style/SudNavBarTheme" android:layout_width="match_parent" - android:layout_height="@dimen/suw_navbar_height" /> + android:layout_height="@dimen/sud_navbar_height" /> </LinearLayout> diff --git a/main/res/layout/sud_list_template_header_collapsed.xml b/main/res/layout/sud_list_template_header_collapsed.xml index 02f4745..f5535ec 100644 --- a/main/res/layout/sud_list_template_header_collapsed.xml +++ b/main/res/layout/sud_list_template_header_collapsed.xml @@ -22,16 +22,16 @@ android:orientation="vertical"> <FrameLayout - android:id="@+id/suw_layout_decor" + android:id="@+id/sud_layout_decor" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/suw_layout_background" - android:elevation="@dimen/suw_title_area_elevation" + android:background="@drawable/sud_layout_background" + android:elevation="@dimen/sud_title_area_elevation" tools:ignore="UnusedAttribute"> <TextView - android:id="@+id/suw_layout_title" - style="@style/SuwHeaderTitle" + android:id="@+id/suc_layout_title" + style="@style/SudHeaderTitle" android:layout_width="match_parent" android:layout_height="wrap_content" /> @@ -46,9 +46,9 @@ android:layout_weight="1" /> <com.google.android.setupdesign.view.NavigationBar - android:id="@+id/suw_layout_navigation_bar" - style="@style/SuwNavBarTheme" + android:id="@+id/sud_layout_navigation_bar" + style="@style/SudNavBarTheme" android:layout_width="match_parent" - android:layout_height="@dimen/suw_navbar_height" /> + android:layout_height="@dimen/sud_navbar_height" /> </LinearLayout> diff --git a/main/res/layout/sud_navbar_view.xml b/main/res/layout/sud_navbar_view.xml index 3e9c6e8..5483104 100644 --- a/main/res/layout/sud_navbar_view.xml +++ b/main/res/layout/sud_navbar_view.xml @@ -19,13 +19,13 @@ xmlns:tools="http://schemas.android.com/tools"> <com.google.android.setupdesign.view.NavigationBarButton - android:id="@+id/suw_navbar_back" - style="@style/SuwNavBarButtonStyle" + android:id="@+id/sud_navbar_back" + style="@style/SudNavBarButtonStyle" android:layout_width="wrap_content" android:layout_height="match_parent" android:contentDescription="@string/sud_back_button_label" - android:drawableLeft="@drawable/suw_navbar_ic_back" - android:drawableStart="@drawable/suw_navbar_ic_back" + android:drawableLeft="@drawable/sud_navbar_ic_back" + android:drawableStart="@drawable/sud_navbar_ic_back" tools:ignore="RtlHardcoded" /> <!-- Ignore RtlHardcoded: drawableLeft is needed for compatibility. Will be overridden by drawableStart on versions that support it. --> @@ -37,13 +37,13 @@ android:visibility="invisible" /> <com.google.android.setupdesign.view.NavigationBarButton - android:id="@+id/suw_navbar_more" - style="@style/SuwNavBarButtonStyle" + android:id="@+id/sud_navbar_more" + style="@style/SudNavBarButtonStyle" android:layout_width="wrap_content" android:layout_height="match_parent" android:contentDescription="@string/sud_more_button_label" - android:drawableEnd="@drawable/suw_navbar_ic_more" - android:drawableRight="@drawable/suw_navbar_ic_more" + android:drawableEnd="@drawable/sud_navbar_ic_more" + android:drawableRight="@drawable/sud_navbar_ic_more" android:gravity="end|center_vertical" android:visibility="gone" tools:ignore="RtlHardcoded" /> @@ -51,12 +51,12 @@ Will be overridden by drawableEnd on versions that support it. --> <com.google.android.setupdesign.view.NavigationBarButton - android:id="@+id/suw_navbar_next" - style="@style/SuwNavBarButtonStyle" + android:id="@+id/sud_navbar_next" + style="@style/SudNavBarButtonStyle" android:layout_width="wrap_content" android:layout_height="match_parent" - android:drawableEnd="@drawable/suw_navbar_ic_next" - android:drawableRight="@drawable/suw_navbar_ic_next" + android:drawableEnd="@drawable/sud_navbar_ic_next" + android:drawableRight="@drawable/sud_navbar_ic_next" android:gravity="end|center_vertical" android:text="@string/sud_next_button_label" tools:ignore="RtlHardcoded" /> diff --git a/main/res/layout/sud_no_scroll_template_card.xml b/main/res/layout/sud_no_scroll_template_card.xml index 8d7ca77..34bfd89 100644 --- a/main/res/layout/sud_no_scroll_template_card.xml +++ b/main/res/layout/sud_no_scroll_template_card.xml @@ -25,22 +25,22 @@ android:orientation="vertical"> <com.google.android.setupdesign.view.Illustration - android:id="@+id/suw_layout_decor" + android:id="@+id/sud_layout_decor" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:background="@drawable/suw_layout_background"> + android:background="@drawable/sud_layout_background"> <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:paddingLeft="@dimen/suw_card_port_margin_sides" - android:paddingRight="@dimen/suw_card_port_margin_sides"> + android:paddingLeft="@dimen/sud_card_port_margin_sides" + android:paddingRight="@dimen/sud_card_port_margin_sides"> <TextView - android:id="@+id/suw_layout_title" - style="@style/SuwCardTitle" + android:id="@+id/suc_layout_title" + style="@style/SudCardTitle" android:layout_width="match_parent" android:layout_height="wrap_content" /> @@ -48,12 +48,12 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:background="?attr/suwCardBackground" - android:elevation="@dimen/suw_card_elevation" + android:background="?attr/sudCardBackground" + android:elevation="@dimen/sud_card_elevation" tools:ignore="UnusedAttribute"> <FrameLayout - android:id="@+id/suw_layout_content" + android:id="@+id/sud_layout_content" android:layout_width="match_parent" android:layout_height="match_parent" /> @@ -66,9 +66,9 @@ </com.google.android.setupdesign.view.Illustration> <com.google.android.setupdesign.view.NavigationBar - android:id="@+id/suw_layout_navigation_bar" - style="@style/SuwNavBarTheme" + android:id="@+id/sud_layout_navigation_bar" + style="@style/SudNavBarTheme" android:layout_width="match_parent" - android:layout_height="@dimen/suw_navbar_height" /> + android:layout_height="@dimen/sud_navbar_height" /> </LinearLayout> diff --git a/main/res/layout/sud_no_scroll_template_card_wide.xml b/main/res/layout/sud_no_scroll_template_card_wide.xml index fca3cc4..32ff896 100644 --- a/main/res/layout/sud_no_scroll_template_card_wide.xml +++ b/main/res/layout/sud_no_scroll_template_card_wide.xml @@ -25,11 +25,11 @@ android:orientation="vertical"> <com.google.android.setupdesign.view.Illustration - android:id="@+id/suw_layout_decor" + android:id="@+id/sud_layout_decor" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:background="@drawable/suw_layout_background"> + android:background="@drawable/sud_layout_background"> <LinearLayout android:layout_width="match_parent" @@ -38,23 +38,23 @@ android:weightSum="16"> <TextView - android:id="@+id/suw_layout_title" - style="@style/SuwCardTitle" + android:id="@+id/suc_layout_title" + style="@style/SudCardTitle" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/suw_card_land_header_text_margin_top" + android:layout_marginTop="@dimen/sud_card_land_header_text_margin_top" android:layout_weight="6" /> <FrameLayout android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="8" - android:background="?attr/suwCardBackground" - android:elevation="@dimen/suw_card_elevation" + android:background="?attr/sudCardBackground" + android:elevation="@dimen/sud_card_elevation" tools:ignore="UnusedAttribute"> <FrameLayout - android:id="@+id/suw_layout_content" + android:id="@+id/sud_layout_content" android:layout_width="match_parent" android:layout_height="match_parent" /> @@ -67,9 +67,9 @@ </com.google.android.setupdesign.view.Illustration> <com.google.android.setupdesign.view.NavigationBar - android:id="@+id/suw_layout_navigation_bar" - style="@style/SuwNavBarTheme" + android:id="@+id/sud_layout_navigation_bar" + style="@style/SudNavBarTheme" android:layout_width="match_parent" - android:layout_height="@dimen/suw_navbar_height" /> + android:layout_height="@dimen/sud_navbar_height" /> </LinearLayout> diff --git a/main/res/layout/sud_no_scroll_template_header.xml b/main/res/layout/sud_no_scroll_template_header.xml index 00cd89c..a5d6bab 100644 --- a/main/res/layout/sud_no_scroll_template_header.xml +++ b/main/res/layout/sud_no_scroll_template_header.xml @@ -33,17 +33,17 @@ android:orientation="vertical"> <com.google.android.setupdesign.view.Illustration - android:id="@+id/suw_layout_decor" + android:id="@+id/sud_layout_decor" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/suw_layout_background" - android:elevation="@dimen/suw_title_area_elevation" + android:background="@drawable/sud_layout_background" + android:elevation="@dimen/sud_title_area_elevation" android:tag="stickyContainer" tools:ignore="UnusedAttribute"> <TextView - android:id="@+id/suw_layout_title" - style="@style/SuwHeaderTitle" + android:id="@+id/suc_layout_title" + style="@style/SudHeaderTitle" android:layout_width="match_parent" android:layout_height="wrap_content" android:tag="sticky" /> @@ -53,7 +53,7 @@ <include layout="@layout/sud_progress_bar_stub" /> <FrameLayout - android:id="@+id/suw_layout_content" + android:id="@+id/sud_layout_content" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" @@ -63,9 +63,9 @@ </LinearLayout> <com.google.android.setupdesign.view.NavigationBar - android:id="@+id/suw_layout_navigation_bar" - style="@style/SuwNavBarTheme" + android:id="@+id/sud_layout_navigation_bar" + style="@style/SudNavBarTheme" android:layout_width="match_parent" - android:layout_height="@dimen/suw_navbar_height" /> + android:layout_height="@dimen/sud_navbar_height" /> </LinearLayout> diff --git a/main/res/layout/sud_no_scroll_template_header_collapsed.xml b/main/res/layout/sud_no_scroll_template_header_collapsed.xml index 1aec162..af50e0a 100644 --- a/main/res/layout/sud_no_scroll_template_header_collapsed.xml +++ b/main/res/layout/sud_no_scroll_template_header_collapsed.xml @@ -25,16 +25,16 @@ android:orientation="vertical"> <FrameLayout - android:id="@+id/suw_layout_decor" + android:id="@+id/sud_layout_decor" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/suw_layout_background" - android:elevation="@dimen/suw_title_area_elevation" + android:background="@drawable/sud_layout_background" + android:elevation="@dimen/sud_title_area_elevation" tools:ignore="UnusedAttribute"> <TextView - android:id="@+id/suw_layout_title" - style="@style/SuwHeaderTitle" + android:id="@+id/suc_layout_title" + style="@style/SudHeaderTitle" android:layout_width="match_parent" android:layout_height="wrap_content" /> @@ -42,15 +42,15 @@ <include layout="@layout/sud_progress_bar_stub" /> - <FrameLayout android:id="@+id/suw_layout_content" + <FrameLayout android:id="@+id/sud_layout_content" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" /> <com.google.android.setupdesign.view.NavigationBar - android:id="@+id/suw_layout_navigation_bar" - style="@style/SuwNavBarTheme" + android:id="@+id/sud_layout_navigation_bar" + style="@style/SudNavBarTheme" android:layout_width="match_parent" - android:layout_height="@dimen/suw_navbar_height" /> + android:layout_height="@dimen/sud_navbar_height" /> </LinearLayout> diff --git a/main/res/layout/sud_preference_recycler_view_header.xml b/main/res/layout/sud_preference_recycler_view_header.xml index db52cd5..17181e7 100644 --- a/main/res/layout/sud_preference_recycler_view_header.xml +++ b/main/res/layout/sud_preference_recycler_view_header.xml @@ -18,9 +18,9 @@ <com.google.android.setupdesign.view.StickyHeaderRecyclerView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/suw_recycler_view" + android:id="@+id/sud_recycler_view" android:layout_width="match_parent" android:layout_height="match_parent" android:clipChildren="false" android:scrollbars="vertical" - app:suwHeader="@layout/sud_list_header" /> + app:sudHeader="@layout/sud_list_header" /> diff --git a/main/res/layout/sud_preference_recycler_view_normal.xml b/main/res/layout/sud_preference_recycler_view_normal.xml index 088a35c..66b8e4c 100644 --- a/main/res/layout/sud_preference_recycler_view_normal.xml +++ b/main/res/layout/sud_preference_recycler_view_normal.xml @@ -17,7 +17,7 @@ <androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/suw_recycler_view" + android:id="@+id/sud_recycler_view" android:layout_width="match_parent" android:layout_height="match_parent" android:scrollbars="vertical" /> diff --git a/main/res/layout/sud_preference_template_header.xml b/main/res/layout/sud_preference_template_header.xml index 61c2daf..a0f75fe 100644 --- a/main/res/layout/sud_preference_template_header.xml +++ b/main/res/layout/sud_preference_template_header.xml @@ -21,15 +21,15 @@ android:orientation="vertical"> <FrameLayout - android:id="@+id/suw_layout_content" + android:id="@+id/sud_layout_content" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" /> <com.google.android.setupdesign.view.NavigationBar - android:id="@+id/suw_layout_navigation_bar" - style="@style/SuwNavBarTheme" + android:id="@+id/sud_layout_navigation_bar" + style="@style/SudNavBarTheme" android:layout_width="match_parent" - android:layout_height="@dimen/suw_navbar_height" /> + android:layout_height="@dimen/sud_navbar_height" /> </LinearLayout> diff --git a/main/res/layout/sud_progress_bar.xml b/main/res/layout/sud_progress_bar.xml index 35e0faf..3e05adb 100644 --- a/main/res/layout/sud_progress_bar.xml +++ b/main/res/layout/sud_progress_bar.xml @@ -20,6 +20,6 @@ style="@style/Widget.AppCompat.ProgressBar.Horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/suw_progress_bar_margin_vertical" - android:layout_marginTop="@dimen/suw_progress_bar_margin_vertical" + android:layout_marginBottom="@dimen/sud_progress_bar_margin_vertical" + android:layout_marginTop="@dimen/sud_progress_bar_margin_vertical" android:indeterminate="true" /> diff --git a/main/res/layout/sud_progress_bar_stub.xml b/main/res/layout/sud_progress_bar_stub.xml index 917a242..3ef13c8 100644 --- a/main/res/layout/sud_progress_bar_stub.xml +++ b/main/res/layout/sud_progress_bar_stub.xml @@ -16,10 +16,10 @@ --> <ViewStub xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/suw_layout_progress_stub" + android:id="@+id/sud_layout_progress_stub" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/suw_progress_bar_margin_vertical" - android:layout_marginTop="@dimen/suw_progress_bar_margin_vertical" - android:inflatedId="@+id/suw_layout_progress" + android:layout_marginBottom="@dimen/sud_progress_bar_margin_vertical" + android:layout_marginTop="@dimen/sud_progress_bar_margin_vertical" + android:inflatedId="@+id/sud_layout_progress" android:layout="@layout/sud_progress_bar" /> diff --git a/main/res/layout/sud_recycler_template_card.xml b/main/res/layout/sud_recycler_template_card.xml index 86c66d1..39968bd 100644 --- a/main/res/layout/sud_recycler_template_card.xml +++ b/main/res/layout/sud_recycler_template_card.xml @@ -22,22 +22,22 @@ android:orientation="vertical"> <com.google.android.setupdesign.view.Illustration - android:id="@+id/suw_layout_decor" + android:id="@+id/sud_layout_decor" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:background="@drawable/suw_layout_background"> + android:background="@drawable/sud_layout_background"> <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:paddingLeft="@dimen/suw_card_port_margin_sides" - android:paddingRight="@dimen/suw_card_port_margin_sides"> + android:paddingLeft="@dimen/sud_card_port_margin_sides" + android:paddingRight="@dimen/sud_card_port_margin_sides"> <TextView - android:id="@+id/suw_layout_title" - style="@style/SuwCardTitle" + android:id="@+id/suc_layout_title" + style="@style/SudCardTitle" android:layout_width="match_parent" android:layout_height="wrap_content" /> @@ -45,18 +45,18 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:background="?attr/suwCardBackground" - android:elevation="@dimen/suw_card_elevation" + android:background="?attr/sudCardBackground" + android:elevation="@dimen/sud_card_elevation" tools:ignore="UnusedAttribute"> <androidx.recyclerview.widget.RecyclerView - android:id="@+id/suw_recycler_view" + android:id="@+id/sud_recycler_view" android:layout_width="match_parent" android:layout_height="match_parent" android:scrollbars="vertical" /> <FrameLayout - android:id="@+id/suw_layout_content" + android:id="@+id/sud_layout_content" android:layout_width="match_parent" android:layout_height="match_parent" /> @@ -69,9 +69,9 @@ </com.google.android.setupdesign.view.Illustration> <com.google.android.setupdesign.view.NavigationBar - android:id="@+id/suw_layout_navigation_bar" - style="@style/SuwNavBarTheme" + android:id="@+id/sud_layout_navigation_bar" + style="@style/SudNavBarTheme" android:layout_width="match_parent" - android:layout_height="@dimen/suw_navbar_height" /> + android:layout_height="@dimen/sud_navbar_height" /> </LinearLayout> diff --git a/main/res/layout/sud_recycler_template_card_wide.xml b/main/res/layout/sud_recycler_template_card_wide.xml index 1d25bb3..01dfcd1 100644 --- a/main/res/layout/sud_recycler_template_card_wide.xml +++ b/main/res/layout/sud_recycler_template_card_wide.xml @@ -22,11 +22,11 @@ android:orientation="vertical"> <com.google.android.setupdesign.view.Illustration - android:id="@+id/suw_layout_decor" + android:id="@+id/sud_layout_decor" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:background="@drawable/suw_layout_background"> + android:background="@drawable/sud_layout_background"> <LinearLayout android:layout_width="match_parent" @@ -35,29 +35,29 @@ android:weightSum="16"> <TextView - android:id="@+id/suw_layout_title" - style="@style/SuwCardTitle" + android:id="@+id/suc_layout_title" + style="@style/SudCardTitle" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/suw_card_land_header_text_margin_top" + android:layout_marginTop="@dimen/sud_card_land_header_text_margin_top" android:layout_weight="6" /> <FrameLayout android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="8" - android:background="?attr/suwCardBackground" - android:elevation="@dimen/suw_card_elevation" + android:background="?attr/sudCardBackground" + android:elevation="@dimen/sud_card_elevation" tools:ignore="UnusedAttribute"> <androidx.recyclerview.widget.RecyclerView - android:id="@+id/suw_recycler_view" + android:id="@+id/sud_recycler_view" android:layout_width="match_parent" android:layout_height="match_parent" android:scrollbars="vertical" /> <FrameLayout - android:id="@+id/suw_layout_content" + android:id="@+id/sud_layout_content" android:layout_width="match_parent" android:layout_height="match_parent" /> @@ -70,9 +70,9 @@ </com.google.android.setupdesign.view.Illustration> <com.google.android.setupdesign.view.NavigationBar - android:id="@+id/suw_layout_navigation_bar" - style="@style/SuwNavBarTheme" + android:id="@+id/sud_layout_navigation_bar" + style="@style/SudNavBarTheme" android:layout_width="match_parent" - android:layout_height="@dimen/suw_navbar_height" /> + android:layout_height="@dimen/sud_navbar_height" /> </LinearLayout> diff --git a/main/res/layout/sud_recycler_template_header.xml b/main/res/layout/sud_recycler_template_header.xml index 3cab166..b685fbb 100644 --- a/main/res/layout/sud_recycler_template_header.xml +++ b/main/res/layout/sud_recycler_template_header.xml @@ -22,18 +22,18 @@ android:orientation="vertical"> <com.google.android.setupdesign.view.StickyHeaderRecyclerView - android:id="@+id/suw_recycler_view" + android:id="@+id/sud_recycler_view" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" android:clipChildren="false" android:scrollbars="vertical" - app:suwHeader="@layout/sud_list_header" /> + app:sudHeader="@layout/sud_list_header" /> <com.google.android.setupdesign.view.NavigationBar - android:id="@+id/suw_layout_navigation_bar" - style="@style/SuwNavBarTheme" + android:id="@+id/sud_layout_navigation_bar" + style="@style/SudNavBarTheme" android:layout_width="match_parent" - android:layout_height="@dimen/suw_navbar_height" /> + android:layout_height="@dimen/sud_navbar_height" /> </LinearLayout> diff --git a/main/res/layout/sud_recycler_template_header_collapsed.xml b/main/res/layout/sud_recycler_template_header_collapsed.xml index 973f5e0..3aecacb 100644 --- a/main/res/layout/sud_recycler_template_header_collapsed.xml +++ b/main/res/layout/sud_recycler_template_header_collapsed.xml @@ -22,16 +22,16 @@ android:orientation="vertical"> <FrameLayout - android:id="@+id/suw_layout_decor" + android:id="@+id/sud_layout_decor" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/suw_layout_background" - android:elevation="@dimen/suw_title_area_elevation" + android:background="@drawable/sud_layout_background" + android:elevation="@dimen/sud_title_area_elevation" tools:ignore="UnusedAttribute"> <TextView - android:id="@+id/suw_layout_title" - style="@style/SuwHeaderTitle" + android:id="@+id/suc_layout_title" + style="@style/SudHeaderTitle" android:layout_width="match_parent" android:layout_height="wrap_content" /> @@ -45,21 +45,21 @@ android:layout_weight="1"> <androidx.recyclerview.widget.RecyclerView - android:id="@+id/suw_recycler_view" + android:id="@+id/sud_recycler_view" android:layout_width="match_parent" android:layout_height="match_parent" android:scrollbars="vertical" /> - <FrameLayout android:id="@+id/suw_layout_content" + <FrameLayout android:id="@+id/sud_layout_content" android:layout_width="match_parent" android:layout_height="match_parent" /> </FrameLayout> <com.google.android.setupdesign.view.NavigationBar - android:id="@+id/suw_layout_navigation_bar" - style="@style/SuwNavBarTheme" + android:id="@+id/sud_layout_navigation_bar" + style="@style/SudNavBarTheme" android:layout_width="match_parent" - android:layout_height="@dimen/suw_navbar_height" /> + android:layout_height="@dimen/sud_navbar_height" /> </LinearLayout> diff --git a/main/res/layout/sud_template_card.xml b/main/res/layout/sud_template_card.xml index ea6717d..428b806 100644 --- a/main/res/layout/sud_template_card.xml +++ b/main/res/layout/sud_template_card.xml @@ -22,22 +22,22 @@ android:orientation="vertical"> <com.google.android.setupdesign.view.Illustration - android:id="@+id/suw_layout_decor" + android:id="@+id/sud_layout_decor" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:background="@drawable/suw_layout_background"> + android:background="@drawable/sud_layout_background"> <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:paddingLeft="@dimen/suw_card_port_margin_sides" - android:paddingRight="@dimen/suw_card_port_margin_sides"> + android:paddingLeft="@dimen/sud_card_port_margin_sides" + android:paddingRight="@dimen/sud_card_port_margin_sides"> <TextView - android:id="@+id/suw_layout_title" - style="@style/SuwCardTitle" + android:id="@+id/suc_layout_title" + style="@style/SudCardTitle" android:layout_width="match_parent" android:layout_height="wrap_content" /> @@ -45,18 +45,18 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:background="?attr/suwCardBackground" - android:elevation="@dimen/suw_card_elevation" + android:background="?attr/sudCardBackground" + android:elevation="@dimen/sud_card_elevation" tools:ignore="UnusedAttribute"> <com.google.android.setupdesign.view.BottomScrollView - android:id="@+id/suw_bottom_scroll_view" + android:id="@+id/sud_bottom_scroll_view" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true"> <FrameLayout - android:id="@+id/suw_layout_content" + android:id="@+id/sud_layout_content" android:layout_width="match_parent" android:layout_height="wrap_content" android:clipChildren="false" /> @@ -72,9 +72,9 @@ </com.google.android.setupdesign.view.Illustration> <com.google.android.setupdesign.view.NavigationBar - android:id="@+id/suw_layout_navigation_bar" - style="@style/SuwNavBarTheme" + android:id="@+id/sud_layout_navigation_bar" + style="@style/SudNavBarTheme" android:layout_width="match_parent" - android:layout_height="@dimen/suw_navbar_height" /> + android:layout_height="@dimen/sud_navbar_height" /> </LinearLayout> diff --git a/main/res/layout/sud_template_card_wide.xml b/main/res/layout/sud_template_card_wide.xml index 1eabc3b..3b57da2 100644 --- a/main/res/layout/sud_template_card_wide.xml +++ b/main/res/layout/sud_template_card_wide.xml @@ -22,11 +22,11 @@ android:orientation="vertical"> <com.google.android.setupdesign.view.Illustration - android:id="@+id/suw_layout_decor" + android:id="@+id/sud_layout_decor" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:background="@drawable/suw_layout_background"> + android:background="@drawable/sud_layout_background"> <LinearLayout android:layout_width="match_parent" @@ -35,28 +35,28 @@ android:weightSum="16"> <TextView - android:id="@+id/suw_layout_title" - style="@style/SuwCardTitle" + android:id="@+id/suc_layout_title" + style="@style/SudCardTitle" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/suw_card_land_header_text_margin_top" + android:layout_marginTop="@dimen/sud_card_land_header_text_margin_top" android:layout_weight="6" /> <FrameLayout android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="8" - android:background="?attr/suwCardBackground" - android:elevation="@dimen/suw_card_elevation" + android:background="?attr/sudCardBackground" + android:elevation="@dimen/sud_card_elevation" tools:ignore="UnusedAttribute"> <com.google.android.setupdesign.view.BottomScrollView - android:id="@+id/suw_bottom_scroll_view" + android:id="@+id/sud_bottom_scroll_view" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true"> - <FrameLayout android:id="@+id/suw_layout_content" + <FrameLayout android:id="@+id/sud_layout_content" android:layout_width="match_parent" android:layout_height="wrap_content" android:clipChildren="false" /> @@ -72,9 +72,9 @@ </com.google.android.setupdesign.view.Illustration> <com.google.android.setupdesign.view.NavigationBar - android:id="@+id/suw_layout_navigation_bar" - style="@style/SuwNavBarTheme" + android:id="@+id/sud_layout_navigation_bar" + style="@style/SudNavBarTheme" android:layout_width="match_parent" - android:layout_height="@dimen/suw_navbar_height" /> + android:layout_height="@dimen/sud_navbar_height" /> </LinearLayout> diff --git a/main/res/layout/sud_template_header.xml b/main/res/layout/sud_template_header.xml index 634be13..bcbe41a 100644 --- a/main/res/layout/sud_template_header.xml +++ b/main/res/layout/sud_template_header.xml @@ -22,7 +22,7 @@ android:orientation="vertical"> <com.google.android.setupdesign.view.StickyHeaderScrollView - android:id="@+id/suw_bottom_scroll_view" + android:id="@+id/sud_bottom_scroll_view" android:layout_weight="1" android:layout_width="match_parent" android:layout_height="0dp" @@ -34,30 +34,30 @@ android:clipChildren="false"> <FrameLayout - android:id="@+id/suw_layout_content" + android:id="@+id/sud_layout_content" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_below="@+id/suw_layout_header" /> + android:layout_below="@+id/sud_layout_header" /> <LinearLayout - android:id="@+id/suw_layout_header" + android:id="@+id/sud_layout_header" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:tag="stickyContainer"> <com.google.android.setupdesign.view.Illustration - android:id="@+id/suw_layout_decor" + android:id="@+id/sud_layout_decor" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/suw_layout_background" - android:elevation="@dimen/suw_title_area_elevation" + android:background="@drawable/sud_layout_background" + android:elevation="@dimen/sud_title_area_elevation" android:orientation="vertical" tools:ignore="UnusedAttribute"> <TextView - android:id="@+id/suw_layout_title" - style="@style/SuwHeaderTitle" + android:id="@+id/suc_layout_title" + style="@style/SudHeaderTitle" android:layout_width="match_parent" android:layout_height="wrap_content" android:tag="sticky" /> @@ -73,9 +73,9 @@ </com.google.android.setupdesign.view.StickyHeaderScrollView> <com.google.android.setupdesign.view.NavigationBar - android:id="@+id/suw_layout_navigation_bar" - style="@style/SuwNavBarTheme" + android:id="@+id/sud_layout_navigation_bar" + style="@style/SudNavBarTheme" android:layout_width="match_parent" - android:layout_height="@dimen/suw_navbar_height" /> + android:layout_height="@dimen/sud_navbar_height" /> </LinearLayout> diff --git a/main/res/layout/sud_template_header_collapsed.xml b/main/res/layout/sud_template_header_collapsed.xml index 48003ab..420df04 100644 --- a/main/res/layout/sud_template_header_collapsed.xml +++ b/main/res/layout/sud_template_header_collapsed.xml @@ -22,38 +22,38 @@ android:orientation="vertical"> <FrameLayout - android:id="@+id/suw_layout_decor" + android:id="@+id/sud_layout_decor" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/suw_layout_background" - android:elevation="@dimen/suw_title_area_elevation" + android:background="@drawable/sud_layout_background" + android:elevation="@dimen/sud_title_area_elevation" tools:ignore="UnusedAttribute"> <TextView - android:id="@+id/suw_layout_title" - style="@style/SuwHeaderTitle" + android:id="@+id/suc_layout_title" + style="@style/SudHeaderTitle" android:layout_width="match_parent" android:layout_height="wrap_content" /> </FrameLayout> <ViewStub - android:id="@+id/suw_layout_progress_stub" + android:id="@+id/sud_layout_progress_stub" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/suw_progress_bar_margin_vertical" - android:layout_marginTop="@dimen/suw_progress_bar_margin_vertical" - android:inflatedId="@+id/suw_layout_progress" + android:layout_marginBottom="@dimen/sud_progress_bar_margin_vertical" + android:layout_marginTop="@dimen/sud_progress_bar_margin_vertical" + android:inflatedId="@+id/sud_layout_progress" android:layout="@layout/sud_progress_bar" /> <com.google.android.setupdesign.view.BottomScrollView - android:id="@+id/suw_bottom_scroll_view" + android:id="@+id/sud_bottom_scroll_view" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" android:fillViewport="true"> - <FrameLayout android:id="@+id/suw_layout_content" + <FrameLayout android:id="@+id/sud_layout_content" android:layout_width="match_parent" android:layout_height="wrap_content" android:clipChildren="false" /> @@ -61,9 +61,9 @@ </com.google.android.setupdesign.view.BottomScrollView> <com.google.android.setupdesign.view.NavigationBar - android:id="@+id/suw_layout_navigation_bar" - style="@style/SuwNavBarTheme" + android:id="@+id/sud_layout_navigation_bar" + style="@style/SudNavBarTheme" android:layout_width="match_parent" - android:layout_height="@dimen/suw_navbar_height" /> + android:layout_height="@dimen/sud_navbar_height" /> </LinearLayout> diff --git a/main/res/values-land/dimens.xml b/main/res/values-land/dimens.xml index 5091624..88a97be 100644 --- a/main/res/values-land/dimens.xml +++ b/main/res/values-land/dimens.xml @@ -18,19 +18,19 @@ <resources> <!-- Card layout (for tablets) --> - <dimen name="suw_card_title_padding_end">32dp</dimen> - <dimen name="suw_card_title_padding_start">56dp</dimen> - <dimen name="suw_card_title_padding_top">24dp</dimen> - <dimen name="suw_card_title_padding_bottom">0dp</dimen> + <dimen name="sud_card_title_padding_end">32dp</dimen> + <dimen name="sud_card_title_padding_start">56dp</dimen> + <dimen name="sud_card_title_padding_top">24dp</dimen> + <dimen name="sud_card_title_padding_bottom">0dp</dimen> <!-- Decor view (illustration or the header without illustration) --> - <dimen name="suw_decor_padding_top">0dp</dimen> + <dimen name="sud_decor_padding_top">0dp</dimen> <!-- GLIF card layout (for tablets) --> - <dimen name="suw_glif_card_width">672dp</dimen> - <dimen name="suw_glif_card_height">560dp</dimen> + <dimen name="sud_glif_card_width">672dp</dimen> + <dimen name="sud_glif_card_height">560dp</dimen> <!-- Illustration --> - <item name="suw_illustration_aspect_ratio" format="float" type="dimen">0</item> + <item name="sud_illustration_aspect_ratio" format="float" type="dimen">0</item> </resources> diff --git a/main/res/values-land/styles.xml b/main/res/values-land/styles.xml index 536a1dc..fabc071 100644 --- a/main/res/values-land/styles.xml +++ b/main/res/values-land/styles.xml @@ -19,8 +19,8 @@ <!-- Card layout (for tablets) --> - <style name="SuwCardTitle" parent="SuwBaseCardTitle"> + <style name="SudCardTitle" parent="SudBaseCardTitle"> <item name="android:maxLines">6</item> </style> -</resources>
\ No newline at end of file +</resources> diff --git a/main/res/values-night/styles.xml b/main/res/values-night/styles.xml index 912e149..ca94c12 100644 --- a/main/res/values-night/styles.xml +++ b/main/res/values-night/styles.xml @@ -18,9 +18,9 @@ <resources> <!-- DayNight themes --> - <style name="SuwThemeMaterial.DayNight" parent="SuwThemeMaterial" /> - <style name="SuwThemeGlif.DayNight" parent="SuwThemeGlif" /> - <style name="SuwThemeGlifV2.DayNight" parent="SuwThemeGlifV2" /> - <style name="SuwThemeGlifV3.DayNight" parent="SuwThemeGlifV3" /> + <style name="SudThemeMaterial.DayNight" parent="SudThemeMaterial" /> + <style name="SudThemeGlif.DayNight" parent="SudThemeGlif" /> + <style name="SudThemeGlifV2.DayNight" parent="SudThemeGlifV2" /> + <style name="SudThemeGlifV3.DayNight" parent="SudThemeGlifV3" /> </resources> diff --git a/main/res/values-sw360dp/dimens.xml b/main/res/values-sw360dp/dimens.xml index 9ed9a82..2b3ee19 100644 --- a/main/res/values-sw360dp/dimens.xml +++ b/main/res/values-sw360dp/dimens.xml @@ -16,5 +16,5 @@ --> <resources> - <dimen name="suw_description_text_size">16sp</dimen> + <dimen name="sud_description_text_size">16sp</dimen> </resources> diff --git a/main/res/values-sw600dp-land/dimens.xml b/main/res/values-sw600dp-land/dimens.xml index 57b7e3e..d68c884 100644 --- a/main/res/values-sw600dp-land/dimens.xml +++ b/main/res/values-sw600dp-land/dimens.xml @@ -18,9 +18,9 @@ <resources> <!-- Decor view (illustration or the header without illustration) --> - <dimen name="suw_decor_padding_top">128dp</dimen> + <dimen name="sud_decor_padding_top">128dp</dimen> <!-- Illustration --> - <item name="suw_illustration_aspect_ratio" format="float" type="dimen">0.0</item> + <item name="sud_illustration_aspect_ratio" format="float" type="dimen">0.0</item> </resources> diff --git a/main/res/values-sw600dp/config.xml b/main/res/values-sw600dp/config.xml index 0cbd5a8..4bac4c9 100644 --- a/main/res/values-sw600dp/config.xml +++ b/main/res/values-sw600dp/config.xml @@ -18,6 +18,6 @@ <resources> <!-- Whether to use tablet layout --> - <bool name="suwUseTabletLayout">true</bool> + <bool name="sudUseTabletLayout">true</bool> </resources> diff --git a/main/res/values-sw600dp/dimens.xml b/main/res/values-sw600dp/dimens.xml index d1734ab..bf9e1e9 100644 --- a/main/res/values-sw600dp/dimens.xml +++ b/main/res/values-sw600dp/dimens.xml @@ -18,23 +18,23 @@ <resources> <!-- General --> - <!-- Calculated by (suw_glif_margin_sides - 4dp internal padding of button) --> - <dimen name="suw_glif_button_margin_end">36dp</dimen> - <!-- Calculated by (suw_glif_margin_sides - suw_glif_button_padding) --> - <dimen name="suw_glif_button_margin_start">24dp</dimen> - <dimen name="suw_glif_margin_sides">40dp</dimen> + <!-- Calculated by (sud_glif_margin_sides - 4dp internal padding of button) --> + <dimen name="sud_glif_button_margin_end">36dp</dimen> + <!-- Calculated by (sud_glif_margin_sides - sud_glif_button_padding) --> + <dimen name="sud_glif_button_margin_start">24dp</dimen> + <dimen name="sud_glif_margin_sides">40dp</dimen> <!-- Decor view (illustration or the header without illustration) --> - <dimen name="suw_decor_padding_top">256dp</dimen> + <dimen name="sud_decor_padding_top">256dp</dimen> <!-- Illustration --> - <item name="suw_illustration_aspect_ratio" format="float" type="dimen">0</item> - <dimen name="suw_header_title_size">34sp</dimen> + <item name="sud_illustration_aspect_ratio" format="float" type="dimen">0</item> + <dimen name="sud_header_title_size">34sp</dimen> <!-- Items --> - <dimen name="suw_items_icon_divider_inset">88dp</dimen> - <dimen name="suw_items_text_divider_inset">40dp</dimen> - <dimen name="suw_items_glif_icon_divider_inset">88dp</dimen> - <dimen name="suw_items_glif_text_divider_inset">40dp</dimen> + <dimen name="sud_items_icon_divider_inset">88dp</dimen> + <dimen name="sud_items_text_divider_inset">40dp</dimen> + <dimen name="sud_items_glif_icon_divider_inset">88dp</dimen> + <dimen name="sud_items_glif_text_divider_inset">40dp</dimen> </resources> diff --git a/main/res/values-v11/styles.xml b/main/res/values-v11/styles.xml index 6903577..301a9d4 100644 --- a/main/res/values-v11/styles.xml +++ b/main/res/values-v11/styles.xml @@ -17,6 +17,6 @@ <resources> - <style name="SuwBase.ProgressBarLarge" parent="@android:style/Widget.Holo.ProgressBar.Large" /> + <style name="SudBase.ProgressBarLarge" parent="@android:style/Widget.Holo.ProgressBar.Large" /> </resources> diff --git a/main/res/values-v21/styles.xml b/main/res/values-v21/styles.xml index eb36cb8..3613533 100644 --- a/main/res/values-v21/styles.xml +++ b/main/res/values-v21/styles.xml @@ -19,87 +19,87 @@ <!-- Content styles --> - <style name="TextAppearance.SuwDescription" parent="android:TextAppearance.Material.Medium"> + <style name="TextAppearance.SudDescription" parent="android:TextAppearance.Material.Medium"> <item name="android:textColor">?android:attr/textColorPrimary</item> - <item name="android:textSize">@dimen/suw_description_text_size</item> + <item name="android:textSize">@dimen/sud_description_text_size</item> </style> <!-- Card layout (for tablets) --> - <style name="TextAppearance.SuwCardTitle" parent="@android:style/TextAppearance.Material.Display1"> + <style name="TextAppearance.SudCardTitle" parent="@android:style/TextAppearance.Material.Display1"> <item name="android:textColor">@android:color/white</item> </style> <!-- GLIF Card layout (for tablets) --> - <style name="SuwGlifCardBackground"> + <style name="SudGlifCardBackground"> <item name="android:background">?android:attr/colorPrimary</item> </style> <!-- Button styles --> - <style name="SuwBase.ProgressBarLarge" parent="@android:style/Widget.Material.ProgressBar.Large" /> + <style name="SudBase.ProgressBarLarge" parent="@android:style/Widget.Material.ProgressBar.Large" /> - <style name="SuwFourColorIndeterminateProgressBar" parent="SuwBase.ProgressBarLarge"> + <style name="SudFourColorIndeterminateProgressBar" parent="SudBase.ProgressBarLarge"> <item name="android:layout_gravity">center</item> <item name="android:indeterminate">true</item> - <item name="android:indeterminateDrawable">@drawable/suw_fourcolor_progress_bar</item> + <item name="android:indeterminateDrawable">@drawable/sud_fourcolor_progress_bar</item> <item name="android:indeterminateTint">@null</item> <item name="android:indeterminateTintMode">@null</item> - <item name="android:paddingStart">@dimen/suw_glif_progress_bar_padding</item> - <item name="android:paddingEnd">@dimen/suw_glif_progress_bar_padding</item> + <item name="android:paddingStart">@dimen/sud_glif_progress_bar_padding</item> + <item name="android:paddingEnd">@dimen/sud_glif_progress_bar_padding</item> </style> <!-- Items styles --> - <style name="SuwItemContainer"> + <style name="SudItemContainer"> <item name="android:minHeight">?android:attr/listPreferredItemHeight</item> - <item name="android:paddingBottom">@dimen/suw_items_padding_vertical</item> + <item name="android:paddingBottom">@dimen/sud_items_padding_vertical</item> <item name="android:paddingEnd">?android:attr/listPreferredItemPaddingEnd</item> <item name="android:paddingStart">?android:attr/listPreferredItemPaddingStart</item> - <item name="android:paddingTop">@dimen/suw_items_padding_vertical</item> + <item name="android:paddingTop">@dimen/sud_items_padding_vertical</item> </style> - <style name="SuwItemTitle"> + <style name="SudItemTitle"> <item name="android:textAppearance">?android:attr/textAppearanceListItem</item> </style> - <style name="SuwItemSummary"> + <style name="SudItemSummary"> <item name="android:textAppearance">?android:attr/textAppearanceListItemSmall</item> </style> <!-- Navigation bar styles --> - <style name="SuwNavBarButtonStyle" parent="@android:style/Widget.Material.Button.Borderless"> - <item name="android:background">?attr/suwNavBarButtonBackground</item> + <style name="SudNavBarButtonStyle" parent="@android:style/Widget.Material.Button.Borderless"> + <item name="android:background">?attr/sudNavBarButtonBackground</item> <item name="android:fontFamily">sans-serif</item> <item name="android:minWidth">0dp</item> - <item name="android:paddingLeft">@dimen/suw_navbar_button_padding_sides</item> - <item name="android:paddingRight">@dimen/suw_navbar_button_padding_sides</item> + <item name="android:paddingLeft">@dimen/sud_navbar_button_padding_sides</item> + <item name="android:paddingRight">@dimen/sud_navbar_button_padding_sides</item> <item name="android:textAllCaps">true</item> - <item name="android:textColor">?attr/suwNavBarTextColor</item> - <item name="android:textSize">@dimen/suw_navbar_text_size</item> + <item name="android:textColor">?attr/sudNavBarTextColor</item> + <item name="android:textSize">@dimen/sud_navbar_text_size</item> </style> - <style name="SuwNavBarThemeDark" parent="SuwNavBarTheme"> - <item name="suwNavBarBackgroundColor">@color/suw_navbar_bg_dark</item> - <item name="suwNavBarButtonBackground">@drawable/suw_navbar_btn_bg</item> + <style name="SudNavBarThemeDark" parent="SudNavBarTheme"> + <item name="sudNavBarBackgroundColor">@color/sud_navbar_bg_dark</item> + <item name="sudNavBarButtonBackground">@drawable/sud_navbar_btn_bg</item> </style> - <style name="SuwNavBarThemeLight" parent="SuwNavBarTheme"> - <item name="suwNavBarBackgroundColor">@color/suw_navbar_bg_light</item> - <item name="suwNavBarButtonBackground">@drawable/suw_navbar_btn_bg</item> + <style name="SudNavBarThemeLight" parent="SudNavBarTheme"> + <item name="sudNavBarBackgroundColor">@color/sud_navbar_bg_light</item> + <item name="sudNavBarButtonBackground">@drawable/sud_navbar_btn_bg</item> </style> - <style name="SuwEditText" parent="@android:style/Widget.Material.EditText"> - <item name="android:background">@drawable/suw_edittext_bg</item> - <item name="android:minHeight">@dimen/suw_edit_text_min_height</item> - <item name="android:paddingLeft">@dimen/suw_edit_text_padding_horizontal</item> - <item name="android:paddingRight">@dimen/suw_edit_text_padding_horizontal</item> + <style name="SudEditText" parent="@android:style/Widget.Material.EditText"> + <item name="android:background">@drawable/sud_edittext_bg</item> + <item name="android:minHeight">@dimen/sud_edit_text_min_height</item> + <item name="android:paddingLeft">@dimen/sud_edit_text_padding_horizontal</item> + <item name="android:paddingRight">@dimen/sud_edit_text_padding_horizontal</item> </style> <!-- Button styles --> - <style name="SuwGlifButton.Tertiary" parent="SuwGlifButton.BaseTertiary"> + <style name="SudGlifButton.Tertiary" parent="SudGlifButton.BaseTertiary"> <item name="android:fontFamily">sans-serif-medium</item> <item name="textAllCaps" tools:targetApi="ice_cream_sandwich">false</item> </style> diff --git a/main/res/values-v22/styles.xml b/main/res/values-v22/styles.xml index 7d2d219..2cf0927 100644 --- a/main/res/values-v22/styles.xml +++ b/main/res/values-v22/styles.xml @@ -17,7 +17,7 @@ <resources> - <style name="SuwAlertDialogTheme" parent="android:Theme.DeviceDefault.Dialog.Alert" /> + <style name="SudAlertDialogTheme" parent="android:Theme.DeviceDefault.Dialog.Alert" /> - <style name="SuwAlertDialogTheme.Light" parent="android:Theme.DeviceDefault.Light.Dialog.Alert" /> -</resources>
\ No newline at end of file + <style name="SudAlertDialogTheme.Light" parent="android:Theme.DeviceDefault.Light.Dialog.Alert" /> +</resources> diff --git a/main/res/values-v27/styles.xml b/main/res/values-v27/styles.xml index cc81ef5..1815c82 100644 --- a/main/res/values-v27/styles.xml +++ b/main/res/values-v27/styles.xml @@ -20,10 +20,10 @@ <!-- Not needed for dark theme, as default nav bar bg color is black. We need a separate style override here since windowLightNavigationBar is new in v27, and these two styles need to be applied together as a unit. --> - <style name="SuwThemeGlifV3.Light" parent="SuwBaseThemeGlifV3.Light"> - <item name="android:navigationBarColor">@color/suw_glif_v3_nav_bar_color_light</item> + <style name="SudThemeGlifV3.Light" parent="SudBaseThemeGlifV3.Light"> + <item name="android:navigationBarColor">@color/sud_glif_v3_nav_bar_color_light</item> <!-- Ignore NewApi: For some reason lint seems to think this API is new in v28 (b/73514594) --> - <item name="android:navigationBarDividerColor" tools:ignore="NewApi">@color/suw_glif_v3_nav_bar_divider_color_light</item> + <item name="android:navigationBarDividerColor" tools:ignore="NewApi">@color/sud_glif_v3_nav_bar_divider_color_light</item> <!-- Ignore NewApi: For some reason lint seems to think this API is new in v28 (b/73514594) --> <item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item> <item name="sucSystemNavBarWindowLight" tools:ignore="NewApi">?android:attr/windowLightNavigationBar</item> diff --git a/main/res/values/attrs.xml b/main/res/values/attrs.xml index 48d4a08..c3fcaf2 100644 --- a/main/res/values/attrs.xml +++ b/main/res/values/attrs.xml @@ -18,14 +18,14 @@ <resources> <!-- Theme attributes --> - <attr name="suwLayoutTheme" format="reference" /> - <attr name="suwMarginSides" format="dimension|reference" /> - <attr name="suwEditTextBackgroundColor" format="color" /> - <attr name="suwButtonHighlightAlpha" format="float" /> + <attr name="sudLayoutTheme" format="reference" /> + <attr name="sudMarginSides" format="dimension|reference" /> + <attr name="sudEditTextBackgroundColor" format="color" /> + <attr name="sudButtonHighlightAlpha" format="float" /> <!-- Subset of values in "gravity" in frameworks/base/core/res/res/values/attrs.xml. Only horizontal values are listed here as the header does not support vertical gravity. --> - <attr name="suwGlifHeaderGravity"> + <attr name="sudGlifHeaderGravity"> <!-- Push object to the left of its container, not changing its size. --> <flag name="left" value="0x03" /> <!-- Push object to the right of its container, not changing its size. --> @@ -39,25 +39,25 @@ <!-- Push object to the end of its container, not changing its size. --> <flag name="end" value="0x00800005" /> </attr> - <attr name="suwGlifIconStyle" format="reference" /> + <attr name="sudGlifIconStyle" format="reference" /> - <attr name="suwButtonAllCaps" format="boolean" /> - <attr name="suwButtonCornerRadius" format="dimension" /> - <attr name="suwButtonFontFamily" format="string|reference" /> - <attr name="suwCardBackground" format="color|reference" /> - <attr name="suwDividerCondition"> + <attr name="sudButtonAllCaps" format="boolean" /> + <attr name="sudButtonCornerRadius" format="dimension" /> + <attr name="sudButtonFontFamily" format="string|reference" /> + <attr name="sudCardBackground" format="color|reference" /> + <attr name="sudDividerCondition"> <enum name="either" value="0" /> <enum name="both" value="1" /> </attr> - <attr name="suwFillContentLayoutStyle" format="reference" /> - <attr name="suwListItemIconColor" format="color" /> - <attr name="suwNavBarBackgroundColor" format="color" /> - <attr name="suwNavBarButtonBackground" format="color|reference" /> - <attr name="suwNavBarTextColor" format="color" /> - <attr name="suwNavBarTheme" format="reference" /> + <attr name="sudFillContentLayoutStyle" format="reference" /> + <attr name="sudListItemIconColor" format="color" /> + <attr name="sudNavBarBackgroundColor" format="color" /> + <attr name="sudNavBarButtonBackground" format="color|reference" /> + <attr name="sudNavBarTextColor" format="color" /> + <attr name="sudNavBarTheme" format="reference" /> <!-- Values copied from frameworks/base/core/res/res/values/attrs.xml --> - <attr name="suwScrollIndicators"> + <attr name="sudScrollIndicators"> <!-- No scroll indicators are displayed. --> <flag name="none" value="0x00" /> <!-- Displays top scroll indicator when view can be scrolled up. --> @@ -77,71 +77,71 @@ </attr> <!-- Custom view attributes --> - <attr name="suwColorPrimary" format="color" /> - <attr name="suwHeader" format="reference" /> - <!-- Deprecated. Use suwDividerInsetStart and suwDividerInsetEnd instead --> - <attr name="suwDividerInset" format="dimension|reference" /> - <attr name="suwDividerInsetEnd" format="dimension|reference" /> - <attr name="suwDividerInsetStart" format="dimension|reference" /> - <attr name="suwDividerInsetStartNoIcon" format="dimension|reference" /> - <attr name="suwItemDescriptionStyle" format="reference" /> - <attr name="suwItemDescriptionTitleStyle" format="reference" /> + <attr name="sudColorPrimary" format="color" /> + <attr name="sudHeader" format="reference" /> + <!-- Deprecated. Use sudDividerInsetStart and sudDividerInsetEnd instead --> + <attr name="sudDividerInset" format="dimension|reference" /> + <attr name="sudDividerInsetEnd" format="dimension|reference" /> + <attr name="sudDividerInsetStart" format="dimension|reference" /> + <attr name="sudDividerInsetStartNoIcon" format="dimension|reference" /> + <attr name="sudItemDescriptionStyle" format="reference" /> + <attr name="sudItemDescriptionTitleStyle" format="reference" /> - <attr name="suwHasStableIds" format="boolean|reference" /> + <attr name="sudHasStableIds" format="boolean|reference" /> - <declare-styleable name="SuwIllustration"> - <attr name="suwAspectRatio" format="float" /> + <declare-styleable name="SudIllustration"> + <attr name="sudAspectRatio" format="float" /> </declare-styleable> - <declare-styleable name="SuwStickyHeaderListView"> - <attr name="suwHeader" /> + <declare-styleable name="SudStickyHeaderListView"> + <attr name="sudHeader" /> </declare-styleable> - <declare-styleable name="SuwHeaderRecyclerView"> - <attr name="suwHeader" /> + <declare-styleable name="SudHeaderRecyclerView"> + <attr name="sudHeader" /> </declare-styleable> - <declare-styleable name="SuwIllustrationVideoView"> - <attr name="suwVideo" format="reference" /> + <declare-styleable name="SudIllustrationVideoView"> + <attr name="sudVideo" format="reference" /> </declare-styleable> - <declare-styleable name="SuwGlifLayout"> - <attr name="suwBackgroundPatterned" format="boolean" /> - <attr name="suwBackgroundBaseColor" format="color" /> - <attr name="suwColorPrimary" /> - <attr name="suwStickyHeader" format="reference" /> + <declare-styleable name="SudGlifLayout"> + <attr name="sudBackgroundPatterned" format="boolean" /> + <attr name="sudBackgroundBaseColor" format="color" /> + <attr name="sudColorPrimary" /> + <attr name="sudStickyHeader" format="reference" /> </declare-styleable> - <declare-styleable name="SuwIntrinsicSizeFrameLayout"> + <declare-styleable name="SudIntrinsicSizeFrameLayout"> <attr name="android:height" /> <attr name="android:width" /> </declare-styleable> - <declare-styleable name="SuwFillContentLayout"> + <declare-styleable name="SudFillContentLayout"> <attr name="android:maxHeight" /> <attr name="android:maxWidth" /> </declare-styleable> - <declare-styleable name="SuwSetupWizardLayout"> - <attr name="suwBackground" format="color|reference" /> - <attr name="suwBackgroundTile" format="color|reference" /> - <attr name="suwDecorPaddingTop" format="dimension|reference" /> - <attr name="suwIllustration" format="color|reference" /> - <attr name="suwIllustrationAspectRatio" format="float|reference" /> - <attr name="suwIllustrationHorizontalTile" format="color|reference" /> - <attr name="suwIllustrationImage" format="color|reference" /> + <declare-styleable name="SudSetupWizardLayout"> + <attr name="sudBackground" format="color|reference" /> + <attr name="sudBackgroundTile" format="color|reference" /> + <attr name="sudDecorPaddingTop" format="dimension|reference" /> + <attr name="sudIllustration" format="color|reference" /> + <attr name="sudIllustrationAspectRatio" format="float|reference" /> + <attr name="sudIllustrationHorizontalTile" format="color|reference" /> + <attr name="sudIllustrationImage" format="color|reference" /> </declare-styleable> - <declare-styleable name="SuwTemplateLayout"> + <declare-styleable name="SudTemplateLayout"> <attr name="android:layout" /> - <attr name="suwContainer" format="reference" /> + <attr name="sudContainer" format="reference" /> </declare-styleable> - <declare-styleable name="SuwAbstractItem"> + <declare-styleable name="SudAbstractItem"> <attr name="android:id" /> </declare-styleable> - <declare-styleable name="SuwItem"> + <declare-styleable name="SudItem"> <attr name="android:enabled" /> <attr name="android:icon" /> <attr name="android:layout" /> @@ -150,58 +150,46 @@ <attr name="android:visible" /> </declare-styleable> - <declare-styleable name="SuwDividerItemDecoration"> + <declare-styleable name="SudDividerItemDecoration"> <attr name="android:listDivider" /> <attr name="android:dividerHeight" /> - <attr name="suwDividerCondition" /> + <attr name="sudDividerCondition" /> </declare-styleable> - <declare-styleable name="SuwButtonItem"> + <declare-styleable name="SudButtonItem"> <attr name="android:buttonStyle" /> <attr name="android:enabled" /> <attr name="android:text" /> <attr name="android:theme" /> </declare-styleable> - <declare-styleable name="SuwHeaderMixin"> - <attr name="suwHeaderText" format="string" localization="suggested" /> - </declare-styleable> - - <declare-styleable name="SuwColoredHeaderMixin"> - <attr name="suwHeaderColor" format="reference|color" /> - </declare-styleable> - - <declare-styleable name="SuwIconMixin"> - <attr name="android:icon" /> - </declare-styleable> - - <declare-styleable name="SuwListMixin"> + <declare-styleable name="SudListMixin"> <attr name="android:entries" /> - <attr name="suwDividerInset" /> - <attr name="suwDividerInsetEnd" /> - <attr name="suwDividerInsetStart" /> + <attr name="sudDividerInset" /> + <attr name="sudDividerInsetEnd" /> + <attr name="sudDividerInsetStart" /> </declare-styleable> - <declare-styleable name="SuwRecyclerItemAdapter"> + <declare-styleable name="SudRecyclerItemAdapter"> <attr name="android:colorBackground" /> <attr name="android:selectableItemBackground" /> <attr name="selectableItemBackground" /> </declare-styleable> - <declare-styleable name="SuwRecyclerMixin"> + <declare-styleable name="SudRecyclerMixin"> <attr name="android:entries" /> - <attr name="suwDividerInset" /> - <attr name="suwDividerInsetEnd" /> - <attr name="suwDividerInsetStart" /> - <attr name="suwHasStableIds" /> + <attr name="sudDividerInset" /> + <attr name="sudDividerInsetEnd" /> + <attr name="sudDividerInsetStart" /> + <attr name="sudHasStableIds" /> </declare-styleable> - <declare-styleable name="SuwSwitchItem"> + <declare-styleable name="SudSwitchItem"> <attr name="android:checked" /> </declare-styleable> - <declare-styleable name="SuwExpandableSwitchItem"> - <attr name="suwCollapsedSummary" format="string" localization="suggested" /> - <attr name="suwExpandedSummary" format="string" localization="suggested" /> + <declare-styleable name="SudExpandableSwitchItem"> + <attr name="sudCollapsedSummary" format="string" localization="suggested" /> + <attr name="sudExpandedSummary" format="string" localization="suggested" /> </declare-styleable> </resources> diff --git a/main/res/values/colors.xml b/main/res/values/colors.xml index 005d1c6..0621c6b 100644 --- a/main/res/values/colors.xml +++ b/main/res/values/colors.xml @@ -19,34 +19,34 @@ <!-- General colors --> - <color name="suw_color_accent_dark">#ff448aff</color> - <color name="suw_color_accent_light">#ff3367d6</color> - <color name="suw_color_background_dark">#ff303030</color> - <color name="suw_color_background_light">#fffafafa</color> - <color name="suw_link_color_dark">#ff448aff</color> - <color name="suw_link_color_light">#ff3367d6</color> - <color name="suw_list_item_icon_color_dark">#b3ffffff</color> - <color name="suw_list_item_icon_color_light">#89000000</color> - <color name="suw_progress_bar_color_dark">#ffffcd40</color> - <color name="suw_progress_bar_color_light">#fff4b400</color> + <color name="sud_color_accent_dark">#ff448aff</color> + <color name="sud_color_accent_light">#ff3367d6</color> + <color name="sud_color_background_dark">#ff303030</color> + <color name="sud_color_background_light">#fffafafa</color> + <color name="sud_link_color_dark">#ff448aff</color> + <color name="sud_link_color_light">#ff3367d6</color> + <color name="sud_list_item_icon_color_dark">#b3ffffff</color> + <color name="sud_list_item_icon_color_light">#89000000</color> + <color name="sud_progress_bar_color_dark">#ffffcd40</color> + <color name="sud_progress_bar_color_light">#fff4b400</color> <!-- On versions < 23, we cannot reference other theme values in a color resource. Default to the framework default of 12% black --> - <color name="suw_flat_button_highlight">#1f000000</color> + <color name="sud_flat_button_highlight">#1f000000</color> <!-- Navigation bar colors --> - <color name="suw_navbar_bg_dark">#ff21272b</color> - <color name="suw_navbar_bg_light">#ffe4e7e9</color> + <color name="sud_navbar_bg_dark">#ff21272b</color> + <color name="sud_navbar_bg_light">#ffe4e7e9</color> <!-- GLIF colors --> - <color name="suw_color_accent_glif_dark">#ff4285f4</color> - <color name="suw_color_accent_glif_light">#ff4285f4</color> - <color name="suw_color_accent_glif_v3">#ff1a73e8</color> - <color name="suw_glif_background_color_dark">#ff000000</color> - <color name="suw_glif_background_color_light">#ffffffff</color> - <color name="suw_glif_edit_text_bg_light_color">#fff1f3f4</color> - <color name="suw_glif_v3_nav_bar_color_light">#ffffffff</color> - <color name="suw_glif_v3_nav_bar_divider_color_light">#1f000000</color> + <color name="sud_color_accent_glif_dark">#ff4285f4</color> + <color name="sud_color_accent_glif_light">#ff4285f4</color> + <color name="sud_color_accent_glif_v3">#ff1a73e8</color> + <color name="sud_glif_background_color_dark">#ff000000</color> + <color name="sud_glif_background_color_light">#ffffffff</color> + <color name="sud_glif_edit_text_bg_light_color">#fff1f3f4</color> + <color name="sud_glif_v3_nav_bar_color_light">#ffffffff</color> + <color name="sud_glif_v3_nav_bar_divider_color_light">#1f000000</color> </resources> diff --git a/main/res/values/config.xml b/main/res/values/config.xml index c11bf41..4847358 100644 --- a/main/res/values/config.xml +++ b/main/res/values/config.xml @@ -18,17 +18,17 @@ <resources> <!-- The duration (in milliseconds) of activity transitions --> - <integer name="suwTransitionDuration">300</integer> + <integer name="sudTransitionDuration">300</integer> <!-- Whether to use tablet layout --> - <bool name="suwUseTabletLayout">false</bool> + <bool name="sudUseTabletLayout">false</bool> <!-- ID used with setTag(int, Object) to store the original weight of a view inside ButtonBarLayout --> - <item name="suw_original_weight" type="id" /> + <item name="sud_original_weight" type="id" /> <!-- Secondary font for use with headings, title, and other non-body text --> - <string name="suwFontSecondary" translatable="false">google-sans</string> - <string name="suwFontSecondaryMedium" translatable="false">google-sans-medium</string> + <string name="sudFontSecondary" translatable="false">google-sans</string> + <string name="sudFontSecondaryMedium" translatable="false">google-sans-medium</string> </resources> diff --git a/main/res/values/dimens.xml b/main/res/values/dimens.xml index 1fa2b35..57e6fe2 100644 --- a/main/res/values/dimens.xml +++ b/main/res/values/dimens.xml @@ -18,142 +18,142 @@ <resources xmlns:tools="http://schemas.android.com/tools"> <!-- General --> - <dimen name="suw_layout_margin_sides">40dp</dimen> - - <dimen name="suw_glif_button_corner_radius">2dp</dimen> - <!-- Calculated by (suw_glif_margin_sides - 4dp internal padding of button) --> - <dimen name="suw_glif_button_margin_end">20dp</dimen> - <!-- Calculated by (suw_glif_margin_sides - suw_glif_button_padding) --> - <dimen name="suw_glif_button_margin_start">8dp</dimen> - <dimen name="suw_glif_button_padding">16dp</dimen> - <!-- Negative of suw_glif_button_padding --> - <dimen name="suw_glif_negative_button_padding">-16dp</dimen> - <dimen name="suw_glif_footer_padding_vertical">8dp</dimen> - <dimen name="suw_glif_footer_min_height">72dp</dimen> - <dimen name="suw_glif_margin_sides">24dp</dimen> - <dimen name="suw_glif_margin_top">56dp</dimen> - - <dimen name="suw_glif_v3_button_corner_radius">4dp</dimen> + <dimen name="sud_layout_margin_sides">40dp</dimen> + + <dimen name="sud_glif_button_corner_radius">2dp</dimen> + <!-- Calculated by (sud_glif_margin_sides - 4dp internal padding of button) --> + <dimen name="sud_glif_button_margin_end">20dp</dimen> + <!-- Calculated by (sud_glif_margin_sides - sud_glif_button_padding) --> + <dimen name="sud_glif_button_margin_start">8dp</dimen> + <dimen name="sud_glif_button_padding">16dp</dimen> + <!-- Negative of sud_glif_button_padding --> + <dimen name="sud_glif_negative_button_padding">-16dp</dimen> + <dimen name="sud_glif_footer_padding_vertical">8dp</dimen> + <dimen name="sud_glif_footer_min_height">72dp</dimen> + <dimen name="sud_glif_margin_sides">24dp</dimen> + <dimen name="sud_glif_margin_top">56dp</dimen> + + <dimen name="sud_glif_v3_button_corner_radius">4dp</dimen> <!-- Content styles --> - <dimen name="suw_check_box_line_spacing_extra">4sp</dimen> - <dimen name="suw_check_box_margin_bottom">12dp</dimen> - <dimen name="suw_check_box_margin_start">1dp</dimen> - <dimen name="suw_check_box_margin_top">24dp</dimen> - <dimen name="suw_check_box_padding_start">15dp</dimen> - - <dimen name="suw_content_frame_padding_top">0dp</dimen> - <dimen name="suw_content_frame_padding_bottom">16dp</dimen> - - <dimen name="suw_description_margin_top">24dp</dimen> - <dimen name="suw_description_margin_bottom">12dp</dimen> - <dimen name="suw_description_margin_bottom_lists">24dp</dimen> - <dimen name="suw_description_line_spacing_extra">4sp</dimen> - <dimen name="suw_description_text_size">16sp</dimen> - - <dimen name="suw_description_glif_margin_top">3dp</dimen> - <dimen name="suw_description_glif_margin_bottom_lists">24dp</dimen> - - <dimen name="suw_content_illustration_max_height">312dp</dimen> - <dimen name="suw_content_illustration_max_width">312dp</dimen> - <dimen name="suw_content_illustration_min_height">172dp</dimen> - <dimen name="suw_content_illustration_min_width">172dp</dimen> - <dimen name="suw_content_illustration_padding_vertical">24dp</dimen> + <dimen name="sud_check_box_line_spacing_extra">4sp</dimen> + <dimen name="sud_check_box_margin_bottom">12dp</dimen> + <dimen name="sud_check_box_margin_start">1dp</dimen> + <dimen name="sud_check_box_margin_top">24dp</dimen> + <dimen name="sud_check_box_padding_start">15dp</dimen> + + <dimen name="sud_content_frame_padding_top">0dp</dimen> + <dimen name="sud_content_frame_padding_bottom">16dp</dimen> + + <dimen name="sud_description_margin_top">24dp</dimen> + <dimen name="sud_description_margin_bottom">12dp</dimen> + <dimen name="sud_description_margin_bottom_lists">24dp</dimen> + <dimen name="sud_description_line_spacing_extra">4sp</dimen> + <dimen name="sud_description_text_size">16sp</dimen> + + <dimen name="sud_description_glif_margin_top">3dp</dimen> + <dimen name="sud_description_glif_margin_bottom_lists">24dp</dimen> + + <dimen name="sud_content_illustration_max_height">312dp</dimen> + <dimen name="sud_content_illustration_max_width">312dp</dimen> + <dimen name="sud_content_illustration_min_height">172dp</dimen> + <dimen name="sud_content_illustration_min_width">172dp</dimen> + <dimen name="sud_content_illustration_padding_vertical">24dp</dimen> <!-- Margin on the start to offset for margin in the drawable --> - <dimen name="suw_radio_button_margin_start">-6dp</dimen> - <dimen name="suw_radio_button_margin_top">0dp</dimen> - <dimen name="suw_radio_button_margin_bottom">12dp</dimen> - <dimen name="suw_radio_button_padding_start">18dp</dimen> - <dimen name="suw_radio_button_line_spacing_extra">5sp</dimen> + <dimen name="sud_radio_button_margin_start">-6dp</dimen> + <dimen name="sud_radio_button_margin_top">0dp</dimen> + <dimen name="sud_radio_button_margin_bottom">12dp</dimen> + <dimen name="sud_radio_button_padding_start">18dp</dimen> + <dimen name="sud_radio_button_line_spacing_extra">5sp</dimen> <!-- Card layout (for tablets) --> - <dimen name="suw_card_corner_radius">2dp</dimen> - <dimen name="suw_card_elevation">5dp</dimen> - <dimen name="suw_card_land_header_text_margin_top">128dp</dimen> - <dimen name="suw_card_port_margin_sides">56dp</dimen> + <dimen name="sud_card_corner_radius">2dp</dimen> + <dimen name="sud_card_elevation">5dp</dimen> + <dimen name="sud_card_land_header_text_margin_top">128dp</dimen> + <dimen name="sud_card_port_margin_sides">56dp</dimen> - <dimen name="suw_card_title_padding_end">0dp</dimen> - <dimen name="suw_card_title_padding_start">0dp</dimen> - <dimen name="suw_card_title_padding_top">16dp</dimen> - <dimen name="suw_card_title_padding_bottom">28dp</dimen> + <dimen name="sud_card_title_padding_end">0dp</dimen> + <dimen name="sud_card_title_padding_start">0dp</dimen> + <dimen name="sud_card_title_padding_top">16dp</dimen> + <dimen name="sud_card_title_padding_bottom">28dp</dimen> <!-- Decor view (illustration or the header without illustration) --> - <dimen name="suw_decor_padding_top">0dp</dimen> + <dimen name="sud_decor_padding_top">0dp</dimen> <!-- GLIF card layout (for tablets) --> - <dimen name="suw_glif_card_elevation">5dp</dimen> - <dimen name="suw_glif_card_width">560dp</dimen> - <dimen name="suw_glif_card_height">672dp</dimen> + <dimen name="sud_glif_card_elevation">5dp</dimen> + <dimen name="sud_glif_card_width">560dp</dimen> + <dimen name="sud_glif_card_height">672dp</dimen> <!-- Header layout (for phones) --> - <dimen name="suw_title_area_elevation">3dp</dimen> + <dimen name="sud_title_area_elevation">3dp</dimen> <!-- Hack to force the header (and its shadow) to be drawn on top of the list contents --> - <dimen name="suw_header_elevation_hack">1dp</dimen> + <dimen name="sud_header_elevation_hack">1dp</dimen> - <dimen name="suw_header_title_size">24sp</dimen> - <dimen name="suw_header_title_margin_bottom">16dp</dimen> - <dimen name="suw_header_title_padding_top">16dp</dimen> - <dimen name="suw_header_title_padding_bottom">2dp</dimen> + <dimen name="sud_header_title_size">24sp</dimen> + <dimen name="sud_header_title_margin_bottom">16dp</dimen> + <dimen name="sud_header_title_padding_top">16dp</dimen> + <dimen name="sud_header_title_padding_bottom">2dp</dimen> <!-- This is the extra spacing required to make the leading exactly 32sp --> - <dimen name="suw_header_title_line_spacing_extra">3.67sp</dimen> + <dimen name="sud_header_title_line_spacing_extra">3.67sp</dimen> - <dimen name="suw_glif_header_title_margin_top">16dp</dimen> - <dimen name="suw_glif_header_title_margin_bottom">2dp</dimen> + <dimen name="sud_glif_header_title_margin_top">16dp</dimen> + <dimen name="sud_glif_header_title_margin_bottom">2dp</dimen> - <dimen name="suw_glif_icon_max_height">32dp</dimen> + <dimen name="sud_glif_icon_max_height">32dp</dimen> <!-- Illustration --> - <item name="suw_illustration_aspect_ratio" format="float" type="dimen">2.22</item> + <item name="sud_illustration_aspect_ratio" format="float" type="dimen">2.22</item> <!-- Items --> - <dimen name="suw_items_icon_container_width">48dp</dimen> - <dimen name="suw_items_padding_vertical">15dp</dimen> - <dimen name="suw_items_verbose_padding_vertical">20dp</dimen> + <dimen name="sud_items_icon_container_width">48dp</dimen> + <dimen name="sud_items_padding_vertical">15dp</dimen> + <dimen name="sud_items_verbose_padding_vertical">20dp</dimen> <!-- Ignore UnusedResources: can be used by clients --> - <dimen name="suw_items_icon_divider_inset" tools:ignore="UnusedResources">88dp</dimen> + <dimen name="sud_items_icon_divider_inset" tools:ignore="UnusedResources">88dp</dimen> <!-- Ignore UnusedResources: can be used by clients --> - <dimen name="suw_items_text_divider_inset" tools:ignore="UnusedResources">40dp</dimen> + <dimen name="sud_items_text_divider_inset" tools:ignore="UnusedResources">40dp</dimen> <!-- Ignore UnusedResources: can be used by clients --> - <dimen name="suw_items_glif_icon_divider_inset" tools:ignore="UnusedResources">72dp</dimen> + <dimen name="sud_items_glif_icon_divider_inset" tools:ignore="UnusedResources">72dp</dimen> <!-- Ignore UnusedResources: can be used by clients --> - <dimen name="suw_items_glif_text_divider_inset" tools:ignore="UnusedResources">24dp</dimen> + <dimen name="sud_items_glif_text_divider_inset" tools:ignore="UnusedResources">24dp</dimen> <!-- Extra padding in the bottom to compensate for difference between descent and (top) internal leading --> - <dimen name="suw_items_padding_bottom_extra">1dp</dimen> - <dimen name="suw_items_verbose_padding_bottom_extra">0dp</dimen> - <dimen name="suw_items_preferred_height">56dp</dimen> + <dimen name="sud_items_padding_bottom_extra">1dp</dimen> + <dimen name="sud_items_verbose_padding_bottom_extra">0dp</dimen> + <dimen name="sud_items_preferred_height">56dp</dimen> <!-- Navigation bar --> <!-- TODO: Move this dimen to gingerbread, or see if it should be in platform style as well --> - <dimen name="suw_navbar_button_drawable_padding" tools:ignore="UnusedResources">6dp</dimen> - <dimen name="suw_navbar_button_padding_sides">10dp</dimen> - <dimen name="suw_navbar_height">56dp</dimen> - <dimen name="suw_navbar_ic_intrinsic_size">24dp</dimen> - <dimen name="suw_navbar_padding_sides">24dp</dimen> - <dimen name="suw_navbar_text_size">16sp</dimen> + <dimen name="sud_navbar_button_drawable_padding" tools:ignore="UnusedResources">6dp</dimen> + <dimen name="sud_navbar_button_padding_sides">10dp</dimen> + <dimen name="sud_navbar_height">56dp</dimen> + <dimen name="sud_navbar_ic_intrinsic_size">24dp</dimen> + <dimen name="sud_navbar_padding_sides">24dp</dimen> + <dimen name="sud_navbar_text_size">16sp</dimen> <!-- Progress bar --> <!-- The margin to compensate for the padding built-in to the widget itself --> - <dimen name="suw_progress_bar_margin_vertical">-7dp</dimen> - <dimen name="suw_glif_progress_bar_margin_vertical">7dp</dimen> - <dimen name="suw_glif_progress_bar_padding">40dp</dimen> + <dimen name="sud_progress_bar_margin_vertical">-7dp</dimen> + <dimen name="sud_glif_progress_bar_margin_vertical">7dp</dimen> + <dimen name="sud_glif_progress_bar_padding">40dp</dimen> <!-- Edit Text dimensions --> - <dimen name="suw_edit_text_min_height">56dp</dimen> - <dimen name="suw_edit_text_padding_horizontal">12dp</dimen> + <dimen name="sud_edit_text_min_height">56dp</dimen> + <dimen name="sud_edit_text_padding_horizontal">12dp</dimen> <!-- SwitchItem --> - <dimen name="suw_switch_padding_start">16dp</dimen> - <dimen name="suw_switch_padding_end">0dp</dimen> - <dimen name="suw_switch_padding_top">39dp</dimen> - <dimen name="suw_switch_divider_height">32dp</dimen> - <dimen name="suw_switch_divider_padding_top">36dp</dimen> - <dimen name="suw_switch_content_padding_end">16dp</dimen> + <dimen name="sud_switch_padding_start">16dp</dimen> + <dimen name="sud_switch_padding_end">0dp</dimen> + <dimen name="sud_switch_padding_top">39dp</dimen> + <dimen name="sud_switch_divider_height">32dp</dimen> + <dimen name="sud_switch_divider_padding_top">36dp</dimen> + <dimen name="sud_switch_content_padding_end">16dp</dimen> <!-- ExpandableSwithItem --> - <dimen name="suw_expand_arrow_drawable_padding">4dp</dimen> + <dimen name="sud_expand_arrow_drawable_padding">4dp</dimen> </resources> diff --git a/main/res/values/styles.xml b/main/res/values/styles.xml index e257c20..1c59c79 100644 --- a/main/res/values/styles.xml +++ b/main/res/values/styles.xml @@ -19,612 +19,614 @@ <!-- General styles --> - <style name="SuwThemeMaterial" parent="Theme.AppCompat.NoActionBar"> - <item name="android:colorBackground">@color/suw_color_background_dark</item> - <item name="android:indeterminateTint" tools:ignore="NewApi">@color/suw_progress_bar_color_dark</item> + <style name="SudThemeMaterial" parent="Theme.AppCompat.NoActionBar"> + <item name="android:colorBackground">@color/sud_color_background_dark</item> + <item name="android:indeterminateTint" tools:ignore="NewApi">@color/sud_progress_bar_color_dark</item> <!-- Specify the indeterminateTintMode to work around a bug in Lollipop --> <item name="android:indeterminateTintMode" tools:ignore="NewApi">src_in</item> - <item name="android:listPreferredItemHeight">@dimen/suw_items_preferred_height</item> - <item name="android:listPreferredItemPaddingEnd" tools:ignore="NewApi">?attr/suwMarginSides</item> - <item name="android:listPreferredItemPaddingStart" tools:ignore="NewApi">?attr/suwMarginSides</item> + <item name="android:listPreferredItemHeight">@dimen/sud_items_preferred_height</item> + <item name="android:listPreferredItemPaddingEnd" tools:ignore="NewApi">?attr/sudMarginSides</item> + <item name="android:listPreferredItemPaddingStart" tools:ignore="NewApi">?attr/sudMarginSides</item> <item name="android:navigationBarColor" tools:ignore="NewApi">@android:color/black</item> <item name="android:statusBarColor" tools:ignore="NewApi">@android:color/black</item> <item name="android:textAppearanceListItemSmall" tools:ignore="NewApi">?attr/textAppearanceListItemSmall</item> - <item name="android:textColorLink">@color/suw_link_color_dark</item> - <item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item> + <item name="android:textColorLink">@color/sud_link_color_dark</item> + <item name="android:windowAnimationStyle">@style/Animation.SudWindowAnimation</item> <item name="android:windowDisablePreview">true</item> <item name="android:windowSoftInputMode">adjustResize</item> - <item name="colorAccent">@color/suw_color_accent_dark</item> - <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item> - <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item> - <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item> - <item name="suwButtonAllCaps">true</item> - <item name="suwButtonFontFamily">sans-serif</item> - <item name="suwButtonHighlightAlpha">0.24</item> - <item name="suwCardBackground">@drawable/suw_card_bg_dark</item> - <item name="suwDividerInsetEnd">0dp</item> - <item name="suwDividerInsetStart">@dimen/suw_items_icon_divider_inset</item> - <item name="suwDividerInsetStartNoIcon">@dimen/suw_items_text_divider_inset</item> - <item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description</item> - <item name="suwItemDescriptionTitleStyle">@style/SuwItemTitle</item> - <item name="suwListItemIconColor">@color/suw_list_item_icon_color_dark</item> - <item name="suwMarginSides">@dimen/suw_layout_margin_sides</item> - <item name="suwNavBarTheme">@style/SuwNavBarThemeDark</item> - <item name="textAppearanceListItemSmall">@style/TextAppearance.SuwItemSummary</item> - </style> - - <style name="SuwThemeMaterial.Light" parent="Theme.AppCompat.Light.NoActionBar"> - <item name="android:colorBackground">@color/suw_color_background_light</item> - <item name="android:indeterminateTint" tools:ignore="NewApi">@color/suw_progress_bar_color_light</item> + <item name="colorAccent">@color/sud_color_accent_dark</item> + <item name="sudFillContentLayoutStyle">@style/SudFillContentLayout</item> + <item name="listPreferredItemPaddingLeft">?attr/sudMarginSides</item> + <item name="listPreferredItemPaddingRight">?attr/sudMarginSides</item> + <item name="sudButtonAllCaps">true</item> + <item name="sudButtonFontFamily">sans-serif</item> + <item name="sudButtonHighlightAlpha">0.24</item> + <item name="sudCardBackground">@drawable/sud_card_bg_dark</item> + <item name="sudDividerInsetEnd">0dp</item> + <item name="sudDividerInsetStart">@dimen/sud_items_icon_divider_inset</item> + <item name="sudDividerInsetStartNoIcon">@dimen/sud_items_text_divider_inset</item> + <item name="sudItemDescriptionStyle">@style/SudItemContainer.Description</item> + <item name="sudItemDescriptionTitleStyle">@style/SudItemTitle</item> + <item name="sudListItemIconColor">@color/sud_list_item_icon_color_dark</item> + <item name="sudMarginSides">@dimen/sud_layout_margin_sides</item> + <item name="sudNavBarTheme">@style/SudNavBarThemeDark</item> + <item name="textAppearanceListItemSmall">@style/TextAppearance.SudItemSummary</item> + </style> + + <style name="SudThemeMaterial.Light" parent="Theme.AppCompat.Light.NoActionBar"> + <item name="android:colorBackground">@color/sud_color_background_light</item> + <item name="android:indeterminateTint" tools:ignore="NewApi">@color/sud_progress_bar_color_light</item> <!-- Specify the indeterminateTintMode to work around a bug in Lollipop --> <item name="android:indeterminateTintMode" tools:ignore="NewApi">src_in</item> - <item name="android:listPreferredItemHeight">@dimen/suw_items_preferred_height</item> - <item name="android:listPreferredItemPaddingEnd" tools:ignore="NewApi">?attr/suwMarginSides</item> - <item name="android:listPreferredItemPaddingStart" tools:ignore="NewApi">?attr/suwMarginSides</item> + <item name="android:listPreferredItemHeight">@dimen/sud_items_preferred_height</item> + <item name="android:listPreferredItemPaddingEnd" tools:ignore="NewApi">?attr/sudMarginSides</item> + <item name="android:listPreferredItemPaddingStart" tools:ignore="NewApi">?attr/sudMarginSides</item> <item name="android:navigationBarColor" tools:ignore="NewApi">@android:color/black</item> <item name="android:statusBarColor" tools:ignore="NewApi">@android:color/black</item> <item name="android:textAppearanceListItemSmall" tools:ignore="NewApi">?attr/textAppearanceListItemSmall</item> - <item name="android:textColorLink">@color/suw_link_color_light</item> - <item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item> + <item name="android:textColorLink">@color/sud_link_color_light</item> + <item name="android:windowAnimationStyle">@style/Animation.SudWindowAnimation</item> <item name="android:windowDisablePreview">true</item> <item name="android:windowSoftInputMode">adjustResize</item> - <item name="colorAccent">@color/suw_color_accent_light</item> - <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item> - <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item> - <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item> - <item name="suwButtonAllCaps">true</item> - <item name="suwButtonFontFamily">sans-serif</item> - <item name="suwButtonHighlightAlpha">0.24</item> - <item name="suwCardBackground">@drawable/suw_card_bg_light</item> - <item name="suwDividerInsetEnd">0dp</item> - <item name="suwDividerInsetStart">@dimen/suw_items_icon_divider_inset</item> - <item name="suwDividerInsetStartNoIcon">@dimen/suw_items_text_divider_inset</item> - <item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description</item> - <item name="suwItemDescriptionTitleStyle">@style/SuwItemTitle</item> - <item name="suwListItemIconColor">@color/suw_list_item_icon_color_light</item> - <item name="suwMarginSides">@dimen/suw_layout_margin_sides</item> - <item name="suwNavBarTheme">@style/SuwNavBarThemeLight</item> - <item name="textAppearanceListItemSmall">@style/TextAppearance.SuwItemSummary</item> - </style> - - <style name="SuwThemeGlif" parent="Theme.AppCompat.NoActionBar"> - <item name="android:colorBackground">@color/suw_glif_background_color_dark</item> + <item name="colorAccent">@color/sud_color_accent_light</item> + <item name="sudFillContentLayoutStyle">@style/SudFillContentLayout</item> + <item name="listPreferredItemPaddingLeft">?attr/sudMarginSides</item> + <item name="listPreferredItemPaddingRight">?attr/sudMarginSides</item> + <item name="sudButtonAllCaps">true</item> + <item name="sudButtonFontFamily">sans-serif</item> + <item name="sudButtonHighlightAlpha">0.24</item> + <item name="sudCardBackground">@drawable/sud_card_bg_light</item> + <item name="sudDividerInsetEnd">0dp</item> + <item name="sudDividerInsetStart">@dimen/sud_items_icon_divider_inset</item> + <item name="sudDividerInsetStartNoIcon">@dimen/sud_items_text_divider_inset</item> + <item name="sudItemDescriptionStyle">@style/SudItemContainer.Description</item> + <item name="sudItemDescriptionTitleStyle">@style/SudItemTitle</item> + <item name="sudListItemIconColor">@color/sud_list_item_icon_color_light</item> + <item name="sudMarginSides">@dimen/sud_layout_margin_sides</item> + <item name="sudNavBarTheme">@style/SudNavBarThemeLight</item> + <item name="textAppearanceListItemSmall">@style/TextAppearance.SudItemSummary</item> + </style> + + <style name="SudThemeGlif" parent="Theme.AppCompat.NoActionBar"> + <item name="android:colorBackground">@color/sud_glif_background_color_dark</item> <item name="android:indeterminateTint" tools:ignore="NewApi">?attr/colorControlActivated</item> <!-- Specify the indeterminateTintMode to work around a bug in Lollipop --> <item name="android:indeterminateTintMode" tools:ignore="NewApi">src_in</item> - <item name="android:listPreferredItemHeight">@dimen/suw_items_preferred_height</item> - <item name="android:listPreferredItemPaddingEnd" tools:ignore="NewApi">?attr/suwMarginSides</item> - <item name="android:listPreferredItemPaddingStart" tools:ignore="NewApi">?attr/suwMarginSides</item> + <item name="android:listPreferredItemHeight">@dimen/sud_items_preferred_height</item> + <item name="android:listPreferredItemPaddingEnd" tools:ignore="NewApi">?attr/sudMarginSides</item> + <item name="android:listPreferredItemPaddingStart" tools:ignore="NewApi">?attr/sudMarginSides</item> <item name="android:navigationBarColor" tools:ignore="NewApi">@android:color/black</item> <item name="android:statusBarColor" tools:ignore="NewApi">@android:color/transparent</item> <item name="android:textAppearanceListItemSmall" tools:ignore="NewApi">?attr/textAppearanceListItemSmall</item> - <item name="android:textColorLink">@color/suw_color_accent_glif_dark</item> - <item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item> + <item name="android:textColorLink">@color/sud_color_accent_glif_dark</item> + <item name="android:windowAnimationStyle">@style/Animation.SudWindowAnimation</item> <item name="android:windowDisablePreview">true</item> <item name="android:windowSoftInputMode">adjustResize</item> - <item name="colorAccent">@color/suw_color_accent_glif_dark</item> + <item name="colorAccent">@color/sud_color_accent_glif_dark</item> <item name="colorPrimary">?attr/colorAccent</item> - <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item> - <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item> - <item name="suwButtonAllCaps">true</item> - <item name="suwButtonCornerRadius">@dimen/suw_glif_button_corner_radius</item> - <item name="suwButtonFontFamily">sans-serif-medium</item> - <item name="suwButtonHighlightAlpha">0.24</item> - <item name="suwColorPrimary">?attr/colorPrimary</item> - <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item> - <item name="suwDividerInsetEnd">0dp</item> - <item name="suwDividerInsetStart">@dimen/suw_items_glif_icon_divider_inset</item> - <item name="suwDividerInsetStartNoIcon">@dimen/suw_items_glif_text_divider_inset</item> - <item name="suwGlifHeaderGravity">start</item> - <item name="suwGlifIconStyle">@style/SuwGlifIcon</item> - <item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description.Glif</item> - <item name="suwItemDescriptionTitleStyle">@style/SuwItemTitle.GlifDescription</item> - <item name="suwListItemIconColor">@color/suw_list_item_icon_color_dark</item> - <item name="suwMarginSides">@dimen/suw_glif_margin_sides</item> - <item name="suwScrollIndicators">bottom</item> - <item name="textAppearanceListItem">@style/TextAppearance.SuwGlifItemTitle</item> - <item name="textAppearanceListItemSmall">@style/TextAppearance.SuwGlifItemSummary</item> - <item name="sucFooterBarButtonFontFamily">?attr/suwButtonFontFamily</item> - <item name="sucFooterBarButtonCornerRadius">?attr/suwButtonCornerRadius</item> - <item name="sucFooterBarButtonAllCaps">?attr/suwButtonAllCaps</item> + <item name="listPreferredItemPaddingLeft">?attr/sudMarginSides</item> + <item name="listPreferredItemPaddingRight">?attr/sudMarginSides</item> + <item name="sudButtonAllCaps">true</item> + <item name="sudButtonCornerRadius">@dimen/sud_glif_button_corner_radius</item> + <item name="sudButtonFontFamily">sans-serif-medium</item> + <item name="sudButtonHighlightAlpha">0.24</item> + <item name="sudColorPrimary">?attr/colorPrimary</item> + <item name="sudFillContentLayoutStyle">@style/SudFillContentLayout</item> + <item name="sudDividerInsetEnd">0dp</item> + <item name="sudDividerInsetStart">@dimen/sud_items_glif_icon_divider_inset</item> + <item name="sudDividerInsetStartNoIcon">@dimen/sud_items_glif_text_divider_inset</item> + <item name="sudGlifHeaderGravity">start</item> + <item name="sudGlifIconStyle">@style/SudGlifIcon</item> + <item name="sudItemDescriptionStyle">@style/SudItemContainer.Description.Glif</item> + <item name="sudItemDescriptionTitleStyle">@style/SudItemTitle.GlifDescription</item> + <item name="sudListItemIconColor">@color/sud_list_item_icon_color_dark</item> + <item name="sudMarginSides">@dimen/sud_glif_margin_sides</item> + <item name="sudScrollIndicators">bottom</item> + <item name="textAppearanceListItem">@style/TextAppearance.SudGlifItemTitle</item> + <item name="textAppearanceListItemSmall">@style/TextAppearance.SudGlifItemSummary</item> + <item name="sucFooterBarButtonFontFamily">?attr/sudButtonFontFamily</item> + <item name="sucFooterBarButtonCornerRadius">?attr/sudButtonCornerRadius</item> + <item name="sucFooterBarButtonAllCaps">?attr/sudButtonAllCaps</item> <item name="sucFooterBarButtonColorControlHighlightRipple">?attr/colorAccent</item> - <item name="sucFooterBarButtonHighlightAlpha">?attr/suwButtonHighlightAlpha</item> + <item name="sucFooterBarButtonHighlightAlpha">?attr/sudButtonHighlightAlpha</item> <item name="sucStatusBarBackground">?android:attr/colorBackground</item> <item name="sucSystemNavBarBackgroundColor">?android:attr/navigationBarColor</item> + <item name="sucFooterButtonPaddingVertical">@dimen/sud_glif_footer_padding_vertical</item> </style> - <style name="SuwThemeGlif.Light" parent="Theme.AppCompat.Light.NoActionBar"> - <item name="android:colorBackground">@color/suw_glif_background_color_light</item> + <style name="SudThemeGlif.Light" parent="Theme.AppCompat.Light.NoActionBar"> + <item name="android:colorBackground">@color/sud_glif_background_color_light</item> <item name="android:indeterminateTint" tools:ignore="NewApi">?attr/colorControlActivated</item> <!-- Specify the indeterminateTintMode to work around a bug in Lollipop --> <item name="android:indeterminateTintMode" tools:ignore="NewApi">src_in</item> - <item name="android:listPreferredItemHeight">@dimen/suw_items_preferred_height</item> - <item name="android:listPreferredItemPaddingEnd" tools:ignore="NewApi">?attr/suwMarginSides</item> - <item name="android:listPreferredItemPaddingStart" tools:ignore="NewApi">?attr/suwMarginSides</item> + <item name="android:listPreferredItemHeight">@dimen/sud_items_preferred_height</item> + <item name="android:listPreferredItemPaddingEnd" tools:ignore="NewApi">?attr/sudMarginSides</item> + <item name="android:listPreferredItemPaddingStart" tools:ignore="NewApi">?attr/sudMarginSides</item> <item name="android:navigationBarColor" tools:ignore="NewApi">@android:color/black</item> <item name="android:statusBarColor" tools:ignore="NewApi">@android:color/transparent</item> <item name="android:textAppearanceListItemSmall" tools:ignore="NewApi">?attr/textAppearanceListItemSmall</item> - <item name="android:textColorLink">@color/suw_color_accent_glif_light</item> - <item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item> + <item name="android:textColorLink">@color/sud_color_accent_glif_light</item> + <item name="android:windowAnimationStyle">@style/Animation.SudWindowAnimation</item> <item name="android:windowDisablePreview">true</item> <item name="android:windowSoftInputMode">adjustResize</item> - <item name="colorAccent">@color/suw_color_accent_glif_light</item> + <item name="colorAccent">@color/sud_color_accent_glif_light</item> <item name="colorPrimary">?attr/colorAccent</item> - <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item> - <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item> - <item name="suwButtonAllCaps">true</item> - <item name="suwButtonCornerRadius">@dimen/suw_glif_button_corner_radius</item> - <item name="suwButtonFontFamily">sans-serif-medium</item> - <item name="suwButtonHighlightAlpha">0.12</item> - <item name="suwColorPrimary">?attr/colorPrimary</item> - <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item> - <item name="suwDividerInsetEnd">0dp</item> - <item name="suwDividerInsetStart">@dimen/suw_items_glif_icon_divider_inset</item> - <item name="suwDividerInsetStartNoIcon">@dimen/suw_items_glif_text_divider_inset</item> - <item name="suwGlifHeaderGravity">start</item> - <item name="suwGlifIconStyle">@style/SuwGlifIcon</item> - <item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description.Glif</item> - <item name="suwItemDescriptionTitleStyle">@style/SuwItemTitle.GlifDescription</item> - <item name="suwListItemIconColor">@color/suw_list_item_icon_color_light</item> - <item name="suwMarginSides">@dimen/suw_glif_margin_sides</item> - <item name="suwScrollIndicators">bottom</item> - <item name="textAppearanceListItem">@style/TextAppearance.SuwGlifItemTitle</item> - <item name="textAppearanceListItemSmall">@style/TextAppearance.SuwGlifItemSummary</item> - <item name="sucFooterBarButtonFontFamily">?attr/suwButtonFontFamily</item> - <item name="sucFooterBarButtonCornerRadius">?attr/suwButtonCornerRadius</item> - <item name="sucFooterBarButtonAllCaps">?attr/suwButtonAllCaps</item> + <item name="listPreferredItemPaddingLeft">?attr/sudMarginSides</item> + <item name="listPreferredItemPaddingRight">?attr/sudMarginSides</item> + <item name="sudButtonAllCaps">true</item> + <item name="sudButtonCornerRadius">@dimen/sud_glif_button_corner_radius</item> + <item name="sudButtonFontFamily">sans-serif-medium</item> + <item name="sudButtonHighlightAlpha">0.12</item> + <item name="sudColorPrimary">?attr/colorPrimary</item> + <item name="sudFillContentLayoutStyle">@style/SudFillContentLayout</item> + <item name="sudDividerInsetEnd">0dp</item> + <item name="sudDividerInsetStart">@dimen/sud_items_glif_icon_divider_inset</item> + <item name="sudDividerInsetStartNoIcon">@dimen/sud_items_glif_text_divider_inset</item> + <item name="sudGlifHeaderGravity">start</item> + <item name="sudGlifIconStyle">@style/SudGlifIcon</item> + <item name="sudItemDescriptionStyle">@style/SudItemContainer.Description.Glif</item> + <item name="sudItemDescriptionTitleStyle">@style/SudItemTitle.GlifDescription</item> + <item name="sudListItemIconColor">@color/sud_list_item_icon_color_light</item> + <item name="sudMarginSides">@dimen/sud_glif_margin_sides</item> + <item name="sudScrollIndicators">bottom</item> + <item name="textAppearanceListItem">@style/TextAppearance.SudGlifItemTitle</item> + <item name="textAppearanceListItemSmall">@style/TextAppearance.SudGlifItemSummary</item> + <item name="sucFooterBarButtonFontFamily">?attr/sudButtonFontFamily</item> + <item name="sucFooterBarButtonCornerRadius">?attr/sudButtonCornerRadius</item> + <item name="sucFooterBarButtonAllCaps">?attr/sudButtonAllCaps</item> <item name="sucFooterBarButtonColorControlHighlightRipple">?attr/colorAccent</item> - <item name="sucFooterBarButtonHighlightAlpha">?attr/suwButtonHighlightAlpha</item> + <item name="sucFooterBarButtonHighlightAlpha">?attr/sudButtonHighlightAlpha</item> <item name="sucStatusBarBackground">?android:attr/colorBackground</item> <item name="sucSystemNavBarBackgroundColor">?android:attr/navigationBarColor</item> + <item name="sucFooterButtonPaddingVertical">@dimen/sud_glif_footer_padding_vertical</item> </style> - <style name="SuwThemeGlifV2" parent="SuwThemeGlif"> - <item name="android:colorBackground">@color/suw_glif_background_color_dark</item> + <style name="SudThemeGlifV2" parent="SudThemeGlif"> + <item name="android:colorBackground">@color/sud_glif_background_color_dark</item> <item name="android:windowLightStatusBar" tools:targetApi="m">false</item> - <item name="suwBackgroundBaseColor">?android:attr/colorBackground</item> - <item name="suwBackgroundPatterned">false</item> - <item name="suwDividerInsetEnd">?attr/suwMarginSides</item> - <item name="suwDividerInsetStart">?attr/suwMarginSides</item> - <item name="suwDividerInsetStartNoIcon">?attr/suwMarginSides</item> - <item name="suwGlifHeaderGravity">center_horizontal</item> - <item name="suwScrollIndicators">top|bottom</item> - <item name="suwEditTextBackgroundColor">@color/suw_glif_edit_text_bg_light_color</item> <!-- TODO: Change color --> - <item name="android:editTextStyle">@style/SuwEditText</item> - <item name="android:alertDialogTheme" tools:targetApi="honeycomb">@style/SuwAlertDialogTheme</item> + <item name="sudBackgroundBaseColor">?android:attr/colorBackground</item> + <item name="sudBackgroundPatterned">false</item> + <item name="sudDividerInsetEnd">?attr/sudMarginSides</item> + <item name="sudDividerInsetStart">?attr/sudMarginSides</item> + <item name="sudDividerInsetStartNoIcon">?attr/sudMarginSides</item> + <item name="sudGlifHeaderGravity">center_horizontal</item> + <item name="sudScrollIndicators">top|bottom</item> + <item name="sudEditTextBackgroundColor">@color/sud_glif_edit_text_bg_light_color</item> <!-- TODO: Change color --> + <item name="android:editTextStyle">@style/SudEditText</item> + <item name="android:alertDialogTheme" tools:targetApi="honeycomb">@style/SudAlertDialogTheme</item> <item name="sucStatusBarWindowLight" tools:targetApi="m">?android:attr/windowLightStatusBar</item> </style> - <style name="SuwThemeGlifV2.Light" parent="SuwThemeGlif.Light"> - <item name="android:colorBackground">@color/suw_glif_background_color_light</item> + <style name="SudThemeGlifV2.Light" parent="SudThemeGlif.Light"> + <item name="android:colorBackground">@color/sud_glif_background_color_light</item> <item name="android:windowLightStatusBar" tools:targetApi="m">true</item> - <item name="suwBackgroundBaseColor">?android:attr/colorBackground</item> - <item name="suwBackgroundPatterned">false</item> - <item name="suwDividerInsetEnd">?attr/suwMarginSides</item> - <item name="suwDividerInsetStart">?attr/suwMarginSides</item> - <item name="suwDividerInsetStartNoIcon">?attr/suwMarginSides</item> - <item name="suwGlifHeaderGravity">center_horizontal</item> - <item name="suwScrollIndicators">top|bottom</item> - <item name="suwEditTextBackgroundColor">@color/suw_glif_edit_text_bg_light_color</item> - <item name="android:editTextStyle">@style/SuwEditText</item> - <item name="android:alertDialogTheme" tools:targetApi="honeycomb">@style/SuwAlertDialogTheme.Light</item> + <item name="sudBackgroundBaseColor">?android:attr/colorBackground</item> + <item name="sudBackgroundPatterned">false</item> + <item name="sudDividerInsetEnd">?attr/sudMarginSides</item> + <item name="sudDividerInsetStart">?attr/sudMarginSides</item> + <item name="sudDividerInsetStartNoIcon">?attr/sudMarginSides</item> + <item name="sudGlifHeaderGravity">center_horizontal</item> + <item name="sudScrollIndicators">top|bottom</item> + <item name="sudEditTextBackgroundColor">@color/sud_glif_edit_text_bg_light_color</item> + <item name="android:editTextStyle">@style/SudEditText</item> + <item name="android:alertDialogTheme" tools:targetApi="honeycomb">@style/SudAlertDialogTheme.Light</item> <item name="sucStatusBarWindowLight" tools:targetApi="m">?android:attr/windowLightStatusBar</item> </style> - <style name="SuwThemeGlifV3" parent="SuwThemeGlifV2"> - <item name="colorAccent">@color/suw_color_accent_glif_v3</item> - <item name="suwButtonAllCaps">false</item> - <item name="suwButtonCornerRadius">@dimen/suw_glif_v3_button_corner_radius</item> - <item name="suwButtonFontFamily">@string/suwFontSecondaryMedium</item> + <style name="SudThemeGlifV3" parent="SudThemeGlifV2"> + <item name="colorAccent">@color/sud_color_accent_glif_v3</item> + <item name="sudButtonAllCaps">false</item> + <item name="sudButtonCornerRadius">@dimen/sud_glif_v3_button_corner_radius</item> + <item name="sudButtonFontFamily">@string/sudFontSecondaryMedium</item> </style> - <style name="SuwBaseThemeGlifV3.Light" parent="SuwThemeGlifV2.Light"> - <item name="colorAccent">@color/suw_color_accent_glif_v3</item> - <item name="suwButtonAllCaps">false</item> - <item name="suwButtonCornerRadius">@dimen/suw_glif_v3_button_corner_radius</item> - <item name="suwButtonFontFamily">@string/suwFontSecondaryMedium</item> + <style name="SudBaseThemeGlifV3.Light" parent="SudThemeGlifV2.Light"> + <item name="colorAccent">@color/sud_color_accent_glif_v3</item> + <item name="sudButtonAllCaps">false</item> + <item name="sudButtonCornerRadius">@dimen/sud_glif_v3_button_corner_radius</item> + <item name="sudButtonFontFamily">@string/sudFontSecondaryMedium</item> </style> - <style name="SuwThemeGlifV3.Light" parent="SuwBaseThemeGlifV3.Light" /> + <style name="SudThemeGlifV3.Light" parent="SudBaseThemeGlifV3.Light" /> - <style name="Animation.SuwWindowAnimation" parent="@android:style/Animation.Activity"> - <item name="android:activityOpenEnterAnimation">@anim/suw_slide_next_in</item> - <item name="android:activityOpenExitAnimation">@anim/suw_slide_next_out</item> - <item name="android:activityCloseEnterAnimation">@anim/suw_slide_back_in</item> - <item name="android:activityCloseExitAnimation">@anim/suw_slide_back_out</item> + <style name="Animation.SudWindowAnimation" parent="@android:style/Animation.Activity"> + <item name="android:activityOpenEnterAnimation">@anim/sud_slide_next_in</item> + <item name="android:activityOpenExitAnimation">@anim/sud_slide_next_out</item> + <item name="android:activityCloseEnterAnimation">@anim/sud_slide_back_in</item> + <item name="android:activityCloseExitAnimation">@anim/sud_slide_back_out</item> </style> <!-- DayNight themes --> - <style name="SuwThemeMaterial.DayNight" parent="SuwThemeMaterial.Light" /> - <style name="SuwThemeGlif.DayNight" parent="SuwThemeGlif.Light" /> - <style name="SuwThemeGlifV2.DayNight" parent="SuwThemeGlifV2.Light" /> - <style name="SuwThemeGlifV3.DayNight" parent="SuwThemeGlifV3.Light" /> + <style name="SudThemeMaterial.DayNight" parent="SudThemeMaterial.Light" /> + <style name="SudThemeGlif.DayNight" parent="SudThemeGlif.Light" /> + <style name="SudThemeGlifV2.DayNight" parent="SudThemeGlifV2.Light" /> + <style name="SudThemeGlifV3.DayNight" parent="SudThemeGlifV3.Light" /> <!-- Content styles --> <!-- Ignore UnusedResources: Used by clients --> - <style name="SuwContentFrame" tools:ignore="UnusedResources"> + <style name="SudContentFrame" tools:ignore="UnusedResources"> <item name="android:clipToPadding">false</item> - <item name="android:paddingTop">@dimen/suw_content_frame_padding_top</item> - <item name="android:paddingLeft">?attr/suwMarginSides</item> - <item name="android:paddingRight">?attr/suwMarginSides</item> - <item name="android:paddingBottom">@dimen/suw_content_frame_padding_bottom</item> + <item name="android:paddingTop">@dimen/sud_content_frame_padding_top</item> + <item name="android:paddingLeft">?attr/sudMarginSides</item> + <item name="android:paddingRight">?attr/sudMarginSides</item> + <item name="android:paddingBottom">@dimen/sud_content_frame_padding_bottom</item> </style> <!-- Ignore UnusedResources: Used by clients --> - <style name="SuwDescription" tools:ignore="UnusedResources"> + <style name="SudDescription" tools:ignore="UnusedResources"> <!-- Before Honeycomb, layout_gravity is needed for FrameLayout to apply the margins --> <item name="android:layout_gravity">top</item> - <item name="android:layout_marginBottom">@dimen/suw_description_margin_bottom</item> - <item name="android:layout_marginTop">@dimen/suw_description_margin_top</item> - <item name="android:lineSpacingExtra">@dimen/suw_description_line_spacing_extra</item> - <item name="android:textAppearance">@style/TextAppearance.SuwDescription</item> + <item name="android:layout_marginBottom">@dimen/sud_description_margin_bottom</item> + <item name="android:layout_marginTop">@dimen/sud_description_margin_top</item> + <item name="android:lineSpacingExtra">@dimen/sud_description_line_spacing_extra</item> + <item name="android:textAppearance">@style/TextAppearance.SudDescription</item> </style> <!-- Ignore UnusedResources: Used by clients --> - <style name="SuwDescription.Glif" parent="SuwDescription" tools:ignore="UnusedResources"> - <item name="android:layout_marginTop">@dimen/suw_description_glif_margin_top</item> - <item name="android:gravity">?attr/suwGlifHeaderGravity</item> + <style name="SudDescription.Glif" parent="SudDescription" tools:ignore="UnusedResources"> + <item name="android:layout_marginTop">@dimen/sud_description_glif_margin_top</item> + <item name="android:gravity">?attr/sudGlifHeaderGravity</item> <item name="android:textAlignment" tools:targetApi="jelly_bean_mr1">gravity</item> </style> - <style name="TextAppearance.SuwDescription" parent="TextAppearance.AppCompat.Medium"> + <style name="TextAppearance.SudDescription" parent="TextAppearance.AppCompat.Medium"> <item name="android:textColor">?android:attr/textColorPrimary</item> - <item name="android:textSize">@dimen/suw_description_text_size</item> + <item name="android:textSize">@dimen/sud_description_text_size</item> </style> <!-- Ignore UnusedResources: Used by clients --> - <style name="TextAppearance.SuwDescription.Secondary" - parent="TextAppearance.SuwDescription" + <style name="TextAppearance.SudDescription.Secondary" + parent="TextAppearance.SudDescription" tools:ignore="UnusedResources"> <item name="android:textColor">?android:attr/textColorSecondary</item> </style> <!-- Ignore UnusedResources: Used by clients --> - <style name="SuwRadioButton" tools:ignore="UnusedResources"> - <item name="android:layout_marginBottom">@dimen/suw_radio_button_margin_bottom</item> - <item name="android:layout_marginLeft">@dimen/suw_radio_button_margin_start</item> - <item name="android:layout_marginStart" tools:ignore="NewApi">@dimen/suw_radio_button_margin_start</item> - <item name="android:layout_marginTop">@dimen/suw_radio_button_margin_top</item> - <item name="android:lineSpacingExtra">@dimen/suw_radio_button_line_spacing_extra</item> - <item name="android:paddingLeft">@dimen/suw_radio_button_padding_start</item> - <item name="android:paddingStart" tools:ignore="NewApi">@dimen/suw_radio_button_padding_start</item> - <item name="android:textAppearance">@style/TextAppearance.SuwDescription</item> + <style name="SudRadioButton" tools:ignore="UnusedResources"> + <item name="android:layout_marginBottom">@dimen/sud_radio_button_margin_bottom</item> + <item name="android:layout_marginLeft">@dimen/sud_radio_button_margin_start</item> + <item name="android:layout_marginStart" tools:ignore="NewApi">@dimen/sud_radio_button_margin_start</item> + <item name="android:layout_marginTop">@dimen/sud_radio_button_margin_top</item> + <item name="android:lineSpacingExtra">@dimen/sud_radio_button_line_spacing_extra</item> + <item name="android:paddingLeft">@dimen/sud_radio_button_padding_start</item> + <item name="android:paddingStart" tools:ignore="NewApi">@dimen/sud_radio_button_padding_start</item> + <item name="android:textAppearance">@style/TextAppearance.SudDescription</item> </style> <!-- Ignore UnusedResources: used by clients --> - <style name="SuwCheckBox" tools:ignore="UnusedResources"> - <item name="android:layout_marginBottom">@dimen/suw_check_box_margin_bottom</item> - <item name="android:layout_marginLeft">@dimen/suw_check_box_margin_start</item> - <item name="android:layout_marginStart" tools:ignore="NewApi">@dimen/suw_check_box_margin_start</item> - <item name="android:layout_marginTop">@dimen/suw_check_box_margin_top</item> - <item name="android:lineSpacingExtra">@dimen/suw_check_box_line_spacing_extra</item> - <item name="android:paddingLeft">@dimen/suw_check_box_padding_start</item> - <item name="android:paddingStart" tools:ignore="NewApi">@dimen/suw_check_box_padding_start</item> - <item name="android:textAppearance">@style/TextAppearance.SuwDescription</item> + <style name="SudCheckBox" tools:ignore="UnusedResources"> + <item name="android:layout_marginBottom">@dimen/sud_check_box_margin_bottom</item> + <item name="android:layout_marginLeft">@dimen/sud_check_box_margin_start</item> + <item name="android:layout_marginStart" tools:ignore="NewApi">@dimen/sud_check_box_margin_start</item> + <item name="android:layout_marginTop">@dimen/sud_check_box_margin_top</item> + <item name="android:lineSpacingExtra">@dimen/sud_check_box_line_spacing_extra</item> + <item name="android:paddingLeft">@dimen/sud_check_box_padding_start</item> + <item name="android:paddingStart" tools:ignore="NewApi">@dimen/sud_check_box_padding_start</item> + <item name="android:textAppearance">@style/TextAppearance.SudDescription</item> </style> <!-- Ignore UnusedResources: used by clients --> - <style name="SuwCheckBox.Multiline" parent="SuwCheckBox" tools:ignore="UnusedResources"> + <style name="SudCheckBox.Multiline" parent="SudCheckBox" tools:ignore="UnusedResources"> <item name="android:gravity">top</item> </style> - <style name="SuwFillContentLayout"> - <item name="android:minWidth">@dimen/suw_content_illustration_min_width</item> - <item name="android:minHeight">@dimen/suw_content_illustration_min_height</item> - <item name="android:maxWidth">@dimen/suw_content_illustration_max_width</item> - <item name="android:maxHeight">@dimen/suw_content_illustration_max_height</item> - <item name="android:paddingTop">@dimen/suw_content_illustration_padding_vertical</item> - <item name="android:paddingBottom">@dimen/suw_content_illustration_padding_vertical</item> + <style name="SudFillContentLayout"> + <item name="android:minWidth">@dimen/sud_content_illustration_min_width</item> + <item name="android:minHeight">@dimen/sud_content_illustration_min_height</item> + <item name="android:maxWidth">@dimen/sud_content_illustration_max_width</item> + <item name="android:maxHeight">@dimen/sud_content_illustration_max_height</item> + <item name="android:paddingTop">@dimen/sud_content_illustration_padding_vertical</item> + <item name="android:paddingBottom">@dimen/sud_content_illustration_padding_vertical</item> </style> <!-- Ignore UnusedResources: used by clients --> - <style name="SuwContentIllustration" tools:ignore="UnusedResources"> + <style name="SudContentIllustration" tools:ignore="UnusedResources"> <item name="android:layout_gravity">center</item> <item name="android:scaleType">fitCenter</item> </style> <!-- Card layout (for tablets) --> - <style name="SuwBaseCardTitle"> + <style name="SudBaseCardTitle"> <item name="android:ellipsize">end</item> <item name="android:maxLines">2</item> - <item name="android:paddingBottom">@dimen/suw_card_title_padding_bottom</item> - <item name="android:paddingEnd" tools:ignore="NewApi">@dimen/suw_card_title_padding_end</item> - <item name="android:paddingLeft">@dimen/suw_card_title_padding_start</item> - <item name="android:paddingRight">@dimen/suw_card_title_padding_end</item> - <item name="android:paddingStart" tools:ignore="NewApi">@dimen/suw_card_title_padding_start</item> - <item name="android:paddingTop">@dimen/suw_card_title_padding_top</item> - <item name="android:textAppearance">@style/TextAppearance.SuwCardTitle</item> + <item name="android:paddingBottom">@dimen/sud_card_title_padding_bottom</item> + <item name="android:paddingEnd" tools:ignore="NewApi">@dimen/sud_card_title_padding_end</item> + <item name="android:paddingLeft">@dimen/sud_card_title_padding_start</item> + <item name="android:paddingRight">@dimen/sud_card_title_padding_end</item> + <item name="android:paddingStart" tools:ignore="NewApi">@dimen/sud_card_title_padding_start</item> + <item name="android:paddingTop">@dimen/sud_card_title_padding_top</item> + <item name="android:textAppearance">@style/TextAppearance.SudCardTitle</item> </style> - <style name="SuwCardTitle" parent="SuwBaseCardTitle" /> + <style name="SudCardTitle" parent="SudBaseCardTitle" /> - <style name="TextAppearance.SuwCardTitle" parent="@style/TextAppearance.AppCompat.Display1"> + <style name="TextAppearance.SudCardTitle" parent="@style/TextAppearance.AppCompat.Display1"> <item name="android:textColor">@android:color/white</item> </style> <!-- GLIF Card layout (for tablets) --> - <style name="SuwGlifCardBackground"> + <style name="SudGlifCardBackground"> <item name="android:background">?attr/colorPrimary</item> </style> - <style name="SuwGlifCardContainer"> + <style name="SudGlifCardContainer"> <item name="android:background">?android:attr/colorBackground</item> - <item name="android:elevation" tools:ignore="NewApi">@dimen/suw_glif_card_elevation</item> + <item name="android:elevation" tools:ignore="NewApi">@dimen/sud_glif_card_elevation</item> </style> - <style name="SuwBase.ProgressBarLarge" parent="@android:style/Widget.ProgressBar.Large" /> + <style name="SudBase.ProgressBarLarge" parent="@android:style/Widget.ProgressBar.Large" /> - <style name="SuwFourColorIndeterminateProgressBar" parent="SuwBase.ProgressBarLarge"> + <style name="SudFourColorIndeterminateProgressBar" parent="SudBase.ProgressBarLarge"> <item name="android:layout_gravity">center</item> <item name="android:indeterminate">true</item> - <item name="android:paddingEnd" tools:targetApi="17" >@dimen/suw_glif_progress_bar_padding</item> - <item name="android:paddingLeft">@dimen/suw_glif_progress_bar_padding</item> - <item name="android:paddingRight">@dimen/suw_glif_progress_bar_padding</item> - <item name="android:paddingStart" tools:targetApi="17" >@dimen/suw_glif_progress_bar_padding</item> + <item name="android:paddingEnd" tools:targetApi="17" >@dimen/sud_glif_progress_bar_padding</item> + <item name="android:paddingLeft">@dimen/sud_glif_progress_bar_padding</item> + <item name="android:paddingRight">@dimen/sud_glif_progress_bar_padding</item> + <item name="android:paddingStart" tools:targetApi="17" >@dimen/sud_glif_progress_bar_padding</item> </style> <!-- Header layout (for phones) --> - <style name="SuwBaseHeaderTitle"> + <style name="SudBaseHeaderTitle"> <!-- Before Honeycomb, layout_gravity is needed for FrameLayout to apply the margins --> <item name="android:layout_gravity">top</item> <item name="android:ellipsize">end</item> <item name="android:maxLines">3</item> - <item name="android:textSize">@dimen/suw_header_title_size</item> + <item name="android:textSize">@dimen/sud_header_title_size</item> </style> - <style name="SuwHeaderTitle" parent="SuwBaseHeaderTitle"> - <item name="android:layout_marginBottom">@dimen/suw_header_title_margin_bottom</item> - <item name="android:layout_marginLeft">?attr/suwMarginSides</item> - <item name="android:layout_marginRight">?attr/suwMarginSides</item> - <item name="android:lineSpacingExtra">@dimen/suw_header_title_line_spacing_extra</item> - <item name="android:paddingBottom">@dimen/suw_header_title_padding_bottom</item> - <item name="android:paddingTop">@dimen/suw_header_title_padding_top</item> + <style name="SudHeaderTitle" parent="SudBaseHeaderTitle"> + <item name="android:layout_marginBottom">@dimen/sud_header_title_margin_bottom</item> + <item name="android:layout_marginLeft">?attr/sudMarginSides</item> + <item name="android:layout_marginRight">?attr/sudMarginSides</item> + <item name="android:lineSpacingExtra">@dimen/sud_header_title_line_spacing_extra</item> + <item name="android:paddingBottom">@dimen/sud_header_title_padding_bottom</item> + <item name="android:paddingTop">@dimen/sud_header_title_padding_top</item> <item name="android:textColor">@android:color/white</item> </style> <!-- Button styles --> - <style name="SuwButtonItem" /> + <style name="SudButtonItem" /> - <style name="SuwButtonItem.Colored" parent="SuwGlifButton.Primary" /> + <style name="SudButtonItem.Colored" parent="SudGlifButton.Primary" /> <!-- Use this style with a Button not a TextView, so that TalkBack will announce it as a button. --> - <style name="SuwGlifButton.BaseTertiary" parent="SuwGlifButton.Secondary"> + <style name="SudGlifButton.BaseTertiary" parent="SudGlifButton.Secondary"> <!-- This style can be applied to a button either as a "style" in XML, or as a theme in ContextThemeWrapper. These self-referencing attributes make sure this is applied as both to the button. --> - <item name="android:buttonStyle">@style/SuwGlifButton.Tertiary</item> - <item name="android:theme">@style/SuwGlifButton.Tertiary</item> + <item name="android:buttonStyle">@style/SudGlifButton.Tertiary</item> + <item name="android:theme">@style/SudGlifButton.Tertiary</item> <item name="android:fontFamily" tools:targetApi="jelly_bean">sans-serif</item> - <item name="android:layout_gravity">?attr/suwGlifHeaderGravity</item> - <item name="android:layout_marginLeft">@dimen/suw_glif_negative_button_padding</item> - <item name="android:layout_marginRight">@dimen/suw_glif_negative_button_padding</item> - <!-- Always lowercase instead of reading attr/suwButtonAllCaps, since this is a tertiary + <item name="android:layout_gravity">?attr/sudGlifHeaderGravity</item> + <item name="android:layout_marginLeft">@dimen/sud_glif_negative_button_padding</item> + <item name="android:layout_marginRight">@dimen/sud_glif_negative_button_padding</item> + <!-- Always lowercase instead of reading attr/sudButtonAllCaps, since this is a tertiary button --> <item name="android:textAllCaps" tools:targetApi="ice_cream_sandwich">false</item> </style> <!-- Ignore UnusedResources: used by clients --> - <style name="SuwGlifButton.Tertiary" parent="SuwGlifButton.BaseTertiary" + <style name="SudGlifButton.Tertiary" parent="SudGlifButton.BaseTertiary" tools:ignore="UnusedResources"> <item name="textAllCaps" tools:targetApi="ice_cream_sandwich">false</item> </style> - <style name="SuwGlifButton.Primary" parent="Widget.AppCompat.Button.Colored"> + <style name="SudGlifButton.Primary" parent="Widget.AppCompat.Button.Colored"> <!-- This style can be applied to a button either as a "style" in XML, or as a theme in ContextThemeWrapper. These self-referencing attributes make sure this is applied as both to the button. --> - <item name="android:buttonStyle">@style/SuwGlifButton.Primary</item> - <item name="android:theme">@style/SuwGlifButton.Primary</item> - <item name="buttonStyle">@style/SuwGlifButton.Primary</item> + <item name="android:buttonStyle">@style/SudGlifButton.Primary</item> + <item name="android:theme">@style/SudGlifButton.Primary</item> + <item name="buttonStyle">@style/SudGlifButton.Primary</item> <!-- Values used in styles --> - <item name="android:fontFamily" tools:targetApi="jelly_bean">?attr/suwButtonFontFamily</item> - <item name="android:paddingLeft">@dimen/suw_glif_button_padding</item> - <item name="android:paddingRight">@dimen/suw_glif_button_padding</item> - <item name="android:textAllCaps" tools:targetApi="ice_cream_sandwich">?attr/suwButtonAllCaps</item> - <item name="textAllCaps">?attr/suwButtonAllCaps</item> + <item name="android:fontFamily" tools:targetApi="jelly_bean">?attr/sudButtonFontFamily</item> + <item name="android:paddingLeft">@dimen/sud_glif_button_padding</item> + <item name="android:paddingRight">@dimen/sud_glif_button_padding</item> + <item name="android:textAllCaps" tools:targetApi="ice_cream_sandwich">?attr/sudButtonAllCaps</item> + <item name="textAllCaps">?attr/sudButtonAllCaps</item> <!-- Values used in themes --> - <item name="android:buttonCornerRadius" tools:ignore="NewApi">?attr/suwButtonCornerRadius</item> + <item name="android:buttonCornerRadius" tools:ignore="NewApi">?attr/sudButtonCornerRadius</item> </style> - <style name="SuwGlifButton.Secondary" parent="Widget.AppCompat.Button.Borderless.Colored"> + <style name="SudGlifButton.Secondary" parent="Widget.AppCompat.Button.Borderless.Colored"> <!-- This style can be applied to a button either as a "style" in XML, or as a theme in ContextThemeWrapper. These self-referencing attributes make sure this is applied as both to the button. --> - <item name="android:buttonStyle">@style/SuwGlifButton.Secondary</item> - <item name="android:theme">@style/SuwGlifButton.Secondary</item> - <item name="buttonStyle">@style/SuwGlifButton.Secondary</item> + <item name="android:buttonStyle">@style/SudGlifButton.Secondary</item> + <item name="android:theme">@style/SudGlifButton.Secondary</item> + <item name="buttonStyle">@style/SudGlifButton.Secondary</item> <!-- Values used in styles --> - <item name="android:fontFamily" tools:targetApi="jelly_bean">?attr/suwButtonFontFamily</item> + <item name="android:fontFamily" tools:targetApi="jelly_bean">?attr/sudButtonFontFamily</item> <item name="android:minWidth">0dp</item> - <item name="android:paddingLeft">@dimen/suw_glif_button_padding</item> - <item name="android:paddingRight">@dimen/suw_glif_button_padding</item> - <item name="android:textAllCaps" tools:targetApi="ice_cream_sandwich">?attr/suwButtonAllCaps</item> - <item name="textAllCaps">?attr/suwButtonAllCaps</item> + <item name="android:paddingLeft">@dimen/sud_glif_button_padding</item> + <item name="android:paddingRight">@dimen/sud_glif_button_padding</item> + <item name="android:textAllCaps" tools:targetApi="ice_cream_sandwich">?attr/sudButtonAllCaps</item> + <item name="textAllCaps">?attr/sudButtonAllCaps</item> <!-- Values used in themes --> - <item name="android:buttonCornerRadius" tools:ignore="NewApi">?attr/suwButtonCornerRadius</item> - <item name="android:colorControlHighlight" tools:targetApi="lollipop">@color/suw_flat_button_highlight</item> - <item name="colorControlHighlight">@color/suw_flat_button_highlight</item> + <item name="android:buttonCornerRadius" tools:ignore="NewApi">?attr/sudButtonCornerRadius</item> + <item name="android:colorControlHighlight" tools:targetApi="lollipop">@color/sud_flat_button_highlight</item> + <item name="colorControlHighlight">@color/sud_flat_button_highlight</item> </style> <!-- The start and end paddings are asymmetric because start buttons are borderless buttons which aligns the text label. --> - <style name="SuwGlifButtonBar"> + <style name="SudGlifButtonBar"> <item name="android:baselineAligned">false</item> <item name="android:clipChildren">false</item> <item name="android:clipToPadding">false</item> <item name="android:gravity">center_vertical</item> - <item name="android:minHeight">@dimen/suw_glif_footer_min_height</item> + <item name="android:minHeight">@dimen/sud_glif_footer_min_height</item> <item name="android:orientation">horizontal</item> - <item name="android:paddingTop">@dimen/suw_glif_footer_padding_vertical</item> - <item name="android:paddingBottom">@dimen/suw_glif_footer_padding_vertical</item> - <item name="android:paddingEnd" tools:ignore="NewApi">@dimen/suw_glif_button_margin_end</item> - <item name="android:paddingLeft">@dimen/suw_glif_button_margin_start</item> - <item name="android:paddingRight">@dimen/suw_glif_button_margin_end</item> - <item name="android:paddingStart" tools:ignore="NewApi">@dimen/suw_glif_button_margin_start</item> + <item name="android:paddingTop">@dimen/sud_glif_footer_padding_vertical</item> + <item name="android:paddingBottom">@dimen/sud_glif_footer_padding_vertical</item> + <item name="android:paddingEnd" tools:ignore="NewApi">@dimen/sud_glif_button_margin_end</item> + <item name="android:paddingLeft">@dimen/sud_glif_button_margin_start</item> + <item name="android:paddingRight">@dimen/sud_glif_button_margin_end</item> + <item name="android:paddingStart" tools:ignore="NewApi">@dimen/sud_glif_button_margin_start</item> </style> - <style name="SuwGlifButtonBar.Stackable" parent="SuwGlifButtonBar"> + <style name="SudGlifButtonBar.Stackable" parent="SudGlifButtonBar"> <item name="android:gravity">center</item> </style> <!-- Items styles --> - <style name="SuwItemContainer"> + <style name="SudItemContainer"> <item name="android:minHeight">?android:attr/listPreferredItemHeight</item> - <item name="android:paddingBottom">@dimen/suw_items_padding_vertical</item> + <item name="android:paddingBottom">@dimen/sud_items_padding_vertical</item> <item name="android:paddingEnd" tools:ignore="NewApi">?attr/listPreferredItemPaddingRight</item> <item name="android:paddingLeft">?attr/listPreferredItemPaddingLeft</item> <item name="android:paddingRight">?attr/listPreferredItemPaddingRight</item> <item name="android:paddingStart" tools:ignore="NewApi">?attr/listPreferredItemPaddingLeft</item> - <item name="android:paddingTop">@dimen/suw_items_padding_vertical</item> + <item name="android:paddingTop">@dimen/sud_items_padding_vertical</item> </style> - <style name="SuwItemContainer.Description" parent="SuwItemContainer"> - <item name="android:paddingTop">@dimen/suw_description_margin_top</item> - <item name="android:paddingBottom">@dimen/suw_description_margin_bottom_lists</item> + <style name="SudItemContainer.Description" parent="SudItemContainer"> + <item name="android:paddingTop">@dimen/sud_description_margin_top</item> + <item name="android:paddingBottom">@dimen/sud_description_margin_bottom_lists</item> </style> - <style name="SuwItemContainer.Description.Glif" parent="SuwItemContainer.Description"> + <style name="SudItemContainer.Description.Glif" parent="SudItemContainer.Description"> <item name="android:minHeight">0dp</item> - <item name="android:paddingTop">@dimen/suw_description_glif_margin_top</item> - <item name="android:paddingBottom">@dimen/suw_description_glif_margin_bottom_lists</item> + <item name="android:paddingTop">@dimen/sud_description_glif_margin_top</item> + <item name="android:paddingBottom">@dimen/sud_description_glif_margin_bottom_lists</item> </style> - <style name="SuwItemContainer.Verbose" parent="SuwItemContainer"> - <item name="android:paddingBottom">@dimen/suw_items_verbose_padding_vertical</item> - <item name="android:paddingTop">@dimen/suw_items_verbose_padding_vertical</item> + <style name="SudItemContainer.Verbose" parent="SudItemContainer"> + <item name="android:paddingBottom">@dimen/sud_items_verbose_padding_vertical</item> + <item name="android:paddingTop">@dimen/sud_items_verbose_padding_vertical</item> </style> - <style name="SuwItemSummary"> + <style name="SudItemSummary"> <item name="android:textAppearance">?attr/textAppearanceListItemSmall</item> </style> - <style name="SuwItemTitle"> + <style name="SudItemTitle"> <item name="android:textAppearance">?attr/textAppearanceListItem</item> </style> - <style name="SuwItemTitle.GlifDescription" parent="SuwItemTitle"> - <item name="android:gravity">?attr/suwGlifHeaderGravity</item> + <style name="SudItemTitle.GlifDescription" parent="SudItemTitle"> + <item name="android:gravity">?attr/sudGlifHeaderGravity</item> <item name="android:textAlignment" tools:targetApi="jelly_bean_mr1">gravity</item> </style> - <style name="SuwItemTitle.Verbose" parent="SuwItemTitle"> - <item name="android:textAppearance">@style/TextAppearance.SuwGlifBody</item> + <style name="SudItemTitle.Verbose" parent="SudItemTitle"> + <item name="android:textAppearance">@style/TextAppearance.SudGlifBody</item> </style> - <style name="SuwSwitchStyle"> - <item name="android:paddingEnd" tools:ignore="NewApi">@dimen/suw_switch_padding_end</item> - <item name="android:paddingLeft">@dimen/suw_switch_padding_start</item> - <item name="android:paddingRight">@dimen/suw_switch_padding_end</item> - <item name="android:paddingStart" tools:ignore="NewApi">@dimen/suw_switch_padding_start</item> + <style name="SudSwitchStyle"> + <item name="android:paddingEnd" tools:ignore="NewApi">@dimen/sud_switch_padding_end</item> + <item name="android:paddingLeft">@dimen/sud_switch_padding_start</item> + <item name="android:paddingRight">@dimen/sud_switch_padding_end</item> + <item name="android:paddingStart" tools:ignore="NewApi">@dimen/sud_switch_padding_start</item> </style> - <style name="SuwSwitchStyle.Divided" parent="SuwSwitchStyle"> + <style name="SudSwitchStyle.Divided" parent="SudSwitchStyle"> <item name="android:paddingEnd" tools:ignore="NewApi">?attr/listPreferredItemPaddingRight</item> <item name="android:paddingRight">?attr/listPreferredItemPaddingRight</item> </style> - <style name="TextAppearance.SuwItemSummary" parent="android:TextAppearance"> + <style name="TextAppearance.SudItemSummary" parent="android:TextAppearance"> <item name="android:textSize">16sp</item> <item name="android:textColor">?android:attr/textColorSecondary</item> </style> <!-- GLIF layout --> - <style name="SuwGlifHeaderTitle" parent="SuwBaseHeaderTitle"> - <item name="android:gravity">?attr/suwGlifHeaderGravity</item> - <item name="android:layout_marginBottom">@dimen/suw_glif_header_title_margin_bottom</item> - <item name="android:layout_marginLeft">?attr/suwMarginSides</item> - <item name="android:layout_marginRight">?attr/suwMarginSides</item> - <item name="android:layout_marginTop">@dimen/suw_glif_header_title_margin_top</item> - <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/suwFontSecondary</item> + <style name="SudGlifHeaderTitle" parent="SudBaseHeaderTitle"> + <item name="android:gravity">?attr/sudGlifHeaderGravity</item> + <item name="android:layout_marginBottom">@dimen/sud_glif_header_title_margin_bottom</item> + <item name="android:layout_marginLeft">?attr/sudMarginSides</item> + <item name="android:layout_marginRight">?attr/sudMarginSides</item> + <item name="android:layout_marginTop">@dimen/sud_glif_header_title_margin_top</item> + <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/sudFontSecondary</item> <item name="android:textAlignment" tools:targetApi="jelly_bean_mr1">gravity</item> <item name="android:textColor">?android:attr/textColorPrimary</item> </style> - <style name="SuwGlifHeaderContainer"> - <item name="android:gravity">?attr/suwGlifHeaderGravity</item> + <style name="SudGlifHeaderContainer"> + <item name="android:gravity">?attr/sudGlifHeaderGravity</item> </style> - <style name="SuwGlifIcon"> - <item name="android:layout_marginLeft">?attr/suwMarginSides</item> - <item name="android:layout_marginRight">?attr/suwMarginSides</item> - <item name="android:layout_marginTop">@dimen/suw_glif_margin_top</item> + <style name="SudGlifIcon"> + <item name="android:layout_marginLeft">?attr/sudMarginSides</item> + <item name="android:layout_marginRight">?attr/sudMarginSides</item> + <item name="android:layout_marginTop">@dimen/sud_glif_margin_top</item> <item name="android:adjustViewBounds">true</item> - <item name="android:maxHeight">@dimen/suw_glif_icon_max_height</item> + <item name="android:maxHeight">@dimen/sud_glif_icon_max_height</item> <item name="android:scaleType">centerInside</item> </style> - <style name="TextAppearance.SuwGlifBody" parent="android:TextAppearance"> + <style name="TextAppearance.SudGlifBody" parent="android:TextAppearance"> <item name="android:textSize">14sp</item> <item name="android:textColor">?android:attr/textColorPrimary</item> </style> - <style name="TextAppearance.SuwGlifItemTitle" parent="android:TextAppearance"> + <style name="TextAppearance.SudGlifItemTitle" parent="android:TextAppearance"> <item name="android:textSize">16sp</item> <item name="android:textColor">?android:attr/textColorPrimary</item> </style> - <style name="TextAppearance.SuwGlifItemSummary" parent="android:TextAppearance"> + <style name="TextAppearance.SudGlifItemSummary" parent="android:TextAppearance"> <item name="android:textSize">14sp</item> <item name="android:textColor">?android:attr/textColorSecondary</item> </style> <!-- Navigation bar styles --> - <style name="SuwNavBarTheme"> + <style name="SudNavBarTheme"> <item name="android:orientation">horizontal</item> <item name="android:layout_alignParentBottom">true</item> - <item name="android:background">?attr/suwNavBarBackgroundColor</item> - <item name="android:paddingLeft">@dimen/suw_navbar_padding_sides</item> - <item name="android:paddingRight">@dimen/suw_navbar_padding_sides</item> - <item name="suwNavBarTextColor">?android:attr/textColorPrimary</item> + <item name="android:background">?attr/sudNavBarBackgroundColor</item> + <item name="android:paddingLeft">@dimen/sud_navbar_padding_sides</item> + <item name="android:paddingRight">@dimen/sud_navbar_padding_sides</item> + <item name="sudNavBarTextColor">?android:attr/textColorPrimary</item> </style> - <style name="SuwNavBarThemeDark" parent="SuwNavBarTheme"> - <item name="suwNavBarBackgroundColor">@color/suw_navbar_bg_dark</item> - <item name="suwNavBarButtonBackground">@drawable/suw_navbar_btn_bg_dark</item> + <style name="SudNavBarThemeDark" parent="SudNavBarTheme"> + <item name="sudNavBarBackgroundColor">@color/sud_navbar_bg_dark</item> + <item name="sudNavBarButtonBackground">@drawable/sud_navbar_btn_bg_dark</item> </style> - <style name="SuwNavBarThemeLight" parent="SuwNavBarTheme"> - <item name="suwNavBarBackgroundColor">@color/suw_navbar_bg_light</item> - <item name="suwNavBarButtonBackground">@drawable/suw_navbar_btn_bg_light</item> + <style name="SudNavBarThemeLight" parent="SudNavBarTheme"> + <item name="sudNavBarBackgroundColor">@color/sud_navbar_bg_light</item> + <item name="sudNavBarButtonBackground">@drawable/sud_navbar_btn_bg_light</item> </style> - <style name="SuwNavBarButtonStyle" parent="@android:style/Widget.Button"> - <item name="android:background">?attr/suwNavBarButtonBackground</item> - <item name="android:drawablePadding">@dimen/suw_navbar_button_drawable_padding</item> + <style name="SudNavBarButtonStyle" parent="@android:style/Widget.Button"> + <item name="android:background">?attr/sudNavBarButtonBackground</item> + <item name="android:drawablePadding">@dimen/sud_navbar_button_drawable_padding</item> <item name="android:fontFamily" tools:ignore="NewApi">sans-serif</item> <item name="android:minWidth">0dp</item> - <item name="android:paddingLeft">@dimen/suw_navbar_button_padding_sides</item> - <item name="android:paddingRight">@dimen/suw_navbar_button_padding_sides</item> + <item name="android:paddingLeft">@dimen/sud_navbar_button_padding_sides</item> + <item name="android:paddingRight">@dimen/sud_navbar_button_padding_sides</item> <item name="android:textAllCaps" tools:ignore="NewApi">true</item> - <item name="android:textColor">?attr/suwNavBarTextColor</item> - <item name="android:textSize">@dimen/suw_navbar_text_size</item> + <item name="android:textColor">?attr/sudNavBarTextColor</item> + <item name="android:textSize">@dimen/sud_navbar_text_size</item> </style> - <style name="SuwEditText" parent="@android:style/Widget.EditText"> - <item name="android:minHeight">@dimen/suw_edit_text_min_height</item> + <style name="SudEditText" parent="@android:style/Widget.EditText"> + <item name="android:minHeight">@dimen/sud_edit_text_min_height</item> </style> - <style name="SuwAlertDialogTheme" parent="Theme.AppCompat.Dialog.Alert" /> + <style name="SudAlertDialogTheme" parent="Theme.AppCompat.Dialog.Alert" /> - <style name="SuwAlertDialogTheme.Light" parent="Theme.AppCompat.Light.Dialog.Alert" /> + <style name="SudAlertDialogTheme.Light" parent="Theme.AppCompat.Light.Dialog.Alert" /> </resources> diff --git a/main/src/com/google/android/setupdesign/DividerItemDecoration.java b/main/src/com/google/android/setupdesign/DividerItemDecoration.java index 5dfe351..fa0166f 100644 --- a/main/src/com/google/android/setupdesign/DividerItemDecoration.java +++ b/main/src/com/google/android/setupdesign/DividerItemDecoration.java @@ -83,15 +83,15 @@ public class DividerItemDecoration extends RecyclerView.ItemDecoration { public DividerItemDecoration() {} public DividerItemDecoration(Context context) { - final TypedArray a = context.obtainStyledAttributes(R.styleable.SuwDividerItemDecoration); + final TypedArray a = context.obtainStyledAttributes(R.styleable.SudDividerItemDecoration); final Drawable divider = - a.getDrawable(R.styleable.SuwDividerItemDecoration_android_listDivider); + a.getDrawable(R.styleable.SudDividerItemDecoration_android_listDivider); final int dividerHeight = - a.getDimensionPixelSize(R.styleable.SuwDividerItemDecoration_android_dividerHeight, 0); + a.getDimensionPixelSize(R.styleable.SudDividerItemDecoration_android_dividerHeight, 0); @DividerCondition final int dividerCondition = a.getInt( - R.styleable.SuwDividerItemDecoration_suwDividerCondition, DIVIDER_CONDITION_EITHER); + R.styleable.SudDividerItemDecoration_sudDividerCondition, DIVIDER_CONDITION_EITHER); a.recycle(); setDivider(divider); diff --git a/main/src/com/google/android/setupdesign/GlifLayout.java b/main/src/com/google/android/setupdesign/GlifLayout.java index d3a7354..4c21f56 100644 --- a/main/src/com/google/android/setupdesign/GlifLayout.java +++ b/main/src/com/google/android/setupdesign/GlifLayout.java @@ -35,10 +35,10 @@ import android.widget.ProgressBar; import android.widget.ScrollView; import android.widget.TextView; import com.google.android.setupcompat.PartnerCustomizationLayout; +import com.google.android.setupcompat.template.ColoredHeaderMixin; +import com.google.android.setupcompat.template.HeaderMixin; +import com.google.android.setupcompat.template.IconMixin; import com.google.android.setupcompat.template.StatusBarMixin; -import com.google.android.setupdesign.template.ColoredHeaderMixin; -import com.google.android.setupdesign.template.HeaderMixin; -import com.google.android.setupdesign.template.IconMixin; import com.google.android.setupdesign.template.ProgressBarMixin; import com.google.android.setupdesign.template.RequireScrollMixin; import com.google.android.setupdesign.template.ScrollViewScrollHandlingDelegate; @@ -55,7 +55,7 @@ import com.google.android.setupdesign.template.ScrollViewScrollHandlingDelegate; * android:layout_width="match_parent" * android:layout_height="match_parent" * android:icon="@drawable/my_icon" - * app:suwHeaderText="@string/my_title"> + * app:sucHeaderText="@string/my_title"> * * <!-- Content here --> * @@ -83,12 +83,12 @@ public class GlifLayout extends PartnerCustomizationLayout { public GlifLayout(Context context, int template, int containerId) { super(context, template, containerId); - init(null, R.attr.suwLayoutTheme); + init(null, R.attr.sudLayoutTheme); } public GlifLayout(Context context, AttributeSet attrs) { super(context, attrs); - init(attrs, R.attr.suwLayoutTheme); + init(attrs, R.attr.sudLayoutTheme); } @TargetApi(VERSION_CODES.HONEYCOMB) @@ -113,22 +113,22 @@ public class GlifLayout extends PartnerCustomizationLayout { } TypedArray a = - getContext().obtainStyledAttributes(attrs, R.styleable.SuwGlifLayout, defStyleAttr, 0); + getContext().obtainStyledAttributes(attrs, R.styleable.SudGlifLayout, defStyleAttr, 0); - ColorStateList primaryColor = a.getColorStateList(R.styleable.SuwGlifLayout_suwColorPrimary); + ColorStateList primaryColor = a.getColorStateList(R.styleable.SudGlifLayout_sudColorPrimary); if (primaryColor != null) { setPrimaryColor(primaryColor); } ColorStateList backgroundColor = - a.getColorStateList(R.styleable.SuwGlifLayout_suwBackgroundBaseColor); + a.getColorStateList(R.styleable.SudGlifLayout_sudBackgroundBaseColor); setBackgroundBaseColor(backgroundColor); boolean backgroundPatterned = - a.getBoolean(R.styleable.SuwGlifLayout_suwBackgroundPatterned, true); + a.getBoolean(R.styleable.SudGlifLayout_sudBackgroundPatterned, true); setBackgroundPatterned(backgroundPatterned); - final int stickyHeader = a.getResourceId(R.styleable.SuwGlifLayout_suwStickyHeader, 0); + final int stickyHeader = a.getResourceId(R.styleable.SudGlifLayout_sudStickyHeader, 0); if (stickyHeader != 0) { inflateStickyHeader(stickyHeader); } @@ -140,13 +140,13 @@ public class GlifLayout extends PartnerCustomizationLayout { if (template == 0) { template = R.layout.sud_glif_template; } - return inflateTemplate(inflater, R.style.SuwThemeGlif_Light, template); + return inflateTemplate(inflater, R.style.SudThemeGlif_Light, template); } @Override protected ViewGroup findContainer(int containerId) { if (containerId == 0) { - containerId = R.id.suw_layout_content; + containerId = R.id.sud_layout_content; } return super.findContainer(containerId); } @@ -160,13 +160,13 @@ public class GlifLayout extends PartnerCustomizationLayout { * @return The root of the inflated header view. */ public View inflateStickyHeader(@LayoutRes int header) { - ViewStub stickyHeaderStub = findManagedViewById(R.id.suw_layout_sticky_header); + ViewStub stickyHeaderStub = findManagedViewById(R.id.sud_layout_sticky_header); stickyHeaderStub.setLayoutResource(header); return stickyHeaderStub.inflate(); } public ScrollView getScrollView() { - final View view = findManagedViewById(R.id.suw_scroll_view); + final View view = findManagedViewById(R.id.sud_scroll_view); return view instanceof ScrollView ? (ScrollView) view : null; } diff --git a/main/src/com/google/android/setupdesign/GlifListLayout.java b/main/src/com/google/android/setupdesign/GlifListLayout.java index c5a78f3..31335cc 100644 --- a/main/src/com/google/android/setupdesign/GlifListLayout.java +++ b/main/src/com/google/android/setupdesign/GlifListLayout.java @@ -116,8 +116,8 @@ public class GlifListLayout extends GlifLayout { * theme and apply insets to it. * * @param start The number of pixels to inset on the "start" side of the list divider. Typically - * this will be either {@code @dimen/suw_items_glif_icon_divider_inset} or - * {@code @dimen/suw_items_glif_text_divider_inset}. + * this will be either {@code @dimen/sud_items_glif_icon_divider_inset} or + * {@code @dimen/sud_items_glif_text_divider_inset}. * @param end The number of pixels to inset on the "end" side of the list divider. * @see ListMixin#setDividerInsets(int, int) */ diff --git a/main/src/com/google/android/setupdesign/GlifPreferenceLayout.java b/main/src/com/google/android/setupdesign/GlifPreferenceLayout.java index 5947644..f235442 100644 --- a/main/src/com/google/android/setupdesign/GlifPreferenceLayout.java +++ b/main/src/com/google/android/setupdesign/GlifPreferenceLayout.java @@ -84,7 +84,7 @@ public class GlifPreferenceLayout extends GlifRecyclerLayout { @Override protected ViewGroup findContainer(int containerId) { if (containerId == 0) { - containerId = R.id.suw_layout_content; + containerId = R.id.sud_layout_content; } return super.findContainer(containerId); } diff --git a/main/src/com/google/android/setupdesign/GlifRecyclerLayout.java b/main/src/com/google/android/setupdesign/GlifRecyclerLayout.java index c62ac85..c74cff0 100644 --- a/main/src/com/google/android/setupdesign/GlifRecyclerLayout.java +++ b/main/src/com/google/android/setupdesign/GlifRecyclerLayout.java @@ -88,7 +88,7 @@ public class GlifRecyclerLayout extends GlifLayout { @Override protected void onTemplateInflated() { - final View recyclerView = findViewById(R.id.suw_recycler_view); + final View recyclerView = findViewById(R.id.sud_recycler_view); if (recyclerView instanceof RecyclerView) { recyclerMixin = new RecyclerMixin(this, (RecyclerView) recyclerView); } else { @@ -100,7 +100,7 @@ public class GlifRecyclerLayout extends GlifLayout { @Override protected ViewGroup findContainer(int containerId) { if (containerId == 0) { - containerId = R.id.suw_recycler_view; + containerId = R.id.sud_recycler_view; } return super.findContainer(containerId); } diff --git a/main/src/com/google/android/setupdesign/SetupWizardLayout.java b/main/src/com/google/android/setupdesign/SetupWizardLayout.java index a90b839..28df4fc 100644 --- a/main/src/com/google/android/setupdesign/SetupWizardLayout.java +++ b/main/src/com/google/android/setupdesign/SetupWizardLayout.java @@ -39,7 +39,7 @@ import android.view.ViewGroup; import android.widget.ScrollView; import android.widget.TextView; import com.google.android.setupcompat.TemplateLayout; -import com.google.android.setupdesign.template.HeaderMixin; +import com.google.android.setupcompat.template.HeaderMixin; import com.google.android.setupdesign.template.NavigationBarMixin; import com.google.android.setupdesign.template.ProgressBarMixin; import com.google.android.setupdesign.template.RequireScrollMixin; @@ -53,7 +53,7 @@ public class SetupWizardLayout extends TemplateLayout { public SetupWizardLayout(Context context) { super(context, 0, 0); - init(null, R.attr.suwLayoutTheme); + init(null, R.attr.sudLayoutTheme); } public SetupWizardLayout(Context context, int template) { @@ -62,12 +62,12 @@ public class SetupWizardLayout extends TemplateLayout { public SetupWizardLayout(Context context, int template, int containerId) { super(context, template, containerId); - init(null, R.attr.suwLayoutTheme); + init(null, R.attr.sudLayoutTheme); } public SetupWizardLayout(Context context, AttributeSet attrs) { super(context, attrs); - init(attrs, R.attr.suwLayoutTheme); + init(attrs, R.attr.sudLayoutTheme); } @TargetApi(VERSION_CODES.HONEYCOMB) @@ -93,29 +93,29 @@ public class SetupWizardLayout extends TemplateLayout { final TypedArray a = getContext() - .obtainStyledAttributes(attrs, R.styleable.SuwSetupWizardLayout, defStyleAttr, 0); + .obtainStyledAttributes(attrs, R.styleable.SudSetupWizardLayout, defStyleAttr, 0); // Set the background from XML, either directly or built from a bitmap tile - final Drawable background = a.getDrawable(R.styleable.SuwSetupWizardLayout_suwBackground); + final Drawable background = a.getDrawable(R.styleable.SudSetupWizardLayout_sudBackground); if (background != null) { setLayoutBackground(background); } else { final Drawable backgroundTile = - a.getDrawable(R.styleable.SuwSetupWizardLayout_suwBackgroundTile); + a.getDrawable(R.styleable.SudSetupWizardLayout_sudBackgroundTile); if (backgroundTile != null) { setBackgroundTile(backgroundTile); } } // Set the illustration from XML, either directly or built from image + horizontal tile - final Drawable illustration = a.getDrawable(R.styleable.SuwSetupWizardLayout_suwIllustration); + final Drawable illustration = a.getDrawable(R.styleable.SudSetupWizardLayout_sudIllustration); if (illustration != null) { setIllustration(illustration); } else { final Drawable illustrationImage = - a.getDrawable(R.styleable.SuwSetupWizardLayout_suwIllustrationImage); + a.getDrawable(R.styleable.SudSetupWizardLayout_sudIllustrationImage); final Drawable horizontalTile = - a.getDrawable(R.styleable.SuwSetupWizardLayout_suwIllustrationHorizontalTile); + a.getDrawable(R.styleable.SudSetupWizardLayout_sudIllustrationHorizontalTile); if (illustrationImage != null && horizontalTile != null) { setIllustration(illustrationImage, horizontalTile); } @@ -123,19 +123,19 @@ public class SetupWizardLayout extends TemplateLayout { // Set the top padding of the illustration int decorPaddingTop = - a.getDimensionPixelSize(R.styleable.SuwSetupWizardLayout_suwDecorPaddingTop, -1); + a.getDimensionPixelSize(R.styleable.SudSetupWizardLayout_sudDecorPaddingTop, -1); if (decorPaddingTop == -1) { - decorPaddingTop = getResources().getDimensionPixelSize(R.dimen.suw_decor_padding_top); + decorPaddingTop = getResources().getDimensionPixelSize(R.dimen.sud_decor_padding_top); } setDecorPaddingTop(decorPaddingTop); // Set the illustration aspect ratio. See Illustration.setAspectRatio(float). This will - // override suwDecorPaddingTop if its value is not 0. + // override sudDecorPaddingTop if its value is not 0. float illustrationAspectRatio = - a.getFloat(R.styleable.SuwSetupWizardLayout_suwIllustrationAspectRatio, -1f); + a.getFloat(R.styleable.SudSetupWizardLayout_sudIllustrationAspectRatio, -1f); if (illustrationAspectRatio == -1f) { final TypedValue out = new TypedValue(); - getResources().getValue(R.dimen.suw_illustration_aspect_ratio, out, true); + getResources().getValue(R.dimen.sud_illustration_aspect_ratio, out, true); illustrationAspectRatio = out.getFloat(); } setIllustrationAspectRatio(illustrationAspectRatio); @@ -170,13 +170,13 @@ public class SetupWizardLayout extends TemplateLayout { if (template == 0) { template = R.layout.sud_template; } - return inflateTemplate(inflater, R.style.SuwThemeMaterial_Light, template); + return inflateTemplate(inflater, R.style.SudThemeMaterial_Light, template); } @Override protected ViewGroup findContainer(int containerId) { if (containerId == 0) { - containerId = R.id.suw_layout_content; + containerId = R.id.sud_layout_content; } return super.findContainer(containerId); } @@ -186,7 +186,7 @@ public class SetupWizardLayout extends TemplateLayout { } public ScrollView getScrollView() { - final View view = findManagedViewById(R.id.suw_bottom_scroll_view); + final View view = findManagedViewById(R.id.sud_bottom_scroll_view); return view instanceof ScrollView ? (ScrollView) view : null; } @@ -225,7 +225,7 @@ public class SetupWizardLayout extends TemplateLayout { * @param drawable The drawable specifying the illustration. */ public void setIllustration(Drawable drawable) { - final View view = findManagedViewById(R.id.suw_layout_decor); + final View view = findManagedViewById(R.id.sud_layout_decor); if (view instanceof Illustration) { final Illustration illustration = (Illustration) view; illustration.setIllustration(drawable); @@ -242,7 +242,7 @@ public class SetupWizardLayout extends TemplateLayout { * @param horizontalTile Resource ID of the horizontally repeating tile for tablet layout. */ public void setIllustration(int asset, int horizontalTile) { - final View view = findManagedViewById(R.id.suw_layout_decor); + final View view = findManagedViewById(R.id.sud_layout_decor); if (view instanceof Illustration) { final Illustration illustration = (Illustration) view; final Drawable illustrationDrawable = getIllustration(asset, horizontalTile); @@ -251,7 +251,7 @@ public class SetupWizardLayout extends TemplateLayout { } private void setIllustration(Drawable asset, Drawable horizontalTile) { - final View view = findManagedViewById(R.id.suw_layout_decor); + final View view = findManagedViewById(R.id.sud_layout_decor); if (view instanceof Illustration) { final Illustration illustration = (Illustration) view; final Drawable illustrationDrawable = getIllustration(asset, horizontalTile); @@ -267,7 +267,7 @@ public class SetupWizardLayout extends TemplateLayout { * @see com.google.android.setupdesign.view.Illustration#setAspectRatio(float) */ public void setIllustrationAspectRatio(float aspectRatio) { - final View view = findManagedViewById(R.id.suw_layout_decor); + final View view = findManagedViewById(R.id.sud_layout_decor); if (view instanceof Illustration) { final Illustration illustration = (Illustration) view; illustration.setAspectRatio(aspectRatio); @@ -285,7 +285,7 @@ public class SetupWizardLayout extends TemplateLayout { * @param paddingTop The top padding in pixels. */ public void setDecorPaddingTop(int paddingTop) { - final View view = findManagedViewById(R.id.suw_layout_decor); + final View view = findManagedViewById(R.id.sud_layout_decor); if (view != null) { view.setPadding( view.getPaddingLeft(), paddingTop, view.getPaddingRight(), view.getPaddingBottom()); @@ -297,7 +297,7 @@ public class SetupWizardLayout extends TemplateLayout { * bitmap tile and you want it to repeat, use {@link #setBackgroundTile(int)} instead. */ public void setLayoutBackground(Drawable background) { - final View view = findManagedViewById(R.id.suw_layout_decor); + final View view = findManagedViewById(R.id.sud_layout_decor); if (view != null) { //noinspection deprecation view.setBackgroundDrawable(background); @@ -330,7 +330,7 @@ public class SetupWizardLayout extends TemplateLayout { @SuppressLint("RtlHardcoded") private Drawable getIllustration(Drawable asset, Drawable horizontalTile) { final Context context = getContext(); - if (context.getResources().getBoolean(R.bool.suwUseTabletLayout)) { + if (context.getResources().getBoolean(R.bool.sudUseTabletLayout)) { // If it is a "tablet" (sw600dp), create a LayerDrawable with the horizontal tile. if (horizontalTile instanceof BitmapDrawable) { ((BitmapDrawable) horizontalTile).setTileModeX(TileMode.REPEAT); diff --git a/main/src/com/google/android/setupdesign/SetupWizardListLayout.java b/main/src/com/google/android/setupdesign/SetupWizardListLayout.java index ad05735..760602f 100644 --- a/main/src/com/google/android/setupdesign/SetupWizardListLayout.java +++ b/main/src/com/google/android/setupdesign/SetupWizardListLayout.java @@ -106,8 +106,8 @@ public class SetupWizardListLayout extends SetupWizardLayout { * theme and inset it {@code inset} pixels to the right (or left in RTL layouts). * * @param inset The number of pixels to inset on the "start" side of the list divider. Typically - * this will be either {@code @dimen/suw_items_icon_divider_inset} or - * {@code @dimen/suw_items_text_divider_inset}. + * this will be either {@code @dimen/sud_items_icon_divider_inset} or + * {@code @dimen/sud_items_text_divider_inset}. * @see ListMixin#setDividerInset(int) * @deprecated Use {@link #setDividerInsets(int, int)} instead. */ @@ -121,8 +121,8 @@ public class SetupWizardListLayout extends SetupWizardLayout { * theme and apply insets to it. * * @param start The number of pixels to inset on the "start" side of the list divider. Typically - * this will be either {@code @dimen/suw_items_icon_divider_inset} or - * {@code @dimen/suw_items_text_divider_inset}. + * this will be either {@code @dimen/sud_items_icon_divider_inset} or + * {@code @dimen/sud_items_text_divider_inset}. * @param end The number of pixels to inset on the "end" side of the list divider. * @see ListMixin#setDividerInsets(int, int) */ diff --git a/main/src/com/google/android/setupdesign/SetupWizardPreferenceLayout.java b/main/src/com/google/android/setupdesign/SetupWizardPreferenceLayout.java index fe6c5a2..7bfeccb 100644 --- a/main/src/com/google/android/setupdesign/SetupWizardPreferenceLayout.java +++ b/main/src/com/google/android/setupdesign/SetupWizardPreferenceLayout.java @@ -83,7 +83,7 @@ public class SetupWizardPreferenceLayout extends SetupWizardRecyclerLayout { @Override protected ViewGroup findContainer(int containerId) { if (containerId == 0) { - containerId = R.id.suw_layout_content; + containerId = R.id.sud_layout_content; } return super.findContainer(containerId); } diff --git a/main/src/com/google/android/setupdesign/SetupWizardRecyclerLayout.java b/main/src/com/google/android/setupdesign/SetupWizardRecyclerLayout.java index 7808c4c..f0dc138 100644 --- a/main/src/com/google/android/setupdesign/SetupWizardRecyclerLayout.java +++ b/main/src/com/google/android/setupdesign/SetupWizardRecyclerLayout.java @@ -92,7 +92,7 @@ public class SetupWizardRecyclerLayout extends SetupWizardLayout { @Override protected ViewGroup findContainer(int containerId) { if (containerId == 0) { - containerId = R.id.suw_recycler_view; + containerId = R.id.sud_recycler_view; } return super.findContainer(containerId); } @@ -107,7 +107,7 @@ public class SetupWizardRecyclerLayout extends SetupWizardLayout { @Override protected void onTemplateInflated() { - final View recyclerView = findViewById(R.id.suw_recycler_view); + final View recyclerView = findViewById(R.id.sud_recycler_view); if (recyclerView instanceof RecyclerView) { recyclerMixin = new RecyclerMixin(this, (RecyclerView) recyclerView); } else { @@ -141,8 +141,8 @@ public class SetupWizardRecyclerLayout extends SetupWizardLayout { * theme and apply insets to it. * * @param start The number of pixels to inset on the "start" side of the list divider. Typically - * this will be either {@code @dimen/suw_items_icon_divider_inset} or - * {@code @dimen/suw_items_text_divider_inset}. + * this will be either {@code @dimen/sud_items_icon_divider_inset} or + * {@code @dimen/sud_items_text_divider_inset}. * @param end The number of pixels to inset on the "end" side of the list divider. * @see RecyclerMixin#setDividerInsets(int, int) */ diff --git a/main/src/com/google/android/setupdesign/items/AbstractItemHierarchy.java b/main/src/com/google/android/setupdesign/items/AbstractItemHierarchy.java index 6cb5fab..267e4ab 100644 --- a/main/src/com/google/android/setupdesign/items/AbstractItemHierarchy.java +++ b/main/src/com/google/android/setupdesign/items/AbstractItemHierarchy.java @@ -38,8 +38,8 @@ public abstract class AbstractItemHierarchy implements ItemHierarchy { public AbstractItemHierarchy() {} public AbstractItemHierarchy(Context context, AttributeSet attrs) { - TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SuwAbstractItem); - id = a.getResourceId(R.styleable.SuwAbstractItem_android_id, 0); + TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SudAbstractItem); + id = a.getResourceId(R.styleable.SudAbstractItem_android_id, 0); a.recycle(); } diff --git a/main/src/com/google/android/setupdesign/items/ButtonBarItem.java b/main/src/com/google/android/setupdesign/items/ButtonBarItem.java index 77d06d0..0f63a50 100644 --- a/main/src/com/google/android/setupdesign/items/ButtonBarItem.java +++ b/main/src/com/google/android/setupdesign/items/ButtonBarItem.java @@ -40,7 +40,7 @@ import java.util.ArrayList; * <ButtonItem * android:id="@+id/next_button" * android:text="@string/next_button_label - * android:theme="@style/SuwButtonItem.Colored" /> + * android:theme="@style/SudButtonItem.Colored" /> * * </ButtonBarItem> * }</pre> diff --git a/main/src/com/google/android/setupdesign/items/ButtonItem.java b/main/src/com/google/android/setupdesign/items/ButtonItem.java index ffefbcf..a2e746e 100644 --- a/main/src/com/google/android/setupdesign/items/ButtonItem.java +++ b/main/src/com/google/android/setupdesign/items/ButtonItem.java @@ -39,7 +39,7 @@ public class ButtonItem extends AbstractItem implements View.OnClickListener { private boolean enabled = true; private CharSequence text; - private int theme = R.style.SuwButtonItem; + private int theme = R.style.SudButtonItem; private OnClickListener listener; private Button button; @@ -50,10 +50,10 @@ public class ButtonItem extends AbstractItem implements View.OnClickListener { public ButtonItem(Context context, AttributeSet attrs) { super(context, attrs); - TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SuwButtonItem); - enabled = a.getBoolean(R.styleable.SuwButtonItem_android_enabled, true); - text = a.getText(R.styleable.SuwButtonItem_android_text); - theme = a.getResourceId(R.styleable.SuwButtonItem_android_theme, R.style.SuwButtonItem); + TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SudButtonItem); + enabled = a.getBoolean(R.styleable.SudButtonItem_android_enabled, true); + text = a.getText(R.styleable.SudButtonItem_android_text); + theme = a.getResourceId(R.styleable.SudButtonItem_android_theme, R.style.SudButtonItem); a.recycle(); } diff --git a/main/src/com/google/android/setupdesign/items/ExpandableSwitchItem.java b/main/src/com/google/android/setupdesign/items/ExpandableSwitchItem.java index 1e23ff7..d20ed02 100644 --- a/main/src/com/google/android/setupdesign/items/ExpandableSwitchItem.java +++ b/main/src/com/google/android/setupdesign/items/ExpandableSwitchItem.java @@ -54,9 +54,9 @@ public class ExpandableSwitchItem extends SwitchItem public ExpandableSwitchItem(Context context, AttributeSet attrs) { super(context, attrs); - final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SuwExpandableSwitchItem); - collapsedSummary = a.getText(R.styleable.SuwExpandableSwitchItem_suwCollapsedSummary); - expandedSummary = a.getText(R.styleable.SuwExpandableSwitchItem_suwExpandedSummary); + final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SudExpandableSwitchItem); + collapsedSummary = a.getText(R.styleable.SudExpandableSwitchItem_sudCollapsedSummary); + expandedSummary = a.getText(R.styleable.SudExpandableSwitchItem_sudExpandedSummary); a.recycle(); } @@ -91,7 +91,7 @@ public class ExpandableSwitchItem extends SwitchItem /** * Sets the summary text shown when the item is collapsed. Corresponds to the {@code - * app:suwCollapsedSummary} XML attribute. + * app:sudCollapsedSummary} XML attribute. */ public void setCollapsedSummary(CharSequence collapsedSummary) { this.collapsedSummary = collapsedSummary; @@ -107,7 +107,7 @@ public class ExpandableSwitchItem extends SwitchItem /** * Sets the summary text shown when the item is expanded. Corresponds to the {@code - * app:suwExpandedSummary} XML attribute. + * app:sudExpandedSummary} XML attribute. */ public void setExpandedSummary(CharSequence expandedSummary) { this.expandedSummary = expandedSummary; @@ -147,7 +147,7 @@ public class ExpandableSwitchItem extends SwitchItem a.recycle(); if (tintColor != null) { - TextView titleView = (TextView) view.findViewById(R.id.suw_items_title); + TextView titleView = (TextView) view.findViewById(R.id.sud_items_title); for (Drawable drawable : titleView.getCompoundDrawables()) { if (drawable != null) { drawable.setColorFilter(tintColor.getDefaultColor(), Mode.SRC_IN); diff --git a/main/src/com/google/android/setupdesign/items/Item.java b/main/src/com/google/android/setupdesign/items/Item.java index fac23fb..4217b4e 100644 --- a/main/src/com/google/android/setupdesign/items/Item.java +++ b/main/src/com/google/android/setupdesign/items/Item.java @@ -45,13 +45,13 @@ public class Item extends AbstractItem { public Item(Context context, AttributeSet attrs) { super(context, attrs); - TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SuwItem); - enabled = a.getBoolean(R.styleable.SuwItem_android_enabled, true); - icon = a.getDrawable(R.styleable.SuwItem_android_icon); - title = a.getText(R.styleable.SuwItem_android_title); - summary = a.getText(R.styleable.SuwItem_android_summary); - layoutRes = a.getResourceId(R.styleable.SuwItem_android_layout, getDefaultLayoutResource()); - visible = a.getBoolean(R.styleable.SuwItem_android_visible, true); + TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SudItem); + enabled = a.getBoolean(R.styleable.SudItem_android_enabled, true); + icon = a.getDrawable(R.styleable.SudItem_android_icon); + title = a.getText(R.styleable.SudItem_android_title); + summary = a.getText(R.styleable.SudItem_android_summary); + layoutRes = a.getResourceId(R.styleable.SudItem_android_layout, getDefaultLayoutResource()); + visible = a.getBoolean(R.styleable.SudItem_android_visible, true); a.recycle(); } @@ -134,10 +134,10 @@ public class Item extends AbstractItem { @Override public void onBindView(View view) { - TextView label = (TextView) view.findViewById(R.id.suw_items_title); + TextView label = (TextView) view.findViewById(R.id.sud_items_title); label.setText(getTitle()); - TextView summaryView = (TextView) view.findViewById(R.id.suw_items_summary); + TextView summaryView = (TextView) view.findViewById(R.id.sud_items_summary); CharSequence summary = getSummary(); if (summary != null && summary.length() > 0) { summaryView.setText(summary); @@ -146,10 +146,10 @@ public class Item extends AbstractItem { summaryView.setVisibility(View.GONE); } - final View iconContainer = view.findViewById(R.id.suw_items_icon_container); + final View iconContainer = view.findViewById(R.id.sud_items_icon_container); final Drawable icon = getIcon(); if (icon != null) { - final ImageView iconView = (ImageView) view.findViewById(R.id.suw_items_icon); + final ImageView iconView = (ImageView) view.findViewById(R.id.sud_items_icon); // Set the image drawable to null before setting the state and level to avoid affecting // any recycled drawable in the ImageView iconView.setImageDrawable(null); diff --git a/main/src/com/google/android/setupdesign/items/RecyclerItemAdapter.java b/main/src/com/google/android/setupdesign/items/RecyclerItemAdapter.java index 2e86fe0..b8ba8a1 100644 --- a/main/src/com/google/android/setupdesign/items/RecyclerItemAdapter.java +++ b/main/src/com/google/android/setupdesign/items/RecyclerItemAdapter.java @@ -98,19 +98,19 @@ public class RecyclerItemAdapter extends RecyclerView.Adapter<ItemViewHolder> final Object viewTag = view.getTag(); if (!TAG_NO_BACKGROUND.equals(viewTag)) { final TypedArray typedArray = - parent.getContext().obtainStyledAttributes(R.styleable.SuwRecyclerItemAdapter); + parent.getContext().obtainStyledAttributes(R.styleable.SudRecyclerItemAdapter); Drawable selectableItemBackground = typedArray.getDrawable( - R.styleable.SuwRecyclerItemAdapter_android_selectableItemBackground); + R.styleable.SudRecyclerItemAdapter_android_selectableItemBackground); if (selectableItemBackground == null) { selectableItemBackground = - typedArray.getDrawable(R.styleable.SuwRecyclerItemAdapter_selectableItemBackground); + typedArray.getDrawable(R.styleable.SudRecyclerItemAdapter_selectableItemBackground); } Drawable background = view.getBackground(); if (background == null) { background = - typedArray.getDrawable(R.styleable.SuwRecyclerItemAdapter_android_colorBackground); + typedArray.getDrawable(R.styleable.SudRecyclerItemAdapter_android_colorBackground); } if (selectableItemBackground == null || background == null) { diff --git a/main/src/com/google/android/setupdesign/items/SwitchItem.java b/main/src/com/google/android/setupdesign/items/SwitchItem.java index 940acea..862197e 100644 --- a/main/src/com/google/android/setupdesign/items/SwitchItem.java +++ b/main/src/com/google/android/setupdesign/items/SwitchItem.java @@ -59,8 +59,8 @@ public class SwitchItem extends Item implements CompoundButton.OnCheckedChangeLi */ public SwitchItem(Context context, AttributeSet attrs) { super(context, attrs); - final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SuwSwitchItem); - checked = a.getBoolean(R.styleable.SuwSwitchItem_android_checked, false); + final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SudSwitchItem); + checked = a.getBoolean(R.styleable.SudSwitchItem_android_checked, false); a.recycle(); } diff --git a/main/src/com/google/android/setupdesign/template/ColoredHeaderMixin.java b/main/src/com/google/android/setupdesign/template/ColoredHeaderMixin.java deleted file mode 100644 index fb581ca..0000000 --- a/main/src/com/google/android/setupdesign/template/ColoredHeaderMixin.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.setupdesign.template; - -import android.content.res.ColorStateList; -import android.content.res.TypedArray; -import android.util.AttributeSet; -import android.widget.TextView; -import com.google.android.setupcompat.TemplateLayout; -import com.google.android.setupdesign.R; - -/** - * A {@link Mixin} displaying a header text that can be set to different colors. This Mixin is - * registered to the template using HeaderMixin.class, and can be retrieved using: {@code - * (ColoredHeaderMixin) templateLayout.getMixin(HeaderMixin.class}. - */ -public class ColoredHeaderMixin extends HeaderMixin { - - /** {@inheritDoc} */ - public ColoredHeaderMixin(TemplateLayout layout, AttributeSet attrs, int defStyleAttr) { - super(layout, attrs, defStyleAttr); - - final TypedArray a = - layout - .getContext() - .obtainStyledAttributes(attrs, R.styleable.SuwColoredHeaderMixin, defStyleAttr, 0); - - // Set the header color - final ColorStateList headerColor = - a.getColorStateList(R.styleable.SuwColoredHeaderMixin_suwHeaderColor); - if (headerColor != null) { - setColor(headerColor); - } - - a.recycle(); - } - - /** - * Sets the color of the header text. This can also be set via XML using {@code - * app:suwHeaderColor}. - * - * @param color The text color of the header. - */ - public void setColor(ColorStateList color) { - final TextView titleView = getTextView(); - if (titleView != null) { - titleView.setTextColor(color); - } - } - - /** @return The current text color of the header. */ - public ColorStateList getColor() { - final TextView titleView = getTextView(); - return titleView != null ? titleView.getTextColors() : null; - } -} diff --git a/main/src/com/google/android/setupdesign/template/HeaderMixin.java b/main/src/com/google/android/setupdesign/template/HeaderMixin.java deleted file mode 100644 index bde0667..0000000 --- a/main/src/com/google/android/setupdesign/template/HeaderMixin.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.setupdesign.template; - -import android.content.res.TypedArray; -import androidx.annotation.AttrRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import android.util.AttributeSet; -import android.widget.TextView; -import com.google.android.setupcompat.TemplateLayout; -import com.google.android.setupcompat.template.Mixin; -import com.google.android.setupdesign.R; - -/** A {@link Mixin} for setting and getting the header text. */ -public class HeaderMixin implements Mixin { - - private final TemplateLayout templateLayout; - - /** - * @param layout The layout this Mixin belongs to. - * @param attrs XML attributes given to the layout. - * @param defStyleAttr The default style attribute as given to the constructor of the layout. - */ - public HeaderMixin( - @NonNull TemplateLayout layout, @Nullable AttributeSet attrs, @AttrRes int defStyleAttr) { - templateLayout = layout; - - final TypedArray a = - layout - .getContext() - .obtainStyledAttributes(attrs, R.styleable.SuwHeaderMixin, defStyleAttr, 0); - - // Set the header text - final CharSequence headerText = a.getText(R.styleable.SuwHeaderMixin_suwHeaderText); - if (headerText != null) { - setText(headerText); - } - - a.recycle(); - } - - /** @return The TextView displaying the header. */ - public TextView getTextView() { - return (TextView) templateLayout.findManagedViewById(R.id.suw_layout_title); - } - - /** - * Sets the header text. This can also be set via the XML attribute {@code app:suwHeaderText}. - * - * @param title The resource ID of the text to be set as header. - */ - public void setText(int title) { - final TextView titleView = getTextView(); - if (titleView != null) { - titleView.setText(title); - } - } - - /** - * Sets the header text. This can also be set via the XML attribute {@code app:suwHeaderText}. - * - * @param title The text to be set as header. - */ - public void setText(CharSequence title) { - final TextView titleView = getTextView(); - if (titleView != null) { - titleView.setText(title); - } - } - - /** @return The current header text. */ - public CharSequence getText() { - final TextView titleView = getTextView(); - return titleView != null ? titleView.getText() : null; - } -} diff --git a/main/src/com/google/android/setupdesign/template/IconMixin.java b/main/src/com/google/android/setupdesign/template/IconMixin.java deleted file mode 100644 index 7627132..0000000 --- a/main/src/com/google/android/setupdesign/template/IconMixin.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.setupdesign.template; - -import android.content.Context; -import android.content.res.TypedArray; -import android.graphics.drawable.Drawable; -import androidx.annotation.DrawableRes; -import android.util.AttributeSet; -import android.view.View; -import android.widget.ImageView; -import com.google.android.setupcompat.TemplateLayout; -import com.google.android.setupcompat.template.Mixin; -import com.google.android.setupdesign.R; - -/** A {@link Mixin} for setting an icon on the template layout. */ -public class IconMixin implements Mixin { - - private final TemplateLayout templateLayout; - - /** - * @param layout The template layout that this Mixin is a part of. - * @param attrs XML attributes given to the layout. - * @param defStyleAttr The default style attribute as given to the constructor of the layout. - */ - public IconMixin(TemplateLayout layout, AttributeSet attrs, int defStyleAttr) { - templateLayout = layout; - final Context context = layout.getContext(); - - final TypedArray a = - context.obtainStyledAttributes(attrs, R.styleable.SuwIconMixin, defStyleAttr, 0); - - final @DrawableRes int icon = a.getResourceId(R.styleable.SuwIconMixin_android_icon, 0); - if (icon != 0) { - setIcon(icon); - } - - a.recycle(); - } - - /** - * Sets the icon on this layout. The icon can also be set in XML using {@code android:icon}. - * - * @param icon A drawable icon. - */ - public void setIcon(Drawable icon) { - final ImageView iconView = getView(); - if (iconView != null) { - iconView.setImageDrawable(icon); - iconView.setVisibility(icon != null ? View.VISIBLE : View.GONE); - } - } - - /** - * Sets the icon on this layout. The icon can also be set in XML using {@code android:icon}. - * - * @param icon A drawable icon resource. - */ - public void setIcon(@DrawableRes int icon) { - final ImageView iconView = getView(); - if (iconView != null) { - // Note: setImageResource on the ImageView is overridden in AppCompatImageView for - // support lib users, which enables vector drawable compat to work on versions pre-L. - iconView.setImageResource(icon); - iconView.setVisibility(icon != 0 ? View.VISIBLE : View.GONE); - } - } - - /** @return The icon previously set in {@link #setIcon(Drawable)} or {@code android:icon} */ - public Drawable getIcon() { - final ImageView iconView = getView(); - return iconView != null ? iconView.getDrawable() : null; - } - - /** Sets the content description of the icon view */ - public void setContentDescription(CharSequence description) { - final ImageView iconView = getView(); - if (iconView != null) { - iconView.setContentDescription(description); - } - } - - /** @return The content description of the icon view */ - public CharSequence getContentDescription() { - final ImageView iconView = getView(); - return iconView != null ? iconView.getContentDescription() : null; - } - - /** @return The ImageView responsible for displaying the icon. */ - protected ImageView getView() { - return (ImageView) templateLayout.findManagedViewById(R.id.suw_layout_icon); - } -} diff --git a/main/src/com/google/android/setupdesign/template/ListMixin.java b/main/src/com/google/android/setupdesign/template/ListMixin.java index 99ca7c8..012fb86 100644 --- a/main/src/com/google/android/setupdesign/template/ListMixin.java +++ b/main/src/com/google/android/setupdesign/template/ListMixin.java @@ -57,20 +57,20 @@ public class ListMixin implements Mixin { final Context context = layout.getContext(); final TypedArray a = - context.obtainStyledAttributes(attrs, R.styleable.SuwListMixin, defStyleAttr, 0); + context.obtainStyledAttributes(attrs, R.styleable.SudListMixin, defStyleAttr, 0); - final int entries = a.getResourceId(R.styleable.SuwListMixin_android_entries, 0); + final int entries = a.getResourceId(R.styleable.SudListMixin_android_entries, 0); if (entries != 0) { final ItemGroup inflated = (ItemGroup) new ItemInflater(context).inflate(entries); setAdapter(new ItemAdapter(inflated)); } - int dividerInset = a.getDimensionPixelSize(R.styleable.SuwListMixin_suwDividerInset, -1); + int dividerInset = a.getDimensionPixelSize(R.styleable.SudListMixin_sudDividerInset, -1); if (dividerInset != -1) { setDividerInset(dividerInset); } else { int dividerInsetStart = - a.getDimensionPixelSize(R.styleable.SuwListMixin_suwDividerInsetStart, 0); - int dividerInsetEnd = a.getDimensionPixelSize(R.styleable.SuwListMixin_suwDividerInsetEnd, 0); + a.getDimensionPixelSize(R.styleable.SudListMixin_sudDividerInsetStart, 0); + int dividerInsetEnd = a.getDimensionPixelSize(R.styleable.SudListMixin_sudDividerInsetEnd, 0); setDividerInsets(dividerInsetStart, dividerInsetEnd); } a.recycle(); @@ -145,8 +145,8 @@ public class ListMixin implements Mixin { * theme and apply insets to it. * * @param start The number of pixels to inset on the "start" side of the list divider. Typically - * this will be either {@code @dimen/suw_items_glif_icon_divider_inset} or - * {@code @dimen/suw_items_glif_text_divider_inset}. + * this will be either {@code @dimen/sud_items_glif_icon_divider_inset} or + * {@code @dimen/sud_items_glif_text_divider_inset}. * @param end The number of pixels to inset on the "end" side of the list divider. */ public void setDividerInsets(int start, int end) { diff --git a/main/src/com/google/android/setupdesign/template/NavigationBarMixin.java b/main/src/com/google/android/setupdesign/template/NavigationBarMixin.java index f9e29ed..3ef9a34 100644 --- a/main/src/com/google/android/setupdesign/template/NavigationBarMixin.java +++ b/main/src/com/google/android/setupdesign/template/NavigationBarMixin.java @@ -38,7 +38,7 @@ public class NavigationBarMixin implements Mixin { * navigation bar. */ public NavigationBar getNavigationBar() { - final View view = templateLayout.findManagedViewById(R.id.suw_layout_navigation_bar); + final View view = templateLayout.findManagedViewById(R.id.sud_layout_navigation_bar); return view instanceof NavigationBar ? (NavigationBar) view : null; } diff --git a/main/src/com/google/android/setupdesign/template/ProgressBarMixin.java b/main/src/com/google/android/setupdesign/template/ProgressBarMixin.java index 61b9e86..717fd57 100644 --- a/main/src/com/google/android/setupdesign/template/ProgressBarMixin.java +++ b/main/src/com/google/android/setupdesign/template/ProgressBarMixin.java @@ -41,7 +41,7 @@ public class ProgressBarMixin implements Mixin { /** @return True if the progress bar is currently shown. */ public boolean isShown() { - final View progressBar = templateLayout.findManagedViewById(R.id.suw_layout_progress); + final View progressBar = templateLayout.findManagedViewById(R.id.sud_layout_progress); return progressBar != null && progressBar.getVisibility() == View.VISIBLE; } @@ -76,7 +76,7 @@ public class ProgressBarMixin implements Mixin { final View progressBar = peekProgressBar(); if (progressBar == null) { final ViewStub progressBarStub = - (ViewStub) templateLayout.findManagedViewById(R.id.suw_layout_progress_stub); + (ViewStub) templateLayout.findManagedViewById(R.id.sud_layout_progress_stub); if (progressBarStub != null) { progressBarStub.inflate(); } @@ -94,7 +94,7 @@ public class ProgressBarMixin implements Mixin { * or if the template does not contain a progress bar. */ public ProgressBar peekProgressBar() { - return (ProgressBar) templateLayout.findManagedViewById(R.id.suw_layout_progress); + return (ProgressBar) templateLayout.findManagedViewById(R.id.sud_layout_progress); } /** Sets the color of the indeterminate progress bar. This method is a no-op on SDK < 21. */ diff --git a/main/src/com/google/android/setupdesign/template/RecyclerMixin.java b/main/src/com/google/android/setupdesign/template/RecyclerMixin.java index b1809e8..e523dbc 100644 --- a/main/src/com/google/android/setupdesign/template/RecyclerMixin.java +++ b/main/src/com/google/android/setupdesign/template/RecyclerMixin.java @@ -100,23 +100,23 @@ public class RecyclerMixin implements Mixin { public void parseAttributes(@Nullable AttributeSet attrs, int defStyleAttr) { final Context context = templateLayout.getContext(); final TypedArray a = - context.obtainStyledAttributes(attrs, R.styleable.SuwRecyclerMixin, defStyleAttr, 0); + context.obtainStyledAttributes(attrs, R.styleable.SudRecyclerMixin, defStyleAttr, 0); - final int entries = a.getResourceId(R.styleable.SuwRecyclerMixin_android_entries, 0); + final int entries = a.getResourceId(R.styleable.SudRecyclerMixin_android_entries, 0); if (entries != 0) { final ItemHierarchy inflated = new ItemInflater(context).inflate(entries); final RecyclerItemAdapter adapter = new RecyclerItemAdapter(inflated); - adapter.setHasStableIds(a.getBoolean(R.styleable.SuwRecyclerMixin_suwHasStableIds, false)); + adapter.setHasStableIds(a.getBoolean(R.styleable.SudRecyclerMixin_sudHasStableIds, false)); setAdapter(adapter); } - int dividerInset = a.getDimensionPixelSize(R.styleable.SuwRecyclerMixin_suwDividerInset, -1); + int dividerInset = a.getDimensionPixelSize(R.styleable.SudRecyclerMixin_sudDividerInset, -1); if (dividerInset != -1) { setDividerInset(dividerInset); } else { int dividerInsetStart = - a.getDimensionPixelSize(R.styleable.SuwRecyclerMixin_suwDividerInsetStart, 0); + a.getDimensionPixelSize(R.styleable.SudRecyclerMixin_sudDividerInsetStart, 0); int dividerInsetEnd = - a.getDimensionPixelSize(R.styleable.SuwRecyclerMixin_suwDividerInsetEnd, 0); + a.getDimensionPixelSize(R.styleable.SudRecyclerMixin_sudDividerInsetEnd, 0); setDividerInsets(dividerInsetStart, dividerInsetEnd); } @@ -124,7 +124,7 @@ public class RecyclerMixin implements Mixin { } /** - * @return The recycler view contained in the layout, as marked by {@code @id/suw_recycler_view}. + * @return The recycler view contained in the layout, as marked by {@code @id/sud_recycler_view}. * This will return {@code null} if the recycler view doesn't exist in the layout. */ @SuppressWarnings("NullableProblems") // If clients guarantee that the template has a recycler @@ -187,8 +187,8 @@ public class RecyclerMixin implements Mixin { * theme and apply insets to it. * * @param start The number of pixels to inset on the "start" side of the list divider. Typically - * this will be either {@code @dimen/suw_items_glif_icon_divider_inset} or - * {@code @dimen/suw_items_glif_text_divider_inset}. + * this will be either {@code @dimen/sud_items_glif_icon_divider_inset} or + * {@code @dimen/sud_items_glif_text_divider_inset}. * @param end The number of pixels to inset on the "end" side of the list divider. */ public void setDividerInsets(int start, int end) { diff --git a/main/src/com/google/android/setupdesign/util/Partner.java b/main/src/com/google/android/setupdesign/util/Partner.java index d335490..b35237c 100644 --- a/main/src/com/google/android/setupdesign/util/Partner.java +++ b/main/src/com/google/android/setupdesign/util/Partner.java @@ -45,7 +45,7 @@ import java.util.List; */ public class Partner { - private static final String TAG = "(SUW) Partner"; + private static final String TAG = "(setupdesign) Partner"; /** Marker action used to discover partner. */ private static final String ACTION_PARTNER_CUSTOMIZATION = diff --git a/main/src/com/google/android/setupdesign/util/ThemeResolver.java b/main/src/com/google/android/setupdesign/util/ThemeResolver.java index 2870af9..d0264e0 100644 --- a/main/src/com/google/android/setupdesign/util/ThemeResolver.java +++ b/main/src/com/google/android/setupdesign/util/ThemeResolver.java @@ -53,7 +53,7 @@ public class ThemeResolver { if (defaultResolver == null) { defaultResolver = new ThemeResolver.Builder() - .setDefaultTheme(R.style.SuwThemeGlif_DayNight) + .setDefaultTheme(R.style.SudThemeGlif_DayNight) .setUseDayNight(true) .build(); } @@ -114,7 +114,7 @@ public class ThemeResolver { * Returns the corresponding DayNight theme resource ID for the given string theme. DayNight * themes are themes that will be either light or dark depending on the system setting. For * example, the string {@link ThemeHelper#THEME_GLIF_LIGHT} will return - * {@code @style/SuwThemeGlif.DayNight}. + * {@code @style/SudThemeGlif.DayNight}. */ @StyleRes private static int getDayNightThemeRes(@Nullable String theme) { @@ -122,16 +122,16 @@ public class ThemeResolver { switch (theme) { case ThemeHelper.THEME_GLIF_V3_LIGHT: case ThemeHelper.THEME_GLIF_V3: - return R.style.SuwThemeGlifV3_DayNight; + return R.style.SudThemeGlifV3_DayNight; case ThemeHelper.THEME_GLIF_V2_LIGHT: case ThemeHelper.THEME_GLIF_V2: - return R.style.SuwThemeGlifV2_DayNight; + return R.style.SudThemeGlifV2_DayNight; case ThemeHelper.THEME_GLIF_LIGHT: case ThemeHelper.THEME_GLIF: - return R.style.SuwThemeGlif_DayNight; + return R.style.SudThemeGlif_DayNight; case ThemeHelper.THEME_MATERIAL_LIGHT: case ThemeHelper.THEME_MATERIAL: - return R.style.SuwThemeMaterial_DayNight; + return R.style.SudThemeMaterial_DayNight; default: // fall through } @@ -141,28 +141,28 @@ public class ThemeResolver { /** * Returns the theme resource ID for the given string theme. For example, the string {@link - * ThemeHelper#THEME_GLIF_LIGHT} will return {@code @style/SuwThemeGlif.Light}. + * ThemeHelper#THEME_GLIF_LIGHT} will return {@code @style/SudThemeGlif.Light}. */ @StyleRes private static int getThemeRes(@Nullable String theme) { if (theme != null) { switch (theme) { case ThemeHelper.THEME_GLIF_V3_LIGHT: - return R.style.SuwThemeGlifV3_Light; + return R.style.SudThemeGlifV3_Light; case ThemeHelper.THEME_GLIF_V3: - return R.style.SuwThemeGlifV3; + return R.style.SudThemeGlifV3; case ThemeHelper.THEME_GLIF_V2_LIGHT: - return R.style.SuwThemeGlifV2_Light; + return R.style.SudThemeGlifV2_Light; case ThemeHelper.THEME_GLIF_V2: - return R.style.SuwThemeGlifV2; + return R.style.SudThemeGlifV2; case ThemeHelper.THEME_GLIF_LIGHT: - return R.style.SuwThemeGlif_Light; + return R.style.SudThemeGlif_Light; case ThemeHelper.THEME_GLIF: - return R.style.SuwThemeGlif; + return R.style.SudThemeGlif; case ThemeHelper.THEME_MATERIAL_LIGHT: - return R.style.SuwThemeMaterial_Light; + return R.style.SudThemeMaterial_Light; case ThemeHelper.THEME_MATERIAL: - return R.style.SuwThemeMaterial; + return R.style.SudThemeMaterial; default: // fall through } @@ -203,7 +203,7 @@ public class ThemeResolver { /** Builder class for {@link ThemeResolver}. */ public static class Builder { - @StyleRes private int defaultTheme = R.style.SuwThemeGlif_DayNight; + @StyleRes private int defaultTheme = R.style.SudThemeGlif_DayNight; @Nullable private String oldestSupportedTheme = null; private boolean useDayNight = true; diff --git a/main/src/com/google/android/setupdesign/view/ButtonBarLayout.java b/main/src/com/google/android/setupdesign/view/ButtonBarLayout.java index add436a..c3188f2 100644 --- a/main/src/com/google/android/setupdesign/view/ButtonBarLayout.java +++ b/main/src/com/google/android/setupdesign/view/ButtonBarLayout.java @@ -84,10 +84,10 @@ public class ButtonBarLayout extends LinearLayout { View child = getChildAt(i); LayoutParams childParams = (LayoutParams) child.getLayoutParams(); if (stacked) { - child.setTag(R.id.suw_original_weight, childParams.weight); + child.setTag(R.id.sud_original_weight, childParams.weight); childParams.weight = 0; } else { - Float weight = (Float) child.getTag(R.id.suw_original_weight); + Float weight = (Float) child.getTag(R.id.sud_original_weight); if (weight != null) { childParams.weight = weight; } diff --git a/main/src/com/google/android/setupdesign/view/FillContentLayout.java b/main/src/com/google/android/setupdesign/view/FillContentLayout.java index d11333b..49e195f 100644 --- a/main/src/com/google/android/setupdesign/view/FillContentLayout.java +++ b/main/src/com/google/android/setupdesign/view/FillContentLayout.java @@ -49,7 +49,7 @@ public class FillContentLayout extends FrameLayout { } public FillContentLayout(Context context, AttributeSet attrs) { - this(context, attrs, R.attr.suwFillContentLayoutStyle); + this(context, attrs, R.attr.sudFillContentLayoutStyle); } public FillContentLayout(Context context, AttributeSet attrs, int defStyleAttr) { @@ -59,10 +59,10 @@ public class FillContentLayout extends FrameLayout { private void init(Context context, AttributeSet attrs, int defStyleAttr) { TypedArray a = - context.obtainStyledAttributes(attrs, R.styleable.SuwFillContentLayout, defStyleAttr, 0); + context.obtainStyledAttributes(attrs, R.styleable.SudFillContentLayout, defStyleAttr, 0); - maxHeight = a.getDimensionPixelSize(R.styleable.SuwFillContentLayout_android_maxHeight, -1); - maxWidth = a.getDimensionPixelSize(R.styleable.SuwFillContentLayout_android_maxWidth, -1); + maxHeight = a.getDimensionPixelSize(R.styleable.SudFillContentLayout_android_maxHeight, -1); + maxWidth = a.getDimensionPixelSize(R.styleable.SudFillContentLayout_android_maxWidth, -1); a.recycle(); } diff --git a/main/src/com/google/android/setupdesign/view/HeaderRecyclerView.java b/main/src/com/google/android/setupdesign/view/HeaderRecyclerView.java index c5f2593..0e40875 100644 --- a/main/src/com/google/android/setupdesign/view/HeaderRecyclerView.java +++ b/main/src/com/google/android/setupdesign/view/HeaderRecyclerView.java @@ -31,7 +31,7 @@ import com.google.android.setupdesign.R; /** * A RecyclerView that can display a header item at the start of the list. The header can be set by - * {@code app:suwHeader} in XML. Note that the header will not be inflated until a layout manager is + * {@code app:sudHeader} in XML. Note that the header will not be inflated until a layout manager is * set. */ public class HeaderRecyclerView extends RecyclerView { @@ -219,8 +219,8 @@ public class HeaderRecyclerView extends RecyclerView { private void init(AttributeSet attrs, int defStyleAttr) { final TypedArray a = getContext() - .obtainStyledAttributes(attrs, R.styleable.SuwHeaderRecyclerView, defStyleAttr, 0); - headerRes = a.getResourceId(R.styleable.SuwHeaderRecyclerView_suwHeader, 0); + .obtainStyledAttributes(attrs, R.styleable.SudHeaderRecyclerView, defStyleAttr, 0); + headerRes = a.getResourceId(R.styleable.SudHeaderRecyclerView_sudHeader, 0); a.recycle(); } diff --git a/main/src/com/google/android/setupdesign/view/Illustration.java b/main/src/com/google/android/setupdesign/view/Illustration.java index 2b4924e..14072db 100644 --- a/main/src/com/google/android/setupdesign/view/Illustration.java +++ b/main/src/com/google/android/setupdesign/view/Illustration.java @@ -72,8 +72,8 @@ public class Illustration extends FrameLayout { private void init(AttributeSet attrs, int defStyleAttr) { if (attrs != null) { TypedArray a = - getContext().obtainStyledAttributes(attrs, R.styleable.SuwIllustration, defStyleAttr, 0); - aspectRatio = a.getFloat(R.styleable.SuwIllustration_suwAspectRatio, 0.0f); + getContext().obtainStyledAttributes(attrs, R.styleable.SudIllustration, defStyleAttr, 0); + aspectRatio = a.getFloat(R.styleable.SudIllustration_sudAspectRatio, 0.0f); a.recycle(); } // Number of pixels of the 8dp baseline grid as defined in material design specs diff --git a/main/src/com/google/android/setupdesign/view/IllustrationVideoView.java b/main/src/com/google/android/setupdesign/view/IllustrationVideoView.java index 91743c7..928fe92 100644 --- a/main/src/com/google/android/setupdesign/view/IllustrationVideoView.java +++ b/main/src/com/google/android/setupdesign/view/IllustrationVideoView.java @@ -44,8 +44,8 @@ import java.io.IOException; * A view for displaying videos in a continuous loop (without audio). This is typically used for * animated illustrations. * - * <p>The video can be specified using {@code app:suwVideo}, specifying the raw resource to the mp4 - * video. Optionally, {@code app:suwLoopStartMs} can be used to specify which part of the video it + * <p>The video can be specified using {@code app:sudVideo}, specifying the raw resource to the mp4 + * video. Optionally, {@code app:sudLoopStartMs} can be used to specify which part of the video it * should loop back to * * <p>For optimal file size, use avconv or other video compression tool to remove the unused audio @@ -79,8 +79,8 @@ public class IllustrationVideoView extends TextureView public IllustrationVideoView(Context context, AttributeSet attrs) { super(context, attrs); final TypedArray a = - context.obtainStyledAttributes(attrs, R.styleable.SuwIllustrationVideoView); - final int videoResId = a.getResourceId(R.styleable.SuwIllustrationVideoView_suwVideo, 0); + context.obtainStyledAttributes(attrs, R.styleable.SudIllustrationVideoView); + final int videoResId = a.getResourceId(R.styleable.SudIllustrationVideoView_sudVideo, 0); a.recycle(); setVideoResource(videoResId); diff --git a/main/src/com/google/android/setupdesign/view/IntrinsicSizeFrameLayout.java b/main/src/com/google/android/setupdesign/view/IntrinsicSizeFrameLayout.java index 926f3c9..f714205 100644 --- a/main/src/com/google/android/setupdesign/view/IntrinsicSizeFrameLayout.java +++ b/main/src/com/google/android/setupdesign/view/IntrinsicSizeFrameLayout.java @@ -56,11 +56,11 @@ public class IntrinsicSizeFrameLayout extends FrameLayout { private void init(Context context, AttributeSet attrs, int defStyleAttr) { final TypedArray a = context.obtainStyledAttributes( - attrs, R.styleable.SuwIntrinsicSizeFrameLayout, defStyleAttr, 0); + attrs, R.styleable.SudIntrinsicSizeFrameLayout, defStyleAttr, 0); intrinsicHeight = - a.getDimensionPixelSize(R.styleable.SuwIntrinsicSizeFrameLayout_android_height, 0); + a.getDimensionPixelSize(R.styleable.SudIntrinsicSizeFrameLayout_android_height, 0); intrinsicWidth = - a.getDimensionPixelSize(R.styleable.SuwIntrinsicSizeFrameLayout_android_width, 0); + a.getDimensionPixelSize(R.styleable.SudIntrinsicSizeFrameLayout_android_width, 0); a.recycle(); } diff --git a/main/src/com/google/android/setupdesign/view/NavigationBar.java b/main/src/com/google/android/setupdesign/view/NavigationBar.java index ac0f8c8..9d978f0 100644 --- a/main/src/com/google/android/setupdesign/view/NavigationBar.java +++ b/main/src/com/google/android/setupdesign/view/NavigationBar.java @@ -50,16 +50,16 @@ public class NavigationBar extends LinearLayout implements View.OnClickListener private static int getNavbarTheme(Context context) { // Normally we can automatically guess the theme by comparing the foreground color against - // the background color. But we also allow specifying explicitly using suwNavBarTheme. + // the background color. But we also allow specifying explicitly using sudNavBarTheme. TypedArray attributes = context.obtainStyledAttributes( new int[] { - R.attr.suwNavBarTheme, android.R.attr.colorForeground, android.R.attr.colorBackground + R.attr.sudNavBarTheme, android.R.attr.colorForeground, android.R.attr.colorBackground }); - @StyleableRes int suwNavBarTheme = 0; + @StyleableRes int navBarTheme = 0; @StyleableRes int colorForeground = 1; @StyleableRes int colorBackground = 2; - int theme = attributes.getResourceId(suwNavBarTheme, 0); + int theme = attributes.getResourceId(navBarTheme, 0); if (theme == 0) { // Compare the value of the foreground against the background color to see if current // theme is light-on-dark or dark-on-light. @@ -68,7 +68,7 @@ public class NavigationBar extends LinearLayout implements View.OnClickListener Color.colorToHSV(attributes.getColor(colorForeground, 0), foregroundHsv); Color.colorToHSV(attributes.getColor(colorBackground, 0), backgroundHsv); boolean isDarkBg = foregroundHsv[2] > backgroundHsv[2]; - theme = isDarkBg ? R.style.SuwNavBarThemeDark : R.style.SuwNavBarThemeLight; + theme = isDarkBg ? R.style.SudNavBarThemeDark : R.style.SudNavBarThemeLight; } attributes.recycle(); return theme; @@ -104,9 +104,9 @@ public class NavigationBar extends LinearLayout implements View.OnClickListener // available in LinearLayout before v11, so call super with the exact same arguments. private void init() { View.inflate(getContext(), R.layout.sud_navbar_view, this); - nextButton = (Button) findViewById(R.id.suw_navbar_next); - backButton = (Button) findViewById(R.id.suw_navbar_back); - moreButton = (Button) findViewById(R.id.suw_navbar_more); + nextButton = (Button) findViewById(R.id.sud_navbar_next); + backButton = (Button) findViewById(R.id.sud_navbar_back); + moreButton = (Button) findViewById(R.id.sud_navbar_more); } public Button getBackButton() { diff --git a/main/src/com/google/android/setupdesign/view/StickyHeaderListView.java b/main/src/com/google/android/setupdesign/view/StickyHeaderListView.java index d5fef1a..3efb85c 100644 --- a/main/src/com/google/android/setupdesign/view/StickyHeaderListView.java +++ b/main/src/com/google/android/setupdesign/view/StickyHeaderListView.java @@ -75,8 +75,8 @@ public class StickyHeaderListView extends ListView { private void init(AttributeSet attrs, int defStyleAttr) { final TypedArray a = getContext() - .obtainStyledAttributes(attrs, R.styleable.SuwStickyHeaderListView, defStyleAttr, 0); - int headerResId = a.getResourceId(R.styleable.SuwStickyHeaderListView_suwHeader, 0); + .obtainStyledAttributes(attrs, R.styleable.SudStickyHeaderListView, defStyleAttr, 0); + int headerResId = a.getResourceId(R.styleable.SudStickyHeaderListView_sudHeader, 0); if (headerResId != 0) { LayoutInflater inflater = LayoutInflater.from(getContext()); View header = inflater.inflate(headerResId, this, false); |
