From 7c7eb70dc3e06c78f971cbf00c6b577d9b194394 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Wed, 11 Nov 2015 16:45:49 -0500 Subject: [PATCH] First pass at restyling dashboard Still needs summaries, but the things are in the right place-ish. Change-Id: I1cbc23da9f56589836b5ebd7e202114e8f323adc --- res/drawable/selectable_card.xml | 21 ++ res/layout/dashboard.xml | 27 +- res/layout/dashboard_category.xml | 17 +- res/layout/dashboard_spacer.xml | 19 ++ res/layout/dashboard_tile.xml | 18 +- res/layout/see_all.xml | 65 ++++ res/values/strings.xml | 5 + res/values/styles.xml | 2 +- .../settings/dashboard/DashboardSummary.java | 312 ++++++++++++------ 9 files changed, 345 insertions(+), 141 deletions(-) create mode 100644 res/drawable/selectable_card.xml create mode 100644 res/layout/dashboard_spacer.xml create mode 100644 res/layout/see_all.xml diff --git a/res/drawable/selectable_card.xml b/res/drawable/selectable_card.xml new file mode 100644 index 00000000000..554b9f6778c --- /dev/null +++ b/res/drawable/selectable_card.xml @@ -0,0 +1,21 @@ + + + + + + diff --git a/res/layout/dashboard.xml b/res/layout/dashboard.xml index 0563fc00c3b..ae5be68dd30 100644 --- a/res/layout/dashboard.xml +++ b/res/layout/dashboard.xml @@ -14,24 +14,13 @@ limitations under the License. --> - - - - - + android:paddingStart="@dimen/dashboard_padding_start" + android:paddingEnd="@dimen/dashboard_padding_end" + android:paddingTop="@dimen/dashboard_padding_top" + android:paddingBottom="@dimen/dashboard_padding_bottom" + android:clipToPadding="false" /> diff --git a/res/layout/dashboard_category.xml b/res/layout/dashboard_category.xml index bee063e6eb3..9109440431e 100644 --- a/res/layout/dashboard_category.xml +++ b/res/layout/dashboard_category.xml @@ -21,11 +21,16 @@ android:paddingStart="@dimen/dashboard_category_padding_start" android:paddingEnd="@dimen/dashboard_category_padding_end" android:orientation="vertical" + android:paddingBottom="8dip" android:background="@color/card_background" - android:layout_marginBottom="8dip" - android:elevation="@dimen/dashboard_category_elevation"> + android:elevation="@dimen/dashboard_category_elevation" > - + + - - diff --git a/res/layout/dashboard_spacer.xml b/res/layout/dashboard_spacer.xml new file mode 100644 index 00000000000..d7d9717b3d6 --- /dev/null +++ b/res/layout/dashboard_spacer.xml @@ -0,0 +1,19 @@ + + + + diff --git a/res/layout/dashboard_tile.xml b/res/layout/dashboard_tile.xml index aa1d00e1414..d1625c7e68c 100644 --- a/res/layout/dashboard_tile.xml +++ b/res/layout/dashboard_tile.xml @@ -19,10 +19,13 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" - android:minHeight="@dimen/dashboard_tile_minimum_height"> + android:minHeight="@dimen/dashboard_tile_minimum_height" + android:clickable="true" + android:background="@drawable/selectable_card" + android:elevation="@dimen/dashboard_category_elevation" > - - - - - \ No newline at end of file + diff --git a/res/layout/see_all.xml b/res/layout/see_all.xml new file mode 100644 index 00000000000..fff4d076ad7 --- /dev/null +++ b/res/layout/see_all.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/values/strings.xml b/res/values/strings.xml index df4d7a4dda6..f9a8feeb2b0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -6989,4 +6989,9 @@ Custom (%d) + + + See all + + See less diff --git a/res/values/styles.xml b/res/values/styles.xml index 8b400efbec3..87e51031ab8 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -299,7 +299,7 @@