From 861609816daa1f79dcbff5c6bbbef427decd9a95 Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Thu, 9 Dec 2021 23:30:00 -0500 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/22777 - Replace about_link_normal_theme with fx_mobile_text_color_action --- app/src/main/res/layout/fragment_add_on_details.xml | 4 ++-- app/src/main/res/layout/fragment_add_on_permissions.xml | 2 +- app/src/main/res/layout/settings_studies.xml | 2 +- app/src/main/res/values-night/colors.xml | 1 - app/src/main/res/values/colors.xml | 1 - app/src/main/res/values/styles.xml | 3 +-- 6 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/layout/fragment_add_on_details.xml b/app/src/main/res/layout/fragment_add_on_details.xml index 56ba19cc3f..9eaf5b3190 100644 --- a/app/src/main/res/layout/fragment_add_on_details.xml +++ b/app/src/main/res/layout/fragment_add_on_details.xml @@ -22,7 +22,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textColor="?primaryText" - android:textColorLink="?aboutLink" + android:textColorLink="@color/fx_mobile_text_color_action" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" tools:text="@tools:sample/lorem/random" /> @@ -134,7 +134,7 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@string/mozac_feature_addons_home_page" - android:textColor="?aboutLink" + android:textColor="@color/fx_mobile_text_color_action" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/last_updated_divider" /> diff --git a/app/src/main/res/layout/fragment_add_on_permissions.xml b/app/src/main/res/layout/fragment_add_on_permissions.xml index 2335186646..c555bbbb65 100644 --- a/app/src/main/res/layout/fragment_add_on_permissions.xml +++ b/app/src/main/res/layout/fragment_add_on_permissions.xml @@ -28,6 +28,6 @@ android:paddingEnd="16dp" android:text="@string/mozac_feature_addons_learn_more" style="@style/AboutHeaderContentText" - android:textColor="?aboutLink"/> + android:textColor="@color/fx_mobile_text_color_action"/> diff --git a/app/src/main/res/layout/settings_studies.xml b/app/src/main/res/layout/settings_studies.xml index b978849226..a5ced587e2 100644 --- a/app/src/main/res/layout/settings_studies.xml +++ b/app/src/main/res/layout/settings_studies.xml @@ -31,7 +31,7 @@ android:importantForAccessibility="no" android:text="@string/preference_experiments_summary_2" android:textColor="?attr/secondaryText" - android:textColorLink="?aboutLink" + android:textColorLink="@color/fx_mobile_text_color_action" app:layout_constraintEnd_toEndOf="@id/studiesTitle" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="@id/studiesTitle" diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index b7b99be8e6..9b0c09ae46 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -98,7 +98,6 @@ @color/photonViolet50 @color/accent_bright_dark_theme @color/accent_high_contrast_dark_theme - @color/photonViolet40 @color/accent_normal_theme @color/photonGrey20 #1FFBFBFE diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index d6180d164e..217a8ead4d 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -93,7 +93,6 @@ @color/photonLightGrey20 @color/photonInk20 @color/photonViolet70 - @color/photonViolet70 @color/photonDarkGrey90 #0015141A @color/photonViolet50 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 320c35726c..96c81fb0c1 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -45,7 +45,6 @@ @color/contrast_text_normal_theme @color/accent_normal_theme @color/accent_bright_normal_theme - @color/about_link_normal_theme @color/accent_high_contrast_normal_theme @color/foundation_normal_theme @color/above_normal_theme @@ -552,7 +551,7 @@