summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchihhangchuang <chihhangchuang@google.com>2020-06-10 15:46:56 +0800
committerchihhangchuang <chihhangchuang@google.com>2020-06-10 15:51:40 +0800
commita4b9eecf93bbf2ff923a2fca73db67f14f8e3959 (patch)
tree4a2337a38d9628c659cfc0a87dd5b45cdb004e84
parent00103e5f53bc2d8a3f7f6aba71c03a3efa53af13 (diff)
downloadThemePicker-a4b9eecf93bbf2ff923a2fca73db67f14f8e3959.tar.gz
Update dark theme color to match mock
Mock: https://docs.google.com/presentation/d/15JadcGi5k1_0znUN_XdFpU7UxeXwxjK3Y7LxvhW5ETM/edit?ts=5e1cc430#slide=id.g85fff7c452_76_21 Screenshot: https://screenshot.googleplex.com/ytBaVdCCto0.png https://screenshot.googleplex.com/TppopvRTG2t.png https://screenshot.googleplex.com/cndtG9eKopv.png https://screenshot.googleplex.com/0zPK9qaTqrY.png https://screenshot.googleplex.com/mMRCbvq8AYT.png Test: Manually Fixes: 158587080 Change-Id: I48a20b13e133467d6e30c9c94ae0594df48cd019
-rw-r--r--res/color/bottom_nav_item_color.xml2
-rw-r--r--res/layout/fragment_grid_picker.xml2
-rw-r--r--res/layout/fragment_theme_picker.xml2
-rw-r--r--res/layout/theme_preview_color_icons.xml7
-rw-r--r--res/values-night/colors.xml3
-rw-r--r--res/values/colors.xml2
-rw-r--r--res/values/styles.xml2
7 files changed, 13 insertions, 7 deletions
diff --git a/res/color/bottom_nav_item_color.xml b/res/color/bottom_nav_item_color.xml
index 9c1f598a..bf94de98 100644
--- a/res/color/bottom_nav_item_color.xml
+++ b/res/color/bottom_nav_item_color.xml
@@ -20,5 +20,5 @@
android:color="?android:colorAccent" />
<item
android:state_checked="false"
- android:color="@color/material_grey600" />
+ android:color="@color/bottom_bar_icon_unchecked_color" />
</selector> \ No newline at end of file
diff --git a/res/layout/fragment_grid_picker.xml b/res/layout/fragment_grid_picker.xml
index 7f35689b..84c81630 100644
--- a/res/layout/fragment_grid_picker.xml
+++ b/res/layout/fragment_grid_picker.xml
@@ -38,7 +38,7 @@
android:layout_height="0dp"
android:paddingTop="@dimen/preview_content_padding_top"
android:paddingBottom="@dimen/preview_content_padding_bottom"
- android:background="@color/fullscreen_preview_background"
+ android:background="@color/preview_pager_background"
android:clipToPadding="false"
app:layout_constrainedHeight="true"
app:layout_constraintStart_toStartOf="parent"
diff --git a/res/layout/fragment_theme_picker.xml b/res/layout/fragment_theme_picker.xml
index a7732073..2e3a6bbb 100644
--- a/res/layout/fragment_theme_picker.xml
+++ b/res/layout/fragment_theme_picker.xml
@@ -36,7 +36,7 @@
android:layout_height="0dp"
android:paddingTop="@dimen/preview_content_padding_top"
android:paddingBottom="@dimen/preview_content_padding_bottom"
- android:background="@color/fullscreen_preview_background"
+ android:background="@color/preview_pager_background"
android:clipToPadding="false"
app:layout_constrainedHeight="true"
app:layout_constraintStart_toStartOf="parent"
diff --git a/res/layout/theme_preview_color_icons.xml b/res/layout/theme_preview_color_icons.xml
index ccfb3008..f1e7522b 100644
--- a/res/layout/theme_preview_color_icons.xml
+++ b/res/layout/theme_preview_color_icons.xml
@@ -19,8 +19,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/color_icons_section"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/primary_color">
+ android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@@ -28,7 +27,8 @@
android:paddingHorizontal="@dimen/preview_theme_color_icons_padding_horizontal"
android:paddingTop="@dimen/preview_theme_color_icons_padding_top"
android:paddingBottom="@dimen/preview_theme_color_icons_padding_bottom"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:background="@color/theme_preview_color_icons_background">
<!-- Title -->
<TextView
@@ -37,6 +37,7 @@
android:layout_height="wrap_content"
android:text="@string/theme_preview_icons_section_title"
android:textSize="@dimen/preview_theme_color_icons_title_text_size"
+ android:textColor="@color/theme_preview_color_icons_title_color"
android:lineHeight="16dp"
android:gravity="center"
app:layout_constraintStart_toStartOf="parent"
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index e022a6ec..4f369a7a 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -20,6 +20,9 @@
<color name="icon_thumbnail_color">@color/white_88_alpha</color>
+ <color name="theme_preview_color_icons_background">@color/material_black_100</color>
+ <color name="theme_preview_color_icons_title_color">@color/material_white_100</color>
+
<color name="control_grey">#b3b3b3</color>
<color name="switch_track_tint">#171717</color>
<color name="switch_thumb_tint">#bdbdbd</color>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 33ae4ea1..d5291c03 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -33,6 +33,8 @@
<color name="theme_preview_icon_color">@color/google_grey700</color>
<color name="theme_preview_workspace_shadow_color_dark">#B0000000</color>
<color name="theme_preview_workspace_shadow_color_transparent">@android:color/transparent</color>
+ <color name="theme_preview_color_icons_background">@color/material_white_100</color>
+ <color name="theme_preview_color_icons_title_color">@color/black_87_alpha</color>
<color name="text_color_dark">#2d2d2d</color>
<color name="text_color_light">@color/material_white_text</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0b61fe4b..dd0f2a38 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -51,7 +51,7 @@
<item name="itemTextAppearanceActive">@style/BottomNavTextAppearanceActive</item>
<item name="itemTextAppearanceInactive">@style/BottomNavTextAppearance</item>
<item name="itemBackground">?android:attr/selectableItemBackgroundBorderless</item>
- <item name="android:background">?android:colorPrimary</item>
+ <item name="android:background">@color/bottom_bar_background_color</item>
</style>
<style name="BottomNavTextAppearance" parent="TitleTextAppearance">