From 335a430d22aa07c713b66e425b3a570578086116 Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Wed, 27 Apr 2022 07:54:01 +1000
Subject: [PATCH 001/111] Remove thumbnail mode selector from design picker

---
 .../ui/sitecreation/theme/HomePagePickerFragment.kt   | 11 -----------
 .../src/main/res/layout/home_page_picker_titlebar.xml | 10 ----------
 2 files changed, 21 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index d301592cdf65..986f93353380 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -15,7 +15,6 @@ import com.google.android.material.appbar.AppBarLayout
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.databinding.HomePagePickerFragmentBinding
-import org.wordpress.android.ui.PreviewModeSelectorPopup
 import org.wordpress.android.ui.layoutpicker.CategoriesAdapter
 import org.wordpress.android.ui.layoutpicker.LayoutCategoryAdapter
 import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState
@@ -43,7 +42,6 @@ class HomePagePickerFragment : Fragment() {
     @Inject lateinit var siteNameFeatureConfig: SiteNameFeatureConfig
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     private lateinit var viewModel: HomePagePickerViewModel
-    private lateinit var previewModeSelectorPopup: PreviewModeSelectorPopup
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
@@ -83,10 +81,6 @@ class HomePagePickerFragment : Fragment() {
             setupUi()
             setupViewModel()
             setupActionListeners()
-            previewModeSelectorPopup = PreviewModeSelectorPopup(
-                    requireActivity(),
-                    homePagePickerTitlebar.previewTypeSelectorButton
-            )
         }
     }
 
@@ -132,10 +126,6 @@ class HomePagePickerFragment : Fragment() {
             }
         })
 
-        viewModel.onThumbnailModeButtonPressed.observe(viewLifecycleOwner, {
-            previewModeSelectorPopup.show(viewModel)
-        })
-
         viewModel.onCategorySelectionChanged.observeEvent(viewLifecycleOwner, {
             layoutsRecyclerView.smoothScrollToPosition(0)
         })
@@ -178,7 +168,6 @@ class HomePagePickerFragment : Fragment() {
         homePagePickerTitlebar.skipButton.setOnClickListener { viewModel.onSkippedTapped() }
         errorView.button.setOnClickListener { viewModel.onRetryClicked() }
         homePagePickerTitlebar.backButton.setOnClickListener { viewModel.onBackPressed() }
-        homePagePickerTitlebar.previewTypeSelectorButton.setOnClickListener { viewModel.onThumbnailModePressed() }
         setScrollListener()
     }
 
diff --git a/WordPress/src/main/res/layout/home_page_picker_titlebar.xml b/WordPress/src/main/res/layout/home_page_picker_titlebar.xml
index c5584a073539..1cca93fc5537 100644
--- a/WordPress/src/main/res/layout/home_page_picker_titlebar.xml
+++ b/WordPress/src/main/res/layout/home_page_picker_titlebar.xml
@@ -22,16 +22,6 @@
         android:paddingEnd="0dp"
         android:text="@string/hpp_title" />
 
-    <ImageButton
-        android:id="@+id/previewTypeSelectorButton"
-        style="@style/WebPreviewNavbarButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_weight="0"
-        android:contentDescription="@string/preview_type_desc"
-        android:src="@drawable/ic_devices_white_24dp" />
-
     <Button
         android:id="@+id/skipButton"
         style="@style/HomePagePickerSkipButton"

From 4f37a1c319b2e3eb17f98ce81dd7e5f763dfcc30 Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Wed, 27 Apr 2022 13:09:56 +1000
Subject: [PATCH 002/111] Rename theme chooser title

---
 WordPress/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index e929bc5890ae..eb3b729e21d8 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -3340,14 +3340,14 @@
     <string name="mlp_network_error_subtitle">Tap retry when you\'re back online or create a blank page using the button below.</string>
 
     <!-- Home Page Picker -->
-    <string name="hpp_title">Choose a design</string>
+    <string name="hpp_title">Choose a theme</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_choose_and_create_site">Create site</string>
     <string name="hpp_error_title">Layouts not available while offline</string>
     <string name="hpp_error_subtitle">Tap retry when you\'re back online.</string>
     <string name="hpp_retry_error">Please Check your internet connection and retry.</string>
-    <string name="hpp_choose_error">There was an error while selecting the design.</string>
+    <string name="hpp_choose_error">There was an error while selecting the theme.</string>
 
     <!-- Stories -->
     <string name="dialog_edit_story_limited_title">Limited Story Editing</string>

From b42d352ddde69af1806547b54d4fdac21a9f3fc6 Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Wed, 27 Apr 2022 13:31:53 +1000
Subject: [PATCH 003/111] Remove subtitle text from theme chooser heading

