wordpress-mobile · antonis · Nov 27, 2020 · Nov 17, 2020 · Nov 17, 2020 · Nov 19, 2020
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,5 +1,6 @@
 16.3
 -----
+* [***] Site Creation: Adds an option to pick a home page design when creating a WordPress.com site.
 * [*] Posts Settings: removed deprecated location setting [https://github.com/wordpress-mobile/WordPress-Android/pull/13404]
 * [***] Stories: New feature for WordPress.com and Jetpack sites: Use photos and videos to create engaging and tappable fullscreen slideshows. [https://github.com/wordpress-mobile/WordPress-Android/pull/13459]
 

diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -71,7 +71,7 @@ android {
         buildConfigField "boolean", "FEATURE_ANNOUNCEMENT_AVAILABLE", "false"
         buildConfigField "boolean", "GUTENBERG_MENTIONS", "true"
         buildConfigField "boolean", "MODAL_LAYOUT_PICKER", "true"
-        buildConfigField "boolean", "HOME_PAGE_PICKER", "false"
+        buildConfigField "boolean", "HOME_PAGE_PICKER", "true"
         buildConfigField "boolean", "UNIFIED_LOGIN_AVAILABLE", "true"
         buildConfigField "boolean", "WP_STORIES_AVAILABLE", "true"
         buildConfigField "boolean", "ANY_FILE_UPLOAD", "true"
@@ -105,7 +105,6 @@ android {
             buildConfigField "boolean", "TENOR_AVAILABLE", "false"
             buildConfigField "long", "REMOTE_CONFIG_FETCH_INTERVAL", "3600"
             buildConfigField "boolean", "GUTENBERG_MENTIONS", "true"
-            buildConfigField "boolean", "HOME_PAGE_PICKER", "false"
             buildConfigField "boolean", "WP_STORIES_AVAILABLE", "true"
             buildConfigField "boolean", "ANY_FILE_UPLOAD", "false"
             buildConfigField "boolean", "ENABLE_FEATURE_CONFIGURATION", "false"
@@ -121,7 +120,6 @@ android {
         wasabi { // "hot" version, can be installed along release, alpha or beta versions
             applicationId "org.wordpress.android.beta"
             dimension "buildType"
-            buildConfigField "boolean", "HOME_PAGE_PICKER", "true"
             // Enable this for testing consolidated media picker
             // buildConfigField "boolean", "CONSOLIDATED_MEDIA_PICKER", "true"
             buildConfigField "boolean", "FOLLOW_UNFOLLOW_COMMENTS", "true"
@@ -130,7 +128,6 @@ android {
         jalapeno { // Pre-Alpha version, used for PR builds, can be installed along release, alpha, beta, dev versions
             applicationId "org.wordpress.android.prealpha"
             dimension "buildType"
-            buildConfigField "boolean", "HOME_PAGE_PICKER", "false"
         }
     }
 

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/misc/SiteCreationTracker.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/misc/SiteCreationTracker.kt
@@ -118,7 +118,7 @@ class SiteCreationTracker @Inject constructor(val tracker: AnalyticsTrackerWrapp
 
     fun trackSiteDesignPreviewLoaded(template: String) {
         tracker.track(
-                AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SUCCESS_PREVIEW_LOADED,
+                AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SITE_DESIGN_PREVIEW_LOADED,
                 mapOf("template" to template)
         )
     }

diff --git a/...c/main/java/org/wordpress/android/ui/sitecreation/previews/SiteCreationPreviewFragment.kt b/...c/main/java/org/wordpress/android/ui/sitecreation/previews/SiteCreationPreviewFragment.kt
@@ -121,6 +121,7 @@ class SiteCreationPreviewFragment : SiteCreationBaseFormFragment(),
         viewModel.preloadPreview.observe(this, Observer { url ->
             url?.let {
                 sitePreviewWebView.webViewClient = URLFilteredWebViewClient(url, this@SiteCreationPreviewFragment)
+                sitePreviewWebView.settings.userAgentString = WordPress.getUserAgent()
                 sitePreviewWebView.loadUrl(url)
             }
         })

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/DesignPreviewFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/DesignPreviewFragment.kt
@@ -67,7 +67,7 @@ class DesignPreviewFragment : FullscreenBottomSheetDialogFragment() {
             when (state) {
                 is Loading -> {
                     progressBar.setVisible(true)
-                    webView.setVisible(true)
+                    webView.setVisible(false)
                     errorView.setVisible(false)
                     webView.loadUrl(url)
                 }
@@ -89,6 +89,7 @@ class DesignPreviewFragment : FullscreenBottomSheetDialogFragment() {
 
         chooseButton.setOnClickListener { viewModel.onPreviewChooseTapped() }
 
+        webView.settings.userAgentString = WordPress.getUserAgent()
         webView.webViewClient = object : WebViewClient() {
             override fun onPageFinished(view: WebView?, url: String?) {
                 super.onPageFinished(view, url)

diff --git a/WordPress/src/main/res/layout-land/site_creation_header_item.xml b/WordPress/src/main/res/layout-land/site_creation_header_item.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     style="@style/SiteCreationHeaderLinearLayoutStyle"
     android:paddingStart="@dimen/site_creation_segments_content_padding_horizontal"
-    android:paddingTop="@dimen/site_creation_segments_content_padding_vertical"
     android:paddingEnd="@dimen/site_creation_segments_content_padding_horizontal"
     android:paddingBottom="@dimen/site_creation_segments_content_padding_vertical">
 

diff --git a/WordPress/src/main/res/layout-sw600dp/home_page_picker_bottom_toolbar.xml b/WordPress/src/main/res/layout-sw600dp/home_page_picker_bottom_toolbar.xml
@@ -13,7 +13,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/categoriesBackground"
+        android:background="?attr/layoutPickerBackground"
         android:gravity="center"
         android:orientation="horizontal"
         android:paddingBottom="@dimen/picker_bottom_button_vertical_margin"

diff --git a/WordPress/src/main/res/layout/home_page_picker_bottom_toolbar.xml b/WordPress/src/main/res/layout/home_page_picker_bottom_toolbar.xml
@@ -13,7 +13,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/categoriesBackground"
+        android:background="?attr/layoutPickerBackground"
         android:gravity="center"
         android:orientation="horizontal"
         android:paddingBottom="@dimen/picker_bottom_button_vertical_margin"

diff --git a/WordPress/src/main/res/layout/home_page_picker_fragment.xml b/WordPress/src/main/res/layout/home_page_picker_fragment.xml
@@ -3,15 +3,15 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/categoriesBackground"
+    android:background="?attr/layoutPickerBackground"
     android:fitsSystemWindows="false"
     android:focusableInTouchMode="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/categoriesBackground"
+        android:background="?attr/layoutPickerBackground"
         android:fitsSystemWindows="false">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
@@ -32,13 +32,14 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:background="?attr/categoriesBackground"
+                android:background="?attr/layoutPickerBackground"
                 android:elevation="0dp"
                 app:layout_collapseMode="pin">
 
                 <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/toolbar_height"
+                    android:layout_marginTop="@dimen/margin_extra_small"
                     android:orientation="vertical">
 
                     <include
@@ -70,7 +71,7 @@
         android:paddingStart="@dimen/hpp_card_padding"
         android:paddingEnd="0dp"
         android:paddingBottom="@dimen/toolbar_content_offset"
-        android:background="?attr/categoriesBackground"
+        android:background="?attr/layoutPickerBackground"
         android:clipToPadding="false"
         android:descendantFocusability="beforeDescendants"
         android:scrollbars="none"

diff --git a/WordPress/src/main/res/layout/home_page_picker_loading_skeleton.xml b/WordPress/src/main/res/layout/home_page_picker_loading_skeleton.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="@dimen/margin_medium"
-    android:background="?attr/categoriesBackground"
+    android:background="?attr/layoutPickerBackground"
     app:shimmer_base_alpha="@dimen/skeleton_shimmer_base_alpha"
     app:shimmer_highlight_alpha="@dimen/skeleton_shimmer_highlight_alpha">
 

diff --git a/WordPress/src/main/res/layout/home_page_picker_preview_fragment.xml b/WordPress/src/main/res/layout/home_page_picker_preview_fragment.xml
@@ -19,7 +19,8 @@
 
         <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/margin_small_medium">
 
             <ImageButton
                 android:id="@+id/backButton"
@@ -69,7 +70,7 @@
         <ProgressBar
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center|top" />
+            android:layout_gravity="center" />
     </FrameLayout>
 
     <LinearLayout
@@ -84,7 +85,7 @@
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/categoriesBackground"
+            android:background="?attr/layoutPickerBackground"
             android:gravity="center"
             android:paddingBottom="@dimen/picker_bottom_button_vertical_margin"
             android:paddingTop="@dimen/picker_bottom_button_vertical_margin">

diff --git a/WordPress/src/main/res/layout/mlp_editor_preview_toolbar.xml b/WordPress/src/main/res/layout/mlp_editor_preview_toolbar.xml
@@ -14,7 +14,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/categoriesBackground"
+        android:background="?attr/layoutPickerBackground"
         android:gravity="center"
         android:orientation="horizontal"
         android:paddingBottom="@dimen/picker_bottom_button_vertical_margin"

diff --git a/WordPress/src/main/res/layout/modal_layout_picker_bottom_toolbar.xml b/WordPress/src/main/res/layout/modal_layout_picker_bottom_toolbar.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/categoriesBackground"
+    android:background="?attr/layoutPickerBackground"
     android:gravity="center"
     android:orientation="horizontal"
     android:paddingBottom="@dimen/picker_bottom_button_vertical_margin"

diff --git a/WordPress/src/main/res/layout/modal_layout_picker_categories_skeleton.xml b/WordPress/src/main/res/layout/modal_layout_picker_categories_skeleton.xml
@@ -4,7 +4,7 @@
     android:id="@+id/categoriesSkeleton"
     android:layout_width="match_parent"
     android:layout_height="@dimen/mlp_categories_bar_height"
-    android:background="?attr/categoriesBackground"
+    android:background="?attr/layoutPickerBackground"
     android:paddingEnd="@dimen/mlp_layout_card_margin_end"
     android:paddingStart="@dimen/mlp_layout_card_margin_start">
 

diff --git a/WordPress/src/main/res/layout/modal_layout_picker_error.xml b/WordPress/src/main/res/layout/modal_layout_picker_error.xml
@@ -4,7 +4,7 @@
     android:id="@+id/errorLayout"
     android:layout_width="match_parent"
     android:layout_height="@dimen/mlp_layouts_row_height"
-    android:background="?attr/categoriesBackground">
+    android:background="?attr/layoutPickerBackground">
 
     <org.wordpress.android.ui.ActionableEmptyView
         android:id="@+id/actionableEmptyView"

diff --git a/WordPress/src/main/res/layout/modal_layout_picker_fragment.xml b/WordPress/src/main/res/layout/modal_layout_picker_fragment.xml
@@ -11,7 +11,7 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/categoriesBackground"
+        android:background="?attr/layoutPickerBackground"
         android:fitsSystemWindows="false">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
@@ -32,7 +32,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:background="?attr/categoriesBackground"
+                android:background="?attr/layoutPickerBackground"
                 android:elevation="0dp"
                 app:layout_collapseMode="pin">
 
@@ -69,7 +69,7 @@
             android:id="@+id/categoriesRecyclerView"
             android:layout_width="match_parent"
             android:layout_height="@dimen/mlp_categories_bar_height"
-            android:background="?attr/categoriesBackground"
+            android:background="?attr/layoutPickerBackground"
             android:clipToPadding="false"
             android:descendantFocusability="beforeDescendants"
             android:orientation="horizontal"
@@ -89,7 +89,7 @@
         android:id="@+id/layoutsRecyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/categoriesBackground"
+        android:background="?attr/layoutPickerBackground"
         android:layout_marginBottom="@dimen/toolbar_content_offset"
         android:clipToPadding="false"
         android:descendantFocusability="beforeDescendants"

diff --git a/WordPress/src/main/res/layout/modal_layout_picker_layouts_skeleton.xml b/WordPress/src/main/res/layout/modal_layout_picker_layouts_skeleton.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/mlp_layouts_row_height"
     android:layout_marginTop="@dimen/margin_extra_large"
-    android:background="?attr/categoriesBackground">
+    android:background="?attr/layoutPickerBackground">
 
     <com.facebook.shimmer.ShimmerFrameLayout
         android:layout_width="match_parent"

diff --git a/WordPress/src/main/res/layout/site_creation_activity.xml b/WordPress/src/main/res/layout/site_creation_activity.xml
@@ -3,7 +3,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:baselineAligned="true"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:background="?attr/layoutPickerBackground">
 
     <FrameLayout
         android:id="@+id/fragment_container"

diff --git a/WordPress/src/main/res/layout/site_creation_domains_screen.xml b/WordPress/src/main/res/layout/site_creation_domains_screen.xml
@@ -56,7 +56,7 @@
         android:id="@+id/create_site_button_container"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:background="?attr/categoriesBackground"
+        android:background="?attr/layoutPickerBackground"
         android:gravity="center"
         android:paddingBottom="@dimen/picker_bottom_button_vertical_margin"
         android:paddingTop="@dimen/picker_bottom_button_vertical_margin"

diff --git a/WordPress/src/main/res/layout/site_creation_form_screen.xml b/WordPress/src/main/res/layout/site_creation_form_screen.xml
@@ -9,6 +9,7 @@
         android:id="@+id/appbar_main"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="?attr/layoutPickerBackground"
         app:liftOnScrollTargetViewId="@+id/site_creation_nested_scroll_view">
 
         <com.google.android.material.appbar.MaterialToolbar

diff --git a/WordPress/src/main/res/layout/site_creation_header_item.xml b/WordPress/src/main/res/layout/site_creation_header_item.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     style="@style/SiteCreationHeaderLinearLayoutStyle"
     android:paddingStart="@dimen/site_creation_segments_content_padding_horizontal"
-    android:paddingTop="@dimen/site_creation_segments_content_padding_vertical"
     android:paddingEnd="@dimen/site_creation_segments_content_padding_horizontal"
     android:paddingBottom="@dimen/site_creation_segments_content_padding_vertical">
 

diff --git a/WordPress/src/main/res/layout/site_creation_search_input_item.xml b/WordPress/src/main/res/layout/site_creation_search_input_item.xml
@@ -40,7 +40,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:background="?attr/colorSurface"
+        android:background="?attr/layoutPickerBackground"
         tools:visibility="invisible">
 
         <ProgressBar

diff --git a/WordPress/src/main/res/values-en-rAU/strings.xml b/WordPress/src/main/res/values-en-rAU/strings.xml
@@ -340,7 +340,7 @@ Language: en_AU
     <string name="new_site_creation_create_site_button">Create Site</string>
     <string name="new_site_creation_search_domain_input_hint">Search Domains</string>
     <string name="new_site_creation_domain_header_subtitle">This is where people will find you on the internet.</string>
-    <string name="new_site_creation_domain_header_title">Choose a domain name for your site</string>
+    <string name="new_site_creation_domain_header_title">Choose a domain</string>
     <string name="new_site_creation_empty_domain_list_message">No available addresses matching your search</string>
     <string name="site_creation_error_generic_subtitle">Error communicating with the server, please try again</string>
     <string name="site_creation_error_generic_title">There was a problem</string>

diff --git a/WordPress/src/main/res/values-en-rCA/strings.xml b/WordPress/src/main/res/values-en-rCA/strings.xml
@@ -872,7 +872,7 @@ Language: en_CA
     <string name="new_site_creation_create_site_button">Create Site</string>
     <string name="new_site_creation_search_domain_input_hint">Search Domains</string>
     <string name="new_site_creation_domain_header_subtitle">This is where people will find you on the internet.</string>
-    <string name="new_site_creation_domain_header_title">Choose a domain name for your site</string>
+    <string name="new_site_creation_domain_header_title">Choose a domain</string>
     <string name="new_site_creation_empty_domain_list_message">No available addresses matching your search</string>
     <string name="site_creation_error_generic_subtitle">Error communicating with the server, please try again</string>
     <string name="site_creation_error_generic_title">There was a problem</string>

diff --git a/WordPress/src/main/res/values-en-rGB/strings.xml b/WordPress/src/main/res/values-en-rGB/strings.xml
@@ -950,7 +950,7 @@ Language: en_GB
     <string name="new_site_creation_create_site_button">Create Site</string>
     <string name="new_site_creation_search_domain_input_hint">Search Domains</string>
     <string name="new_site_creation_domain_header_subtitle">This is where people will find you on the internet.</string>
-    <string name="new_site_creation_domain_header_title">Choose a domain name for your site</string>
+    <string name="new_site_creation_domain_header_title">Choose a domain</string>
     <string name="new_site_creation_empty_domain_list_message">No available addresses matching your search</string>
     <string name="site_creation_error_generic_subtitle">Error communicating with the server, please try again</string>
     <string name="site_creation_error_generic_title">There was a problem</string>

diff --git a/WordPress/src/main/res/values-night/styles.xml b/WordPress/src/main/res/values-night/styles.xml
@@ -78,7 +78,7 @@
         <item name="categoriesButtonBackground">@color/mlp_categories_button_background_dark</item>
         <item name="categoriesButtonBackgroundSelected">@color/mlp_categories_button_background_selected_dark</item>
         <item name="mlpDividerColor">@color/mlp_divider_dark</item>
-        <item name="categoriesBackground">@color/mlp_categories_background_dark</item>
+        <item name="layoutPickerBackground">@color/mlp_categories_background_dark</item>
 
         <!-- Material Date Range Picker -->
         <item name="materialCalendarStyle">@style/WordPress.MaterialCalendarStyle</item>

diff --git a/WordPress/src/main/res/values/attrs.xml b/WordPress/src/main/res/values/attrs.xml
@@ -21,7 +21,7 @@
     <attr name="colorGutenbergBackground" format="reference|color" />
 
     <!-- Modal layout picker colors-->
-    <attr name="categoriesBackground" format="reference|color" />
+    <attr name="layoutPickerBackground" format="reference|color" />
     <attr name="categoriesButtonBackground" format="reference|color" />
     <attr name="categoriesButtonBackgroundSelected" format="reference|color" />
     <attr name="mlpDividerColor" format="reference|color" />

diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml
@@ -166,6 +166,7 @@
         @dimen/emphasis_extra_low
     </item>
 
+    <dimen name="text_sz_extra_extra_small">7sp</dimen>
     <dimen name="text_sz_extra_small">10sp</dimen>
     <dimen name="text_sz_small">12sp</dimen>
     <dimen name="text_sz_medium">14sp</dimen>

diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
@@ -2939,7 +2939,7 @@
 
     <!-- Home Page Picker -->
     <string name="hpp_title">Choose a design</string>
-    <string name="hpp_subtitle">Pick your favorite homepage layout. You can customize or change it later.</string>
+    <string name="hpp_subtitle">Pick your favorite homepage layout. You can edit and customize it later.</string>
     <string name="hpp_choose_button">Choose</string>
     <string name="hpp_skip_button">Skip</string>
     <string name="hpp_error_title">Layouts not available while offline</string>

diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml
@@ -92,7 +92,7 @@
         <item name="categoriesButtonBackground">@color/mlp_categories_button_background</item>
         <item name="categoriesButtonBackgroundSelected">@color/grey_900</item>
         <item name="mlpDividerColor">@color/grey_300</item>
-        <item name="categoriesBackground">@color/white</item>
+        <item name="layoutPickerBackground">@color/white</item>
 
         <!-- Material Date Range Picker -->
         <item name="materialCalendarStyle">@style/WordPress.MaterialCalendarStyle</item>
@@ -1419,7 +1419,9 @@
     <style name="ModalLayoutPickerCategoryEmoji" parent="ModalLayoutPickerText">
         <item name="android:layout_width">@dimen/mlp_categories_emoji_size</item>
         <item name="android:layout_height">@dimen/mlp_categories_emoji_size</item>
-        <item name="android:textSize">@dimen/text_sz_medium</item>
+        <item name="autoSizeMaxTextSize">@dimen/text_sz_medium</item>
+        <item name="autoSizeMinTextSize">@dimen/text_sz_extra_extra_small</item>
+        <item name="autoSizeTextType">uniform</item>
         <item name="android:layout_marginStart">@dimen/mlp_category_horizontal_margin</item>
         <item name="android:layout_marginEnd">@dimen/mlp_category_horizontal_central_margin</item>
         <item name="android:textAppearance">?attr/textAppearanceBody2</item>

diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile