diff --git a/app/src/main/res/drawable/create_collection_background.xml b/app/src/main/res/drawable/scrim_background.xml similarity index 82% rename from app/src/main/res/drawable/create_collection_background.xml rename to app/src/main/res/drawable/scrim_background.xml index 977845c7d9..580d0c9e46 100644 --- a/app/src/main/res/drawable/create_collection_background.xml +++ b/app/src/main/res/drawable/scrim_background.xml @@ -4,7 +4,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> diff --git a/app/src/main/res/layout/collection_tab_list_row.xml b/app/src/main/res/layout/collection_tab_list_row.xml index ccb03cccaa..512ef656e0 100644 --- a/app/src/main/res/layout/collection_tab_list_row.xml +++ b/app/src/main/res/layout/collection_tab_list_row.xml @@ -61,7 +61,7 @@ android:textColor="?primaryText" android:textSize="15sp" app:layout_constraintStart_toEndOf="@id/favicon_image" - app:layout_constraintEnd_toEndOf="@id/hostname" + app:layout_constraintEnd_toStartOf="@id/tab_selected_checkbox" app:layout_constraintTop_toBottomOf="@id/hostname" app:layout_constraintBottom_toBottomOf="parent"/> diff --git a/app/src/main/res/layout/component_collection_creation.xml b/app/src/main/res/layout/component_collection_creation.xml index a0a3826b1e..c9cf419956 100644 --- a/app/src/main/res/layout/component_collection_creation.xml +++ b/app/src/main/res/layout/component_collection_creation.xml @@ -15,7 +15,8 @@ android:background="?android:attr/selectableItemBackgroundBorderless" android:drawableStart="@drawable/mozac_ic_back" android:textAppearance="@style/HeaderTextStyle" - android:textColor="?foundation" + android:textColor="@color/neutral_text" + android:drawableTint="@color/neutral_text" android:drawablePadding="8dp" android:text="@string/create_collection_select_tabs" android:textSize="20sp" @@ -31,7 +32,7 @@ android:textSize="16sp" android:text="Select All" android:textAllCaps="false" - android:textColor="?foundation" + android:textColor="@color/neutral_text" android:layout_margin="16dp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintEnd_toEndOf="parent"/> diff --git a/app/src/main/res/layout/fragment_create_collection.xml b/app/src/main/res/layout/fragment_create_collection.xml index 863f740622..624f01c006 100644 --- a/app/src/main/res/layout/fragment_create_collection.xml +++ b/app/src/main/res/layout/fragment_create_collection.xml @@ -1,9 +1,14 @@ + + + diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 3079501e11..dc095d1573 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -17,4 +17,6 @@ @color/neutral_faded_dark_theme @color/shadow_dark_theme @color/destructive_dark_theme + @color/scrimStart_dark_theme + @color/scrimStart_dark_theme diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index ea698ff303..3caf6afe51 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -18,6 +18,9 @@ + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 2b4d33d5f0..bdec44b119 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -17,6 +17,8 @@ @color/photonGrey20 #1F000000 @color/photonRed60 + #F5393473 + #F520123A #FBFBFE @@ -32,6 +34,8 @@ #1FEDEDF0 #050505 #FF4F5E + #F520123A + #F515141A #FBFBFE @@ -47,6 +51,8 @@ #1FEDEDF0 #2B1067 #FF4F5E + #F520123A + #F515141A @color/primary_text_light_theme @@ -62,6 +68,8 @@ @color/neutral_faded_light_theme @color/shadow_light_theme @color/destructive_light_theme + @color/scrimStart_light_theme + @color/scrimEnd_light_theme #DFDFE3 @@ -104,4 +112,6 @@ @color/foundation_private_theme #FBFBFE + + @color/white_color diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 40b6fa7cb2..f40cd9b397 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -28,6 +28,8 @@ @color/neutral_faded_normal_theme @color/shadow_normal_theme @color/destructive_normal_theme + @color/scrimStart_normal_theme + @color/scrimStart_normal_theme @drawable/ic_logo_wordmark_normal @@ -62,6 +64,8 @@ @color/neutral_faded_private_theme @color/shadow_private_theme @color/destructive_private_theme + @color/scrimStart_private_theme + @color/scrimStart_private_theme @drawable/ic_logo_wordmark_private @@ -108,12 +112,11 @@ 24dp - -