Adjust the the layout of the category tiles, including font size and color.
Screenshot: https://screenshot.googleplex.com/7xzErwj8uKS.png
UX deck: https://docs.google.com/presentation/d/15JadcGi5k1_0znUN_XdFpU7UxeXwxjK3Y7LxvhW5ETM/edit?ts=5e7828e0#slide=id.g7cc7612850_7_39
Bug: 152201119
Change-Id: I6ff8518ee77dd976881f5f8fedc90a7bff3a3d43
diff --git a/res/color/option_title_color.xml b/res/color/option_title_color.xml
new file mode 100644
index 0000000..2809247
--- /dev/null
+++ b/res/color/option_title_color.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2019 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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:state_activated="true"
+ android:color="?android:colorAccent" />
+ <item
+ android:state_activated="false"
+ android:alpha="0.54"
+ android:color="?android:colorForeground" />
+ <item
+ android:color="?android:colorForeground"/>
+</selector>
diff --git a/res/layout/fragment_category_selector.xml b/res/layout/fragment_category_selector.xml
index 2e83774..6f74eb4 100644
--- a/res/layout/fragment_category_selector.xml
+++ b/res/layout/fragment_category_selector.xml
@@ -21,7 +21,6 @@
android:clipToPadding="false"
android:fitsSystemWindows="true"
android:paddingHorizontal="@dimen/grid_edge_space"
- android:paddingTop="@dimen/grid_padding"
android:scrollbarSize="@dimen/grid_padding"
android:scrollbarStyle="outsideOverlay"
android:scrollbarThumbVertical="@color/scrollbar_thumb_color_dark"
diff --git a/res/layout/grid_item_category.xml b/res/layout/grid_item_category.xml
index 026f694..3953153 100755
--- a/res/layout/grid_item_category.xml
+++ b/res/layout/grid_item_category.xml
@@ -27,17 +27,14 @@
android:id="@+id/category_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="1"
+ android:layout_marginTop="@dimen/grid_item_category_label_padding_top"
+ android:layout_marginBottom="@dimen/grid_item_category_label_padding_bottom"
android:background="@color/category_title_scrim_color"
android:ellipsize="end"
- android:gravity="center_horizontal|bottom"
+ android:gravity="center"
android:maxLines="1"
- android:paddingTop="@dimen/grid_item_category_label_padding_top"
- android:paddingBottom="@dimen/grid_item_category_label_padding_bottom"
- android:textAlignment="center"
- android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title"
- android:textColor="@color/category_title_text_color"
- android:textSize="@dimen/abc_text_size_subhead_material"
+ android:minHeight="@dimen/grid_item_category_label_minimum_height"
+ android:textAppearance="@style/OptionTitleTextAppearance"
tools:text="Wallpaper category" />
<androidx.cardview.widget.CardView
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index af6442c..69bf7f8 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -24,6 +24,7 @@
<dimen name="grid_item_category_label_padding">12dp</dimen>
<dimen name="grid_item_category_label_padding_top">12dp</dimen>
<dimen name="grid_item_category_label_padding_bottom">4dp</dimen>
+ <dimen name="grid_item_category_label_minimum_height">16dp</dimen>
<dimen name="grid_item_category_overlay_icon_margin_bottom">24dp</dimen>
<dimen name="grid_item_category_title_height">48dp</dimen>
<dimen name="grid_tile_aspect_height">340dp</dimen>
@@ -213,4 +214,5 @@
<dimen name="option_border_width">2dp</dimen>
<dimen name="option_selected_border_width">3dp</dimen>
+ <dimen name="option_title_font_text_size">12sp</dimen>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6d9274b..3cf2dbc 100755
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -222,4 +222,11 @@
<item name="android:tint">@color/material_grey500</item>
</style>
+ <!-- Option tiles -->
+ <style name="OptionTitleTextAppearance" parent="TitleTextAppearance">
+ <item name="android:textColor">@color/option_title_color</item>
+ <item name="android:textAlignment">center</item>
+ <item name="android:textSize">@dimen/option_title_font_text_size</item>
+ </style>
+
</resources>
