For #18758 - Update colors on share layout

mozilla-mobile · Feb 16, 2022 · e1f91aa · e1f91aa
1 parent 3768353
commit e1f91aa
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/app/src/main/res/drawable/recent_apps_background.xml b/app/src/main/res/drawable/recent_apps_background.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="?recentlyUsedShareMenu"/>
+    <solid android:color="@color/fx_mobile_layer_color_1"/>
     <corners android:radius="@dimen/share_recent_apps_background_radius"/>
 </shape>
diff --git a/app/src/main/res/layout/account_share_list_item.xml b/app/src/main/res/layout/account_share_list_item.xml
@@ -37,6 +37,7 @@
         android:lines="2"
         android:textAlignment="gravity"
         android:textSize="10sp"
+        android:textColor="?primaryText"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/app_share_list_item.xml b/app/src/main/res/layout/app_share_list_item.xml
@@ -33,7 +33,7 @@
         android:gravity="center|top"
         android:lines="2"
         android:textAlignment="gravity"
-        android:textColor="@color/photonDarkGrey10"
+        android:textColor="?primaryText"
         android:textSize="10sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/layout/share_close.xml b/app/src/main/res/layout/share_close.xml
@@ -21,7 +21,7 @@
         android:background="@android:color/transparent"
         android:contentDescription="@string/content_description_close_button"
         android:padding="12dp"
-        app:iconTint="@color/neutral_text"
+        app:tint="@color/fx_mobile_icon_color_oncolor"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_close" />
@@ -36,7 +36,7 @@
         android:paddingHorizontal="1dp"
         android:text="@string/share_header_2"
         android:textAppearance="@style/HeaderTextStyle"
-        android:textColor="@color/neutral_text"
+        android:textColor="@color/fx_mobile_text_color_oncolor_primary"
         android:textSize="20sp"
         app:layout_constraintStart_toEndOf="@id/closeButton"
         app:layout_constraintTop_toTopOf="parent" />

diff --git a/app/src/main/res/layout/share_tab_item.xml b/app/src/main/res/layout/share_tab_item.xml
@@ -29,7 +29,7 @@
         android:textSize="20sp"
         android:maxLines="1"
         android:ellipsize="end"
-        android:textColor="?contrastText"
+        android:textColor="@color/fx_mobile_text_color_oncolor_primary"
         tools:text="Download Firefox - Free Web Browser"
         app:layout_constraintStart_toEndOf="@id/share_tab_favicon"
         app:layout_constraintTop_toTopOf="parent"
@@ -42,7 +42,7 @@
         android:textSize="12sp"
         android:maxLines="1"
         android:ellipsize="end"
-        android:textColor="@color/photonLightGrey60"
+        android:textColor="@color/fx_mobile_text_color_oncolor_secondary"
         tools:text="https://www.mozilla.org/en-US/firefox/new/"
         app:layout_constraintStart_toStartOf="@id/share_tab_title"
         app:layout_constraintTop_toBottomOf="@id/share_tab_title"

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -531,7 +531,7 @@
     <style name="ShareHeaderTextStyle">
         <item name="android:singleLine">true</item>
         <item name="android:textAllCaps">true</item>
-        <item name="android:textColor">@color/photonDarkGrey10</item>
+        <item name="android:textColor">?secondaryText</item>
         <item name="android:textSize">@dimen/share_header_text_size</item>
         <item name="android:textStyle">bold</item>
         <item name="fontFamily">@font/metropolis_semibold</item>