From c03907e847238f550a4d0d972da59d4b9d556c5f Mon Sep 17 00:00:00 2001 From: Igor Oliveira Date: Mon, 6 Aug 2018 00:12:26 -0300 Subject: [PATCH] Bug 25696 - Implement alpha onboarding for Tor Browser for Android - FirstrunTorPagerConfig.java: Create file that sets up all the views in the pager. - FirstrunPager.java: Update code to use the FirstrunTorPagerConfig. - FirstrunLastPanel.java: Create view that adds a close handler in the latest pager view. Also: Bug 25696 - Design of alpha onboarding for Tor Browser for Android Bug 27125 - Move localized Tor Browser for Android strings into separate file --- .../layout/firstrun_animation_container.xml | 10 +-- .../firstrun_basepanel_checkable_fragment.xml | 34 +++++--- .../app/src/main/res/values/colors.xml | 3 + .../app/src/main/res/values/styles.xml | 7 ++ .../gecko/firstrun/FirstrunLastPanel.java | 30 +++++++ .../mozilla/gecko/firstrun/FirstrunPager.java | 18 ++-- .../gecko/firstrun/FirstrunPagerConfig.java | 1 + .../mozilla/gecko/firstrun/FirstrunPanel.java | 2 + .../firstrun/FirstrunTorPagerConfig.java | 81 ++++++++++++++++++ .../org/mozilla/gecko/firstrun/LastPanel.java | 7 +- .../base/locales/en-US/android_strings.dtd | 2 +- .../base/locales/en-US/torbrowser_strings.dtd | 26 ++++++ mobile/android/base/strings.xml.in | 32 ++++++- .../res/drawable-nodpi/figure_experience.png | Bin 0 -> 44299 bytes .../res/drawable-nodpi/figure_network.png | Bin 0 -> 70302 bytes .../alpha/res/drawable-nodpi/figure_onion.png | Bin 0 -> 139952 bytes .../res/drawable-nodpi/figure_privacy.png | Bin 0 -> 61696 bytes .../res/drawable-nodpi/figure_security.png | Bin 0 -> 52021 bytes .../res/drawable-nodpi/figure_welcome.png | Bin 0 -> 83798 bytes .../home_tab_menu_strip_tor.9.png | Bin 0 -> 126 bytes .../res/drawable-nodpi/figure_experience.png | Bin 0 -> 44299 bytes .../res/drawable-nodpi/figure_network.png | Bin 0 -> 70302 bytes .../res/drawable-nodpi/figure_onion.png | Bin 0 -> 139952 bytes .../res/drawable-nodpi/figure_privacy.png | Bin 0 -> 61696 bytes .../res/drawable-nodpi/figure_security.png | Bin 0 -> 52021 bytes .../res/drawable-nodpi/figure_welcome.png | Bin 0 -> 83798 bytes .../home_tab_menu_strip_tor.9.png | Bin 0 -> 126 bytes .../res/drawable-nodpi/figure_experience.png | Bin 0 -> 44299 bytes .../res/drawable-nodpi/figure_network.png | Bin 0 -> 70302 bytes .../res/drawable-nodpi/figure_onion.png | Bin 0 -> 139952 bytes .../res/drawable-nodpi/figure_privacy.png | Bin 0 -> 61696 bytes .../res/drawable-nodpi/figure_security.png | Bin 0 -> 52021 bytes .../res/drawable-nodpi/figure_welcome.png | Bin 0 -> 83798 bytes .../home_tab_menu_strip_tor.9.png | Bin 0 -> 126 bytes 34 files changed, 215 insertions(+), 38 deletions(-) create mode 100644 mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunLastPanel.java create mode 100644 mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunTorPagerConfig.java create mode 100644 mobile/android/branding/alpha/res/drawable-nodpi/figure_experience.png create mode 100644 mobile/android/branding/alpha/res/drawable-nodpi/figure_network.png create mode 100644 mobile/android/branding/alpha/res/drawable-nodpi/figure_onion.png create mode 100644 mobile/android/branding/alpha/res/drawable-nodpi/figure_privacy.png create mode 100644 mobile/android/branding/alpha/res/drawable-nodpi/figure_security.png create mode 100644 mobile/android/branding/alpha/res/drawable-nodpi/figure_welcome.png create mode 100644 mobile/android/branding/alpha/res/drawable-nodpi/home_tab_menu_strip_tor.9.png create mode 100644 mobile/android/branding/nightly/res/drawable-nodpi/figure_experience.png create mode 100644 mobile/android/branding/nightly/res/drawable-nodpi/figure_network.png create mode 100644 mobile/android/branding/nightly/res/drawable-nodpi/figure_onion.png create mode 100644 mobile/android/branding/nightly/res/drawable-nodpi/figure_privacy.png create mode 100644 mobile/android/branding/nightly/res/drawable-nodpi/figure_security.png create mode 100644 mobile/android/branding/nightly/res/drawable-nodpi/figure_welcome.png create mode 100644 mobile/android/branding/nightly/res/drawable-nodpi/home_tab_menu_strip_tor.9.png create mode 100644 mobile/android/branding/official/res/drawable-nodpi/figure_experience.png create mode 100644 mobile/android/branding/official/res/drawable-nodpi/figure_network.png create mode 100644 mobile/android/branding/official/res/drawable-nodpi/figure_onion.png create mode 100644 mobile/android/branding/official/res/drawable-nodpi/figure_privacy.png create mode 100644 mobile/android/branding/official/res/drawable-nodpi/figure_security.png create mode 100644 mobile/android/branding/official/res/drawable-nodpi/figure_welcome.png create mode 100644 mobile/android/branding/official/res/drawable-nodpi/home_tab_menu_strip_tor.9.png diff --git a/mobile/android/app/src/main/res/layout/firstrun_animation_container.xml b/mobile/android/app/src/main/res/layout/firstrun_animation_container.xml index 3e7225365c57e..dd20466a8e1a9 100644 --- a/mobile/android/app/src/main/res/layout/firstrun_animation_container.xml +++ b/mobile/android/app/src/main/res/layout/firstrun_animation_container.xml @@ -8,7 +8,7 @@ xmlns:gecko="http://schemas.android.com/apk/res-auto" android:layout_height="match_parent" android:layout_width="match_parent" - android:background="@color/dark_transparent_overlay"> + android:background="@android:color/white"> diff --git a/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml b/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml index 700ab20663ced..b0083511ae0de 100644 --- a/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml +++ b/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml @@ -13,31 +13,37 @@ - + + + + + android:gravity="left" + android:lineSpacingExtra="5dp" + android:textAppearance="@style/TextAppearance.FirstrunTorRegular.Body"/> diff --git a/mobile/android/app/src/main/res/values/colors.xml b/mobile/android/app/src/main/res/values/colors.xml index d1be54da0233a..f31f0e73198fc 100644 --- a/mobile/android/app/src/main/res/values/colors.xml +++ b/mobile/android/app/src/main/res/values/colors.xml @@ -151,6 +151,9 @@ #272727 + #484848 + #7D4698 + #FAFAFA #ffffcb51 diff --git a/mobile/android/app/src/main/res/values/styles.xml b/mobile/android/app/src/main/res/values/styles.xml index 033aec05c806b..a669933fca01a 100644 --- a/mobile/android/app/src/main/res/values/styles.xml +++ b/mobile/android/app/src/main/res/values/styles.xml @@ -730,6 +730,7 @@ + +