Closes mozilla-mobile#22558: Update inactive tabs colors on tab tray …

…when in private browsing
rocketsroger · Dec 16, 2021 · 0db1927 · 0db1927
1 parent 1c34db2
commit 0db1927
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 15 deletions.
diff --git a/app/src/main/res/drawable/ic_chevron_down.xml b/app/src/main/res/drawable/ic_chevron_down.xml
@@ -7,6 +7,6 @@
         android:height="24dp"
         android:viewportWidth="24"
         android:viewportHeight="24">
-    <path android:fillColor="?primaryText"
+    <path android:fillColor="@color/primary_text_normal_theme"
           android:pathData="M12 14.289L5.28 7.57a0.75 0.75 0 1 0-1.061 1.061l7.37 7.37h0.821l7.37-7.37a0.748 0.748 0 0 0 0-1.061 0.75 0.75 0 0 0-1.061 0L12 14.289z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_chevron_up.xml b/app/src/main/res/drawable/ic_chevron_up.xml
@@ -7,6 +7,6 @@
         android:height="24dp"
         android:viewportWidth="24"
         android:viewportHeight="24">
-    <path android:fillColor="?primaryText"
+    <path android:fillColor="@color/primary_text_normal_theme"
           android:pathData="m12,8.711 l-6.72,6.72a0.75,0.75 0,1 1,-1.061 -1.061L11.589,7h0.821l7.37,7.37c0.147,0.146 0.22,0.338 0.22,0.53a0.75,0.75 0,0 1,-1.281 0.53L12,8.711z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
@@ -9,8 +9,8 @@
     android:viewportHeight="24">
   <path
       android:pathData="M20.25,6L16,6L16,4.5A2.5,2.5 0,0 0,13.5 2h-3A2.5,2.5 0,0 0,8 4.5L8,6L3.75,6a0.75,0.75 0,0 0,0 1.5L4,7.5v12A2.5,2.5 0,0 0,6.5 22h11a2.5,2.5 0,0 0,2.5 -2.5v-12h0.25a0.75,0.75 0,0 0,0 -1.5zM9.5,4.3l0.8,-0.8h3.4l0.8,0.8L14.5,6h-5L9.5,4.3zM18.5,19.7 L17.7,20.5L6.3,20.5l-0.8,-0.8L5.5,7.5h13v12.2z"
-      android:fillColor="?primaryText"/>
+      android:fillColor="@color/primary_text_normal_theme"/>
   <path
       android:pathData="M10.5,10.75v6.5a0.75,0.75 0,0 1,-1.5 0v-6.5a0.75,0.75 0,0 1,1.5 0zM15,10.75v6.5a0.75,0.75 0,0 1,-1.5 0v-6.5a0.75,0.75 0,0 1,1.5 0z"
-      android:fillColor="?primaryText"/>
+      android:fillColor="@color/primary_text_normal_theme"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
@@ -8,6 +8,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?primaryText"
+        android:fillColor="@color/tab_tray_item_text_normal_theme"
         android:pathData="M15.685,14.074C16.511,12.925 17,11.519 17,10C17,6.141 13.86,3 10,3C6.14,3 3,6.141 3,10C3,13.859 6.14,17 10,17C11.525,17 12.936,16.508 14.087,15.676L14.611,15.67L19.721,20.78C19.867,20.926 20.059,21 20.251,21C20.443,21 20.635,20.927 20.781,20.78C21.074,20.487 21.074,20.012 20.781,19.719L15.675,14.612L15.685,14.074ZM10,15.5C6.967,15.5 4.5,13.032 4.5,10C4.5,6.968 6.967,4.5 10,4.5C13.033,4.5 15.5,6.968 15.5,10C15.5,13.032 13.033,15.5 10,15.5Z" />
 </vector>
diff --git a/app/src/main/res/drawable/rounded_all_corners.xml b/app/src/main/res/drawable/rounded_all_corners.xml
@@ -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/. -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?above" />
+    <solid android:color="@color/tab_tray_item_background_normal_theme" />
     <corners android:radius="@dimen/tab_corner_radius"/>
 </shape>
diff --git a/app/src/main/res/drawable/rounded_bottom_corners.xml b/app/src/main/res/drawable/rounded_bottom_corners.xml
@@ -4,6 +4,6 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?above" />
+    <solid android:color="@color/tab_tray_item_background_normal_theme" />
     <corners android:bottomLeftRadius="@dimen/tab_corner_radius" android:bottomRightRadius="@dimen/tab_corner_radius" />
 </shape>
diff --git a/app/src/main/res/drawable/rounded_top_corners.xml b/app/src/main/res/drawable/rounded_top_corners.xml
@@ -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/. -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?above" />
+    <solid android:color="@color/tab_tray_item_background_normal_theme" />
     <corners android:topLeftRadius="@dimen/tab_corner_radius" android:topRightRadius="@dimen/tab_corner_radius" />
 </shape>
diff --git a/app/src/main/res/layout/inactive_header_item.xml b/app/src/main/res/layout/inactive_header_item.xml
@@ -36,7 +36,7 @@
             android:maxLines="1"
             android:minLines="1"
             android:text="@string/inactive_tabs_title"
-            android:textAppearance="@style/Header16TextStyle"
+            android:textAppearance="@style/TabTrayHeader16TextStyle"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"

diff --git a/app/src/main/res/layout/inactive_tab_list_item.xml b/app/src/main/res/layout/inactive_tab_list_item.xml
@@ -16,7 +16,7 @@
         android:id="@+id/site_list_item"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?above"
+        android:background="@color/tab_tray_item_background_normal_theme"
         android:foreground="?android:attr/selectableItemBackground"
         android:minHeight="@dimen/mozac_widget_site_item_height" />
 </FrameLayout>
diff --git a/app/src/main/res/layout/tab_group_item.xml b/app/src/main/res/layout/tab_group_item.xml
@@ -27,7 +27,7 @@
         android:ellipsize="end"
         android:gravity="start"
         android:maxLines="1"
-        android:textAppearance="@style/Header16TextStyle"
+        android:textAppearance="@style/TabTrayHeader16TextStyle"
         app:layout_constraintBottom_toBottomOf="@id/group_icon"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"

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
@@ -18,7 +18,7 @@
     android:gravity="start"
     android:maxLines="1"
     android:text="@string/tab_tray_header_title_1"
-    android:textAppearance="@style/Header16TextStyle"
+    android:textAppearance="@style/TabTrayHeader16TextStyle"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -261,10 +261,10 @@
         <item name="menuItemButtonTintColor">@color/accent_high_contrast_private_theme</item>
 
         <!-- Shared widget colors -->
-        <item name="mozac_primary_text_color">@color/fx_mobile_private_text_color_primary</item>
+        <item name="mozac_primary_text_color">@color/primary_text_normal_theme</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>
+        <item name="mozac_widget_favicon_background_color">@color/mozac_widget_favicon_background_normal_theme</item>
+        <item name="mozac_widget_favicon_border_color">@color/mozac_widget_favicon_border_normal_theme</item>
 
         <!-- Tab Tray -->
         <item name="tabTrayItemMediaBackground">@color/tab_tray_item_media_background_private_theme</item>
@@ -646,6 +646,13 @@
         <item name="android:stateListAnimator">@null</item>
     </style>
 
+    <style name="TabTrayHeader16TextStyle" parent="TextAppearance.MaterialComponents.Body1">
+        <item name="android:textColor">@color/tab_tray_item_text_normal_theme</item>
+        <item name="android:textSize">16sp</item>
+        <item name="fontFamily">@font/metropolis_semibold</item>
+    </style>
+
+
     <style name="SearchDialogStyle">
         <item name="android:windowAnimationStyle">@null</item>
         <item name="android:textAppearance">@style/TextAppearance.AppCompat</item>