diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayMenu.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayMenu.kt
index 0db8459314..5b001f34e6 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayMenu.kt
@@ -54,14 +54,14 @@ class TabsTrayMenu(
listOf(
SimpleBrowserMenuItem(
context.getString(R.string.tabs_tray_select_tabs),
- textColorResource = R.color.primary_text_normal_theme
+ textColorResource = R.color.fx_mobile_text_color_primary
) {
onItemTapped.invoke(Item.SelectTabs)
}.apply { visible = shouldShowSelectOrShare },
SimpleBrowserMenuItem(
context.getString(R.string.tab_tray_menu_item_share),
- textColorResource = R.color.primary_text_normal_theme
+ textColorResource = R.color.fx_mobile_text_color_primary
) {
context.components.analytics.metrics.track(Event.TabsTrayShareAllTabsPressed)
onItemTapped.invoke(Item.ShareAllTabs)
@@ -69,28 +69,28 @@ class TabsTrayMenu(
SimpleBrowserMenuItem(
context.getString(R.string.tab_tray_menu_account_settings),
- textColorResource = R.color.primary_text_normal_theme
+ textColorResource = R.color.fx_mobile_text_color_primary
) {
onItemTapped.invoke(Item.OpenAccountSettings)
}.apply { visible = shouldShowAccountSetting },
SimpleBrowserMenuItem(
context.getString(R.string.tab_tray_menu_tab_settings),
- textColorResource = R.color.primary_text_normal_theme
+ textColorResource = R.color.fx_mobile_text_color_primary
) {
onItemTapped.invoke(Item.OpenTabSettings)
}.apply { visible = shouldShowTabSetting },
SimpleBrowserMenuItem(
context.getString(R.string.tab_tray_menu_recently_closed),
- textColorResource = R.color.primary_text_normal_theme
+ textColorResource = R.color.fx_mobile_text_color_primary
) {
onItemTapped.invoke(Item.OpenRecentlyClosed)
},
SimpleBrowserMenuItem(
context.getString(R.string.tab_tray_menu_item_close),
- textColorResource = R.color.primary_text_normal_theme
+ textColorResource = R.color.fx_mobile_text_color_primary
) {
context.components.analytics.metrics.track(Event.TabsTrayCloseAllTabsPressed)
onItemTapped.invoke(Item.CloseAllTabs)
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/SelectionMenu.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/SelectionMenu.kt
index 0285fa59c3..68813ec214 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/SelectionMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/SelectionMenu.kt
@@ -27,21 +27,21 @@ class SelectionMenu(
listOf(
SimpleBrowserMenuItem(
context.getString(R.string.tab_tray_multiselect_menu_item_bookmark),
- textColorResource = R.color.primary_text_normal_theme
+ textColorResource = R.color.fx_mobile_text_color_primary
) {
onItemTapped.invoke(Item.BookmarkTabs)
},
SimpleBrowserMenuItem(
context.getString(R.string.tab_tray_multiselect_menu_item_close),
- textColorResource = R.color.primary_text_normal_theme
+ textColorResource = R.color.fx_mobile_text_color_primary
) {
onItemTapped.invoke(Item.DeleteTabs)
},
// This item is only visible for debugging.
SimpleBrowserMenuItem(
context.getString(R.string.inactive_tabs_menu_item),
- textColorResource = R.color.primary_text_normal_theme
+ textColorResource = R.color.fx_mobile_text_color_primary
) {
onItemTapped.invoke(Item.MakeInactive)
}.apply {
diff --git a/app/src/main/res/layout/sync_tabs_error_row.xml b/app/src/main/res/layout/sync_tabs_error_row.xml
index 141594e2a4..4b4a78ce6f 100644
--- a/app/src/main/res/layout/sync_tabs_error_row.xml
+++ b/app/src/main/res/layout/sync_tabs_error_row.xml
@@ -19,7 +19,7 @@
android:layout_marginTop="4dp"
android:textSize="14sp"
android:textAlignment="viewStart"
- android:textColor="@color/primary_text_normal_theme"
+ android:textColor="@color/fx_mobile_text_color_primary"
tools:text="@string/synced_tabs_no_tabs"/>
+ app:tint="@color/fx_mobile_text_color_primary" />
+ app:tint="@color/fx_mobile_icon_color_primary" />
diff --git a/app/src/main/res/layout/tab_tray_title_header_item.xml b/app/src/main/res/layout/tab_tray_title_header_item.xml
index 97c9d193a2..cd58a0fe1d 100644
--- a/app/src/main/res/layout/tab_tray_title_header_item.xml
+++ b/app/src/main/res/layout/tab_tray_title_header_item.xml
@@ -19,7 +19,7 @@
android:maxLines="1"
android:text="@string/tab_tray_header_title_1"
android:textAppearance="@style/Header16TextStyle"
- android:textColor="@color/primary_text_normal_theme"
+ android:textColor="@color/fx_mobile_text_color_primary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_synced_tabs_group.xml b/app/src/main/res/layout/view_synced_tabs_group.xml
index 987ce8df7f..0746db267e 100644
--- a/app/src/main/res/layout/view_synced_tabs_group.xml
+++ b/app/src/main/res/layout/view_synced_tabs_group.xml
@@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:gravity="center_vertical|start"
android:textAppearance="@style/Header14TextStyle"
- android:textColor="@color/primary_text_normal_theme"
+ android:textColor="@color/fx_mobile_text_color_primary"
android:textSize="12sp"
android:letterSpacing="0.04"
android:textDirection="locale"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 66d872601c..0b035c3a5c 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -117,9 +117,8 @@
@color/photonRed40
- @color/fx_mobile_text_color_primary
#A7A2B7
- @color/primary_text_normal_theme
+ @color/fx_mobile_text_color_primary
@color/photonLightGrey70
@color/photonDarkGrey50
@color/photonViolet50
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 61cb23e7aa..057d58d48b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -191,7 +191,6 @@
@color/photonViolet50
- @color/primary_text_light_theme
@color/photonGrey50
@color/photonLightGrey05
@color/photonLightGrey90
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e0eb172916..40f9ce8dbd 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,7 +14,7 @@
- @android:color/transparent
- @color/fx_mobile_layer_color_1
- @color/accent_normal_theme
- - @color/primary_text_normal_theme
+ - @color/fx_mobile_text_color_primary
- @color/state_list_text_color
- @color/secondary_state_list_text_color
- @style/DialogStyleNormal
@@ -44,10 +44,10 @@
- @color/toggle_off_track_normal_theme
- - @color/primary_text_normal_theme
+ - @color/fx_mobile_text_color_primary
- - @color/primary_text_normal_theme
+ - @color/fx_mobile_text_color_primary
- @color/secondary_text_normal_theme
- @color/contrast_text_normal_theme
- @color/accent_normal_theme
@@ -87,7 +87,7 @@
- @color/recently_used_share_theme
- - @color/primary_text_normal_theme
+ - @color/fx_mobile_text_color_primary
- @color/caption_text_normal_theme
- @color/fx_mobile_layer_color_2
- @color/fx_mobile_border_color_primary
@@ -105,7 +105,7 @@
- @drawable/home_bottom_bar_background
- @drawable/home_bottom_bar_background_top
- @android:color/transparent
- - @color/primary_text_normal_theme
+ - @color/fx_mobile_text_color_primary
- ?primaryText