For #22836 - Replace primary_text_private_theme with fx_mobile_private_text_color_primary color token

upstream-sync
Gabriel Luong 3 years ago committed by mergify[bot]
parent 8ca1a7e271
commit 2c22622edb

@ -111,7 +111,7 @@ class DefaultToolbarIntegration(
interactor.onTabCounterMenuItemTapped(it)
},
iconColor = if (isPrivate) {
ContextCompat.getColor(context, R.color.primary_text_private_theme)
ContextCompat.getColor(context, R.color.fx_mobile_private_text_color_primary)
} else {
null
}

@ -593,7 +593,7 @@ class HomeFragment : Fragment() {
requireContext(),
onItemTapped,
iconColor = if (mode == BrowsingMode.Private) {
ContextCompat.getColor(requireContext(), R.color.primary_text_private_theme)
ContextCompat.getColor(requireContext(), R.color.fx_mobile_private_text_color_primary)
} else {
null
}

@ -3,6 +3,6 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" android:color="@color/primary_text_private_theme" />
<item android:state_enabled="true" android:color="@color/fx_mobile_private_text_color_primary" />
<item android:state_enabled="false" android:color="@color/mozac_feature_readerview_text_color_disabled" />
</selector>

@ -4,5 +4,5 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:color="@color/mozac_feature_readerview_selected" />
<item android:state_checked="false" android:color="@color/primary_text_private_theme" />
<item android:state_checked="false" android:color="@color/fx_mobile_private_text_color_primary" />
</selector>

@ -110,7 +110,7 @@
<color name="fx_mobile_private_action_color_control_accent" tools:ignore="UnusedResources">@color/photonViolet40A30</color>
<!-- Text -->
<color name="fx_mobile_private_text_color_primary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<color name="fx_mobile_private_text_color_primary">@color/photonLightGrey05</color>
<color name="fx_mobile_private_text_color_secondary" tools:ignore="UnusedResources">@color/photonLightGrey40</color>
<color name="fx_mobile_private_text_color_tertiary" tools:ignore="UnusedResources">@color/photonViolet40</color>
<color name="fx_mobile_private_text_color_disabled" tools:ignore="UnusedResources">@color/photonLightGrey05A40</color>
@ -158,9 +158,8 @@
<color name="tab_tray_item_selected_background_dark_theme">#412E69</color>
<!-- Private theme color palette -->
<color name="primary_text_private_theme">@color/photonLightGrey05</color>
<color name="secondary_text_private_theme">#A7A2B7</color>
<color name="contrast_text_private_theme">@color/primary_text_private_theme</color>
<color name="contrast_text_private_theme">@color/photonLightGrey05</color>
<color name="caption_text_private_theme">@color/photonLightGrey70</color>
<color name="foundation_private_theme">#261E4B</color>
<color name="inset_private_theme">@color/photonInk50</color>

@ -196,7 +196,7 @@
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowBackground">@color/foundation_private_theme</item>
<item name="android:colorEdgeEffect">@color/accent_private_theme</item>
<item name="android:colorAccent">@color/primary_text_private_theme</item>
<item name="android:colorAccent">@color/fx_mobile_private_text_color_primary</item>
<item name="colorControlActivated">@color/accent_high_contrast_private_theme</item>
<item name="android:textColorPrimary">@color/state_list_text_color</item>
<item name="android:textColorSecondary">@color/secondary_state_list_text_color</item>
@ -218,10 +218,10 @@
<!-- Inactive track color(30% transparency) -->
<item name="android:colorForeground">@color/toggle_off_track_dark_theme</item>
<!-- sets the toolbar back button color, radio buttons/ unselected checkboxes -->
<item name="colorControlNormal">@color/primary_text_private_theme</item>
<item name="colorControlNormal">@color/fx_mobile_private_text_color_primary</item>
<!-- Updated color attributes -->
<item name="primaryText">@color/primary_text_private_theme</item>
<item name="primaryText">@color/fx_mobile_private_text_color_primary</item>
<item name="secondaryText">@color/secondary_text_private_theme</item>
<item name="contrastText">@color/contrast_text_private_theme</item>
<item name="accent">@color/accent_private_theme</item>
@ -263,7 +263,7 @@
<item name="menuItemButtonTintColor">@color/accent_high_contrast_private_theme</item>
<!-- Shared widget colors -->
<item name="mozac_primary_text_color">@color/primary_text_private_theme</item>
<item name="mozac_primary_text_color">@color/fx_mobile_private_text_color_primary</item>
<item name="mozac_caption_text_color">@color/caption_text_private_theme</item>
<item name="mozac_widget_favicon_background_color">@color/mozac_widget_favicon_background_private_theme</item>
<item name="mozac_widget_favicon_border_color">@color/mozac_widget_favicon_border_private_theme</item>
@ -281,7 +281,7 @@
<item name="homeBackground">@drawable/private_home_background_gradient</item>
<item name="bottomBarBackground">@drawable/private_home_bottom_bar_background_gradient</item>
<item name="bottomBarBackgroundTop">@drawable/private_home_bottom_bar_background_gradient_top</item>
<item name="privateBrowsingButtonBackground">@color/primary_text_private_theme</item>
<item name="privateBrowsingButtonBackground">@color/fx_mobile_private_text_color_primary</item>
<item name="privateBrowsingButtonAccent">@color/above_private_theme</item>
</style>

Loading…
Cancel
Save