commit 90a4eb1931f4fac684c31d0b74f13c5e012b8d36
parent 186140180542237de6944c64136d88e1e8c734c7
Author: Gabriel Luong <gabriel.luong@gmail.com>
Date: Wed, 10 Dec 2025 15:33:06 +0000
Bug 2004511 - Part 3: Remove unused Acorn color tokens in XML r=android-reviewers,007
- First pass at removing unused Acorn color tokens in XML.
- Corrected tokens that are actually unused by removing `tools:ignore="UnusedResources"`.
Differential Revision: https://phabricator.services.mozilla.com/D275380
Diffstat:
4 files changed, 13 insertions(+), 265 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/res/values-night/colors.xml b/mobile/android/fenix/app/src/main/res/values-night/colors.xml
@@ -56,29 +56,17 @@
<color name="fx_mobile_layer_color_2">@color/photonDarkGrey30</color>
<!-- Search -->
<color name="fx_mobile_layer_color_3">@color/photonDarkGrey80</color>
- <!-- App Bar Top (edit), Text Cursor, Selected Tab Check -->
- <color name="fx_mobile_layer_color_accent">@color/photonViolet40</color>
<!-- Selected tab -->
<color name="fx_mobile_layer_color_accent_nonopaque">@color/photonViolet50A32</color>
- <!-- Selected chip -->
- <color name="fx_mobile_action_color_chip_selected">@color/photonViolet50A32</color>
- <!-- Selected tab -->
- <color name="fx_mobile_layer_color_accent_opaque">#423262</color>
<color name="fx_mobile_layer_color_scrim">@color/photonDarkGrey90A95</color>
<!-- Tooltip -->
<color name="fx_mobile_layer_color_gradient_start">@color/photonViolet70</color>
<!-- Tooltip -->
<color name="fx_mobile_layer_color_gradient_end">@color/photonViolet60</color>
<!-- Warning background -->
- <color name="fx_mobile_layer_color_warning" tools:ignore="UnusedResources">@color/photonYellow70A77</color>
- <!-- Confirmation background -->
- <color name="fx_mobile_layer_color_success" tools:ignore="UnusedResources">@color/photonGreen80</color>
+ <color name="fx_mobile_layer_color_warning">@color/photonYellow70A77</color>
<!-- Error background -->
- <color name="fx_mobile_layer_color_critical" tools:ignore="UnusedResources">@color/photonPink80</color>
- <!-- Info background -->
- <color name="fx_mobile_layer_color_information" tools:ignore="UnusedResources">@color/photonBlue50</color>
- <!-- Search -->
- <color name="fx_mobile_layer_color_search">@color/photonDarkGrey80</color>
+ <color name="fx_mobile_layer_color_critical">@color/photonPink80</color>
<!-- Action -->
<!-- Primary button, Snackbar, Floating action button, Chip selected -->
@@ -87,34 +75,6 @@
<color name="fx_mobile_action_color_primary_disabled">@color/photonViolet60A50</color>
<!-- Secondary button -->
<color name="fx_mobile_action_color_secondary">@color/photonDarkGrey05</color>
- <!-- Filter -->
- <color name="fx_mobile_action_color_tertiary" tools:ignore="UnusedResources">@color/photonDarkGrey10</color>
- <!-- Chip -->
- <color name="fx_mobile_action_color_quarternary" tools:ignore="UnusedResources">@color/photonDarkGrey80</color>
- <!-- Warning button -->
- <color name="fx_mobile_action_color_warning" tools:ignore="UnusedResources">@color/photonYellow40A41</color>
- <!-- Confirmation button -->
- <color name="fx_mobile_action_color_success" tools:ignore="UnusedResources">@color/photonGreen70</color>
- <!-- Error button -->
- <color name="fx_mobile_action_color_critical" tools:ignore="UnusedResources">@color/photonPink70A69</color>
- <!-- Info button -->
- <color name="fx_mobile_action_color_information" tools:ignore="UnusedResources">@color/photonBlue60</color>
- <!-- Checkbox default, Radio button default -->
- <color name="fx_mobile_action_color_form_default" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
- <!-- Checkbox selected, Radio button selected -->
- <color name="fx_mobile_action_color_form_selected" tools:ignore="UnusedResources">@color/photonViolet40</color>
- <!-- Switch background OFF, Switch background ON -->
- <color name="fx_mobile_action_color_form_surface" tools:ignore="UnusedResources">@color/photonDarkGrey05</color>
- <!-- Checkbox disabled, Radio disabled -->
- <color name="fx_mobile_action_color_form_disabled" tools:ignore="UnusedResources">@color/photonDarkGrey05</color>
- <!-- Switch thumb ON -->
- <color name="fx_mobile_action_color_form_on" tools:ignore="UnusedResources">@color/photonViolet40</color>
- <!-- Switch thumb OFF -->
- <color name="fx_mobile_action_color_form_off" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
- <!-- Scroll indicator active -->
- <color name="fx_mobile_action_color_indicator_active" tools:ignore="UnusedResources">@color/photonLightGrey90</color>
- <!-- Scroll indicator inactive -->
- <color name="fx_mobile_action_color_indicator_inactive" tools:ignore="UnusedResources">@color/photonDarkGrey05</color>
<!-- Text -->
<!-- Primary text -->
@@ -128,11 +88,7 @@
<!-- Warning text on Secondary button -->
<color name="fx_mobile_text_color_critical_button">@color/photonRed20</color>
<!-- Small heading, Text link -->
- <color name="fx_mobile_text_color_accent">@color/photonViolet20</color>
- <!-- Small heading, Text link -->
- <color name="fx_mobile_text_color_accent_disabled" tools:ignore="UnusedResources">@color/photonViolet20A60</color>
- <!-- Text Inverted -->
- <color name="fx_mobile_text_color_inverted" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
+ <color name="fx_mobile_text_color_accent">@color/photonViolet20</color>lor>
<!-- Text Inverted/On Color -->
<color name="fx_mobile_text_color_oncolor_primary">@color/photonLightGrey05</color>
<!-- Text Inverted/On Color -->
@@ -143,29 +99,19 @@
<color name="fx_mobile_text_color_action_primary_disabled">@color/photonLightGrey05A40</color>
<!-- Action Secondary text -->
<color name="fx_mobile_text_color_action_secondary">@color/photonLightGrey05</color>
- <!-- Action Tertiary text -->
- <color name="fx_mobile_text_color_action_tertiary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
- <!-- Action Tertiary Active text -->
- <color name="fx_mobile_text_color_action_tertiary_active" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Icon -->
<!-- Primary icon -->
<color name="fx_mobile_icon_color_primary">@color/photonLightGrey05</color>
- <!-- Inactive tab -->
- <color name="fx_mobile_icon_color_primary_inactive">@color/photonLightGrey05A60</color>
<!-- Secondary icon -->
<color name="fx_mobile_icon_color_secondary">@color/photonLightGrey40</color>
- <!-- Active tab -->
- <color name="fx_mobile_icon_color_active">@color/photonViolet40</color>
<!-- Disabled icon -->
- <color name="fx_mobile_icon_color_disabled" tools:ignore="UnusedResources">@color/photonLightGrey05A40</color>
+ <color name="fx_mobile_icon_color_disabled">@color/photonLightGrey05A40</color>
<!-- Icon inverted (on color) -->
<color name="fx_mobile_icon_color_oncolor">@color/photonLightGrey05</color>
<!-- Information -->
<color name="fx_mobile_icon_color_information">@color/photonBlue30</color>
- <!-- Icon button -->
- <color name="fx_mobile_icon_color_button" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
- <color name="fx_mobile_icon_color_critical" tools:ignore="UnusedResources">@color/photonRed20</color>
+ <color name="fx_mobile_icon_color_critical">@color/photonRed20</color>
<!-- Warning icon on Secondary button -->
<color name="fx_mobile_icon_color_critical_button">@color/photonRed20</color>
<color name="fx_mobile_icon_color_accent_violet">@color/photonViolet20</color>
@@ -173,12 +119,8 @@
<color name="fx_mobile_icon_color_accent_pink">@color/photonPink20</color>
<color name="fx_mobile_icon_color_accent_green">@color/photonGreen20</color>
<color name="fx_mobile_icon_color_accent_yellow">@color/photonYellow20</color>
- <!-- Action Primary Icon -->
- <color name="fx_mobile_icon_color_action_primary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Action Secondary Icon -->
<color name="fx_mobile_icon_color_action_secondary">@color/photonLightGrey05</color>
- <!-- Action Tertiary Icon -->
- <color name="fx_mobile_icon_color_action_tertiary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Reader, ETP Shield -->
<color name="fx_mobile_icon_color_gradient_start">@color/photonViolet20</color>
<!-- Reader, ETP Shield -->
@@ -187,19 +129,8 @@
<!-- Border -->
<!-- Default, Divider, Dotted -->
<color name="fx_mobile_border_color_primary">@color/photonDarkGrey05</color>
- <color name="fx_mobile_border_color_secondary">@color/photonDarkGrey10</color>
- <!-- Onboarding -->
- <color name="fx_mobile_border_color_inverted" tools:ignore="UnusedResources">@color/photonLightGrey30</color>
- <!-- Form parts -->
- <color name="fx_mobile_border_color_form_default" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Active tab (Nav), Selected tab, Active form -->
<color name="fx_mobile_border_color_accent">@color/photonViolet40</color>
- <!-- Form parts -->
- <color name="fx_mobile_border_color_disabled" tools:ignore="UnusedResources">@color/photonLightGrey05A40</color>
- <!-- Form parts -->
- <color name="fx_mobile_border_color_critical" tools:ignore="UnusedResources">@color/photonRed20</color>
- <!-- Toolbar divider -->
- <color name="fx_mobile_border_color_toolbar_divider">@color/photonDarkGrey60</color>
<!-- Normal theme colors for dark mode -->
<color name="accent_normal_theme">@color/photonViolet50</color>
diff --git a/mobile/android/fenix/app/src/main/res/values/attrs.xml b/mobile/android/fenix/app/src/main/res/values/attrs.xml
@@ -10,7 +10,6 @@
<attr name="layer2" format="reference" />
<!-- Search -->
<attr name="layer3" format="reference" />
- <attr name="layerSearch" format="reference" />
<!-- Selected tab -->
<attr name="layerNonOpaque" format="reference" />
<attr name="scrim" format="reference" />
@@ -20,8 +19,6 @@
<attr name="actionPrimary" format="reference" />
<!-- Primary button in a disabled state -->
<attr name="actionPrimaryDisabled" format="reference" />
- <!-- Chip selected -->
- <attr name="actionChipSelected" format="reference" />
<!-- Text -->
<!-- Primary text -->
@@ -42,19 +39,12 @@
<attr name="textActionPrimaryDisabled" format="reference" />
<!-- Icon -->
- <!-- Secondary icon -->
- <attr name="iconSecondary" format="reference" />
- <!-- Active tab -->
- <attr name="iconActive" format="reference" />
<!-- Icon inverted (on color) -->
<attr name="iconOnColor" format="reference" />
<!-- Border -->
<!-- Default, Divider, Dotted -->
<attr name="borderPrimary" format="reference" />
- <attr name="borderSecondary" format="reference" />
- <!-- Toolbar divider -->
- <attr name="borderToolbarDivider" format="reference"/>
<!-- Color palette attributes -->
<attr name="accent" format="reference" />
diff --git a/mobile/android/fenix/app/src/main/res/values/colors.xml b/mobile/android/fenix/app/src/main/res/values/colors.xml
@@ -56,28 +56,17 @@
<color name="fx_mobile_layer_color_2">@color/photonWhite</color>
<!-- Search -->
<color name="fx_mobile_layer_color_3">@color/photonLightGrey20</color>
- <color name="fx_mobile_layer_color_search">@color/photonLightGrey30</color>
- <!-- App Bar Top (edit), Text Cursor, Selected Tab Check -->
- <color name="fx_mobile_layer_color_accent" tools:ignore="UnusedResources">@color/photonInk20</color>
<!-- Selected tab -->
<color name="fx_mobile_layer_color_accent_nonopaque">@color/photonViolet70A12</color>
- <!-- Selected chip -->
- <color name="fx_mobile_action_color_chip_selected">@color/photonViolet70A12</color>
- <!-- Selected tab -->
- <color name="fx_mobile_layer_color_accent_opaque" tools:ignore="UnusedResources">#EAE4F9</color>
<color name="fx_mobile_layer_color_scrim">@color/photonDarkGrey30A95</color>
<!-- Tooltip -->
<color name="fx_mobile_layer_color_gradient_start">@color/photonViolet70</color>
<!-- Tooltip -->
<color name="fx_mobile_layer_color_gradient_end">@color/photonViolet60</color>
<!-- Warning background -->
- <color name="fx_mobile_layer_color_warning" tools:ignore="UnusedResources">@color/photonYellow20</color>
- <!-- Confirmation background -->
- <color name="fx_mobile_layer_color_success" tools:ignore="UnusedResources">@color/photonGreen20</color>
+ <color name="fx_mobile_layer_color_warning">@color/photonYellow20</color>
<!-- Error background -->
- <color name="fx_mobile_layer_color_critical" tools:ignore="UnusedResources">@color/photonRed10</color>
- <!-- Info background -->
- <color name="fx_mobile_layer_color_information" tools:ignore="UnusedResources">@color/photonBlue50A44</color>
+ <color name="fx_mobile_layer_color_critical">@color/photonRed10</color>
<!-- Action -->
<!-- Primary button, Snackbar, Floating action button, Chip selected -->
@@ -86,34 +75,6 @@
<color name="fx_mobile_action_color_primary_disabled">@color/photonInk20A20</color>
<!-- Secondary button -->
<color name="fx_mobile_action_color_secondary">@color/photonLightGrey30</color>
- <!-- Filter -->
- <color name="fx_mobile_action_color_tertiary" tools:ignore="UnusedResources">@color/photonLightGrey40</color>
- <!-- Chip -->
- <color name="fx_mobile_action_color_quarternary" tools:ignore="UnusedResources">@color/photonLightGrey10</color>
- <!-- Warning button -->
- <color name="fx_mobile_action_color_warning" tools:ignore="UnusedResources">@color/photonYellow60A40</color>
- <!-- Confirmation button -->
- <color name="fx_mobile_action_color_success" tools:ignore="UnusedResources">@color/photonGreen60</color>
- <!-- Error button -->
- <color name="fx_mobile_action_color_critical" tools:ignore="UnusedResources">@color/photonRed30</color>
- <!-- Info button -->
- <color name="fx_mobile_action_color_information" tools:ignore="UnusedResources">@color/photonBlue50</color>
- <!-- Checkbox default, Radio button default -->
- <color name="fx_mobile_action_color_form_default" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
- <!-- Checkbox selected, Radio button selected -->
- <color name="fx_mobile_action_color_form_selected" tools:ignore="UnusedResources">@color/photonInk20</color>
- <!-- Switch background OFF, Switch background ON -->
- <color name="fx_mobile_action_color_form_surface" tools:ignore="UnusedResources">@color/photonLightGrey50</color>
- <!-- Checkbox disabled, Radio disabled -->
- <color name="fx_mobile_action_color_form_disabled" tools:ignore="UnusedResources">@color/photonLightGrey50</color>
- <!-- Switch thumb ON -->
- <color name="fx_mobile_action_color_form_on" tools:ignore="UnusedResources">@color/photonInk20</color>
- <!-- Switch thumb OFF -->
- <color name="fx_mobile_action_color_form_off" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
- <!-- Scroll indicator active -->
- <color name="fx_mobile_action_color_indicator_active" tools:ignore="UnusedResources">@color/photonLightGrey50</color>
- <!-- Scroll indicator inactive -->
- <color name="fx_mobile_action_color_indicator_inactive" tools:ignore="UnusedResources">@color/photonLightGrey30</color>
<!-- Text -->
<!-- Primary text -->
@@ -128,10 +89,6 @@
<color name="fx_mobile_text_color_critical_button">@color/photonRed70</color>
<!-- Small heading, Text link -->
<color name="fx_mobile_text_color_accent">@color/photonViolet70</color>
- <!-- Small heading, Text link -->
- <color name="fx_mobile_text_color_accent_disabled" tools:ignore="UnusedResources">@color/photonViolet70A80</color>
- <!-- Text Inverted -->
- <color name="fx_mobile_text_color_inverted" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Text Inverted/On Color -->
<color name="fx_mobile_text_color_oncolor_primary">@color/photonLightGrey05</color>
<!-- Text Inverted/On Color -->
@@ -142,29 +99,19 @@
<color name="fx_mobile_text_color_action_primary_disabled">@color/photonDarkGrey90A50</color>
<!-- Action Secondary text -->
<color name="fx_mobile_text_color_action_secondary">@color/photonDarkGrey90</color>
- <!-- Action Tertiary text -->
- <color name="fx_mobile_text_color_action_tertiary" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
- <!-- Action Tertiary Active text -->
- <color name="fx_mobile_text_color_action_tertiary_active" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Icon -->
<!-- Primary icon -->
<color name="fx_mobile_icon_color_primary">@color/photonDarkGrey90</color>
- <!-- Inactive tab -->
- <color name="fx_mobile_icon_color_primary_inactive" tools:ignore="UnusedResources">@color/photonDarkGrey90A60</color>
<!-- Secondary icon -->
<color name="fx_mobile_icon_color_secondary">@color/photonDarkGrey05</color>
- <!-- Active tab -->
- <color name="fx_mobile_icon_color_active">@color/photonInk20</color>
<!-- Disabled icon -->
- <color name="fx_mobile_icon_color_disabled" tools:ignore="UnusedResources">@color/photonDarkGrey90A40</color>
+ <color name="fx_mobile_icon_color_disabled">@color/photonDarkGrey90A40</color>
<!-- Icon inverted (on color) -->
<color name="fx_mobile_icon_color_oncolor">@color/photonLightGrey05</color>
<!-- Information -->
<color name="fx_mobile_icon_color_information">@color/photonBlue30</color>
- <!-- Icon button -->
- <color name="fx_mobile_icon_color_button" tools:ignore="UnusedResources">@color/photonInk20</color>
- <color name="fx_mobile_icon_color_critical" tools:ignore="UnusedResources">@color/photonRed70</color>
+ <color name="fx_mobile_icon_color_critical">@color/photonRed70</color>
<!-- Warning icon on Secondary button -->
<color name="fx_mobile_icon_color_critical_button">@color/photonRed70</color>
<color name="fx_mobile_icon_color_accent_violet">@color/photonViolet70</color>
@@ -172,12 +119,8 @@
<color name="fx_mobile_icon_color_accent_pink">@color/photonPink60</color>
<color name="fx_mobile_icon_color_accent_green">@color/photonGreen60</color>
<color name="fx_mobile_icon_color_accent_yellow">@color/photonYellow60</color>
- <!-- Action Primary Icon -->
- <color name="fx_mobile_icon_color_action_primary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Action Secondary Icon -->
<color name="fx_mobile_icon_color_action_secondary">@color/photonDarkGrey90</color>
- <!-- Action Tertiary Icon -->
- <color name="fx_mobile_icon_color_action_tertiary" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
<!-- Reader, ETP Shield -->
<color name="fx_mobile_icon_color_gradient_start">@color/photonViolet50</color>
<!-- Reader, ETP Shield -->
@@ -186,19 +129,8 @@
<!-- Border -->
<!-- Default, Divider, Dotted -->
<color name="fx_mobile_border_color_primary">@color/photonLightGrey30</color>
- <color name="fx_mobile_border_color_secondary">@color/photonLightGrey20</color>
- <!-- Toolbar divider -->
- <color name="fx_mobile_border_color_toolbar_divider">@color/photonLightGrey10</color>
- <!-- Onboarding -->
- <color name="fx_mobile_border_color_inverted" tools:ignore="UnusedResources">@color/photonDarkGrey05</color>
- <!-- Form parts -->
- <color name="fx_mobile_border_color_form_default" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
<!-- Active tab (Nav), Selected tab, Active form -->
- <color name="fx_mobile_border_color_accent" tools:ignore="UnusedResources">@color/photonInk20</color>
- <!-- Form parts -->
- <color name="fx_mobile_border_color_disabled" tools:ignore="UnusedResources">@color/photonDarkGrey90A40</color>
- <!-- Form parts -->
- <color name="fx_mobile_border_color_critical" tools:ignore="UnusedResources">@color/photonRed70</color>
+ <color name="fx_mobile_border_color_accent">@color/photonInk20</color>
<!-- Private theme color variables -->
@@ -253,48 +185,15 @@
<color name="fx_mobile_private_layer_color_2">@color/photonViolet90</color>
<!-- Search -->
<color name="fx_mobile_private_layer_color_3">@color/photonInk90</color>
- <color name="fx_mobile_private_layer_color_search">@color/photonInk90</color>
- <!-- App Bar Top (edit), Text Cursor, Selected Tab Check -->
- <color name="fx_mobile_private_layer_color_accent" tools:ignore="UnusedResources">@color/photonViolet40</color>
<!-- Selected tab -->
<color name="fx_mobile_private_layer_color_accent_nonopaque">@color/photonViolet50A32</color>
- <!-- Selected chip -->
- <color name="fx_mobile_private_action_color_chip_selected">@color/photonViolet50A32</color>
- <!-- Selected tab -->
- <color name="fx_mobile_private_layer_color_accent_opaque" tools:ignore="UnusedResources">#423262</color>
<color name="fx_mobile_private_layer_color_scrim">@color/photonDarkGrey90A95</color>
- <!-- Tooltip -->
- <color name="fx_mobile_private_layer_color_gradient_start" tools:ignore="UnusedResources">@color/photonViolet70</color>
- <!-- Tooltip -->
- <color name="fx_mobile_private_layer_color_gradient_end" tools:ignore="UnusedResources">@color/photonViolet40</color>
<!-- Action -->
<!-- Primary button, Snackbar, Floating action button, Chip selected -->
<color name="fx_mobile_private_action_color_primary">@color/photonViolet60</color>
<!-- Primary button in a disabled state -->
<color name="fx_mobile_private_action_color_primary_disabled">@color/photonInk20A20</color>
- <!-- Secondary button -->
- <color name="fx_mobile_private_action_color_secondary" tools:ignore="UnusedResources">@color/photonDarkGrey05</color>
- <!-- Filter -->
- <color name="fx_mobile_private_action_color_tertiary" tools:ignore="UnusedResources">@color/photonDarkGrey10</color>
- <!-- Chip -->
- <color name="fx_mobile_private_action_quarternary" tools:ignore="UnusedResources">@color/photonDarkGrey80</color>
- <!-- Checkbox default, Radio button default -->
- <color name="fx_mobile_private_action_color_form_default" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
- <!-- Checkbox selected, Radio button selected -->
- <color name="fx_mobile_private_action_color_form_selected" tools:ignore="UnusedResources">@color/photonViolet40</color>
- <!-- Switch background OFF, Switch background ON -->
- <color name="fx_mobile_private_action_color_form_surface" tools:ignore="UnusedResources">@color/photonDarkGrey05</color>
- <!-- Checkbox disabled, Radio disabled -->
- <color name="fx_mobile_private_action_color_form_disabled" tools:ignore="UnusedResources">@color/photonDarkGrey05</color>
- <!-- Switch thumb ON -->
- <color name="fx_mobile_private_action_color_form_on" tools:ignore="UnusedResources">@color/photonViolet40</color>
- <!-- Switch thumb OFF -->
- <color name="fx_mobile_private_action_color_form_off" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
- <!-- Scroll indicator active -->
- <color name="fx_mobile_private_action_color_indicator_active" tools:ignore="UnusedResources">@color/photonLightGrey90</color>
- <!-- Scroll indicator inactive -->
- <color name="fx_mobile_private_action_color_indicator_inactive" tools:ignore="UnusedResources">@color/photonDarkGrey05</color>
<!-- Text -->
<!-- Primary text -->
@@ -305,79 +204,25 @@
<color name="fx_mobile_private_text_color_disabled">@color/photonLightGrey05A40</color>
<!-- Warning text -->
<color name="fx_mobile_private_text_color_critical">@color/photonRed20</color>
- <!-- Warning text on Secondary button -->
- <color name="fx_mobile_private_text_color_critical_button" tools:ignore="UnusedResources">@color/photonRed20</color>
<!-- Small heading, Text link -->
<color name="fx_mobile_private_text_color_accent">@color/photonViolet20</color>
- <!-- Small heading, Text link -->
- <color name="fx_mobile_private_text_color_accent_disabled" tools:ignore="UnusedResources">@color/photonViolet20A60</color>
<!-- Text Inverted/On Color -->
<color name="fx_mobile_private_text_color_oncolor_primary">@color/photonLightGrey05</color>
- <!-- Text Inverted/On Color -->
- <color name="fx_mobile_private_text_color_oncolor_secondary" tools:ignore="UnusedResources">@color/photonLightGrey40</color>
<!-- Action Primary text -->
<color name="fx_mobile_private_text_color_action_primary">@color/photonLightGrey05</color>
<!-- Action Primary disabled text -->
<color name="fx_mobile_private_text_color_action_primary_disabled">@color/photonLightGrey05A40</color>
- <!-- Action Secondary text -->
- <color name="fx_mobile_private_text_color_action_secondary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
- <!-- Action Tertiary text -->
- <color name="fx_mobile_private_text_color_action_tertiary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
- <!-- Action Tertiary Active text -->
- <color name="fx_mobile_private_text_color_action_tertiary_active" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Icon -->
<!-- Primary icon -->
<color name="fx_mobile_private_icon_color_primary">@color/photonLightGrey05</color>
- <!-- Inactive tab -->
- <color name="fx_mobile_private_icon_color_primary_inactive" tools:ignore="UnusedResources">@color/photonLightGrey05A60</color>
- <!-- Secondary icon -->
- <color name="fx_mobile_private_icon_color_secondary">@color/photonLightGrey40</color>
- <!-- Active tab -->
- <color name="fx_mobile_private_icon_color_active">@color/photonViolet40</color>
- <!-- Disabled icon -->
- <color name="fx_mobile_private_icon_color_disabled" tools:ignore="UnusedResources">@color/photonLightGrey05A40</color>
<!-- Icon inverted (on color) -->
<color name="fx_mobile_private_icon_color_oncolor">@color/photonLightGrey05</color>
- <!-- Information -->
- <color name="fx_mobile_private_icon_color_information" tools:ignore="UnusedResources">@color/photonBlue30</color>
- <!-- Icon button -->
- <color name="fx_mobile_private_icon_color_button" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
- <color name="fx_mobile_private_icon_color_critical" tools:ignore="UnusedResources">@color/photonRed20</color>
- <!-- Warning icon on Secondary button -->
- <color name="fx_mobile_private_icon_color_critical_button" tools:ignore="UnusedResources">@color/photonRed20</color>
- <color name="fx_mobile_private_icon_color_accent_violet" tools:ignore="UnusedResources">@color/photonViolet20</color>
- <color name="fx_mobile_private_icon_color_accent_blue" tools:ignore="UnusedResources">@color/photonBlue20</color>
- <color name="fx_mobile_private_icon_color_accent_pink" tools:ignore="UnusedResources">@color/photonPink20</color>
- <color name="fx_mobile_private_icon_color_accent_green" tools:ignore="UnusedResources">@color/photonGreen20</color>
- <color name="fx_mobile_private_icon_color_accent_yellow" tools:ignore="UnusedResources">@color/photonYellow20</color>
- <!-- Action Primary Icon -->
- <color name="fx_mobile_private_icon_color_action_primary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
- <!-- Action Secondary Icon -->
- <color name="fx_mobile_private_icon_color_action_secondary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
- <!-- Action Tertiary Icon -->
- <color name="fx_mobile_private_icon_color_action_tertiary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
- <!-- Reader, ETP Shield -->
- <color name="fx_mobile_private_icon_color_gradient_start" tools:ignore="UnusedResources">@color/photonViolet20</color>
- <!-- Reader, ETP Shield -->
- <color name="fx_mobile_private_icon_color_gradient_end" tools:ignore="UnusedResources">@color/photonBlue20</color>
+ <color name="fx_mobile_private_icon_color_critical">@color/photonRed20</color>
<!-- Border -->
<!-- Default, Divider, Dotted -->
<color name="fx_mobile_private_border_color_primary">@color/photonInk05</color>
- <color name="fx_mobile_private_border_color_secondary">@color/photonInk10</color>
- <!-- Onboarding -->
- <color name="fx_mobile_private_border_color_inverted" tools:ignore="UnusedResources">@color/photonLightGrey30</color>
- <!-- Form parts -->
- <color name="fx_mobile_private_border_color_form_default" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
- <!-- Active tab (Nav), Selected tab, Active form -->
- <color name="fx_mobile_private_border_color_accent" tools:ignore="UnusedResources">@color/photonViolet40</color>
- <!-- Form parts -->
- <color name="fx_mobile_private_border_color_disabled" tools:ignore="UnusedResources">@color/photonLightGrey05A40</color>
- <!-- Form parts -->
- <color name="fx_mobile_private_border_color_critical" tools:ignore="UnusedResources">@color/photonRed20</color>
- <!-- Toolbar divider -->
- <color name="fx_mobile_private_border_color_toolbar_divider">@color/photonViolet80</color>
<!-- Light theme color palette -->
<color name="primary_text_light_theme">@color/photonInk80</color>
diff --git a/mobile/android/fenix/app/src/main/res/values/styles.xml b/mobile/android/fenix/app/src/main/res/values/styles.xml
@@ -101,7 +101,6 @@
<item name="layer2">@color/fx_mobile_layer_color_2</item>
<!-- Search -->
<item name="layer3">@color/fx_mobile_layer_color_3</item>
- <item name="layerSearch">@color/fx_mobile_layer_color_search</item>
<!-- Selected tab -->
<item name="layerNonOpaque">@color/fx_mobile_layer_color_accent_nonopaque</item>
<item name="scrim">@color/fx_mobile_layer_color_scrim</item>
@@ -111,8 +110,6 @@
<item name="actionPrimary">@color/fx_mobile_action_color_primary</item>
<!-- Primary button in a disabled state -->
<item name="actionPrimaryDisabled">@color/fx_mobile_action_color_primary_disabled</item>
- <!-- Selected chip -->
- <item name="actionChipSelected">@color/fx_mobile_action_color_chip_selected</item>
<!-- Text -->
<!-- Primary text -->
@@ -133,19 +130,13 @@
<item name="textActionPrimaryDisabled">@color/fx_mobile_text_color_action_primary_disabled</item>
<!-- Icon -->
- <!-- Secondary icon -->
- <item name="iconSecondary">@color/fx_mobile_icon_color_secondary</item>
- <!-- Active tab -->
- <item name="iconActive">@color/fx_mobile_icon_color_active</item>
<!-- Icon inverted (on color) -->
<item name="iconOnColor">@color/fx_mobile_icon_color_oncolor</item>
<!-- Border -->
<!-- Default, Divider, Dotted -->
<item name="borderPrimary">@color/fx_mobile_border_color_primary</item>
- <item name="borderSecondary">@color/fx_mobile_border_color_secondary</item>
- <!-- Toolbar divider -->
- <item name="borderToolbarDivider">@color/fx_mobile_border_color_toolbar_divider</item>
+
<!-- Active thumb color & Active track color (30% transparency) -->
<item name="colorControlActivated">@color/accent_high_contrast_normal_theme</item>
<!-- Inactive thumb color -->
@@ -398,7 +389,6 @@
<item name="layer2">@color/fx_mobile_private_layer_color_2</item>
<!-- Search -->
<item name="layer3">@color/fx_mobile_private_layer_color_3</item>
- <item name="layerSearch">@color/fx_mobile_private_layer_color_search</item>
<!-- Selected tab -->
<item name="layerNonOpaque">@color/fx_mobile_private_layer_color_accent_nonopaque</item>
<item name="scrim">@color/fx_mobile_private_layer_color_scrim</item>
@@ -408,8 +398,7 @@
<item name="actionPrimary">@color/fx_mobile_private_action_color_primary</item>
<!-- Primary button in a disabled state -->
<item name="actionPrimaryDisabled">@color/fx_mobile_private_action_color_primary_disabled</item>
- <!-- Selected chip -->
- <item name="actionChipSelected">@color/fx_mobile_private_action_color_chip_selected</item>
+
<!-- Text -->
<!-- Primary text -->
<item name="textPrimary">@color/fx_mobile_private_text_color_primary</item>
@@ -429,19 +418,12 @@
<item name="textActionPrimaryDisabled">@color/fx_mobile_private_text_color_action_primary_disabled</item>
<!-- Icon -->
- <!-- Secondary icon -->
- <item name="iconSecondary">@color/fx_mobile_private_icon_color_secondary</item>
- <!-- Active tab -->
- <item name="iconActive">@color/fx_mobile_private_icon_color_active</item>
<!-- Icon inverted (on color) -->
<item name="iconOnColor">@color/fx_mobile_private_icon_color_oncolor</item>
<!-- Border -->
<!-- Default, Divider, Dotted -->
<item name="borderPrimary">@color/fx_mobile_private_border_color_primary</item>
- <item name="borderSecondary">@color/fx_mobile_private_border_color_secondary</item>
- <!-- Toolbar divider -->
- <item name="borderToolbarDivider">@color/fx_mobile_private_border_color_toolbar_divider</item>
<!-- Inactive thumb color -->
<item name="colorSwitchThumbNormal">@color/toggle_off_knob_dark_theme</item>
