diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt index e69222611e..fc8fc48b1c 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt @@ -547,7 +547,7 @@ open class DefaultToolbarMenu( val syncMenuItem = BrowserMenuImageText( getSyncItemTitle(), - R.drawable.ic_synced_tabs, + R.drawable.ic_signed_out, primaryTextColor() ) { onItemTapped.invoke(ToolbarMenu.Item.SyncAccount(accountManager.signedInToFxa())) diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivacyNoticeViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivacyNoticeViewHolder.kt index 668c17cee4..9f4d752c75 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivacyNoticeViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivacyNoticeViewHolder.kt @@ -18,7 +18,7 @@ class OnboardingPrivacyNoticeViewHolder( ) : RecyclerView.ViewHolder(view) { init { - view.header_text.setOnboardingIcon(R.drawable.ic_onboarding_privacy_notice) + view.header_text.setOnboardingIcon(R.drawable.ic_info) val appName = view.context.getString(R.string.app_name) view.description_text.text = view.context.getString(R.string.onboarding_privacy_notice_description2, appName) diff --git a/app/src/main/res/drawable/ic_bookmark_filled.xml b/app/src/main/res/drawable/ic_bookmark_filled.xml index 090a843c01..8989f5484c 100644 --- a/app/src/main/res/drawable/ic_bookmark_filled.xml +++ b/app/src/main/res/drawable/ic_bookmark_filled.xml @@ -9,6 +9,6 @@ android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_chevron_down.xml b/app/src/main/res/drawable/ic_chevron_down.xml index aef6a00b1d..6177fe8a10 100644 --- a/app/src/main/res/drawable/ic_chevron_down.xml +++ b/app/src/main/res/drawable/ic_chevron_down.xml @@ -3,10 +3,10 @@ - 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/. --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + 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"/> diff --git a/app/src/main/res/drawable/ic_chevron_up.xml b/app/src/main/res/drawable/ic_chevron_up.xml index 9148fa55d7..60d8c82f8c 100644 --- a/app/src/main/res/drawable/ic_chevron_up.xml +++ b/app/src/main/res/drawable/ic_chevron_up.xml @@ -3,10 +3,10 @@ - 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/. --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + 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"/> diff --git a/app/src/main/res/drawable/ic_confirm_email.xml b/app/src/main/res/drawable/ic_confirm_email.xml new file mode 100644 index 0000000000..19fa069b02 --- /dev/null +++ b/app/src/main/res/drawable/ic_confirm_email.xml @@ -0,0 +1,16 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_onboarding_avatar_anonymous_large.xml b/app/src/main/res/drawable/ic_onboarding_avatar_anonymous_large.xml index 078d9b0ecd..c8312c4bf2 100644 --- a/app/src/main/res/drawable/ic_onboarding_avatar_anonymous_large.xml +++ b/app/src/main/res/drawable/ic_onboarding_avatar_anonymous_large.xml @@ -8,9 +8,12 @@ android:viewportWidth="24" android:viewportHeight="24"> + android:fillColor="?onboardingSelected" + android:pathData="M12 6.5a3 3 0 1 0 0 6 3 3 0 0 0 0-6z" /> + android:fillColor="?onboardingSelected" + android:pathData="M12 21.5c-5.238 0-9.5-4.262-9.5-9.5S6.762 2.5 12 2.5s9.5 4.262 9.5 9.5-4.262 9.5-9.5 9.5zM12 4c-4.411 0-8 3.589-8 8s3.589 8 8 8 8-3.589 8-8-3.589-8-8-8z" /> + diff --git a/app/src/main/res/drawable/ic_onboarding_privacy_notice.xml b/app/src/main/res/drawable/ic_onboarding_privacy_notice.xml deleted file mode 100644 index e836da928c..0000000000 --- a/app/src/main/res/drawable/ic_onboarding_privacy_notice.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_sign_in.xml b/app/src/main/res/drawable/ic_sign_in.xml index e02a2ef304..28629bb9c9 100644 --- a/app/src/main/res/drawable/ic_sign_in.xml +++ b/app/src/main/res/drawable/ic_sign_in.xml @@ -8,6 +8,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_signed_out.xml b/app/src/main/res/drawable/ic_signed_out.xml new file mode 100644 index 0000000000..2a52d161ec --- /dev/null +++ b/app/src/main/res/drawable/ic_signed_out.xml @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sync_disconnected.xml b/app/src/main/res/drawable/ic_sync_disconnected.xml index ab6bd02994..b4d61e51c4 100644 --- a/app/src/main/res/drawable/ic_sync_disconnected.xml +++ b/app/src/main/res/drawable/ic_sync_disconnected.xml @@ -3,13 +3,14 @@ - 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/. --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="?primaryText" + android:pathData="M10.07 20.336l1.198-2.089A6.364 6.364 0 0 1 9.5 18.5c-2.353 0-4.395-1.277-5.525-3.162a2.451 2.451 0 0 1 1.84-0.838h7.372c0.075 0 0.144 0.017 0.217 0.024l1.28-2.231c0.916-1.596 3.218-1.596 4.134 0l0.12 0.208a9.71 9.71 0 0 0-0.07-2.613c-0.65-3.933-3.823-7.105-7.756-7.755C4.62 1.06-0.94 6.62 0.133 13.111c0.65 3.933 3.822 7.105 7.755 7.755a9.794 9.794 0 0 0 1.93 0.111c0.052-0.217 0.132-0.432 0.251-0.641zM9.5 6.5a3 3 0 1 1 0 6 3 3 0 0 1 0-6z" /> + diff --git a/app/src/main/res/drawable/ic_top_sites.xml b/app/src/main/res/drawable/ic_top_sites.xml index 11123a240d..59a02d306c 100644 --- a/app/src/main/res/drawable/ic_top_sites.xml +++ b/app/src/main/res/drawable/ic_top_sites.xml @@ -9,5 +9,5 @@ android:viewportHeight="24"> + android:pathData="M21.28 20.22l-5.472-5.472 2.986-2.986c0.527-0.528 0.68-1.285 0.398-1.976a1.796 1.796 0 0 0-1.665-1.133l-2.475-0.029-3.775-3.776 1.068-1.068a0.75 0.75 0 1 0-1.061-1.061L2.72 11.287a0.75 0.75 0 0 0 1.06 1.061l1.079-1.079 3.775 3.775 0.029 2.475a1.794 1.794 0 0 0 1.135 1.665 1.795 1.795 0 0 0 1.973-0.398l2.977-2.977 5.472 5.472a0.748 0.748 0 0 0 1.06 0 0.75 0.75 0 0 0 0-1.061zm-10.569-2.495a0.304 0.304 0 0 1-0.348 0.07 0.307 0.307 0 0 1-0.2-0.294l-0.037-3.086-4.207-4.207 4.299-4.299 4.206 4.207 3.086 0.037a0.306 0.306 0 0 1 0.294 0.199 0.31 0.31 0 0 1-0.07 0.349l-7.023 7.024z" /> diff --git a/app/src/main/res/layout/collection_home_list_row.xml b/app/src/main/res/layout/collection_home_list_row.xml index 15feff9e8e..46ce31c8a9 100644 --- a/app/src/main/res/layout/collection_home_list_row.xml +++ b/app/src/main/res/layout/collection_home_list_row.xml @@ -48,8 +48,8 @@ tools:text="@tools:sample/lorem/random" /> 28dp - 10dp - 12dp + 24dp + 24dp 5dp 16dp 4dp