From d7644bcc478e46feb8a86d58f4b85079deb15f6a Mon Sep 17 00:00:00 2001
From: Klymentiy haykov <forsver@gmail.com>
Date: Sun, 29 Mar 2020 18:33:16 -0700
Subject: [PATCH 01/30] Updated GB reference

---
 libs/gutenberg-mobile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile
index d72586b0fd4a..00503480930b 160000
--- a/libs/gutenberg-mobile
+++ b/libs/gutenberg-mobile
@@ -1 +1 @@
-Subproject commit d72586b0fd4aa5b2558ea5ea40ee7414dc17febb
+Subproject commit 00503480930bb8c0ec6615494662f3fcb3a8e83e

From 93bb5dc41eda7e9dd25b3e23b9ad707034b45f99 Mon Sep 17 00:00:00 2001
From: Klymentiy haykov <forsver@gmail.com>
Date: Sun, 29 Mar 2020 18:33:46 -0700
Subject: [PATCH 02/30] Moved Auth header name to constant

---
 .../wordpress/android/ui/utils/AuthenticationUtils.kt    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/utils/AuthenticationUtils.kt b/WordPress/src/main/java/org/wordpress/android/ui/utils/AuthenticationUtils.kt
index d9c2b95135d0..5ecd2d8dd9a8 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/utils/AuthenticationUtils.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/utils/AuthenticationUtils.kt
@@ -20,7 +20,7 @@ class AuthenticationUtils
         headers["User-Agent"] = userAgent.userAgent
         if (WPUrlUtils.safeToAddWordPressComAuthToken(url)) {
             if (accessToken.exists()) {
-                headers["Authorization"] = "Bearer " + accessToken.get()
+                headers[AUTHORIZATION_HEADER_NAME] = "Bearer " + accessToken.get()
             }
         } else {
             // Check if we had HTTP Auth credentials for the root url
@@ -28,9 +28,14 @@ class AuthenticationUtils
             if (httpAuthModel != null) {
                 val creds = String.format("%s:%s", httpAuthModel.username, httpAuthModel.password)
                 val auth = "Basic " + Base64.encodeToString(creds.toByteArray(), Base64.NO_WRAP)
-                headers["Authorization"] = auth
+                headers[AUTHORIZATION_HEADER_NAME] = auth
             }
         }
         return headers
     }
+
+    companion object {
+        const val AUTHORIZATION_HEADER_NAME = "Authorization"
+    }
+
 }

From 1ebf3e6e7e5649ed3852ba398e50ac41b148d41d Mon Sep 17 00:00:00 2001
From: Klymentiy haykov <forsver@gmail.com>
Date: Sun, 29 Mar 2020 18:34:09 -0700
Subject: [PATCH 03/30] Updated listener signature

---
 .../org/wordpress/android/editor/EditorFragmentAbstract.java    | 2 +-
 .../org/wordpress/android/editor/GutenbergEditorFragment.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java
