From bdb4bffa358f0a15da2f754ce7e3e2d50bfc29b8 Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Thu, 1 Sep 2022 12:53:11 -0400 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/26738 - Update MR onboarding with the latest illustrations --- app/lint-baseline.xml | 438 +++++++++--------- .../fenix/onboarding/view/Onboarding.kt | 8 +- .../main/res/drawable/ic_onboarding_sync.xml | 17 + .../res/drawable/ic_onboarding_welcome.xml | 133 ++++++ app/src/main/res/drawable/ic_scan.xml | 132 +----- .../main/res/layout/fragment_turn_on_sync.xml | 4 +- 6 files changed, 400 insertions(+), 332 deletions(-) create mode 100644 app/src/main/res/drawable/ic_onboarding_sync.xml create mode 100644 app/src/main/res/drawable/ic_onboarding_welcome.xml diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml index ef8d88a327..d291d3d5e0 100644 --- a/app/lint-baseline.xml +++ b/app/lint-baseline.xml @@ -19,17 +19,6 @@ column="5"/> - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -323,7 +334,7 @@ errorLine2=" ~~~~~~~~~~~~~"> @@ -334,7 +345,7 @@ errorLine2=" ~~~~~~~~~~~~~"> @@ -345,7 +356,7 @@ errorLine2=" ~~~~~~~~~~~~~"> @@ -356,7 +367,7 @@ errorLine2=" ~~~~~~~~~~~~~"> @@ -367,10 +378,21 @@ errorLine2=" ~~~~~~~~~~~~~"> + + + + @@ -393,6 +415,17 @@ column="5"/> + + + + + errorLine1=" <string name="studies_description_2">%1$s zaman zaman araştırmalar yükleyip çalıştırabilir.</string>" + errorLine2=" ^"> - - - - - - - - - - - - - - - - - - - - + line="705" + column="47"/> @@ -576,7 +554,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~"> @@ -587,7 +565,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -620,7 +598,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -756,28 +734,6 @@ column="6"/> - - - - - - - - - - - - + message="Possible overdraw: Root element paints background `?attr/layer1` with a theme that also paints a background (inferred theme is `@style/NormalTheme`)" + errorLine1=" android:background="?attr/layer1">" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + message="Possible overdraw: Root element paints background `?attr/layer1` with a theme that also paints a background (inferred theme is `@style/NormalTheme`)" + errorLine1=" android:background="?attr/layer1"" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + message="Possible overdraw: Root element paints background `?attr/layer1` with a theme that also paints a background (inferred theme is `@style/NormalTheme`)" + errorLine1=" android:background="?attr/layer1"" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + + + + + + + + @@ -910,6 +877,17 @@ column="5"/> + + + + + message="Possible overdraw: Root element paints background `?attr/layer1` with a theme that also paints a background (inferred theme is `@style/NormalTheme`)" + errorLine1=" android:background="?attr/layer1"" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - - - - + message="Possible overdraw: Root element paints background `?attr/layer1` with a theme that also paints a background (inferred theme is `@style/NormalTheme`)" + errorLine1=" android:background="?attr/layer1"" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + message="Possible overdraw: Root element paints background `?attr/layer1` with a theme that also paints a background (inferred theme is `@style/NormalTheme`)" + errorLine1=" android:background="?attr/layer1"" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + message="Possible overdraw: Root element paints background `?attr/layer1` with a theme that also paints a background (inferred theme is `@style/NormalTheme`)" + errorLine1=" android:background="?attr/layer1"" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + + + + @@ -1049,7 +1027,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1060,7 +1038,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -1071,7 +1049,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1097,6 +1075,17 @@ column="12"/> + + + + + message="The following images appear both as density independent `.xml` files and as bitmap files: /Users/oracle/Projects/fenix/app/src/main/res/drawable-hdpi/ic_logo_wordmark_normal.png, /Users/oracle/Projects/fenix/app/src/main/res/drawable-night/ic_logo_wordmark_normal.xml"> + + + + + + + + + + @@ -1183,14 +1190,14 @@ + message="Missing the following drawables in `drawable-xhdpi`: cerulean.png, fenix_search_widget.png, sunrise.jpg"> + message="Missing the following drawables in `drawable-xxhdpi`: cerulean.png, fenix_search_widget.png, sunrise.jpg"> @@ -1224,7 +1231,7 @@ errorLine2=" ^"> @@ -1235,19 +1242,19 @@ errorLine2=" ^"> + errorLine1=" dialog?.window?.decorView?.setOnTouchListener { _, event ->" + errorLine2=" ^"> + line="259" + column="63"/> @@ -1268,7 +1275,29 @@ errorLine2=" ^"> + + + + + + + + @@ -1290,7 +1319,7 @@ errorLine2=" ~~~~~~~~~"> @@ -1316,17 +1345,6 @@ column="5"/> - - - - + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_onboarding_welcome.xml b/app/src/main/res/drawable/ic_onboarding_welcome.xml new file mode 100644 index 0000000000..9aa2495c49 --- /dev/null +++ b/app/src/main/res/drawable/ic_onboarding_welcome.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_scan.xml b/app/src/main/res/drawable/ic_scan.xml index f3bd7d2cc8..81108170d3 100644 --- a/app/src/main/res/drawable/ic_scan.xml +++ b/app/src/main/res/drawable/ic_scan.xml @@ -1,119 +1,23 @@ - - + + + - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_turn_on_sync.xml b/app/src/main/res/layout/fragment_turn_on_sync.xml index b64447078e..90b4dc98a4 100644 --- a/app/src/main/res/layout/fragment_turn_on_sync.xml +++ b/app/src/main/res/layout/fragment_turn_on_sync.xml @@ -30,8 +30,8 @@