---
 .../sitecreation/theme/HomePagePickerFragment.kt | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index 986f93353380..4ec77ef3c911 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -86,8 +86,10 @@ class HomePagePickerFragment : Fragment() {
 
     private fun HomePagePickerFragmentBinding.setupUi() {
         homePagePickerTitlebar.title.isInvisible = !displayUtils.isPhoneLandscape()
-        modalLayoutPickerHeaderSection.modalLayoutPickerTitleRow?.header?.setText(R.string.hpp_title)
-        modalLayoutPickerHeaderSection.modalLayoutPickerSubtitleRow?.description?.setText(R.string.hpp_subtitle)
+        with (modalLayoutPickerHeaderSection) {
+            modalLayoutPickerTitleRow?.header?.setText(R.string.hpp_title)
+            modalLayoutPickerSubtitleRow?.root?.visibility = View.GONE
+        }
         if (siteNameFeatureConfig.isEnabled()) {
             homePagePickerBottomToolbar.chooseButton.setText(R.string.hpp_choose_and_create_site)
         }
@@ -96,7 +98,6 @@ class HomePagePickerFragment : Fragment() {
     private fun HomePagePickerFragmentBinding.setupViewModel() {
         viewModel.uiState.observe(viewLifecycleOwner, { uiState ->
             setHeaderVisibility(uiState.isHeaderVisible)
-            setDescriptionVisibility(uiState.isDescriptionVisible)
             setContentVisibility(uiState.loadingSkeletonVisible, uiState.errorViewVisible)
             setToolbarVisibility(uiState.isToolbarVisible)
             when (uiState) {
@@ -141,15 +142,6 @@ class HomePagePickerFragment : Fragment() {
         )
     }
 
-    /**
-     * Sets the header description visibility
-     * @param visible if true the description is visible else invisible
-     */
-    private fun HomePagePickerFragmentBinding.setDescriptionVisibility(visible: Boolean) {
-        modalLayoutPickerHeaderSection.modalLayoutPickerSubtitleRow?.description?.visibility =
-                if (visible) View.VISIBLE else View.INVISIBLE
-    }
-
     private fun HomePagePickerFragmentBinding.setContentVisibility(skeleton: Boolean, error: Boolean) {
         modalLayoutPickerCategoriesSkeleton.categoriesSkeleton.setVisible(skeleton)
         categoriesRecyclerView.setVisible(!skeleton && !error)

From 7d11be372fdfd1911211c6a8b3fce3f35ed563dc Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Wed, 27 Apr 2022 14:29:07 +1000
Subject: [PATCH 004/111] Move lambdas outsite of parentheses

This isn't needed for this task, but is useful to satisfy the IDE :)
---
 .../android/ui/mlp/ModalLayoutPickerFragment.kt  | 16 ++++++++--------
 .../sitecreation/theme/HomePagePickerFragment.kt | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt
index b3b172fce2ff..99a742eac9b4 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt
@@ -118,7 +118,7 @@ class ModalLayoutPickerFragment : FullscreenBottomSheetDialogFragment() {
     private fun ModalLayoutPickerFragmentBinding.setupViewModel(savedInstanceState: Bundle?) {
         viewModel.loadSavedState(savedInstanceState)
 
-        viewModel.uiState.observe(this@ModalLayoutPickerFragment, { uiState ->
+        viewModel.uiState.observe(this@ModalLayoutPickerFragment) { uiState ->
             setHeaderVisibility(uiState.isHeaderVisible)
             setDescriptionVisibility(uiState.isDescriptionVisible)
             setButtonsVisibility(uiState.buttonsUiState)
@@ -135,13 +135,13 @@ class ModalLayoutPickerFragment : FullscreenBottomSheetDialogFragment() {
                     uiState.subtitle?.let { modalLayoutPickerError.actionableEmptyView.subtitle.setText(it) }
                 }
             }
-        })
+        }
 
-        viewModel.onThumbnailModeButtonPressed.observe(viewLifecycleOwner, {
+        viewModel.onThumbnailModeButtonPressed.observe(viewLifecycleOwner) {
             previewModeSelectorPopup.show(viewModel)
-        })
+        }
 
-        viewModel.onPreviewActionPressed.observe(viewLifecycleOwner, { action ->
+        viewModel.onPreviewActionPressed.observe(viewLifecycleOwner) { action ->
             activity?.supportFragmentManager?.let { fm ->
                 when (action) {
                     is Show -> {
@@ -153,11 +153,11 @@ class ModalLayoutPickerFragment : FullscreenBottomSheetDialogFragment() {
                     }
                 }
             }
-        })
+        }
 
-        viewModel.onCategorySelectionChanged.observeEvent(this@ModalLayoutPickerFragment, {
+        viewModel.onCategorySelectionChanged.observeEvent(this@ModalLayoutPickerFragment) {
             layoutsRecyclerView.smoothScrollToPosition(0)
-        })
+        }
     }
 
     private fun ModalLayoutPickerFragmentBinding.setHeaderVisibility(visible: Boolean) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index 4ec77ef3c911..f13097e40e9f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -96,7 +96,7 @@ class HomePagePickerFragment : Fragment() {
     }
 
     private fun HomePagePickerFragmentBinding.setupViewModel() {
-        viewModel.uiState.observe(viewLifecycleOwner, { uiState ->
+        viewModel.uiState.observe(viewLifecycleOwner) { uiState ->
             setHeaderVisibility(uiState.isHeaderVisible)
             setContentVisibility(uiState.loadingSkeletonVisible, uiState.errorViewVisible)
             setToolbarVisibility(uiState.isToolbarVisible)
@@ -111,9 +111,9 @@ class HomePagePickerFragment : Fragment() {
                     uiState.toast?.let { ToastUtils.showToast(requireContext(), it) }
                 }
             }
-        })
+        }
 
-        viewModel.onPreviewActionPressed.observe(viewLifecycleOwner, { action ->
+        viewModel.onPreviewActionPressed.observe(viewLifecycleOwner) { action ->
             activity?.supportFragmentManager?.let { fm ->
                 when (action) {
                     is Show -> {
@@ -125,11 +125,11 @@ class HomePagePickerFragment : Fragment() {
                     }
                 }
             }
-        })
+        }
 
-        viewModel.onCategorySelectionChanged.observeEvent(viewLifecycleOwner, {
+        viewModel.onCategorySelectionChanged.observeEvent(viewLifecycleOwner) {
             layoutsRecyclerView.smoothScrollToPosition(0)
-        })
+        }
 
         viewModel.start(displayUtils.isTablet())
     }

From f16160f3d03a3aaf8c717411be771362fd51437b Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Wed, 27 Apr 2022 14:54:06 +1000
Subject: [PATCH 005/111] Remove bottom toolbar from theme chooser screen

---
 .../theme/HomePagePickerFragment.kt           | 10 -----
 .../home_page_picker_bottom_toolbar.xml       | 40 ------------------
 .../home_page_picker_bottom_toolbar.xml       | 42 -------------------
 .../res/layout/home_page_picker_fragment.xml  |  8 ----
 4 files changed, 100 deletions(-)
 delete mode 100644 WordPress/src/main/res/layout-sw600dp/home_page_picker_bottom_toolbar.xml
 delete mode 100644 WordPress/src/main/res/layout/home_page_picker_bottom_toolbar.xml

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index f13097e40e9f..b913205aa024 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -90,16 +90,12 @@ class HomePagePickerFragment : Fragment() {
             modalLayoutPickerTitleRow?.header?.setText(R.string.hpp_title)
             modalLayoutPickerSubtitleRow?.root?.visibility = View.GONE
         }
-        if (siteNameFeatureConfig.isEnabled()) {
-            homePagePickerBottomToolbar.chooseButton.setText(R.string.hpp_choose_and_create_site)
-        }
     }
 
     private fun HomePagePickerFragmentBinding.setupViewModel() {
         viewModel.uiState.observe(viewLifecycleOwner) { uiState ->
             setHeaderVisibility(uiState.isHeaderVisible)
             setContentVisibility(uiState.loadingSkeletonVisible, uiState.errorViewVisible)
-            setToolbarVisibility(uiState.isToolbarVisible)
             when (uiState) {
                 is LayoutPickerUiState.Loading -> { // Nothing more to do here
                 }
@@ -150,13 +146,7 @@ class HomePagePickerFragment : Fragment() {
         errorView.setVisible(error)
     }
 
-    private fun HomePagePickerFragmentBinding.setToolbarVisibility(visible: Boolean) {
-        AniUtils.animateBottomBar(homePagePickerBottomToolbar.bottomToolbar, visible)
-    }
-
     private fun HomePagePickerFragmentBinding.setupActionListeners() {
-        homePagePickerBottomToolbar.previewButton.setOnClickListener { viewModel.onPreviewTapped() }
-        homePagePickerBottomToolbar.chooseButton.setOnClickListener { viewModel.onChooseTapped() }
         homePagePickerTitlebar.skipButton.setOnClickListener { viewModel.onSkippedTapped() }
         errorView.button.setOnClickListener { viewModel.onRetryClicked() }
         homePagePickerTitlebar.backButton.setOnClickListener { viewModel.onBackPressed() }
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
deleted file mode 100644
index b9ea6d9eb1b5..000000000000
--- a/WordPress/src/main/res/layout-sw600dp/home_page_picker_bottom_toolbar.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/bottomToolbar"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/mlp_bottom_shadow_height"
-        android:background="@drawable/modal_layout_picker_bottom_shadow" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/layoutPickerBackground"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:paddingBottom="@dimen/picker_bottom_button_vertical_margin"
-        android:paddingTop="@dimen/picker_bottom_button_vertical_margin">
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/previewButton"
-            style="@style/Widget.ModalLayoutPicker.Button.Secondary"
-            android:layout_width="@dimen/hpp_button_max_width"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/mlp_bottom_button_horizontal_central_margin"
-            android:layout_marginStart="@dimen/mlp_bottom_button_horizontal_margin"
-            android:text="@string/mlp_preview_page" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/chooseButton"
-            style="@style/Widget.ModalLayoutPicker.Button.Primary"
-            android:layout_width="@dimen/hpp_button_max_width"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/mlp_bottom_button_horizontal_margin"
-            android:text="@string/hpp_choose_button" />
-
-    </LinearLayout>
-</LinearLayout>
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
deleted file mode 100644
index b937dd3838f2..000000000000
--- a/WordPress/src/main/res/layout/home_page_picker_bottom_toolbar.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/bottomToolbar"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/mlp_bottom_shadow_height"
-        android:background="@drawable/modal_layout_picker_bottom_shadow" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/layoutPickerBackground"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:paddingBottom="@dimen/picker_bottom_button_vertical_margin"
-        android:paddingTop="@dimen/picker_bottom_button_vertical_margin">
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/previewButton"
-            style="@style/Widget.ModalLayoutPicker.Button.Secondary"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/mlp_bottom_button_horizontal_central_margin"
-            android:layout_marginStart="@dimen/mlp_bottom_button_horizontal_margin"
-            android:layout_weight="1"
-            android:text="@string/mlp_preview_page" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/chooseButton"
-            style="@style/Widget.ModalLayoutPicker.Button.Primary"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/mlp_bottom_button_horizontal_margin"
-            android:layout_weight="1"
-            android:text="@string/hpp_choose_button" />
-
-    </LinearLayout>
-</LinearLayout>
diff --git a/WordPress/src/main/res/layout/home_page_picker_fragment.xml b/WordPress/src/main/res/layout/home_page_picker_fragment.xml
index afb5d4960868..c9d401cc8da7 100644
--- a/WordPress/src/main/res/layout/home_page_picker_fragment.xml
+++ b/WordPress/src/main/res/layout/home_page_picker_fragment.xml
@@ -105,12 +105,4 @@
         app:aevSubtitle="@string/hpp_error_subtitle"
         app:aevTitle="@string/hpp_error_title"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-    <include
-        android:id="@+id/home_page_picker_bottom_toolbar"
-        layout="@layout/home_page_picker_bottom_toolbar"
-        android:visibility="gone"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

From d1bc9402b8688118cd58387d1dec39001f997ef8 Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Wed, 27 Apr 2022 14:55:35 +1000
Subject: [PATCH 006/111] Add TODOS for loose ends from removed UI

Since we are removing some parts of an implementation that shares a base
class with the page picker, there will be some changes needed to adapt
these for the new flow. The intent with these comments is to serve as a
place-holder denoting some things that need to be rewired.
---
 .../android/ui/layoutpicker/LayoutPickerViewModel.kt      | 2 +-
 .../ui/sitecreation/theme/HomePagePickerViewModel.kt      | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
index d8cf46b5fdf0..71c1507e2b5c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
@@ -187,7 +187,7 @@ abstract class LayoutPickerViewModel(
      * Layout tapped
      * @param layoutSlug the slug of the tapped layout
      */
-    fun onLayoutTapped(layoutSlug: String) {
+    open fun onLayoutTapped(layoutSlug: String) {
         (uiState.value as? Content)?.let { state ->
             if (!state.loadedThumbnailSlugs.contains(layoutSlug)) return // No action
             if (layoutSlug == state.selectedLayoutSlug) { // deselect
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
index 074a87baa8de..5980c5ffb99d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
@@ -85,12 +85,20 @@ class HomePagePickerViewModel @Inject constructor(
         }
     }
 
+    override fun onLayoutTapped(layoutSlug: String) {
+        // TODO: open preview instead of updating uistate to make buttons and border visible
+        // The parent class function super.onPreviewTapped() does not accept a slug, so we if we use this here, we first
+        // need to set the selectedLayoutSlug in the uistate
+        super.onLayoutTapped(layoutSlug)
+    }
+
     override fun onPreviewChooseTapped() {
         super.onPreviewChooseTapped()
         onChooseTapped()
     }
 
     fun onChooseTapped() {
+        // TODO: adapt this to the new flow
         selectedLayout?.let { layout ->
             val template = layout.slug
             analyticsTracker.trackSiteDesignSelected(template)

From d3c84c430eaaf39d5e834291be48bb08c1d31b79 Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Wed, 27 Apr 2022 15:29:23 +1000
Subject: [PATCH 007/111] Fix lint issue

---
 .../android/ui/sitecreation/theme/HomePagePickerFragment.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index f13097e40e9f..0830f367317f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -86,7 +86,7 @@ class HomePagePickerFragment : Fragment() {
 
     private fun HomePagePickerFragmentBinding.setupUi() {
         homePagePickerTitlebar.title.isInvisible = !displayUtils.isPhoneLandscape()
-        with (modalLayoutPickerHeaderSection) {
+        with(modalLayoutPickerHeaderSection) {
             modalLayoutPickerTitleRow?.header?.setText(R.string.hpp_title)
             modalLayoutPickerSubtitleRow?.root?.visibility = View.GONE
         }

From faf4c0308b99b0cd644fbe6a16456f936ef6c24e Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Wed, 27 Apr 2022 15:50:16 +1000
Subject: [PATCH 008/111] Fix lint issue

---
 .../android/ui/sitecreation/theme/HomePagePickerFragment.kt      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index ba9b6b59209e..1fcb01902c87 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -22,7 +22,6 @@ import org.wordpress.android.ui.layoutpicker.LayoutPickerViewModel.DesignPreview
 import org.wordpress.android.ui.layoutpicker.LayoutPickerViewModel.DesignPreviewAction.Show
 import org.wordpress.android.ui.sitecreation.theme.DesignPreviewFragment.Companion.DESIGN_PREVIEW_TAG
 import org.wordpress.android.ui.utils.UiHelpers
-import org.wordpress.android.util.AniUtils
 import org.wordpress.android.util.DisplayUtilsWrapper
 import org.wordpress.android.util.ToastUtils
 import org.wordpress.android.util.config.SiteNameFeatureConfig

From 48df3011db945b96bae4fb3039e637e4c444d8b5 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Wed, 27 Apr 2022 12:54:59 +0200
Subject: [PATCH 009/111] Remove string resource hpp_subtitle that becomes
 unused

---
 WordPress/src/main/res/values/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index eb3b729e21d8..806f38db7e3e 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -3341,7 +3341,6 @@
 
     <!-- Home Page Picker -->
     <string name="hpp_title">Choose a theme</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_choose_and_create_site">Create site</string>
     <string name="hpp_error_title">Layouts not available while offline</string>

From 522e2ec02d6c6b022cbcceacdd46ba57e7ffea2c Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Thu, 28 Apr 2022 15:05:33 +1000
Subject: [PATCH 010/111] Use mobile thumbnails in theme picker screen

---
 .../ui/layoutpicker/LayoutListItemUiState.kt       |  1 +
 .../ui/layoutpicker/LayoutPickerViewModel.kt       | 14 +++++++++-----
 .../android/ui/layoutpicker/LayoutViewHolder.kt    |  2 +-
 .../sitecreation/theme/HomePagePickerViewModel.kt  |  1 +
 .../viewmodel/mlp/ModalLayoutPickerViewModel.kt    |  1 +
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutListItemUiState.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutListItemUiState.kt
index f775acdc946f..b1b54da0286c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutListItemUiState.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutListItemUiState.kt
@@ -9,6 +9,7 @@ data class LayoutListItemUiState(
     val slug: String,
     val title: String,
     val preview: String,
+    val mShotPreview: String,
     val selected: Boolean,
     val onItemTapped: (() -> Unit),
     val onThumbnailReady: (() -> Unit)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
index d8cf46b5fdf0..6ecbab88d2cc 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
@@ -64,6 +64,7 @@ abstract class LayoutPickerViewModel(
         }
 
     abstract val useCachedData: Boolean
+    abstract val shouldUseMobileThumbnail: Boolean
 
     var nestedScrollStates: Bundle = Bundle()
 
@@ -155,14 +156,17 @@ abstract class LayoutPickerViewModel(
             selectedCategories.forEach { category ->
 
                 val layouts = layouts.getFilteredLayouts(category.slug).map { layout ->
+                    val preview = when (_previewMode.value) {
+                        MOBILE -> layout.previewMobile
+                        TABLET -> layout.previewTablet
+                        else -> layout.preview
+                    }
+                    val thumbnailPreview = if (shouldUseMobileThumbnail) layout.previewMobile else preview
                     LayoutListItemUiState(
                             slug = layout.slug,
                             title = layout.title,
-                            preview = when (_previewMode.value) {
-                                MOBILE -> layout.previewMobile
-                                TABLET -> layout.previewTablet
-                                else -> layout.preview
-                            },
+                            preview = preview,
+                            mShotPreview = thumbnailPreview,
                             selected = layout.slug == state.selectedLayoutSlug,
                             onItemTapped = { onLayoutTapped(layoutSlug = layout.slug) },
                             onThumbnailReady = { onThumbnailReady(layoutSlug = layout.slug) }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutViewHolder.kt
index bc615cd39068..a39cb00e387f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutViewHolder.kt
@@ -22,7 +22,7 @@ class LayoutViewHolder(
         uiState: LayoutListItemUiState,
         imageManager: ImageManager
     ) {
-        imageManager.loadWithResultListener(binding.preview, MShot(uiState.preview),
+        imageManager.loadWithResultListener(binding.preview, MShot(uiState.mShotPreview),
                 object : RequestListener<Drawable> {
                     override fun onLoadFailed(e: Exception?, model: Any?) {
                     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
index 074a87baa8de..c5b9323ab2c1 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
@@ -41,6 +41,7 @@ class HomePagePickerViewModel @Inject constructor(
     val onBackButtonPressed: LiveData<Unit> = _onBackButtonPressed
 
     override val useCachedData: Boolean = false
+    override val shouldUseMobileThumbnail = true
 
     sealed class DesignSelectionAction(val template: String) {
         object Skip : DesignSelectionAction(defaultTemplateSlug)
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModel.kt
index 6b0a09c48a0e..a7101ad944e6 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModel.kt
@@ -66,6 +66,7 @@ class ModalLayoutPickerViewModel @Inject constructor(
     }
 
     override val useCachedData: Boolean = true
+    override val shouldUseMobileThumbnail = false
 
     override val selectedLayout: LayoutModel?
         get() = (uiState.value as? Content)?.let { state ->

From ed4f5404031ae23fc2b71717d31f07458dc37fdc Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Thu, 28 Apr 2022 15:12:22 +1000
Subject: [PATCH 011/111] Reword the test cases to reflect that thumbnails are
 not changed

---
 .../ui/sitecreation/theme/HomePagePickerViewModelTest.kt  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
index deceebd11695..b640f36f77b6 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
@@ -53,7 +53,7 @@ class HomePagePickerViewModelTest {
 
     private lateinit var viewModel: HomePagePickerViewModel
 
-    val mockCategory = StarterDesignCategory(
+    private val mockCategory = StarterDesignCategory(
             slug = "about",
             title = "About",
             description = "About pages",
@@ -213,7 +213,7 @@ class HomePagePickerViewModelTest {
     }
 
     @Test
-    fun `when the picker starts on a phone the mobile thumbnails or preview load by default`() = mockResponse {
+    fun `when the picker starts on a phone the mobile previews load by default`() = mockResponse {
         viewModel.start(isTablet = false)
         val captor = ArgumentCaptor.forClass(PreviewMode::class.java)
         verify(previewModeObserver).onChanged(captor.capture())
@@ -221,7 +221,7 @@ class HomePagePickerViewModelTest {
     }
 
     @Test
-    fun `when the picker starts on a tablet the tablet thumbnails or preview load by default`() = mockResponse {
+    fun `when the picker starts on a tablet the tablet preview loads by default`() = mockResponse {
         viewModel.start(isTablet = true)
         val captor = ArgumentCaptor.forClass(PreviewMode::class.java)
         verify(previewModeObserver).onChanged(captor.capture())
@@ -229,7 +229,7 @@ class HomePagePickerViewModelTest {
     }
 
     @Test
-    fun `when the changes the preview mode the thumbnails or preview change`() = mockResponse {
+    fun `when the user changes the preview mode the previews change`() = mockResponse {
         viewModel.start()
         viewModel.onPreviewModeChanged(PreviewMode.DESKTOP)
         val captor = ArgumentCaptor.forClass(PreviewMode::class.java)

From 0079b9e192b028394097c274793ef1725c0fbb1d Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Thu, 28 Apr 2022 16:06:04 +1000
Subject: [PATCH 012/111] Remove thumbnail preview mode tracking in theme
 picker

---
 .../android/ui/layoutpicker/LayoutPickerTracker.kt         | 3 ++-
 .../android/ui/sitecreation/misc/SiteCreationTracker.kt    | 7 -------
 .../org/wordpress/android/analytics/AnalyticsTracker.java  | 1 -
 .../android/analytics/AnalyticsTrackerNosara.java          | 2 --
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerTracker.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerTracker.kt
index dde4ded7b34f..d57f0b4c1ac0 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerTracker.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerTracker.kt
@@ -3,7 +3,8 @@ package org.wordpress.android.ui.layoutpicker
 interface LayoutPickerTracker {
     fun trackPreviewModeChanged(mode: String)
 
-    fun trackThumbnailModeTapped(mode: String)
+    fun trackThumbnailModeTapped(mode: String) {
+    }
 
     fun trackPreviewModeTapped(mode: String)
 
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
index 927007df38c5..33423b588c96 100644
--- 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
@@ -167,13 +167,6 @@ class SiteCreationTracker @Inject constructor(val tracker: AnalyticsTrackerWrapp
         )
     }
 
-    override fun trackThumbnailModeTapped(mode: String) {
-        tracker.track(
-                AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SITE_DESIGN_THUMBNAIL_MODE_BUTTON_TAPPED,
-                mapOf(PREVIEW_MODE.key to mode)
-        )
-    }
-
     fun trackSiteDesignSkipped() {
         designSelectionSkipped = true
         tracker.track(AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SITE_DESIGN_SKIPPED)
diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java
index 9cf7c18daf03..73462a191b8f 100644
--- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java
+++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java
@@ -481,7 +481,6 @@ public enum Stat {
         ENHANCED_SITE_CREATION_ERROR_SHOWN,
         ENHANCED_SITE_CREATION_BACKGROUND_SERVICE_UPDATED,
         ENHANCED_SITE_CREATION_SITE_DESIGN_VIEWED,
-        ENHANCED_SITE_CREATION_SITE_DESIGN_THUMBNAIL_MODE_BUTTON_TAPPED,
         ENHANCED_SITE_CREATION_SITE_DESIGN_SELECTED,
         ENHANCED_SITE_CREATION_SITE_DESIGN_SKIPPED,
         ENHANCED_SITE_CREATION_SITE_DESIGN_PREVIEW_VIEWED,
diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java
index 437867af8abc..c55e4a1e7f92 100644
--- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java
+++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java
@@ -1393,8 +1393,6 @@ public static String getEventNameForStat(AnalyticsTracker.Stat stat) {
                 return "enhanced_site_creation_background_service_updated";
             case ENHANCED_SITE_CREATION_SITE_DESIGN_VIEWED:
                 return "enhanced_site_creation_site_design_viewed";
-            case ENHANCED_SITE_CREATION_SITE_DESIGN_THUMBNAIL_MODE_BUTTON_TAPPED:
-                return "enhanced_site_creation_site_design_thumbnail_mode_button_tapped";
             case ENHANCED_SITE_CREATION_SITE_DESIGN_SELECTED:
                 return "enhanced_site_creation_site_design_selected";
             case ENHANCED_SITE_CREATION_SITE_DESIGN_SKIPPED:

From be51e24913035ea4d46313f26767847cc6016530 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Thu, 28 Apr 2022 13:58:53 +0200
Subject: [PATCH 013/111] Remove unusd resource hpp_button_max_width

---
 WordPress/src/main/res/values/dimens.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml
index 1727f2c91174..ac608d16b442 100644
--- a/WordPress/src/main/res/values/dimens.xml
+++ b/WordPress/src/main/res/values/dimens.xml
@@ -646,7 +646,6 @@
     <dimen name="mlp_layout_skeleton_line_width">100dp</dimen>
 
     <!-- Home Page Picker -->
-    <dimen name="hpp_button_max_width">244dp</dimen>
     <dimen name="hpp_title_padding_start">@dimen/margin_extra_extra_medium_large</dimen>
 
     <!-- Site Intent Question -->

From 24ee21f41fda0e8d1a1c658ec7e5568bd1f59002 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Wed, 27 Apr 2022 20:45:17 +0200
Subject: [PATCH 014/111] Hide the category pills recyclerview and skeleton
 view

---
 .../theme/HomePagePickerFragment.kt           | 27 +++----------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index 1fcb01902c87..62498ac208b6 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -5,17 +5,15 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.ViewCompat
+import androidx.core.view.isGone
 import androidx.core.view.isInvisible
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.appbar.AppBarLayout
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.databinding.HomePagePickerFragmentBinding
-import org.wordpress.android.ui.layoutpicker.CategoriesAdapter
 import org.wordpress.android.ui.layoutpicker.LayoutCategoryAdapter
 import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState
 import org.wordpress.android.ui.layoutpicker.LayoutPickerViewModel.DesignPreviewAction.Dismiss
@@ -25,9 +23,8 @@ import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.DisplayUtilsWrapper
 import org.wordpress.android.util.ToastUtils
 import org.wordpress.android.util.config.SiteNameFeatureConfig
-import org.wordpress.android.util.image.ImageManager
 import org.wordpress.android.util.extensions.setVisible
-import org.wordpress.android.viewmodel.observeEvent
+import org.wordpress.android.util.image.ImageManager
 import javax.inject.Inject
 
 /**
@@ -61,17 +58,8 @@ class HomePagePickerFragment : Fragment() {
         viewModel = ViewModelProvider(requireActivity(), viewModelFactory).get(HomePagePickerViewModel::class.java)
 
         with(HomePagePickerFragmentBinding.bind(view)) {
-            categoriesRecyclerView.apply {
-                layoutManager = LinearLayoutManager(
-                        context,
-                        RecyclerView.HORIZONTAL,
-                        false
-                )
-                setRecycledViewPool(RecyclerView.RecycledViewPool())
-                adapter = CategoriesAdapter()
-                ViewCompat.setNestedScrollingEnabled(this, false)
-            }
-
+            modalLayoutPickerCategoriesSkeleton.root.isGone = true
+            categoriesRecyclerView.isGone = true
             layoutsRecyclerView.apply {
                 layoutManager = LinearLayoutManager(requireActivity())
                 adapter = LayoutCategoryAdapter(viewModel.nestedScrollStates)
@@ -99,7 +87,6 @@ class HomePagePickerFragment : Fragment() {
                 is LayoutPickerUiState.Loading -> { // Nothing more to do here
                 }
                 is LayoutPickerUiState.Content -> {
-                    (categoriesRecyclerView.adapter as CategoriesAdapter).setData(uiState.categories)
                     (layoutsRecyclerView.adapter as? LayoutCategoryAdapter)?.update(uiState.layoutCategories)
                 }
                 is LayoutPickerUiState.Error -> {
@@ -122,10 +109,6 @@ class HomePagePickerFragment : Fragment() {
             }
         }
 
-        viewModel.onCategorySelectionChanged.observeEvent(viewLifecycleOwner) {
-            layoutsRecyclerView.smoothScrollToPosition(0)
-        }
-
         viewModel.start(displayUtils.isTablet())
     }
 
@@ -138,8 +121,6 @@ class HomePagePickerFragment : Fragment() {
     }
 
     private fun HomePagePickerFragmentBinding.setContentVisibility(skeleton: Boolean, error: Boolean) {
-        modalLayoutPickerCategoriesSkeleton.categoriesSkeleton.setVisible(skeleton)
-        categoriesRecyclerView.setVisible(!skeleton && !error)
         modalLayoutPickerLayoutsSkeleton.layoutsSkeleton.setVisible(skeleton)
         layoutsRecyclerView.setVisible(!skeleton && !error)
         errorView.setVisible(error)

From 9f443242a81b554fa29d88a015a649a866111ead Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Wed, 27 Apr 2022 20:45:48 +0200
Subject: [PATCH 015/111] Set text alignment of the big title to the left of
 the screen

---
 .../android/ui/sitecreation/theme/HomePagePickerFragment.kt  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index 62498ac208b6..2aa1f16caf6c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -74,7 +74,10 @@ class HomePagePickerFragment : Fragment() {
     private fun HomePagePickerFragmentBinding.setupUi() {
         homePagePickerTitlebar.title.isInvisible = !displayUtils.isPhoneLandscape()
         with(modalLayoutPickerHeaderSection) {
-            modalLayoutPickerTitleRow?.header?.setText(R.string.hpp_title)
+            modalLayoutPickerTitleRow?.header?.apply {
+                textAlignment = View.TEXT_ALIGNMENT_TEXT_START
+                setText(R.string.hpp_title)
+            }
             modalLayoutPickerSubtitleRow?.root?.visibility = View.GONE
         }
     }

From 69b4968ed5c5cf43f158532217e9db2057493058 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Wed, 27 Apr 2022 20:47:08 +0200
Subject: [PATCH 016/111] Add horizontal padding to the big title to align it
 with the preview cards

---
 WordPress/src/main/res/values/styles.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml
index 22d5e42c51b7..8a47e6a3bd3c 100644
--- a/WordPress/src/main/res/values/styles.xml
+++ b/WordPress/src/main/res/values/styles.xml
@@ -1515,6 +1515,8 @@
         <item name="android:textColor">?attr/colorOnSurface</item>
         <item name="android:paddingTop">@dimen/mlp_titles_top_margin</item>
         <item name="android:paddingBottom">@dimen/margin_small_medium</item>
+        <item name="android:paddingStart">@dimen/margin_extra_large</item>
+        <item name="android:paddingEnd">@dimen/margin_extra_large</item>
         <item name="android:maxLines">3</item>
         <item name="fontFamily">serif</item>
     </style>

From 92fcbc5a62180a3b13f1b1d9a816c117971c541c Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Mon, 2 May 2022 13:18:39 +0200
Subject: [PATCH 017/111] Align collapsed title text to left of Site Theme
 screen

---
 WordPress/src/main/res/layout/home_page_picker_titlebar.xml | 1 +
 WordPress/src/main/res/values/dimens.xml                    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/res/layout/home_page_picker_titlebar.xml b/WordPress/src/main/res/layout/home_page_picker_titlebar.xml
index 1cca93fc5537..a8db0a41ab12 100644
--- a/WordPress/src/main/res/layout/home_page_picker_titlebar.xml
+++ b/WordPress/src/main/res/layout/home_page_picker_titlebar.xml
@@ -18,6 +18,7 @@
         style="@style/ModalLayoutPickerHeader"
         android:layout_width="0dp"
         android:layout_weight="1"
+        android:textAlignment="textStart"
         android:paddingStart="@dimen/hpp_title_padding_start"
         android:paddingEnd="0dp"
         android:text="@string/hpp_title" />
diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml
index ac608d16b442..dee358e7a9ce 100644
--- a/WordPress/src/main/res/values/dimens.xml
+++ b/WordPress/src/main/res/values/dimens.xml
@@ -646,7 +646,7 @@
     <dimen name="mlp_layout_skeleton_line_width">100dp</dimen>
 
     <!-- Home Page Picker -->
-    <dimen name="hpp_title_padding_start">@dimen/margin_extra_extra_medium_large</dimen>
+    <dimen name="hpp_title_padding_start">@dimen/margin_none</dimen>
 
     <!-- Site Intent Question -->
     <dimen name="siq_title_padding_start">@dimen/margin_extra_extra_large</dimen>

From 3a3c9d53506bf46277b805f3bbd4126b272b7128 Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Wed, 4 May 2022 11:42:44 +0300
Subject: [PATCH 018/111] Sets the layout picker thumbnail layout dimension
 dynamically

---
 .../ui/layoutpicker/LayoutCategoryAdapter.kt    | 11 +++++++++--
 .../android/ui/layoutpicker/LayoutViewHolder.kt | 12 +++++++++---
 .../android/ui/layoutpicker/LayoutsAdapter.kt   |  8 ++++++--
 .../ui/layoutpicker/LayoutsItemViewHolder.kt    |  5 +++--
 .../ui/layoutpicker/ThumbDimensionProvider.kt   | 12 ++----------
 .../mlp/ModalLayoutPickerDimensionProvider.kt   | 17 +++++++++++++++++
 .../android/ui/mlp/ModalLayoutPickerFragment.kt |  3 ++-
 .../theme/HomePagePickerFragment.kt             |  3 ++-
 .../theme/SiteDesignPickerDimensionProvider.kt  | 17 +++++++++++++++++
 .../usecases/FetchHomePageLayoutsUseCase.kt     |  4 ++--
 .../viewmodel/mlp/ModalLayoutPickerViewModel.kt |  4 ++--
 WordPress/src/main/res/values/dimens.xml        |  4 +++-
 .../theme/FetchHomePageLayoutsUseCaseTest.kt    |  3 +--
 .../mlp/ModalLayoutPickerViewModelTest.kt       |  4 ++--
 14 files changed, 77 insertions(+), 30 deletions(-)
 create mode 100644 WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerDimensionProvider.kt
 create mode 100644 WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignPickerDimensionProvider.kt

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
index a6845f54657d..a68ffef2a441 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
@@ -8,7 +8,10 @@ import androidx.recyclerview.widget.RecyclerView.Adapter
 /**
  * Renders the layout categories
  */
-class LayoutCategoryAdapter(private var nestedScrollStates: Bundle) : Adapter<LayoutsItemViewHolder>() {
+class LayoutCategoryAdapter(
+    private var nestedScrollStates: Bundle,
+    private val thumbDimensionProvider: ThumbDimensionProvider
+) : Adapter<LayoutsItemViewHolder>() {
     private var items: List<LayoutCategoryUiState> = listOf()
 
     fun update(newItems: List<LayoutCategoryUiState>) {
@@ -34,7 +37,11 @@ class LayoutCategoryAdapter(private var nestedScrollStates: Bundle) : Adapter<La
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
-            LayoutsItemViewHolder(parent = parent, nestedScrollStates = nestedScrollStates)
+            LayoutsItemViewHolder(
+                    parent = parent,
+                    nestedScrollStates = nestedScrollStates,
+                    thumbDimensionProvider = thumbDimensionProvider
+            )
 
     fun onRestoreInstanceState(savedInstanceState: Bundle) {
         nestedScrollStates = savedInstanceState
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutViewHolder.kt
index a39cb00e387f..14c5c927cc31 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutViewHolder.kt
@@ -3,6 +3,7 @@ package org.wordpress.android.ui.layoutpicker
 import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.core.view.updateLayoutParams
 import androidx.recyclerview.widget.RecyclerView
 import org.wordpress.android.R
 import org.wordpress.android.databinding.ModalLayoutPickerLayoutsCardBinding
@@ -16,7 +17,8 @@ import org.wordpress.android.util.extensions.setVisible
  */
 class LayoutViewHolder(
     private val parent: ViewGroup,
-    private val binding: ModalLayoutPickerLayoutsCardBinding
+    private val binding: ModalLayoutPickerLayoutsCardBinding,
+    private val thumbDimensionProvider: ThumbDimensionProvider
 ) : RecyclerView.ViewHolder(binding.root) {
     fun onBind(
         uiState: LayoutListItemUiState,
@@ -33,6 +35,10 @@ class LayoutViewHolder(
                 })
 
         binding.selectedOverlay.setVisible(uiState.selectedOverlayVisible)
+        binding.preview.updateLayoutParams {
+            height = thumbDimensionProvider.previewHeight
+            width = thumbDimensionProvider.previewWidth
+        }
         binding.preview.contentDescription = parent.context.getString(uiState.contentDescriptionResId, uiState.title)
         binding.preview.context?.let { ctx ->
             binding.layoutContainer.strokeWidth = if (uiState.selectedOverlayVisible) {
@@ -47,13 +53,13 @@ class LayoutViewHolder(
     }
 
     companion object {
-        fun from(parent: ViewGroup): LayoutViewHolder {
+        fun from(parent: ViewGroup, thumbDimensionProvider: ThumbDimensionProvider): LayoutViewHolder {
             val binding = ModalLayoutPickerLayoutsCardBinding.inflate(
                     LayoutInflater.from(parent.context),
                     parent,
                     false
             )
-            return LayoutViewHolder(parent, binding)
+            return LayoutViewHolder(parent, binding, thumbDimensionProvider)
         }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsAdapter.kt
index fc72126862a7..b285c91f2d28 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsAdapter.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsAdapter.kt
@@ -11,7 +11,10 @@ import javax.inject.Inject
 /**
  * Renders the Layout cards
  */
-class LayoutsAdapter(context: Context) : RecyclerView.Adapter<LayoutViewHolder>() {
+class LayoutsAdapter(
+    context: Context,
+    private val thumbDimensionProvider: ThumbDimensionProvider
+) : RecyclerView.Adapter<LayoutViewHolder>() {
     @Inject lateinit var imageManager: ImageManager
 
     private var layouts: List<LayoutListItemUiState> = listOf()
@@ -26,7 +29,8 @@ class LayoutsAdapter(context: Context) : RecyclerView.Adapter<LayoutViewHolder>(
         diffResult.dispatchUpdatesTo(this)
     }
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = LayoutViewHolder.from(parent)
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
+            LayoutViewHolder.from(parent, thumbDimensionProvider)
 
     override fun getItemCount(): Int = layouts.size
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
index 9ecbfdc503da..128cb34d9275 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
@@ -16,7 +16,8 @@ import org.wordpress.android.R
 class LayoutsItemViewHolder(
     parent: ViewGroup,
     private val prefetchItemCount: Int = 4,
-    private var nestedScrollStates: Bundle
+    private var nestedScrollStates: Bundle,
+    private val thumbDimensionProvider: ThumbDimensionProvider
 ) : RecyclerView.ViewHolder(
         LayoutInflater.from(
                 parent.context
@@ -33,7 +34,7 @@ class LayoutsItemViewHolder(
                     false
             ).apply { initialPrefetchItemCount = prefetchItemCount }
             setRecycledViewPool(RecyclerView.RecycledViewPool())
-            adapter = LayoutsAdapter(parent.context)
+            adapter = LayoutsAdapter(parent.context, thumbDimensionProvider)
 
             addOnScrollListener(object : OnScrollListener() {
                 override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/ThumbDimensionProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/ThumbDimensionProvider.kt
index 09d257055200..3e7d2840c40c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/ThumbDimensionProvider.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/ThumbDimensionProvider.kt
@@ -1,15 +1,7 @@
 package org.wordpress.android.ui.layoutpicker
 
-import org.wordpress.android.R
-import org.wordpress.android.viewmodel.ContextProvider
-import javax.inject.Inject
-
-class ThumbDimensionProvider @Inject constructor(private val contextProvider: ContextProvider) {
+interface ThumbDimensionProvider {
     val previewWidth: Int
-        get() = contextProvider.getContext().resources.getDimensionPixelSize(R.dimen.mlp_layout_card_width)
-
     val previewHeight: Int
-        get() = contextProvider.getContext().resources.getDimensionPixelSize(R.dimen.mlp_layout_card_height)
-
-    val scale: Double = 1.0 // Passing 1.0 and the rendered pixels per device in previewWidth
+    val scale: Double
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerDimensionProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerDimensionProvider.kt
new file mode 100644
index 000000000000..7463d3b83e7e
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerDimensionProvider.kt
@@ -0,0 +1,17 @@
+package org.wordpress.android.ui.mlp
+
+import org.wordpress.android.R.dimen
+import org.wordpress.android.ui.layoutpicker.ThumbDimensionProvider
+import org.wordpress.android.viewmodel.ContextProvider
+import javax.inject.Inject
+
+class ModalLayoutPickerDimensionProvider @Inject constructor(private val contextProvider: ContextProvider) :
+        ThumbDimensionProvider {
+    override val previewWidth: Int
+        get() = contextProvider.getContext().resources.getDimensionPixelSize(dimen.mlp_layout_card_width)
+
+    override val previewHeight: Int
+        get() = contextProvider.getContext().resources.getDimensionPixelSize(dimen.mlp_layout_card_height)
+
+    override val scale: Double = 1.0 // Passing 1.0 and the rendered pixels per device in previewWidth
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt
index 99a742eac9b4..9e38361b56ee 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt
@@ -38,6 +38,7 @@ import javax.inject.Inject
 class ModalLayoutPickerFragment : FullscreenBottomSheetDialogFragment() {
     @Inject internal lateinit var uiHelper: UiHelpers
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+    @Inject lateinit var thumbDimensionProvider: ModalLayoutPickerDimensionProvider
     private lateinit var viewModel: ModalLayoutPickerViewModel
     private lateinit var previewModeSelectorPopup: PreviewModeSelectorPopup
 
@@ -73,7 +74,7 @@ class ModalLayoutPickerFragment : FullscreenBottomSheetDialogFragment() {
 
             layoutsRecyclerView.apply {
                 layoutManager = LinearLayoutManager(requireActivity())
-                adapter = LayoutCategoryAdapter(viewModel.nestedScrollStates)
+                adapter = LayoutCategoryAdapter(viewModel.nestedScrollStates, thumbDimensionProvider)
             }
 
             modalLayoutPickerTitlebar.backButton.setOnClickListener {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index 2aa1f16caf6c..b64c8c094dac 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -37,6 +37,7 @@ class HomePagePickerFragment : Fragment() {
     @Inject internal lateinit var uiHelper: UiHelpers
     @Inject lateinit var siteNameFeatureConfig: SiteNameFeatureConfig
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+    @Inject lateinit var thumbDimensionProvider: SiteDesignPickerDimensionProvider
     private lateinit var viewModel: HomePagePickerViewModel
 
     override fun onAttach(context: Context) {
@@ -62,7 +63,7 @@ class HomePagePickerFragment : Fragment() {
             categoriesRecyclerView.isGone = true
             layoutsRecyclerView.apply {
                 layoutManager = LinearLayoutManager(requireActivity())
-                adapter = LayoutCategoryAdapter(viewModel.nestedScrollStates)
+                adapter = LayoutCategoryAdapter(viewModel.nestedScrollStates, thumbDimensionProvider)
             }
 
             setupUi()
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignPickerDimensionProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignPickerDimensionProvider.kt
new file mode 100644
index 000000000000..75a24346883d
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignPickerDimensionProvider.kt
@@ -0,0 +1,17 @@
+package org.wordpress.android.ui.sitecreation.theme
+
+import org.wordpress.android.R.dimen
+import org.wordpress.android.ui.layoutpicker.ThumbDimensionProvider
+import org.wordpress.android.viewmodel.ContextProvider
+import javax.inject.Inject
+
+class SiteDesignPickerDimensionProvider @Inject constructor(private val contextProvider: ContextProvider) :
+        ThumbDimensionProvider {
+    override val previewWidth: Int
+        get() = contextProvider.getContext().resources.getDimensionPixelSize(dimen.hpp_layout_card_width)
+
+    override val previewHeight: Int
+        get() = contextProvider.getContext().resources.getDimensionPixelSize(dimen.hpp_layout_card_height)
+
+    override val scale: Double = 1.0 // Passing 1.0 and the rendered pixels per device in previewWidth
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/FetchHomePageLayoutsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/FetchHomePageLayoutsUseCase.kt
index 5be0c0a5f270..9063df882406 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/FetchHomePageLayoutsUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/FetchHomePageLayoutsUseCase.kt
@@ -7,7 +7,7 @@ import org.wordpress.android.fluxc.generated.ThemeActionBuilder
 import org.wordpress.android.fluxc.store.ThemeStore
 import org.wordpress.android.fluxc.store.ThemeStore.FetchStarterDesignsPayload
 import org.wordpress.android.fluxc.store.ThemeStore.OnStarterDesignsFetched
-import org.wordpress.android.ui.layoutpicker.ThumbDimensionProvider
+import org.wordpress.android.ui.sitecreation.theme.SiteDesignPickerDimensionProvider
 import javax.inject.Inject
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
@@ -16,7 +16,7 @@ import kotlin.coroutines.suspendCoroutine
 class FetchHomePageLayoutsUseCase @Inject constructor(
     val dispatcher: Dispatcher,
     @Suppress("unused") val themeStore: ThemeStore,
-    private val thumbDimensionProvider: ThumbDimensionProvider
+    private val thumbDimensionProvider: SiteDesignPickerDimensionProvider
 ) {
     private var continuation: Continuation<OnStarterDesignsFetched>? = null
 
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModel.kt
index a7101ad944e6..2327a2d97793 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModel.kt
@@ -20,7 +20,7 @@ import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState.Content
 import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState.Error
 import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState.Loading
 import org.wordpress.android.ui.layoutpicker.LayoutPickerViewModel
-import org.wordpress.android.ui.layoutpicker.ThumbDimensionProvider
+import org.wordpress.android.ui.mlp.ModalLayoutPickerDimensionProvider
 import org.wordpress.android.ui.layoutpicker.toLayoutCategories
 import org.wordpress.android.ui.layoutpicker.toLayoutModels
 import org.wordpress.android.ui.mlp.ModalLayoutPickerTracker
@@ -42,7 +42,7 @@ class ModalLayoutPickerViewModel @Inject constructor(
     private val siteStore: SiteStore,
     private val selectedSiteRepository: SelectedSiteRepository,
     private val supportedBlocksProvider: SupportedBlocksProvider,
-    private val thumbDimensionProvider: ThumbDimensionProvider,
+    private val thumbDimensionProvider: ModalLayoutPickerDimensionProvider,
     private val displayUtilsWrapper: DisplayUtilsWrapper,
     override val networkUtils: NetworkUtilsWrapper,
     private val analyticsTracker: ModalLayoutPickerTracker,
diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml
index d8fb6f1c755f..4ae30838f4d7 100644
--- a/WordPress/src/main/res/values/dimens.xml
+++ b/WordPress/src/main/res/values/dimens.xml
@@ -646,8 +646,10 @@
     <dimen name="mlp_layout_skeleton_line_height">24dp</dimen>
     <dimen name="mlp_layout_skeleton_line_width">100dp</dimen>
 
-    <!-- Home Page Picker -->
+    <!-- Site Design Picker -->
     <dimen name="hpp_title_padding_start">@dimen/margin_none</dimen>
+    <dimen name="hpp_layout_card_height">260dp</dimen>
+    <dimen name="hpp_layout_card_width">200dp</dimen>
 
     <!-- Site Intent Question -->
     <dimen name="siq_title_padding_start">@dimen/margin_extra_extra_large</dimen>
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/FetchHomePageLayoutsUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/FetchHomePageLayoutsUseCaseTest.kt
index d8406d78ff5f..2e1c4dd5a044 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/FetchHomePageLayoutsUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/FetchHomePageLayoutsUseCaseTest.kt
@@ -19,7 +19,6 @@ import org.wordpress.android.fluxc.store.SiteStore.SuggestDomainsPayload
 import org.wordpress.android.fluxc.store.ThemeStore
 import org.wordpress.android.fluxc.store.ThemeStore.OnStarterDesignsFetched
 import org.wordpress.android.test
-import org.wordpress.android.ui.layoutpicker.ThumbDimensionProvider
 import org.wordpress.android.ui.sitecreation.usecases.FetchHomePageLayoutsUseCase
 
 @RunWith(MockitoJUnitRunner::class)
@@ -29,7 +28,7 @@ class FetchHomePageLayoutsUseCaseTest {
 
     @Mock lateinit var dispatcher: Dispatcher
     @Mock lateinit var store: ThemeStore
-    @Mock lateinit var thumbDimensionProvider: ThumbDimensionProvider
+    @Mock lateinit var thumbDimensionProvider: SiteDesignPickerDimensionProvider
 
     private lateinit var useCase: FetchHomePageLayoutsUseCase
     private lateinit var dispatchCaptor: KArgumentCaptor<Action<SuggestDomainsPayload>>
diff --git a/WordPress/src/test/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModelTest.kt
index 7e852f87b16f..e5a016b123cb 100644
--- a/WordPress/src/test/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModelTest.kt
@@ -30,7 +30,7 @@ import org.wordpress.android.fluxc.store.SiteStore.SiteError
 import org.wordpress.android.fluxc.store.SiteStore.SiteErrorType.GENERIC_ERROR
 import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState.Content
 import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState.Error
-import org.wordpress.android.ui.layoutpicker.ThumbDimensionProvider
+import org.wordpress.android.ui.mlp.ModalLayoutPickerDimensionProvider
 import org.wordpress.android.ui.mlp.ModalLayoutPickerTracker
 import org.wordpress.android.ui.mlp.SupportedBlocks
 import org.wordpress.android.ui.mlp.SupportedBlocksProvider
@@ -58,7 +58,7 @@ class ModalLayoutPickerViewModelTest {
     @Mock lateinit var siteStore: SiteStore
     @Mock lateinit var selectedSiteRepository: SelectedSiteRepository
     @Mock lateinit var supportedBlocksProvider: SupportedBlocksProvider
-    @Mock lateinit var thumbDimensionProvider: ThumbDimensionProvider
+    @Mock lateinit var thumbDimensionProvider: ModalLayoutPickerDimensionProvider
     @Mock lateinit var displayUtilsWrapper: DisplayUtilsWrapper
     @Mock lateinit var networkUtils: NetworkUtilsWrapper
     @Mock lateinit var analyticsTracker: ModalLayoutPickerTracker

From ed9e0c6fa06346874a331085fdc480d17ba6b15b Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Wed, 4 May 2022 11:43:29 +0300
Subject: [PATCH 019/111] Sets the loading skeleton layout dimension
 dynamically

---
 .../wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt   | 6 ++++++
 .../android/ui/sitecreation/theme/HomePagePickerFragment.kt | 5 +++++
 .../res/layout/modal_layout_picker_layouts_skeleton.xml     | 1 +
 3 files changed, 12 insertions(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt
index 9e38361b56ee..8e0dc57405ec 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt
@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.ViewCompat
+import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -97,6 +98,11 @@ class ModalLayoutPickerFragment : FullscreenBottomSheetDialogFragment() {
                 viewModel.onThumbnailModePressed()
             }
 
+            modalLayoutPickerLayoutsSkeleton.skeletonCardView.updateLayoutParams {
+                height = thumbDimensionProvider.previewHeight
+                width = thumbDimensionProvider.previewWidth
+            }
+
             setScrollListener()
 
             setupViewModel(savedInstanceState)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index b64c8c094dac..1f9be3492704 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -7,6 +7,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isGone
 import androidx.core.view.isInvisible
+import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -81,6 +82,10 @@ class HomePagePickerFragment : Fragment() {
             }
             modalLayoutPickerSubtitleRow?.root?.visibility = View.GONE
         }
+        modalLayoutPickerLayoutsSkeleton.skeletonCardView.updateLayoutParams {
+            height = thumbDimensionProvider.previewHeight
+            width = thumbDimensionProvider.previewWidth
+        }
     }
 
     private fun HomePagePickerFragmentBinding.setupViewModel() {
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
index 795383146ef1..3eafa9306bc3 100644
--- a/WordPress/src/main/res/layout/modal_layout_picker_layouts_skeleton.xml
+++ b/WordPress/src/main/res/layout/modal_layout_picker_layouts_skeleton.xml
@@ -29,6 +29,7 @@
                 android:background="?attr/categoriesButtonBackground" />
 
             <com.google.android.material.card.MaterialCardView
+                android:id="@+id/skeletonCardView"
                 style="@style/LayoutCardView"
                 android:layout_width="@dimen/mlp_layout_card_width"
                 android:layout_height="@dimen/mlp_layout_card_height"

From 3f080dea38ae988d110569c52920abf1780a0657 Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Wed, 4 May 2022 18:31:40 +0300
Subject: [PATCH 020/111] Uses a different thumb dimension for tablet devices

---
 WordPress/src/main/res/values-sw600dp/dimens.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/WordPress/src/main/res/values-sw600dp/dimens.xml b/WordPress/src/main/res/values-sw600dp/dimens.xml
index c08e8b52e81f..73eb40ca1e04 100644
--- a/WordPress/src/main/res/values-sw600dp/dimens.xml
+++ b/WordPress/src/main/res/values-sw600dp/dimens.xml
@@ -11,4 +11,8 @@
     <dimen name="prologue_intro_content_max_width">600dp</dimen>
 
     <dimen name="prologue_promo_title_size">38sp</dimen>
+
+    <!-- Site Design Picker -->
+    <dimen name="hpp_layout_card_height">325dp</dimen>
+    <dimen name="hpp_layout_card_width">250dp</dimen>
 </resources>

From 0b0fbcf52c6510e74aa56b39d76c87808455cf07 Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Wed, 4 May 2022 19:00:15 +0300
Subject: [PATCH 021/111] Sets the category row height dynamically

---
 .../android/ui/layoutpicker/LayoutsItemViewHolder.kt          | 4 ++++
 .../android/ui/layoutpicker/ThumbDimensionProvider.kt         | 1 +
 .../android/ui/mlp/ModalLayoutPickerDimensionProvider.kt      | 3 +++
 .../sitecreation/theme/SiteDesignPickerDimensionProvider.kt   | 3 +++
 WordPress/src/main/res/values-sw600dp/dimens.xml              | 1 +
 WordPress/src/main/res/values/dimens.xml                      | 1 +
 6 files changed, 13 insertions(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
index 128cb34d9275..ed52cfedf634 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
@@ -5,6 +5,7 @@ import android.os.Parcelable
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.core.view.updateLayoutParams
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.OnScrollListener
@@ -27,6 +28,9 @@ class LayoutsItemViewHolder(
     private var currentItem: LayoutCategoryUiState? = null
 
     private val recycler: RecyclerView by lazy {
+        itemView.updateLayoutParams {
+            height = thumbDimensionProvider.rowHeight
+        }
         itemView.findViewById<RecyclerView>(R.id.layouts_recycler_view).apply {
             layoutManager = LinearLayoutManager(
                     context,
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/ThumbDimensionProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/ThumbDimensionProvider.kt
index 3e7d2840c40c..43d3c64ecafa 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/ThumbDimensionProvider.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/ThumbDimensionProvider.kt
@@ -4,4 +4,5 @@ interface ThumbDimensionProvider {
     val previewWidth: Int
     val previewHeight: Int
     val scale: Double
+    val rowHeight: Int
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerDimensionProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerDimensionProvider.kt
index 7463d3b83e7e..9e36f498052f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerDimensionProvider.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerDimensionProvider.kt
@@ -14,4 +14,7 @@ class ModalLayoutPickerDimensionProvider @Inject constructor(private val context
         get() = contextProvider.getContext().resources.getDimensionPixelSize(dimen.mlp_layout_card_height)
 
     override val scale: Double = 1.0 // Passing 1.0 and the rendered pixels per device in previewWidth
+
+    override val rowHeight: Int
+        get() = contextProvider.getContext().resources.getDimensionPixelSize(dimen.mlp_layouts_row_height)
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignPickerDimensionProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignPickerDimensionProvider.kt
index 75a24346883d..227cd54674c2 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignPickerDimensionProvider.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignPickerDimensionProvider.kt
@@ -14,4 +14,7 @@ class SiteDesignPickerDimensionProvider @Inject constructor(private val contextP
         get() = contextProvider.getContext().resources.getDimensionPixelSize(dimen.hpp_layout_card_height)
 
     override val scale: Double = 1.0 // Passing 1.0 and the rendered pixels per device in previewWidth
+
+    override val rowHeight: Int
+        get() = contextProvider.getContext().resources.getDimensionPixelSize(dimen.hpp_layouts_row_height)
 }
diff --git a/WordPress/src/main/res/values-sw600dp/dimens.xml b/WordPress/src/main/res/values-sw600dp/dimens.xml
index 73eb40ca1e04..0b08207845ae 100644
--- a/WordPress/src/main/res/values-sw600dp/dimens.xml
+++ b/WordPress/src/main/res/values-sw600dp/dimens.xml
@@ -15,4 +15,5 @@
     <!-- Site Design Picker -->
     <dimen name="hpp_layout_card_height">325dp</dimen>
     <dimen name="hpp_layout_card_width">250dp</dimen>
+    <dimen name="hpp_layouts_row_height">400dp</dimen>
 </resources>
diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml
index 4ae30838f4d7..4787166012eb 100644
--- a/WordPress/src/main/res/values/dimens.xml
+++ b/WordPress/src/main/res/values/dimens.xml
@@ -650,6 +650,7 @@
     <dimen name="hpp_title_padding_start">@dimen/margin_none</dimen>
     <dimen name="hpp_layout_card_height">260dp</dimen>
     <dimen name="hpp_layout_card_width">200dp</dimen>
+    <dimen name="hpp_layouts_row_height">330dp</dimen>
 
     <!-- Site Intent Question -->
     <dimen name="siq_title_padding_start">@dimen/margin_extra_extra_large</dimen>

From 10642c110f4d55e04632b64f4b515c36cca435b5 Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Thu, 5 May 2022 17:33:19 +1000
Subject: [PATCH 022/111] Present preview when the theme is tapped

This also refreshes the uiState of the picker, since it is still
partially visible on wider screens.
---
 .../ui/sitecreation/theme/HomePagePickerViewModel.kt     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
index 96241ca69415..a04669716409 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
@@ -87,10 +87,11 @@ class HomePagePickerViewModel @Inject constructor(
     }
 
     override fun onLayoutTapped(layoutSlug: String) {
-        // TODO: open preview instead of updating uistate to make buttons and border visible
-        // The parent class function super.onPreviewTapped() does not accept a slug, so we if we use this here, we first
-        // need to set the selectedLayoutSlug in the uistate
-        super.onLayoutTapped(layoutSlug)
+        (uiState.value as? Content)?.let {
+            updateUiState(it.copy(selectedLayoutSlug = layoutSlug))
+            onPreviewTapped()
+            loadLayouts()
+        }
     }
 
     override fun onPreviewChooseTapped() {

From c240b23dc43307d6c286cf9fa8a88723bb0d39ce Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Thu, 5 May 2022 17:37:26 +1000
Subject: [PATCH 023/111] Deselect theme when the preview is dismissed

This also makes loadLayouts non-private, which isn't ideal. It seems
cleaner than adding another set of functions, though.
---
 .../android/ui/layoutpicker/LayoutPickerViewModel.kt          | 2 +-
 .../android/ui/sitecreation/theme/HomePagePickerFragment.kt   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
index 314aa04cfcb1..22f38bafff55 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
@@ -142,7 +142,7 @@ abstract class LayoutPickerViewModel(
         }
     }
 
-    private fun loadLayouts() {
+    fun loadLayouts() {
         val state = uiState.value as? Content ?: Content()
         launch(bgDispatcher) {
             val listItems = ArrayList<LayoutCategoryUiState>()
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index 2aa1f16caf6c..140c6ec8ef6f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -107,6 +107,10 @@ class HomePagePickerFragment : Fragment() {
                     }
                     is Dismiss -> {
                         (fm.findFragmentByTag(DESIGN_PREVIEW_TAG) as? DesignPreviewFragment)?.dismiss()
+                        (viewModel.uiState.value as? LayoutPickerUiState.Content)?.let {
+                            viewModel.updateUiState(it.copy(selectedLayoutSlug = null))
+                            viewModel.loadLayouts()
+                        }
                     }
                 }
             }

From 822a85e4f2437efc51fa1c4ff001530b10766b64 Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Thu, 5 May 2022 17:40:20 +1000
Subject: [PATCH 024/111] Hide selected overlay (check mark) in theme picker

---
 .../android/ui/layoutpicker/LayoutListItemUiState.kt        | 6 +++---
 .../android/ui/layoutpicker/LayoutPickerViewModel.kt        | 2 ++
 .../wordpress/android/ui/layoutpicker/LayoutViewHolder.kt   | 2 +-
 .../ui/sitecreation/theme/HomePagePickerViewModel.kt        | 1 +
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutListItemUiState.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutListItemUiState.kt
index b1b54da0286c..7c6d367822e0 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutListItemUiState.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutListItemUiState.kt
@@ -12,11 +12,11 @@ data class LayoutListItemUiState(
     val mShotPreview: String,
     val selected: Boolean,
     val onItemTapped: (() -> Unit),
-    val onThumbnailReady: (() -> Unit)
+    val onThumbnailReady: (() -> Unit),
+    private val shouldHideSelectedOverlay: Boolean
 ) {
     val contentDescriptionResId: Int
         get() = if (selected) R.string.mlp_selected_description else R.string.mlp_notselected_description
-
     val selectedOverlayVisible: Boolean
-        get() = selected
+        get() = !shouldHideSelectedOverlay && selected
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
index 22f38bafff55..03a4cabc9bc3 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
@@ -65,6 +65,7 @@ abstract class LayoutPickerViewModel(
 
     abstract val useCachedData: Boolean
     abstract val shouldUseMobileThumbnail: Boolean
+    open val shouldHideSelectedOverlay = false
 
     var nestedScrollStates: Bundle = Bundle()
 
@@ -168,6 +169,7 @@ abstract class LayoutPickerViewModel(
                             preview = preview,
                             mShotPreview = thumbnailPreview,
                             selected = layout.slug == state.selectedLayoutSlug,
+                            shouldHideSelectedOverlay = shouldHideSelectedOverlay,
                             onItemTapped = { onLayoutTapped(layoutSlug = layout.slug) },
                             onThumbnailReady = { onThumbnailReady(layoutSlug = layout.slug) }
                     )
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutViewHolder.kt
index a39cb00e387f..a9e6b4bad17b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutViewHolder.kt
@@ -35,7 +35,7 @@ class LayoutViewHolder(
         binding.selectedOverlay.setVisible(uiState.selectedOverlayVisible)
         binding.preview.contentDescription = parent.context.getString(uiState.contentDescriptionResId, uiState.title)
         binding.preview.context?.let { ctx ->
-            binding.layoutContainer.strokeWidth = if (uiState.selectedOverlayVisible) {
+            binding.layoutContainer.strokeWidth = if (uiState.selected) {
                 ctx.resources.getDimensionPixelSize(R.dimen.picker_header_selection_overlay_width)
             } else {
                 0
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
index a04669716409..979a8b43ef2d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
@@ -42,6 +42,7 @@ class HomePagePickerViewModel @Inject constructor(
 
     override val useCachedData: Boolean = false
     override val shouldUseMobileThumbnail = true
+    override val shouldHideSelectedOverlay = true
 
     sealed class DesignSelectionAction(val template: String) {
         object Skip : DesignSelectionAction(defaultTemplateSlug)

From c87bf460b634b8238aa1d9cecd50d7a65bad697b Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Fri, 6 May 2022 16:10:01 +1000
Subject: [PATCH 025/111] Add content description for preview action to theme
 thumbnails

This also renames the LayoutListItemUiState parameter to be more
meaningful for the way in which it is used.
---
 .../android/ui/layoutpicker/LayoutListItemUiState.kt   | 10 +++++++---
 .../android/ui/layoutpicker/LayoutPickerViewModel.kt   |  4 ++--
 .../ui/sitecreation/theme/HomePagePickerViewModel.kt   |  2 +-
 WordPress/src/main/res/values/strings.xml              |  1 +
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutListItemUiState.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutListItemUiState.kt
index 7c6d367822e0..b0520102d3be 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutListItemUiState.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutListItemUiState.kt
@@ -13,10 +13,14 @@ data class LayoutListItemUiState(
     val selected: Boolean,
     val onItemTapped: (() -> Unit),
     val onThumbnailReady: (() -> Unit),
-    private val shouldHideSelectedOverlay: Boolean
+    private val tapOpensPreview: Boolean
 ) {
     val contentDescriptionResId: Int
-        get() = if (selected) R.string.mlp_selected_description else R.string.mlp_notselected_description
+        get() = when {
+            tapOpensPreview -> R.string.hpp_preview_tapped_theme
+            selected -> R.string.mlp_selected_description
+            else -> R.string.mlp_notselected_description
+        }
     val selectedOverlayVisible: Boolean
-        get() = !shouldHideSelectedOverlay && selected
+        get() = !tapOpensPreview && selected
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
index 03a4cabc9bc3..e08dd3765711 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
@@ -65,7 +65,7 @@ abstract class LayoutPickerViewModel(
 
     abstract val useCachedData: Boolean
     abstract val shouldUseMobileThumbnail: Boolean
-    open val shouldHideSelectedOverlay = false
+    open val thumbnailTapOpensPreview = false
 
     var nestedScrollStates: Bundle = Bundle()
 
@@ -169,7 +169,7 @@ abstract class LayoutPickerViewModel(
                             preview = preview,
                             mShotPreview = thumbnailPreview,
                             selected = layout.slug == state.selectedLayoutSlug,
-                            shouldHideSelectedOverlay = shouldHideSelectedOverlay,
+                            tapOpensPreview = thumbnailTapOpensPreview,
                             onItemTapped = { onLayoutTapped(layoutSlug = layout.slug) },
                             onThumbnailReady = { onThumbnailReady(layoutSlug = layout.slug) }
                     )
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
index 979a8b43ef2d..f0bab46fbdfb 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
@@ -42,7 +42,7 @@ class HomePagePickerViewModel @Inject constructor(
 
     override val useCachedData: Boolean = false
     override val shouldUseMobileThumbnail = true
-    override val shouldHideSelectedOverlay = true
+    override val thumbnailTapOpensPreview = true
 
     sealed class DesignSelectionAction(val template: String) {
         object Skip : DesignSelectionAction(defaultTemplateSlug)
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index 982d201bdda3..86c24ec3ad40 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -3371,6 +3371,7 @@
     <string name="hpp_title">Choose a theme</string>
     <string name="hpp_choose_button">Choose</string>
     <string name="hpp_choose_and_create_site">Create site</string>
+    <string name="hpp_preview_tapped_theme">Preview theme %s</string>
     <string name="hpp_error_title">Layouts not available while offline</string>
     <string name="hpp_error_subtitle">Tap retry when you\'re back online.</string>
     <string name="hpp_retry_error">Please Check your internet connection and retry.</string>

From 949bc2ac86c2bba481d9016996a98fcf697e707c Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Fri, 6 May 2022 16:12:08 +1000
Subject: [PATCH 026/111] Update theme picker tests

This also includes a commented out test for discussion purposes, which
will be removed in the following commit.
---
 .../theme/HomePagePickerViewModel.kt          |  8 +-
 .../theme/HomePagePickerViewModelTest.kt      | 88 ++++++++-----------
 2 files changed, 42 insertions(+), 54 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
index f0bab46fbdfb..2739615a86bf 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
@@ -89,9 +89,11 @@ class HomePagePickerViewModel @Inject constructor(
 
     override fun onLayoutTapped(layoutSlug: String) {
         (uiState.value as? Content)?.let {
-            updateUiState(it.copy(selectedLayoutSlug = layoutSlug))
-            onPreviewTapped()
-            loadLayouts()
+            if (it.loadedThumbnailSlugs.contains(layoutSlug)) {
+                updateUiState(it.copy(selectedLayoutSlug = layoutSlug))
+                onPreviewTapped()
+                loadLayouts()
+            }
         }
     }
 
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
index b640f36f77b6..8f8262e3195e 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
@@ -2,6 +2,7 @@ package org.wordpress.android.ui.sitecreation.theme
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.Observer
+import com.nhaarman.mockitokotlin2.never
 import com.nhaarman.mockitokotlin2.times
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
@@ -13,6 +14,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.ArgumentCaptor
+import org.mockito.ArgumentMatchers.isA
 import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.wordpress.android.fluxc.Dispatcher
@@ -142,42 +144,21 @@ class HomePagePickerViewModelTest {
     }
 
     @Test
-    fun `when the user taps on a layout the layout is selected if the thumbnail has loaded`() = mockResponse {
+    fun `when the user taps on a layout the preview flow is triggered`() = mockResponse {
         viewModel.start()
         viewModel.onThumbnailReady(mockedDesignSlug)
         viewModel.onLayoutTapped(mockedDesignSlug)
-        assertThat(requireNotNull(viewModel.uiState.value as LayoutPickerUiState.Content).selectedLayoutSlug)
-                .isEqualTo(mockedDesignSlug)
-    }
-
-    @Test
-    fun `when the user taps on a layout the layout is not selected if the thumbnail has not loaded`() = mockResponse {
-        viewModel.start()
-        viewModel.onLayoutTapped(mockedDesignSlug)
-        assertThat(requireNotNull(viewModel.uiState.value as LayoutPickerUiState.Content).selectedLayoutSlug).isNull()
-    }
-
-    @Test
-    fun `when the user taps on a selected layout the layout is deselected`() = mockResponse {
-        viewModel.start()
-        viewModel.onThumbnailReady(mockedDesignSlug)
-        viewModel.onLayoutTapped(mockedDesignSlug)
-        viewModel.onLayoutTapped(mockedDesignSlug)
-        assertThat(requireNotNull(viewModel.uiState.value as LayoutPickerUiState.Content).selectedLayoutSlug).isNull()
-    }
-
-    @Test
-    fun `when the picker starts the toolbar is hidden`() = mockResponse {
-        viewModel.start()
-        assertThat(viewModel.uiState.value?.isToolbarVisible).isEqualTo(false)
+        val captor = ArgumentCaptor.forClass(DesignPreviewAction::class.java)
+        verify(onPreviewActionObserver).onChanged(captor.capture())
+        assertThat(requireNotNull(captor.value as Show).template).isEqualTo(mockedDesignSlug)
+        assertThat(requireNotNull(captor.value as Show).demoUrl).isEqualTo(mockedDesignDemoUrl)
     }
 
     @Test
-    fun `when the user selects a design the toolbar is shown`() = mockResponse {
+    fun `when the user taps on a thumbnail that has not loaded, the preview flow is not triggered`() = mockResponse {
         viewModel.start()
-        viewModel.onThumbnailReady(mockedDesignSlug)
         viewModel.onLayoutTapped(mockedDesignSlug)
-        assertThat(viewModel.uiState.value?.isToolbarVisible).isEqualTo(true)
+        verify(onPreviewActionObserver, never()).onChanged(isA(Show::class.java))
     }
 
     @Test
@@ -189,29 +170,6 @@ class HomePagePickerViewModelTest {
         assertThat(captor.value.template).isEqualTo(defaultTemplateSlug)
     }
 
-    @Test
-    fun `when the user chooses a design the design info is passed to the next step`() = mockResponse {
-        viewModel.start()
-        viewModel.onThumbnailReady(mockedDesignSlug)
-        viewModel.onLayoutTapped(mockedDesignSlug)
-        viewModel.onChooseTapped()
-        val captor = ArgumentCaptor.forClass(DesignSelectionAction::class.java)
-        verify(onDesignActionObserver).onChanged(captor.capture())
-        assertThat(captor.value.template).isEqualTo(mockedDesignSlug)
-    }
-
-    @Test
-    fun `when the user selects a design and presses preview the preview flow is triggered`() = mockResponse {
-        viewModel.start()
-        viewModel.onThumbnailReady(mockedDesignSlug)
-        viewModel.onLayoutTapped(mockedDesignSlug)
-        viewModel.onPreviewTapped()
-        val captor = ArgumentCaptor.forClass(DesignPreviewAction::class.java)
-        verify(onPreviewActionObserver).onChanged(captor.capture())
-        assertThat(requireNotNull(captor.value as Show).template).isEqualTo(mockedDesignSlug)
-        assertThat(requireNotNull(captor.value as Show).demoUrl).isEqualTo(mockedDesignDemoUrl)
-    }
-
     @Test
     fun `when the picker starts on a phone the mobile previews load by default`() = mockResponse {
         viewModel.start(isTablet = false)
@@ -236,4 +194,32 @@ class HomePagePickerViewModelTest {
         verify(previewModeObserver, times(2)).onChanged(captor.capture())
         assertThat(requireNotNull(captor.value as PreviewMode)).isEqualTo(PreviewMode.DESKTOP)
     }
+
+    @Test
+    fun `when the user chooses a design the design info is passed to the next step`() = mockResponse {
+        viewModel.start()
+        viewModel.onThumbnailReady(mockedDesignSlug)
+        viewModel.onLayoutTapped(mockedDesignSlug)
+        viewModel.onPreviewChooseTapped()
+        val captor = ArgumentCaptor.forClass(DesignSelectionAction::class.java)
+        verify(onDesignActionObserver).onChanged(captor.capture())
+        assertThat(captor.value.template).isEqualTo(mockedDesignSlug)
+    }
+
+    /*
+
+    It would be nice to also include a test like the following, but this behavior currently exists outside the SUT,
+    in the preview fragment.
+
+    @Test
+    fun `when the user dismisses the preview, the theme is deselected`() = mockResponse {
+        viewModel.start()
+        viewModel.onThumbnailReady(mockedDesignSlug)
+        viewModel.onLayoutTapped(mockedDesignSlug)
+        assertThat(requireNotNull(viewModel.uiState.value as LayoutPickerUiState.Content).selectedLayoutSlug)
+                .isEqualTo(mockedDesignSlug)
+        viewModel.onDismissPreview()
+        assertThat(requireNotNull(viewModel.uiState.value as LayoutPickerUiState.Content).selectedLayoutSlug).isNull()
+    }
+    */
 }

From 8275b865426fcb82e6bb5ad19fb927ead899d118 Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Fri, 6 May 2022 16:13:32 +1000
Subject: [PATCH 027/111] Remove unused test in theme picker viewmodel

---
 .../theme/HomePagePickerViewModelTest.kt        | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
index 8f8262e3195e..2a3797f6afb5 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
@@ -205,21 +205,4 @@ class HomePagePickerViewModelTest {
         verify(onDesignActionObserver).onChanged(captor.capture())
         assertThat(captor.value.template).isEqualTo(mockedDesignSlug)
     }
-
-    /*
-
-    It would be nice to also include a test like the following, but this behavior currently exists outside the SUT,
-    in the preview fragment.
-
-    @Test
-    fun `when the user dismisses the preview, the theme is deselected`() = mockResponse {
-        viewModel.start()
-        viewModel.onThumbnailReady(mockedDesignSlug)
-        viewModel.onLayoutTapped(mockedDesignSlug)
-        assertThat(requireNotNull(viewModel.uiState.value as LayoutPickerUiState.Content).selectedLayoutSlug)
-                .isEqualTo(mockedDesignSlug)
-        viewModel.onDismissPreview()
-        assertThat(requireNotNull(viewModel.uiState.value as LayoutPickerUiState.Content).selectedLayoutSlug).isNull()
-    }
-    */
 }

From 84a182925e5a7fa74a7a03f0b94851b8695ea1aa Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Fri, 6 May 2022 16:15:35 +1000
Subject: [PATCH 028/111] Add comment on tracker default NOOP implementation

This is not part of the PR's underlying task, but seems too small for
its own stand-alone PR.
---
 .../org/wordpress/android/ui/layoutpicker/LayoutPickerTracker.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerTracker.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerTracker.kt
index d57f0b4c1ac0..54c778aafe78 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerTracker.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerTracker.kt
@@ -3,6 +3,7 @@ package org.wordpress.android.ui.layoutpicker
 interface LayoutPickerTracker {
     fun trackPreviewModeChanged(mode: String)
 
+    // NOOP implementation provided to make override optional in subclasses
     fun trackThumbnailModeTapped(mode: String) {
     }
 

From b845651676baa208e5f3643293070af245e01d06 Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Fri, 6 May 2022 13:21:05 +0300
Subject: [PATCH 029/111] Extracts default implementation for the scale
 property of the ThumbDimensionProvider

---
 .../android/ui/layoutpicker/ThumbDimensionProvider.kt          | 3 ++-
 .../android/ui/mlp/ModalLayoutPickerDimensionProvider.kt       | 2 --
 .../ui/sitecreation/theme/SiteDesignPickerDimensionProvider.kt | 2 --
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/ThumbDimensionProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/ThumbDimensionProvider.kt
index 43d3c64ecafa..7d1dd30a50ed 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/ThumbDimensionProvider.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/ThumbDimensionProvider.kt
@@ -3,6 +3,7 @@ package org.wordpress.android.ui.layoutpicker
 interface ThumbDimensionProvider {
     val previewWidth: Int
     val previewHeight: Int
-    val scale: Double
     val rowHeight: Int
+    val scale: Double
+        get() = 1.0 // Passing 1.0 and the rendered pixels per device in previewWidth
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerDimensionProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerDimensionProvider.kt
index 9e36f498052f..d0c74d29dc92 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerDimensionProvider.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerDimensionProvider.kt
@@ -13,8 +13,6 @@ class ModalLayoutPickerDimensionProvider @Inject constructor(private val context
     override val previewHeight: Int
         get() = contextProvider.getContext().resources.getDimensionPixelSize(dimen.mlp_layout_card_height)
 
-    override val scale: Double = 1.0 // Passing 1.0 and the rendered pixels per device in previewWidth
-
     override val rowHeight: Int
         get() = contextProvider.getContext().resources.getDimensionPixelSize(dimen.mlp_layouts_row_height)
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignPickerDimensionProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignPickerDimensionProvider.kt
index 227cd54674c2..4964a9993287 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignPickerDimensionProvider.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignPickerDimensionProvider.kt
@@ -13,8 +13,6 @@ class SiteDesignPickerDimensionProvider @Inject constructor(private val contextP
     override val previewHeight: Int
         get() = contextProvider.getContext().resources.getDimensionPixelSize(dimen.hpp_layout_card_height)
 
-    override val scale: Double = 1.0 // Passing 1.0 and the rendered pixels per device in previewWidth
-
     override val rowHeight: Int
         get() = contextProvider.getContext().resources.getDimensionPixelSize(dimen.hpp_layouts_row_height)
 }

From c950f0f8107ece5aeedaa36b469854ded0d50f68 Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Fri, 6 May 2022 17:16:54 +0300
Subject: [PATCH 030/111] Adds dimension provider for recommended designs

---
 .../SiteDesignRecommendedDimensionProvider.kt  | 18 ++++++++++++++++++
 WordPress/src/main/res/values/dimens.xml       |  3 +++
 2 files changed, 21 insertions(+)
 create mode 100644 WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignRecommendedDimensionProvider.kt

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignRecommendedDimensionProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignRecommendedDimensionProvider.kt
new file mode 100644
index 000000000000..db5ddbcc73a5
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignRecommendedDimensionProvider.kt
@@ -0,0 +1,18 @@
+package org.wordpress.android.ui.sitecreation.theme
+
+import org.wordpress.android.R.dimen
+import org.wordpress.android.ui.layoutpicker.ThumbDimensionProvider
+import org.wordpress.android.viewmodel.ContextProvider
+import javax.inject.Inject
+
+class SiteDesignRecommendedDimensionProvider @Inject constructor(private val contextProvider: ContextProvider) :
+        ThumbDimensionProvider {
+    override val previewWidth: Int
+        get() = contextProvider.getContext().resources.getDimensionPixelSize(dimen.hpp_recommended_card_width)
+
+    override val previewHeight: Int
+        get() = contextProvider.getContext().resources.getDimensionPixelSize(dimen.hpp_recommended_card_height)
+
+    override val rowHeight: Int
+        get() = contextProvider.getContext().resources.getDimensionPixelSize(dimen.hpp_recommended_row_height)
+}
diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml
index 4787166012eb..eb07ff86433c 100644
--- a/WordPress/src/main/res/values/dimens.xml
+++ b/WordPress/src/main/res/values/dimens.xml
@@ -651,6 +651,9 @@
     <dimen name="hpp_layout_card_height">260dp</dimen>
     <dimen name="hpp_layout_card_width">200dp</dimen>
     <dimen name="hpp_layouts_row_height">330dp</dimen>
+    <dimen name="hpp_recommended_card_height">420dp</dimen>
+    <dimen name="hpp_recommended_card_width">320dp</dimen>
+    <dimen name="hpp_recommended_row_height">500dp</dimen>
 
     <!-- Site Intent Question -->
     <dimen name="siq_title_padding_start">@dimen/margin_extra_extra_large</dimen>

From 8b3d3d7e7f4cb09ee694e6ff99de6e303fd66c7b Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Fri, 6 May 2022 17:26:36 +0300
Subject: [PATCH 031/111] WIP: Adds recommended designs row

---
 .../ui/layoutpicker/LayoutCategoryAdapter.kt       |  6 ++++--
 .../ui/layoutpicker/LayoutCategoryDiffCallback.kt  |  6 ++++--
 .../android/ui/layoutpicker/LayoutCategoryModel.kt |  6 ++++--
 .../ui/layoutpicker/LayoutCategoryUiState.kt       |  4 +++-
 .../ui/layoutpicker/LayoutPickerViewModel.kt       |  3 ++-
 .../ui/layoutpicker/LayoutsItemViewHolder.kt       | 14 +++++++++++---
 .../sitecreation/theme/HomePagePickerFragment.kt   |  7 ++++++-
 .../sitecreation/theme/HomePagePickerViewModel.kt  |  6 +++++-
 .../res/layout/modal_layout_picker_layouts_row.xml |  5 +++++
 WordPress/src/main/res/values/strings.xml          |  1 +
 WordPress/src/main/res/values/styles.xml           |  8 ++++++++
 11 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
index a68ffef2a441..2cc4ddfbb9e4 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
@@ -10,7 +10,8 @@ import androidx.recyclerview.widget.RecyclerView.Adapter
  */
 class LayoutCategoryAdapter(
     private var nestedScrollStates: Bundle,
-    private val thumbDimensionProvider: ThumbDimensionProvider
+    private val thumbDimensionProvider: ThumbDimensionProvider,
+    private val recommendedDimensionProvider: ThumbDimensionProvider? = null
 ) : Adapter<LayoutsItemViewHolder>() {
     private var items: List<LayoutCategoryUiState> = listOf()
 
@@ -40,7 +41,8 @@ class LayoutCategoryAdapter(
             LayoutsItemViewHolder(
                     parent = parent,
                     nestedScrollStates = nestedScrollStates,
-                    thumbDimensionProvider = thumbDimensionProvider
+                    thumbDimensionProvider = thumbDimensionProvider,
+                    recommendedDimensionProvider = recommendedDimensionProvider
             )
 
     fun onRestoreInstanceState(savedInstanceState: Bundle) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryDiffCallback.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryDiffCallback.kt
index ec4fd12cab99..138a44d73871 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryDiffCallback.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryDiffCallback.kt
@@ -11,7 +11,8 @@ class LayoutCategoryDiffCallback(
 ) : Callback() {
     object Payload
     override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
-        return newList[newItemPosition].slug == oldList[oldItemPosition].slug
+        return newList[newItemPosition].isRecommended == oldList[oldItemPosition].isRecommended &&
+                newList[newItemPosition].slug == oldList[oldItemPosition].slug
     }
 
     override fun getOldListSize(): Int = oldList.size
@@ -19,7 +20,8 @@ class LayoutCategoryDiffCallback(
     override fun getNewListSize(): Int = newList.size
 
     override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
-        return newList[newItemPosition].layouts == oldList[oldItemPosition].layouts
+        return newList[newItemPosition].isRecommended == oldList[oldItemPosition].isRecommended &&
+                newList[newItemPosition].layouts == oldList[oldItemPosition].layouts
     }
 
     override fun getChangePayload(oldItemPosition: Int, newItemPosition: Int): Any? {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryModel.kt
index 3477e34053a2..d0ab70af2e29 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryModel.kt
@@ -10,7 +10,8 @@ import org.wordpress.android.fluxc.network.rest.wpcom.theme.StarterDesignCategor
 @SuppressLint("ParcelCreator")
 class LayoutCategoryModel(
     private val starterDesignCategory: StarterDesignCategory? = null,
-    private val blockLayoutCategory: GutenbergLayoutCategory? = null
+    private val blockLayoutCategory: GutenbergLayoutCategory? = null,
+    val isRecommended: Boolean = false
 ) : Parcelable {
     val slug: String
         get() = starterDesignCategory?.slug ?: blockLayoutCategory?.slug ?: ""
@@ -23,7 +24,8 @@ class LayoutCategoryModel(
 }
 
 @JvmName("starterDesignToLayoutCategories")
-fun List<StarterDesignCategory>.toLayoutCategories() = map { LayoutCategoryModel(starterDesignCategory = it) }
+fun List<StarterDesignCategory>.toLayoutCategories(recommended: Boolean = false) =
+        map { LayoutCategoryModel(starterDesignCategory = it, isRecommended = recommended) }
 
 @JvmName("gutenbergLayoutToLayoutCategories")
 fun List<GutenbergLayoutCategory>.toLayoutCategories() = map { LayoutCategoryModel(blockLayoutCategory = it) }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryUiState.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryUiState.kt
index 33ba6f20171e..a8b429ddb132 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryUiState.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryUiState.kt
@@ -6,10 +6,12 @@ package org.wordpress.android.ui.layoutpicker
  * @param title the layout category title
  * @param description the layout category description
  * @param layouts the layouts list
+ * @param isRecommended defines if the category is recommended (optional with default `false`)
  */
 data class LayoutCategoryUiState(
     val slug: String,
     val title: String,
     val description: String,
-    val layouts: List<LayoutListItemUiState>
+    val layouts: List<LayoutListItemUiState>,
+    val isRecommended: Boolean = false
 )
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
index e08dd3765711..ef43a92b8f6e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
@@ -179,7 +179,8 @@ abstract class LayoutPickerViewModel(
                                 category.slug,
                                 category.title,
                                 category.description,
-                                layouts
+                                layouts,
+                                category.isRecommended
                         )
                 )
             }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
index ed52cfedf634..baffe84fa68b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
@@ -10,6 +10,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.OnScrollListener
 import org.wordpress.android.R
+import org.wordpress.android.util.extensions.setVisible
 
 /**
  * Modal Layout Picker layouts view holder
@@ -18,18 +19,21 @@ class LayoutsItemViewHolder(
     parent: ViewGroup,
     private val prefetchItemCount: Int = 4,
     private var nestedScrollStates: Bundle,
-    private val thumbDimensionProvider: ThumbDimensionProvider
+    private val thumbDimensionProvider: ThumbDimensionProvider,
+    private val recommendedDimensionProvider: ThumbDimensionProvider?
 ) : RecyclerView.ViewHolder(
         LayoutInflater.from(
                 parent.context
         ).inflate(R.layout.modal_layout_picker_layouts_row, parent, false)
 ) {
     private val title: TextView = itemView.findViewById(R.id.title)
+    private val subtitle: TextView = itemView.findViewById(R.id.subtitle)
     private var currentItem: LayoutCategoryUiState? = null
 
     private val recycler: RecyclerView by lazy {
+        val isRecommended = currentItem?.isRecommended == true && recommendedDimensionProvider != null
         itemView.updateLayoutParams {
-            height = thumbDimensionProvider.rowHeight
+            height = if (isRecommended) recommendedDimensionProvider!!.rowHeight else thumbDimensionProvider.rowHeight
         }
         itemView.findViewById<RecyclerView>(R.id.layouts_recycler_view).apply {
             layoutManager = LinearLayoutManager(
@@ -38,7 +42,10 @@ class LayoutsItemViewHolder(
                     false
             ).apply { initialPrefetchItemCount = prefetchItemCount }
             setRecycledViewPool(RecyclerView.RecycledViewPool())
-            adapter = LayoutsAdapter(parent.context, thumbDimensionProvider)
+            adapter = LayoutsAdapter(
+                    parent.context,
+                    if (isRecommended) recommendedDimensionProvider!! else thumbDimensionProvider
+            )
 
             addOnScrollListener(object : OnScrollListener() {
                 override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
@@ -54,6 +61,7 @@ class LayoutsItemViewHolder(
         currentItem = category
 
         title.text = category.description
+        subtitle.setVisible(category.isRecommended)
         (recycler.adapter as LayoutsAdapter).setData(category.layouts)
         restoreScrollState(recycler, category.title)
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index 47654553bc62..929785ff40c9 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -39,6 +39,7 @@ class HomePagePickerFragment : Fragment() {
     @Inject lateinit var siteNameFeatureConfig: SiteNameFeatureConfig
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     @Inject lateinit var thumbDimensionProvider: SiteDesignPickerDimensionProvider
+    @Inject lateinit var recommendedDimensionProvider: SiteDesignRecommendedDimensionProvider
     private lateinit var viewModel: HomePagePickerViewModel
 
     override fun onAttach(context: Context) {
@@ -64,7 +65,11 @@ class HomePagePickerFragment : Fragment() {
             categoriesRecyclerView.isGone = true
             layoutsRecyclerView.apply {
                 layoutManager = LinearLayoutManager(requireActivity())
-                adapter = LayoutCategoryAdapter(viewModel.nestedScrollStates, thumbDimensionProvider)
+                adapter = LayoutCategoryAdapter(
+                        viewModel.nestedScrollStates,
+                        thumbDimensionProvider,
+                        recommendedDimensionProvider
+                )
             }
 
             setupUi()
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
index 2739615a86bf..5afa891cb160 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
@@ -81,7 +81,11 @@ class HomePagePickerViewModel @Inject constructor(
                     analyticsTracker.trackErrorShown(ERROR_CONTEXT, UNKNOWN, "Error fetching designs")
                     updateUiState(Error())
                 } else {
-                    handleResponse(event.designs.toLayoutModels(), event.categories.toLayoutCategories())
+                    // TODO: This is just to demonstrate the UI. The real are pending to be linked
+                    val recommended = event.categories.filter { it.slug == "blog" }.apply {  }.toLayoutCategories(true)
+
+                    val categories = event.categories.toLayoutCategories()
+                    handleResponse(event.designs.toLayoutModels(), recommended + categories)
                 }
             }
         }
diff --git a/WordPress/src/main/res/layout/modal_layout_picker_layouts_row.xml b/WordPress/src/main/res/layout/modal_layout_picker_layouts_row.xml
index e86c9b7d75c0..ab787b0d8c02 100644
--- a/WordPress/src/main/res/layout/modal_layout_picker_layouts_row.xml
+++ b/WordPress/src/main/res/layout/modal_layout_picker_layouts_row.xml
@@ -7,6 +7,11 @@
 
     <View style="@style/ModalLayoutPickerLayoutsSeparatorLine" />
 
+    <TextView
+        android:id="@+id/subtitle"
+        style="@style/ModalLayoutPickerLayoutsSubtitle"
+        android:layout_marginStart="@dimen/mlp_layout_card_margin_start"
+        android:text="@string/hpp_recommended_subtitle" />
     <TextView
         android:id="@+id/title"
         style="@style/ModalLayoutPickerLayoutsTitle"
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index 6599e1d60033..89a12d0db8b8 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -3377,6 +3377,7 @@
     <string name="hpp_error_subtitle">Tap retry when you\'re back online.</string>
     <string name="hpp_retry_error">Please Check your internet connection and retry.</string>
     <string name="hpp_choose_error">There was an error while selecting the theme.</string>
+    <string name="hpp_recommended_subtitle">Picked for you</string>
 
     <!-- Stories -->
     <string name="dialog_edit_story_limited_title">Limited Story Editing</string>
diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml
index 8a47e6a3bd3c..0f98f5730a2b 100644
--- a/WordPress/src/main/res/values/styles.xml
+++ b/WordPress/src/main/res/values/styles.xml
@@ -1553,6 +1553,14 @@
         <item name="android:textAppearance">?attr/textAppearanceHeadline5</item>
         <item name="fontFamily">serif</item>
     </style>
+    <style name="ModalLayoutPickerLayoutsSubtitle" parent="ModalLayoutPickerText">
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:layout_gravity">top</item>
+        <item name="android:textSize">@dimen/text_sz_small</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textAppearance">?attr/textAppearanceCaption</item>
+        <item name="fontFamily">serif</item>
+    </style>
 
     <style name="ModalLayoutPickerLayoutsSeparatorLine">
         <item name="android:background">?attr/mlpDividerColor</item>

From ceb4a36c1bccaa3e0f1295f1cfbb0ba782b7d7ca Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Fri, 6 May 2022 17:34:18 +0300
Subject: [PATCH 032/111] Fixes lint issue

---
 .../android/ui/sitecreation/theme/HomePagePickerViewModel.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
index 5afa891cb160..1e319072f996 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
@@ -82,7 +82,7 @@ class HomePagePickerViewModel @Inject constructor(
                     updateUiState(Error())
                 } else {
                     // TODO: This is just to demonstrate the UI. The real are pending to be linked
-                    val recommended = event.categories.filter { it.slug == "blog" }.apply {  }.toLayoutCategories(true)
+                    val recommended = event.categories.filter { it.slug == "blog" }.toLayoutCategories(true)
 
                     val categories = event.categories.toLayoutCategories()
                     handleResponse(event.designs.toLayoutModels(), recommended + categories)

From e5128e3b0bb7983dbf6cdce5e8c41023f7bbda23 Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Fri, 6 May 2022 18:09:16 +0300
Subject: [PATCH 033/111] Adds recommended title

---
 .../sitecreation/theme/HomePagePickerViewModel.kt | 15 ++++++++++++---
 WordPress/src/main/res/values/strings.xml         |  1 +
 .../theme/HomePagePickerViewModelTest.kt          |  5 ++++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
index 1e319072f996..36dea1cfdcb6 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
@@ -18,6 +18,7 @@ import org.wordpress.android.ui.layoutpicker.toLayoutCategories
 import org.wordpress.android.ui.layoutpicker.toLayoutModels
 import org.wordpress.android.ui.sitecreation.usecases.FetchHomePageLayoutsUseCase
 import org.wordpress.android.util.NetworkUtilsWrapper
+import org.wordpress.android.viewmodel.ResourceProvider
 import org.wordpress.android.viewmodel.SingleLiveEvent
 import javax.inject.Inject
 import javax.inject.Named
@@ -32,7 +33,8 @@ class HomePagePickerViewModel @Inject constructor(
     private val fetchHomePageLayoutsUseCase: FetchHomePageLayoutsUseCase,
     private val analyticsTracker: SiteCreationTracker,
     @Named(BG_THREAD) override val bgDispatcher: CoroutineDispatcher,
-    @Named(UI_THREAD) override val mainDispatcher: CoroutineDispatcher
+    @Named(UI_THREAD) override val mainDispatcher: CoroutineDispatcher,
+    private val resourceProvider: ResourceProvider
 ) : LayoutPickerViewModel(mainDispatcher, bgDispatcher, networkUtils, analyticsTracker) {
     private val _onDesignActionPressed = SingleLiveEvent<DesignSelectionAction>()
     val onDesignActionPressed: LiveData<DesignSelectionAction> = _onDesignActionPressed
@@ -81,8 +83,15 @@ class HomePagePickerViewModel @Inject constructor(
                     analyticsTracker.trackErrorShown(ERROR_CONTEXT, UNKNOWN, "Error fetching designs")
                     updateUiState(Error())
                 } else {
-                    // TODO: This is just to demonstrate the UI. The real are pending to be linked
-                    val recommended = event.categories.filter { it.slug == "blog" }.toLayoutCategories(true)
+                    // TODO: This is just to demonstrate the UI. The real data are pending to be linked
+                    val dummySelectedVertical = "food"
+                    val recommendedVertical = resourceProvider.getString(
+                            R.string.hpp_recommended_title,
+                            dummySelectedVertical
+                    )
+                    val recommendedCategory = event.categories.first { it.slug == "blog" }
+                            .copy(title = recommendedVertical, description = recommendedVertical)
+                    val recommended = listOf(recommendedCategory).toLayoutCategories(true)
 
                     val categories = event.categories.toLayoutCategories()
                     handleResponse(event.designs.toLayoutModels(), recommended + categories)
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index 89a12d0db8b8..84d8ac766092 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -3377,6 +3377,7 @@
     <string name="hpp_error_subtitle">Tap retry when you\'re back online.</string>
     <string name="hpp_retry_error">Please Check your internet connection and retry.</string>
     <string name="hpp_choose_error">There was an error while selecting the theme.</string>
+    <string name="hpp_recommended_title">Best for %s</string>
     <string name="hpp_recommended_subtitle">Picked for you</string>
 
     <!-- Stories -->
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
index 2a3797f6afb5..099e12576136 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
@@ -33,6 +33,7 @@ import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState
 import org.wordpress.android.ui.sitecreation.usecases.FetchHomePageLayoutsUseCase
 import org.wordpress.android.util.NetworkUtilsWrapper
 import org.wordpress.android.util.NoDelayCoroutineDispatcher
+import org.wordpress.android.viewmodel.ResourceProvider
 
 private const val mockedDesignSlug = "mockedDesignSlug"
 private const val mockedDesignSegmentId = 1L
@@ -52,6 +53,7 @@ class HomePagePickerViewModelTest {
     @Mock lateinit var onPreviewActionObserver: Observer<DesignPreviewAction>
     @Mock lateinit var previewModeObserver: Observer<PreviewMode>
     @Mock lateinit var analyticsTracker: SiteCreationTracker
+    @Mock lateinit var resourceProvider: ResourceProvider
 
     private lateinit var viewModel: HomePagePickerViewModel
 
@@ -70,7 +72,8 @@ class HomePagePickerViewModelTest {
                 fetchHomePageLayoutsUseCase,
                 analyticsTracker,
                 NoDelayCoroutineDispatcher(),
-                NoDelayCoroutineDispatcher()
+                NoDelayCoroutineDispatcher(),
+                resourceProvider
         )
         viewModel.uiState.observeForever(uiStateObserver)
         viewModel.onDesignActionPressed.observeForever(onDesignActionObserver)

From dfa6d16d97586b13e7c28f06bdafaad89599b29a Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Fri, 6 May 2022 16:38:53 +0200
Subject: [PATCH 034/111] Add id to divider view between layouts rows

---
 .../src/main/res/layout/modal_layout_picker_layouts_row.xml   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/res/layout/modal_layout_picker_layouts_row.xml b/WordPress/src/main/res/layout/modal_layout_picker_layouts_row.xml
index ab787b0d8c02..d032b8f76b82 100644
--- a/WordPress/src/main/res/layout/modal_layout_picker_layouts_row.xml
+++ b/WordPress/src/main/res/layout/modal_layout_picker_layouts_row.xml
@@ -5,7 +5,9 @@
     android:layout_height="@dimen/mlp_layouts_row_height"
     android:orientation="vertical">
 
-    <View style="@style/ModalLayoutPickerLayoutsSeparatorLine" />
+    <View
+        android:id="@+id/layouts_row_separator_line"
+        style="@style/ModalLayoutPickerLayoutsSeparatorLine" />
 
     <TextView
         android:id="@+id/subtitle"

From d8a612b25c277f90223298b7e9692c25c1148da5 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Fri, 6 May 2022 16:40:12 +0200
Subject: [PATCH 035/111] Add showDividers bool to layouts item view holder for
 showing/hiding the separators

---
 .../android/ui/layoutpicker/LayoutCategoryAdapter.kt        | 6 ++++--
 .../android/ui/layoutpicker/LayoutsItemViewHolder.kt        | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
index 2cc4ddfbb9e4..67372c73dc19 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
@@ -11,7 +11,8 @@ import androidx.recyclerview.widget.RecyclerView.Adapter
 class LayoutCategoryAdapter(
     private var nestedScrollStates: Bundle,
     private val thumbDimensionProvider: ThumbDimensionProvider,
-    private val recommendedDimensionProvider: ThumbDimensionProvider? = null
+    private val recommendedDimensionProvider: ThumbDimensionProvider? = null,
+    private val showRowDividers: Boolean = true
 ) : Adapter<LayoutsItemViewHolder>() {
     private var items: List<LayoutCategoryUiState> = listOf()
 
@@ -42,7 +43,8 @@ class LayoutCategoryAdapter(
                     parent = parent,
                     nestedScrollStates = nestedScrollStates,
                     thumbDimensionProvider = thumbDimensionProvider,
-                    recommendedDimensionProvider = recommendedDimensionProvider
+                    recommendedDimensionProvider = recommendedDimensionProvider,
+                    showRowDividers = showRowDividers
             )
 
     fun onRestoreInstanceState(savedInstanceState: Bundle) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
index baffe84fa68b..bb629aa27fe4 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
@@ -3,8 +3,10 @@ package org.wordpress.android.ui.layoutpicker
 import android.os.Bundle
 import android.os.Parcelable
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -18,6 +20,7 @@ import org.wordpress.android.util.extensions.setVisible
 class LayoutsItemViewHolder(
     parent: ViewGroup,
     private val prefetchItemCount: Int = 4,
+    private val showRowDividers: Boolean,
     private var nestedScrollStates: Bundle,
     private val thumbDimensionProvider: ThumbDimensionProvider,
     private val recommendedDimensionProvider: ThumbDimensionProvider?
@@ -35,6 +38,7 @@ class LayoutsItemViewHolder(
         itemView.updateLayoutParams {
             height = if (isRecommended) recommendedDimensionProvider!!.rowHeight else thumbDimensionProvider.rowHeight
         }
+        itemView.findViewById<View>(R.id.layouts_row_separator_line).isVisible = showRowDividers
         itemView.findViewById<RecyclerView>(R.id.layouts_recycler_view).apply {
             layoutManager = LinearLayoutManager(
                     context,

From 97aaf34710b11426bb35d7feec2237fb8ffb00f1 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Fri, 6 May 2022 16:40:56 +0200
Subject: [PATCH 036/111] Hide layouts row separator on site design screen

---
 .../android/ui/sitecreation/theme/HomePagePickerFragment.kt    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index 929785ff40c9..c73537e416ee 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -68,7 +68,8 @@ class HomePagePickerFragment : Fragment() {
                 adapter = LayoutCategoryAdapter(
                         viewModel.nestedScrollStates,
                         thumbDimensionProvider,
-                        recommendedDimensionProvider
+                        recommendedDimensionProvider,
+                        showRowDividers = false
                 )
             }
 

From 2a1d5c1d039d8e9885dc687ae4b7815912518348 Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Fri, 6 May 2022 18:49:37 +0300
Subject: [PATCH 037/111] Fixes broken tests

---
 .../ui/sitecreation/theme/HomePagePickerViewModelTest.kt  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
index 099e12576136..9f1b73b09e79 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
@@ -2,6 +2,7 @@ package org.wordpress.android.ui.sitecreation.theme
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.Observer
+import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.never
 import com.nhaarman.mockitokotlin2.times
 import com.nhaarman.mockitokotlin2.verify
@@ -58,9 +59,9 @@ class HomePagePickerViewModelTest {
     private lateinit var viewModel: HomePagePickerViewModel
 
     private val mockCategory = StarterDesignCategory(
-            slug = "about",
-            title = "About",
-            description = "About pages",
+            slug = "blog",
+            title = "Blog",
+            description = "Blogging designs",
             emoji = "👋"
     )
 
@@ -106,6 +107,7 @@ class HomePagePickerViewModelTest {
         )
         whenever(fetchHomePageLayoutsUseCase.fetchStarterDesigns()).thenReturn(response)
         whenever(networkUtils.isNetworkAvailable()).thenReturn(true)
+        whenever(resourceProvider.getString(any(), any())).thenReturn("")
         block()
     }
 

From 9217d24357dba592aad01c11c7f8e0ef8f88f5a4 Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Fri, 6 May 2022 18:57:07 +0300
Subject: [PATCH 038/111] Workaround to prevent recyclerview from recycling
 rows of different size

---
 .../wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
index 67372c73dc19..b46eeda0fd77 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
@@ -30,6 +30,7 @@ class LayoutCategoryAdapter(
     override fun getItemCount(): Int = items.size
 
     override fun onBindViewHolder(holder: LayoutsItemViewHolder, position: Int) {
+        holder.setIsRecyclable(false) // TODO: Find a better fix!
         holder.bind(items[position])
     }
 

From df0d9ea9caa60ede657014b21ac6e8094c1d4221 Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Mon, 9 May 2022 12:51:44 +1000
Subject: [PATCH 039/111] Override getItemViewType to re-enable recycling

---
 .../android/ui/layoutpicker/LayoutCategoryAdapter.kt | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
index b46eeda0fd77..3883229f53ef 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
@@ -4,6 +4,13 @@ import android.os.Bundle
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView.Adapter
+import org.wordpress.android.ui.layoutpicker.LayoutCategoryViewType.DEFAULT
+import org.wordpress.android.ui.layoutpicker.LayoutCategoryViewType.RECOMMENDED
+
+enum class LayoutCategoryViewType {
+    DEFAULT,
+    RECOMMENDED,
+}
 
 /**
  * Renders the layout categories
@@ -30,10 +37,13 @@ class LayoutCategoryAdapter(
     override fun getItemCount(): Int = items.size
 
     override fun onBindViewHolder(holder: LayoutsItemViewHolder, position: Int) {
-        holder.setIsRecyclable(false) // TODO: Find a better fix!
         holder.bind(items[position])
     }
 
+    override fun getItemViewType(position: Int): Int {
+        return if (items[position].isRecommended) RECOMMENDED.ordinal else DEFAULT.ordinal
+    }
+
     override fun onViewRecycled(holder: LayoutsItemViewHolder) {
         super.onViewRecycled(holder)
         holder.onRecycled()

From 443e445fb9ccdd76a084a8179a8d4abec3d5b30e Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Mon, 9 May 2022 10:51:21 +0300
Subject: [PATCH 040/111] Minor code optimization to avoid force unwrapping

---
 .../ui/layoutpicker/LayoutsItemViewHolder.kt        | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
index bb629aa27fe4..bf617d1b6b9b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
@@ -34,9 +34,13 @@ class LayoutsItemViewHolder(
     private var currentItem: LayoutCategoryUiState? = null
 
     private val recycler: RecyclerView by lazy {
-        val isRecommended = currentItem?.isRecommended == true && recommendedDimensionProvider != null
+        val dimensionProvider = if (currentItem?.isRecommended == true && recommendedDimensionProvider != null) {
+            recommendedDimensionProvider
+        } else {
+            thumbDimensionProvider
+        }
         itemView.updateLayoutParams {
-            height = if (isRecommended) recommendedDimensionProvider!!.rowHeight else thumbDimensionProvider.rowHeight
+            height = dimensionProvider.rowHeight
         }
         itemView.findViewById<View>(R.id.layouts_row_separator_line).isVisible = showRowDividers
         itemView.findViewById<RecyclerView>(R.id.layouts_recycler_view).apply {
@@ -46,10 +50,7 @@ class LayoutsItemViewHolder(
                     false
             ).apply { initialPrefetchItemCount = prefetchItemCount }
             setRecycledViewPool(RecyclerView.RecycledViewPool())
-            adapter = LayoutsAdapter(
-                    parent.context,
-                    if (isRecommended) recommendedDimensionProvider!! else thumbDimensionProvider
-            )
+            adapter = LayoutsAdapter(parent.context, dimensionProvider)
 
             addOnScrollListener(object : OnScrollListener() {
                 override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {

From d0d65f0ffa6d5a15442f20843d59e47517478073 Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Mon, 9 May 2022 11:22:40 +0300
Subject: [PATCH 041/111] Extracts (dummy) recommendation logic to a separate
 function

---
 .../theme/HomePagePickerViewModel.kt          | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
index 36dea1cfdcb6..e3173c0879ae 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
@@ -5,8 +5,10 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import org.wordpress.android.R
 import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.network.rest.wpcom.theme.StarterDesignCategory
 import org.wordpress.android.modules.BG_THREAD
 import org.wordpress.android.modules.UI_THREAD
+import org.wordpress.android.ui.layoutpicker.LayoutCategoryModel
 import org.wordpress.android.ui.sitecreation.misc.SiteCreationErrorType.INTERNET_UNAVAILABLE_ERROR
 import org.wordpress.android.ui.sitecreation.misc.SiteCreationErrorType.UNKNOWN
 import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker
@@ -83,23 +85,24 @@ class HomePagePickerViewModel @Inject constructor(
                     analyticsTracker.trackErrorShown(ERROR_CONTEXT, UNKNOWN, "Error fetching designs")
                     updateUiState(Error())
                 } else {
-                    // TODO: This is just to demonstrate the UI. The real data are pending to be linked
-                    val dummySelectedVertical = "food"
-                    val recommendedVertical = resourceProvider.getString(
-                            R.string.hpp_recommended_title,
-                            dummySelectedVertical
-                    )
-                    val recommendedCategory = event.categories.first { it.slug == "blog" }
-                            .copy(title = recommendedVertical, description = recommendedVertical)
-                    val recommended = listOf(recommendedCategory).toLayoutCategories(true)
-
-                    val categories = event.categories.toLayoutCategories()
-                    handleResponse(event.designs.toLayoutModels(), recommended + categories)
+                    handleResponse(event.designs.toLayoutModels(), categoriesWithRecommendations(event.categories))
                 }
             }
         }
     }
 
+    private fun categoriesWithRecommendations(categories: List<StarterDesignCategory>): List<LayoutCategoryModel> {
+        // TODO: This is just to demonstrate the UI. The real data are pending to be linked
+        val dummySelectedVertical = "food"
+        val recommendedVertical = resourceProvider.getString(
+                R.string.hpp_recommended_title,
+                dummySelectedVertical
+        )
+        val recommendedCategory = categories.first { it.slug == "blog" }
+                .copy(title = recommendedVertical, description = recommendedVertical)
+        return listOf(recommendedCategory).toLayoutCategories(true) + categories.toLayoutCategories()
+    }
+
     override fun onLayoutTapped(layoutSlug: String) {
         (uiState.value as? Content)?.let {
             if (it.loadedThumbnailSlugs.contains(layoutSlug)) {

From df5065aa0823b0f635745d0cc2ace2b08fc7f642 Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Mon, 9 May 2022 11:43:24 +0300
Subject: [PATCH 042/111] Sets Blogging as the default fallback recommendation

---
 .../ui/sitecreation/theme/HomePagePickerViewModel.kt     | 9 +++------
 WordPress/src/main/res/values/strings.xml                | 1 +
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
index e3173c0879ae..cbb2ed932072 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
@@ -92,12 +92,9 @@ class HomePagePickerViewModel @Inject constructor(
     }
 
     private fun categoriesWithRecommendations(categories: List<StarterDesignCategory>): List<LayoutCategoryModel> {
-        // TODO: This is just to demonstrate the UI. The real data are pending to be linked
-        val dummySelectedVertical = "food"
-        val recommendedVertical = resourceProvider.getString(
-                R.string.hpp_recommended_title,
-                dummySelectedVertical
-        )
+        val defaultVertical = resourceProvider.getString(R.string.hpp_recommended_default_vertical)
+        val recommendedVertical = resourceProvider.getString(R.string.hpp_recommended_title, defaultVertical)
+        // TODO: The link with the selected vertical and actual fallback recommendations will be implemented separately
         val recommendedCategory = categories.first { it.slug == "blog" }
                 .copy(title = recommendedVertical, description = recommendedVertical)
         return listOf(recommendedCategory).toLayoutCategories(true) + categories.toLayoutCategories()
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index 7eeb27813437..d863ace17a13 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -3381,6 +3381,7 @@
     <string name="hpp_choose_error">There was an error while selecting the theme.</string>
     <string name="hpp_recommended_title">Best for %s</string>
     <string name="hpp_recommended_subtitle">Picked for you</string>
+    <string name="hpp_recommended_default_vertical">Blogging</string>
 
     <!-- Stories -->
     <string name="dialog_edit_story_limited_title">Limited Story Editing</string>

From c3d5ab5a482d83cb7c5ba101672bb7e749b7cf61 Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Mon, 9 May 2022 12:47:29 +0300
Subject: [PATCH 043/111] Mocks resource provider call with one parameter

---
 .../ui/sitecreation/theme/HomePagePickerViewModelTest.kt       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
index 9f1b73b09e79..680d9aeda59b 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
@@ -107,7 +107,8 @@ class HomePagePickerViewModelTest {
         )
         whenever(fetchHomePageLayoutsUseCase.fetchStarterDesigns()).thenReturn(response)
         whenever(networkUtils.isNetworkAvailable()).thenReturn(true)
-        whenever(resourceProvider.getString(any(), any())).thenReturn("")
+        whenever(resourceProvider.getString(any())).thenReturn("Blogging")
+        whenever(resourceProvider.getString(any(), any())).thenReturn("Best for Blogging")
         block()
     }
 

From f502a2aadb94c71abe89f359bd8186a8abc118f0 Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Tue, 10 May 2022 12:40:02 +0300
Subject: [PATCH 044/111] Updates FluxC reference

---
 .../ui/sitecreation/theme/HomePagePickerViewModelTest.kt        | 1 +
 build.gradle                                                    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
index 680d9aeda59b..36fc67aebc11 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
@@ -97,6 +97,7 @@ class HomePagePickerViewModelTest {
                                 listOf(mockCategory),
                                 mockedDesignDemoUrl,
                                 "theme",
+                                listOf("stable", "blog"),
                                 "desktopThumbnail",
                                 "tabletThumbnail",
                                 "mobileThumbnail"
diff --git a/build.gradle b/build.gradle
index 4ffc9f5c8d88..0daf68a489da 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ ext {
     coroutinesVersion = '1.5.2'
     androidxWorkVersion = "2.7.0"
 
-    fluxCVersion = 'trunk-1ee442f447044438c9b17068cb224cc162cd5912'
+    fluxCVersion = '2385-52aa9be4c288fb05c19435cb5f2112c8320b7e7e'
 
     appCompatVersion = '1.0.2'
     coreVersion = '1.3.2'

From a6f506f76b3dd38250dc19e53a30a67549dca5fa Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Tue, 10 May 2022 12:41:53 +0300
Subject: [PATCH 045/111] Pass selected vertical to the design picker

---
 .../ui/sitecreation/SiteCreationActivity.kt   |  2 +-
 .../theme/HomePagePickerFragment.kt           | 19 ++++++++++++++++++-
 .../theme/HomePagePickerViewModel.kt          |  5 ++++-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
index fd95bbc0d263..08a598017460 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
@@ -181,7 +181,7 @@ class SiteCreationActivity : LocaleAwareActivity(),
         val fragment = when (target.wizardStep) {
             INTENTS -> SiteCreationIntentsFragment()
             SITE_NAME -> SiteCreationSiteNameFragment.newInstance(target.wizardState.siteIntent)
-            SITE_DESIGNS -> HomePagePickerFragment()
+            SITE_DESIGNS -> HomePagePickerFragment.newInstance(target.wizardState.siteIntent)
             DOMAINS -> SiteCreationDomainsFragment.newInstance(
                     screenTitle
             )
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index c73537e416ee..68ac36c93b4f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -42,6 +42,9 @@ class HomePagePickerFragment : Fragment() {
     @Inject lateinit var recommendedDimensionProvider: SiteDesignRecommendedDimensionProvider
     private lateinit var viewModel: HomePagePickerViewModel
 
+    private val siteIntent: String?
+        get() = arguments?.getString(ARG_SITE_INTENT)
+
     override fun onAttach(context: Context) {
         super.onAttach(context)
         (requireActivity().applicationContext as WordPress).component().inject(this)
@@ -128,7 +131,7 @@ class HomePagePickerFragment : Fragment() {
             }
         }
 
-        viewModel.start(displayUtils.isTablet())
+        viewModel.start(siteIntent, displayUtils.isTablet())
     }
 
     private fun HomePagePickerFragmentBinding.setHeaderVisibility(visible: Boolean) {
@@ -160,4 +163,18 @@ class HomePagePickerFragment : Fragment() {
         })
         viewModel.onAppBarOffsetChanged(0, scrollThreshold)
     }
+
+    companion object {
+        private const val ARG_SITE_INTENT = "arg_site_intent"
+
+        fun newInstance(siteIntent: String?): HomePagePickerFragment {
+            val bundle = Bundle().apply {
+                putString(ARG_SITE_INTENT, siteIntent)
+            }
+
+            return HomePagePickerFragment().apply {
+                arguments = bundle
+            }
+        }
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
index cbb2ed932072..f289ecbfd03c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
@@ -44,6 +44,8 @@ class HomePagePickerViewModel @Inject constructor(
     private val _onBackButtonPressed = SingleLiveEvent<Unit>()
     val onBackButtonPressed: LiveData<Unit> = _onBackButtonPressed
 
+    private lateinit var vertical: String
+
     override val useCachedData: Boolean = false
     override val shouldUseMobileThumbnail = true
     override val thumbnailTapOpensPreview = true
@@ -62,7 +64,8 @@ class HomePagePickerViewModel @Inject constructor(
         dispatcher.unregister(fetchHomePageLayoutsUseCase)
     }
 
-    fun start(isTablet: Boolean = false) {
+    fun start(intent: String? = null, isTablet: Boolean = false) {
+        vertical = intent ?: ""
         initializePreviewMode(isTablet)
         if (uiState.value !is Content) {
             analyticsTracker.trackSiteDesignViewed(selectedPreviewMode().key)

From 85d9074b74ff569355f23918802b933e01bbadf3 Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Tue, 10 May 2022 12:42:53 +0300
Subject: [PATCH 046/111] Recommend designs based on the selected vertical

---
 .../theme/HomePagePickerViewModel.kt          | 71 ++++++++++++++++---
 1 file changed, 62 insertions(+), 9 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
index f289ecbfd03c..5e0d38dfcb4d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
@@ -5,10 +5,10 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import org.wordpress.android.R
 import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.network.rest.wpcom.theme.StarterDesign
 import org.wordpress.android.fluxc.network.rest.wpcom.theme.StarterDesignCategory
 import org.wordpress.android.modules.BG_THREAD
 import org.wordpress.android.modules.UI_THREAD
-import org.wordpress.android.ui.layoutpicker.LayoutCategoryModel
 import org.wordpress.android.ui.sitecreation.misc.SiteCreationErrorType.INTERNET_UNAVAILABLE_ERROR
 import org.wordpress.android.ui.sitecreation.misc.SiteCreationErrorType.UNKNOWN
 import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker
@@ -88,19 +88,72 @@ class HomePagePickerViewModel @Inject constructor(
                     analyticsTracker.trackErrorShown(ERROR_CONTEXT, UNKNOWN, "Error fetching designs")
                     updateUiState(Error())
                 } else {
-                    handleResponse(event.designs.toLayoutModels(), categoriesWithRecommendations(event.categories))
+                    handleResponseWithRecommendations(vertical, event.designs, event.categories)
                 }
             }
         }
     }
 
-    private fun categoriesWithRecommendations(categories: List<StarterDesignCategory>): List<LayoutCategoryModel> {
-        val defaultVertical = resourceProvider.getString(R.string.hpp_recommended_default_vertical)
-        val recommendedVertical = resourceProvider.getString(R.string.hpp_recommended_title, defaultVertical)
-        // TODO: The link with the selected vertical and actual fallback recommendations will be implemented separately
-        val recommendedCategory = categories.first { it.slug == "blog" }
-                .copy(title = recommendedVertical, description = recommendedVertical)
-        return listOf(recommendedCategory).toLayoutCategories(true) + categories.toLayoutCategories()
+    private fun handleResponseWithRecommendations(
+        vertical: String,
+        designs: List<StarterDesign>,
+        categories: List<StarterDesignCategory>
+    ) {
+        val verticalSlug: String? = if (vertical.isNullOrEmpty()) null else getVerticalSlug(vertical)
+        val hasRecommendations = !verticalSlug.isNullOrEmpty() &&
+                designs.any { it.group != null && it.group.contains(verticalSlug) }
+
+        if (hasRecommendations) {
+            val recommendedTitle = resourceProvider.getString(R.string.hpp_recommended_title, vertical)
+            // Create a new category for the recommendations
+            val recommendedCategory = StarterDesignCategory(
+                    slug = "recommended_$verticalSlug", // The slug is not used but should not already exist
+                    title = recommendedTitle,
+                    description = recommendedTitle,
+                    emoji = ""
+            )
+            val designsWithRecommendations = designs.map {
+                // Add the new category to the recommended designs so that they are filtered correctly
+                // in the `LayoutPickerViewModel.loadLayouts()` method
+                if (it.group.contains(verticalSlug)) {
+                    it.copy(categories = it.categories + recommendedCategory)
+                } else {
+                    it
+                }
+            }.toLayoutModels()
+            val categoriesWithRecommendations =
+                    listOf(recommendedCategory).toLayoutCategories(true) +
+                    categories.toLayoutCategories()
+            handleResponse(designsWithRecommendations, categoriesWithRecommendations)
+        } else {
+            // If no designs are recommended for the selected vertical recommend the blog category
+            val recommendedTitle = resourceProvider.getString(
+                    R.string.hpp_recommended_title,
+                    resourceProvider.getString(R.string.hpp_recommended_default_vertical)
+            )
+            val recommendedCategory = categories.firstOrNull { it.slug == "blog" }?.copy(
+                    title = recommendedTitle,
+                    description = recommendedTitle
+            )
+            if (recommendedCategory == null) {
+                // If there is no blog category do not show a recommendation
+                handleResponse(designs.toLayoutModels(), categories.toLayoutCategories())
+            } else {
+                val categoriesWithRecommendations =
+                        listOf(recommendedCategory).toLayoutCategories(true) +
+                        categories.toLayoutCategories()
+                handleResponse(designs.toLayoutModels(), categoriesWithRecommendations)
+            }
+        }
+    }
+
+    private fun getVerticalSlug(vertical: String): String? {
+        val slugsArray = resourceProvider.getStringArray(R.array.site_creation_intents_slugs)
+        val verticalArray = resourceProvider.getStringArray(R.array.site_creation_intents_strings)
+        if (slugsArray.size != verticalArray.size) {
+            throw IllegalStateException("Intents arrays size mismatch")
+        }
+        return slugsArray.getOrNull(verticalArray.indexOf(vertical))
     }
 
     override fun onLayoutTapped(layoutSlug: String) {

From 9677bb992baf9d940fdfb571bab1df7436f630df Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Tue, 10 May 2022 17:27:06 +0300
Subject: [PATCH 047/111] Extracts the recommendation logic to a separate file

---
 .../theme/HomePagePickerViewModel.kt          | 76 ++-----------------
 .../theme/SiteDesignRecommendationProvider.kt | 76 +++++++++++++++++++
 .../theme/HomePagePickerViewModelTest.kt      |  4 +-
 3 files changed, 86 insertions(+), 70 deletions(-)
 create mode 100644 WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignRecommendationProvider.kt

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
index 5e0d38dfcb4d..8a09517a0d2c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
@@ -5,8 +5,6 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import org.wordpress.android.R
 import org.wordpress.android.fluxc.Dispatcher
-import org.wordpress.android.fluxc.network.rest.wpcom.theme.StarterDesign
-import org.wordpress.android.fluxc.network.rest.wpcom.theme.StarterDesignCategory
 import org.wordpress.android.modules.BG_THREAD
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.sitecreation.misc.SiteCreationErrorType.INTERNET_UNAVAILABLE_ERROR
@@ -16,11 +14,8 @@ import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState.Content
 import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState.Loading
 import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState.Error
 import org.wordpress.android.ui.layoutpicker.LayoutPickerViewModel
-import org.wordpress.android.ui.layoutpicker.toLayoutCategories
-import org.wordpress.android.ui.layoutpicker.toLayoutModels
 import org.wordpress.android.ui.sitecreation.usecases.FetchHomePageLayoutsUseCase
 import org.wordpress.android.util.NetworkUtilsWrapper
-import org.wordpress.android.viewmodel.ResourceProvider
 import org.wordpress.android.viewmodel.SingleLiveEvent
 import javax.inject.Inject
 import javax.inject.Named
@@ -36,7 +31,7 @@ class HomePagePickerViewModel @Inject constructor(
     private val analyticsTracker: SiteCreationTracker,
     @Named(BG_THREAD) override val bgDispatcher: CoroutineDispatcher,
     @Named(UI_THREAD) override val mainDispatcher: CoroutineDispatcher,
-    private val resourceProvider: ResourceProvider
+    private val recommendationProvider: SiteDesignRecommendationProvider
 ) : LayoutPickerViewModel(mainDispatcher, bgDispatcher, networkUtils, analyticsTracker) {
     private val _onDesignActionPressed = SingleLiveEvent<DesignSelectionAction>()
     val onDesignActionPressed: LiveData<DesignSelectionAction> = _onDesignActionPressed
@@ -88,74 +83,17 @@ class HomePagePickerViewModel @Inject constructor(
                     analyticsTracker.trackErrorShown(ERROR_CONTEXT, UNKNOWN, "Error fetching designs")
                     updateUiState(Error())
                 } else {
-                    handleResponseWithRecommendations(vertical, event.designs, event.categories)
+                    recommendationProvider.handleResponse(
+                            vertical,
+                            event.designs,
+                            event.categories,
+                            this@HomePagePickerViewModel::handleResponse
+                    )
                 }
             }
         }
     }
 
-    private fun handleResponseWithRecommendations(
-        vertical: String,
-        designs: List<StarterDesign>,
-        categories: List<StarterDesignCategory>
-    ) {
-        val verticalSlug: String? = if (vertical.isNullOrEmpty()) null else getVerticalSlug(vertical)
-        val hasRecommendations = !verticalSlug.isNullOrEmpty() &&
-                designs.any { it.group != null && it.group.contains(verticalSlug) }
-
-        if (hasRecommendations) {
-            val recommendedTitle = resourceProvider.getString(R.string.hpp_recommended_title, vertical)
-            // Create a new category for the recommendations
-            val recommendedCategory = StarterDesignCategory(
-                    slug = "recommended_$verticalSlug", // The slug is not used but should not already exist
-                    title = recommendedTitle,
-                    description = recommendedTitle,
-                    emoji = ""
-            )
-            val designsWithRecommendations = designs.map {
-                // Add the new category to the recommended designs so that they are filtered correctly
-                // in the `LayoutPickerViewModel.loadLayouts()` method
-                if (it.group.contains(verticalSlug)) {
-                    it.copy(categories = it.categories + recommendedCategory)
-                } else {
-                    it
-                }
-            }.toLayoutModels()
-            val categoriesWithRecommendations =
-                    listOf(recommendedCategory).toLayoutCategories(true) +
-                    categories.toLayoutCategories()
-            handleResponse(designsWithRecommendations, categoriesWithRecommendations)
-        } else {
-            // If no designs are recommended for the selected vertical recommend the blog category
-            val recommendedTitle = resourceProvider.getString(
-                    R.string.hpp_recommended_title,
-                    resourceProvider.getString(R.string.hpp_recommended_default_vertical)
-            )
-            val recommendedCategory = categories.firstOrNull { it.slug == "blog" }?.copy(
-                    title = recommendedTitle,
-                    description = recommendedTitle
-            )
-            if (recommendedCategory == null) {
-                // If there is no blog category do not show a recommendation
-                handleResponse(designs.toLayoutModels(), categories.toLayoutCategories())
-            } else {
-                val categoriesWithRecommendations =
-                        listOf(recommendedCategory).toLayoutCategories(true) +
-                        categories.toLayoutCategories()
-                handleResponse(designs.toLayoutModels(), categoriesWithRecommendations)
-            }
-        }
-    }
-
-    private fun getVerticalSlug(vertical: String): String? {
-        val slugsArray = resourceProvider.getStringArray(R.array.site_creation_intents_slugs)
-        val verticalArray = resourceProvider.getStringArray(R.array.site_creation_intents_strings)
-        if (slugsArray.size != verticalArray.size) {
-            throw IllegalStateException("Intents arrays size mismatch")
-        }
-        return slugsArray.getOrNull(verticalArray.indexOf(vertical))
-    }
-
     override fun onLayoutTapped(layoutSlug: String) {
         (uiState.value as? Content)?.let {
             if (it.loadedThumbnailSlugs.contains(layoutSlug)) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignRecommendationProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignRecommendationProvider.kt
new file mode 100644
index 000000000000..3441b58e2522
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignRecommendationProvider.kt
@@ -0,0 +1,76 @@
+package org.wordpress.android.ui.sitecreation.theme
+
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.network.rest.wpcom.theme.StarterDesign
+import org.wordpress.android.fluxc.network.rest.wpcom.theme.StarterDesignCategory
+import org.wordpress.android.ui.layoutpicker.LayoutCategoryModel
+import org.wordpress.android.ui.layoutpicker.LayoutModel
+import org.wordpress.android.ui.layoutpicker.toLayoutCategories
+import org.wordpress.android.ui.layoutpicker.toLayoutModels
+import org.wordpress.android.viewmodel.ResourceProvider
+import javax.inject.Inject
+
+class SiteDesignRecommendationProvider @Inject constructor(private val resourceProvider: ResourceProvider) {
+    fun handleResponse(
+        vertical: String,
+        designs: List<StarterDesign>,
+        categories: List<StarterDesignCategory>,
+        responseHandler: (layouts: List<LayoutModel>, categories: List<LayoutCategoryModel>) -> Unit
+    ) {
+        val verticalSlug: String? = if (vertical.isNullOrEmpty()) null else getVerticalSlug(vertical)
+        val hasRecommendations = !verticalSlug.isNullOrEmpty() &&
+                designs.any { it.group != null && it.group.contains(verticalSlug) }
+
+        if (hasRecommendations) {
+            val recommendedTitle = resourceProvider.getString(R.string.hpp_recommended_title, vertical)
+            // Create a new category for the recommendations
+            val recommendedCategory = StarterDesignCategory(
+                    slug = "recommended_$verticalSlug", // The slug is not used but should not already exist
+                    title = recommendedTitle,
+                    description = recommendedTitle,
+                    emoji = ""
+            )
+            val designsWithRecommendations = designs.map {
+                // Add the new category to the recommended designs so that they are filtered correctly
+                // in the `LayoutPickerViewModel.loadLayouts()` method
+                if (it.group.contains(verticalSlug)) {
+                    it.copy(categories = it.categories + recommendedCategory)
+                } else {
+                    it
+                }
+            }.toLayoutModels()
+            val categoriesWithRecommendations =
+                    listOf(recommendedCategory).toLayoutCategories(true) +
+                            categories.toLayoutCategories()
+            responseHandler(designsWithRecommendations, categoriesWithRecommendations)
+        } else {
+            // If no designs are recommended for the selected vertical recommend the blog category
+            val recommendedTitle = resourceProvider.getString(
+                    R.string.hpp_recommended_title,
+                    resourceProvider.getString(R.string.hpp_recommended_default_vertical)
+            )
+            val recommendedCategory = categories.firstOrNull { it.slug == "blog" }?.copy(
+                    title = recommendedTitle,
+                    description = recommendedTitle
+            )
+            if (recommendedCategory == null) {
+                // If there is no blog category do not show a recommendation
+                responseHandler(designs.toLayoutModels(), categories.toLayoutCategories())
+            } else {
+                val categoriesWithRecommendations =
+                        listOf(recommendedCategory).toLayoutCategories(true) +
+                                categories.toLayoutCategories()
+                responseHandler(designs.toLayoutModels(), categoriesWithRecommendations)
+            }
+        }
+    }
+
+    private fun getVerticalSlug(vertical: String): String? {
+        val slugsArray = resourceProvider.getStringArray(R.array.site_creation_intents_slugs)
+        val verticalArray = resourceProvider.getStringArray(R.array.site_creation_intents_strings)
+        if (slugsArray.size != verticalArray.size) {
+            throw IllegalStateException("Intents arrays size mismatch")
+        }
+        return slugsArray.getOrNull(verticalArray.indexOf(vertical))
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
index 36fc67aebc11..49848a16a90c 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
@@ -56,6 +56,7 @@ class HomePagePickerViewModelTest {
     @Mock lateinit var analyticsTracker: SiteCreationTracker
     @Mock lateinit var resourceProvider: ResourceProvider
 
+    private lateinit var recommendationProvider: SiteDesignRecommendationProvider
     private lateinit var viewModel: HomePagePickerViewModel
 
     private val mockCategory = StarterDesignCategory(
@@ -67,6 +68,7 @@ class HomePagePickerViewModelTest {
 
     @Before
     fun setUp() {
+        recommendationProvider = SiteDesignRecommendationProvider(resourceProvider)
         viewModel = HomePagePickerViewModel(
                 networkUtils,
                 dispatcher,
@@ -74,7 +76,7 @@ class HomePagePickerViewModelTest {
                 analyticsTracker,
                 NoDelayCoroutineDispatcher(),
                 NoDelayCoroutineDispatcher(),
-                resourceProvider
+                recommendationProvider
         )
         viewModel.uiState.observeForever(uiStateObserver)
         viewModel.onDesignActionPressed.observeForever(onDesignActionObserver)

From fe387f413edd30e0e65ea5fb7986018988b063c5 Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Tue, 10 May 2022 17:27:36 +0300
Subject: [PATCH 048/111] Tests the recommended designs logic

---
 .../SiteDesignRecommendationProviderTest.kt   | 145 ++++++++++++++++++
 1 file changed, 145 insertions(+)
 create mode 100644 WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignRecommendationProviderTest.kt

diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignRecommendationProviderTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignRecommendationProviderTest.kt
new file mode 100644
index 000000000000..6ea4612c5469
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignRecommendationProviderTest.kt
@@ -0,0 +1,145 @@
+package org.wordpress.android.ui.sitecreation.theme
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.network.rest.wpcom.theme.StarterDesign
+import org.wordpress.android.fluxc.network.rest.wpcom.theme.StarterDesignCategory
+import org.wordpress.android.ui.layoutpicker.LayoutCategoryModel
+import org.wordpress.android.ui.layoutpicker.LayoutModel
+import org.wordpress.android.viewmodel.ResourceProvider
+
+@RunWith(MockitoJUnitRunner::class)
+@InternalCoroutinesApi
+class SiteDesignRecommendationProviderTest {
+    @Rule
+    @JvmField val rule = InstantTaskExecutorRule()
+
+    @Mock lateinit var resourceProvider: ResourceProvider
+
+    private lateinit var recommendationProvider: SiteDesignRecommendationProvider
+
+    private val mockedVerticalSlug = "mockedVerticalSlug"
+    private val mockedVerticalTitle = "mockedVerticalTitle"
+    private val recommendedDesignSlug = "recommendedDesignSlug"
+    private val blogCategory = StarterDesignCategory(
+            slug = "blog",
+            title = "Blog",
+            description = "Blogging designs",
+            emoji = ""
+    )
+    private val anotherCategory = StarterDesignCategory(
+            slug = "another",
+            title = "Another",
+            description = "Random designs",
+            emoji = ""
+    )
+    private val blogDesign = StarterDesign(
+            "blog",
+            "title",
+            1L,
+            listOf(blogCategory),
+            "url",
+            "theme",
+            listOf("any"),
+            "desktopThumbnail",
+            "tabletThumbnail",
+            "mobileThumbnail"
+    )
+    private val anotherDesign = StarterDesign(
+            recommendedDesignSlug,
+            "title",
+            1L,
+            listOf(anotherCategory),
+            "url",
+            "theme",
+            listOf("any", mockedVerticalSlug),
+            "desktopThumbnail",
+            "tabletThumbnail",
+            "mobileThumbnail"
+    )
+    private val allDesigns = listOf(blogDesign, anotherDesign)
+    private val allCategories = listOf(blogCategory, anotherCategory)
+
+    private val slugsArray = arrayOf("art", "automotive", "beauty", mockedVerticalSlug)
+    private val verticalArray = arrayOf("Art", "Automotive", "Beauty", mockedVerticalTitle)
+
+    private class ResponseHandler {
+        var layouts: List<LayoutModel>? = null
+        var categories: List<LayoutCategoryModel>? = null
+        fun handle(layouts: List<LayoutModel>, categories: List<LayoutCategoryModel>) {
+            this.layouts = layouts
+            this.categories = categories
+        }
+    }
+
+    @Before
+    fun setUp() {
+        recommendationProvider = SiteDesignRecommendationProvider(resourceProvider)
+        whenever(resourceProvider.getString(any())).thenReturn("Blogging")
+        whenever(resourceProvider.getString(any(), any())).thenReturn("Best for Blogging")
+        whenever(resourceProvider.getStringArray(R.array.site_creation_intents_slugs)).thenReturn(slugsArray)
+        whenever(resourceProvider.getStringArray(R.array.site_creation_intents_strings)).thenReturn(verticalArray)
+    }
+
+    @Test
+    fun `when no vertical is selected the blog category is recommended`() {
+        val handler = ResponseHandler()
+        recommendationProvider.handleResponse("", allDesigns, allCategories, handler::handle)
+        assertThat(requireNotNull(handler.categories?.filter { it.isRecommended }?.size)).isEqualTo(1)
+        assertThat(requireNotNull(handler.categories?.first()?.isRecommended)).isEqualTo(true)
+        assertThat(requireNotNull(handler.categories?.first()?.slug)).isEqualTo(blogCategory.slug)
+    }
+
+    @Test
+    fun `when a vertical is selected and there are no recommendations, the blog category is recommended`() {
+        val handler = ResponseHandler()
+        recommendationProvider.handleResponse("art", allDesigns, allCategories, handler::handle)
+        assertThat(requireNotNull(handler.categories?.filter { it.isRecommended }?.size)).isEqualTo(1)
+        assertThat(requireNotNull(handler.categories?.first()?.isRecommended)).isEqualTo(true)
+        assertThat(requireNotNull(handler.categories?.first()?.slug)).isEqualTo(blogCategory.slug)
+    }
+
+    @Test
+    fun `when a vertical is selected and there are recommendations, a recommended category is created`() {
+        val handler = ResponseHandler()
+        recommendationProvider.handleResponse(mockedVerticalTitle, allDesigns, allCategories, handler::handle)
+        assertThat(requireNotNull(handler.categories?.filter { it.isRecommended }?.size)).isEqualTo(1)
+        assertThat(requireNotNull(handler.categories?.first()?.isRecommended)).isEqualTo(true)
+        assertThat(requireNotNull(handler.categories?.first()?.slug)).isEqualTo("recommended_$mockedVerticalSlug")
+    }
+
+    @Test
+    fun `when a vertical is selected the associated design is recommended`() {
+        val handler = ResponseHandler()
+        recommendationProvider.handleResponse(mockedVerticalTitle, allDesigns, allCategories, handler::handle)
+        assertThat(requireNotNull(handler.layouts?.filter { it.slug == recommendedDesignSlug }?.size)).isEqualTo(1)
+    }
+
+    @Test
+    fun `when no vertical is selected and there is no blog category skip the recommendation`() {
+        val handler = ResponseHandler()
+        val noBlogDesigns = listOf(anotherDesign)
+        val noBlogCategories = listOf(anotherCategory)
+        recommendationProvider.handleResponse("", noBlogDesigns, noBlogCategories, handler::handle)
+        assertThat(requireNotNull(handler.categories?.filter { it.isRecommended }?.size)).isEqualTo(0)
+    }
+
+    @Test
+    fun `when a vertical is selected and there are no recommendations or blog category skip the recommendation`() {
+        val handler = ResponseHandler()
+        val noBlogDesigns = listOf(anotherDesign)
+        val noBlogCategories = listOf(anotherCategory)
+        recommendationProvider.handleResponse("art", noBlogDesigns, noBlogCategories, handler::handle)
+        assertThat(requireNotNull(handler.categories?.filter { it.isRecommended }?.size)).isEqualTo(0)
+    }
+}

From 0052838632801df40dab6e359046587b7349bac6 Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Thu, 12 May 2022 09:55:42 +0300
Subject: [PATCH 049/111] Adds a mechanism for randomising the order of layouts
 in specific categories

---
 .../android/ui/layoutpicker/LayoutCategoryModel.kt  | 13 ++++++++++---
 .../ui/layoutpicker/LayoutPickerViewModel.kt        | 13 +++++++++++--
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryModel.kt
index d0ab70af2e29..95a300198517 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryModel.kt
@@ -11,7 +11,8 @@ import org.wordpress.android.fluxc.network.rest.wpcom.theme.StarterDesignCategor
 class LayoutCategoryModel(
     private val starterDesignCategory: StarterDesignCategory? = null,
     private val blockLayoutCategory: GutenbergLayoutCategory? = null,
-    val isRecommended: Boolean = false
+    val isRecommended: Boolean = false,
+    val randomizeOrder: Boolean = false
 ) : Parcelable {
     val slug: String
         get() = starterDesignCategory?.slug ?: blockLayoutCategory?.slug ?: ""
@@ -24,8 +25,14 @@ class LayoutCategoryModel(
 }
 
 @JvmName("starterDesignToLayoutCategories")
-fun List<StarterDesignCategory>.toLayoutCategories(recommended: Boolean = false) =
-        map { LayoutCategoryModel(starterDesignCategory = it, isRecommended = recommended) }
+fun List<StarterDesignCategory>.toLayoutCategories(recommended: Boolean = false, randomizeOrder: Boolean = false) =
+        map {
+            LayoutCategoryModel(
+                    starterDesignCategory = it,
+                    isRecommended = recommended,
+                    randomizeOrder = randomizeOrder
+            )
+        }
 
 @JvmName("gutenbergLayoutToLayoutCategories")
 fun List<GutenbergLayoutCategory>.toLayoutCategories() = map { LayoutCategoryModel(blockLayoutCategory = it) }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
index ef43a92b8f6e..1f073a9cf409 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
@@ -69,6 +69,9 @@ abstract class LayoutPickerViewModel(
 
     var nestedScrollStates: Bundle = Bundle()
 
+    // Map that holds the ordered/randomised layouts list per category (key: slug)
+    val orderedLayouts: MutableMap<String, List<LayoutModel>> = mutableMapOf()
+
     abstract fun fetchLayouts(preferCache: Boolean = false)
 
     open fun onPreviewChooseTapped() = onDismissPreview()
@@ -155,8 +158,14 @@ abstract class LayoutPickerViewModel(
             }
 
             selectedCategories.forEach { category ->
-
-                val layouts = layouts.getFilteredLayouts(category.slug).map { layout ->
+                val ordered = orderedLayouts[category.slug] ?: if (category.randomizeOrder) {
+                    val randomised = layouts.getFilteredLayouts(category.slug).shuffled()
+                    orderedLayouts[category.slug] = randomised
+                    randomised
+                } else {
+                    layouts.getFilteredLayouts(category.slug)
+                }
+                val layouts = ordered.map { layout ->
                     val preview = when (_previewMode.value) {
                         MOBILE -> layout.previewMobile
                         TABLET -> layout.previewTablet

From 29060b907748661ae91103c3a8f2b40a9131d358 Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Thu, 12 May 2022 09:56:35 +0300
Subject: [PATCH 050/111] Randomises the order of site designs except for the
 recommended category

---
 .../theme/SiteDesignRecommendationProvider.kt          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignRecommendationProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignRecommendationProvider.kt
index 3441b58e2522..6d2b1ce7bd46 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignRecommendationProvider.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignRecommendationProvider.kt
@@ -40,8 +40,8 @@ class SiteDesignRecommendationProvider @Inject constructor(private val resourceP
                 }
             }.toLayoutModels()
             val categoriesWithRecommendations =
-                    listOf(recommendedCategory).toLayoutCategories(true) +
-                            categories.toLayoutCategories()
+                    listOf(recommendedCategory).toLayoutCategories(recommended = true) +
+                            categories.toLayoutCategories(randomizeOrder = true)
             responseHandler(designsWithRecommendations, categoriesWithRecommendations)
         } else {
             // If no designs are recommended for the selected vertical recommend the blog category
@@ -55,11 +55,11 @@ class SiteDesignRecommendationProvider @Inject constructor(private val resourceP
             )
             if (recommendedCategory == null) {
                 // If there is no blog category do not show a recommendation
-                responseHandler(designs.toLayoutModels(), categories.toLayoutCategories())
+                responseHandler(designs.toLayoutModels(), categories.toLayoutCategories(randomizeOrder = true))
             } else {
                 val categoriesWithRecommendations =
-                        listOf(recommendedCategory).toLayoutCategories(true) +
-                                categories.toLayoutCategories()
+                        listOf(recommendedCategory).toLayoutCategories(recommended = true, randomizeOrder = true) +
+                                categories.toLayoutCategories(randomizeOrder = true)
                 responseHandler(designs.toLayoutModels(), categoriesWithRecommendations)
             }
         }

From 69d9798838423f45189f543fcbf3600521c1ac3e Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Thu, 12 May 2022 10:12:06 +0300
Subject: [PATCH 051/111] Also save the ordered layouts per category for
 efficiency

---
 .../android/ui/layoutpicker/LayoutPickerViewModel.kt          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
index 1f073a9cf409..a9e9b08e0f8f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
@@ -163,7 +163,9 @@ abstract class LayoutPickerViewModel(
                     orderedLayouts[category.slug] = randomised
                     randomised
                 } else {
-                    layouts.getFilteredLayouts(category.slug)
+                    val ordered = layouts.getFilteredLayouts(category.slug)
+                    orderedLayouts[category.slug] = ordered
+                    ordered
                 }
                 val layouts = ordered.map { layout ->
                     val preview = when (_previewMode.value) {

From 9daa723f858963d576fe842eb9cf2e2e4bfb1f6c Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Thu, 12 May 2022 10:21:56 +0300
Subject: [PATCH 052/111] Unit tests for which categories should be randomised

---
 .../theme/SiteDesignRecommendationProviderTest.kt      | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignRecommendationProviderTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignRecommendationProviderTest.kt
index 6ea4612c5469..e21a280c14a0 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignRecommendationProviderTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/SiteDesignRecommendationProviderTest.kt
@@ -91,12 +91,20 @@ class SiteDesignRecommendationProviderTest {
         whenever(resourceProvider.getStringArray(R.array.site_creation_intents_strings)).thenReturn(verticalArray)
     }
 
+    @Test
+    fun `All non recommended categories are randomised`() {
+        val handler = ResponseHandler()
+        recommendationProvider.handleResponse("", allDesigns, allCategories, handler::handle)
+        assertThat(requireNotNull(handler.categories?.filter { !it.isRecommended })).allMatch { it.randomizeOrder }
+    }
+
     @Test
     fun `when no vertical is selected the blog category is recommended`() {
         val handler = ResponseHandler()
         recommendationProvider.handleResponse("", allDesigns, allCategories, handler::handle)
         assertThat(requireNotNull(handler.categories?.filter { it.isRecommended }?.size)).isEqualTo(1)
         assertThat(requireNotNull(handler.categories?.first()?.isRecommended)).isEqualTo(true)
+        assertThat(requireNotNull(handler.categories?.first()?.randomizeOrder)).isEqualTo(true)
         assertThat(requireNotNull(handler.categories?.first()?.slug)).isEqualTo(blogCategory.slug)
     }
 
@@ -106,6 +114,7 @@ class SiteDesignRecommendationProviderTest {
         recommendationProvider.handleResponse("art", allDesigns, allCategories, handler::handle)
         assertThat(requireNotNull(handler.categories?.filter { it.isRecommended }?.size)).isEqualTo(1)
         assertThat(requireNotNull(handler.categories?.first()?.isRecommended)).isEqualTo(true)
+        assertThat(requireNotNull(handler.categories?.first()?.randomizeOrder)).isEqualTo(true)
         assertThat(requireNotNull(handler.categories?.first()?.slug)).isEqualTo(blogCategory.slug)
     }
 
@@ -115,6 +124,7 @@ class SiteDesignRecommendationProviderTest {
         recommendationProvider.handleResponse(mockedVerticalTitle, allDesigns, allCategories, handler::handle)
         assertThat(requireNotNull(handler.categories?.filter { it.isRecommended }?.size)).isEqualTo(1)
         assertThat(requireNotNull(handler.categories?.first()?.isRecommended)).isEqualTo(true)
+        assertThat(requireNotNull(handler.categories?.first()?.randomizeOrder)).isEqualTo(false)
         assertThat(requireNotNull(handler.categories?.first()?.slug)).isEqualTo("recommended_$mockedVerticalSlug")
     }
 

From e0980a7afce0dbe2dc945c7382681ca9fa614d37 Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Thu, 12 May 2022 17:31:45 +0300
Subject: [PATCH 053/111] Unselect the layout after the choose action if fired

---
 .../android/ui/sitecreation/theme/HomePagePickerViewModel.kt   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
index 8a09517a0d2c..c0154afaab88 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
@@ -105,13 +105,12 @@ class HomePagePickerViewModel @Inject constructor(
     }
 
     override fun onPreviewChooseTapped() {
-        super.onPreviewChooseTapped()
         onChooseTapped()
     }
 
     fun onChooseTapped() {
-        // TODO: adapt this to the new flow
         selectedLayout?.let { layout ->
+            super.onPreviewChooseTapped()
             val template = layout.slug
             analyticsTracker.trackSiteDesignSelected(template)
             _onDesignActionPressed.value = DesignSelectionAction.Choose(template)

From 3ddba5e31a9ac6dec06dc1f6dd592aadfdcbf025 Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Fri, 13 May 2022 07:29:50 +0300
Subject: [PATCH 054/111] Adds recommended property in the
 enhanced_site_creation_site_design_selected event

---
 .../ui/layoutpicker/LayoutPickerUiState.kt     |  1 +
 .../ui/layoutpicker/LayoutPickerViewModel.kt   |  4 ++--
 .../sitecreation/misc/SiteCreationTracker.kt   |  8 +++++---
 .../theme/HomePagePickerViewModel.kt           |  7 ++++---
 .../theme/HomePagePickerViewModelTest.kt       | 18 ++++++++++++++++++
 5 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerUiState.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerUiState.kt
index 44f2dbb00651..8f39db02d30a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerUiState.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerUiState.kt
@@ -17,6 +17,7 @@ sealed class LayoutPickerUiState(
         override val isToolbarVisible: Boolean = false,
         val selectedCategoriesSlugs: ArrayList<String> = arrayListOf(),
         val selectedLayoutSlug: String? = null,
+        val isSelectedLayoutRecommended: Boolean = false,
         val loadedThumbnailSlugs: ArrayList<String> = arrayListOf(),
         val categories: List<CategoryListItemUiState> = listOf(),
         val layoutCategories: List<LayoutCategoryUiState> = listOf(),
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
index ef43a92b8f6e..c42a9af6b8f0 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
@@ -170,7 +170,7 @@ abstract class LayoutPickerViewModel(
                             mShotPreview = thumbnailPreview,
                             selected = layout.slug == state.selectedLayoutSlug,
                             tapOpensPreview = thumbnailTapOpensPreview,
-                            onItemTapped = { onLayoutTapped(layoutSlug = layout.slug) },
+                            onItemTapped = { onLayoutTapped(layoutSlug = layout.slug, category.isRecommended) },
                             onThumbnailReady = { onThumbnailReady(layoutSlug = layout.slug) }
                     )
                 }
@@ -194,7 +194,7 @@ abstract class LayoutPickerViewModel(
      * Layout tapped
      * @param layoutSlug the slug of the tapped layout
      */
-    open fun onLayoutTapped(layoutSlug: String) {
+    open fun onLayoutTapped(layoutSlug: String, isRecommended: Boolean = false) {
         (uiState.value as? Content)?.let { state ->
             if (!state.loadedThumbnailSlugs.contains(layoutSlug)) return // No action
             if (layoutSlug == state.selectedLayoutSlug) { // deselect
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
index 33423b588c96..09f2fd446f3e 100644
--- 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
@@ -9,6 +9,7 @@ import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker.PROPERTY.C
 import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker.PROPERTY.FILTER
 import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker.PROPERTY.LOCATION
 import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker.PROPERTY.PREVIEW_MODE
+import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker.PROPERTY.RECOMMENDED
 import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker.PROPERTY.SEARCH_TERM
 import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker.PROPERTY.SEGMENT_ID
 import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker.PROPERTY.SEGMENT_NAME
@@ -47,7 +48,8 @@ class SiteCreationTracker @Inject constructor(val tracker: AnalyticsTrackerWrapp
         SELECTED_FILTERS("selected_filters"),
         VERTICAL_SLUG("vertical_slug"),
         VARIATION("variation"),
-        SITE_NAME("site_name")
+        SITE_NAME("site_name"),
+        RECOMMENDED("recommended")
     }
 
     private var designSelectionSkipped: Boolean = false
@@ -172,11 +174,11 @@ class SiteCreationTracker @Inject constructor(val tracker: AnalyticsTrackerWrapp
         tracker.track(AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SITE_DESIGN_SKIPPED)
     }
 
-    fun trackSiteDesignSelected(template: String) {
+    fun trackSiteDesignSelected(template: String, recommended: Boolean) {
         designSelectionSkipped = false
         tracker.track(
                 AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SITE_DESIGN_SELECTED,
-                mapOf(TEMPLATE.key to template)
+                mapOf(TEMPLATE.key to template, RECOMMENDED.key to recommended)
         )
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
index c0154afaab88..5e4416c8c1f7 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
@@ -94,10 +94,10 @@ class HomePagePickerViewModel @Inject constructor(
         }
     }
 
-    override fun onLayoutTapped(layoutSlug: String) {
+    override fun onLayoutTapped(layoutSlug: String, isRecommended: Boolean) {
         (uiState.value as? Content)?.let {
             if (it.loadedThumbnailSlugs.contains(layoutSlug)) {
-                updateUiState(it.copy(selectedLayoutSlug = layoutSlug))
+                updateUiState(it.copy(selectedLayoutSlug = layoutSlug, isSelectedLayoutRecommended = isRecommended))
                 onPreviewTapped()
                 loadLayouts()
             }
@@ -112,7 +112,8 @@ class HomePagePickerViewModel @Inject constructor(
         selectedLayout?.let { layout ->
             super.onPreviewChooseTapped()
             val template = layout.slug
-            analyticsTracker.trackSiteDesignSelected(template)
+            val isRecommended = (uiState.value as? Content)?.isSelectedLayoutRecommended == true
+            analyticsTracker.trackSiteDesignSelected(template, isRecommended)
             _onDesignActionPressed.value = DesignSelectionAction.Choose(template)
             return
         }
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
index 49848a16a90c..9d71fe54a6cd 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
@@ -214,4 +214,22 @@ class HomePagePickerViewModelTest {
         verify(onDesignActionObserver).onChanged(captor.capture())
         assertThat(captor.value.template).isEqualTo(mockedDesignSlug)
     }
+
+    @Test
+    fun `when the user chooses a recommended design the recommended information is emitted`() = mockResponse {
+        viewModel.start()
+        viewModel.onThumbnailReady(mockedDesignSlug)
+        viewModel.onLayoutTapped(mockedDesignSlug, true)
+        viewModel.onPreviewChooseTapped()
+        verify(analyticsTracker).trackSiteDesignSelected(mockedDesignSlug, true)
+    }
+
+    @Test
+    fun `when the user chooses a design that is not recommended the correct information is emitted`() = mockResponse {
+        viewModel.start()
+        viewModel.onThumbnailReady(mockedDesignSlug)
+        viewModel.onLayoutTapped(mockedDesignSlug, false)
+        viewModel.onPreviewChooseTapped()
+        verify(analyticsTracker).trackSiteDesignSelected(mockedDesignSlug, false)
+    }
 }

From 91c1cab1f0149c20f42b28e063f2f7dea56bfffd Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Fri, 13 May 2022 08:19:58 +0300
Subject: [PATCH 055/111] Hides keyboard on back

---
 .../wordpress/android/ui/sitecreation/SiteCreationActivity.kt    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
index 08a598017460..b9c4276453f7 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
@@ -124,6 +124,7 @@ class SiteCreationActivity : LocaleAwareActivity(),
             finish()
         })
         mainViewModel.onBackPressedObservable.observe(this, Observer {
+            ActivityUtils.hideKeyboard(this)
             super.onBackPressed()
         })
         siteCreationIntentsViewModel.onBackButtonPressed.observe(this, Observer {

From db502a2e1903dfa9cf1079394ce1e442fff08ffd Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Mon, 9 May 2022 18:34:59 +1000
Subject: [PATCH 056/111] Add bottom helper text to theme picker

This implements an optional footer parameter to layouts recycle view,
useful for working around scroll issues in the screen where it is used.
It introduces a new abstraction `LayoutRowViewHolder` from which
`LayoutItemViewHolder` and `LayoutFooterViewHolder` extend.

The footer is inflated when needed from the passed resource id (the
overriden item count is incremented when not null).

It also adds the footer as a `LayoutCategoryViewType` so that it isn't
mixed with the regular items during view recycling.
---
 .../ui/layoutpicker/LayoutCategoryAdapter.kt  | 41 ++++++++++++-------
 ...mViewHolder.kt => LayoutsRowViewHolder.kt} |  9 +++-
 .../theme/HomePagePickerFragment.kt           |  6 ++-
 .../res/layout/home_page_picker_footer.xml    | 21 ++++++++++
 WordPress/src/main/res/values/strings.xml     |  1 +
 5 files changed, 61 insertions(+), 17 deletions(-)
 rename WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/{LayoutsItemViewHolder.kt => LayoutsRowViewHolder.kt} (91%)
 create mode 100644 WordPress/src/main/res/layout/home_page_picker_footer.xml

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
index 3883229f53ef..a05a0b3e02cc 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
@@ -5,11 +5,13 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView.Adapter
 import org.wordpress.android.ui.layoutpicker.LayoutCategoryViewType.DEFAULT
+import org.wordpress.android.ui.layoutpicker.LayoutCategoryViewType.FOOTER
 import org.wordpress.android.ui.layoutpicker.LayoutCategoryViewType.RECOMMENDED
 
 enum class LayoutCategoryViewType {
     DEFAULT,
     RECOMMENDED,
+    FOOTER,
 }
 
 /**
@@ -19,8 +21,9 @@ class LayoutCategoryAdapter(
     private var nestedScrollStates: Bundle,
     private val thumbDimensionProvider: ThumbDimensionProvider,
     private val recommendedDimensionProvider: ThumbDimensionProvider? = null,
-    private val showRowDividers: Boolean = true
-) : Adapter<LayoutsItemViewHolder>() {
+    private val showRowDividers: Boolean = true,
+    private val footerLayoutResId: Int? = null
+) : Adapter<LayoutsRowViewHolder>() {
     private var items: List<LayoutCategoryUiState> = listOf()
 
     fun update(newItems: List<LayoutCategoryUiState>) {
@@ -34,29 +37,37 @@ class LayoutCategoryAdapter(
         diffResult.dispatchUpdatesTo(this)
     }
 
-    override fun getItemCount(): Int = items.size
+    override fun getItemCount(): Int = items.size + if (footerLayoutResId != null) 1 else 0
 
-    override fun onBindViewHolder(holder: LayoutsItemViewHolder, position: Int) {
-        holder.bind(items[position])
+    override fun onBindViewHolder(holder: LayoutsRowViewHolder, position: Int) {
+        (holder as? LayoutsItemViewHolder)?.bind(items[position])
     }
 
     override fun getItemViewType(position: Int): Int {
-        return if (items[position].isRecommended) RECOMMENDED.ordinal else DEFAULT.ordinal
+        return when {
+            items.size <= position -> FOOTER.ordinal
+            items[position].isRecommended -> RECOMMENDED.ordinal
+            else -> DEFAULT.ordinal
+        }
     }
 
-    override fun onViewRecycled(holder: LayoutsItemViewHolder) {
+    override fun onViewRecycled(holder: LayoutsRowViewHolder) {
         super.onViewRecycled(holder)
-        holder.onRecycled()
+        (holder as? LayoutsItemViewHolder)?.onRecycled()
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
-            LayoutsItemViewHolder(
-                    parent = parent,
-                    nestedScrollStates = nestedScrollStates,
-                    thumbDimensionProvider = thumbDimensionProvider,
-                    recommendedDimensionProvider = recommendedDimensionProvider,
-                    showRowDividers = showRowDividers
-            )
+            when(viewType) {
+                FOOTER.ordinal -> LayoutsFooterViewHolder(parent, footerLayoutResId!!)
+                else ->
+                    LayoutsItemViewHolder(
+                            parent = parent,
+                            nestedScrollStates = nestedScrollStates,
+                            thumbDimensionProvider = thumbDimensionProvider,
+                            recommendedDimensionProvider = recommendedDimensionProvider,
+                            showRowDividers = showRowDividers
+                    )
+            }
 
     fun onRestoreInstanceState(savedInstanceState: Bundle) {
         nestedScrollStates = savedInstanceState
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt
similarity index 91%
rename from WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
rename to WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt
index bf617d1b6b9b..6bb2df979498 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt
@@ -14,6 +14,13 @@ import androidx.recyclerview.widget.RecyclerView.OnScrollListener
 import org.wordpress.android.R
 import org.wordpress.android.util.extensions.setVisible
 
+sealed class LayoutsRowViewHolder(view: View): RecyclerView.ViewHolder(view)
+
+class LayoutsFooterViewHolder(parent: ViewGroup, footerLayoutResId: Int):
+        LayoutsRowViewHolder(
+                LayoutInflater.from(parent.context).inflate(footerLayoutResId, parent, false)
+        )
+
 /**
  * Modal Layout Picker layouts view holder
  */
@@ -24,7 +31,7 @@ class LayoutsItemViewHolder(
     private var nestedScrollStates: Bundle,
     private val thumbDimensionProvider: ThumbDimensionProvider,
     private val recommendedDimensionProvider: ThumbDimensionProvider?
-) : RecyclerView.ViewHolder(
+): LayoutsRowViewHolder(
         LayoutInflater.from(
                 parent.context
         ).inflate(R.layout.modal_layout_picker_layouts_row, parent, false)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index c73537e416ee..45578fe3bbab 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -4,6 +4,8 @@ import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
 import android.view.ViewGroup
 import androidx.core.view.isGone
 import androidx.core.view.isInvisible
@@ -11,6 +13,7 @@ import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.appbar.AppBarLayout
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
@@ -69,7 +72,8 @@ class HomePagePickerFragment : Fragment() {
                         viewModel.nestedScrollStates,
                         thumbDimensionProvider,
                         recommendedDimensionProvider,
-                        showRowDividers = false
+                        showRowDividers = false,
+                        footerLayoutResId = R.layout.home_page_picker_footer
                 )
             }
 
diff --git a/WordPress/src/main/res/layout/home_page_picker_footer.xml b/WordPress/src/main/res/layout/home_page_picker_footer.xml
new file mode 100644
index 000000000000..dafdf9c8f437
--- /dev/null
+++ b/WordPress/src/main/res/layout/home_page_picker_footer.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/bottom_helper_text"
+        style="@style/ModalLayoutPickerSubtitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:drawableLeft="@drawable/ic_info_outline_grey_dark_18dp"
+        android:padding="16dp"
+        android:text="@string/hpp_bottom_helper_text"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index d863ace17a13..110680d655db 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -3382,6 +3382,7 @@
     <string name="hpp_recommended_title">Best for %s</string>
     <string name="hpp_recommended_subtitle">Picked for you</string>
     <string name="hpp_recommended_default_vertical">Blogging</string>
+    <string name="hpp_bottom_helper_text">Can\'t decide? You can change the theme at any time.</string>
 
     <!-- Stories -->
     <string name="dialog_edit_story_limited_title">Limited Story Editing</string>

From ab4b4c0ed237ce664cf780bab8ec993367b38872 Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Fri, 13 May 2022 18:01:25 +0300
Subject: [PATCH 057/111] Moves the site design picker loadSavedState call to
 the correct place

---
 .../wordpress/android/ui/sitecreation/SiteCreationActivity.kt | 1 -
 .../android/ui/sitecreation/theme/HomePagePickerFragment.kt   | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
index b9c4276453f7..5c659392831d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
@@ -76,7 +76,6 @@ class SiteCreationActivity : LocaleAwareActivity(),
                 .get(SiteCreationSiteNameViewModel::class.java)
         val siteCreationSource = intent.extras?.getString(ARG_CREATE_SITE_SOURCE)
         mainViewModel.start(savedInstanceState, SiteCreationSource.fromString(siteCreationSource))
-        hppViewModel.loadSavedState(savedInstanceState)
 
         observeVMState()
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index 68ac36c93b4f..c28977dd5684 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -63,6 +63,10 @@ class HomePagePickerFragment : Fragment() {
 
         viewModel = ViewModelProvider(requireActivity(), viewModelFactory).get(HomePagePickerViewModel::class.java)
 
+        savedInstanceState?.let {
+            viewModel.loadSavedState(it)
+        }
+
         with(HomePagePickerFragmentBinding.bind(view)) {
             modalLayoutPickerCategoriesSkeleton.root.isGone = true
             categoriesRecyclerView.isGone = true

From 8fe8fc850a6403c8f4139ec750714288a82055dd Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Fri, 13 May 2022 17:39:18 +0200
Subject: [PATCH 058/111] Fix screens title visibility on the new & updated
 site creation screens

---
 .../ui/sitecreation/sitename/SiteCreationSiteNameFragment.kt    | 1 -
 .../android/ui/sitecreation/theme/HomePagePickerFragment.kt     | 2 --
 .../ui/sitecreation/verticals/SiteCreationIntentsFragment.kt    | 2 --
 3 files changed, 5 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/sitename/SiteCreationSiteNameFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/sitename/SiteCreationSiteNameFragment.kt
index 700c85f516ea..e6484f2f4a2f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/sitename/SiteCreationSiteNameFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/sitename/SiteCreationSiteNameFragment.kt
@@ -80,7 +80,6 @@ class SiteCreationSiteNameFragment : Fragment() {
         siteCreationSiteNameHeader.title?.text = headerTitleWithIntentColoredBlueIfSpecified
         siteCreationSiteNameHeader.subtitle?.setText(R.string.new_site_creation_site_name_header_subtitle)
         siteCreationSiteNameTitlebar.appBarTitle.setText(R.string.new_site_creation_site_name_title)
-        siteCreationSiteNameTitlebar.appBarTitle.isInvisible = !displayUtils.isPhoneLandscape()
         viewModel.uiState.value?.siteName.let { input.setText(it) }
         input.requestFocus()
         ActivityUtils.showKeyboard(input)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index c28977dd5684..8f249271a573 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -6,7 +6,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isGone
-import androidx.core.view.isInvisible
 import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
@@ -87,7 +86,6 @@ class HomePagePickerFragment : Fragment() {
     }
 
     private fun HomePagePickerFragmentBinding.setupUi() {
-        homePagePickerTitlebar.title.isInvisible = !displayUtils.isPhoneLandscape()
         with(modalLayoutPickerHeaderSection) {
             modalLayoutPickerTitleRow?.header?.apply {
                 textAlignment = View.TEXT_ALIGNMENT_TEXT_START
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationIntentsFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationIntentsFragment.kt
index 63037bd67cd5..16132cffc8b5 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationIntentsFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationIntentsFragment.kt
@@ -5,7 +5,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.Fragment
@@ -68,7 +67,6 @@ class SiteCreationIntentsFragment : Fragment() {
     }
 
     private fun SiteCreationIntentsFragmentBinding.setupUi() {
-        siteCreationIntentsTitlebar.appBarTitle.isInvisible = !displayUtils.isPhoneLandscape()
         recyclerView.itemAnimator = null
         recyclerView.adapter = SiteCreationIntentsAdapter()
         siteCreationIntentsHeader.title?.setText(R.string.new_site_creation_intents_header_title)

From 3c6c94e916471e7e644ad7603e000e8c32ad371e Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Fri, 13 May 2022 19:21:17 +0300
Subject: [PATCH 059/111] Updates the UI on vertical change

---
 .../ui/sitecreation/theme/HomePagePickerViewModel.kt     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
index 5e4416c8c1f7..58e360d9e039 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
@@ -39,7 +39,7 @@ class HomePagePickerViewModel @Inject constructor(
     private val _onBackButtonPressed = SingleLiveEvent<Unit>()
     val onBackButtonPressed: LiveData<Unit> = _onBackButtonPressed
 
-    private lateinit var vertical: String
+    private var vertical: String = ""
 
     override val useCachedData: Boolean = false
     override val shouldUseMobileThumbnail = true
@@ -60,9 +60,12 @@ class HomePagePickerViewModel @Inject constructor(
     }
 
     fun start(intent: String? = null, isTablet: Boolean = false) {
-        vertical = intent ?: ""
+        val verticalChanged = vertical != intent
+        if (verticalChanged) {
+            vertical = intent ?: ""
+        }
         initializePreviewMode(isTablet)
-        if (uiState.value !is Content) {
+        if (uiState.value !is Content || verticalChanged) {
             analyticsTracker.trackSiteDesignViewed(selectedPreviewMode().key)
             fetchLayouts()
         }

From 18c2ac8509ace442367d2584fd085d7ddc139761 Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Fri, 13 May 2022 19:42:39 +0300
Subject: [PATCH 060/111] Adds unit test verifying that the vertical change
 triggers a reload

---
 .../theme/HomePagePickerViewModelTest.kt      | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
index 9d71fe54a6cd..e6ae08a3750d 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
@@ -18,6 +18,7 @@ import org.mockito.ArgumentCaptor
 import org.mockito.ArgumentMatchers.isA
 import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.R
 import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.network.rest.wpcom.theme.StarterDesign
 import org.wordpress.android.fluxc.network.rest.wpcom.theme.StarterDesignCategory
@@ -59,6 +60,9 @@ class HomePagePickerViewModelTest {
     private lateinit var recommendationProvider: SiteDesignRecommendationProvider
     private lateinit var viewModel: HomePagePickerViewModel
 
+    private val slugsArray = arrayOf("art", "food", "beauty")
+    private val verticalArray = arrayOf("Art", "Food", "Beauty")
+
     private val mockCategory = StarterDesignCategory(
             slug = "blog",
             title = "Blog",
@@ -112,6 +116,8 @@ class HomePagePickerViewModelTest {
         whenever(networkUtils.isNetworkAvailable()).thenReturn(true)
         whenever(resourceProvider.getString(any())).thenReturn("Blogging")
         whenever(resourceProvider.getString(any(), any())).thenReturn("Best for Blogging")
+        whenever(resourceProvider.getStringArray(R.array.site_creation_intents_slugs)).thenReturn(slugsArray)
+        whenever(resourceProvider.getStringArray(R.array.site_creation_intents_strings)).thenReturn(verticalArray)
         block()
     }
 
@@ -232,4 +238,24 @@ class HomePagePickerViewModelTest {
         viewModel.onPreviewChooseTapped()
         verify(analyticsTracker).trackSiteDesignSelected(mockedDesignSlug, false)
     }
+
+    @Test
+    fun `when the vertical changes the designs reload`() = mockResponse {
+        val expectedUiStateChangesOnEachLoad = 3
+        viewModel.start(intent = "Art")
+        viewModel.start(intent = "Food")
+        val captor = ArgumentCaptor.forClass(LayoutPickerUiState::class.java)
+        verify(uiStateObserver, times(expectedUiStateChangesOnEachLoad * 2)).onChanged(captor.capture())
+        assertThat(captor.value is LayoutPickerUiState.Content)
+    }
+
+    @Test
+    fun `when the vertical is the same the designs do not change`() = mockResponse {
+        val expectedUiStateChangesOnEachLoad = 3
+        viewModel.start(intent = "Art")
+        viewModel.start(intent = "Art")
+        val captor = ArgumentCaptor.forClass(LayoutPickerUiState::class.java)
+        verify(uiStateObserver, times(expectedUiStateChangesOnEachLoad)).onChanged(captor.capture())
+        assertThat(captor.value is LayoutPickerUiState.Content)
+    }
 }

From 9dbd048aa743c53231ebad8ce519591d6fe95402 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Sat, 14 May 2022 03:12:38 +0200
Subject: [PATCH 061/111] Align collapsing titles on site creation screens to
 textStart

---
 .../src/main/res/layout/site_creation_intents_titlebar.xml     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/WordPress/src/main/res/layout/site_creation_intents_titlebar.xml b/WordPress/src/main/res/layout/site_creation_intents_titlebar.xml
index af9b668f6f3c..1eae66ba7bd4 100644
--- a/WordPress/src/main/res/layout/site_creation_intents_titlebar.xml
+++ b/WordPress/src/main/res/layout/site_creation_intents_titlebar.xml
@@ -18,8 +18,7 @@
         style="@style/ModalLayoutPickerHeader"
         android:layout_width="0dp"
         android:layout_weight="1"
-        android:layout_marginStart="@dimen/siq_title_padding_start"
-        android:layout_marginEnd="0dp"
+        android:textAlignment="textStart"
         android:text="@string/new_site_creation_intents_title" />
 
     <Button

From eb9e6e26e7e4bc995d5092c32c0166e04c556086 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Sat, 14 May 2022 03:13:20 +0200
Subject: [PATCH 062/111] Align header title & subtitle on site creation
 screens to textStart

---
 .../res/layout/site_creation_header_v2.xml    |  6 ++--
 WordPress/src/main/res/values/styles.xml      | 28 +++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/WordPress/src/main/res/layout/site_creation_header_v2.xml b/WordPress/src/main/res/layout/site_creation_header_v2.xml
index 932f3509387f..7241e9878734 100644
--- a/WordPress/src/main/res/layout/site_creation_header_v2.xml
+++ b/WordPress/src/main/res/layout/site_creation_header_v2.xml
@@ -8,7 +8,7 @@
 
     <org.wordpress.android.widgets.WPTextView
         android:id="@+id/title"
-        style="@style/ModalLayoutPickerTitle"
+        style="@style/SiteCreationHeaderV2Title"
         android:lineSpacingExtra="-4sp"
         android:letterSpacing="0.01"
         android:paddingBottom="@dimen/margin_large"
@@ -18,7 +18,9 @@
 
     <org.wordpress.android.widgets.WPTextView
         android:id="@+id/subtitle"
-        style="@style/ModalLayoutPickerSubtitle"
+        style="@style/SiteCreationHeaderV2Subtitle"
+        android:layout_marginEnd="@dimen/margin_none"
+        android:layout_marginStart="@dimen/margin_none"
         android:paddingBottom="@dimen/margin_extra_medium_large"
         android:lineSpacingExtra="5sp"
         android:letterSpacing="0.01"
diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml
index 0f98f5730a2b..0da75bfa0b23 100644
--- a/WordPress/src/main/res/values/styles.xml
+++ b/WordPress/src/main/res/values/styles.xml
@@ -1488,6 +1488,34 @@
         <item name="android:paddingBottom">@dimen/margin_small_medium</item>
     </style>
 
+    <!-- Site Creation Header Styles -->
+
+    <style name="SiteCreationHeaderV2Text">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textAlignment">textStart</item>
+        <item name="android:textColor">?attr/colorOnSurface</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
+    <style name="SiteCreationHeaderV2Title" parent="SiteCreationHeaderV2Text">
+        <item name="android:paddingTop">@dimen/mlp_titles_top_margin</item>
+        <item name="android:paddingBottom">@dimen/margin_small_medium</item>
+        <item name="android:textAppearance">?attr/textAppearanceHeadline4</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:maxLines">3</item>
+        <item name="fontFamily">serif</item>
+    </style>
+
+    <style name="SiteCreationHeaderV2Subtitle" parent="SiteCreationHeaderV2Text">
+        <item name="android:paddingTop">@dimen/margin_small</item>
+        <item name="android:paddingBottom">@dimen/mlp_titles_bottom_margin</item>
+        <item name="android:textAppearance">?attr/textAppearanceBody1</item>
+        <item name="android:maxLines">5</item>
+        <item name="android:alpha">0.6</item>
+        <item name="fontFamily">sans-serif</item>
+    </style>
+
     <!-- Modal Layout Picker Styles -->
 
     <style name="ModalLayoutPickerText">

From af3d168af61fb146a6d0ad75eee1ce4090b71670 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Sat, 14 May 2022 03:14:16 +0200
Subject: [PATCH 063/111] Use site creation header v2 in site theme screen for
 consistency

---
 .../ui/sitecreation/theme/HomePagePickerFragment.kt   | 11 +++--------
 .../src/main/res/layout/home_page_picker_fragment.xml |  4 ++--
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index c28977dd5684..dcf0706d95c0 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -88,13 +88,8 @@ class HomePagePickerFragment : Fragment() {
 
     private fun HomePagePickerFragmentBinding.setupUi() {
         homePagePickerTitlebar.title.isInvisible = !displayUtils.isPhoneLandscape()
-        with(modalLayoutPickerHeaderSection) {
-            modalLayoutPickerTitleRow?.header?.apply {
-                textAlignment = View.TEXT_ALIGNMENT_TEXT_START
-                setText(R.string.hpp_title)
-            }
-            modalLayoutPickerSubtitleRow?.root?.visibility = View.GONE
-        }
+        siteCreationThemeHeader.title?.setText(R.string.hpp_title)
+        siteCreationThemeHeader.subtitle?.isGone = true
         modalLayoutPickerLayoutsSkeleton.skeletonCardView.updateLayoutParams {
             height = thumbDimensionProvider.previewHeight
             width = thumbDimensionProvider.previewWidth
@@ -141,7 +136,7 @@ class HomePagePickerFragment : Fragment() {
     private fun HomePagePickerFragmentBinding.setHeaderVisibility(visible: Boolean) {
         uiHelper.fadeInfadeOutViews(
                 homePagePickerTitlebar.title,
-                modalLayoutPickerHeaderSection.modalLayoutPickerTitleRow?.header,
+                siteCreationThemeHeader.title,
                 visible
         )
     }
diff --git a/WordPress/src/main/res/layout/home_page_picker_fragment.xml b/WordPress/src/main/res/layout/home_page_picker_fragment.xml
index c9d401cc8da7..58390be957d7 100644
--- a/WordPress/src/main/res/layout/home_page_picker_fragment.xml
+++ b/WordPress/src/main/res/layout/home_page_picker_fragment.xml
@@ -22,8 +22,8 @@
             app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
             <include
-                android:id="@+id/modal_layout_picker_header_section"
-                layout="@layout/modal_layout_picker_header_section"
+                android:id="@+id/site_creation_theme_header"
+                layout="@layout/site_creation_header_v2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom"

From 376303a10e8fc87f7dc8b19b570911e7440831d2 Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Mon, 16 May 2022 11:01:03 +1000
Subject: [PATCH 064/111] Fix detekt issues

---
 .../android/ui/layoutpicker/LayoutCategoryAdapter.kt        | 2 +-
 .../android/ui/layoutpicker/LayoutsRowViewHolder.kt         | 6 +++---
 .../android/ui/sitecreation/theme/HomePagePickerFragment.kt | 3 ---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
index a05a0b3e02cc..3bad574f9f9a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
@@ -57,7 +57,7 @@ class LayoutCategoryAdapter(
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
-            when(viewType) {
+            when (viewType) {
                 FOOTER.ordinal -> LayoutsFooterViewHolder(parent, footerLayoutResId!!)
                 else ->
                     LayoutsItemViewHolder(
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt
index 6bb2df979498..49e859cbfa0f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt
@@ -14,9 +14,9 @@ import androidx.recyclerview.widget.RecyclerView.OnScrollListener
 import org.wordpress.android.R
 import org.wordpress.android.util.extensions.setVisible
 
-sealed class LayoutsRowViewHolder(view: View): RecyclerView.ViewHolder(view)
+sealed class LayoutsRowViewHolder(view: View) : RecyclerView.ViewHolder(view)
 
-class LayoutsFooterViewHolder(parent: ViewGroup, footerLayoutResId: Int):
+class LayoutsFooterViewHolder(parent: ViewGroup, footerLayoutResId: Int) :
         LayoutsRowViewHolder(
                 LayoutInflater.from(parent.context).inflate(footerLayoutResId, parent, false)
         )
@@ -31,7 +31,7 @@ class LayoutsItemViewHolder(
     private var nestedScrollStates: Bundle,
     private val thumbDimensionProvider: ThumbDimensionProvider,
     private val recommendedDimensionProvider: ThumbDimensionProvider?
-): LayoutsRowViewHolder(
+) : LayoutsRowViewHolder(
         LayoutInflater.from(
                 parent.context
         ).inflate(R.layout.modal_layout_picker_layouts_row, parent, false)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index 5b882b067445..6f969574712d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -4,8 +4,6 @@ import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
-import android.view.View.GONE
-import android.view.View.VISIBLE
 import android.view.ViewGroup
 import androidx.core.view.isGone
 import androidx.core.view.isInvisible
@@ -13,7 +11,6 @@ import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.appbar.AppBarLayout
 import org.wordpress.android.R
 import org.wordpress.android.WordPress

From f97da0aa09fa8ae6942d2988bf9f9c16a43c1cee Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Mon, 16 May 2022 12:40:09 +1000
Subject: [PATCH 065/111] Fix lint

---
 WordPress/src/main/res/layout/home_page_picker_footer.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/WordPress/src/main/res/layout/home_page_picker_footer.xml b/WordPress/src/main/res/layout/home_page_picker_footer.xml
index dafdf9c8f437..d6f1d6d4d24c 100644
--- a/WordPress/src/main/res/layout/home_page_picker_footer.xml
+++ b/WordPress/src/main/res/layout/home_page_picker_footer.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -10,7 +9,7 @@
         style="@style/ModalLayoutPickerSubtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:drawableLeft="@drawable/ic_info_outline_grey_dark_18dp"
+        android:drawableStart="@drawable/ic_info_outline_grey_dark_18dp"
         android:padding="16dp"
         android:text="@string/hpp_bottom_helper_text"
         app:layout_constraintTop_toTopOf="parent"

From d3af3a327218bd533d7b95a1ec2b564cc7641829 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Mon, 16 May 2022 11:07:25 +0200
Subject: [PATCH 066/111] Rename appbar title id in site theme titlebar to
 avoid DuplicateIncludedIds lint issue

---
 .../android/ui/sitecreation/theme/HomePagePickerFragment.kt   | 4 ++--
 WordPress/src/main/res/layout/home_page_picker_titlebar.xml   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index dcf0706d95c0..23c3be9d736b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -87,7 +87,7 @@ class HomePagePickerFragment : Fragment() {
     }
 
     private fun HomePagePickerFragmentBinding.setupUi() {
-        homePagePickerTitlebar.title.isInvisible = !displayUtils.isPhoneLandscape()
+        homePagePickerTitlebar.appBarTitle.isInvisible = !displayUtils.isPhoneLandscape()
         siteCreationThemeHeader.title?.setText(R.string.hpp_title)
         siteCreationThemeHeader.subtitle?.isGone = true
         modalLayoutPickerLayoutsSkeleton.skeletonCardView.updateLayoutParams {
@@ -135,7 +135,7 @@ class HomePagePickerFragment : Fragment() {
 
     private fun HomePagePickerFragmentBinding.setHeaderVisibility(visible: Boolean) {
         uiHelper.fadeInfadeOutViews(
-                homePagePickerTitlebar.title,
+                homePagePickerTitlebar.appBarTitle,
                 siteCreationThemeHeader.title,
                 visible
         )
diff --git a/WordPress/src/main/res/layout/home_page_picker_titlebar.xml b/WordPress/src/main/res/layout/home_page_picker_titlebar.xml
index a8db0a41ab12..5ba7b522689c 100644
--- a/WordPress/src/main/res/layout/home_page_picker_titlebar.xml
+++ b/WordPress/src/main/res/layout/home_page_picker_titlebar.xml
@@ -14,7 +14,7 @@
         android:tint="?attr/colorOnSurface" />
 
     <TextView
-        android:id="@+id/title"
+        android:id="@+id/appBarTitle"
         style="@style/ModalLayoutPickerHeader"
         android:layout_width="0dp"
         android:layout_weight="1"

From f3c6c2159867980d6787809db8ce9dc18b894a7e Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Mon, 16 May 2022 14:02:41 +0200
Subject: [PATCH 067/111] Remove unused dimension resource
 siq_title_padding_start

---
 WordPress/src/main/res/values/dimens.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml
index eb07ff86433c..f2d449b6b798 100644
--- a/WordPress/src/main/res/values/dimens.xml
+++ b/WordPress/src/main/res/values/dimens.xml
@@ -656,7 +656,6 @@
     <dimen name="hpp_recommended_row_height">500dp</dimen>
 
     <!-- Site Intent Question -->
-    <dimen name="siq_title_padding_start">@dimen/margin_extra_extra_large</dimen>
     <dimen name="siq_header_scroll_snap_threshold">-96dp</dimen>
 
     <!-- Login Prologue -->

From 157d9297b3a3959ef75693e4bc24921955e7ccf3 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Mon, 16 May 2022 14:03:09 +0200
Subject: [PATCH 068/111] Remove redundant horizontal margins override in the
 site creation header layout

---
 WordPress/src/main/res/layout/site_creation_header_v2.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/WordPress/src/main/res/layout/site_creation_header_v2.xml b/WordPress/src/main/res/layout/site_creation_header_v2.xml
index 7241e9878734..9c11635d10a1 100644
--- a/WordPress/src/main/res/layout/site_creation_header_v2.xml
+++ b/WordPress/src/main/res/layout/site_creation_header_v2.xml
@@ -19,8 +19,6 @@
     <org.wordpress.android.widgets.WPTextView
         android:id="@+id/subtitle"
         style="@style/SiteCreationHeaderV2Subtitle"
-        android:layout_marginEnd="@dimen/margin_none"
-        android:layout_marginStart="@dimen/margin_none"
         android:paddingBottom="@dimen/margin_extra_medium_large"
         android:lineSpacingExtra="5sp"
         android:letterSpacing="0.01"

From 01d5a852b2de2dba5ccb37d7599e10d01acdce9a Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Tue, 17 May 2022 14:07:46 +1000
Subject: [PATCH 069/111] Make some style adjustments

---
 .../res/drawable/ic_info_outline_grey_dark_24dp.xml | 13 +++++++++++++
 .../src/main/res/layout/home_page_picker_footer.xml |  8 +++++---
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 WordPress/src/main/res/drawable/ic_info_outline_grey_dark_24dp.xml

diff --git a/WordPress/src/main/res/drawable/ic_info_outline_grey_dark_24dp.xml b/WordPress/src/main/res/drawable/ic_info_outline_grey_dark_24dp.xml
new file mode 100644
index 000000000000..42d91533cf21
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_info_outline_grey_dark_24dp.xml
@@ -0,0 +1,13 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="18.0"
+    android:viewportWidth="18.0" >
+
+    <path
+        android:fillColor="@color/neutral_70"
+        android:pathData="M9.8,6.8H8.2V5.2h1.5V6.8zM9.8,8.2H8.2v4.5h1.5V8.2zM9,3C5.7,3 3,5.7 3,9s2.7,6 6,6s6,-2.7 6,-6S12.3,3 9,3M9,1.5c4.1,0 7.5,3.4 7.5,7.5s-3.4,7.5 -7.5,7.5S1.5,13.1 1.5,9S4.9,1.5 9,1.5z" >
+    </path>
+
+</vector>
diff --git a/WordPress/src/main/res/layout/home_page_picker_footer.xml b/WordPress/src/main/res/layout/home_page_picker_footer.xml
index d6f1d6d4d24c..b6fa197affd3 100644
--- a/WordPress/src/main/res/layout/home_page_picker_footer.xml
+++ b/WordPress/src/main/res/layout/home_page_picker_footer.xml
@@ -6,12 +6,14 @@
 
     <TextView
         android:id="@+id/bottom_helper_text"
-        style="@style/ModalLayoutPickerSubtitle"
+        style="@style/SiteCreationHeaderV2Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:drawableStart="@drawable/ic_info_outline_grey_dark_18dp"
-        android:padding="16dp"
+        android:padding="@dimen/margin_large"
         android:text="@string/hpp_bottom_helper_text"
+        android:drawablePadding="@dimen/margin_large"
+        app:drawableStartCompat="@drawable/ic_info_outline_grey_dark_24dp"
+        app:drawableTint="?attr/colorOnSurface"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"

From 381266508e5f0e1b655eeb74b7bdcc4a48e38682 Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Tue, 17 May 2022 14:08:12 +1000
Subject: [PATCH 070/111] Only show footer when list is populated

This prevents an issue where the fetched categories arriving later after
the layout caused the list to be scrolled to the bottom (maintaining a
view of the footer as the new items were added).
---
 .../wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
index 3bad574f9f9a..25ee2a80821e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
@@ -25,6 +25,7 @@ class LayoutCategoryAdapter(
     private val footerLayoutResId: Int? = null
 ) : Adapter<LayoutsRowViewHolder>() {
     private var items: List<LayoutCategoryUiState> = listOf()
+    private val shouldShowFooter get() = footerLayoutResId != null && items.isNotEmpty()
 
     fun update(newItems: List<LayoutCategoryUiState>) {
         val diffResult = DiffUtil.calculateDiff(
@@ -37,7 +38,7 @@ class LayoutCategoryAdapter(
         diffResult.dispatchUpdatesTo(this)
     }
 
-    override fun getItemCount(): Int = items.size + if (footerLayoutResId != null) 1 else 0
+    override fun getItemCount(): Int = items.size + if (shouldShowFooter) 1 else 0
 
     override fun onBindViewHolder(holder: LayoutsRowViewHolder, position: Int) {
         (holder as? LayoutsItemViewHolder)?.bind(items[position])

From 3a7dd1ac5c174e3a4e2d57714560256c066cacb2 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Tue, 17 May 2022 12:12:02 +0200
Subject: [PATCH 071/111] Replace SiteCreationActivity dependency injection
 with Hilt

---
 .../main/java/org/wordpress/android/modules/AppComponent.java | 2 --
 .../wordpress/android/ui/sitecreation/SiteCreationActivity.kt | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java b/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
index 7b40b5b2a66a..303c56ae28ed 100644
--- a/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
+++ b/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
@@ -193,7 +193,6 @@
 import org.wordpress.android.ui.reader.views.ReaderSiteSearchResultView;
 import org.wordpress.android.ui.reader.views.ReaderTagHeaderView;
 import org.wordpress.android.ui.reader.views.ReaderWebView;
-import org.wordpress.android.ui.sitecreation.SiteCreationActivity;
 import org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsFragment;
 import org.wordpress.android.ui.sitecreation.previews.SiteCreationPreviewFragment;
 import org.wordpress.android.ui.sitecreation.services.SiteCreationService;
@@ -259,7 +258,6 @@ public interface AppComponent {
 
     void inject(PostSignupInterstitialActivity object);
 
-    void inject(SiteCreationActivity object);
 
     void inject(SiteCreationDomainsFragment object);
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
index 5c659392831d..d13f85675a12 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
@@ -7,8 +7,8 @@ import android.view.MenuItem
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
+import dagger.hilt.android.AndroidEntryPoint
 import org.wordpress.android.R
-import org.wordpress.android.WordPress
 import org.wordpress.android.ui.ActivityLauncher
 import org.wordpress.android.ui.LocaleAwareActivity
 import org.wordpress.android.ui.accounts.HelpActivity.Origin
@@ -48,6 +48,7 @@ import org.wordpress.android.util.wizard.WizardNavigationTarget
 import javax.inject.Inject
 
 @Suppress("TooManyFunctions")
+@AndroidEntryPoint
 class SiteCreationActivity : LocaleAwareActivity(),
         IntentsScreenListener,
         SiteNameScreenListener,
@@ -66,7 +67,6 @@ class SiteCreationActivity : LocaleAwareActivity(),
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        (application as WordPress).component().inject(this)
         setContentView(R.layout.site_creation_activity)
         mainViewModel = ViewModelProvider(this, viewModelFactory).get(SiteCreationMainVM::class.java)
         hppViewModel = ViewModelProvider(this, viewModelFactory).get(HomePagePickerViewModel::class.java)

From 2bf8d9fe43d9b5d34625e8ccaf46c75d35276704 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Tue, 17 May 2022 12:13:06 +0200
Subject: [PATCH 072/111] Inject SiteCreationVM with Hilt

---
 .../java/org/wordpress/android/modules/ViewModelModule.java | 6 ------
 .../android/ui/sitecreation/SiteCreationActivity.kt         | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java b/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
index 674a51bd0df5..e3b27fbaddae 100644
--- a/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
+++ b/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
@@ -62,7 +62,6 @@
 import org.wordpress.android.ui.reader.viewmodels.ReaderPostListViewModel;
 import org.wordpress.android.ui.reader.viewmodels.ReaderViewModel;
 import org.wordpress.android.ui.reader.viewmodels.SubfilterPageViewModel;
-import org.wordpress.android.ui.sitecreation.SiteCreationMainVM;
 import org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModel;
 import org.wordpress.android.ui.sitecreation.previews.SitePreviewViewModel;
 import org.wordpress.android.ui.sitecreation.sitename.SiteCreationSiteNameViewModel;
@@ -274,11 +273,6 @@ abstract class ViewModelModule {
     @ViewModelKey(SiteCreationDomainsViewModel.class)
     abstract ViewModel siteCreationDomainsViewModel(SiteCreationDomainsViewModel viewModel);
 
-    @Binds
-    @IntoMap
-    @ViewModelKey(SiteCreationMainVM.class)
-    abstract ViewModel siteCreationMainVM(SiteCreationMainVM viewModel);
-
     @Binds
     @IntoMap
     @ViewModelKey(SitePreviewViewModel.class)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
index d13f85675a12..8086e5f22472 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
+import androidx.activity.viewModels
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
@@ -60,15 +61,14 @@ class SiteCreationActivity : LocaleAwareActivity(),
     @Inject internal lateinit var viewModelFactory: ViewModelProvider.Factory
     @Inject internal lateinit var uiHelpers: UiHelpers
     @Inject internal lateinit var siteNameFeatureConfig: SiteNameFeatureConfig
-    private lateinit var mainViewModel: SiteCreationMainVM
     private lateinit var hppViewModel: HomePagePickerViewModel
     private lateinit var siteCreationIntentsViewModel: SiteCreationIntentsViewModel
     private lateinit var siteCreationSiteNameViewModel: SiteCreationSiteNameViewModel
+    private val mainViewModel: SiteCreationMainVM by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.site_creation_activity)
-        mainViewModel = ViewModelProvider(this, viewModelFactory).get(SiteCreationMainVM::class.java)
         hppViewModel = ViewModelProvider(this, viewModelFactory).get(HomePagePickerViewModel::class.java)
         siteCreationIntentsViewModel = ViewModelProvider(this, viewModelFactory)
                 .get(SiteCreationIntentsViewModel::class.java)

From 600d72525e85ebd191b25af15981b796dd9fa6cc Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Tue, 17 May 2022 12:15:21 +0200
Subject: [PATCH 073/111] Replace dagger with hilt for SiteCreationIntents
 fragment & viewModel

---
 .../wordpress/android/modules/AppComponent.java |  2 --
 .../android/modules/ViewModelModule.java        |  6 ------
 .../ui/sitecreation/SiteCreationActivity.kt     |  4 +---
 .../verticals/SiteCreationIntentsFragment.kt    | 17 ++++-------------
 .../verticals/SiteCreationIntentsViewModel.kt   |  2 ++
 5 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java b/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
index 303c56ae28ed..237d67d68e21 100644
--- a/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
+++ b/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
@@ -545,8 +545,6 @@ public interface AppComponent {
 
     void inject(HomePagePickerFragment object);
 
-    void inject(SiteCreationIntentsFragment object);
-
     void inject(SiteCreationSiteNameFragment object);
 
     void inject(SubfilterBottomSheetFragment object);
diff --git a/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java b/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
index e3b27fbaddae..1c4fbe165e54 100644
--- a/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
+++ b/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
@@ -66,7 +66,6 @@
 import org.wordpress.android.ui.sitecreation.previews.SitePreviewViewModel;
 import org.wordpress.android.ui.sitecreation.sitename.SiteCreationSiteNameViewModel;
 import org.wordpress.android.ui.sitecreation.theme.HomePagePickerViewModel;
-import org.wordpress.android.ui.sitecreation.verticals.SiteCreationIntentsViewModel;
 import org.wordpress.android.ui.stats.refresh.lists.DaysListViewModel;
 import org.wordpress.android.ui.stats.refresh.lists.InsightsDetailListViewModel;
 import org.wordpress.android.ui.stats.refresh.lists.InsightsListViewModel;
@@ -258,11 +257,6 @@ abstract class ViewModelModule {
     @ViewModelKey(HistoryViewModel.class)
     abstract ViewModel historyViewModel(HistoryViewModel viewModel);
 
-    @Binds
-    @IntoMap
-    @ViewModelKey(SiteCreationIntentsViewModel.class)
-    abstract ViewModel siteCreationIntentsViewModel(SiteCreationIntentsViewModel viewModel);
-
     @Binds
     @IntoMap
     @ViewModelKey(SiteCreationSiteNameViewModel.class)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
index 8086e5f22472..cc6d5b0adbfe 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
@@ -62,16 +62,14 @@ class SiteCreationActivity : LocaleAwareActivity(),
     @Inject internal lateinit var uiHelpers: UiHelpers
     @Inject internal lateinit var siteNameFeatureConfig: SiteNameFeatureConfig
     private lateinit var hppViewModel: HomePagePickerViewModel
-    private lateinit var siteCreationIntentsViewModel: SiteCreationIntentsViewModel
     private lateinit var siteCreationSiteNameViewModel: SiteCreationSiteNameViewModel
     private val mainViewModel: SiteCreationMainVM by viewModels()
+    private val siteCreationIntentsViewModel: SiteCreationIntentsViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.site_creation_activity)
         hppViewModel = ViewModelProvider(this, viewModelFactory).get(HomePagePickerViewModel::class.java)
-        siteCreationIntentsViewModel = ViewModelProvider(this, viewModelFactory)
-                .get(SiteCreationIntentsViewModel::class.java)
         siteCreationSiteNameViewModel = ViewModelProvider(this, viewModelFactory)
                 .get(SiteCreationSiteNameViewModel::class.java)
         val siteCreationSource = intent.extras?.getString(ARG_CREATE_SITE_SOURCE)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationIntentsFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationIntentsFragment.kt
index 16132cffc8b5..f14e8bfbfc2c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationIntentsFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationIntentsFragment.kt
@@ -1,6 +1,5 @@
 package org.wordpress.android.ui.sitecreation.verticals
 
-import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -8,10 +7,10 @@ import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
+import androidx.fragment.app.activityViewModels
 import com.google.android.material.appbar.AppBarLayout
+import dagger.hilt.android.AndroidEntryPoint
 import org.wordpress.android.R
-import org.wordpress.android.WordPress
 import org.wordpress.android.databinding.SiteCreationIntentsFragmentBinding
 import org.wordpress.android.ui.sitecreation.verticals.SiteCreationIntentsViewModel.IntentsUiState
 import org.wordpress.android.ui.utils.UiHelpers
@@ -22,19 +21,14 @@ import javax.inject.Inject
  * Implements the Site Intent Question UI
  */
 @Suppress("TooManyFunctions")
+@AndroidEntryPoint
 class SiteCreationIntentsFragment : Fragment() {
-    @Inject internal lateinit var viewModelFactory: ViewModelProvider.Factory
     @Inject internal lateinit var uiHelper: UiHelpers
     @Inject internal lateinit var displayUtils: DisplayUtilsWrapper
 
-    private lateinit var viewModel: SiteCreationIntentsViewModel
+    private val viewModel: SiteCreationIntentsViewModel by activityViewModels()
     private var binding: SiteCreationIntentsFragmentBinding? = null
 
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        (requireActivity().applicationContext as WordPress).component().inject(this)
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -46,9 +40,6 @@ class SiteCreationIntentsFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        viewModel = ViewModelProvider(requireActivity(), viewModelFactory)
-                .get(SiteCreationIntentsViewModel::class.java)
-
         val binding = SiteCreationIntentsFragmentBinding.bind(view)
         this.binding = binding
         with(binding) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationIntentsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationIntentsViewModel.kt
index 120cb36ea161..338b86bb1a0c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationIntentsViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationIntentsViewModel.kt
@@ -4,6 +4,7 @@ import android.content.res.Resources
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
@@ -17,6 +18,7 @@ import javax.inject.Inject
 import javax.inject.Named
 import kotlin.coroutines.CoroutineContext
 
+@HiltViewModel
 class SiteCreationIntentsViewModel @Inject constructor(
     private val analyticsTracker: SiteCreationTracker,
     private val searchResultsProvider: VerticalsSearchResultsProvider,

From c62b642d2376c68edb6bfaa3996d9b65cd5c69fb Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Tue, 17 May 2022 12:16:51 +0200
Subject: [PATCH 074/111] Replace dagger with hilt for SiteCreationSiteName
 fragment & viewModel

---
 .../wordpress/android/modules/AppComponent.java |  3 ---
 .../android/modules/ViewModelModule.java        |  6 ------
 .../ui/sitecreation/SiteCreationActivity.kt     |  4 +---
 .../sitename/SiteCreationSiteNameFragment.kt    | 17 ++++-------------
 .../sitename/SiteCreationSiteNameViewModel.kt   |  2 ++
 5 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java b/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
index 237d67d68e21..e48012ad584d 100644
--- a/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
+++ b/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
@@ -196,7 +196,6 @@
 import org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsFragment;
 import org.wordpress.android.ui.sitecreation.previews.SiteCreationPreviewFragment;
 import org.wordpress.android.ui.sitecreation.services.SiteCreationService;
-import org.wordpress.android.ui.sitecreation.sitename.SiteCreationSiteNameFragment;
 import org.wordpress.android.ui.sitecreation.theme.DesignPreviewFragment;
 import org.wordpress.android.ui.sitecreation.theme.HomePagePickerFragment;
 import org.wordpress.android.ui.sitecreation.verticals.SiteCreationIntentsFragment;
@@ -545,8 +544,6 @@ public interface AppComponent {
 
     void inject(HomePagePickerFragment object);
 
-    void inject(SiteCreationSiteNameFragment object);
-
     void inject(SubfilterBottomSheetFragment object);
 
     void inject(AddContentAdapter object);
diff --git a/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java b/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
index 1c4fbe165e54..56384788b415 100644
--- a/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
+++ b/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
@@ -64,7 +64,6 @@
 import org.wordpress.android.ui.reader.viewmodels.SubfilterPageViewModel;
 import org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModel;
 import org.wordpress.android.ui.sitecreation.previews.SitePreviewViewModel;
-import org.wordpress.android.ui.sitecreation.sitename.SiteCreationSiteNameViewModel;
 import org.wordpress.android.ui.sitecreation.theme.HomePagePickerViewModel;
 import org.wordpress.android.ui.stats.refresh.lists.DaysListViewModel;
 import org.wordpress.android.ui.stats.refresh.lists.InsightsDetailListViewModel;
@@ -257,11 +256,6 @@ abstract class ViewModelModule {
     @ViewModelKey(HistoryViewModel.class)
     abstract ViewModel historyViewModel(HistoryViewModel viewModel);
 
-    @Binds
-    @IntoMap
-    @ViewModelKey(SiteCreationSiteNameViewModel.class)
-    abstract ViewModel siteCreationSiteNameViewModel(SiteCreationSiteNameViewModel viewModel);
-
     @Binds
     @IntoMap
     @ViewModelKey(SiteCreationDomainsViewModel.class)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
index cc6d5b0adbfe..e2387d12872c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
@@ -62,16 +62,14 @@ class SiteCreationActivity : LocaleAwareActivity(),
     @Inject internal lateinit var uiHelpers: UiHelpers
     @Inject internal lateinit var siteNameFeatureConfig: SiteNameFeatureConfig
     private lateinit var hppViewModel: HomePagePickerViewModel
-    private lateinit var siteCreationSiteNameViewModel: SiteCreationSiteNameViewModel
     private val mainViewModel: SiteCreationMainVM by viewModels()
     private val siteCreationIntentsViewModel: SiteCreationIntentsViewModel by viewModels()
+    private val siteCreationSiteNameViewModel: SiteCreationSiteNameViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.site_creation_activity)
         hppViewModel = ViewModelProvider(this, viewModelFactory).get(HomePagePickerViewModel::class.java)
-        siteCreationSiteNameViewModel = ViewModelProvider(this, viewModelFactory)
-                .get(SiteCreationSiteNameViewModel::class.java)
         val siteCreationSource = intent.extras?.getString(ARG_CREATE_SITE_SOURCE)
         mainViewModel.start(savedInstanceState, SiteCreationSource.fromString(siteCreationSource))
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/sitename/SiteCreationSiteNameFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/sitename/SiteCreationSiteNameFragment.kt
index e6484f2f4a2f..74a4253cecae 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/sitename/SiteCreationSiteNameFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/sitename/SiteCreationSiteNameFragment.kt
@@ -1,6 +1,5 @@
 package org.wordpress.android.ui.sitecreation.sitename
 
-import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -9,11 +8,11 @@ import android.view.inputmethod.EditorInfo
 import androidx.core.view.isInvisible
 import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
+import androidx.fragment.app.activityViewModels
+import dagger.hilt.android.AndroidEntryPoint
 import org.wordpress.android.R
 import org.wordpress.android.R.color
 import org.wordpress.android.R.string
-import org.wordpress.android.WordPress
 import org.wordpress.android.databinding.SiteCreationSiteNameFragmentBinding
 import org.wordpress.android.ui.sitecreation.sitename.SiteCreationSiteNameViewModel.SiteNameUiState
 import org.wordpress.android.ui.utils.HtmlMessageUtils
@@ -27,20 +26,15 @@ import javax.inject.Inject
  * Implements the Site Name UI
  */
 @Suppress("TooManyFunctions")
+@AndroidEntryPoint
 class SiteCreationSiteNameFragment : Fragment() {
-    @Inject internal lateinit var viewModelFactory: ViewModelProvider.Factory
     @Inject internal lateinit var uiHelper: UiHelpers
     @Inject internal lateinit var displayUtils: DisplayUtilsWrapper
     @Inject internal lateinit var htmlMessageUtils: HtmlMessageUtils
 
-    private lateinit var viewModel: SiteCreationSiteNameViewModel
+    private val viewModel: SiteCreationSiteNameViewModel by activityViewModels()
     private var binding: SiteCreationSiteNameFragmentBinding? = null
 
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        (requireActivity().applicationContext as WordPress).component().inject(this)
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -52,9 +46,6 @@ class SiteCreationSiteNameFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        viewModel = ViewModelProvider(requireActivity(), viewModelFactory)
-                .get(SiteCreationSiteNameViewModel::class.java)
-
         val binding = SiteCreationSiteNameFragmentBinding.bind(view)
         this.binding = binding
         with(binding) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/sitename/SiteCreationSiteNameViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/sitename/SiteCreationSiteNameViewModel.kt
index 702d17ac0737..e32449c615ba 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/sitename/SiteCreationSiteNameViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/sitename/SiteCreationSiteNameViewModel.kt
@@ -3,6 +3,7 @@ package org.wordpress.android.ui.sitecreation.sitename
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
@@ -13,6 +14,7 @@ import javax.inject.Inject
 import javax.inject.Named
 import kotlin.coroutines.CoroutineContext
 
+@HiltViewModel
 class SiteCreationSiteNameViewModel @Inject constructor(
     private val analyticsTracker: SiteCreationTracker,
     @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher

From 496bd2a4680a6f055ff5b60cd0d9c017f2a7c790 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Tue, 17 May 2022 12:17:13 +0200
Subject: [PATCH 075/111] Fix SiteCreationMainVM injection with Hilt

---
 .../org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt
index bf63ac0077cb..1b62775f3c62 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt
@@ -7,6 +7,7 @@ import androidx.annotation.StringRes
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import androidx.lifecycle.ViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.parcelize.Parcelize
 import org.wordpress.android.R
 import org.wordpress.android.ui.sitecreation.SiteCreationMainVM.SiteCreationScreenTitle.ScreenTitleEmpty
@@ -45,6 +46,7 @@ data class SiteCreationState(
 
 typealias NavigationTarget = WizardNavigationTarget<SiteCreationStep, SiteCreationState>
 
+@HiltViewModel
 class SiteCreationMainVM @Inject constructor(
     private val tracker: SiteCreationTracker,
     private val wizardManager: WizardManager<SiteCreationStep>,

From 0d6e4f8ca98167eb838f25f569906468027d888f Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Tue, 17 May 2022 12:17:28 +0200
Subject: [PATCH 076/111] Cleanup AppComponent

---
 .../main/java/org/wordpress/android/modules/AppComponent.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java b/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
index e48012ad584d..c9a7cfe51aaa 100644
--- a/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
+++ b/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
@@ -198,7 +198,6 @@
 import org.wordpress.android.ui.sitecreation.services.SiteCreationService;
 import org.wordpress.android.ui.sitecreation.theme.DesignPreviewFragment;
 import org.wordpress.android.ui.sitecreation.theme.HomePagePickerFragment;
-import org.wordpress.android.ui.sitecreation.verticals.SiteCreationIntentsFragment;
 import org.wordpress.android.ui.stats.StatsConnectJetpackActivity;
 import org.wordpress.android.ui.stats.refresh.lists.StatsListFragment;
 import org.wordpress.android.ui.stats.refresh.lists.widget.alltime.AllTimeWidgetBlockListProviderFactory;
@@ -651,7 +650,7 @@ public interface AppComponent {
     void inject(EditCancelDialogFragment object);
 
     void inject(BloggingReminderBottomSheetFragment object);
-    
+
     void inject(LocalePickerBottomSheet object);
 
     void inject(CategoriesListFragment object);

From f4810e08900ba26eaee40b0a8493ca9bdd592436 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Tue, 17 May 2022 12:18:33 +0200
Subject: [PATCH 077/111] Replace dagger with hilt for HomePagePicker fragment
 & viewModel

---
 .../wordpress/android/modules/AppComponent.java    |  3 ---
 .../wordpress/android/modules/ViewModelModule.java |  6 ------
 .../ui/sitecreation/SiteCreationActivity.kt        |  5 +----
 .../sitecreation/theme/HomePagePickerFragment.kt   | 14 ++++----------
 .../sitecreation/theme/HomePagePickerViewModel.kt  |  2 ++
 5 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java b/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
index c9a7cfe51aaa..78d01b6d5f10 100644
--- a/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
+++ b/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
@@ -197,7 +197,6 @@
 import org.wordpress.android.ui.sitecreation.previews.SiteCreationPreviewFragment;
 import org.wordpress.android.ui.sitecreation.services.SiteCreationService;
 import org.wordpress.android.ui.sitecreation.theme.DesignPreviewFragment;
-import org.wordpress.android.ui.sitecreation.theme.HomePagePickerFragment;
 import org.wordpress.android.ui.stats.StatsConnectJetpackActivity;
 import org.wordpress.android.ui.stats.refresh.lists.StatsListFragment;
 import org.wordpress.android.ui.stats.refresh.lists.widget.alltime.AllTimeWidgetBlockListProviderFactory;
@@ -541,8 +540,6 @@ public interface AppComponent {
 
     void inject(ModalLayoutPickerFragment object);
 
-    void inject(HomePagePickerFragment object);
-
     void inject(SubfilterBottomSheetFragment object);
 
     void inject(AddContentAdapter object);
diff --git a/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java b/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
index 56384788b415..37b860fffb3c 100644
--- a/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
+++ b/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
@@ -64,7 +64,6 @@
 import org.wordpress.android.ui.reader.viewmodels.SubfilterPageViewModel;
 import org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModel;
 import org.wordpress.android.ui.sitecreation.previews.SitePreviewViewModel;
-import org.wordpress.android.ui.sitecreation.theme.HomePagePickerViewModel;
 import org.wordpress.android.ui.stats.refresh.lists.DaysListViewModel;
 import org.wordpress.android.ui.stats.refresh.lists.InsightsDetailListViewModel;
 import org.wordpress.android.ui.stats.refresh.lists.InsightsListViewModel;
@@ -331,11 +330,6 @@ abstract class ViewModelModule {
     @ViewModelKey(ModalLayoutPickerViewModel.class)
     abstract ViewModel mlpViewModel(ModalLayoutPickerViewModel viewModel);
 
-    @Binds
-    @IntoMap
-    @ViewModelKey(HomePagePickerViewModel.class)
-    abstract ViewModel hppViewModel(HomePagePickerViewModel viewModel);
-
     @Binds
     @IntoMap
     @ViewModelKey(PostSignupInterstitialViewModel.class)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
index e2387d12872c..df4842c4ebe5 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
@@ -7,7 +7,6 @@ import android.view.MenuItem
 import androidx.activity.viewModels
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProvider
 import dagger.hilt.android.AndroidEntryPoint
 import org.wordpress.android.R
 import org.wordpress.android.ui.ActivityLauncher
@@ -58,18 +57,16 @@ class SiteCreationActivity : LocaleAwareActivity(),
         OnHelpClickedListener,
         BasicDialogPositiveClickInterface,
         BasicDialogNegativeClickInterface {
-    @Inject internal lateinit var viewModelFactory: ViewModelProvider.Factory
     @Inject internal lateinit var uiHelpers: UiHelpers
     @Inject internal lateinit var siteNameFeatureConfig: SiteNameFeatureConfig
-    private lateinit var hppViewModel: HomePagePickerViewModel
     private val mainViewModel: SiteCreationMainVM by viewModels()
+    private val hppViewModel: HomePagePickerViewModel by viewModels()
     private val siteCreationIntentsViewModel: SiteCreationIntentsViewModel by viewModels()
     private val siteCreationSiteNameViewModel: SiteCreationSiteNameViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.site_creation_activity)
-        hppViewModel = ViewModelProvider(this, viewModelFactory).get(HomePagePickerViewModel::class.java)
         val siteCreationSource = intent.extras?.getString(ARG_CREATE_SITE_SOURCE)
         mainViewModel.start(savedInstanceState, SiteCreationSource.fromString(siteCreationSource))
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index 8f94e622c382..f715138b3831 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -1,6 +1,5 @@
 package org.wordpress.android.ui.sitecreation.theme
 
-import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -8,11 +7,12 @@ import android.view.ViewGroup
 import androidx.core.view.isGone
 import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.appbar.AppBarLayout
+import dagger.hilt.android.AndroidEntryPoint
 import org.wordpress.android.R
-import org.wordpress.android.WordPress
 import org.wordpress.android.databinding.HomePagePickerFragmentBinding
 import org.wordpress.android.ui.layoutpicker.LayoutCategoryAdapter
 import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState
@@ -31,6 +31,7 @@ import javax.inject.Inject
  * Implements the Home Page Picker UI
  */
 @Suppress("TooManyFunctions")
+@AndroidEntryPoint
 class HomePagePickerFragment : Fragment() {
     @Inject lateinit var imageManager: ImageManager
     @Inject lateinit var displayUtils: DisplayUtilsWrapper
@@ -39,16 +40,11 @@ class HomePagePickerFragment : Fragment() {
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     @Inject lateinit var thumbDimensionProvider: SiteDesignPickerDimensionProvider
     @Inject lateinit var recommendedDimensionProvider: SiteDesignRecommendedDimensionProvider
-    private lateinit var viewModel: HomePagePickerViewModel
+    private val viewModel: HomePagePickerViewModel by activityViewModels()
 
     private val siteIntent: String?
         get() = arguments?.getString(ARG_SITE_INTENT)
 
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        (requireActivity().applicationContext as WordPress).component().inject(this)
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -60,8 +56,6 @@ class HomePagePickerFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        viewModel = ViewModelProvider(requireActivity(), viewModelFactory).get(HomePagePickerViewModel::class.java)
-
         savedInstanceState?.let {
             viewModel.loadSavedState(it)
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
index 58e360d9e039..dc83d75e7b68 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
@@ -1,6 +1,7 @@
 package org.wordpress.android.ui.sitecreation.theme
 
 import androidx.lifecycle.LiveData
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import org.wordpress.android.R
@@ -24,6 +25,7 @@ const val defaultTemplateSlug = "default"
 
 private const val ERROR_CONTEXT = "design"
 
+@HiltViewModel
 class HomePagePickerViewModel @Inject constructor(
     override val networkUtils: NetworkUtilsWrapper,
     private val dispatcher: Dispatcher,

From 1d624705ff8f3d69045b2ea86892287e9240f95f Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Tue, 17 May 2022 12:19:10 +0200
Subject: [PATCH 078/111] Replace dagger with hilt for SiteCreationDomains
 fragment & viewModel

---
 .../wordpress/android/modules/AppComponent.java  |  3 ---
 .../android/modules/ViewModelModule.java         |  5 -----
 .../domains/SiteCreationDomainsFragment.kt       | 16 ++++------------
 .../domains/SiteCreationDomainsViewModel.kt      |  2 ++
 .../previews/SitePreviewViewModel.kt             |  2 ++
 5 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java b/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
index 78d01b6d5f10..96c338adc005 100644
--- a/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
+++ b/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
@@ -193,7 +193,6 @@
 import org.wordpress.android.ui.reader.views.ReaderSiteSearchResultView;
 import org.wordpress.android.ui.reader.views.ReaderTagHeaderView;
 import org.wordpress.android.ui.reader.views.ReaderWebView;
-import org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsFragment;
 import org.wordpress.android.ui.sitecreation.previews.SiteCreationPreviewFragment;
 import org.wordpress.android.ui.sitecreation.services.SiteCreationService;
 import org.wordpress.android.ui.sitecreation.theme.DesignPreviewFragment;
@@ -256,8 +255,6 @@ public interface AppComponent {
     void inject(PostSignupInterstitialActivity object);
 
 
-    void inject(SiteCreationDomainsFragment object);
-
     void inject(SiteCreationPreviewFragment object);
 
     void inject(JetpackConnectionResultActivity object);
diff --git a/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java b/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
index 37b860fffb3c..0c70e7f3502a 100644
--- a/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
+++ b/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
@@ -62,7 +62,6 @@
 import org.wordpress.android.ui.reader.viewmodels.ReaderPostListViewModel;
 import org.wordpress.android.ui.reader.viewmodels.ReaderViewModel;
 import org.wordpress.android.ui.reader.viewmodels.SubfilterPageViewModel;
-import org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModel;
 import org.wordpress.android.ui.sitecreation.previews.SitePreviewViewModel;
 import org.wordpress.android.ui.stats.refresh.lists.DaysListViewModel;
 import org.wordpress.android.ui.stats.refresh.lists.InsightsDetailListViewModel;
@@ -255,10 +254,6 @@ abstract class ViewModelModule {
     @ViewModelKey(HistoryViewModel.class)
     abstract ViewModel historyViewModel(HistoryViewModel viewModel);
 
-    @Binds
-    @IntoMap
-    @ViewModelKey(SiteCreationDomainsViewModel.class)
-    abstract ViewModel siteCreationDomainsViewModel(SiteCreationDomainsViewModel viewModel);
 
     @Binds
     @IntoMap
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsFragment.kt
index 826aec51190c..c8b00792adf1 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsFragment.kt
@@ -4,11 +4,11 @@ import android.content.Context
 import android.os.Bundle
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import androidx.lifecycle.ViewModelProvider
+import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import dagger.hilt.android.AndroidEntryPoint
 import org.wordpress.android.R
-import org.wordpress.android.WordPress
 import org.wordpress.android.databinding.SiteCreationDomainsScreenBinding
 import org.wordpress.android.databinding.SiteCreationFormScreenBinding
 import org.wordpress.android.ui.accounts.HelpActivity
@@ -21,11 +21,11 @@ import org.wordpress.android.util.DisplayUtilsWrapper
 import javax.inject.Inject
 
 @Suppress("TooManyFunctions")
+@AndroidEntryPoint
 class SiteCreationDomainsFragment : SiteCreationBaseFormFragment() {
     private var searchInputWithHeader: SearchInputWithHeader? = null
-    private lateinit var viewModel: SiteCreationDomainsViewModel
+        private val viewModel: SiteCreationDomainsViewModel by activityViewModels()
 
-    @Inject internal lateinit var viewModelFactory: ViewModelProvider.Factory
     @Inject internal lateinit var uiHelpers: UiHelpers
     @Inject internal lateinit var displayUtils: DisplayUtilsWrapper
 
@@ -41,11 +41,6 @@ class SiteCreationDomainsFragment : SiteCreationBaseFormFragment() {
         }
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        (requireActivity().application as WordPress).component().inject(this)
-    }
-
     override fun getContentLayout(): Int {
         return R.layout.site_creation_domains_screen
     }
@@ -84,9 +79,6 @@ class SiteCreationDomainsFragment : SiteCreationBaseFormFragment() {
     }
 
     private fun SiteCreationDomainsScreenBinding.initViewModel() {
-        viewModel = ViewModelProvider(this@SiteCreationDomainsFragment, viewModelFactory)
-                .get(SiteCreationDomainsViewModel::class.java)
-
         viewModel.uiState.observe(this@SiteCreationDomainsFragment, { uiState ->
             uiState?.let {
                 searchInputWithHeader?.updateHeader(requireActivity(), uiState.headerUiState)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModel.kt
index 81561c556371..d5708b498fbc 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModel.kt
@@ -5,6 +5,7 @@ import androidx.annotation.VisibleForTesting
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
@@ -45,6 +46,7 @@ import kotlin.properties.Delegates
 private const val THROTTLE_DELAY = 500L
 private const val ERROR_CONTEXT = "domains"
 
+@HiltViewModel
 class SiteCreationDomainsViewModel @Inject constructor(
     private val networkUtils: NetworkUtilsWrapper,
     private val dispatcher: Dispatcher,
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/SitePreviewViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/SitePreviewViewModel.kt
index 1584ee1d3e2d..3ddbf1614779 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/SitePreviewViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/SitePreviewViewModel.kt
@@ -6,6 +6,7 @@ import android.os.Parcelable
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.parcelize.Parcelize
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
@@ -67,6 +68,7 @@ private val loadingTexts = listOf(
         UiStringRes(R.string.new_site_creation_creating_site_loading_4)
 )
 
+@HiltViewModel
 class SitePreviewViewModel @Inject constructor(
     private val dispatcher: Dispatcher,
     private val siteStore: SiteStore,

From 3e5e382705c1d152320b7b9a41f7e2c321490115 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Tue, 17 May 2022 12:19:26 +0200
Subject: [PATCH 079/111] Replace dagger with hilt for SiteCreationPreview
 fragment & viewModel

---
 .../org/wordpress/android/modules/AppComponent.java   |  4 ----
 .../wordpress/android/modules/ViewModelModule.java    |  7 -------
 .../previews/SiteCreationPreviewFragment.kt           | 11 ++++-------
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java b/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
index 96c338adc005..bca242460fa1 100644
--- a/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
+++ b/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
@@ -193,7 +193,6 @@
 import org.wordpress.android.ui.reader.views.ReaderSiteSearchResultView;
 import org.wordpress.android.ui.reader.views.ReaderTagHeaderView;
 import org.wordpress.android.ui.reader.views.ReaderWebView;
-import org.wordpress.android.ui.sitecreation.previews.SiteCreationPreviewFragment;
 import org.wordpress.android.ui.sitecreation.services.SiteCreationService;
 import org.wordpress.android.ui.sitecreation.theme.DesignPreviewFragment;
 import org.wordpress.android.ui.stats.StatsConnectJetpackActivity;
@@ -254,9 +253,6 @@ public interface AppComponent {
 
     void inject(PostSignupInterstitialActivity object);
 
-
-    void inject(SiteCreationPreviewFragment object);
-
     void inject(JetpackConnectionResultActivity object);
 
     void inject(StatsConnectJetpackActivity object);
diff --git a/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java b/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
index 0c70e7f3502a..cecf82e6b7f5 100644
--- a/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
+++ b/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
@@ -62,7 +62,6 @@
 import org.wordpress.android.ui.reader.viewmodels.ReaderPostListViewModel;
 import org.wordpress.android.ui.reader.viewmodels.ReaderViewModel;
 import org.wordpress.android.ui.reader.viewmodels.SubfilterPageViewModel;
-import org.wordpress.android.ui.sitecreation.previews.SitePreviewViewModel;
 import org.wordpress.android.ui.stats.refresh.lists.DaysListViewModel;
 import org.wordpress.android.ui.stats.refresh.lists.InsightsDetailListViewModel;
 import org.wordpress.android.ui.stats.refresh.lists.InsightsListViewModel;
@@ -254,12 +253,6 @@ abstract class ViewModelModule {
     @ViewModelKey(HistoryViewModel.class)
     abstract ViewModel historyViewModel(HistoryViewModel viewModel);
 
-
-    @Binds
-    @IntoMap
-    @ViewModelKey(SitePreviewViewModel.class)
-    abstract ViewModel newSitePreviewViewModel(SitePreviewViewModel viewModel);
-
     @Binds
     @IntoMap
     @ViewModelKey(PostListViewModel.class)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/SiteCreationPreviewFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/SiteCreationPreviewFragment.kt
index e47eb09b2e96..2e6ba64b1b17 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/SiteCreationPreviewFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/SiteCreationPreviewFragment.kt
@@ -15,7 +15,9 @@ import android.view.View.OnLayoutChangeListener
 import android.view.animation.DecelerateInterpolator
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
+import androidx.fragment.app.viewModels
 import androidx.lifecycle.ViewModelProvider
+import dagger.hilt.android.AndroidEntryPoint
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.databinding.FullscreenErrorWithRetryBinding
@@ -46,6 +48,7 @@ private const val ARG_DATA = "arg_site_creation_data"
 private const val SLIDE_IN_ANIMATION_DURATION = 450L
 
 @Suppress("TooManyFunctions")
+@AndroidEntryPoint
 class SiteCreationPreviewFragment : SiteCreationBaseFormFragment(),
         ErrorManagedWebViewClientListener {
     /**
@@ -53,12 +56,11 @@ class SiteCreationPreviewFragment : SiteCreationBaseFormFragment(),
      * automatically shows system notifications when site creation is in progress and the app is in the background.
      */
     private var serviceEventConnection: ServiceEventConnection? = null
-    private lateinit var viewModel: SitePreviewViewModel
+    private val viewModel: SitePreviewViewModel by viewModels()
     private var animatorSet: AnimatorSet? = null
     private val isLandscape: Boolean
         get() = resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
 
-    @Inject internal lateinit var viewModelFactory: ViewModelProvider.Factory
     @Inject internal lateinit var uiHelpers: UiHelpers
 
     private var binding: SiteCreationPreviewScreenBinding? = null
@@ -75,7 +77,6 @@ class SiteCreationPreviewFragment : SiteCreationBaseFormFragment(),
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        (requireNotNull(activity).application as WordPress).component().inject(this)
         if (savedInstanceState == null) {
             // we need to manually clear the SiteCreationService state so we don't for example receive sticky events
             // from the previous run of the SiteCreation flow.
@@ -121,10 +122,6 @@ class SiteCreationPreviewFragment : SiteCreationBaseFormFragment(),
     }
 
     private fun SiteCreationPreviewScreenDefaultBinding.initViewModel() {
-        viewModel = ViewModelProvider(
-                this@SiteCreationPreviewFragment,
-                viewModelFactory
-        ).get(SitePreviewViewModel::class.java)
         viewModel.uiState.observe(this@SiteCreationPreviewFragment, { uiState ->
             uiState?.let {
                 when (uiState) {

From 9f72fffc28e78526a6e1f7f87a9191f0a57cf326 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Tue, 17 May 2022 12:27:26 +0200
Subject: [PATCH 080/111] Fix whitespace indentation in
 SiteCreationDomainsFragment

---
 .../ui/sitecreation/domains/SiteCreationDomainsFragment.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsFragment.kt
index c8b00792adf1..d9639402fb91 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsFragment.kt
@@ -24,7 +24,7 @@ import javax.inject.Inject
 @AndroidEntryPoint
 class SiteCreationDomainsFragment : SiteCreationBaseFormFragment() {
     private var searchInputWithHeader: SearchInputWithHeader? = null
-        private val viewModel: SiteCreationDomainsViewModel by activityViewModels()
+    private val viewModel: SiteCreationDomainsViewModel by activityViewModels()
 
     @Inject internal lateinit var uiHelpers: UiHelpers
     @Inject internal lateinit var displayUtils: DisplayUtilsWrapper

From aca07458c3dbe515adf7a6b0f6916f5edb7c3ed3 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Tue, 17 May 2022 12:45:19 +0200
Subject: [PATCH 081/111] Remove unused import in SiteCreationPreviewFragment

---
 .../ui/sitecreation/previews/SiteCreationPreviewFragment.kt      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/SiteCreationPreviewFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/SiteCreationPreviewFragment.kt
index 2e6ba64b1b17..4e83741a90dd 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/SiteCreationPreviewFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/SiteCreationPreviewFragment.kt
@@ -16,7 +16,6 @@ import android.view.animation.DecelerateInterpolator
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.ViewModelProvider
 import dagger.hilt.android.AndroidEntryPoint
 import org.wordpress.android.R
 import org.wordpress.android.WordPress

From 2383dc9a2311771d4134780fb33e60fa018ebe54 Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Wed, 18 May 2022 18:41:35 +1000
Subject: [PATCH 082/111] Add temporary feature flag to facilitate testing

In order to make testing more convenient, this adds a temporary flag
that can be toggled in the debug settings of the app. It also adds a
hard-coded behavior to clear the Glide cache (memory and disk), for the
purpose of testing the flow with a fresh start each time.
---
 WordPress/build.gradle                        |  2 ++
 .../ui/debug/DebugSettingsItemViewHolder.kt   | 32 +++++++++++++++++--
 .../config/PreloadThumbnailsFeatureConfig.kt  | 12 +++++++
 3 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 WordPress/src/main/java/org/wordpress/android/util/config/PreloadThumbnailsFeatureConfig.kt

diff --git a/WordPress/build.gradle b/WordPress/build.gradle
index c2ffda71dc2f..14c1c44f0920 100644
--- a/WordPress/build.gradle
+++ b/WordPress/build.gradle
@@ -127,6 +127,8 @@ android {
         buildConfigField "boolean", "STATS_REVAMP_V2", "false"
         buildConfigField "boolean", "QUICK_START_EXISTING_USERS_V2", "false"
         buildConfigField "boolean", "QRCODE_AUTH_FLOW", "false"
+        // Including this temporarily, to facilitate testing.
+        buildConfigField "boolean", "PRELOAD_THUMBNAILS", "false"
 
         // Override these constants in jetpack product flavor to enable/ disable features
         buildConfigField "boolean", "ENABLE_SITE_CREATION", "true"
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/debug/DebugSettingsItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/debug/DebugSettingsItemViewHolder.kt
index 314bbf21ea2f..e90fbb1df7a9 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/debug/DebugSettingsItemViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/debug/DebugSettingsItemViewHolder.kt
@@ -1,5 +1,6 @@
 package org.wordpress.android.ui.debug
 
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -9,6 +10,12 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.LayoutRes
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import com.bumptech.glide.Glide
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
 import org.wordpress.android.R
 import org.wordpress.android.databinding.DebugSettingsRowBinding
 import org.wordpress.android.ui.debug.DebugSettingsViewModel.UiItem
@@ -35,7 +42,7 @@ sealed class DebugSettingsItemViewHolder(
         }
     }
 
-    class FeatureViewHolder(parent: ViewGroup) : DebugSettingsItemViewHolder(parent, R.layout.debug_settings_feature) {
+    class FeatureViewHolder(val parent: ViewGroup) : DebugSettingsItemViewHolder(parent, R.layout.debug_settings_feature) {
         private val title = itemView.findViewById<TextView>(R.id.feature_title)
         private val enabled = itemView.findViewById<CheckBox>(R.id.feature_enabled)
         private val unknown = itemView.findViewById<ImageView>(R.id.unknown_icon)
@@ -57,8 +64,27 @@ sealed class DebugSettingsItemViewHolder(
                     unknown.visibility = View.VISIBLE
                 }
             }
-            enabled.setOnCheckedChangeListener { _, _ -> item.toggleAction.toggle() }
-            itemView.setOnClickListener { item.toggleAction.toggle() }
+            // To facilitate testing, clear the Glide memory and disk caches every time the flag is toggled
+            enabled.setOnCheckedChangeListener { _, _ ->
+                item.toggleAction.toggle()
+                clearGlideCache()
+            }
+            itemView.setOnClickListener {
+                item.toggleAction.toggle()
+                clearGlideCache()
+            }
+        }
+
+        // Cheap hack for testing ;)
+        fun clearGlideCache() {
+            runBlocking {
+                Glide.get(parent.context).clearMemory()
+                Log.d("Glide", "memory cache cleared!")
+                async(Dispatchers.IO) {
+                    Glide.get(parent.context).clearDiskCache()
+                    Log.d("Glide", "disk cache cleared!")
+                }
+            }
         }
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/PreloadThumbnailsFeatureConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/config/PreloadThumbnailsFeatureConfig.kt
new file mode 100644
index 000000000000..5da2da469cee
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/util/config/PreloadThumbnailsFeatureConfig.kt
@@ -0,0 +1,12 @@
+package org.wordpress.android.util.config
+
+import org.wordpress.android.BuildConfig
+import org.wordpress.android.annotation.FeatureInDevelopment
+import javax.inject.Inject
+
+/**
+ * Configuration of the Site Name step in the Site Creation flow
+ */
+@FeatureInDevelopment
+class PreloadThumbnailsFeatureConfig
+@Inject constructor(appConfig: AppConfig) : FeatureConfig(appConfig, BuildConfig.PRELOAD_THUMBNAILS)

From aa00844433132f05d0a4efa075faff0047740dc7 Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Wed, 18 May 2022 18:43:57 +1000
Subject: [PATCH 083/111] Disable volley cache for MShots loader

For some reason, deleting the Glide cache was not enough, and disabling
the volley cache was still not enough to prevent a cache hit. I suspect
that there is an additional cache later on the network side of things.
Nevertheless, we may want to keep the volley cache disabled, to prevent
3 layers of duplicate cache.
---
 .../java/org/wordpress/android/networking/GlideMShotsLoader.kt   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/networking/GlideMShotsLoader.kt b/WordPress/src/main/java/org/wordpress/android/networking/GlideMShotsLoader.kt
index 9ff08f772c48..1753309a940c 100644
--- a/WordPress/src/main/java/org/wordpress/android/networking/GlideMShotsLoader.kt
+++ b/WordPress/src/main/java/org/wordpress/android/networking/GlideMShotsLoader.kt
@@ -32,6 +32,7 @@ class MShot(val url: String)
 class GlideMShotsLoader(noRedirectsRequestQueue: RequestQueue) : ModelLoader<MShot, InputStream> {
     private val requestFactory = VolleyRequestFactory { url, callback, priority, headers ->
         VolleyStreamFetcher.GlideRequest(url, callback, priority, headers).apply {
+            setShouldCache(false) // <- Maybe we should add this here to avoid duplicating cache in Volley?
             retryPolicy = DefaultRetryPolicy(DEFAULT_TIMEOUT_MS, MAX_RETRIES, DEFAULT_BACKOFF_MULT)
         }
     }

From 1ce7d7c3420e43d16a4ea11b373036ac225714cb Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Wed, 18 May 2022 18:46:25 +1000
Subject: [PATCH 084/111] Add reminder note about nested recycler viewholder
 pool

The nested recycler views can only utilized a shared pool if they are
given the same instance of the pool. We can either remove the line, or
keep a reference to the instance at a higher level in the hierarchy, so
that the children recycler views can share a pool of view holders.
---
 .../wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
index bf617d1b6b9b..ed076027d046 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
@@ -49,6 +49,7 @@ class LayoutsItemViewHolder(
                     RecyclerView.HORIZONTAL,
                     false
             ).apply { initialPrefetchItemCount = prefetchItemCount }
+            // TODO: use a shared instance of the pool (or alternatively, remove this?)
             setRecycledViewPool(RecyclerView.RecycledViewPool())
             adapter = LayoutsAdapter(parent.context, dimensionProvider)
 

From 46cd6c063dfbf2d827e794ca51cc2fa32bdfe63c Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Wed, 18 May 2022 18:49:45 +1000
Subject: [PATCH 085/111] Implement preloader function in main site creation
 view model

---
 .../ui/sitecreation/SiteCreationMainVM.kt     | 45 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt
index bf63ac0077cb..e9b3a901a6f2 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt
@@ -1,14 +1,21 @@
 package org.wordpress.android.ui.sitecreation
 
 import android.annotation.SuppressLint
+import android.content.Context
 import android.os.Bundle
 import android.os.Parcelable
 import androidx.annotation.StringRes
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.bumptech.glide.Glide
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
 import kotlinx.parcelize.Parcelize
 import org.wordpress.android.R
+import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.ui.sitecreation.SiteCreationMainVM.SiteCreationScreenTitle.ScreenTitleEmpty
 import org.wordpress.android.ui.sitecreation.SiteCreationMainVM.SiteCreationScreenTitle.ScreenTitleGeneral
 import org.wordpress.android.ui.sitecreation.SiteCreationMainVM.SiteCreationScreenTitle.ScreenTitleStepCount
@@ -18,7 +25,9 @@ import org.wordpress.android.ui.sitecreation.SiteCreationStep.SITE_PREVIEW
 import org.wordpress.android.ui.sitecreation.misc.SiteCreationSource
 import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker
 import org.wordpress.android.ui.sitecreation.previews.SitePreviewViewModel.CreateSiteState
+import org.wordpress.android.ui.sitecreation.usecases.FetchHomePageLayoutsUseCase
 import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.util.NetworkUtilsWrapper
 import org.wordpress.android.util.experiments.SiteNameABExperiment
 import org.wordpress.android.util.wizard.WizardManager
 import org.wordpress.android.util.wizard.WizardNavigationTarget
@@ -48,13 +57,28 @@ typealias NavigationTarget = WizardNavigationTarget<SiteCreationStep, SiteCreati
 class SiteCreationMainVM @Inject constructor(
     private val tracker: SiteCreationTracker,
     private val wizardManager: WizardManager<SiteCreationStep>,
-    private val siteNameABExperiment: SiteNameABExperiment
+    private val siteNameABExperiment: SiteNameABExperiment,
+    private val networkUtils: NetworkUtilsWrapper,
+    private val dispatcher: Dispatcher,
+    private val fetchHomePageLayoutsUseCase: FetchHomePageLayoutsUseCase,
 ) : ViewModel() {
+    init {
+        // TODO: Remove the duplicate {,un}registration in the picker view model
+        dispatcher.register(fetchHomePageLayoutsUseCase)
+    }
+
+    override fun onCleared() {
+        super.onCleared()
+        dispatcher.unregister(fetchHomePageLayoutsUseCase)
+    }
+
     private var isStarted = false
     private var siteCreationCompleted = false
 
     private lateinit var siteCreationState: SiteCreationState
 
+    internal var preloadingJob: Job? = null
+
     val navigationTargetObservable: SingleEventObservable<NavigationTarget> by lazy {
         SingleEventObservable(
                 Transformations.map(wizardManager.navigatorLiveData) {
@@ -95,6 +119,25 @@ class SiteCreationMainVM @Inject constructor(
         }
     }
 
+    fun preloadThumbnails(context: Context) {
+        if (preloadingJob == null) {
+            preloadingJob = viewModelScope.launch (Dispatchers.IO) {
+                if (networkUtils.isNetworkAvailable()) {
+                    val response = fetchHomePageLayoutsUseCase.fetchStarterDesigns()
+                    for (design in response.designs) {
+                        Glide.with(context)
+                                .downloadOnly()
+                                .load(design.previewMobile)
+                                .submit()
+                                .get() // This makes each call blocking, so subsequent calls can be cancelled if needed.
+                    }
+                    preloadingJob = null
+                }
+            }
+        }
+    }
+
+
     fun writeToBundle(outState: Bundle) {
         outState.putBoolean(KEY_SITE_CREATION_COMPLETED, siteCreationCompleted)
         outState.putInt(KEY_CURRENT_STEP, wizardManager.currentStep)

From 04a4cdb4e5d0db842d7b5c6715148f1c5f87d6ad Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Wed, 18 May 2022 18:50:16 +1000
Subject: [PATCH 086/111] Invoke preloading at the start, and cancel before
 theme picker loads

---
 .../android/ui/sitecreation/SiteCreationActivity.kt | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
index 5c659392831d..ea192ff6de11 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
@@ -7,6 +7,7 @@ import android.view.MenuItem
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
+import kotlinx.coroutines.cancel
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.ui.ActivityLauncher
@@ -43,6 +44,7 @@ import org.wordpress.android.ui.sitecreation.verticals.SiteCreationIntentsFragme
 import org.wordpress.android.ui.sitecreation.verticals.SiteCreationIntentsViewModel
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.ActivityUtils
+import org.wordpress.android.util.config.PreloadThumbnailsFeatureConfig
 import org.wordpress.android.util.config.SiteNameFeatureConfig
 import org.wordpress.android.util.wizard.WizardNavigationTarget
 import javax.inject.Inject
@@ -63,6 +65,8 @@ class SiteCreationActivity : LocaleAwareActivity(),
     private lateinit var hppViewModel: HomePagePickerViewModel
     private lateinit var siteCreationIntentsViewModel: SiteCreationIntentsViewModel
     private lateinit var siteCreationSiteNameViewModel: SiteCreationSiteNameViewModel
+    // TODO: remove this (it is for testing convenience)
+    @Inject internal lateinit var preloadThumbnailsFeatureConfig: PreloadThumbnailsFeatureConfig
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -76,6 +80,9 @@ class SiteCreationActivity : LocaleAwareActivity(),
                 .get(SiteCreationSiteNameViewModel::class.java)
         val siteCreationSource = intent.extras?.getString(ARG_CREATE_SITE_SOURCE)
         mainViewModel.start(savedInstanceState, SiteCreationSource.fromString(siteCreationSource))
+        if (preloadThumbnailsFeatureConfig.isEnabled()) {
+            mainViewModel.preloadThumbnails(this)
+        }
 
         observeVMState()
     }
@@ -177,6 +184,12 @@ class SiteCreationActivity : LocaleAwareActivity(),
     }
 
     private fun showStep(target: WizardNavigationTarget<SiteCreationStep, SiteCreationState>) {
+        // Cancel preload job before displaying the theme picker.
+        if (target.wizardStep == SITE_DESIGNS) {
+            mainViewModel.preloadingJob?.cancel(
+                    "Preload did not complete before theme picker was shown."
+            )
+        }
         val screenTitle = getScreenTitle(target.wizardStep)
         val fragment = when (target.wizardStep) {
             INTENTS -> SiteCreationIntentsFragment()

From 1faffab232fc5228596637a96d2a20d2f73e299f Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Thu, 19 May 2022 10:33:33 +0300
Subject: [PATCH 087/111] Sets the loading skeleton to the size of the
 recommended row

---
 .../ui/sitecreation/theme/HomePagePickerFragment.kt        | 7 +++++--
 .../res/layout/modal_layout_picker_layouts_skeleton.xml    | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index f715138b3831..7ba9b9a2e8f7 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -83,9 +83,12 @@ class HomePagePickerFragment : Fragment() {
     private fun HomePagePickerFragmentBinding.setupUi() {
         siteCreationThemeHeader.title?.setText(R.string.hpp_title)
         siteCreationThemeHeader.subtitle?.isGone = true
+        modalLayoutPickerLayoutsSkeleton.layoutsSkeleton.updateLayoutParams {
+            height = recommendedDimensionProvider.rowHeight
+        }
         modalLayoutPickerLayoutsSkeleton.skeletonCardView.updateLayoutParams {
-            height = thumbDimensionProvider.previewHeight
-            width = thumbDimensionProvider.previewWidth
+            height = recommendedDimensionProvider.previewHeight
+            width = recommendedDimensionProvider.previewWidth
         }
     }
 
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
index 3eafa9306bc3..3de74cd4929c 100644
--- a/WordPress/src/main/res/layout/modal_layout_picker_layouts_skeleton.xml
+++ b/WordPress/src/main/res/layout/modal_layout_picker_layouts_skeleton.xml
@@ -15,7 +15,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/mlp_layouts_row_height"
+            android:layout_height="match_parent"
             android:orientation="vertical">
 
             <View style="@style/ModalLayoutPickerLayoutsSeparatorLine"

From 283d30eaa27b64c0e83f75ea196a9ef9fac28e3e Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Thu, 19 May 2022 12:52:02 +0300
Subject: [PATCH 088/111] Sets the correct height in the Page Layout Picker

---
 .../org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt
index 8e0dc57405ec..d61ffaf33e34 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt
@@ -98,6 +98,9 @@ class ModalLayoutPickerFragment : FullscreenBottomSheetDialogFragment() {
                 viewModel.onThumbnailModePressed()
             }
 
+            modalLayoutPickerLayoutsSkeleton.layoutsSkeleton.updateLayoutParams {
+                height = thumbDimensionProvider.rowHeight
+            }
             modalLayoutPickerLayoutsSkeleton.skeletonCardView.updateLayoutParams {
                 height = thumbDimensionProvider.previewHeight
                 width = thumbDimensionProvider.previewWidth

From 12f8f4c4e3dad97ded83a0d28dfb9945153e2efc Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Fri, 20 May 2022 15:04:26 +0300
Subject: [PATCH 089/111] Fixes Lint issue

---
 .../android/ui/debug/DebugSettingsItemViewHolder.kt        | 7 ++++---
 .../android/ui/sitecreation/SiteCreationMainVM.kt          | 5 ++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/debug/DebugSettingsItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/debug/DebugSettingsItemViewHolder.kt
index e90fbb1df7a9..bbfee3b30aa6 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/debug/DebugSettingsItemViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/debug/DebugSettingsItemViewHolder.kt
@@ -13,9 +13,7 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import com.bumptech.glide.Glide
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
-import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.withContext
 import org.wordpress.android.R
 import org.wordpress.android.databinding.DebugSettingsRowBinding
 import org.wordpress.android.ui.debug.DebugSettingsViewModel.UiItem
@@ -42,7 +40,10 @@ sealed class DebugSettingsItemViewHolder(
         }
     }
 
-    class FeatureViewHolder(val parent: ViewGroup) : DebugSettingsItemViewHolder(parent, R.layout.debug_settings_feature) {
+    class FeatureViewHolder(val parent: ViewGroup) : DebugSettingsItemViewHolder(
+            parent,
+            R.layout.debug_settings_feature
+    ) {
         private val title = itemView.findViewById<TextView>(R.id.feature_title)
         private val enabled = itemView.findViewById<CheckBox>(R.id.feature_enabled)
         private val unknown = itemView.findViewById<ImageView>(R.id.unknown_icon)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt
index 8bca4ccb5035..fcf9b565ec5f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt
@@ -62,7 +62,7 @@ class SiteCreationMainVM @Inject constructor(
     private val siteNameABExperiment: SiteNameABExperiment,
     private val networkUtils: NetworkUtilsWrapper,
     private val dispatcher: Dispatcher,
-    private val fetchHomePageLayoutsUseCase: FetchHomePageLayoutsUseCase,
+    private val fetchHomePageLayoutsUseCase: FetchHomePageLayoutsUseCase
 ) : ViewModel() {
     init {
         // TODO: Remove the duplicate {,un}registration in the picker view model
@@ -123,7 +123,7 @@ class SiteCreationMainVM @Inject constructor(
 
     fun preloadThumbnails(context: Context) {
         if (preloadingJob == null) {
-            preloadingJob = viewModelScope.launch (Dispatchers.IO) {
+            preloadingJob = viewModelScope.launch(Dispatchers.IO) {
                 if (networkUtils.isNetworkAvailable()) {
                     val response = fetchHomePageLayoutsUseCase.fetchStarterDesigns()
                     for (design in response.designs) {
@@ -139,7 +139,6 @@ class SiteCreationMainVM @Inject constructor(
         }
     }
 
-
     fun writeToBundle(outState: Bundle) {
         outState.putBoolean(KEY_SITE_CREATION_COMPLETED, siteCreationCompleted)
         outState.putInt(KEY_CURRENT_STEP, wizardManager.currentStep)

From 86f014ef3c1397ac79ec372021768131047a987e Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Fri, 20 May 2022 18:21:27 +0300
Subject: [PATCH 090/111] Updates view model test with the new parameters

---
 .../ui/sitecreation/SiteCreationMainVMTest.kt | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVMTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVMTest.kt
index 5cb6c07fb487..710f1b0a0935 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVMTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVMTest.kt
@@ -21,6 +21,7 @@ import org.mockito.ArgumentCaptor
 import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.wordpress.android.R
+import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.model.experiments.Variation
 import org.wordpress.android.fluxc.model.experiments.Variation.Control
 import org.wordpress.android.ui.sitecreation.SiteCreationMainVM.SiteCreationScreenTitle.ScreenTitleEmpty
@@ -30,6 +31,8 @@ import org.wordpress.android.ui.sitecreation.misc.SiteCreationSource
 import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker
 import org.wordpress.android.ui.sitecreation.previews.SitePreviewViewModel.CreateSiteState
 import org.wordpress.android.ui.sitecreation.previews.SitePreviewViewModel.CreateSiteState.SiteCreationCompleted
+import org.wordpress.android.ui.sitecreation.usecases.FetchHomePageLayoutsUseCase
+import org.wordpress.android.util.NetworkUtilsWrapper
 import org.wordpress.android.util.experiments.SiteNameABExperiment
 import org.wordpress.android.util.wizard.WizardManager
 import org.wordpress.android.viewmodel.SingleLiveEvent
@@ -58,6 +61,9 @@ class SiteCreationMainVMTest {
     @Mock lateinit var wizardManager: WizardManager<SiteCreationStep>
     @Mock lateinit var siteCreationStep: SiteCreationStep
     @Mock lateinit var siteNameABExperiment: SiteNameABExperiment
+    @Mock lateinit var networkUtils: NetworkUtilsWrapper
+    @Mock lateinit var dispatcher: Dispatcher
+    @Mock lateinit var fetchHomePageLayoutsUseCase: FetchHomePageLayoutsUseCase
     private val wizardManagerNavigatorLiveData = SingleLiveEvent<SiteCreationStep>()
 
     private lateinit var viewModel: SiteCreationMainVM
@@ -69,7 +75,7 @@ class SiteCreationMainVMTest {
             wizardManagerNavigatorLiveData.value = siteCreationStep
             Unit
         }
-        viewModel = SiteCreationMainVM(tracker, wizardManager, siteNameABExperiment)
+        viewModel = getNewViewModel()
         viewModel.start(null, SiteCreationSource.UNSPECIFIED)
         viewModel.navigationTargetObservable.observeForever(navigationTargetObserver)
         viewModel.wizardFinishedObservable.observeForever(wizardFinishedObserver)
@@ -84,16 +90,16 @@ class SiteCreationMainVMTest {
     @Test
     fun siteCreationSiteNameExperimentControlTracked() {
         whenever(siteNameABExperiment.getVariation()).thenReturn(Control)
-        viewModel = SiteCreationMainVM(tracker, wizardManager, siteNameABExperiment)
-        viewModel.start(null, SiteCreationSource.UNSPECIFIED)
+        val newViewModel = getNewViewModel()
+        newViewModel.start(null, SiteCreationSource.UNSPECIFIED)
         verify(tracker).trackSiteNameExperimentVariation(Control)
     }
 
     @Test
     fun siteCreationSiteNameExperimentTreatmentTracked() {
         whenever(siteNameABExperiment.getVariation()).thenReturn(Variation.fromName("wpandroid_site_name_v1"))
-        viewModel = SiteCreationMainVM(tracker, wizardManager, siteNameABExperiment)
-        viewModel.start(null, SiteCreationSource.UNSPECIFIED)
+        val newViewModel = getNewViewModel()
+        newViewModel.start(null, SiteCreationSource.UNSPECIFIED)
         verify(tracker).trackSiteNameExperimentVariation(Variation.fromName("wpandroid_site_name_v1"))
     }
 
@@ -220,7 +226,7 @@ class SiteCreationMainVMTest {
                 .thenReturn(expectedState)
 
         // we need to create a new instance of the VM as the `viewModel` has already been started in setUp()
-        val newViewModel = SiteCreationMainVM(tracker, wizardManager, siteNameABExperiment)
+        val newViewModel = getNewViewModel()
         newViewModel.start(savedInstanceState, SiteCreationSource.UNSPECIFIED)
 
         /* we need to simulate navigation to the next step (Domain selection, see comment above) as
@@ -241,7 +247,7 @@ class SiteCreationMainVMTest {
                 .thenReturn(SiteCreationState())
 
         // we need to create a new instance of the VM as the `viewModel` has already been started in setUp()
-        val newViewModel = SiteCreationMainVM(tracker, wizardManager, siteNameABExperiment)
+        val newViewModel = getNewViewModel()
         newViewModel.start(savedInstanceState, SiteCreationSource.UNSPECIFIED)
 
         verify(wizardManager).setCurrentStepIndex(index)
@@ -249,7 +255,7 @@ class SiteCreationMainVMTest {
 
     @Test
     fun `given null instance state, when start, then site creation accessed including source is tracked`() {
-        val newViewModel = SiteCreationMainVM(tracker, wizardManager, siteNameABExperiment)
+        val newViewModel = getNewViewModel()
         newViewModel.start(null, SiteCreationSource.UNSPECIFIED)
 
         // Because setup is run before every test, we expect this to be tracked twice
@@ -264,7 +270,7 @@ class SiteCreationMainVMTest {
         whenever(savedInstanceState.getParcelable<SiteCreationState>(KEY_SITE_CREATION_STATE))
                 .thenReturn(expectedState)
 
-        val newViewModel = SiteCreationMainVM(tracker, wizardManager, siteNameABExperiment)
+        val newViewModel = getNewViewModel()
         newViewModel.start(savedInstanceState, SiteCreationSource.UNSPECIFIED)
 
         // Because setup is run before every test, we expect this to be tracked on that first instance only
@@ -273,4 +279,13 @@ class SiteCreationMainVMTest {
 
     private fun currentWizardState(vm: SiteCreationMainVM) =
             vm.navigationTargetObservable.lastEvent!!.wizardState
+
+    private fun getNewViewModel() = SiteCreationMainVM(
+            tracker,
+            wizardManager,
+            siteNameABExperiment,
+            networkUtils,
+            dispatcher,
+            fetchHomePageLayoutsUseCase
+    )
 }

From ba5f8c1638520457b02a33c3b6180191af36b4c2 Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Mon, 23 May 2022 11:46:53 +1000
Subject: [PATCH 091/111] Move preload cancellation inside when expression

---
 .../ui/sitecreation/SiteCreationActivity.kt      | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
index cebd0db6139e..58bd66f0a4f8 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
@@ -177,17 +177,19 @@ class SiteCreationActivity : LocaleAwareActivity(),
     }
 
     private fun showStep(target: WizardNavigationTarget<SiteCreationStep, SiteCreationState>) {
-        // Cancel preload job before displaying the theme picker.
-        if (target.wizardStep == SITE_DESIGNS) {
-            mainViewModel.preloadingJob?.cancel(
-                    "Preload did not complete before theme picker was shown."
-            )
-        }
         val screenTitle = getScreenTitle(target.wizardStep)
         val fragment = when (target.wizardStep) {
             INTENTS -> SiteCreationIntentsFragment()
             SITE_NAME -> SiteCreationSiteNameFragment.newInstance(target.wizardState.siteIntent)
-            SITE_DESIGNS -> HomePagePickerFragment.newInstance(target.wizardState.siteIntent)
+            SITE_DESIGNS -> {
+                // Cancel preload job before displaying the theme picker.
+                if (target.wizardStep == SITE_DESIGNS) {
+                    mainViewModel.preloadingJob?.cancel(
+                            "Preload did not complete before theme picker was shown."
+                    )
+                }
+                HomePagePickerFragment.newInstance(target.wizardState.siteIntent)
+            }
             DOMAINS -> SiteCreationDomainsFragment.newInstance(
                     screenTitle
             )

From 290593e06f786d7bb35a50c8639eefa51c4c4020 Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Mon, 23 May 2022 11:53:53 +1000
Subject: [PATCH 092/111] Set preloading null outside of network check

---
 .../org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt
index fcf9b565ec5f..87de51eabc10 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt
@@ -133,8 +133,8 @@ class SiteCreationMainVM @Inject constructor(
                                 .submit()
                                 .get() // This makes each call blocking, so subsequent calls can be cancelled if needed.
                     }
-                    preloadingJob = null
                 }
+                preloadingJob = null
             }
         }
     }

From 1a67643450e31417f713dd056cbafbea22bda91d Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Mon, 23 May 2022 15:21:55 +1000
Subject: [PATCH 093/111] Revert "Add temporary feature flag to facilitate
 testing"

This reverts commit 2383dc9a2311771d4134780fb33e60fa018ebe54.
---
 WordPress/build.gradle                        |  2 --
 .../ui/debug/DebugSettingsItemViewHolder.kt   | 33 ++-----------------
 .../ui/sitecreation/SiteCreationActivity.kt   |  7 +---
 .../config/PreloadThumbnailsFeatureConfig.kt  | 12 -------
 4 files changed, 4 insertions(+), 50 deletions(-)
 delete mode 100644 WordPress/src/main/java/org/wordpress/android/util/config/PreloadThumbnailsFeatureConfig.kt

diff --git a/WordPress/build.gradle b/WordPress/build.gradle
index a84743e64536..02d4b6b139d7 100644
--- a/WordPress/build.gradle
+++ b/WordPress/build.gradle
@@ -128,8 +128,6 @@ android {
         buildConfigField "boolean", "QUICK_START_EXISTING_USERS_V2", "false"
         buildConfigField "boolean", "QRCODE_AUTH_FLOW", "false"
         buildConfigField "boolean", "BETA_SITE_DESIGNS", "false"
-        // Including this temporarily, to facilitate testing.
-        buildConfigField "boolean", "PRELOAD_THUMBNAILS", "false"
 
         // Override these constants in jetpack product flavor to enable/ disable features
         buildConfigField "boolean", "ENABLE_SITE_CREATION", "true"
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/debug/DebugSettingsItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/debug/DebugSettingsItemViewHolder.kt
index bbfee3b30aa6..314bbf21ea2f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/debug/DebugSettingsItemViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/debug/DebugSettingsItemViewHolder.kt
@@ -1,6 +1,5 @@
 package org.wordpress.android.ui.debug
 
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -10,10 +9,6 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.LayoutRes
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
-import com.bumptech.glide.Glide
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.runBlocking
 import org.wordpress.android.R
 import org.wordpress.android.databinding.DebugSettingsRowBinding
 import org.wordpress.android.ui.debug.DebugSettingsViewModel.UiItem
@@ -40,10 +35,7 @@ sealed class DebugSettingsItemViewHolder(
         }
     }
 
-    class FeatureViewHolder(val parent: ViewGroup) : DebugSettingsItemViewHolder(
-            parent,
-            R.layout.debug_settings_feature
-    ) {
+    class FeatureViewHolder(parent: ViewGroup) : DebugSettingsItemViewHolder(parent, R.layout.debug_settings_feature) {
         private val title = itemView.findViewById<TextView>(R.id.feature_title)
         private val enabled = itemView.findViewById<CheckBox>(R.id.feature_enabled)
         private val unknown = itemView.findViewById<ImageView>(R.id.unknown_icon)
@@ -65,27 +57,8 @@ sealed class DebugSettingsItemViewHolder(
                     unknown.visibility = View.VISIBLE
                 }
             }
-            // To facilitate testing, clear the Glide memory and disk caches every time the flag is toggled
-            enabled.setOnCheckedChangeListener { _, _ ->
-                item.toggleAction.toggle()
-                clearGlideCache()
-            }
-            itemView.setOnClickListener {
-                item.toggleAction.toggle()
-                clearGlideCache()
-            }
-        }
-
-        // Cheap hack for testing ;)
-        fun clearGlideCache() {
-            runBlocking {
-                Glide.get(parent.context).clearMemory()
-                Log.d("Glide", "memory cache cleared!")
-                async(Dispatchers.IO) {
-                    Glide.get(parent.context).clearDiskCache()
-                    Log.d("Glide", "disk cache cleared!")
-                }
-            }
+            enabled.setOnCheckedChangeListener { _, _ -> item.toggleAction.toggle() }
+            itemView.setOnClickListener { item.toggleAction.toggle() }
         }
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
index 58bd66f0a4f8..67dc19f3b603 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
@@ -44,7 +44,6 @@ import org.wordpress.android.ui.sitecreation.verticals.SiteCreationIntentsFragme
 import org.wordpress.android.ui.sitecreation.verticals.SiteCreationIntentsViewModel
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.ActivityUtils
-import org.wordpress.android.util.config.PreloadThumbnailsFeatureConfig
 import org.wordpress.android.util.config.SiteNameFeatureConfig
 import org.wordpress.android.util.wizard.WizardNavigationTarget
 import javax.inject.Inject
@@ -65,17 +64,13 @@ class SiteCreationActivity : LocaleAwareActivity(),
     private val hppViewModel: HomePagePickerViewModel by viewModels()
     private val siteCreationIntentsViewModel: SiteCreationIntentsViewModel by viewModels()
     private val siteCreationSiteNameViewModel: SiteCreationSiteNameViewModel by viewModels()
-    // TODO: remove this (it is for testing convenience)
-    @Inject internal lateinit var preloadThumbnailsFeatureConfig: PreloadThumbnailsFeatureConfig
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.site_creation_activity)
         val siteCreationSource = intent.extras?.getString(ARG_CREATE_SITE_SOURCE)
         mainViewModel.start(savedInstanceState, SiteCreationSource.fromString(siteCreationSource))
-        if (preloadThumbnailsFeatureConfig.isEnabled()) {
-            mainViewModel.preloadThumbnails(this)
-        }
+        mainViewModel.preloadThumbnails(this)
 
         observeVMState()
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/PreloadThumbnailsFeatureConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/config/PreloadThumbnailsFeatureConfig.kt
deleted file mode 100644
index 5da2da469cee..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/util/config/PreloadThumbnailsFeatureConfig.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.wordpress.android.util.config
-
-import org.wordpress.android.BuildConfig
-import org.wordpress.android.annotation.FeatureInDevelopment
-import javax.inject.Inject
-
-/**
- * Configuration of the Site Name step in the Site Creation flow
- */
-@FeatureInDevelopment
-class PreloadThumbnailsFeatureConfig
-@Inject constructor(appConfig: AppConfig) : FeatureConfig(appConfig, BuildConfig.PRELOAD_THUMBNAILS)

From 0cfce3d95cf1c00daa4009d2d25a77bbf0cf2967 Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Mon, 23 May 2022 15:22:24 +1000
Subject: [PATCH 094/111] Revert "Disable volley cache for MShots loader"

This reverts commit aa00844433132f05d0a4efa075faff0047740dc7.
---
 .../java/org/wordpress/android/networking/GlideMShotsLoader.kt   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/networking/GlideMShotsLoader.kt b/WordPress/src/main/java/org/wordpress/android/networking/GlideMShotsLoader.kt
index 1753309a940c..9ff08f772c48 100644
--- a/WordPress/src/main/java/org/wordpress/android/networking/GlideMShotsLoader.kt
+++ b/WordPress/src/main/java/org/wordpress/android/networking/GlideMShotsLoader.kt
@@ -32,7 +32,6 @@ class MShot(val url: String)
 class GlideMShotsLoader(noRedirectsRequestQueue: RequestQueue) : ModelLoader<MShot, InputStream> {
     private val requestFactory = VolleyRequestFactory { url, callback, priority, headers ->
         VolleyStreamFetcher.GlideRequest(url, callback, priority, headers).apply {
-            setShouldCache(false) // <- Maybe we should add this here to avoid duplicating cache in Volley?
             retryPolicy = DefaultRetryPolicy(DEFAULT_TIMEOUT_MS, MAX_RETRIES, DEFAULT_BACKOFF_MULT)
         }
     }

From b2f99c7240e2de40b03b0a82808893cefc37754c Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Mon, 23 May 2022 15:28:56 +1000
Subject: [PATCH 095/111] Remove instantiation of nested recycledViewPools

---
 .../wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt
index 7821dbaf7159..887cc8d004cd 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt
@@ -56,8 +56,6 @@ class LayoutsItemViewHolder(
                     RecyclerView.HORIZONTAL,
                     false
             ).apply { initialPrefetchItemCount = prefetchItemCount }
-            // TODO: use a shared instance of the pool (or alternatively, remove this?)
-            setRecycledViewPool(RecyclerView.RecycledViewPool())
             adapter = LayoutsAdapter(parent.context, dimensionProvider)
 
             addOnScrollListener(object : OnScrollListener() {

From 34b10eb9faa00f97a3744990b816275ef73f66f4 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Mon, 23 May 2022 10:29:29 +0200
Subject: [PATCH 096/111] Add divider on top of helper text of site theme
 screen

---
 .../main/res/drawable/top_divider_background.xml   | 14 ++++++++++++++
 .../main/res/layout/home_page_picker_footer.xml    |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 WordPress/src/main/res/drawable/top_divider_background.xml

diff --git a/WordPress/src/main/res/drawable/top_divider_background.xml b/WordPress/src/main/res/drawable/top_divider_background.xml
new file mode 100644
index 000000000000..83dccbf33ba7
--- /dev/null
+++ b/WordPress/src/main/res/drawable/top_divider_background.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:left="-8dp"
+        android:right="-8dp"
+        android:bottom="-8dp">
+        <shape>
+            <solid android:color="@android:color/transparent" />
+            <stroke
+                android:width="@dimen/bottom_tabs_divider_size"
+                android:color="@color/material_on_surface_disabled" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/WordPress/src/main/res/layout/home_page_picker_footer.xml b/WordPress/src/main/res/layout/home_page_picker_footer.xml
index b6fa197affd3..2e2fd93c31c4 100644
--- a/WordPress/src/main/res/layout/home_page_picker_footer.xml
+++ b/WordPress/src/main/res/layout/home_page_picker_footer.xml
@@ -12,6 +12,7 @@
         android:padding="@dimen/margin_large"
         android:text="@string/hpp_bottom_helper_text"
         android:drawablePadding="@dimen/margin_large"
+        android:background="@drawable/top_divider_background"
         app:drawableStartCompat="@drawable/ic_info_outline_grey_dark_24dp"
         app:drawableTint="?attr/colorOnSurface"
         app:layout_constraintTop_toTopOf="parent"

From a6df1eebffe49c04075ec5bb88ca9c2fedc58031 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Mon, 23 May 2022 10:29:53 +0200
Subject: [PATCH 097/111] Increase padding of helper text to 16dp

---
 WordPress/src/main/res/layout/home_page_picker_footer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/src/main/res/layout/home_page_picker_footer.xml b/WordPress/src/main/res/layout/home_page_picker_footer.xml
index 2e2fd93c31c4..d79abe0b28a3 100644
--- a/WordPress/src/main/res/layout/home_page_picker_footer.xml
+++ b/WordPress/src/main/res/layout/home_page_picker_footer.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:padding="@dimen/margin_large"
         android:text="@string/hpp_bottom_helper_text"
-        android:drawablePadding="@dimen/margin_large"
+        android:drawablePadding="@dimen/margin_extra_large"
         android:background="@drawable/top_divider_background"
         app:drawableStartCompat="@drawable/ic_info_outline_grey_dark_24dp"
         app:drawableTint="?attr/colorOnSurface"

From efb8acc8a83e655d6ee0dfbd07c5668e28f54dfa Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Mon, 23 May 2022 10:30:26 +0200
Subject: [PATCH 098/111] Increase font size of category title on site theme

---
 .../ui/layoutpicker/LayoutCategoryAdapter.kt       |  4 ++--
 .../ui/layoutpicker/LayoutsRowViewHolder.kt        | 14 ++++++++++++--
 .../sitecreation/theme/HomePagePickerFragment.kt   |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
index 25ee2a80821e..88a6a6aef8ef 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
@@ -21,7 +21,7 @@ class LayoutCategoryAdapter(
     private var nestedScrollStates: Bundle,
     private val thumbDimensionProvider: ThumbDimensionProvider,
     private val recommendedDimensionProvider: ThumbDimensionProvider? = null,
-    private val showRowDividers: Boolean = true,
+    private val isPageLayoutCategory: Boolean = true,
     private val footerLayoutResId: Int? = null
 ) : Adapter<LayoutsRowViewHolder>() {
     private var items: List<LayoutCategoryUiState> = listOf()
@@ -66,7 +66,7 @@ class LayoutCategoryAdapter(
                             nestedScrollStates = nestedScrollStates,
                             thumbDimensionProvider = thumbDimensionProvider,
                             recommendedDimensionProvider = recommendedDimensionProvider,
-                            showRowDividers = showRowDividers
+                            isPageLayoutCategory = isPageLayoutCategory
                     )
             }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt
index 887cc8d004cd..67553423de65 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt
@@ -2,6 +2,7 @@ package org.wordpress.android.ui.layoutpicker
 
 import android.os.Bundle
 import android.os.Parcelable
+import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -12,6 +13,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.OnScrollListener
 import org.wordpress.android.R
+import org.wordpress.android.R.dimen
 import org.wordpress.android.util.extensions.setVisible
 
 sealed class LayoutsRowViewHolder(view: View) : RecyclerView.ViewHolder(view)
@@ -27,7 +29,7 @@ class LayoutsFooterViewHolder(parent: ViewGroup, footerLayoutResId: Int) :
 class LayoutsItemViewHolder(
     parent: ViewGroup,
     private val prefetchItemCount: Int = 4,
-    private val showRowDividers: Boolean,
+    private val isPageLayoutCategory: Boolean,
     private var nestedScrollStates: Bundle,
     private val thumbDimensionProvider: ThumbDimensionProvider,
     private val recommendedDimensionProvider: ThumbDimensionProvider?
@@ -49,7 +51,7 @@ class LayoutsItemViewHolder(
         itemView.updateLayoutParams {
             height = dimensionProvider.rowHeight
         }
-        itemView.findViewById<View>(R.id.layouts_row_separator_line).isVisible = showRowDividers
+        itemView.findViewById<View>(R.id.layouts_row_separator_line).isVisible = isPageLayoutCategory
         itemView.findViewById<RecyclerView>(R.id.layouts_recycler_view).apply {
             layoutManager = LinearLayoutManager(
                     context,
@@ -72,6 +74,14 @@ class LayoutsItemViewHolder(
         currentItem = category
 
         title.text = category.description
+
+        title.setTextSize(
+                TypedValue.COMPLEX_UNIT_PX,
+                title.resources.getDimensionPixelSize(
+                        if (isPageLayoutCategory) dimen.text_sz_large else dimen.text_sz_extra_large
+                ).toFloat()
+        )
+
         subtitle.setVisible(category.isRecommended)
         (recycler.adapter as LayoutsAdapter).setData(category.layouts)
         restoreScrollState(recycler, category.title)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index 7ba9b9a2e8f7..ad2bf97cc595 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -69,7 +69,7 @@ class HomePagePickerFragment : Fragment() {
                         viewModel.nestedScrollStates,
                         thumbDimensionProvider,
                         recommendedDimensionProvider,
-                        showRowDividers = false,
+                        isPageLayoutCategory = false,
                         footerLayoutResId = R.layout.home_page_picker_footer
                 )
             }

From ebcd379ac9ff7e88f2083c3442e98be6f6c9682d Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Mon, 23 May 2022 13:48:00 +0200
Subject: [PATCH 099/111] Fix increase padding of footer to 16dp

---
 WordPress/src/main/res/layout/home_page_picker_footer.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/src/main/res/layout/home_page_picker_footer.xml b/WordPress/src/main/res/layout/home_page_picker_footer.xml
index d79abe0b28a3..77b0de766ef0 100644
--- a/WordPress/src/main/res/layout/home_page_picker_footer.xml
+++ b/WordPress/src/main/res/layout/home_page_picker_footer.xml
@@ -9,9 +9,9 @@
         style="@style/SiteCreationHeaderV2Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/margin_large"
+        android:padding="@dimen/margin_extra_large"
         android:text="@string/hpp_bottom_helper_text"
-        android:drawablePadding="@dimen/margin_extra_large"
+        android:drawablePadding="@dimen/margin_large"
         android:background="@drawable/top_divider_background"
         app:drawableStartCompat="@drawable/ic_info_outline_grey_dark_24dp"
         app:drawableTint="?attr/colorOnSurface"

From 5351d7359ecba7942b946a72bb813cfe77ae1489 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Mon, 23 May 2022 14:03:42 +0200
Subject: [PATCH 100/111] Remove TODO comment from init of SiteCreationMainVM
 that is no longer relevant

---
 .../org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt
index 87de51eabc10..64bcbbe99468 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt
@@ -65,7 +65,6 @@ class SiteCreationMainVM @Inject constructor(
     private val fetchHomePageLayoutsUseCase: FetchHomePageLayoutsUseCase
 ) : ViewModel() {
     init {
-        // TODO: Remove the duplicate {,un}registration in the picker view model
         dispatcher.register(fetchHomePageLayoutsUseCase)
     }
 

From 0d522e690ae53261579b2f9f4d885805268fce4c Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Mon, 23 May 2022 14:07:55 +0200
Subject: [PATCH 101/111] Remove if condition for cancelling the preview
 preloading job

---
 .../android/ui/sitecreation/SiteCreationActivity.kt         | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
index 67dc19f3b603..764c23dd63ed 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
@@ -178,11 +178,7 @@ class SiteCreationActivity : LocaleAwareActivity(),
             SITE_NAME -> SiteCreationSiteNameFragment.newInstance(target.wizardState.siteIntent)
             SITE_DESIGNS -> {
                 // Cancel preload job before displaying the theme picker.
-                if (target.wizardStep == SITE_DESIGNS) {
-                    mainViewModel.preloadingJob?.cancel(
-                            "Preload did not complete before theme picker was shown."
-                    )
-                }
+                mainViewModel.preloadingJob?.cancel("Preload did not complete before theme picker was shown.")
                 HomePagePickerFragment.newInstance(target.wizardState.siteIntent)
             }
             DOMAINS -> SiteCreationDomainsFragment.newInstance(

From cefc268622e35d854152f76608f380346e0ec141 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Mon, 23 May 2022 14:53:42 +0200
Subject: [PATCH 102/111] Add bool prop for useLargeCategoryHeading to keep
 LayoutCategoryAdapter concerns tidy

---
 .../android/ui/layoutpicker/LayoutCategoryAdapter.kt       | 6 ++++--
 .../android/ui/layoutpicker/LayoutsRowViewHolder.kt        | 7 ++++---
 .../ui/sitecreation/theme/HomePagePickerFragment.kt        | 3 ++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
index 88a6a6aef8ef..5f1ca5813e22 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
@@ -21,7 +21,8 @@ class LayoutCategoryAdapter(
     private var nestedScrollStates: Bundle,
     private val thumbDimensionProvider: ThumbDimensionProvider,
     private val recommendedDimensionProvider: ThumbDimensionProvider? = null,
-    private val isPageLayoutCategory: Boolean = true,
+    private val showRowDividers: Boolean = true,
+    private val useLargeCategoryHeading: Boolean = false,
     private val footerLayoutResId: Int? = null
 ) : Adapter<LayoutsRowViewHolder>() {
     private var items: List<LayoutCategoryUiState> = listOf()
@@ -66,7 +67,8 @@ class LayoutCategoryAdapter(
                             nestedScrollStates = nestedScrollStates,
                             thumbDimensionProvider = thumbDimensionProvider,
                             recommendedDimensionProvider = recommendedDimensionProvider,
-                            isPageLayoutCategory = isPageLayoutCategory
+                            showRowDividers = showRowDividers,
+                            useLargeCategoryHeading = useLargeCategoryHeading
                     )
             }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt
index 67553423de65..f479e4917a04 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt
@@ -29,7 +29,8 @@ class LayoutsFooterViewHolder(parent: ViewGroup, footerLayoutResId: Int) :
 class LayoutsItemViewHolder(
     parent: ViewGroup,
     private val prefetchItemCount: Int = 4,
-    private val isPageLayoutCategory: Boolean,
+    private val showRowDividers: Boolean,
+    private val useLargeCategoryHeading: Boolean,
     private var nestedScrollStates: Bundle,
     private val thumbDimensionProvider: ThumbDimensionProvider,
     private val recommendedDimensionProvider: ThumbDimensionProvider?
@@ -51,7 +52,7 @@ class LayoutsItemViewHolder(
         itemView.updateLayoutParams {
             height = dimensionProvider.rowHeight
         }
-        itemView.findViewById<View>(R.id.layouts_row_separator_line).isVisible = isPageLayoutCategory
+        itemView.findViewById<View>(R.id.layouts_row_separator_line).isVisible = showRowDividers
         itemView.findViewById<RecyclerView>(R.id.layouts_recycler_view).apply {
             layoutManager = LinearLayoutManager(
                     context,
@@ -78,7 +79,7 @@ class LayoutsItemViewHolder(
         title.setTextSize(
                 TypedValue.COMPLEX_UNIT_PX,
                 title.resources.getDimensionPixelSize(
-                        if (isPageLayoutCategory) dimen.text_sz_large else dimen.text_sz_extra_large
+                        if (useLargeCategoryHeading) dimen.text_sz_extra_large else dimen.text_sz_large
                 ).toFloat()
         )
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index ad2bf97cc595..ef6a22965519 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -69,7 +69,8 @@ class HomePagePickerFragment : Fragment() {
                         viewModel.nestedScrollStates,
                         thumbDimensionProvider,
                         recommendedDimensionProvider,
-                        isPageLayoutCategory = false,
+                        showRowDividers = false,
+                        useLargeCategoryHeading = true,
                         footerLayoutResId = R.layout.home_page_picker_footer
                 )
             }

From fed9a50a06719149bb4ca568493746d9774e2fe9 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Mon, 23 May 2022 14:57:37 +0200
Subject: [PATCH 103/111] Move handling of row dividers to bind method block

---
 .../wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt
index f479e4917a04..ff3b85caed19 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt
@@ -39,6 +39,7 @@ class LayoutsItemViewHolder(
                 parent.context
         ).inflate(R.layout.modal_layout_picker_layouts_row, parent, false)
 ) {
+    private val rowDivider: View = itemView.findViewById(R.id.layouts_row_separator_line)
     private val title: TextView = itemView.findViewById(R.id.title)
     private val subtitle: TextView = itemView.findViewById(R.id.subtitle)
     private var currentItem: LayoutCategoryUiState? = null
@@ -52,7 +53,6 @@ class LayoutsItemViewHolder(
         itemView.updateLayoutParams {
             height = dimensionProvider.rowHeight
         }
-        itemView.findViewById<View>(R.id.layouts_row_separator_line).isVisible = showRowDividers
         itemView.findViewById<RecyclerView>(R.id.layouts_recycler_view).apply {
             layoutManager = LinearLayoutManager(
                     context,
@@ -74,6 +74,7 @@ class LayoutsItemViewHolder(
     fun bind(category: LayoutCategoryUiState) {
         currentItem = category
 
+        rowDivider.isVisible = showRowDividers
         title.text = category.description
 
         title.setTextSize(

From 62875654460d789e5778241b597cf2d176bf7db3 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Mon, 23 May 2022 14:59:35 +0200
Subject: [PATCH 104/111] Suppress LongParameterList check for
 LayoutsItemViewHolder ctor

---
 .../wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt
index ff3b85caed19..feba881c130a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsRowViewHolder.kt
@@ -26,6 +26,7 @@ class LayoutsFooterViewHolder(parent: ViewGroup, footerLayoutResId: Int) :
 /**
  * Modal Layout Picker layouts view holder
  */
+@Suppress("LongParameterList")
 class LayoutsItemViewHolder(
     parent: ViewGroup,
     private val prefetchItemCount: Int = 4,

From 579411321148b3ffbaa019b674497edb1cdfb633 Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Tue, 24 May 2022 12:24:08 +0300
Subject: [PATCH 105/111] Uses the custom Glide loader for preloading the
 MShots

---
 .../android/ui/sitecreation/SiteCreationMainVM.kt | 11 +++++------
 .../wordpress/android/util/image/ImageManager.kt  | 15 +++++++++++++++
 .../ui/sitecreation/SiteCreationMainVMTest.kt     |  5 ++++-
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt
index 64bcbbe99468..b07204131793 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt
@@ -17,6 +17,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.parcelize.Parcelize
 import org.wordpress.android.R
 import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.networking.MShot
 import org.wordpress.android.ui.sitecreation.SiteCreationMainVM.SiteCreationScreenTitle.ScreenTitleEmpty
 import org.wordpress.android.ui.sitecreation.SiteCreationMainVM.SiteCreationScreenTitle.ScreenTitleGeneral
 import org.wordpress.android.ui.sitecreation.SiteCreationMainVM.SiteCreationScreenTitle.ScreenTitleStepCount
@@ -30,6 +31,7 @@ import org.wordpress.android.ui.sitecreation.usecases.FetchHomePageLayoutsUseCas
 import org.wordpress.android.ui.utils.UiString.UiStringRes
 import org.wordpress.android.util.NetworkUtilsWrapper
 import org.wordpress.android.util.experiments.SiteNameABExperiment
+import org.wordpress.android.util.image.ImageManager
 import org.wordpress.android.util.wizard.WizardManager
 import org.wordpress.android.util.wizard.WizardNavigationTarget
 import org.wordpress.android.util.wizard.WizardState
@@ -62,7 +64,8 @@ class SiteCreationMainVM @Inject constructor(
     private val siteNameABExperiment: SiteNameABExperiment,
     private val networkUtils: NetworkUtilsWrapper,
     private val dispatcher: Dispatcher,
-    private val fetchHomePageLayoutsUseCase: FetchHomePageLayoutsUseCase
+    private val fetchHomePageLayoutsUseCase: FetchHomePageLayoutsUseCase,
+    private val imageManager: ImageManager
 ) : ViewModel() {
     init {
         dispatcher.register(fetchHomePageLayoutsUseCase)
@@ -126,11 +129,7 @@ class SiteCreationMainVM @Inject constructor(
                 if (networkUtils.isNetworkAvailable()) {
                     val response = fetchHomePageLayoutsUseCase.fetchStarterDesigns()
                     for (design in response.designs) {
-                        Glide.with(context)
-                                .downloadOnly()
-                                .load(design.previewMobile)
-                                .submit()
-                                .get() // This makes each call blocking, so subsequent calls can be cancelled if needed.
+                        imageManager.preload(context, MShot(design.previewMobile))
                     }
                 }
                 preloadingJob = null
diff --git a/WordPress/src/main/java/org/wordpress/android/util/image/ImageManager.kt b/WordPress/src/main/java/org/wordpress/android/util/image/ImageManager.kt
index 33f2c2df96e3..e26966fdcae6 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/image/ImageManager.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/image/ImageManager.kt
@@ -296,6 +296,21 @@ class ImageManager @Inject constructor(
                 .clearOnDetach()
     }
 
+    /**
+     * Preloads an [MShot].
+     *
+     * This is needed because the mshot service redirects to a loading gif image when the thumbnail is not ready.
+     * The loading is handled by [org.wordpress.android.networking.GlideMShotsLoader]
+     */
+    fun preload(context: Context, design: MShot) {
+        if (!context.isAvailable()) return
+        GlideApp.with(context)
+                .downloadOnly()
+                .load(design)
+                .submit()
+                .get() // This makes each call blocking, so subsequent calls can be cancelled if needed.
+    }
+
     /**
      * Loads an [MShot] into an [ImageView] and attaches a [RequestListener].
      *
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVMTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVMTest.kt
index 710f1b0a0935..d63f3270a991 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVMTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVMTest.kt
@@ -34,6 +34,7 @@ import org.wordpress.android.ui.sitecreation.previews.SitePreviewViewModel.Creat
 import org.wordpress.android.ui.sitecreation.usecases.FetchHomePageLayoutsUseCase
 import org.wordpress.android.util.NetworkUtilsWrapper
 import org.wordpress.android.util.experiments.SiteNameABExperiment
+import org.wordpress.android.util.image.ImageManager
 import org.wordpress.android.util.wizard.WizardManager
 import org.wordpress.android.viewmodel.SingleLiveEvent
 import org.wordpress.android.viewmodel.helpers.DialogHolder
@@ -64,6 +65,7 @@ class SiteCreationMainVMTest {
     @Mock lateinit var networkUtils: NetworkUtilsWrapper
     @Mock lateinit var dispatcher: Dispatcher
     @Mock lateinit var fetchHomePageLayoutsUseCase: FetchHomePageLayoutsUseCase
+    @Mock lateinit var imageManager: ImageManager
     private val wizardManagerNavigatorLiveData = SingleLiveEvent<SiteCreationStep>()
 
     private lateinit var viewModel: SiteCreationMainVM
@@ -286,6 +288,7 @@ class SiteCreationMainVMTest {
             siteNameABExperiment,
             networkUtils,
             dispatcher,
-            fetchHomePageLayoutsUseCase
+            fetchHomePageLayoutsUseCase,
+            imageManager
     )
 }

From 4e3f28a58a74220cb6038ae4fdbddf5e7a5e13a7 Mon Sep 17 00:00:00 2001
From: antonis <antonis.lilis@automattic.com>
Date: Tue, 24 May 2022 12:36:03 +0300
Subject: [PATCH 106/111] Removes unused import

---
 .../org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt
index b07204131793..d7ffe2a83056 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt
@@ -9,7 +9,6 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.bumptech.glide.Glide
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch

From b30c49caae959918929be1651fe27622b384649e Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@automattic.com>
Date: Tue, 31 May 2022 13:47:24 +0300
Subject: [PATCH 107/111] Adds release notes

---
 RELEASE-NOTES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index ead5b079e082..2c78f56ec2fb 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -2,7 +2,7 @@
 
 20.1
 -----
-
+* [*] Site creation: enhances the design selection screen with recommended designs [https://github.com/wordpress-mobile/WordPress-Android/pull/16468]
 
 20.0
 -----

From 66b37ebc97943fc348b84f815212464acb680904 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@automattic.com>
Date: Thu, 2 Jun 2022 16:17:37 +0300
Subject: [PATCH 108/111] Adds margin between recommended design title and
 subtitle

---
 .../src/main/res/layout/modal_layout_picker_layouts_row.xml      | 1 +
 WordPress/src/main/res/values/dimens.xml                         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/WordPress/src/main/res/layout/modal_layout_picker_layouts_row.xml b/WordPress/src/main/res/layout/modal_layout_picker_layouts_row.xml
index d032b8f76b82..80b8036756d8 100644
--- a/WordPress/src/main/res/layout/modal_layout_picker_layouts_row.xml
+++ b/WordPress/src/main/res/layout/modal_layout_picker_layouts_row.xml
@@ -13,6 +13,7 @@
         android:id="@+id/subtitle"
         style="@style/ModalLayoutPickerLayoutsSubtitle"
         android:layout_marginStart="@dimen/mlp_layout_card_margin_start"
+        android:layout_marginBottom="@dimen/hpp_recommended_subtitle_margin"
         android:text="@string/hpp_recommended_subtitle" />
     <TextView
         android:id="@+id/title"
diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml
index 73d7d98ef273..23dbf19f808b 100644
--- a/WordPress/src/main/res/values/dimens.xml
+++ b/WordPress/src/main/res/values/dimens.xml
@@ -662,6 +662,7 @@
     <dimen name="hpp_recommended_card_height">420dp</dimen>
     <dimen name="hpp_recommended_card_width">320dp</dimen>
     <dimen name="hpp_recommended_row_height">500dp</dimen>
+    <dimen name="hpp_recommended_subtitle_margin">5dp</dimen>
 
     <!-- Site Intent Question -->
     <dimen name="siq_header_scroll_snap_threshold">-96dp</dimen>

From eb916f852857c48633bdd44d9bdd70e1f12eaafe Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@automattic.com>
Date: Thu, 2 Jun 2022 16:45:25 +0300
Subject: [PATCH 109/111] Aligns overlay and stroke visibility in design
 selection

---
 .../org/wordpress/android/ui/layoutpicker/LayoutViewHolder.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutViewHolder.kt
index a5a100a6b2a1..14c5c927cc31 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutViewHolder.kt
@@ -41,7 +41,7 @@ class LayoutViewHolder(
         }
         binding.preview.contentDescription = parent.context.getString(uiState.contentDescriptionResId, uiState.title)
         binding.preview.context?.let { ctx ->
-            binding.layoutContainer.strokeWidth = if (uiState.selected) {
+            binding.layoutContainer.strokeWidth = if (uiState.selectedOverlayVisible) {
                 ctx.resources.getDimensionPixelSize(R.dimen.picker_header_selection_overlay_width)
             } else {
                 0

From f39946e965e1313d5ee1743d009d7bdf9c297f8b Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Fri, 3 Jun 2022 16:15:37 +1000
Subject: [PATCH 110/111] Save view model data in home page picker fragment on
 orientation changes

---
 .../android/ui/sitecreation/theme/HomePagePickerFragment.kt  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index ef6a22965519..aab9091630d8 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -81,6 +81,11 @@ class HomePagePickerFragment : Fragment() {
         }
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        viewModel.writeToBundle(outState)
+    }
+
     private fun HomePagePickerFragmentBinding.setupUi() {
         siteCreationThemeHeader.title?.setText(R.string.hpp_title)
         siteCreationThemeHeader.subtitle?.isGone = true

From 591dddfe69e299ca112182607daebb5b88c0ccd5 Mon Sep 17 00:00:00 2001
From: Matthew Kevins <mmkevins@yahoo.com>
Date: Fri, 3 Jun 2022 16:39:50 +1000
Subject: [PATCH 111/111] Remove writing theme picker vm to activity bundle

---
 .../wordpress/android/ui/sitecreation/SiteCreationActivity.kt    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
index 4978f3b33f63..fb330975a50c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
@@ -78,7 +78,6 @@ class SiteCreationActivity : LocaleAwareActivity(),
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         mainViewModel.writeToBundle(outState)
-        hppViewModel.writeToBundle(outState)
     }
 
     private fun observeVMState() {