index 25d47d071e82..cc71037f389b 100644
--- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java
+++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java
@@ -192,7 +192,7 @@ public interface EditorFragmentListener {
         void onMediaDeleted(String mediaId);
         void onUndoMediaCheck(String undoedContent);
         void onVideoPressInfoRequested(String videoId);
-        String onAuthHeaderRequested(String url);
+        Map<String, String> onAuthHeaderRequested(String url);
         void onTrackableEvent(TrackableEvent event);
         void onHtmlModeToggledInToolbar();
         void onAddStockMediaClicked(boolean allowMultipleSelection);
diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java
index b515e6a18b35..86dc3f6d9a0a 100644
--- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java
+++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java
@@ -346,7 +346,7 @@ public void run() {
                     }
                 },
                 new OnAuthHeaderRequestedListener() {
-                    @Override public String onAuthHeaderRequested(String url) {
+                    @Override public Map<String, String> onAuthHeaderRequested(String url) {
                         return mEditorFragmentListener.onAuthHeaderRequested(url);
                     }
                 },

From 1950a23f30953db8648cc7da63a5f0fdad366571 Mon Sep 17 00:00:00 2001
From: Klymentiy haykov <forsver@gmail.com>
Date: Sun, 29 Mar 2020 18:35:41 -0700
Subject: [PATCH 04/30] Updated headers handling in Aztec

---
 .../org/wordpress/android/editor/AztecEditorFragment.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/AztecEditorFragment.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/AztecEditorFragment.java
index c499bf259ee8..539ddba8358f 100644
--- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/AztecEditorFragment.java
+++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/AztecEditorFragment.java
@@ -1814,8 +1814,9 @@ public void onClick(DialogInterface dialog, int id) {
                 // Use https:// when requesting the auth header, in case the image is incorrectly using http://
                 // If an auth header is returned, force https:// for the actual HTTP request
                 final String imageSrc = metaData.getSrc();
-                String authHeader = mEditorFragmentListener.onAuthHeaderRequested(UrlUtils.makeHttps(imageSrc));
-                if (authHeader.length() > 0) {
+                Map<String, String> authHeaders =
+                        mEditorFragmentListener.onAuthHeaderRequested(UrlUtils.makeHttps(imageSrc));
+                if (authHeaders != null && authHeaders.containsKey("Authorization")) {
                     metaData.setSrc(UrlUtils.makeHttps(imageSrc));
                 }
 

From 4797668e6843825d1ea7ffcd14b05d36456f5af1 Mon Sep 17 00:00:00 2001
From: Klymentiy haykov <forsver@gmail.com>
Date: Sun, 29 Mar 2020 18:36:23 -0700
Subject: [PATCH 05/30] Updated headers handling in EditPostActivity

---
 .../wordpress/android/ui/posts/EditPostActivity.java   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
index 5c39667c919e..0491ec0ef5a7 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
@@ -142,6 +142,7 @@
 import org.wordpress.android.ui.uploads.UploadUtils;
 import org.wordpress.android.ui.uploads.UploadUtilsWrapper;
 import org.wordpress.android.ui.uploads.VideoOptimizer;
+import org.wordpress.android.ui.utils.AuthenticationUtils;
 import org.wordpress.android.ui.utils.UiHelpers;
 import org.wordpress.android.util.ActivityUtils;
 import org.wordpress.android.util.AniUtils;
@@ -2663,14 +2664,15 @@ public void onVideoPressInfoRequested(final String videoId) {
     }
 
     @Override
-    public String onAuthHeaderRequested(String url) {
-        String authHeader = "";
+    public Map<String, String> onAuthHeaderRequested(String url) {
+        Map<String, String> authHeaders = new HashMap<>();
+
         String token = mAccountStore.getAccessToken();
         if (mSite.isPrivate() && WPUrlUtils.safeToAddWordPressComAuthToken(url)
             && !TextUtils.isEmpty(token)) {
-            authHeader = "Bearer " + token;
+            authHeaders.put(AuthenticationUtils.AUTHORIZATION_HEADER_NAME, "Bearer " + token);
         }
-        return authHeader;
+        return authHeaders;
     }
 
     @Override

From 3ce8113f1f499296ef9ad126a9e0b7e6740e31d6 Mon Sep 17 00:00:00 2001
From: Klymentiy haykov <forsver@gmail.com>
Date: Sun, 29 Mar 2020 19:51:16 -0700
Subject: [PATCH 06/30] Using constant for header name in Aztec.

---
 .../org/wordpress/android/editor/AztecEditorFragment.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/AztecEditorFragment.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/AztecEditorFragment.java
index 539ddba8358f..da4d5253d2f5 100644
--- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/AztecEditorFragment.java
+++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/AztecEditorFragment.java
@@ -147,6 +147,8 @@ public AztecLoggingException(Throwable originalException) {
     private static final String TEMP_VIDEO_UPLOADING_CLASS = "data-temp-aztec-video";
     private static final String GUTENBERG_BLOCK_START = "<!-- wp:";
 
+    private static final String AUTHORIZATION_HEADER_NAME = "Authorization";
+
     private static final int MIN_BITMAP_DIMENSION_DP = 48;
     public static final int DEFAULT_MEDIA_PLACEHOLDER_DIMENSION_DP = 196;
 
@@ -1816,7 +1818,7 @@ public void onClick(DialogInterface dialog, int id) {
                 final String imageSrc = metaData.getSrc();
                 Map<String, String> authHeaders =
                         mEditorFragmentListener.onAuthHeaderRequested(UrlUtils.makeHttps(imageSrc));
-                if (authHeaders != null && authHeaders.containsKey("Authorization")) {
+                if (authHeaders != null && authHeaders.containsKey(AUTHORIZATION_HEADER_NAME)) {
                     metaData.setSrc(UrlUtils.makeHttps(imageSrc));
                 }
 

From 846f0d25298dd5182c4ebb0101cfff60d79cb027 Mon Sep 17 00:00:00 2001
From: Klymentiy haykov <forsver@gmail.com>
Date: Sun, 29 Mar 2020 20:13:58 -0700
Subject: [PATCH 07/30] Removed empty line.

---
 .../java/org/wordpress/android/ui/utils/AuthenticationUtils.kt   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/utils/AuthenticationUtils.kt b/WordPress/src/main/java/org/wordpress/android/ui/utils/AuthenticationUtils.kt
index 5ecd2d8dd9a8..3d538504d25d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/utils/AuthenticationUtils.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/utils/AuthenticationUtils.kt
@@ -37,5 +37,4 @@ class AuthenticationUtils
     companion object {
         const val AUTHORIZATION_HEADER_NAME = "Authorization"
     }
-
 }

From 9903028e368cff4585cdff001b021e36cfa74809 Mon Sep 17 00:00:00 2001
From: malinajirka <malinajirka@gmail.com>
Date: Thu, 2 Apr 2020 11:12:59 +0200
Subject: [PATCH 08/30] Improve UI on the site creation loading screen

---
 .../previews/SiteCreationPreviewFragment.kt   | 45 ++++++++-
 .../previews/SitePreviewViewModel.kt          | 50 ++++++++--
 .../org/wordpress/android/util/AniUtils.java  |  4 +-
 .../img_illustration_magician_hat_128.xml     | 42 ++++++++
 .../site_creation_preview_screen.xml          |  2 +-
 .../site_creation_preview_screen_default.xml  |  2 +-
 .../site_creation_progress_creating_site.xml  | 95 +++++++++++++++++++
 WordPress/src/main/res/values/strings.xml     |  8 ++
 8 files changed, 234 insertions(+), 14 deletions(-)
 create mode 100644 WordPress/src/main/res/drawable/img_illustration_magician_hat_128.xml
 create mode 100644 WordPress/src/main/res/layout/site_creation_progress_creating_site.xml

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 bc4c10043597..55453ccc4c8a 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
@@ -1,5 +1,7 @@
 package org.wordpress.android.ui.sitecreation.previews
 
+import android.animation.Animator
+import android.animation.Animator.AnimatorListener
 import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
@@ -37,10 +39,13 @@ import org.wordpress.android.ui.sitecreation.previews.SitePreviewViewModel.SiteP
 import org.wordpress.android.ui.sitecreation.previews.SitePreviewViewModel.SitePreviewUiState.SitePreviewWebErrorUiState
 import org.wordpress.android.ui.sitecreation.services.SiteCreationService
 import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.AniUtils
+import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.AutoForeground.ServiceEventConnection
 import org.wordpress.android.util.ErrorManagedWebViewClient.ErrorManagedWebViewClientListener
 import org.wordpress.android.util.URLFilteredWebViewClient
 import org.wordpress.android.util.getColorFromAttribute
+import java.util.ArrayList
 import javax.inject.Inject
 
 private const val ARG_DATA = "arg_site_creation_data"
@@ -63,6 +68,8 @@ class SiteCreationPreviewFragment : SiteCreationBaseFormFragment(),
     private lateinit var sitePreviewWebError: ViewGroup
     private lateinit var sitePreviewWebViewShimmerLayout: ShimmerFrameLayout
     private lateinit var sitePreviewWebUrlTitle: TextView
+    private lateinit var loadingTextLayout: ViewGroup
+    private lateinit var loadingTextView: TextView
 
     @Inject internal lateinit var viewModelFactory: ViewModelProvider.Factory
     @Inject internal lateinit var uiHelpers: UiHelpers
@@ -108,6 +115,8 @@ class SiteCreationPreviewFragment : SiteCreationBaseFormFragment(),
         sitePreviewWebViewShimmerLayout = rootView.findViewById(R.id.sitePreviewWebViewShimmerLayout)
         sitePreviewWebUrlTitle = rootView.findViewById(R.id.sitePreviewWebUrlTitle)
         okButtonContainer = rootView.findViewById(R.id.sitePreviewOkButtonContainer)
+        loadingTextView = fullscreenProgressLayout.findViewById(R.id.progress_text)
+        loadingTextLayout = fullscreenProgressLayout.findViewById(R.id.progress_text_layout)
         initViewModel()
         initRetryButton()
         initOkButton()
@@ -214,10 +223,44 @@ class SiteCreationPreviewFragment : SiteCreationBaseFormFragment(),
 
     private fun updateLoadingLayout(progressUiState: SitePreviewFullscreenProgressUiState) {
         progressUiState.apply {
-            uiHelpers.setTextOrHide(fullscreenProgressLayout.findViewById(R.id.progress_text), loadingTextResId)
+            val newText = uiHelpers.getTextOfUiString(loadingTextView.context, loadingTextResId)
+            AppLog.d(AppLog.T.MAIN, "Changing text - animation: $animate")
+            if (animate) {
+                updateLoadingTextWithFadeAnimation(newText)
+            } else {
+                loadingTextView.text = newText
+            }
         }
     }
 
+    private fun updateLoadingTextWithFadeAnimation(newText: String) {
+        val animationDuration = AniUtils.Duration.SHORT
+        val animations = ArrayList<Animator>()
+        val fadeOut = AniUtils.getFadeOutAnim(loadingTextLayout, animationDuration, View.VISIBLE)
+        val fadeIn = AniUtils.getFadeInAnim(loadingTextLayout, animationDuration)
+
+        // update the text when the view isn't visible
+        fadeIn.addListener(object : AnimatorListener {
+            override fun onAnimationRepeat(animation: Animator?) {}
+
+            override fun onAnimationEnd(animation: Animator?) {}
+
+            override fun onAnimationCancel(animation: Animator?) {}
+
+            override fun onAnimationStart(animation: Animator) {
+                loadingTextView.text = newText
+            }
+        })
+        // Start the fadein animation right after the view fades out
+        fadeIn.startDelay = animationDuration.toMillis(loadingTextLayout.context)
+
+        val animatorSet = AnimatorSet()
+        animations.add(fadeOut)
+        animations.add(fadeIn)
+        animatorSet.playSequentially(animations)
+        animatorSet.start()
+    }
+
     private fun updateErrorLayout(errorUiStateState: SitePreviewFullscreenErrorUiState) {
         errorUiStateState.apply {
             uiHelpers.setTextOrHide(fullscreenErrorLayout.findViewById(R.id.error_title), titleResId)
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 86fa75b0a117..be24ab4510bf 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
@@ -7,6 +7,7 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.greenrobot.eventbus.Subscribe
@@ -35,6 +36,8 @@ import org.wordpress.android.ui.sitecreation.services.SiteCreationServiceState.S
 import org.wordpress.android.ui.sitecreation.services.SiteCreationServiceState.SiteCreationStep.IDLE
 import org.wordpress.android.ui.sitecreation.services.SiteCreationServiceState.SiteCreationStep.SUCCESS
 import org.wordpress.android.ui.sitecreation.usecases.isWordPressComSubDomain
+import org.wordpress.android.ui.utils.UiString
+import org.wordpress.android.ui.utils.UiString.UiStringRes
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.AppLog.T
 import org.wordpress.android.util.NetworkUtilsWrapper
@@ -46,8 +49,16 @@ import kotlin.coroutines.CoroutineContext
 
 private const val CONNECTION_ERROR_DELAY_TO_SHOW_LOADING_STATE = 1000L
 private const val DELAY_TO_SHOW_WEB_VIEW_LOADING_SHIMMER = 1000L
+private const val LOADING_STATE_TEXT_ANIMATION_DELAY = 2000L
 private const val ERROR_CONTEXT = "site_preview"
 
+private val loadingTexts = listOf(
+        UiStringRes(R.string.new_site_creation_creating_site_loading_1),
+        UiStringRes(R.string.new_site_creation_creating_site_loading_2),
+        UiStringRes(R.string.new_site_creation_creating_site_loading_3),
+        UiStringRes(R.string.new_site_creation_creating_site_loading_4)
+)
+
 class SitePreviewViewModel @Inject constructor(
     private val dispatcher: Dispatcher,
     private val siteStore: SiteStore,
@@ -63,6 +74,7 @@ class SitePreviewViewModel @Inject constructor(
         get() = bgDispatcher + job
     private var isStarted = false
     private var webviewFullyLoadedTracked = false
+    private var loadingAnimationJob: Job? = null
 
     private lateinit var siteCreationState: SiteCreationState
     private lateinit var urlWithoutScheme: String
@@ -102,6 +114,7 @@ class SitePreviewViewModel @Inject constructor(
         super.onCleared()
         dispatcher.unregister(fetchWpComSiteUseCase)
         job.cancel()
+        loadingAnimationJob?.cancel()
     }
 
     fun start(siteCreationState: SiteCreationState) {
@@ -112,7 +125,7 @@ class SitePreviewViewModel @Inject constructor(
         this.siteCreationState = siteCreationState
         urlWithoutScheme = requireNotNull(siteCreationState.domain)
 
-        updateUiState(SitePreviewFullscreenProgressUiState)
+        showFullscreenProgress()
         startCreateSiteService()
     }
 
@@ -131,7 +144,7 @@ class SitePreviewViewModel @Inject constructor(
     }
 
     fun retry() {
-        updateUiState(SitePreviewFullscreenProgressUiState)
+        showFullscreenProgress()
         startCreateSiteService(serviceStateForRetry)
     }
 
@@ -149,7 +162,7 @@ class SitePreviewViewModel @Inject constructor(
     }
 
     private fun showFullscreenErrorWithDelay() {
-        updateUiState(SitePreviewFullscreenProgressUiState)
+        showFullscreenProgress()
         launch {
             // We show the loading indicator for a bit so the user has some feedback when they press retry
             delay(CONNECTION_ERROR_DELAY_TO_SHOW_LOADING_STATE)
@@ -279,11 +292,33 @@ class SitePreviewViewModel @Inject constructor(
         )
     }
 
+    private fun showFullscreenProgress() {
+        loadingAnimationJob = launch(mainDispatcher) {
+            var i = 0
+            val listSize = loadingTexts.size
+            while(isActive) {
+                updateUiState(
+                        SitePreviewFullscreenProgressUiState(
+                                animate = i != 0, // the first text should appear without an animation
+                                loadingTextResId = loadingTexts[i++ % listSize]
+                        )
+                )
+                delay(LOADING_STATE_TEXT_ANIMATION_DELAY)
+            }
+        }
+    }
+
     private fun updateUiState(uiState: SitePreviewUiState) {
+        if (uiState !is SitePreviewFullscreenProgressUiState) {
+            loadingAnimationJob?.cancel()
+        }
         _uiState.value = uiState
     }
 
     private fun updateUiStateAsync(uiState: SitePreviewUiState) {
+        if (uiState !is SitePreviewFullscreenProgressUiState) {
+            loadingAnimationJob?.cancel()
+        }
         _uiState.postValue(uiState)
     }
 
@@ -299,7 +334,7 @@ class SitePreviewViewModel @Inject constructor(
                 contentLayoutVisibility = true,
                 webViewVisibility = true,
                 webViewErrorVisibility = false
-                )
+        )
 
         data class SitePreviewWebErrorUiState(val data: SitePreviewData) : SitePreviewUiState(
                 contentLayoutVisibility = true,
@@ -312,11 +347,8 @@ class SitePreviewViewModel @Inject constructor(
                 shimmerVisibility = true
         )
 
-        object SitePreviewFullscreenProgressUiState : SitePreviewUiState(
-                fullscreenProgressLayoutVisibility = true
-        ) {
-            const val loadingTextResId = R.string.notification_new_site_creation_creating_site_subtitle
-        }
+        data class SitePreviewFullscreenProgressUiState(val loadingTextResId: UiString, val animate: Boolean) :
+                SitePreviewUiState(fullscreenProgressLayoutVisibility = true)
 
         sealed class SitePreviewFullscreenErrorUiState constructor(
             val titleResId: Int,
diff --git a/WordPress/src/main/java/org/wordpress/android/util/AniUtils.java b/WordPress/src/main/java/org/wordpress/android/util/AniUtils.java
index 473793ae186b..5cea64b08761 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/AniUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/AniUtils.java
@@ -171,7 +171,7 @@ private static void animateBar(View view,
         view.setVisibility(newVisibility);
     }
 
-    private static ObjectAnimator getFadeInAnim(final View target, Duration duration) {
+    public static ObjectAnimator getFadeInAnim(final View target, Duration duration) {
         ObjectAnimator fadeIn = ObjectAnimator.ofFloat(target, View.ALPHA, 0.0f, 1.0f);
         fadeIn.setDuration(duration.toMillis(target.getContext()));
         fadeIn.setInterpolator(new LinearInterpolator());
@@ -184,7 +184,7 @@ public void onAnimationStart(Animator animation) {
         return fadeIn;
     }
 
-    private static ObjectAnimator getFadeOutAnim(final View target, Duration duration, final int endVisibility) {
+    public static ObjectAnimator getFadeOutAnim(final View target, Duration duration, final int endVisibility) {
         ObjectAnimator fadeOut = ObjectAnimator.ofFloat(target, View.ALPHA, 1.0f, 0.0f);
         fadeOut.setDuration(duration.toMillis(target.getContext()));
         fadeOut.setInterpolator(new LinearInterpolator());
diff --git a/WordPress/src/main/res/drawable/img_illustration_magician_hat_128.xml b/WordPress/src/main/res/drawable/img_illustration_magician_hat_128.xml
new file mode 100644
index 000000000000..77a46c363ca4
--- /dev/null
+++ b/WordPress/src/main/res/drawable/img_illustration_magician_hat_128.xml
@@ -0,0 +1,42 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="310"
+    android:viewportHeight="328">
+  <path
+      android:pathData="M151.78,148.48m-129.91,0a129.91,129.91 0,1 1,259.82 0a129.91,129.91 0,1 1,-259.82 0"
+      android:fillColor="@color/primary_5"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M289.64,31.13L171.65,106.99c-3.48,2.24 -8.12,1.23 -10.36,-2.25s-1.23,-8.12 2.25,-10.36L281.53,18.52c3.48,-2.24 8.12,-1.23 10.36,2.25s1.23,8.12 -2.25,10.36z"
+      android:fillColor="@color/primary_10"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M176.57,103.83l-4.92,3.16c-3.48,2.24 -8.12,1.23 -10.36,-2.25s-1.23,-8.12 2.25,-10.36l4.8,-3.09 8.23,12.54z"
+      android:fillColor="@color/primary_30"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M169.32,132.04l-8.13,7 6.73,7.82 -2.08,1.79 -6.73,-7.82 -8.2,7.06 -1.91,-2.21 8.2,-7.06 -6.72,-7.83 2.08,-1.79 6.73,7.82 8.13,-7z"
+      android:fillColor="@color/primary_20"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M83.27,114l2.25,4.51 5.02,0.76 -3.64,3.51 0.88,5.01 -4.51,-2.38 -4.51,2.38 0.87,-5.01 -3.63,-3.51 5.01,-0.76zM118.27,91l4.43,8.86 9.84,1.47 -7.14,6.89 1.73,9.85 -8.86,-4.68 -8.86,4.68 1.72,-9.85L104,101.33l9.84,-1.47zM141.27,38l5.98,11.96 13.29,1.99 -9.64,9.3 2.33,13.29 -11.96,-6.31 -11.96,6.31 2.32,-13.29 -9.63,-9.3 13.29,-1.99z"
+      android:fillColor="@color/primary_40"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M100.32,301.92L110.8,197c0.64,-6.41 5.79,-11.27 11.94,-11.27h58.9c6.02,0 11.12,4.68 11.9,10.94l13.24,105.63c0.94,7.58 -107.2,7 -106.46,-0.38z"
+      android:fillColor="@color/primary_20"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M156.48,313.73c-0.95,0 -1.87,0 -2.76,-0.01 -14.13,-0.06 -47.83,-0.72 -55.66,-5.5 -2.6,-1.59 -3.99,-4.17 -3.71,-6.9L104.83,196.4c0.95,-9.5 8.65,-16.67 17.91,-16.67h58.89c9.02,0 16.7,6.96 17.85,16.2l13.24,105.63c0.34,2.73 -0.96,5.33 -3.49,6.96 -6.91,4.46 -34.87,5.21 -52.75,5.21zM106.67,298.69c6.16,1.37 22.23,2.92 46.86,3.03 24.52,0.12 40.57,-1.28 46.8,-2.6l-12.75,-101.7c-0.41,-3.24 -2.96,-5.69 -5.95,-5.69h-58.89c-3.07,0 -5.63,2.52 -5.97,5.87l-10.1,101.09z"
+      android:fillColor="@color/primary_20"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M236.78,184.23c0,8.01 -38.06,4.5 -85,4.5s-85,3.51 -85,-4.5 38.06,-13.5 85,-13.5 85,5.49 85,13.5z"
+      android:fillColor="@color/primary_40"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M208.67,189.99c-6.81,0 -14.61,-0.16 -23.17,-0.33 -10.19,-0.2 -21.74,-0.44 -33.72,-0.44s-23.53,0.23 -33.72,0.44c-27.02,0.54 -46.53,0.93 -50.82,-3.27 -0.64,-0.63 -0.96,-1.35 -0.96,-2.16 0,-9.19 43.01,-14 85.5,-14s85.5,4.81 85.5,14c0,0.81 -0.32,1.54 -0.96,2.16 -2.93,2.87 -12.97,3.6 -27.65,3.6zM151.78,188.23c11.99,0 23.54,0.23 33.74,0.44 25.76,0.52 46.11,0.92 50.1,-2.99 0.45,-0.44 0.66,-0.91 0.66,-1.45 0,-7.29 -37.12,-13 -84.5,-13s-84.5,5.71 -84.5,13c0,0.54 0.22,1.01 0.66,1.45 3.99,3.91 24.34,3.5 50.1,2.99 10.19,-0.21 21.75,-0.44 33.74,-0.44z"
+      android:fillColor="@color/primary_20"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/WordPress/src/main/res/layout-land/site_creation_preview_screen.xml b/WordPress/src/main/res/layout-land/site_creation_preview_screen.xml
index 5ba6926a85eb..86007ccde555 100644
--- a/WordPress/src/main/res/layout-land/site_creation_preview_screen.xml
+++ b/WordPress/src/main/res/layout-land/site_creation_preview_screen.xml
@@ -12,7 +12,7 @@
         tools:visibility="gone"/>
 
     <include
-        layout="@layout/progress_layout"
+        layout="@layout/site_creation_progress_creating_site"
         tools:visibility="gone"/>
 
     <RelativeLayout
diff --git a/WordPress/src/main/res/layout/site_creation_preview_screen_default.xml b/WordPress/src/main/res/layout/site_creation_preview_screen_default.xml
index 6f5b64add2c9..4ad0293b9699 100644
--- a/WordPress/src/main/res/layout/site_creation_preview_screen_default.xml
+++ b/WordPress/src/main/res/layout/site_creation_preview_screen_default.xml
@@ -13,7 +13,7 @@
         tools:visibility="gone"/>
 
     <include
-        layout="@layout/progress_layout"
+        layout="@layout/site_creation_progress_creating_site"
         tools:visibility="gone"/>
 
     <RelativeLayout
diff --git a/WordPress/src/main/res/layout/site_creation_progress_creating_site.xml b/WordPress/src/main/res/layout/site_creation_progress_creating_site.xml
new file mode 100644
index 000000000000..46e3d15ab8ec
--- /dev/null
+++ b/WordPress/src/main/res/layout/site_creation_progress_creating_site.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/progress_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/background_default"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/margin_medium"
+        android:gravity="center_horizontal"
+        android:text="@string/new_site_creation_creating_site_loading_title"
+        android:textColor="@color/neutral_100"
+        android:textSize="@dimen/text_sz_extra_extra_large"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@id/subtitle"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="Hooray! Almost done!" />
+
+    <TextView
+        android:id="@+id/subtitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/margin_extra_large"
+        android:gravity="center"
+        android:text="@string/new_site_creation_creating_site_loading_subtitle"
+        android:textColor="@color/neutral_100"
+        android:textSize="@dimen/text_sz_extra_large"
+        app:layout_constraintBottom_toTopOf="@+id/img_illustration"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        tools:text="Your site will be ready shortly" />
+
+    <ImageView
+        android:id="@+id/img_illustration"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/margin_extra_large"
+        android:contentDescription="@null"
+        android:src="@drawable/img_illustration_magician_hat_128"
+        app:layout_constraintBottom_toTopOf="@+id/progress_text_layout"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/subtitle" />
+
+    <LinearLayout
+        android:id="@+id/progress_text_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toTopOf="@+id/progress"
+        app:layout_constraintEnd_toStartOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/img_illustration"
+        tools:ignore="UseCompoundDrawables">
+
+        <ImageView
+            android:id="@+id/checkmark_icon"
+            android:layout_width="@dimen/icon_size_075"
+            android:layout_height="@dimen/icon_size_075"
+            android:contentDescription="@null"
+            android:src="@drawable/ic_checkmark_white_24dp"
+            android:tint="@color/success" />
+
+        <TextView
+            android:id="@+id/progress_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_large"
+            android:textColor="@color/neutral_100"
+            android:textSize="@dimen/text_sz_extra_large"
+            tools:text="Setting up theme!" />
+    </LinearLayout>
+
+    <ProgressBar
+        android:id="@+id/progress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/margin_extra_large"
+        android:layout_marginTop="@dimen/margin_extra_extra_medium_large"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/progress_text_layout" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index 9fe8cef954c4..c367ab16ce60 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -2687,6 +2687,14 @@
     <string name="notification_new_site_creation_title">Create Site</string>
     <string name="notification_new_site_creation_failed">There was a problem</string>
     <string name="notification_new_site_creation_creating_site_subtitle">We\'re creating your new site</string>
+
+    <string name="new_site_creation_creating_site_loading_title">Hooray!\nAlmost done</string>
+    <string name="new_site_creation_creating_site_loading_subtitle">Your site will be ready shortly</string>
+    <string name="new_site_creation_creating_site_loading_1">Grabbing site URL</string>
+    <string name="new_site_creation_creating_site_loading_2">Adding site features</string>
+    <string name="new_site_creation_creating_site_loading_3">Setting up theme</string>
+    <string name="new_site_creation_creating_site_loading_4">Creating dashboard</string>
+
     <string name="cancel_new_site_wizard_content_description">Cancel Site Creation Wizard</string>
     <string name="site_created_but_not_fetched_snackbar_message">It seems like you\'re on a slow connection. If you don\'t see your new site in the list, try refreshing.</string>
     <string name="new_site_creation_clear_all_content_description">Clear</string>

From a575e2f3fc0795d1b43bed8d54262f5fe694c878 Mon Sep 17 00:00:00 2001
From: malinajirka <malinajirka@gmail.com>
Date: Thu, 2 Apr 2020 13:49:17 +0200
Subject: [PATCH 09/30] Add unit tests for loading animation in site creation
 flow

---
 .../previews/SitePreviewViewModel.kt          |  9 ++--
 .../previews/SitePreviewViewModelTest.kt      | 53 +++++++++++++++++--
 2 files changed, 53 insertions(+), 9 deletions(-)

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 be24ab4510bf..72f9130e9478 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
@@ -49,7 +49,7 @@ import kotlin.coroutines.CoroutineContext
 
 private const val CONNECTION_ERROR_DELAY_TO_SHOW_LOADING_STATE = 1000L
 private const val DELAY_TO_SHOW_WEB_VIEW_LOADING_SHIMMER = 1000L
-private const val LOADING_STATE_TEXT_ANIMATION_DELAY = 2000L
+const val LOADING_STATE_TEXT_ANIMATION_DELAY = 2000L
 private const val ERROR_CONTEXT = "site_preview"
 
 private val loadingTexts = listOf(
@@ -163,13 +163,11 @@ class SitePreviewViewModel @Inject constructor(
 
     private fun showFullscreenErrorWithDelay() {
         showFullscreenProgress()
-        launch {
+        launch (mainDispatcher) {
             // We show the loading indicator for a bit so the user has some feedback when they press retry
             delay(CONNECTION_ERROR_DELAY_TO_SHOW_LOADING_STATE)
             tracker.trackErrorShown(ERROR_CONTEXT, INTERNET_UNAVAILABLE_ERROR)
-            withContext(mainDispatcher) {
-                updateUiState(SitePreviewConnectionErrorUiState)
-            }
+            updateUiState(SitePreviewConnectionErrorUiState)
         }
     }
 
@@ -293,6 +291,7 @@ class SitePreviewViewModel @Inject constructor(
     }
 
     private fun showFullscreenProgress() {
+        loadingAnimationJob?.cancel()
         loadingAnimationJob = launch(mainDispatcher) {
             var i = 0
             val listSize = loadingTexts.size
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/previews/SitePreviewViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/previews/SitePreviewViewModelTest.kt
index f85cb6797163..5189b845c94a 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/previews/SitePreviewViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/previews/SitePreviewViewModelTest.kt
@@ -5,7 +5,9 @@ import androidx.lifecycle.Observer
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.test.TestCoroutineDispatcher
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
 import org.junit.Rule
@@ -13,7 +15,6 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
-import org.wordpress.android.TEST_DISPATCHER
 import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.store.SiteStore
@@ -50,6 +51,7 @@ private const val LOCAL_SITE_ID = 2
 private val SITE_CREATION_STATE = SiteCreationState(1, URL)
 
 @InternalCoroutinesApi
+@ExperimentalCoroutinesApi
 @RunWith(MockitoJUnitRunner::class)
 class SitePreviewViewModelTest {
     @Rule
@@ -70,6 +72,7 @@ class SitePreviewViewModelTest {
     @Mock private lateinit var preloadPreviewObserver: Observer<String>
 
     private lateinit var viewModel: SitePreviewViewModel
+    private val coroutineDispatcher = TestCoroutineDispatcher()
 
     @Before
     fun setUp() {
@@ -80,8 +83,8 @@ class SitePreviewViewModelTest {
                 networkUtils,
                 urlUtils,
                 tracker,
-                TEST_DISPATCHER,
-                TEST_DISPATCHER
+                coroutineDispatcher,
+                coroutineDispatcher
         )
         viewModel.uiState.observeForever(uiStateObserver)
         viewModel.startCreateSiteService.observeForever(startServiceObserver)
@@ -120,6 +123,27 @@ class SitePreviewViewModelTest {
         assertThat(viewModel.uiState.value).isInstanceOf(SitePreviewFullscreenProgressUiState::class.java)
     }
 
+    @Test
+    fun `ProgressUiState's animate field is false only for first emitted event`() = test {
+        initViewModel()
+        assertThat((viewModel.uiState.value as SitePreviewFullscreenProgressUiState).animate).isFalse()
+        for(i in 1..100) {
+            coroutineDispatcher.advanceTimeBy(LOADING_STATE_TEXT_ANIMATION_DELAY)
+            assertThat((viewModel.uiState.value as SitePreviewFullscreenProgressUiState).animate).isTrue()
+        }
+    }
+
+    @Test
+    fun `ProgressUiState's text changes every LOADING_STATE_TEXT_ANIMATION_DELAY seconds`() {
+        initViewModel()
+        for(i in 1..100) {
+            val lastTextId = (viewModel.uiState.value as SitePreviewFullscreenProgressUiState).loadingTextResId
+            coroutineDispatcher.advanceTimeBy(LOADING_STATE_TEXT_ANIMATION_DELAY)
+            assertThat((viewModel.uiState.value as SitePreviewFullscreenProgressUiState).loadingTextResId)
+                    .isNotEqualTo(lastTextId)
+        }
+    }
+
     @Test
     fun `service started on start`() = test {
         initViewModel()
@@ -127,9 +151,10 @@ class SitePreviewViewModelTest {
     }
 
     @Test
-    fun `error shown on start when internet access not available`() = test {
+    fun `error shown on start when internet access not available`()  {
         whenever(networkUtils.isNetworkAvailable()).thenReturn(false)
         initViewModel()
+        coroutineDispatcher.advanceUntilIdle() // skip delays
         assertThat(viewModel.uiState.value).isInstanceOf(SitePreviewConnectionErrorUiState::class.java)
     }
 
@@ -140,6 +165,16 @@ class SitePreviewViewModelTest {
         assertThat(viewModel.uiState.value).isInstanceOf(SitePreviewGenericErrorUiState::class.java)
     }
 
+    @Test
+    fun `displaying error screen cancels the progress animation job`() {
+        initViewModel()
+        viewModel.onSiteCreationServiceStateUpdated(createServiceFailureState())
+        for (i in 1..100) {
+            coroutineDispatcher.advanceTimeBy(LOADING_STATE_TEXT_ANIMATION_DELAY)
+            assertThat(viewModel.uiState.value).isInstanceOf(SitePreviewGenericErrorUiState::class.java)
+        }
+    }
+
     @Test
     fun `service started on retry`() {
         initViewModel()
@@ -180,6 +215,16 @@ class SitePreviewViewModelTest {
         assertThat(viewModel.uiState.value).isInstanceOf(SitePreviewContentUiState::class.java)
     }
 
+    @Test
+    fun `displaying content cancels the progress animation job`() {
+        initViewModel()
+        viewModel.onUrlLoaded()
+        for (i in 1..100) {
+            coroutineDispatcher.advanceTimeBy(LOADING_STATE_TEXT_ANIMATION_DELAY)
+            assertThat(viewModel.uiState.value).isInstanceOf(SitePreviewContentUiState::class.java)
+        }
+    }
+
     @Test
     fun `show webview empty screen on WebViewError`() {
         initViewModel()

From cd76d1d68159c8c1ca19851bbd26c2b21397c6a5 Mon Sep 17 00:00:00 2001
From: malinajirka <malinajirka@gmail.com>
Date: Thu, 2 Apr 2020 13:51:09 +0200
Subject: [PATCH 10/30] Update release-notes

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

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 279591ad2ab4..58d9664f86c1 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -2,6 +2,7 @@
 -----
 * Block editor: You can now crop, zoom in/out and rotate images that are already inserted in a post.
 * Fix a deeplinking issue that could lead to the app not being open after clicking on some special "wordpress://" URLs.
+* Site Creation: Improved look of the loading screen while the site is being created
 
 14.5
 -----

From 1826b1fb2a55bd355adba647cf8a739fe21f24d6 Mon Sep 17 00:00:00 2001
From: malinajirka <malinajirka@gmail.com>
Date: Thu, 2 Apr 2020 15:18:42 +0200
Subject: [PATCH 11/30] Fix lint issues

---
 .../ui/sitecreation/previews/SitePreviewViewModel.kt        | 4 ++--
 .../ui/sitecreation/previews/SitePreviewViewModelTest.kt    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

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 72f9130e9478..908c1c03f2f4 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
@@ -163,7 +163,7 @@ class SitePreviewViewModel @Inject constructor(
 
     private fun showFullscreenErrorWithDelay() {
         showFullscreenProgress()
-        launch (mainDispatcher) {
+        launch(mainDispatcher) {
             // We show the loading indicator for a bit so the user has some feedback when they press retry
             delay(CONNECTION_ERROR_DELAY_TO_SHOW_LOADING_STATE)
             tracker.trackErrorShown(ERROR_CONTEXT, INTERNET_UNAVAILABLE_ERROR)
@@ -295,7 +295,7 @@ class SitePreviewViewModel @Inject constructor(
         loadingAnimationJob = launch(mainDispatcher) {
             var i = 0
             val listSize = loadingTexts.size
-            while(isActive) {
+            while (isActive) {
                 updateUiState(
                         SitePreviewFullscreenProgressUiState(
                                 animate = i != 0, // the first text should appear without an animation
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/previews/SitePreviewViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/previews/SitePreviewViewModelTest.kt
index 5189b845c94a..a18514ebb84b 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/previews/SitePreviewViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/previews/SitePreviewViewModelTest.kt
@@ -127,7 +127,7 @@ class SitePreviewViewModelTest {
     fun `ProgressUiState's animate field is false only for first emitted event`() = test {
         initViewModel()
         assertThat((viewModel.uiState.value as SitePreviewFullscreenProgressUiState).animate).isFalse()
-        for(i in 1..100) {
+        for (i in 1..100) {
             coroutineDispatcher.advanceTimeBy(LOADING_STATE_TEXT_ANIMATION_DELAY)
             assertThat((viewModel.uiState.value as SitePreviewFullscreenProgressUiState).animate).isTrue()
         }
@@ -136,7 +136,7 @@ class SitePreviewViewModelTest {
     @Test
     fun `ProgressUiState's text changes every LOADING_STATE_TEXT_ANIMATION_DELAY seconds`() {
         initViewModel()
-        for(i in 1..100) {
+        for (i in 1..100) {
             val lastTextId = (viewModel.uiState.value as SitePreviewFullscreenProgressUiState).loadingTextResId
             coroutineDispatcher.advanceTimeBy(LOADING_STATE_TEXT_ANIMATION_DELAY)
             assertThat((viewModel.uiState.value as SitePreviewFullscreenProgressUiState).loadingTextResId)
@@ -151,7 +151,7 @@ class SitePreviewViewModelTest {
     }
 
     @Test
-    fun `error shown on start when internet access not available`()  {
+    fun `error shown on start when internet access not available`() {
         whenever(networkUtils.isNetworkAvailable()).thenReturn(false)
         initViewModel()
         coroutineDispatcher.advanceUntilIdle() // skip delays

From 1eebd97eb23251e17fc4a8217872faae8ddf071f Mon Sep 17 00:00:00 2001
From: malinajirka <malinajirka@gmail.com>
Date: Mon, 6 Apr 2020 12:03:24 +0200
Subject: [PATCH 12/30] Update site creation loading screen for dark mode

---
 .../layout/site_creation_progress_creating_site.xml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/WordPress/src/main/res/layout/site_creation_progress_creating_site.xml b/WordPress/src/main/res/layout/site_creation_progress_creating_site.xml
index 46e3d15ab8ec..ebf98079ee41 100644
--- a/WordPress/src/main/res/layout/site_creation_progress_creating_site.xml
+++ b/WordPress/src/main/res/layout/site_creation_progress_creating_site.xml
@@ -5,17 +5,16 @@
     android:id="@+id/progress_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_default"
     android:orientation="vertical">
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_medium"
         android:gravity="center_horizontal"
         android:text="@string/new_site_creation_creating_site_loading_title"
-        android:textColor="@color/neutral_100"
+        android:textColor="?attr/colorOnSurface"
         android:textSize="@dimen/text_sz_extra_extra_large"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@id/subtitle"
@@ -25,14 +24,14 @@
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="Hooray! Almost done!" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_extra_large"
         android:gravity="center"
         android:text="@string/new_site_creation_creating_site_loading_subtitle"
-        android:textColor="@color/neutral_100"
+        android:textColor="?attr/wpColorOnSurfaceMedium"
         android:textSize="@dimen/text_sz_extra_large"
         app:layout_constraintBottom_toTopOf="@+id/img_illustration"
         app:layout_constraintEnd_toEndOf="parent"
@@ -72,12 +71,12 @@
             android:src="@drawable/ic_checkmark_white_24dp"
             android:tint="@color/success" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/progress_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/margin_large"
-            android:textColor="@color/neutral_100"
+            android:textColor="?attr/wpColorOnSurfaceMedium"
             android:textSize="@dimen/text_sz_extra_large"
             tools:text="Setting up theme!" />
     </LinearLayout>

From bfdf6bf97cb429935b463f59dc2f313f1d6392af Mon Sep 17 00:00:00 2001
From: malinajirka <malinajirka@gmail.com>
Date: Tue, 7 Apr 2020 09:03:50 +0200
Subject: [PATCH 13/30] Minor code cleanup

---
 .../previews/SiteCreationPreviewFragment.kt            | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

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 9e50a071efba..e135c6ac0ee7 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
@@ -235,7 +235,6 @@ class SiteCreationPreviewFragment : SiteCreationBaseFormFragment(),
 
     private fun updateLoadingTextWithFadeAnimation(newText: String) {
         val animationDuration = AniUtils.Duration.SHORT
-        val animations = ArrayList<Animator>()
         val fadeOut = AniUtils.getFadeOutAnim(loadingTextLayout, animationDuration, View.VISIBLE)
         val fadeIn = AniUtils.getFadeInAnim(loadingTextLayout, animationDuration)
 
@@ -254,11 +253,10 @@ class SiteCreationPreviewFragment : SiteCreationBaseFormFragment(),
         // Start the fadein animation right after the view fades out
         fadeIn.startDelay = animationDuration.toMillis(loadingTextLayout.context)
 
-        val animatorSet = AnimatorSet()
-        animations.add(fadeOut)
-        animations.add(fadeIn)
-        animatorSet.playSequentially(animations)
-        animatorSet.start()
+        AnimatorSet().apply {
+            playSequentially(fadeOut, fadeIn)
+            start()
+        }
     }
 
     private fun updateErrorLayout(errorUiStateState: SitePreviewFullscreenErrorUiState) {

From 38978424e5bb763f5a72ab0e334ca839f63b040d Mon Sep 17 00:00:00 2001
From: malinajirka <malinajirka@gmail.com>
Date: Tue, 7 Apr 2020 09:25:15 +0200
Subject: [PATCH 14/30] Fix lint

---
 .../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 e135c6ac0ee7..cec47f40adff 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
@@ -45,7 +45,6 @@ import org.wordpress.android.util.AutoForeground.ServiceEventConnection
 import org.wordpress.android.util.ErrorManagedWebViewClient.ErrorManagedWebViewClientListener
 import org.wordpress.android.util.URLFilteredWebViewClient
 import org.wordpress.android.util.getColorFromAttribute
-import java.util.ArrayList
 import javax.inject.Inject
 
 private const val ARG_DATA = "arg_site_creation_data"

From ff51082b1606ececb041aba66df742484df0c149 Mon Sep 17 00:00:00 2001
From: malinajirka <malinajirka@gmail.com>
Date: Wed, 8 Apr 2020 09:01:31 +0200
Subject: [PATCH 15/30] Add dark mode version of site creation loading
 illustration

---
 .../img_illustration_magician_hat_128.xml              | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 WordPress/src/main/res/drawable-night/img_illustration_magician_hat_128.xml

diff --git a/WordPress/src/main/res/drawable-night/img_illustration_magician_hat_128.xml b/WordPress/src/main/res/drawable-night/img_illustration_magician_hat_128.xml
new file mode 100644
index 000000000000..5a63d7f79a5f
--- /dev/null
+++ b/WordPress/src/main/res/drawable-night/img_illustration_magician_hat_128.xml
@@ -0,0 +1,10 @@
+<vector android:height="128dp" android:viewportHeight="328"
+    android:viewportWidth="310" android:width="128dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/pink_100" android:fillType="nonZero" android:pathData="M151.78,148.48m-129.91,0a129.91,129.91 0,1 1,259.82 0a129.91,129.91 0,1 1,-259.82 0"/>
+    <path android:fillColor="@color/pink_40" android:fillType="nonZero" android:pathData="M289.64,31.13L171.65,106.99c-3.48,2.24 -8.12,1.23 -10.36,-2.25s-1.23,-8.12 2.25,-10.36L281.53,18.52c3.48,-2.24 8.12,-1.23 10.36,2.25s1.23,8.12 -2.25,10.36z"/>
+    <path android:fillColor="@color/pink_70" android:fillType="nonZero" android:pathData="M176.57,103.83l-4.92,3.16c-3.48,2.24 -8.12,1.23 -10.36,-2.25s-1.23,-8.12 2.25,-10.36l4.8,-3.09 8.23,12.54zM169.32,132.04l-8.13,7 6.73,7.82 -2.08,1.79 -6.73,-7.82 -8.2,7.06 -1.91,-2.21 8.2,-7.06 -6.72,-7.83 2.08,-1.79 6.73,7.82 8.13,-7zM83.27,114l2.25,4.51 5.02,0.76 -3.64,3.51 0.88,5.01 -4.51,-2.38 -4.51,2.38 0.87,-5.01 -3.63,-3.51 5.01,-0.76zM118.27,91l4.43,8.86 9.84,1.47 -7.14,6.89 1.73,9.85 -8.86,-4.68 -8.86,4.68 1.72,-9.85L104,101.33l9.84,-1.47zM141.27,38l5.98,11.96 13.29,1.99 -9.64,9.3 2.33,13.29 -11.96,-6.31 -11.96,6.31 2.32,-13.29 -9.63,-9.3 13.29,-1.99z"/>
+    <path android:fillColor="@color/pink_40" android:fillType="nonZero" android:pathData="M100.32,301.92L110.8,197c0.64,-6.41 5.79,-11.27 11.94,-11.27h58.9c6.02,0 11.12,4.68 11.9,10.94l13.24,105.63c0.94,7.58 -107.2,7 -106.46,-0.38z"/>
+    <path android:fillColor="@color/pink_40" android:fillType="nonZero" android:pathData="M156.48,313.73c-0.95,0 -1.87,0 -2.76,-0.01 -14.13,-0.06 -47.83,-0.72 -55.66,-5.5 -2.6,-1.59 -3.99,-4.17 -3.71,-6.9L104.83,196.4c0.95,-9.5 8.65,-16.67 17.91,-16.67h58.89c9.02,0 16.7,6.96 17.85,16.2l13.24,105.63c0.34,2.73 -0.96,5.33 -3.49,6.96 -6.91,4.46 -34.87,5.21 -52.75,5.21zM106.67,298.69c6.16,1.37 22.23,2.92 46.86,3.03 24.52,0.12 40.57,-1.28 46.8,-2.6l-12.75,-101.7c-0.41,-3.24 -2.96,-5.69 -5.95,-5.69h-58.89c-3.07,0 -5.63,2.52 -5.97,5.87l-10.1,101.09z"/>
+    <path android:fillColor="@color/pink_60" android:fillType="nonZero" android:pathData="M236.78,184.23c0,8.01 -38.06,4.5 -85,4.5s-85,3.51 -85,-4.5 38.06,-13.5 85,-13.5 85,5.49 85,13.5z"/>
+    <path android:fillColor="@color/pink_60" android:fillType="nonZero" android:pathData="M208.67,189.99c-6.81,0 -14.61,-0.16 -23.17,-0.33 -10.19,-0.2 -21.74,-0.44 -33.72,-0.44s-23.53,0.23 -33.72,0.44c-27.02,0.54 -46.53,0.93 -50.82,-3.27 -0.64,-0.63 -0.96,-1.35 -0.96,-2.16 0,-9.19 43.01,-14 85.5,-14s85.5,4.81 85.5,14c0,0.81 -0.32,1.54 -0.96,2.16 -2.93,2.87 -12.97,3.6 -27.65,3.6zM151.78,188.23c11.99,0 23.54,0.23 33.74,0.44 25.76,0.52 46.11,0.92 50.1,-2.99 0.45,-0.44 0.66,-0.91 0.66,-1.45 0,-7.29 -37.12,-13 -84.5,-13s-84.5,5.71 -84.5,13c0,0.54 0.22,1.01 0.66,1.45 3.99,3.91 24.34,3.5 50.1,2.99 10.19,-0.21 21.75,-0.44 33.74,-0.44z"/>
+</vector>

From 02d9838962c8611bda746acafb99eba97b05a6d9 Mon Sep 17 00:00:00 2001
From: malinajirka <malinajirka@gmail.com>
Date: Wed, 8 Apr 2020 09:01:49 +0200
Subject: [PATCH 16/30] Minor cleanup

---
 .../previews/SiteCreationPreviewFragment.kt            | 10 ++--------
 .../layout/site_creation_progress_creating_site.xml    |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

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 cec47f40adff..049bc9abda9e 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
@@ -1,7 +1,7 @@
 package org.wordpress.android.ui.sitecreation.previews
 
 import android.animation.Animator
-import android.animation.Animator.AnimatorListener
+import android.animation.AnimatorListenerAdapter
 import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
@@ -238,13 +238,7 @@ class SiteCreationPreviewFragment : SiteCreationBaseFormFragment(),
         val fadeIn = AniUtils.getFadeInAnim(loadingTextLayout, animationDuration)
 
         // update the text when the view isn't visible
-        fadeIn.addListener(object : AnimatorListener {
-            override fun onAnimationRepeat(animation: Animator?) {}
-
-            override fun onAnimationEnd(animation: Animator?) {}
-
-            override fun onAnimationCancel(animation: Animator?) {}
-
+        fadeIn.addListener(object : AnimatorListenerAdapter() {
             override fun onAnimationStart(animation: Animator) {
                 loadingTextView.text = newText
             }
diff --git a/WordPress/src/main/res/layout/site_creation_progress_creating_site.xml b/WordPress/src/main/res/layout/site_creation_progress_creating_site.xml
index ebf98079ee41..9455a2a251ca 100644
--- a/WordPress/src/main/res/layout/site_creation_progress_creating_site.xml
+++ b/WordPress/src/main/res/layout/site_creation_progress_creating_site.xml
@@ -69,7 +69,7 @@
             android:layout_height="@dimen/icon_size_075"
             android:contentDescription="@null"
             android:src="@drawable/ic_checkmark_white_24dp"
-            android:tint="@color/success" />
+            app:tint="@color/success" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/progress_text"

From d91beb38e63825fe0e16d56576e227841eeb29af Mon Sep 17 00:00:00 2001
From: Matt Chowning <matt.chowning@automattic.com>
Date: Mon, 23 Mar 2020 14:22:13 -0400
Subject: [PATCH 17/30] Update fluxc to enable authenticated rest api request
 to self-hosted sites

---
 .../reactnative/ReactNativeRequestHandler.kt  | 32 +------
 .../posts/reactnative/ReactNativeUrlUtil.kt   | 50 ----------
 .../ReactNativeRequestHandlerTest.kt          | 91 ++-----------------
 .../reactnative/ReactNativeUrlUtilTest.kt     | 68 --------------
 build.gradle                                  |  2 +-
 5 files changed, 9 insertions(+), 234 deletions(-)
 delete mode 100644 WordPress/src/main/java/org/wordpress/android/ui/posts/reactnative/ReactNativeUrlUtil.kt
 delete mode 100644 WordPress/src/test/java/org/wordpress/android/ui/posts/reactnative/ReactNativeUrlUtilTest.kt

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/reactnative/ReactNativeRequestHandler.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/reactnative/ReactNativeRequestHandler.kt
index 0b4620b9fcdf..145c89f32554 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/reactnative/ReactNativeRequestHandler.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/reactnative/ReactNativeRequestHandler.kt
@@ -19,7 +19,6 @@ import javax.inject.Named
 
 class ReactNativeRequestHandler @Inject constructor(
     private val reactNativeStore: ReactNativeStore,
-    private val urlUtil: ReactNativeUrlUtil,
     @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
 ) : CoroutineScope {
     override val coroutineContext = bgDispatcher + Job()
@@ -31,11 +30,8 @@ class ReactNativeRequestHandler @Inject constructor(
         onError: Consumer<Bundle>
     ) {
         launch {
-            if (mSite.isUsingWpComRestApi) {
-                performGetRequestForWPComSite(pathWithParams, mSite.siteId, onSuccess::accept, onError::accept)
-            } else {
-                performGetRequestForSelfHostedSite(pathWithParams, mSite.url, onSuccess::accept, onError::accept)
-            }
+            val response = reactNativeStore.executeRequest(mSite, pathWithParams)
+            handleResponse(response, onSuccess::accept, onError::accept)
         }
     }
 
@@ -49,30 +45,6 @@ class ReactNativeRequestHandler @Inject constructor(
         coroutineContext[Job]!!.cancel()
     }
 
-    private suspend fun performGetRequestForWPComSite(
-        pathWithParams: String,
-        wpComSiteId: Long,
-        onSuccess: (String) -> Unit,
-        onError: (Bundle) -> Unit
-    ) {
-        urlUtil.parseUrlAndParamsForWPCom(pathWithParams, wpComSiteId)?.let { (url, params) ->
-            val response = reactNativeStore.performWPComRequest(url, params)
-            handleResponse(response, onSuccess, onError)
-        }
-    }
-
-    private suspend fun performGetRequestForSelfHostedSite(
-        pathWithParams: String,
-        siteUrl: String,
-        onSuccess: (String) -> Unit,
-        onError: (Bundle) -> Unit
-    ) {
-        urlUtil.parseUrlAndParamsForWPOrg(pathWithParams, siteUrl)?.let { (url, params) ->
-            val response = reactNativeStore.performWPAPIRequest(url, params)
-            handleResponse(response, onSuccess, onError)
-        }
-    }
-
     private fun handleResponse(
         response: ReactNativeFetchResponse,
         onSuccess: (String) -> Unit,
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/reactnative/ReactNativeUrlUtil.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/reactnative/ReactNativeUrlUtil.kt
deleted file mode 100644
index aa920e654a4a..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/reactnative/ReactNativeUrlUtil.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.wordpress.android.ui.posts.reactnative
-
-import android.net.Uri
-import javax.inject.Inject
-
-private const val WPCOM_ENDPOINT = "https://public-api.wordpress.com"
-
-class ReactNativeUrlUtil @Inject constructor() {
-    internal fun parseUrlAndParamsForWPCom(
-        pathWithParams: String,
-        wpComSiteId: Long
-    ): Pair<String, Map<String, String>>? =
-            parsePathAndParams(pathWithParams)?.let { (path, params) ->
-                val url = WPCOM_ENDPOINT + path.replace("wp/v2/", "wp/v2/sites/$wpComSiteId/")
-                Pair(url, params)
-            }
-
-    internal fun parseUrlAndParamsForWPOrg(
-        pathWithParams: String,
-        siteUrl: String
-    ): Pair<String, Map<String, String>>? =
-            parsePathAndParams(pathWithParams)?.let { (path, params) ->
-                val url = "$siteUrl/wp-json$path"
-                val updatedParams = updateUrlForWPOrgRequest(params)
-                Pair(url, updatedParams)
-            }
-
-    /*
-     * We cannot make authorized requests to self-hosted sites. A "context" of
-     * "edit" requires authorization, so changing the context to "view" since that does not need
-     * authorizations and still has the data we need.
-     */
-    private fun updateUrlForWPOrgRequest(params: Map<String, String>): Map<String, String> =
-            params.mapValues { (key, value) ->
-                val hasEditContext = key == "context" && value == "edit"
-                if (hasEditContext) {
-                    "view"
-                } else {
-                    value
-                }
-            }
-
-    private fun parsePathAndParams(pathWithParams: String): Pair<String, Map<String, String>> {
-        val uri = Uri.parse(pathWithParams)
-        val paramMap = uri.queryParameterNames.map { name ->
-            name to uri.getQueryParameter(name)
-        }.toMap()
-        return Pair(uri.path, paramMap)
-    }
-}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/reactnative/ReactNativeRequestHandlerTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/reactnative/ReactNativeRequestHandlerTest.kt
index c2ca681eeb54..306cbaa1d67b 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/posts/reactnative/ReactNativeRequestHandlerTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/reactnative/ReactNativeRequestHandlerTest.kt
@@ -29,31 +29,20 @@ import org.wordpress.android.util.NoDelayCoroutineDispatcher
 @RunWith(RobolectricTestRunner::class)
 class ReactNativeRequestHandlerTest {
     private val reactNativeStore = mock<ReactNativeStore>()
-    private val reactNativeUrlUtil = mock<ReactNativeUrlUtil>()
     private val site = mock<SiteModel>()
-
     private val pathWithParams = "/wp/v2/media?context=edit"
-    private val siteId: Long = 1111
-    private val siteUrl = "a_site_url"
-    private val parsedPath = "/wp/v2/media"
-    private val paramsMap = mapOf("context" to "edit")
-
     private lateinit var subject: ReactNativeRequestHandler
 
     @Before
     fun setUp() {
         subject = ReactNativeRequestHandler(
                 reactNativeStore,
-                reactNativeUrlUtil,
                 NoDelayCoroutineDispatcher()
         )
-
-        whenever(site.siteId).thenReturn(siteId)
-        whenever(site.url).thenReturn(siteUrl)
     }
 
     @Test
-    fun `WPcom get request that succeeds`() = test {
+    fun `successful request`() = test {
         whenever(site.isUsingWpComRestApi).thenReturn(true)
 
         var calledSuccess = false
@@ -67,14 +56,11 @@ class ReactNativeRequestHandlerTest {
             fail("Error handler should not be called")
         }
 
-        whenever(reactNativeUrlUtil.parseUrlAndParamsForWPCom(pathWithParams, siteId)).thenReturn(
-                Pair(parsedPath, paramsMap)
-        )
-
         val successfulResponseJson = mock<JsonElement>()
         whenever(successfulResponseJson.toString()).thenReturn(jsonAsString)
+
         val fetchResponse = ReactNativeFetchResponse.Success(successfulResponseJson)
-        whenever(reactNativeStore.performWPComRequest(parsedPath, paramsMap)).thenReturn(fetchResponse)
+        whenever(reactNativeStore.executeRequest(site, pathWithParams)).thenReturn(fetchResponse)
 
         subject.performGetRequest(pathWithParams, site, successHandler, errorHandler)
 
@@ -82,7 +68,7 @@ class ReactNativeRequestHandlerTest {
     }
 
     @Test
-    fun `WPcom get request that fails`() = test {
+    fun `failed request`() = test {
         whenever(site.isUsingWpComRestApi).thenReturn(true)
 
         var calledError = false
@@ -98,80 +84,15 @@ class ReactNativeRequestHandlerTest {
             fail("Success handler should not be called")
         }
 
-        whenever(reactNativeUrlUtil.parseUrlAndParamsForWPCom(pathWithParams, siteId)).thenReturn(
-                Pair(parsedPath, paramsMap)
-        )
-
-        val fetchResponse = getFetchResponseError(errorMessage, statusCode)
-        whenever(reactNativeStore.performWPComRequest(parsedPath, paramsMap)).thenReturn(fetchResponse)
-
-        subject.performGetRequest(pathWithParams, site, successHandler, errorHandler)
-
-        assertTrue(calledError)
-    }
-
-    @Test
-    fun `WPorg get request that succeeds`() = test {
-        whenever(site.isUsingWpComRestApi).thenReturn(false)
-
-        var calledSuccess = false
-        val jsonAsString = "json_as_string"
-        val successHandler = Consumer<String> {
-            if (it != jsonAsString) { fail("expected json was not returned: $it") }
-            calledSuccess = true
-        }
-
-        val errorHandler = Consumer<Bundle> {
-            fail("Error handler should not be called")
-        }
-
-        whenever(reactNativeUrlUtil.parseUrlAndParamsForWPOrg(pathWithParams, siteUrl)).thenReturn(
-                Pair(parsedPath, paramsMap)
-        )
-
-        val successfulResponseJson = mock<JsonElement>()
-        whenever(successfulResponseJson.toString()).thenReturn(jsonAsString)
-        val fetchResponse = ReactNativeFetchResponse.Success(successfulResponseJson)
-        whenever(reactNativeStore.performWPAPIRequest(parsedPath, paramsMap)).thenReturn(fetchResponse)
-
-        subject.performGetRequest(pathWithParams, site, successHandler, errorHandler)
-
-        assertTrue(calledSuccess)
-    }
-
-    @Test
-    fun `WPorg get request that fails`() = test {
-        whenever(site.isUsingWpComRestApi).thenReturn(false)
-
-        var calledError = false
-        val statusCode = 505
-        val errorMessage = "error_message"
-        val errorHandler = Consumer<Bundle> {
-            assertEquals(statusCode, it.getInt("code"))
-            assertEquals(errorMessage, it.getString("message"))
-            calledError = true
-        }
-
-        val successHandler = Consumer<String> {
-            fail("Success handler should not be called")
-        }
-
-        whenever(reactNativeUrlUtil.parseUrlAndParamsForWPOrg(pathWithParams, siteUrl)).thenReturn(
-                Pair(parsedPath, paramsMap)
-        )
-
         val fetchResponse = getFetchResponseError(errorMessage, statusCode)
-        whenever(reactNativeStore.performWPAPIRequest(parsedPath, paramsMap)).thenReturn(fetchResponse)
+        whenever(reactNativeStore.executeRequest(site, pathWithParams)).thenReturn(fetchResponse)
 
         subject.performGetRequest(pathWithParams, site, successHandler, errorHandler)
 
         assertTrue(calledError)
     }
 
-    private fun getFetchResponseError(
-        errorMessage: String,
-        statusCode: Int
-    ): Error {
+    private fun getFetchResponseError(errorMessage: String, statusCode: Int): Error {
         val volleyNetworkResponse = NetworkResponse(statusCode, null, false, 0L, null)
         val volleyError = VolleyError(volleyNetworkResponse)
 
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/reactnative/ReactNativeUrlUtilTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/reactnative/ReactNativeUrlUtilTest.kt
deleted file mode 100644
index 9fe2b1376f6b..000000000000
--- a/WordPress/src/test/java/org/wordpress/android/ui/posts/reactnative/ReactNativeUrlUtilTest.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.wordpress.android.ui.posts.reactnative
-
-import android.os.Build
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
-import org.wordpress.android.TestApplication
-
-private const val INPUT_PATH = "/wp/v2/media/54"
-private const val INPUT_QUERY_PARAMS = "?context=edit&_locale=user"
-private val INPUT_QUERY_PARAMS_MAP = mapOf("context" to "edit", "_locale" to "user")
-
-@Config(application = TestApplication::class, sdk = [Build.VERSION_CODES.LOLLIPOP])
-@RunWith(RobolectricTestRunner::class)
-class ReactNativeUrlUtilTest {
-    private lateinit var subject: ReactNativeUrlUtil
-
-    @Before
-    fun setUp() {
-        subject = ReactNativeUrlUtil()
-    }
-
-    @Test
-    fun `successfully generates url and query params for WPcom`() {
-        val siteId = 555L
-
-        val expectedUrl = "https://public-api.wordpress.com/wp/v2/sites/$siteId/media/54"
-        val expected = Pair(expectedUrl, INPUT_QUERY_PARAMS_MAP)
-
-        assertEquals(expected, subject.parseUrlAndParamsForWPCom(INPUT_PATH + INPUT_QUERY_PARAMS, siteId))
-    }
-
-    @Test
-    fun `successfully generates url missing query params for WPcom`() {
-        val siteId = 555L
-
-        val expectedUrl = "https://public-api.wordpress.com/wp/v2/sites/$siteId/media/54"
-        val expected = Pair(expectedUrl, emptyMap<String, String>())
-
-        assertEquals(expected, subject.parseUrlAndParamsForWPCom(INPUT_PATH, siteId))
-    }
-
-    @Test
-    fun `successfully generates url and query params for WPorg`() {
-        val siteUrl = "https://jurassic.ninja"
-
-        val expectedUrl = "$siteUrl/wp-json/wp/v2/media/54"
-
-        // changes context from edit to view
-        val expectedParams = INPUT_QUERY_PARAMS_MAP.plus("context" to "view")
-
-        val expected = Pair(expectedUrl, expectedParams)
-        assertEquals(expected, subject.parseUrlAndParamsForWPOrg(INPUT_PATH + INPUT_QUERY_PARAMS, siteUrl))
-    }
-
-    @Test
-    fun `successfully generates url missing query params for WPorg`() {
-        val siteUrl = "https://jurassic.ninja"
-
-        val expectedUrl = "$siteUrl/wp-json/wp/v2/media/54"
-        val expected = Pair(expectedUrl, emptyMap<String, String>())
-
-        assertEquals(expected, subject.parseUrlAndParamsForWPOrg(INPUT_PATH, siteUrl))
-    }
-}
diff --git a/build.gradle b/build.gradle
index e0e4b1b4e598..17ff59a08374 100644
--- a/build.gradle
+++ b/build.gradle
@@ -106,7 +106,7 @@ ext {
     targetSdkVersion = 28
 
     daggerVersion = '2.22.1'
-    fluxCVersion = '1.6.9'
+    fluxCVersion = '1.6.10-beta-1'
 
     appCompatVersion = '1.0.2'
     constraintLayoutVersion = '1.1.3'

From e8798de0334097557b67d29d9d396db6d6bce79f Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Wed, 8 Apr 2020 14:46:06 -0400
Subject: [PATCH 18/30] Updates .configure to latest hash

---
 .configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.configure b/.configure
index df3e2a3eab64..79c516aded91 100644
--- a/.configure
+++ b/.configure
@@ -1,7 +1,7 @@
 {
   "project_name": "WordPress-Android",
   "branch": "master",
-  "pinned_hash": "eb32678967bdbe1e100a6dbb4cf8adeb8935e335",
+  "pinned_hash": "c9fee80926844dde0c23d55128de6232539571e2",
   "files_to_copy": [
     {
       "file": "android/WPAndroid/gradle.properties",
@@ -27,4 +27,4 @@
   "file_dependencies": [
 
   ]
-}
\ No newline at end of file
+}

From 32efd51755de2bddabae912855176d30617b266f Mon Sep 17 00:00:00 2001
From: Klymentiy haykov <forsver@gmail.com>
Date: Wed, 8 Apr 2020 12:19:56 -0700
Subject: [PATCH 19/30] Updated GB reference.

---
 libs/gutenberg-mobile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile
index 2784d09fd276..b693f1431a3b 160000
--- a/libs/gutenberg-mobile
+++ b/libs/gutenberg-mobile
@@ -1 +1 @@
-Subproject commit 2784d09fd276dc366cf6c8161488d06e79311fe2
+Subproject commit b693f1431a3b21274574628bb20e0347cf215331

From a4a7c45a094bf03723d5fc62eea4c2b28c99e4b1 Mon Sep 17 00:00:00 2001
From: malinajirka <malinajirka@gmail.com>
Date: Thu, 9 Apr 2020 11:26:21 +0200
Subject: [PATCH 20/30] Remove unnecessary pageActionsEnabled for upload as we
 use an overlay

---
 .../viewmodel/pages/PageListEventListener.kt  |  9 ------
 .../android/viewmodel/pages/PagesViewModel.kt | 31 -------------------
 2 files changed, 40 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListEventListener.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListEventListener.kt
index ca5a60663feb..d2e6fb029c23 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListEventListener.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListEventListener.kt
@@ -38,8 +38,6 @@ class PageListEventListener(
     private val eventBusWrapper: EventBusWrapper,
     private val site: SiteModel,
     private val handleRemoteAutoSave: (LocalId, Boolean) -> Unit,
-    private val handlePageUpdated: (RemoteId) -> Unit,
-    private val handlePostUploadedStarted: (RemoteId) -> Unit,
     private val handlePostUploadFinished: (RemoteId, Boolean) -> Unit,
     private val invalidateUploadStatus: (List<LocalId>) -> Unit
 ) : CoroutineScope {
@@ -87,7 +85,6 @@ class PageListEventListener(
                             LocalId((event.causeOfChange as RemoteAutoSavePost).localPostId),
                             event.isError
                     )
-                    handlePageUpdated.invoke(RemoteId((event.causeOfChange as RemoteAutoSavePost).remotePostId))
                 }
 
                 is UpdatePost -> {
@@ -99,7 +96,6 @@ class PageListEventListener(
                         )
                     }
                     uploadStatusChanged(LocalId((event.causeOfChange as UpdatePost).localPostId))
-                    handlePageUpdated.invoke(RemoteId((event.causeOfChange as UpdatePost).remotePostId))
                 }
             }
         }
@@ -138,7 +134,6 @@ class PageListEventListener(
     fun onEventBackgroundThread(event: PostEvents.PostUploadStarted) {
         if (event.post != null && event.post.isPage && event.post.localSiteId == site.id) {
             uploadStatusChanged(LocalId(event.post.id))
-            handlePostUploadedStarted(RemoteId(event.post.remotePostId))
         }
     }
 
@@ -182,10 +177,8 @@ class PageListEventListener(
             postStore: PostStore,
             eventBusWrapper: EventBusWrapper,
             site: SiteModel,
-            handlePageUpdated: (RemoteId) -> Unit,
             invalidateUploadStatus: (List<LocalId>) -> Unit,
             handleRemoteAutoSave: (LocalId, Boolean) -> Unit,
-            handlePostUploadedStarted: (RemoteId) -> Unit,
             handlePostUploadFinished: (RemoteId, Boolean) -> Unit
         ): PageListEventListener {
             return PageListEventListener(
@@ -194,10 +187,8 @@ class PageListEventListener(
                     postStore = postStore,
                     eventBusWrapper = eventBusWrapper,
                     site = site,
-                    handlePageUpdated = handlePageUpdated,
                     invalidateUploadStatus = invalidateUploadStatus,
                     handleRemoteAutoSave = handleRemoteAutoSave,
-                    handlePostUploadedStarted = handlePostUploadedStarted,
                     handlePostUploadFinished = handlePostUploadFinished
             )
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt
index 10ed765d563c..6a3d75695534 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt
@@ -178,7 +178,6 @@ class PagesViewModel
         get() = _lastSearchQuery
 
     private var searchJob: Job? = null
-    private var pageUpdateContinuations: MutableMap<Long, Continuation<Unit>> = mutableMapOf()
     private var currentPageType = PUBLISHED
 
     private lateinit var pageListEventListener: PageListEventListener
@@ -209,10 +208,8 @@ class PagesViewModel
                 postStore = postStore,
                 eventBusWrapper = eventBusWrapper,
                 site = site,
-                handlePageUpdated = this::handlePageUpdated,
                 invalidateUploadStatus = this::handleInvalidateUploadStatus,
                 handleRemoteAutoSave = this::handleRemoveAutoSaveEvent,
-                handlePostUploadedStarted = this::postUploadStarted,
                 handlePostUploadFinished = this::postUploadedFinished
         )
     }
@@ -269,14 +266,6 @@ class PagesViewModel
         }
     }
 
-    private suspend fun waitForPageUpdate(remotePageId: Long) {
-        _arePageActionsEnabled = false
-        suspendCoroutineWithTimeout<Unit>(PAGE_UPLOAD_TIMEOUT) { cont ->
-            pageUpdateContinuations[remotePageId] = cont
-        }
-        _arePageActionsEnabled = true
-    }
-
     fun onPageParentSet(pageId: Long, parentId: Long) {
         launch {
             pageMap[pageId]?.let { page ->
@@ -763,18 +752,6 @@ class PagesViewModel
     private fun hasRemoteAutoSavePreviewError() = _previewState.value != null &&
             _previewState.value == PostListRemotePreviewState.REMOTE_AUTO_SAVE_PREVIEW_ERROR
 
-    fun handlePageUpdated(remotePostId: RemoteId) {
-        var id = 0L
-        if (!pageUpdateContinuations.contains(id)) {
-            id = remotePostId.value
-        }
-
-        pageUpdateContinuations[id]?.let { cont ->
-            pageUpdateContinuations.remove(id)
-            cont.resume(Unit)
-        }
-    }
-
     private fun handleRemoveAutoSaveEvent(pageId: LocalId, isError: Boolean) {
         val post = postStore.getPostByLocalPostId(pageId.value)
 
@@ -790,14 +767,6 @@ class PagesViewModel
         }
     }
 
-    fun postUploadStarted(remoteId: RemoteId) {
-        launch {
-            performIfNetworkAvailableAsync {
-                waitForPageUpdate(remoteId.value)
-            }
-        }
-    }
-
     private fun postUploadedFinished(remoteId: RemoteId, isError: Boolean) {
         pageMap[remoteId.value]?.let {
             _uploadFinishedAction.postValue(Pair(it, isError))

From 047851025d819dbbcc865ec6f7155a4a84acf8dc Mon Sep 17 00:00:00 2001
From: malinajirka <malinajirka@gmail.com>
Date: Thu, 9 Apr 2020 12:00:24 +0200
Subject: [PATCH 21/30] Remove legacy tests and unused code

---
 .../android/viewmodel/pages/PagesViewModel.kt |  4 --
 .../viewmodel/pages/PagesViewModelTest.kt     | 43 -------------------
 2 files changed, 47 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt
index 6a3d75695534..af73d9327291 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt
@@ -48,7 +48,6 @@ import org.wordpress.android.util.EventBusWrapper
 import org.wordpress.android.util.NetworkUtilsWrapper
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.util.analytics.AnalyticsUtils
-import org.wordpress.android.util.coroutines.suspendCoroutineWithTimeout
 import org.wordpress.android.viewmodel.ScopedViewModel
 import org.wordpress.android.viewmodel.SingleLiveEvent
 import org.wordpress.android.viewmodel.helpers.DialogHolder
@@ -69,15 +68,12 @@ import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListType.TRAS
 import java.util.SortedMap
 import javax.inject.Inject
 import javax.inject.Named
-import kotlin.coroutines.Continuation
-import kotlin.coroutines.resume
 
 private const val ACTION_DELAY = 100L
 private const val SEARCH_DELAY = 200L
 private const val SCROLL_DELAY = 200L
 private const val SNACKBAR_DELAY = 500L
 private const val SEARCH_COLLAPSE_DELAY = 500L
-private const val PAGE_UPLOAD_TIMEOUT = 5000L
 
 typealias LoadAutoSaveRevision = Boolean
 
diff --git a/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PagesViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PagesViewModelTest.kt
index 85438371bb0e..ac1d414c8f66 100644
--- a/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PagesViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PagesViewModelTest.kt
@@ -163,41 +163,6 @@ class PagesViewModelTest {
         assertThat(result).isNull()
     }
 
-    @Test
-    fun `when a page is being uploaded, page actions are disabled`() = test {
-        // Arrange
-        val page = createPostModel()
-
-        setUpPageStoreWithEmptyPages()
-        viewModel.start(site)
-
-        assertThat(viewModel.arePageActionsEnabled).isTrue()
-
-        // Act
-        viewModel.postUploadStarted(RemoteId(page.remotePostId))
-
-        // Assert
-        assertThat(viewModel.arePageActionsEnabled).isFalse()
-    }
-
-    @Test
-    fun `when a page upload is completed, page actions are re-enabled`() = test {
-        // Given
-        val page = createPostModel()
-
-        setUpPageStoreWithEmptyPages()
-        viewModel.start(site)
-
-        viewModel.postUploadStarted(RemoteId(page.remotePostId))
-        assertThat(viewModel.arePageActionsEnabled).isFalse()
-
-        // When
-        viewModel.handlePageUpdated(RemoteId(page.remotePostId))
-
-        // Then
-        assertThat(viewModel.arePageActionsEnabled).isTrue()
-    }
-
     @Test
     fun `Auto-upload is initiated when the user enters the screen`() = test {
         // Given
@@ -281,12 +246,4 @@ class PagesViewModelTest {
 
         return pageModel
     }
-
-    private companion object Fixtures {
-        fun createPostModel() = PostModel().apply {
-            setId(1_001)
-            setRemotePostId(2_034)
-            setIsPage(true)
-        }
-    }
 }

From 55cf12348ef16e48c6739b6629a0eb47a47a4b49 Mon Sep 17 00:00:00 2001
From: malinajirka <malinajirka@gmail.com>
Date: Thu, 9 Apr 2020 12:00:46 +0200
Subject: [PATCH 22/30] Remove legacy tests and unused code

---
 .../org/wordpress/android/viewmodel/pages/PagesViewModelTest.kt  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PagesViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PagesViewModelTest.kt
index ac1d414c8f66..d152d0e25575 100644
--- a/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PagesViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PagesViewModelTest.kt
@@ -21,7 +21,6 @@ import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.model.CauseOfOnPostChanged
-import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
 import org.wordpress.android.fluxc.model.PostModel
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.page.PageModel

From 5d45781441dcb9af1085c4010cd4b09da8f9d959 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Thu, 9 Apr 2020 06:43:26 -0400
Subject: [PATCH 23/30] Run configure-apply to update .configure

---
 .configure-files/gradle.properties.enc | Bin 2832 -> 2864 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/.configure-files/gradle.properties.enc b/.configure-files/gradle.properties.enc
index 9e124793952956d4e6f4af26363afd8d9fa31971..d63de9c1aa0878c25e1fa240e3d1d676693c3f79 100644
GIT binary patch
delta 1185
zcmV;S1YY})7O)nupay><XtUxYCBU8R)_MR%t$qA7mNY^jd=AzY+10ch{OdiLs9AyL
z+lF597&_Vz4!;HjG_q8cUnVa|?jU$L_wZ)FufuY<??gna0ri*`CNZxCh`oeD)QN<Y
zYfjIS=H$nYAN=#Gp<fqGAlZOFx1lCb<sp5OUGIEl`sW!pmid34Xxpa4C)opAc7`qm
z6+n&b`ByWk*y-0bux`_zu!5Ar_8Flt>Fj^V&?%b?w$gc01g}r82w@PQBtiG?Uu`z_
z<Sigco9lC*w6@-@5B%)kPotVdQ;FEH^N@IkG)Jr(@!0f-t)uZwSAZBl;qpH`CNY%|
z4=|!OU@MsFv;==Zh_oxnuTx=!3beh&!nJ3EkX(bofIoU&2EKC)({8m&x+T4eBsvU)
zuQSv+{Y(_E{fxxX85=j1OhYJWuPJAkNuM|V6dw3frANLT%SSOq%HzB`FPu3|jgluz
z;`EIie9Uja5hr`(53a1=PQ&H$|LW>}?s`NUARKw)CnSGCWZjb8@1&f)r$_?P!lkuU
z4iL?YqF^h(f(dXi!<in?-yNq|&#|3VagZ9bM<;y@GCWPjan6iIJR_3>kZv;U0AuZ*
z-Gy8F^F+98@xf7+>ZXWK1sOGK3ZJk*(|ReaJTQ(9LZbP>|I$1hY8|@``-^<em~RzO
z3QCQ96#;+MPPcw234bm&Z$leF4)COgGu$L;U(ciZ;@LhT7GBQ7udG&>ccc-344b8t
zD2UQm5I7a4qI+d$TY>dcIjnJ~PvyH*3(a4O%Df%dZx^ifeXFLv7V*6q16$F~4!*Fy
zO=_NFm}iWU1}}g%`Xk46>Mh^b#$Z6_<x?_mc&C51Aik&ph5Sh<?Ea*oB~*1Sp7rX*
z`q|hdC&)@7lGo{4%Q{VJ1rpi^FTkX2TO$2us_Se?#`SWt92h7RN4*AvK@fE*;IuE>
zOjjZ56XnuNuWm|i4uQ~xY+3aB*KOL-UDd$7g}Zg{s*t6nOZojTRgoC%8_in?Y96E9
zddh!xaF}hT^JJlovCy!SYO2l&wMz5g<eYI*QhDc+s^N@%vF0ThS7GW3h=)^_IsedI
zLQ2mzMAY$M&-jQzE&1^yopTFipHI`z@Q=zVc0Cr-%NEj__mMb%M^y?5-cc5%E8eV?
zCf1jvU@;ba@=T{$C}_E!MANf`IyI_v1-XAP)WimKx}&u>ek7Wsb1?_JO}9No-jLQu
z9a_5YMtIuVurKZWoN}wFx;-jmttIaVFvF)D^fKhfBYSNc)&7&rVL2Jfh7w}KNS2hi
znIJWE%$xH^V)gJx>vmuE_*G7_ij<@F9Y4X76j}jMuX?=69j1>Go?1Rk^30}rAH{!1
zJm8N^Ic$dFrTF1R1YL_P*<SiGL8gswspDB{!VUc)#}4}Qwc*j_PK5j@W*4ew{vC)P
zh<U6Aa9YnhO_=W=fg|xoiEj)7hf%An)PZ+7NXZLnuiEmjlX%JBM{;D`E~z(_XJ4u@
zblb>BtBk96yI#NM2XbsEYChRNc260ieqpnvOdF@OzJ}B4o(x|$lR%apoOu6pQomCO

delta 1152
zcmV-`1b_Rm7LXROpay?olSCOd-U2;^L$!ZxZ(ZrekfYCR=K_l!1MOptJfZ@m(u_D`
zFCvhFV>)+Axg4&m7Le}gZ2!r}rkBsr;|wM+3kBsAEk{%E&c*NePL=$7e5k5~+KaR_
zoy`y&$Jd&5iNvM#9bx0hNHcZUUcJF~wi3N+6B(uv6Zn!-P$hrAQ=#t6&VUDVt~E;s
zP`^3?M>jb?u0v>wI|sZ<nWls(ey3L~tK<V_PwFd}B0vmPNiEzQYoUiFlGG|9>jKxf
zO4&2}8ub~se#vZMJl1&nutM&Fzr>5OzE4YOnIld$th8m6p&2(_C8jD=7!c9rxagye
z<ZjwL0q_T0TWWv%0&Dg!{QD4*HC~of#|-xEI5u>)vWM-$HT&RQJAb)umnV+}&v0xd
zUYfDo!M(!8LeF&E9Cl+LORMD*e0}ITUO$&gts1OJcLR?y)T3BVf4V{<=TI+qFN8&B
zfI<o{g0Th|dSp72DI=*%eaE}T*A-^aY`i^P<IZhl3Ne4h4&nhUglC+zUI$s4aEJw#
z?MZ#iYg<?q<SI~D=>T_seyoPsPRiEZK5G!@OXonjG@cEy``D?!^_xRH`ajI-ddG)Y
zKM+Sp%TEC4mPH&ntYgRMbWYLm_slVT;UB#R(xk~T%SacDYd?@;Q})E~{Z9BgqqcW_
z9o;(Se42l=f=Tj^H$mUh3a<?!6b);$MH-PC?2wUxz$ORQrKPk2<jhY4k_Cgl3`~y2
zB0A@4yI_6RPdHS`H;+?P6)L>|+9SCU7M#{lnaa)4CQO-3M6OA$i8em(O6(6@fx!A1
zGk{a&PfHQroj>J(kbb&ib9OUyDEm72k}ZOHuDpMw(jD;Nit8;#c(Q@2vS&+~|MdVW
z%bP~__jsIW8HN{Rdz7U-qM&~e(iBMkwu<SKgK0ZQ(l-2L7+By_JViT-dr`WJ5&jN(
zpXz^swj6tFpKA`qKN)g#|E@aDUAsuv+$zHVWRZv19=51wpY9IdxU<J#(jKI~c2Vnv
zTws61dF3@Gm>JS%TNvIU>2xcxD9<eT#t%_$wN3k=-oACP-{I6|`h2;mlN<_xoTeI6
zNI)m>Kd4s&T?Q_sDs`(Ge#(qTnUZGTgOmzHhBS6?WvpKW%PVX@K3|x9YmO3H)_(|Y
zb<@mxs)s&_q(awrN0z$=EN|1V8=_RcAZUMT`5*+T-PO(Y<2{Psl9J=M0RUZE&yFcb
z`oc9w7Y##>ywsI0{fa*PHDF3Ee^2^FBI^n<rxwQY^?FsYEIKY6=y3ID0m*DLWIjCb
znS`zmsGS})FxMf(P8Y;j0gvvCp+vbu-`eRP=dUqkY$8m6#n~!8TTpcvRRdb}@veAX
z4+ky?OQtMpP6E)K)jDAarRG8-Xh&1(;+ub)GEAh_SEgRn#PSHhF`J#RXkQ6&f)X>B
zD*00>{8tL~{t7}jmA6ehXVlki5AYFSr^gb|6>=Lc<LVh6p6B^hyl}v@fFk`fOH{E5
S8Ymg92R#!N!yTw+8Bng@qbdsk


From 02402d22918b67e1fe1b7d18443b5b7bdc389dd5 Mon Sep 17 00:00:00 2001
From: Joel Dean <jdeanjj1000@gmail.com>
Date: Fri, 10 Apr 2020 03:51:32 -0500
Subject: [PATCH 24/30] changed auto upload text from cancel to cancel upload.

---
 .../java/org/wordpress/android/widgets/PostListButtonType.kt    | 2 +-
 WordPress/src/main/res/menu/page_more.xml                       | 2 +-
 WordPress/src/main/res/values/strings.xml                       | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/PostListButtonType.kt b/WordPress/src/main/java/org/wordpress/android/widgets/PostListButtonType.kt
index 502c4436c79e..378811e752ce 100644
--- a/WordPress/src/main/java/org/wordpress/android/widgets/PostListButtonType.kt
+++ b/WordPress/src/main/java/org/wordpress/android/widgets/PostListButtonType.kt
@@ -30,7 +30,7 @@ enum class PostListButtonType constructor(
             R.drawable.ic_trash_white_24dp,
             R.attr.colorOnSurface
     ),
-    BUTTON_CANCEL_PENDING_AUTO_UPLOAD(14, R.string.cancel, R.drawable.ic_undo_white_24dp, R.attr.wpColorWarningDark);
+    BUTTON_CANCEL_PENDING_AUTO_UPLOAD(14, R.string.pages_and_posts_cancel_auto_upload, R.drawable.ic_undo_white_24dp, R.attr.wpColorWarningDark);
 
     companion object {
         fun fromInt(value: Int): PostListButtonType? = values().firstOrNull { it.value == value }
diff --git a/WordPress/src/main/res/menu/page_more.xml b/WordPress/src/main/res/menu/page_more.xml
index c74c0ab62ce0..16fc73efeb09 100644
--- a/WordPress/src/main/res/menu/page_more.xml
+++ b/WordPress/src/main/res/menu/page_more.xml
@@ -10,7 +10,7 @@
     <item
         android:id="@+id/cancel_auto_upload"
         android:orderInCategory="100"
-        android:title="@string/cancel"
+        android:title="@string/pages_and_posts_cancel_auto_upload"
         app:showAsAction="never"/>
     <item
         android:id="@+id/set_parent"
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index eb5377cf8cab..92b773e358d9 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -2617,6 +2617,7 @@
     <string name="pages_empty_scheduled">You don\'t have any scheduled pages</string>
     <string name="pages_empty_trashed">You don\'t have any trashed pages</string>
     <string name="pages_open_page_error">The selected page is not available</string>
+    <string name="pages_and_posts_cancel_auto_upload">Cancel Upload</string>
 
 
     <string name="page_status_pending_review" translatable="false">@string/post_status_pending_review</string>

From 1041766ddbce2376bce6fb57af02ac2a5c787f7b Mon Sep 17 00:00:00 2001
From: Joel Dean <jdeanjj1000@gmail.com>
Date: Fri, 10 Apr 2020 04:19:54 -0500
Subject: [PATCH 25/30] made upload text lower caps.

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

diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index 92b773e358d9..9418faeac73e 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -2617,7 +2617,7 @@
     <string name="pages_empty_scheduled">You don\'t have any scheduled pages</string>
     <string name="pages_empty_trashed">You don\'t have any trashed pages</string>
     <string name="pages_open_page_error">The selected page is not available</string>
-    <string name="pages_and_posts_cancel_auto_upload">Cancel Upload</string>
+    <string name="pages_and_posts_cancel_auto_upload">Cancel upload</string>
 
 
     <string name="page_status_pending_review" translatable="false">@string/post_status_pending_review</string>

From b9ee4220ab9bd59ffe08ece7b362d0db69a0ba05 Mon Sep 17 00:00:00 2001
From: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
Date: Fri, 10 Apr 2020 16:01:11 +0300
Subject: [PATCH 26/30] Replace the dash with comma

---
 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 eb5377cf8cab..af5587923e3f 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -370,8 +370,8 @@
 
     <!-- gutenberg informative dialog -->
     <string name="dialog_gutenberg_informative_title">Block Editor Enabled</string>
-    <string name="dialog_gutenberg_informative_description_post">You\’re now using the block editor for new posts \u2014 great! If you\’d like to change to the classic editor, go to \'My Site\' &gt; \'Site Settings\'.</string>
-    <string name="dialog_gutenberg_informative_description_page">You\’re now using the block editor for new pages \u2014 great! If you\’d like to change to the classic editor, go to \'My Site\' &gt; \'Site Settings\'.</string>
+    <string name="dialog_gutenberg_informative_description_post">You\’re now using the block editor for new posts, great! If you\’d like to change to the classic editor, go to \'My Site\' &gt; \'Site Settings\'.</string>
+    <string name="dialog_gutenberg_informative_description_page">You\’re now using the block editor for new pages, great! If you\’d like to change to the classic editor, go to \'My Site\' &gt; \'Site Settings\'.</string>
     <string name="dialog_gutenberg_informative_description_v2">We made big improvements to the block editor and think it\'s worth a try! We enabled it for new posts and pages but if you\'d like to change to the classic editor, go to \'My Site\' &gt; \'Site Settings\'.</string>
 
     <!-- reload drop down -->

From dabcdeb6e67295aa38c9fa31ab56bec3f8731b80 Mon Sep 17 00:00:00 2001
From: Joel Dean <jdeanjj1000@gmail.com>
Date: Fri, 10 Apr 2020 11:24:25 -0500
Subject: [PATCH 27/30] Fixed ktlint issue.

---
 .../org/wordpress/android/widgets/PostListButtonType.kt    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/PostListButtonType.kt b/WordPress/src/main/java/org/wordpress/android/widgets/PostListButtonType.kt
index 378811e752ce..95723b47ed61 100644
--- a/WordPress/src/main/java/org/wordpress/android/widgets/PostListButtonType.kt
+++ b/WordPress/src/main/java/org/wordpress/android/widgets/PostListButtonType.kt
@@ -30,7 +30,12 @@ enum class PostListButtonType constructor(
             R.drawable.ic_trash_white_24dp,
             R.attr.colorOnSurface
     ),
-    BUTTON_CANCEL_PENDING_AUTO_UPLOAD(14, R.string.pages_and_posts_cancel_auto_upload, R.drawable.ic_undo_white_24dp, R.attr.wpColorWarningDark);
+    BUTTON_CANCEL_PENDING_AUTO_UPLOAD(
+            14,
+            R.string.pages_and_posts_cancel_auto_upload,
+            R.drawable.ic_undo_white_24dp,
+            R.attr.wpColorWarningDark
+    );
 
     companion object {
         fun fromInt(value: Int): PostListButtonType? = values().firstOrNull { it.value == value }

From 88807eed9fd6f9512af442c82ecd16369a3604c6 Mon Sep 17 00:00:00 2001
From: Klymentiy haykov <forsver@gmail.com>
Date: Wed, 8 Apr 2020 10:03:01 -0700
Subject: [PATCH 28/30] Change parent style of NoDisplay activity to
 WordPress.NoActionBar

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

diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml
index d0075029449f..36378ee48ac9 100644
--- a/WordPress/src/main/res/values/styles.xml
+++ b/WordPress/src/main/res/values/styles.xml
@@ -129,8 +129,7 @@
         <item name="android:dropDownListViewStyle">@style/DropDownListView.Light.WordPress</item>
     </style>
 
-    <style name="NoDisplay" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:windowNoTitle">true</item>
+    <style name="NoDisplay" parent="WordPress.NoActionBar">
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowIsTranslucent">true</item>

From e7bd605a92c6db62029faf1a5f943b54472bcfcc Mon Sep 17 00:00:00 2001
From: Klymentiy haykov <forsver@gmail.com>
Date: Mon, 13 Apr 2020 17:12:15 -0700
Subject: [PATCH 29/30] Fixed share intent receiver in dark mode.

---
 .../ui/ShareIntentReceiverActivity.java       |  8 ----
 .../ui/ShareIntentReceiverFragment.java       | 14 ------
 .../layout/share_intent_receiver_activity.xml | 21 ++++----
 .../layout/share_intent_sites_listitem.xml    | 48 +++++++++----------
 4 files changed, 34 insertions(+), 57 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java
index fcf28f73ab08..b511422e43a3 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java
@@ -75,14 +75,6 @@ protected void onCreate(Bundle savedInstanceState) {
         }
     }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-        // keep setBackground in the onResume, otherwise the transition between activities is visible to the user when
-        // sharing text with an account with one visible site
-        findViewById(R.id.main_view).setBackgroundResource(R.color.background_default);
-    }
-
     private void refreshContent() {
         if (FluxCUtils.isSignedInWPComOrHasWPOrgSite(mAccountStore, mSiteStore)) {
             List<SiteModel> visibleSites = mSiteStore.getVisibleSites();
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverFragment.java
index ee48eb80838d..875ea6cd9299 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverFragment.java
@@ -24,8 +24,6 @@
 import org.wordpress.android.ui.main.SitePickerAdapter.SiteList;
 import org.wordpress.android.ui.media.MediaBrowserActivity;
 import org.wordpress.android.ui.posts.EditPostActivity;
-import org.wordpress.android.util.ContextExtensionsKt;
-import org.wordpress.android.util.ViewUtils;
 import org.wordpress.android.util.image.ImageManager;
 
 import javax.inject.Inject;
@@ -171,20 +169,8 @@ public void run() {
 
                                 if (mRecyclerView.computeVerticalScrollRange() > mRecyclerView.getHeight()) {
                                     mBottomButtonsShadow.setVisibility(View.VISIBLE);
-                                    mBottomButtonsContainer.setBackgroundResource(android.R.color.white);
-                                    mShareMediaBtn.setTextColor(getResources().getColor(R.color.primary_50));
-                                    ViewUtils.setButtonBackgroundColor(getContext(), mShareMediaBtn,
-                                            R.style.WordPress_Button_Grey,
-                                            R.attr.colorButtonNormal);
                                 } else {
                                     mBottomButtonsShadow.setVisibility(View.GONE);
-                                    mBottomButtonsContainer.setBackground(null);
-                                    mShareMediaBtn.setTextColor(
-                                            ContextExtensionsKt
-                                                    .getColorFromAttribute(getContext(), R.attr.wpColorText));
-                                    ViewUtils.setButtonBackgroundColor(getContext(), mShareMediaBtn,
-                                            R.style.WordPress_Button,
-                                            R.attr.colorButtonNormal);
                                 }
                             }
                         });
diff --git a/WordPress/src/main/res/layout/share_intent_receiver_activity.xml b/WordPress/src/main/res/layout/share_intent_receiver_activity.xml
index d6c659c70153..8511278e3e88 100644
--- a/WordPress/src/main/res/layout/share_intent_receiver_activity.xml
+++ b/WordPress/src/main/res/layout/share_intent_receiver_activity.xml
@@ -1,15 +1,14 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:id="@+id/main_view"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:baselineAligned="true"
-  app:theme="@style/LoginTheme"
-  android:orientation="vertical">
-
-  <FrameLayout
-    android:id="@+id/fragment_container"
+    android:id="@+id/main_view"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+    android:layout_height="match_parent"
+    android:background="?android:colorBackground"
+    android:baselineAligned="true"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 
 </LinearLayout>
diff --git a/WordPress/src/main/res/layout/share_intent_sites_listitem.xml b/WordPress/src/main/res/layout/share_intent_sites_listitem.xml
index b22506746d8c..a7275fb56b6a 100644
--- a/WordPress/src/main/res/layout/share_intent_sites_listitem.xml
+++ b/WordPress/src/main/res/layout/share_intent_sites_listitem.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:id="@+id/layout_container"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:layout_marginTop="@dimen/margin_medium"
-  android:layout_marginBottom="@dimen/margin_medium"
-  android:layout_marginStart="@dimen/margin_extra_large"
-  android:layout_marginEnd="@dimen/margin_extra_large"
-  android:orientation="horizontal">
-
-  <include
-    tools:ignore="DuplicateIncludedIds"
-    layout="@layout/login_epilogue_sites_listitem"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/layout_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_toStartOf="@+id/radio_selected"/>
+    android:layout_marginStart="@dimen/margin_extra_large"
+    android:layout_marginTop="@dimen/margin_medium"
+    android:layout_marginEnd="@dimen/margin_extra_large"
+    android:layout_marginBottom="@dimen/margin_medium"
+    android:orientation="horizontal">
 
-  <RadioButton
-    android:id="@+id/radio_selected"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="@dimen/margin_small_medium"
-    android:layout_marginEnd="@dimen/margin_small_medium"
-    android:layout_alignParentEnd="true"
-    android:layout_centerVertical="true"
-    android:clickable="false"
-    android:focusableInTouchMode="false" />
+    <include
+        layout="@layout/login_epilogue_sites_listitem"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_toStartOf="@+id/radio_selected"
+        tools:ignore="DuplicateIncludedIds" />
+
+    <com.google.android.material.radiobutton.MaterialRadioButton
+        android:id="@+id/radio_selected"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="@dimen/margin_small_medium"
+        android:layout_marginEnd="@dimen/margin_small_medium"
+        android:clickable="false"
+        android:focusableInTouchMode="false" />
 
 </RelativeLayout>

From 2833f2991c50da163af718e07689d8d2f360f962 Mon Sep 17 00:00:00 2001
From: Klymentiy haykov <forsver@gmail.com>
Date: Mon, 13 Apr 2020 17:41:41 -0700
Subject: [PATCH 30/30] Removed unused styles.

---
 WordPress/src/main/res/values/styles.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml
index 36378ee48ac9..53cd322fffd4 100644
--- a/WordPress/src/main/res/values/styles.xml
+++ b/WordPress/src/main/res/values/styles.xml
@@ -254,19 +254,10 @@
         <item name="android:textColor">@color/neutral_40</item>
     </style>
 
-    <style name="WordPress.Button" parent="Widget.MaterialComponents.Button">
-        <item name="android:textColor">?attr/colorOnPrimarySurface</item>
-    </style>
-
     <style name="WordPress.Button.Primary" parent="Widget.MaterialComponents.Button">
         <item name="backgroundTint">@color/secondary_disabled_selector</item>
     </style>
 
-    <style name="WordPress.Button.Grey" parent="Widget.AppCompat.Button.Colored">
-        <item name="colorButtonNormal">@color/neutral_0</item>
-        <item name="android:textColor">@color/primary_50</item>
-    </style>
-
     <!-- NUX Styles -->
     <style name="WordPress.NUXPrimaryButton">
         <item name="android:textColor">@color/white_neutral_10_selector</item>