From 206074a45ed37e05ee0e564ac75e57b8e5f36282 Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Fri, 3 Dec 2021 23:59:48 -0500 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/22702 - Replace home_show_all_button_text with fx_mobile_text_color_action color token --- app/src/main/res/layout/recent_bookmarks_header.xml | 4 ++-- app/src/main/res/layout/recent_tabs_header.xml | 2 +- app/src/main/res/layout/recent_visits_header.xml | 2 +- app/src/main/res/values-night/colors.xml | 5 +---- app/src/main/res/values/colors.xml | 6 +----- 5 files changed, 6 insertions(+), 13 deletions(-) diff --git a/app/src/main/res/layout/recent_bookmarks_header.xml b/app/src/main/res/layout/recent_bookmarks_header.xml index 1ee111061a..6e2fd2c432 100644 --- a/app/src/main/res/layout/recent_bookmarks_header.xml +++ b/app/src/main/res/layout/recent_bookmarks_header.xml @@ -38,8 +38,8 @@ android:maxLines="1" android:nestedScrollingEnabled="false" android:text="@string/recently_saved_show_all" - android:textColor="@color/home_show_all_button_text" + android:textColor="@color/fx_mobile_text_color_action" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="@id/header" /> - + diff --git a/app/src/main/res/layout/recent_tabs_header.xml b/app/src/main/res/layout/recent_tabs_header.xml index b51bad22d6..dcfff431af 100644 --- a/app/src/main/res/layout/recent_tabs_header.xml +++ b/app/src/main/res/layout/recent_tabs_header.xml @@ -36,7 +36,7 @@ android:maxLines="1" android:nestedScrollingEnabled="false" android:text="@string/recent_tabs_show_all" - android:textColor="@color/home_show_all_button_text" + android:textColor="@color/fx_mobile_text_color_action" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="@id/header" /> diff --git a/app/src/main/res/layout/recent_visits_header.xml b/app/src/main/res/layout/recent_visits_header.xml index bf01f4247f..9fec65f2eb 100644 --- a/app/src/main/res/layout/recent_visits_header.xml +++ b/app/src/main/res/layout/recent_visits_header.xml @@ -37,7 +37,7 @@ android:maxLines="1" android:nestedScrollingEnabled="false" android:text="@string/recent_tabs_show_all" - android:textColor="@color/home_show_all_button_text" + android:textColor="@color/fx_mobile_text_color_action" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="@id/header" /> diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 93cf2503d7..95ea2dd94a 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -50,7 +50,7 @@ @color/photonRed40 - @color/photonViolet40 + @color/photonViolet40 @color/photonViolet40 @@ -171,9 +171,6 @@ #88FFD1 #FFDE67 - - @color/photonViolet40 - @color/inset_normal_theme @color/primary_text_dark_theme diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 81a6e3e412..d7738aec60 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -50,7 +50,7 @@ @color/photonRed80 - @color/photonViolet70 + @color/photonViolet70 @color/photonViolet90 @@ -257,11 +257,7 @@ @color/collection_icon_color_yellow - - @color/photonViolet70 - - #482166