From 1ec6c9a186bb5dd5346ded7104674bfb81ef5277 Mon Sep 17 00:00:00 2001
From: Renan Ferrari <renan.fb@gmail.com>
Date: Thu, 14 May 2020 13:04:58 -0300
Subject: [PATCH 01/17] Temporarily add epilogue activities to the debug
 manifest

---
 WordPress/src/debug/AndroidManifest.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/WordPress/src/debug/AndroidManifest.xml b/WordPress/src/debug/AndroidManifest.xml
index 299ee8c21a87..024e31d507ed 100644
--- a/WordPress/src/debug/AndroidManifest.xml
+++ b/WordPress/src/debug/AndroidManifest.xml
@@ -8,6 +8,19 @@
         tools:replace="android:name,android:supportsRtl"
         android:name=".WordPressDebug"
         android:supportsRtl="true">
+
+        <!-- Temporarily adding these activities here, so we are able to launch them from adb -->
+        <activity
+            android:name=".ui.accounts.LoginEpilogueActivity"
+            android:label="@string/login_epilogue_screen_title"
+            android:theme="@style/LoginTheme"
+            android:exported="true" />
+
+        <activity
+            android:name=".ui.accounts.SignupEpilogueActivity"
+            android:label="@string/signup_epilogue_screen_title"
+            android:theme="@style/LoginTheme"
+            android:exported="true" />
     </application>
 
     <!--

From 5cc3132e66e3fc490a40e024bfe71cdc11170cf8 Mon Sep 17 00:00:00 2001
From: Renan Ferrari <renan.fb@gmail.com>
Date: Thu, 14 May 2020 13:09:00 -0300
Subject: [PATCH 02/17] Update signup epilogue layout and styles

---
 .../signup/SignupEpilogueFragment.java        |   7 +-
 .../util/image/ImagePlaceholderManager.kt     |   4 +-
 .../src/main/res/drawable/bg_oval_surface.xml |   5 +
 .../ic_user_circle_no_padding_grey_24dp.xml   |   9 +
 .../src/main/res/layout/signup_epilogue.xml   | 282 +++++++-----------
 WordPress/src/main/res/values/colors.xml      |   1 +
 WordPress/src/main/res/values/dimens.xml      |   1 +
 WordPress/src/main/res/values/styles.xml      |  10 +-
 8 files changed, 141 insertions(+), 178 deletions(-)
 create mode 100644 WordPress/src/main/res/drawable/bg_oval_surface.xml
 create mode 100644 WordPress/src/main/res/drawable/ic_user_circle_no_padding_grey_24dp.xml

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java
index 8636f0df4858..dcac8fbe6a1f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java
@@ -18,9 +18,8 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.ImageButton;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.annotation.LayoutRes;
@@ -91,7 +90,7 @@ public class SignupEpilogueFragment extends LoginBaseFormFragment<SignupEpilogue
     private FullScreenDialogFragment mDialog;
     private SignupEpilogueListener mSignupEpilogueListener;
 
-    protected ImageButton mHeaderAvatarAdd;
+    protected ImageView mHeaderAvatarAdd;
     protected String mDisplayName;
     protected String mEmailAddress;
     protected String mPhotoUrl;
@@ -166,7 +165,7 @@ protected ViewGroup createMainView(LayoutInflater inflater, ViewGroup container,
 
     @Override
     protected void setupContent(ViewGroup rootView) {
-        final RelativeLayout headerAvatarLayout = rootView.findViewById(R.id.signup_epilogue_header_avatar_layout);
+        final FrameLayout headerAvatarLayout = rootView.findViewById(R.id.signup_epilogue_header_avatar_layout);
         headerAvatarLayout.setEnabled(mIsEmailSignup);
         headerAvatarLayout.setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt b/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt
index 79a5d43f0b1c..86f517571a2c 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt
@@ -10,7 +10,7 @@ class ImagePlaceholderManager @Inject constructor() {
         return when (imgType) {
             ImageType.AVATAR -> R.drawable.bg_rectangle_neutral_10_user_32dp
             ImageType.AVATAR_WITH_BACKGROUND -> R.drawable.bg_oval_neutral_30_user_32dp
-            ImageType.AVATAR_WITHOUT_BACKGROUND -> R.drawable.ic_user_circle_grey_24dp
+            ImageType.AVATAR_WITHOUT_BACKGROUND -> R.drawable.ic_user_circle_no_padding_grey_24dp
             ImageType.BLAVATAR -> R.drawable.bg_rectangle_neutral_10_globe_32dp
             ImageType.IMAGE -> null // don't display any error drawable
             ImageType.PHOTO -> R.color.neutral_0
@@ -29,7 +29,7 @@ class ImagePlaceholderManager @Inject constructor() {
         return when (imgType) {
             ImageType.AVATAR -> R.drawable.bg_oval_neutral_0
             ImageType.AVATAR_WITH_BACKGROUND -> R.drawable.bg_oval_neutral_30_user_32dp
-            ImageType.AVATAR_WITHOUT_BACKGROUND -> R.drawable.ic_user_circle_grey_24dp
+            ImageType.AVATAR_WITHOUT_BACKGROUND -> R.drawable.ic_user_circle_no_padding_grey_24dp
             ImageType.BLAVATAR -> R.color.neutral_0
             ImageType.IMAGE -> null // don't display any placeholder
             ImageType.PHOTO -> R.color.neutral_0
diff --git a/WordPress/src/main/res/drawable/bg_oval_surface.xml b/WordPress/src/main/res/drawable/bg_oval_surface.xml
new file mode 100644
index 000000000000..e10c97565529
--- /dev/null
+++ b/WordPress/src/main/res/drawable/bg_oval_surface.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="?attr/colorSurface" />
+</shape>
diff --git a/WordPress/src/main/res/drawable/ic_user_circle_no_padding_grey_24dp.xml b/WordPress/src/main/res/drawable/ic_user_circle_no_padding_grey_24dp.xml
new file mode 100644
index 000000000000..f398127d5fcb
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_user_circle_no_padding_grey_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="@color/login_avatar_placeholder_color"
+        android:pathData="M12,0C5.3723,0 0,5.3723 0,12C0,18.6277 5.3723,24 12,24C18.6277,24 24,18.6277 24,12C24,5.3723 18.6277,0 12,0ZM12,22.2C6.3673,22.2 1.8,17.6327 1.8,12C1.8,6.3673 6.3673,1.8 12,1.8C17.6327,1.8 22.2,6.3673 22.2,12C22.2,17.6327 17.6327,22.2 12,22.2ZM12,12.6C8.3543,12.6 5.4,14.6733 5.4,16.8C5.4,18.9267 8.3543,21 12,21C15.6457,21 18.6,18.9267 18.6,16.8C18.6,14.6733 15.6457,12.6 12,12.6ZM12,12C13.9883,12 15.6,10.3883 15.6,8.4C15.6,6.4117 13.9883,4.8 12,4.8C10.0117,4.8 8.4,6.4117 8.4,8.4C8.4,10.3883 10.0117,12 12,12Z" />
+</vector>
diff --git a/WordPress/src/main/res/layout/signup_epilogue.xml b/WordPress/src/main/res/layout/signup_epilogue.xml
index 650c706b6930..1cf27192199b 100644
--- a/WordPress/src/main/res/layout/signup_epilogue.xml
+++ b/WordPress/src/main/res/layout/signup_epilogue.xml
@@ -1,192 +1,134 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-    <ScrollView
+    <FrameLayout
+        android:id="@+id/content"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/bottom_buttons"
-        android:layout_alignParentTop="true"
-        android:fillViewport="true">
+        android:layout_height="0dp"
+        android:layout_weight="1">
 
-        <LinearLayout
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/scroll_view"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:orientation="vertical"
-            android:paddingTop="@dimen/margin_extra_large">
-
-            <org.wordpress.android.widgets.WPTextView
-                style="@style/LoginTheme.Heading"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/margin_extra_large"
-                android:layout_marginEnd="@dimen/margin_extra_large"
-                android:layout_marginBottom="@dimen/margin_medium"
-                android:text="@string/signup_epilogue_heading" />
+            android:layout_height="match_parent">
 
-            <com.google.android.material.card.MaterialCardView
-                android:id="@+id/user_details_card"
-                style="@style/Widget.MaterialComponents.CardView"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/margin_large"
-                android:layout_marginEnd="@dimen/margin_large"
-                android:layout_marginBottom="@dimen/margin_extra_medium_large"
-                app:cardCornerRadius="@dimen/default_cardview_radius"
-                app:cardElevation="@dimen/card_elevation"
-                app:cardUseCompatPadding="true">
+                android:orientation="vertical"
+                android:padding="@dimen/margin_extra_large">
 
-                <LinearLayout
-                    android:layout_width="match_parent"
+                <FrameLayout
+                    android:id="@+id/signup_epilogue_header_avatar_layout"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:gravity="center_horizontal"
-                    android:orientation="vertical"
-                    android:paddingStart="@dimen/margin_extra_large"
-                    android:paddingEnd="@dimen/margin_extra_large">
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:clickable="true"
+                    android:contentDescription="@string/content_description_add_avatar"
+                    android:focusable="true">
 
-                    <RelativeLayout
-                        android:id="@+id/signup_epilogue_header_avatar_layout"
+                    <ImageView
+                        android:id="@+id/signup_epilogue_header_avatar"
                         android:layout_width="@dimen/avatar_sz_login_epilogue"
                         android:layout_height="@dimen/avatar_sz_login_epilogue"
-                        android:layout_marginTop="@dimen/margin_extra_medium_large"
-                        android:layout_marginBottom="@dimen/margin_medium"
-                        android:background="?attr/selectableItemBackgroundBorderless"
-                        android:clickable="true"
-                        android:contentDescription="@string/content_description_add_avatar"
-                        android:focusable="true">
-
-                        <ImageView
-                            android:id="@+id/signup_epilogue_header_avatar"
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:importantForAccessibility="no"
-                            android:src="@drawable/ic_user_circle_white_24dp"
-                            app:tint="?attr/wpColorOnSurfaceMedium" />
-
-                        <ImageButton
-                            android:id="@+id/signup_epilogue_header_avatar_add"
-                            android:layout_width="@dimen/add_avatar_button_size"
-                            android:layout_height="@dimen/add_avatar_button_size"
-                            android:layout_alignParentTop="true"
-                            android:layout_alignParentEnd="true"
-                            android:background="@drawable/bg_oval_white"
-                            android:importantForAccessibility="no"
-                            android:src="@drawable/ic_add_white_24dp"
-                            app:tint="?attr/wpColorOnSurfaceMedium"
-                            android:visibility="gone"
-                            tools:visibility="visible" />
-
-                    </RelativeLayout>
-
-                    <org.wordpress.android.widgets.WPTextView
-                        android:id="@+id/signup_epilogue_header_display"
-                        style="@style/LoginTheme.Subhead"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_horizontal"
-                        tools:text="Pamela Nguyen" />
-
-                    <org.wordpress.android.widgets.WPTextView
-                        android:id="@+id/signup_epilogue_header_email"
-                        style="@style/LoginTheme.Username"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="@dimen/margin_extra_medium_large"
-                        android:focusable="true"
-                        android:focusableInTouchMode="true"
-                        android:gravity="center_horizontal"
-                        tools:text="pamelanguyen@gmail.com" />
-
-                </LinearLayout>
-
-            </com.google.android.material.card.MaterialCardView>
-
-            <org.wordpress.android.login.widgets.WPLoginInputRow
-                android:id="@+id/signup_epilogue_input_display"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/signup_epilogue_hint_display"
-                android:imeOptions="actionDone"
-                android:inputType="textPersonName"
-                android:paddingStart="@dimen/margin_extra_large"
-                android:paddingEnd="@dimen/margin_extra_large" />
-
-            <org.wordpress.android.login.widgets.WPLoginInputRow
-                android:id="@+id/signup_epilogue_input_username"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_extra_large"
-                android:hint="@string/signup_epilogue_hint_username"
-                android:inputType="none"
-                android:paddingStart="@dimen/margin_extra_large"
-                android:paddingEnd="@dimen/margin_extra_large" />
-
-            <org.wordpress.android.login.widgets.WPLoginInputRow
-                android:id="@+id/signup_epilogue_input_password"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_extra_large"
-                android:hint="@string/signup_epilogue_hint_password"
-                android:inputType="textPassword"
-                android:paddingStart="@dimen/margin_extra_large"
-                android:paddingEnd="@dimen/margin_extra_large"
-                android:visibility="gone"
-                app:passwordToggleEnabled="true"
-                tools:visibility="visible" />
-
-            <org.wordpress.android.widgets.WPTextView
-                android:id="@+id/signup_epilogue_input_password_detail"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_medium"
-                android:layout_marginBottom="@dimen/margin_extra_large"
-                android:paddingStart="@dimen/margin_extra_large"
-                android:paddingEnd="@dimen/margin_extra_large"
-                android:text="@string/signup_epilogue_hint_password_detail"
-                android:textAppearance="?attr/textAppearanceCaption"
-                android:visibility="gone"
-                app:fixWidowWords="true"
-                tools:visibility="visible" />
+                        android:importantForAccessibility="no"
+                        android:src="@drawable/ic_user_circle_no_padding_grey_24dp" />
+
+                    <ImageView
+                        android:id="@+id/signup_epilogue_header_avatar_add"
+                        android:layout_width="@dimen/add_avatar_button_size"
+                        android:layout_height="@dimen/add_avatar_button_size"
+                        android:layout_gravity="top|end"
+                        android:background="@drawable/bg_oval_surface"
+                        android:importantForAccessibility="no"
+                        android:src="@drawable/ic_add_white_24dp"
+                        android:visibility="gone"
+                        app:tint="?attr/colorPrimary"
+                        tools:visibility="visible" />
+                </FrameLayout>
+
+                <org.wordpress.android.widgets.WPTextView
+                    android:id="@+id/signup_epilogue_header_display"
+                    style="@style/LoginTheme.Headline"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_extra_large"
+                    tools:text="Pamela Nguyen" />
 
-        </LinearLayout>
+                <org.wordpress.android.widgets.WPTextView
+                    android:id="@+id/signup_epilogue_header_email"
+                    style="@style/LoginTheme.Username"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_small"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    tools:text="pamelanguyen@gmail.com" />
 
-    </ScrollView>
+                <org.wordpress.android.login.widgets.WPLoginInputRow
+                    android:id="@+id/signup_epilogue_input_display"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_extra_medium_large"
+                    android:hint="@string/signup_epilogue_hint_display"
+                    android:imeOptions="actionDone"
+                    android:inputType="textPersonName" />
 
-    <View
-        android:id="@+id/bottom_shadow"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/button_container_shadow_height"
-        android:layout_above="@+id/bottom_buttons"
-        android:background="@drawable/login_shadow" />
+                <org.wordpress.android.login.widgets.WPLoginInputRow
+                    android:id="@+id/signup_epilogue_input_username"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_extra_large"
+                    android:hint="@string/signup_epilogue_hint_username"
+                    android:inputType="none" />
 
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/bottom_buttons"
-        style="@style/LoginTheme.BottomBar"
+                <org.wordpress.android.login.widgets.WPLoginInputRow
+                    android:id="@+id/signup_epilogue_input_password"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_extra_large"
+                    android:hint="@string/signup_epilogue_hint_password"
+                    android:inputType="textPassword"
+                    android:visibility="gone"
+                    app:passwordToggleEnabled="true"
+                    tools:visibility="visible" />
+
+                <org.wordpress.android.widgets.WPTextView
+                    android:id="@+id/signup_epilogue_input_password_detail"
+                    style="@style/LoginTheme.Footnote"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_extra_large"
+                    android:text="@string/signup_epilogue_hint_password_detail"
+                    android:visibility="gone"
+                    app:fixWidowWords="true"
+                    tools:visibility="visible" />
+            </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
+
+        <View
+            android:id="@+id/bottom_shadow"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/button_container_shadow_height"
+            android:layout_gravity="bottom"
+            android:background="@drawable/login_shadow"
+            android:visibility="gone"
+            tools:visibility="visible" />
+    </FrameLayout>
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/primary_button"
+        style="@style/LoginTheme.Button.Primary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        app:cardCornerRadius="0dp"
-        app:cardElevation="@dimen/appbar_elevation">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:clipToPadding="false"
-            android:padding="@dimen/margin_large">
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/primary_button"
-                style="@style/LoginTheme.Button.Primary"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/login_continue" />
-
-        </RelativeLayout>
-    </com.google.android.material.card.MaterialCardView>
-
-</RelativeLayout>
+        android:layout_marginBottom="@dimen/margin_medium_large"
+        android:layout_marginEnd="@dimen/margin_extra_large"
+        android:layout_marginStart="@dimen/margin_extra_large"
+        android:layout_marginTop="@dimen/margin_medium_large"
+        android:text="@string/login_continue" />
+</LinearLayout>
diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml
index bcf6beb66388..7a682a911a25 100644
--- a/WordPress/src/main/res/values/colors.xml
+++ b/WordPress/src/main/res/values/colors.xml
@@ -40,6 +40,7 @@
     <color name="color_primary">@color/primary</color>
     <color name="promo_indicator_color_default">@color/black_translucent_20</color>
     <color name="login_promo_footer_background_color">#eff3f7</color>
+    <color name="login_avatar_placeholder_color">@color/material_on_surface_disabled</color>
 
     <!-- SEMANTIC -->
     <color name="accent">@color/pink_50</color>
diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml
index 9c46b33aa7b3..5ae834dcc6b5 100644
--- a/WordPress/src/main/res/values/dimens.xml
+++ b/WordPress/src/main/res/values/dimens.xml
@@ -362,6 +362,7 @@
     <dimen name="plugin_banner_size">192dp</dimen>
 
     <dimen name="add_avatar_button_size">24dp</dimen>
+    <dimen name="avatar_sz_login_epilogue">72dp</dimen>
 
     <dimen name="dialog_snackbar_content_padding">20dp</dimen>
     <dimen name="dialog_snackbar_max_icons_size">18dp</dimen>
diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml
index d46e10810c2c..e11dc2e30fbc 100644
--- a/WordPress/src/main/res/values/styles.xml
+++ b/WordPress/src/main/res/values/styles.xml
@@ -956,7 +956,7 @@
 
     <style name="LoginTheme.InputLabelStatic" parent="TextAppearance.MaterialComponents.Subtitle2" />
 
-    <style name="LoginTheme.EditText" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense">
+    <style name="LoginTheme.EditText" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
         <item name="startIconTint">?attr/colorPrimary</item>
         <item name="endIconTint">?attr/colorPrimary</item>
         <item name="endIconDrawable">@drawable/ic_arrow_left_white_24dp</item>
@@ -981,6 +981,10 @@
         <item name="fixWidowWords">true</item>
     </style>
 
+    <style name="LoginTheme.Headline" parent="TextAppearance.MaterialComponents.Headline5">
+        <item name="fontFamily">serif</item>
+    </style>
+
     <style name="LoginTheme.SiteTitle" parent="TextAppearance.MaterialComponents.Subtitle2" />
 
     <style name="LoginTheme.SiteUrl" parent="TextAppearance.MaterialComponents.Body2" />
@@ -991,7 +995,9 @@
         <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="LoginTheme.Username" parent="TextAppearance.MaterialComponents.Subtitle1" />
+    <style name="LoginTheme.Username" parent="TextAppearance.MaterialComponents.Subtitle1">
+        <item name="android:alpha">@dimen/material_emphasis_medium</item>
+    </style>
 
     <style name="LoginTheme.Footnote" parent="TextAppearance.MaterialComponents.Caption" />
 

From 7f6553fc6ace820c01416fcb0619ec9fe38a0e6b Mon Sep 17 00:00:00 2001
From: Renan Ferrari <renan.fb@gmail.com>
Date: Thu, 14 May 2020 13:10:30 -0300
Subject: [PATCH 03/17] Update SignupEpilogueFragment so it hides its bottom
 shadow on scroll

---
 .../signup/SignupEpilogueFragment.java        | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java
index dcac8fbe6a1f..af4a2ab141c9 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java
@@ -16,6 +16,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewTreeObserver.OnGlobalLayoutListener;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
@@ -27,6 +28,8 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
+import androidx.core.widget.NestedScrollView;
+import androidx.core.widget.NestedScrollView.OnScrollChangeListener;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.yalantis.ucrop.UCrop;
@@ -99,6 +102,8 @@ public class SignupEpilogueFragment extends LoginBaseFormFragment<SignupEpilogue
     protected ImageView mHeaderAvatar;
     protected WPTextView mHeaderDisplayName;
     protected WPTextView mHeaderEmailAddress;
+    protected View mBottomShadow;
+    protected NestedScrollView mScrollView;
     protected boolean mIsAvatarAdded;
     protected boolean mIsEmailSignup;
 
@@ -243,6 +248,27 @@ public boolean onKey(View view, int keyCode, KeyEvent event) {
 
         // Set focus on static text field to avoid showing keyboard on start.
         mHeaderEmailAddress.requestFocus();
+
+        mBottomShadow = rootView.findViewById(R.id.bottom_shadow);
+        mScrollView = rootView.findViewById(R.id.scroll_view);
+        mScrollView.setOnScrollChangeListener(
+                (OnScrollChangeListener) (v, scrollX, scrollY, oldScrollX, oldScrollY) -> showBottomShadowIfNeeded());
+        // We must use onGlobalLayout here otherwise canScrollVertically will always return false
+        mScrollView.getViewTreeObserver().addOnGlobalLayoutListener(new OnGlobalLayoutListener() {
+            @Override public void onGlobalLayout() {
+                mScrollView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                showBottomShadowIfNeeded();
+            }
+        });
+    }
+
+    private void showBottomShadowIfNeeded() {
+        if (mScrollView != null) {
+            final boolean canScrollDown = mScrollView.canScrollVertically(1);
+            if (mBottomShadow != null) {
+                mBottomShadow.setVisibility(canScrollDown ? View.VISIBLE : View.GONE);
+            }
+        }
     }
 
     @Override

From 21be455c9513bd2894874dccc2783aa78a76894b Mon Sep 17 00:00:00 2001
From: Renan Ferrari <renan.fb@gmail.com>
Date: Thu, 14 May 2020 13:11:20 -0300
Subject: [PATCH 04/17] Update signup epilogue primary button string

---
 WordPress/src/main/res/layout/signup_epilogue.xml             | 2 +-
 WordPress/src/main/res/values/strings.xml                     | 1 +
 libs/login/WordPressLoginFlow/src/main/res/values/strings.xml | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/res/layout/signup_epilogue.xml b/WordPress/src/main/res/layout/signup_epilogue.xml
index 1cf27192199b..5ae4750cd5b2 100644
--- a/WordPress/src/main/res/layout/signup_epilogue.xml
+++ b/WordPress/src/main/res/layout/signup_epilogue.xml
@@ -130,5 +130,5 @@
         android:layout_marginEnd="@dimen/margin_extra_large"
         android:layout_marginStart="@dimen/margin_extra_large"
         android:layout_marginTop="@dimen/margin_medium_large"
-        android:text="@string/login_continue" />
+        android:text="@string/login_done" />
 </LinearLayout>
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index 15140cc37c37..b5f4f9c90bcf 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -2326,6 +2326,7 @@
     <string name="connect_more">Connect Another Site</string>
     <string name="connect_site">Connect Site</string>
     <string name="login_continue">Continue</string>
+    <string name="login_done">Done</string>
     <string name="login_already_logged_in_wpcom">Already logged in to WordPress.com</string>
     <string name="login_username_at">\@%s</string>
     <string name="enter_site_address">Enter the address of the WordPress site you\'d like to connect.</string>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/values/strings.xml b/libs/login/WordPressLoginFlow/src/main/res/values/strings.xml
index c29307aa80ca..ea5b31567bc6 100644
--- a/libs/login/WordPressLoginFlow/src/main/res/values/strings.xml
+++ b/libs/login/WordPressLoginFlow/src/main/res/values/strings.xml
@@ -36,6 +36,7 @@
     <string name="connect_more">Connect Another Site</string>
     <string name="connect_site">Connect Site</string>
     <string name="login_continue">Continue</string>
+    <string name="login_done">Done</string>
     <string name="login_already_logged_in_wpcom">Already logged in to WordPress.com</string>
     <string name="login_username_at">\@%s</string>
     <string name="enter_site_address">Enter the address of the WordPress site you\'d like to connect.</string>

From 209b845804d8971bd21d8a8ac4209dbc20100253 Mon Sep 17 00:00:00 2001
From: Renan Ferrari <renan.fb@gmail.com>
Date: Thu, 14 May 2020 19:41:51 -0300
Subject: [PATCH 05/17] Update ShareIntentReceiverFragment so it uses its own
 layout

---
 .../ui/ShareIntentReceiverActivity.java       |  6 +-
 .../ui/ShareIntentReceiverFragment.java       | 39 ++++++------
 .../layout/share_intent_receiver_fragment.xml | 59 +++++++++++++++++++
 .../layout/share_intent_receiver_header.xml   | 10 ++++
 4 files changed, 92 insertions(+), 22 deletions(-)
 create mode 100644 WordPress/src/main/res/layout/share_intent_receiver_fragment.xml
 create mode 100644 WordPress/src/main/res/layout/share_intent_receiver_header.xml

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 b511422e43a3..21770b29b32e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java
@@ -87,7 +87,7 @@ private void refreshContent() {
                 share(ShareAction.SHARE_TO_POST, visibleSites.get(0).getId());
             } else {
                 // display a fragment with list of sites and list of actions the user can perform
-                initShareFragment(false);
+                initShareFragment();
             }
         } else {
             // start the login flow and wait onActivityResult
@@ -107,9 +107,9 @@ private void downloadExternalMedia() {
         }
     }
 
-    private void initShareFragment(boolean afterLogin) {
+    private void initShareFragment() {
         ShareIntentReceiverFragment shareIntentReceiverFragment = ShareIntentReceiverFragment
-                .newInstance(!isSharingText(), loadLastUsedBlogLocalId(), afterLogin);
+                .newInstance(!isSharingText(), loadLastUsedBlogLocalId());
         getSupportFragmentManager()
                 .beginTransaction()
                 .replace(R.id.fragment_container, shareIntentReceiverFragment, ShareIntentReceiverFragment.TAG)
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 875ea6cd9299..1f8968fe402b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverFragment.java
@@ -7,6 +7,7 @@
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
@@ -18,7 +19,6 @@
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.fluxc.store.AccountStore;
-import org.wordpress.android.ui.accounts.login.LoginHeaderViewHolder;
 import org.wordpress.android.ui.main.SitePickerAdapter;
 import org.wordpress.android.ui.main.SitePickerAdapter.HeaderHandler;
 import org.wordpress.android.ui.main.SitePickerAdapter.SiteList;
@@ -33,7 +33,6 @@ public class ShareIntentReceiverFragment extends Fragment {
 
     private static final String ARG_SHARING_MEDIA = "ARG_SHARING_MEDIA";
     private static final String ARG_LAST_USED_BLOG_LOCAL_ID = "ARG_LAST_USED_BLOG_LOCAL_ID";
-    private static final String ARG_AFTER_LOGIN = "ARG_AFTER_LOGIN";
 
     @Inject AccountStore mAccountStore;
     @Inject ImageManager mImageManager;
@@ -45,17 +44,14 @@ public class ShareIntentReceiverFragment extends Fragment {
 
     private boolean mSharingMediaFile;
     private int mLastUsedBlogLocalId;
-    private boolean mAfterLogin;
     private RecyclerView mRecyclerView;
     private View mBottomButtonsContainer;
     private View mBottomButtonsShadow;
 
-    public static ShareIntentReceiverFragment newInstance(boolean sharingMediaFile, int lastUsedBlogLocalId,
-                                                          boolean afterLogin) {
+    public static ShareIntentReceiverFragment newInstance(boolean sharingMediaFile, int lastUsedBlogLocalId) {
         ShareIntentReceiverFragment fragment = new ShareIntentReceiverFragment();
         Bundle args = new Bundle();
         args.putBoolean(ARG_SHARING_MEDIA, sharingMediaFile);
-        args.putBoolean(ARG_AFTER_LOGIN, afterLogin);
         args.putInt(ARG_LAST_USED_BLOG_LOCAL_ID, lastUsedBlogLocalId);
         fragment.setArguments(args);
         return fragment;
@@ -81,7 +77,7 @@ public void onAttach(Context context) {
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
                              @Nullable Bundle savedInstanceState) {
-        ViewGroup layout = (ViewGroup) inflater.inflate(R.layout.login_epilogue_screen, container, false);
+        ViewGroup layout = (ViewGroup) inflater.inflate(R.layout.share_intent_receiver_fragment, container, false);
         initButtonsContainer(layout);
         initShareActionPostButton(layout);
         initShareActionMediaButton(layout, mSharingMediaFile);
@@ -94,7 +90,6 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         ((WordPress) getActivity().getApplication()).component().inject(this);
         mSharingMediaFile = getArguments().getBoolean(ARG_SHARING_MEDIA);
-        mAfterLogin = getArguments().getBoolean(ARG_AFTER_LOGIN);
         mLastUsedBlogLocalId = getArguments().getInt(ARG_LAST_USED_BLOG_LOCAL_ID);
         loadSavedState(savedInstanceState);
     }
@@ -122,15 +117,12 @@ private void initButtonsContainer(ViewGroup layout) {
     private void initShareActionPostButton(final ViewGroup layout) {
         mSharePostBtn = layout.findViewById(R.id.primary_button);
         addShareActionListener(mSharePostBtn, ShareAction.SHARE_TO_POST);
-        mSharePostBtn.setVisibility(View.VISIBLE);
-        mSharePostBtn.setText(R.string.share_action_post);
     }
 
     private void initShareActionMediaButton(final ViewGroup layout, boolean sharingMediaFile) {
         mShareMediaBtn = layout.findViewById(R.id.secondary_button);
         addShareActionListener(mShareMediaBtn, ShareAction.SHARE_TO_MEDIA_LIBRARY);
         mShareMediaBtn.setVisibility(sharingMediaFile ? View.VISIBLE : View.GONE);
-        mShareMediaBtn.setText(R.string.share_action_media);
     }
 
     private void addShareActionListener(final Button button, final ShareAction shareAction) {
@@ -189,23 +181,32 @@ private HeaderHandler createHeaderHandler() {
             @Override
             public ViewHolder onCreateViewHolder(LayoutInflater layoutInflater, ViewGroup parent,
                                                  boolean attachToRoot) {
-                return new LoginHeaderViewHolder(layoutInflater.inflate(R.layout.login_epilogue_header, parent, false));
+                return new HeaderViewHolder(
+                        layoutInflater.inflate(R.layout.share_intent_receiver_header, parent, false));
             }
 
             @Override
             public void onBindViewHolder(ViewHolder holder, SiteList sites) {
-                refreshAccountDetails((LoginHeaderViewHolder) holder, sites);
+                if (!isAdded()) {
+                    return;
+                }
+                ((HeaderViewHolder) holder).bindText(getString(
+                        sites.size() == 1 ? R.string.share_intent_adding_to : R.string.share_intent_pick_site));
             }
         };
     }
 
-    private void refreshAccountDetails(LoginHeaderViewHolder holder, SiteList sites) {
-        if (!isAdded()) {
-            return;
+    static class HeaderViewHolder extends RecyclerView.ViewHolder {
+        private final TextView mHeaderTextView;
+
+        HeaderViewHolder(View view) {
+            super(view);
+            mHeaderTextView = view.findViewById(R.id.header_text_view);
+        }
+
+        void bindText(String text) {
+            mHeaderTextView.setText(text);
         }
-        holder.updateLoggedInAsHeading(getContext(), mImageManager, mAfterLogin, mAccountStore.getAccount());
-        holder.showSitesHeading(
-                getString(sites.size() == 1 ? R.string.share_intent_adding_to : R.string.share_intent_pick_site));
     }
 
     enum ShareAction {
diff --git a/WordPress/src/main/res/layout/share_intent_receiver_fragment.xml b/WordPress/src/main/res/layout/share_intent_receiver_fragment.xml
new file mode 100644
index 000000000000..aeb2b68f3b27
--- /dev/null
+++ b/WordPress/src/main/res/layout/share_intent_receiver_fragment.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@+id/bottom_buttons"
+        android:scrollbars="vertical"
+        android:theme="@style/LoginEpilogueSitesList" />
+
+    <ProgressBar
+        android:id="@+id/sites_progress"
+        style="?android:attr/progressBarStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+    <View
+        android:id="@+id/bottom_shadow"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/button_container_shadow_height"
+        android:layout_above="@+id/bottom_buttons"
+        android:background="@drawable/login_shadow" />
+
+    <LinearLayout
+        android:id="@+id/bottom_buttons"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:clipToPadding="false"
+        android:orientation="vertical"
+        android:paddingBottom="@dimen/margin_medium_large"
+        android:paddingEnd="@dimen/margin_extra_large"
+        android:paddingStart="@dimen/margin_extra_large"
+        android:paddingTop="@dimen/margin_medium_large">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/secondary_button"
+            style="@style/LoginTheme.Button.SignUp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/margin_small"
+            android:text="@string/share_action_media" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/primary_button"
+            style="@style/LoginTheme.Button.Primary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/share_action_post" />
+    </LinearLayout>
+</RelativeLayout>
diff --git a/WordPress/src/main/res/layout/share_intent_receiver_header.xml b/WordPress/src/main/res/layout/share_intent_receiver_header.xml
new file mode 100644
index 000000000000..93a0c63a2fe3
--- /dev/null
+++ b/WordPress/src/main/res/layout/share_intent_receiver_header.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/header_text_view"
+    style="@style/LoginTheme.Heading"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingEnd="@dimen/margin_extra_large"
+    android:paddingStart="@dimen/margin_extra_large"
+    android:paddingTop="@dimen/margin_extra_large"
+    android:text="@string/share_intent_pick_site" />

From edc0c8758ba456b89026488f5c867c43bcc655ad Mon Sep 17 00:00:00 2001
From: Renan Ferrari <renan.fb@gmail.com>
Date: Thu, 14 May 2020 21:58:34 -0300
Subject: [PATCH 06/17] Remove secondary button from the bottom of login
 epilogue

---
 .../accounts/login/LoginEpilogueFragment.java | 32 +++++++--------
 .../main/res/layout/login_epilogue_screen.xml | 41 +++++--------------
 2 files changed, 26 insertions(+), 47 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java
index 3f952b29494d..0d414f194c26 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java
@@ -92,8 +92,8 @@ protected ViewGroup createMainView(LayoutInflater inflater, ViewGroup container,
     protected void setupContent(ViewGroup rootView) {
         mBottomShadow = rootView.findViewById(R.id.bottom_shadow);
 
-        mBottomButtonsContainer = rootView.findViewById(R.id.bottom_buttons);
-        mConnectMore = mBottomButtonsContainer.findViewById(R.id.secondary_button);
+//        mBottomButtonsContainer = rootView.findViewById(R.id.bottom_buttons);
+//        mConnectMore = mBottomButtonsContainer.findViewById(R.id.secondary_button);
 
         mSitesList = rootView.findViewById(R.id.recycler_view);
         mSitesList.setLayoutManager(new LinearLayoutManager(getActivity()));
@@ -104,15 +104,15 @@ protected void setupContent(ViewGroup rootView) {
 
     @Override
     protected void setupBottomButtons(Button secondaryButton, Button primaryButton) {
-        secondaryButton.setVisibility(mShowAndReturn ? View.GONE : View.VISIBLE);
-        secondaryButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (mLoginEpilogueListener != null) {
-                    mLoginEpilogueListener.onConnectAnotherSite();
-                }
-            }
-        });
+//        secondaryButton.setVisibility(mShowAndReturn ? View.GONE : View.VISIBLE);
+//        secondaryButton.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                if (mLoginEpilogueListener != null) {
+//                    mLoginEpilogueListener.onConnectAnotherSite();
+//                }
+//            }
+//        });
 
         primaryButton.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -217,7 +217,7 @@ private void refreshAccountDetails(LoginHeaderViewHolder holder, SiteList sites)
         final boolean isWpcom = mAccountStore.hasAccessToken();
 
         if (isWpcom) {
-            holder.updateLoggedInAsHeading(getContext(), mImageManager, true, mAccountStore.getAccount());
+            holder.updateLoggedInAsHeading(getContext(), mImageManager, mAccountStore.getAccount());
         } else if (sites.size() != 0) {
             SiteModel site = mSiteStore.getSiteByLocalId(sites.get(0).getLocalId());
             int avatarSz = getResources().getDimensionPixelSize(R.dimen.avatar_sz_large);
@@ -226,18 +226,18 @@ private void refreshAccountDetails(LoginHeaderViewHolder holder, SiteList sites)
             String username = site.getUsername();
             String displayName = site.getDisplayName();
 
-            holder.updateLoggedInAsHeading(getContext(), mImageManager, true, avatarUrl, username, displayName);
+            holder.updateLoggedInAsHeading(getContext(), mImageManager, avatarUrl, username, displayName);
         }
 
         if (sites.size() == 0) {
             holder.hideSitesHeading();
-            mConnectMore.setText(R.string.connect_site);
+//            mConnectMore.setText(R.string.connect_site);
         } else {
             holder.showSitesHeading(StringUtils.getQuantityString(
-                    getActivity(), R.string.days_quantity_one, R.string.login_epilogue_mysites_one,
+                    getActivity(), R.string.login_epilogue_mysites_one, R.string.login_epilogue_mysites_one,
                     R.string.login_epilogue_mysites_other, sites.size()));
 
-            mConnectMore.setText(R.string.connect_more);
+//            mConnectMore.setText(R.string.connect_more);
         }
     }
 
diff --git a/WordPress/src/main/res/layout/login_epilogue_screen.xml b/WordPress/src/main/res/layout/login_epilogue_screen.xml
index 87b2d0d3ef28..f518162e615a 100644
--- a/WordPress/src/main/res/layout/login_epilogue_screen.xml
+++ b/WordPress/src/main/res/layout/login_epilogue_screen.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -9,7 +8,7 @@
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_above="@+id/bottom_buttons"
+        android:layout_above="@+id/primary_button"
         android:scrollbars="vertical"
         android:theme="@style/LoginEpilogueSitesList" />
 
@@ -26,38 +25,18 @@
         android:id="@+id/bottom_shadow"
         android:layout_width="match_parent"
         android:layout_height="@dimen/button_container_shadow_height"
-        android:layout_above="@+id/bottom_buttons"
+        android:layout_above="@+id/primary_button"
         android:background="@drawable/login_shadow" />
 
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/bottom_buttons"
-        style="@style/LoginTheme.BottomBar"
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/primary_button"
+        style="@style/LoginTheme.Button.Primary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        app:cardCornerRadius="0dp"
-        app:cardElevation="@dimen/appbar_elevation">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:clipToPadding="false"
-            android:orientation="vertical"
-            android:padding="@dimen/margin_large">
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/secondary_button"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/connect_more"
-                style="@style/LoginTheme.Button.SignUp" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/primary_button"
-                style="@style/WordPress.Button.Primary"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/login_continue" />
-        </LinearLayout>
-    </com.google.android.material.card.MaterialCardView>
+        android:layout_marginBottom="@dimen/margin_medium_large"
+        android:layout_marginEnd="@dimen/margin_extra_large"
+        android:layout_marginStart="@dimen/margin_extra_large"
+        android:layout_marginTop="@dimen/margin_medium_large"
+        android:text="@string/login_done" />
 </RelativeLayout>

From 89841b42add7fd3ddc1c02330fdba07602928d76 Mon Sep 17 00:00:00 2001
From: Renan Ferrari <renan.fb@gmail.com>
Date: Thu, 14 May 2020 22:27:09 -0300
Subject: [PATCH 07/17] Update login epilogue header

---
 .../accounts/login/LoginHeaderViewHolder.java | 33 +++-----
 .../main/res/layout/login_epilogue_header.xml | 78 ++++++-------------
 WordPress/src/main/res/values/styles.xml      |  6 +-
 3 files changed, 38 insertions(+), 79 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginHeaderViewHolder.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginHeaderViewHolder.java
index a276d86cd643..1eadc7a37f80 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginHeaderViewHolder.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginHeaderViewHolder.java
@@ -19,8 +19,6 @@
  * ViewHolder for a RecyclerView header used on screens shown after a user logs in.
  */
 public class LoginHeaderViewHolder extends RecyclerView.ViewHolder {
-    private final View mLoggedInAsHeading;
-    private final View mUserDetailsCard;
     private final ImageView mAvatarImageView;
     private final TextView mDisplayNameTextView;
     private final TextView mUsernameTextView;
@@ -28,38 +26,27 @@ public class LoginHeaderViewHolder extends RecyclerView.ViewHolder {
 
     public LoginHeaderViewHolder(View view) {
         super(view);
-        mLoggedInAsHeading = view.findViewById(R.id.logged_in_as_heading);
-        mUserDetailsCard = view.findViewById(R.id.user_details_card);
         mAvatarImageView = view.findViewById(R.id.avatar);
         mDisplayNameTextView = view.findViewById(R.id.display_name);
         mUsernameTextView = view.findViewById(R.id.username);
         mMySitesHeadingTextView = view.findViewById(R.id.my_sites_heading);
     }
 
-    public void updateLoggedInAsHeading(Context context, ImageManager imageManager, boolean isAfterLogin,
-                                        AccountModel defaultAccount) {
-        updateLoggedInAsHeading(context, imageManager, isAfterLogin, constructGravatarUrl(context, defaultAccount),
+    public void updateLoggedInAsHeading(Context context, ImageManager imageManager, AccountModel defaultAccount) {
+        updateLoggedInAsHeading(context, imageManager, constructGravatarUrl(context, defaultAccount),
                                 defaultAccount.getUserName(), defaultAccount.getDisplayName());
     }
 
-    public void updateLoggedInAsHeading(Context context, ImageManager imageManager, boolean isAfterLogin,
-                                        String avatarUrl, String username, String displayName) {
-        if (isAfterLogin) {
-            mLoggedInAsHeading.setVisibility(View.VISIBLE);
-            mUserDetailsCard.setVisibility(View.VISIBLE);
-            imageManager.loadIntoCircle(mAvatarImageView, ImageType.AVATAR_WITHOUT_BACKGROUND,
-                    StringUtils.notNullStr(avatarUrl));
-            mUsernameTextView.setText(context.getString(R.string.login_username_at, username));
+    public void updateLoggedInAsHeading(Context context, ImageManager imageManager, String avatarUrl, String username,
+                                        String displayName) {
+        imageManager.loadIntoCircle(mAvatarImageView, ImageType.AVATAR_WITHOUT_BACKGROUND,
+                StringUtils.notNullStr(avatarUrl));
+        mUsernameTextView.setText(username);
 
-            if (!TextUtils.isEmpty(displayName)) {
-                mDisplayNameTextView.setText(displayName);
-            } else {
-                mDisplayNameTextView.setText(username);
-            }
+        if (!TextUtils.isEmpty(displayName)) {
+            mDisplayNameTextView.setText(displayName);
         } else {
-            imageManager.cancelRequestAndClearImageView(mAvatarImageView);
-            mLoggedInAsHeading.setVisibility(View.GONE);
-            mUserDetailsCard.setVisibility(View.GONE);
+            mDisplayNameTextView.setText(username);
         }
     }
 
diff --git a/WordPress/src/main/res/layout/login_epilogue_header.xml b/WordPress/src/main/res/layout/login_epilogue_header.xml
index 9aef512e6a29..63dd15cfa2c0 100644
--- a/WordPress/src/main/res/layout/login_epilogue_header.xml
+++ b/WordPress/src/main/res/layout/login_epilogue_header.xml
@@ -1,77 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/header"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="center_horizontal"
     android:orientation="vertical"
+    android:paddingEnd="@dimen/margin_extra_large"
+    android:paddingStart="@dimen/margin_extra_large"
     android:paddingTop="@dimen/margin_extra_large">
 
-    <TextView
-        android:id="@+id/logged_in_as_heading"
-        style="@style/LoginTheme.Heading"
+    <ImageView
+        android:id="@+id/avatar"
+        android:layout_width="@dimen/avatar_sz_login_epilogue"
+        android:layout_height="@dimen/avatar_sz_login_epilogue"
+        android:importantForAccessibility="no"
+        android:src="@drawable/ic_user_circle_no_padding_grey_24dp" />
+
+    <org.wordpress.android.widgets.WPTextView
+        android:id="@+id/display_name"
+        style="@style/LoginTheme.Headline"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/margin_extra_large"
-        android:layout_marginEnd="@dimen/margin_extra_large"
-        android:layout_marginBottom="@dimen/margin_medium"
-        android:text="@string/login_logged_in_as" />
+        android:layout_marginTop="@dimen/margin_extra_large"
+        tools:text="Pamela Nguyen" />
 
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/user_details_card"
-        style="@style/Widget.MaterialComponents.CardView"
+    <org.wordpress.android.widgets.WPTextView
+        android:id="@+id/username"
+        style="@style/LoginTheme.Username"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/margin_large"
-        android:layout_marginEnd="@dimen/margin_large"
-        android:layout_marginBottom="@dimen/margin_extra_extra_medium_large"
-        app:cardCornerRadius="@dimen/default_cardview_radius"
-        app:cardElevation="@dimen/card_elevation"
-        app:cardUseCompatPadding="true">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:orientation="vertical"
-            android:paddingStart="@dimen/margin_extra_large"
-            android:paddingEnd="@dimen/margin_extra_large">
-
-            <ImageView
-                android:id="@+id/avatar"
-                android:layout_width="@dimen/avatar_sz_inner_circle"
-                android:layout_height="@dimen/avatar_sz_inner_circle"
-                android:layout_marginTop="@dimen/margin_extra_medium_large"
-                android:layout_marginBottom="@dimen/margin_medium"
-                android:contentDescription="@null" />
-
-            <org.wordpress.android.widgets.WPTextView
-                android:id="@+id/display_name"
-                style="@style/LoginTheme.Subhead"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                tools:text="Full Name" />
-
-            <org.wordpress.android.widgets.WPTextView
-                android:id="@+id/username"
-                style="@style/LoginTheme.Username"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/margin_extra_medium_large"
-                android:gravity="center_horizontal"
-                tools:text="@username" />
-        </LinearLayout>
-    </com.google.android.material.card.MaterialCardView>
+        android:layout_marginTop="@dimen/margin_small"
+        android:layout_marginBottom="@dimen/margin_medium"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        tools:text="pamelanguyen" />
 
     <TextView
         android:id="@+id/my_sites_heading"
         style="@style/LoginTheme.Heading"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/margin_extra_large"
-        android:layout_marginEnd="@dimen/margin_extra_large"
+        android:paddingTop="@dimen/margin_extra_large"
         android:text="@string/login_epilogue_mysites_other" />
 </LinearLayout>
diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml
index e11dc2e30fbc..f61aa0d0dabd 100644
--- a/WordPress/src/main/res/values/styles.xml
+++ b/WordPress/src/main/res/values/styles.xml
@@ -989,7 +989,11 @@
 
     <style name="LoginTheme.SiteUrl" parent="TextAppearance.MaterialComponents.Body2" />
 
-    <style name="LoginTheme.Heading" parent="TextAppearance.MaterialComponents.Subtitle2" />
+    <style name="LoginTheme.Heading" parent="TextAppearance.MaterialComponents.Overline">
+        <item name="android:textColor">?attr/colorPrimary</item>
+        <item name="android:fontFamily">sans-serif-black</item>
+        <item name="fontFamily">sans-serif-medium</item>
+    </style>
 
     <style name="LoginTheme.Subhead" parent="TextAppearance.MaterialComponents.Subtitle1">
         <item name="android:textStyle">bold</item>

From f12eede431447e9d94c98249964ff26cc57ba6da Mon Sep 17 00:00:00 2001
From: Renan Ferrari <renan.fb@gmail.com>
Date: Fri, 15 May 2020 17:50:36 -0300
Subject: [PATCH 08/17] Update login epilogue list item

---
 .../android/ui/main/SitePickerAdapter.java    |  5 +-
 .../android/util/image/ImageManager.kt        | 28 +++++++++
 .../util/image/ImagePlaceholderManager.kt     |  2 +
 .../wordpress/android/util/image/ImageType.kt |  1 +
 .../bg_rectangle_neutral_10_radius_4dp.xml    |  6 ++
 ...angle_neutral_10_radius_4dp_globe_32dp.xml | 12 ++++
 .../main/res/layout/base_site_listitem.xml    | 40 +++++++++++++
 .../layout/login_epilogue_sites_listitem.xml  | 55 +++++-------------
 .../layout/share_intent_sites_listitem.xml    | 21 +++----
 .../main/res/layout/site_picker_listitem.xml  | 57 ++++---------------
 WordPress/src/main/res/values/dimens.xml      |  2 +
 WordPress/src/main/res/values/styles.xml      | 14 ++++-
 12 files changed, 136 insertions(+), 107 deletions(-)
 create mode 100644 WordPress/src/main/res/drawable/bg_rectangle_neutral_10_radius_4dp.xml
 create mode 100644 WordPress/src/main/res/drawable/bg_rectangle_neutral_10_radius_4dp_globe_32dp.xml
 create mode 100644 WordPress/src/main/res/layout/base_site_listitem.xml

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerAdapter.java
index db937b631ce7..c56b94450436 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerAdapter.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerAdapter.java
@@ -1,7 +1,6 @@
 package org.wordpress.android.ui.main;
 
 import android.content.Context;
-import android.graphics.Typeface;
 import android.os.AsyncTask;
 import android.text.TextUtils;
 import android.util.TypedValue;
@@ -241,7 +240,7 @@ public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder viewHolder,
         final SiteViewHolder holder = (SiteViewHolder) viewHolder;
         holder.mTxtTitle.setText(site.getBlogNameOrHomeURL());
         holder.mTxtDomain.setText(site.mHomeURL);
-        mImageManager.load(holder.mImgBlavatar, ImageType.BLAVATAR, site.mBlavatarUrl);
+        mImageManager.loadWithRoundedCorners(holder.mImgBlavatar, ImageType.BLAVATAR_ROUNDED, site.mBlavatarUrl);
 
 
         if ((site.mLocalId == mCurrentLocalId && !mIsMultiSelectEnabled)
@@ -255,8 +254,6 @@ public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder viewHolder,
         if (holder.mIsSiteHidden == null || holder.mIsSiteHidden != site.mIsHidden) {
             holder.mIsSiteHidden = site.mIsHidden;
             holder.mTxtTitle.setAlpha(site.mIsHidden ? mDisabledSiteOpacity : 1f);
-            holder.mTxtTitle
-                    .setTypeface(holder.mTxtTitle.getTypeface(), site.mIsHidden ? Typeface.NORMAL : Typeface.BOLD);
             holder.mImgBlavatar.setAlpha(site.mIsHidden ? mDisabledSiteOpacity : 1f);
         }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/util/image/ImageManager.kt b/WordPress/src/main/java/org/wordpress/android/util/image/ImageManager.kt
index 06c4f67a3ad4..36cd06750165 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/image/ImageManager.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/image/ImageManager.kt
@@ -21,6 +21,7 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
 import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.GlideException
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.request.target.AppWidgetTarget
 import com.bumptech.glide.request.target.BaseTarget
 import com.bumptech.glide.request.target.CustomTarget
@@ -32,6 +33,7 @@ import org.wordpress.android.WordPress
 import org.wordpress.android.modules.GlideApp
 import org.wordpress.android.modules.GlideRequest
 import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.DisplayUtils
 import java.io.File
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -148,6 +150,32 @@ class ImageManager @Inject constructor(private val placeholderManager: ImagePlac
                 .clearOnDetach()
     }
 
+    /**
+     * Loads an image from the "imgUrl" into the ImageView and applies a rounded corner transformation. Adds placeholder
+     * and error placeholder depending on the ImageType.
+     *
+     * If no URL is provided, it only loads the placeholder
+     */
+    @JvmOverloads
+    fun loadWithRoundedCorners(
+        imageView: ImageView,
+        imageType: ImageType,
+        imgUrl: String = "",
+        cornerRadius: Int = 4,
+        scaleType: ScaleType = CENTER
+    ) {
+        val context = imageView.context
+        if (!context.isAvailable()) return
+        GlideApp.with(context)
+                .load(imgUrl)
+                .addFallback(imageType)
+                .addPlaceholder(imageType)
+                .applyScaleType(scaleType)
+                .transform(RoundedCorners(DisplayUtils.dpToPx(context, cornerRadius)))
+                .into(imageView)
+                .clearOnDetach()
+    }
+
     /**
      * Loads an image from the "imgUrl" into the ImageView. Adds a placeholder and an error placeholder depending
      * on the ImageType. Attaches the ResultListener so the client can manually show/hide progress and error
diff --git a/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt b/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt
index 86f517571a2c..1a0cda1c71b3 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt
@@ -12,6 +12,7 @@ class ImagePlaceholderManager @Inject constructor() {
             ImageType.AVATAR_WITH_BACKGROUND -> R.drawable.bg_oval_neutral_30_user_32dp
             ImageType.AVATAR_WITHOUT_BACKGROUND -> R.drawable.ic_user_circle_no_padding_grey_24dp
             ImageType.BLAVATAR -> R.drawable.bg_rectangle_neutral_10_globe_32dp
+            ImageType.BLAVATAR_ROUNDED -> R.drawable.bg_rectangle_neutral_10_radius_4dp_globe_32dp
             ImageType.IMAGE -> null // don't display any error drawable
             ImageType.PHOTO -> R.color.neutral_0
             ImageType.PLAN -> R.drawable.bg_oval_neutral_30_plans_32dp
@@ -31,6 +32,7 @@ class ImagePlaceholderManager @Inject constructor() {
             ImageType.AVATAR_WITH_BACKGROUND -> R.drawable.bg_oval_neutral_30_user_32dp
             ImageType.AVATAR_WITHOUT_BACKGROUND -> R.drawable.ic_user_circle_no_padding_grey_24dp
             ImageType.BLAVATAR -> R.color.neutral_0
+            ImageType.BLAVATAR_ROUNDED -> R.drawable.bg_rectangle_neutral_10_radius_4dp
             ImageType.IMAGE -> null // don't display any placeholder
             ImageType.PHOTO -> R.color.neutral_0
             ImageType.PLAN -> R.drawable.bg_oval_neutral_30_plans_32dp
diff --git a/WordPress/src/main/java/org/wordpress/android/util/image/ImageType.kt b/WordPress/src/main/java/org/wordpress/android/util/image/ImageType.kt
index 69c81b54acf3..6305457b3689 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/image/ImageType.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/image/ImageType.kt
@@ -10,6 +10,7 @@ enum class ImageType {
     AVATAR_WITH_BACKGROUND,
     AVATAR_WITHOUT_BACKGROUND,
     BLAVATAR,
+    BLAVATAR_ROUNDED,
     IMAGE,
     PHOTO,
     PLAN,
diff --git a/WordPress/src/main/res/drawable/bg_rectangle_neutral_10_radius_4dp.xml b/WordPress/src/main/res/drawable/bg_rectangle_neutral_10_radius_4dp.xml
new file mode 100644
index 000000000000..3b0a354e4f9d
--- /dev/null
+++ b/WordPress/src/main/res/drawable/bg_rectangle_neutral_10_radius_4dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="4dp" />
+    <solid android:color="@color/neutral_10" />
+</shape>
diff --git a/WordPress/src/main/res/drawable/bg_rectangle_neutral_10_radius_4dp_globe_32dp.xml b/WordPress/src/main/res/drawable/bg_rectangle_neutral_10_radius_4dp_globe_32dp.xml
new file mode 100644
index 000000000000..30404da13c11
--- /dev/null
+++ b/WordPress/src/main/res/drawable/bg_rectangle_neutral_10_radius_4dp_globe_32dp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/bg_rectangle_neutral_10_radius_4dp" />
+
+    <item
+        android:drawable="@drawable/ic_globe_white_24dp"
+        android:bottom="4dp"
+        android:left="4dp"
+        android:right="4dp"
+        android:top="4dp" />
+
+</layer-list>
diff --git a/WordPress/src/main/res/layout/base_site_listitem.xml b/WordPress/src/main/res/layout/base_site_listitem.xml
new file mode 100644
index 000000000000..0dd227b91f42
--- /dev/null
+++ b/WordPress/src/main/res/layout/base_site_listitem.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical">
+
+    <ImageView
+        android:id="@+id/image_blavatar"
+        android:layout_width="@dimen/blavatar_sz"
+        android:layout_height="@dimen/blavatar_sz"
+        android:layout_marginEnd="@dimen/margin_extra_large"
+        android:gravity="center_vertical"
+        android:importantForAccessibility="no"
+        android:src="@drawable/bg_rectangle_neutral_10_radius_4dp_globe_32dp" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <org.wordpress.android.widgets.WPTextView
+            android:id="@+id/text_title"
+            style="@style/LoginTheme.Subhead"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            tools:text="Around the World with Pam" />
+
+        <org.wordpress.android.widgets.WPTextView
+            android:id="@+id/text_domain"
+            style="@style/LoginTheme.Subhead2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            tools:text="pamelanguyen.com" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/WordPress/src/main/res/layout/login_epilogue_sites_listitem.xml b/WordPress/src/main/res/layout/login_epilogue_sites_listitem.xml
index bc34e03a8b06..d5d0a2c3f74d 100644
--- a/WordPress/src/main/res/layout/login_epilogue_sites_listitem.xml
+++ b/WordPress/src/main/res/layout/login_epilogue_sites_listitem.xml
@@ -1,49 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/layout_container"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:layout_marginStart="@dimen/margin_extra_large"
-    android:layout_marginEnd="@dimen/margin_extra_large"
-    android:layout_marginTop="@dimen/margin_medium"
-    android:layout_marginBottom="@dimen/margin_medium">
+    android:layout_height="@dimen/site_list_item_height"
+    android:orientation="vertical">
 
-    <ImageView
-        android:id="@+id/image_blavatar"
-        android:layout_width="@dimen/blavatar_sz"
-        android:layout_height="@dimen/blavatar_sz"
+    <include
+        layout="@layout/base_site_listitem"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
         android:layout_marginEnd="@dimen/margin_extra_large"
-        android:gravity="center_vertical"
-        android:background="@drawable/blavatar_border"
-        android:src="@drawable/bg_rectangle_neutral_10_globe_32dp"
-        android:contentDescription="@null"/>
+        android:layout_marginStart="@dimen/margin_extra_large"
+        android:layout_weight="1" />
 
-    <LinearLayout
+    <View
+        android:id="@+id/item_divider"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <org.wordpress.android.widgets.WPTextView
-            style="@style/LoginTheme.Subhead"
-            android:id="@+id/text_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/margin_small"
-            android:ellipsize="end"
-            android:maxLines="1"
-            tools:text="text_title" />
-
-        <org.wordpress.android.widgets.WPTextView
-            style="@style/LoginTheme.Footnote"
-            android:id="@+id/text_domain"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            tools:text="text_domain" />
-    </LinearLayout>
+        android:layout_height="@dimen/list_divider_height"
+        android:layout_marginStart="@dimen/margin_extra_large"
+        android:background="?android:attr/listDivider" />
 </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 a7275fb56b6a..6d0dad5d9321 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,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/layout_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginBottom="@dimen/margin_medium"
+    android:layout_marginEnd="@dimen/margin_extra_large"
     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:gravity="center_vertical"
     android:orientation="horizontal">
 
     <include
-        layout="@layout/login_epilogue_sites_listitem"
-        android:layout_width="match_parent"
+        layout="@layout/base_site_listitem"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_toStartOf="@+id/radio_selected"
-        tools:ignore="DuplicateIncludedIds" />
+        android:layout_weight="1" />
 
     <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:layout_marginStart="@dimen/margin_small_medium"
         android:clickable="false"
         android:focusableInTouchMode="false" />
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/WordPress/src/main/res/layout/site_picker_listitem.xml b/WordPress/src/main/res/layout/site_picker_listitem.xml
index d263b35e4524..1ebbe6e5c308 100644
--- a/WordPress/src/main/res/layout/site_picker_listitem.xml
+++ b/WordPress/src/main/res/layout/site_picker_listitem.xml
@@ -5,64 +5,27 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <RelativeLayout
+    <FrameLayout
         android:id="@+id/layout_container"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/selectableItemBackground"
-        android:paddingTop="@dimen/margin_large">
+        android:layout_height="@dimen/site_list_item_height"
+        android:orientation="vertical">
 
-        <ImageView
-            android:id="@+id/image_blavatar"
-            android:layout_width="@dimen/blavatar_sz"
-            android:layout_height="@dimen/blavatar_sz"
-            android:layout_marginStart="@dimen/site_picker_blavatar_margin_left"
-            android:layout_marginEnd="@dimen/site_picker_blavatar_margin_right"
-            android:background="@android:color/white"
-            android:contentDescription="@string/blavatar_desc"
-            android:gravity="center_vertical"
-            android:padding="1dp"
-            android:src="@drawable/bg_rectangle_neutral_10_globe_32dp" />
-
-        <LinearLayout
-            android:id="@+id/metadata_container"
+        <include
+            layout="@layout/base_site_listitem"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginBottom="@dimen/margin_medium"
-            android:layout_toEndOf="@id/image_blavatar"
-            android:orientation="vertical">
-
-            <org.wordpress.android.widgets.WPTextView
-                android:id="@+id/text_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:textAppearance="?attr/textAppearanceSubtitle1"
-                tools:text="text_title" />
-
-            <org.wordpress.android.widgets.WPTextView
-                android:id="@+id/text_domain"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:textAppearance="?attr/textAppearanceCaption"
-                tools:text="text_domain" />
-
-        </LinearLayout>
-
-    </RelativeLayout>
+            android:layout_height="match_parent"
+            android:layout_marginEnd="@dimen/margin_extra_large"
+            android:layout_marginStart="@dimen/margin_extra_large" />
+    </FrameLayout>
 
     <View
         android:id="@+id/divider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_marginTop="@dimen/margin_medium"
         android:layout_marginBottom="@dimen/margin_medium"
+        android:layout_marginTop="@dimen/margin_medium"
         android:background="?android:attr/listDivider"
         android:visibility="gone"
         tools:visibility="visible" />
-
 </LinearLayout>
diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml
index 5ae834dcc6b5..3ec6b09b225c 100644
--- a/WordPress/src/main/res/values/dimens.xml
+++ b/WordPress/src/main/res/values/dimens.xml
@@ -272,6 +272,8 @@
     <dimen name="menu_item_margin_tablet">24dp</dimen>
     <dimen name="menu_item_margin">@dimen/menu_item_margin_normal</dimen>
 
+    <dimen name="site_list_item_height">64dp</dimen>
+
     <!-- Site Settings -->
     <dimen name="site_settings_divider_height">1dp</dimen>
     <dimen name="related_posts_dialog_padding_left">24dp</dimen>
diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml
index f61aa0d0dabd..24ab12bf2db8 100644
--- a/WordPress/src/main/res/values/styles.xml
+++ b/WordPress/src/main/res/values/styles.xml
@@ -995,15 +995,23 @@
         <item name="fontFamily">sans-serif-medium</item>
     </style>
 
-    <style name="LoginTheme.Subhead" parent="TextAppearance.MaterialComponents.Subtitle1">
-        <item name="android:textStyle">bold</item>
+    <style name="LoginTheme.Subhead" parent="TextAppearance.MaterialComponents.Subtitle1" />
+
+    <style name="LoginTheme.Subhead2" parent="TextAppearance.MaterialComponents.Subtitle2">
+        <item name="android:alpha">@dimen/material_emphasis_medium</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="fontFamily">sans-serif</item>
     </style>
 
     <style name="LoginTheme.Username" parent="TextAppearance.MaterialComponents.Subtitle1">
         <item name="android:alpha">@dimen/material_emphasis_medium</item>
     </style>
 
-    <style name="LoginTheme.Footnote" parent="TextAppearance.MaterialComponents.Caption" />
+    <style name="LoginTheme.Footnote" parent="TextAppearance.MaterialComponents.Caption">
+        <item name="android:alpha">@dimen/material_emphasis_medium</item>
+        <item name="android:textColor">?attr/colorOnSurface</item>
+    </style>
 
     <style name="LoginEpilogueSitesList">
         <item name="colorControlHighlight">@android:color/transparent</item>

From 0f6a3726b4dc045e0e0c50c06b84749e9b466e49 Mon Sep 17 00:00:00 2001
From: Renan Ferrari <renan.fb@gmail.com>
Date: Fri, 15 May 2020 19:40:50 -0300
Subject: [PATCH 09/17] Add footer with secondary button to login epilogue list

---
 .../ui/ShareIntentReceiverFragment.java       |  15 ++-
 .../accounts/login/LoginEpilogueFragment.java | 101 +++++++++---------
 .../accounts/login/LoginFooterViewHolder.java |  21 ++++
 .../android/ui/main/SitePickerAdapter.java    |  52 ++++++---
 .../main/res/layout/login_epilogue_footer.xml |  19 ++++
 5 files changed, 140 insertions(+), 68 deletions(-)
 create mode 100644 WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginFooterViewHolder.java
 create mode 100644 WordPress/src/main/res/layout/login_epilogue_footer.xml

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 1f8968fe402b..05079f31388a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverFragment.java
@@ -14,14 +14,13 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.Adapter;
-import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.fluxc.store.AccountStore;
 import org.wordpress.android.ui.main.SitePickerAdapter;
-import org.wordpress.android.ui.main.SitePickerAdapter.HeaderHandler;
 import org.wordpress.android.ui.main.SitePickerAdapter.SiteList;
+import org.wordpress.android.ui.main.SitePickerAdapter.ViewHolderHandler;
 import org.wordpress.android.ui.media.MediaBrowserActivity;
 import org.wordpress.android.ui.posts.EditPostActivity;
 import org.wordpress.android.util.image.ImageManager;
@@ -176,21 +175,21 @@ public void run() {
         return mAdapter;
     }
 
-    private HeaderHandler createHeaderHandler() {
-        return new HeaderHandler() {
+    private ViewHolderHandler<HeaderViewHolder> createHeaderHandler() {
+        return new ViewHolderHandler<HeaderViewHolder>() {
             @Override
-            public ViewHolder onCreateViewHolder(LayoutInflater layoutInflater, ViewGroup parent,
-                                                 boolean attachToRoot) {
+            public HeaderViewHolder onCreateViewHolder(LayoutInflater layoutInflater, ViewGroup parent,
+                                                       boolean attachToRoot) {
                 return new HeaderViewHolder(
                         layoutInflater.inflate(R.layout.share_intent_receiver_header, parent, false));
             }
 
             @Override
-            public void onBindViewHolder(ViewHolder holder, SiteList sites) {
+            public void onBindViewHolder(HeaderViewHolder holder, SiteList sites) {
                 if (!isAdded()) {
                     return;
                 }
-                ((HeaderViewHolder) holder).bindText(getString(
+                holder.bindText(getString(
                         sites.size() == 1 ? R.string.share_intent_adding_to : R.string.share_intent_pick_site));
             }
         };
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java
index 0d414f194c26..f8f11b68c5d0 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java
@@ -22,6 +22,7 @@
 import org.wordpress.android.login.LoginBaseFormFragment;
 import org.wordpress.android.ui.main.SitePickerAdapter;
 import org.wordpress.android.ui.main.SitePickerAdapter.SiteList;
+import org.wordpress.android.ui.main.SitePickerAdapter.ViewHolderHandler;
 import org.wordpress.android.util.GravatarUtils;
 import org.wordpress.android.util.StringUtils;
 import org.wordpress.android.util.analytics.AnalyticsUtils;
@@ -40,8 +41,6 @@ public class LoginEpilogueFragment extends LoginBaseFormFragment<LoginEpilogueLi
 
     private RecyclerView mSitesList;
     private View mBottomShadow;
-    private View mBottomButtonsContainer;
-    private Button mConnectMore;
 
     private SitePickerAdapter mAdapter;
     private boolean mDoLoginUpdate;
@@ -91,10 +90,6 @@ protected ViewGroup createMainView(LayoutInflater inflater, ViewGroup container,
     @Override
     protected void setupContent(ViewGroup rootView) {
         mBottomShadow = rootView.findViewById(R.id.bottom_shadow);
-
-//        mBottomButtonsContainer = rootView.findViewById(R.id.bottom_buttons);
-//        mConnectMore = mBottomButtonsContainer.findViewById(R.id.secondary_button);
-
         mSitesList = rootView.findViewById(R.id.recycler_view);
         mSitesList.setLayoutManager(new LinearLayoutManager(getActivity()));
         mSitesList.setScrollBarStyle(View.SCROLLBARS_OUTSIDE_OVERLAY);
@@ -104,22 +99,9 @@ protected void setupContent(ViewGroup rootView) {
 
     @Override
     protected void setupBottomButtons(Button secondaryButton, Button primaryButton) {
-//        secondaryButton.setVisibility(mShowAndReturn ? View.GONE : View.VISIBLE);
-//        secondaryButton.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View v) {
-//                if (mLoginEpilogueListener != null) {
-//                    mLoginEpilogueListener.onConnectAnotherSite();
-//                }
-//            }
-//        });
-
-        primaryButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (mLoginEpilogueListener != null) {
-                    mLoginEpilogueListener.onContinue();
-                }
+        primaryButton.setOnClickListener(v -> {
+            if (mLoginEpilogueListener != null) {
+                mLoginEpilogueListener.onContinue();
             }
         });
     }
@@ -160,33 +142,45 @@ public void onBeforeLoad(boolean isEmpty) {
 
                     @Override
                     public void onAfterLoad() {
-                        mSitesList.post(new Runnable() {
-                            @Override
-                            public void run() {
-                                if (!isAdded()) {
-                                    return;
-                                }
-
-                                if (mSitesList.computeVerticalScrollRange() > mSitesList.getHeight()) {
-                                    mBottomShadow.setVisibility(View.VISIBLE);
-                                } else {
-                                    mBottomShadow.setVisibility(View.GONE);
-                                }
+                        mSitesList.post(() -> {
+                            if (!isAdded()) {
+                                return;
+                            }
+
+                            if (mSitesList.computeVerticalScrollRange() > mSitesList.getHeight()) {
+                                mBottomShadow.setVisibility(View.VISIBLE);
+                            } else {
+                                mBottomShadow.setVisibility(View.GONE);
                             }
                         });
                     }
-                }, new SitePickerAdapter.HeaderHandler() {
-            @Override
-            public RecyclerView.ViewHolder onCreateViewHolder(LayoutInflater layoutInflater, ViewGroup parent,
-                                                              boolean attachToRoot) {
-                return new LoginHeaderViewHolder(layoutInflater.inflate(R.layout.login_epilogue_header, parent, false));
-            }
+                },
+                new SitePickerAdapter.ViewHolderHandler<LoginHeaderViewHolder>() {
+                    @Override
+                    public LoginHeaderViewHolder onCreateViewHolder(LayoutInflater layoutInflater, ViewGroup parent,
+                                                                    boolean attachToRoot) {
+                        return new LoginHeaderViewHolder(
+                                layoutInflater.inflate(R.layout.login_epilogue_header, parent, false));
+                    }
 
-            @Override
-            public void onBindViewHolder(RecyclerView.ViewHolder holder, SiteList sites) {
-                refreshAccountDetails((LoginHeaderViewHolder) holder, sites);
-            }
-        }, mOldSitesIds);
+                    @Override
+                    public void onBindViewHolder(LoginHeaderViewHolder holder, SiteList sites) {
+                        bindHeaderViewHolder(holder, sites);
+                    }
+                },
+                new ViewHolderHandler<LoginFooterViewHolder>() {
+                    @Override
+                    public LoginFooterViewHolder onCreateViewHolder(LayoutInflater layoutInflater, ViewGroup parent,
+                                                                    boolean attachToRoot) {
+                        return new LoginFooterViewHolder(
+                                layoutInflater.inflate(R.layout.login_epilogue_footer, parent, false));
+                    }
+
+                    @Override
+                    public void onBindViewHolder(LoginFooterViewHolder holder, SiteList sites) {
+                        bindFooterViewHolder(holder, sites);
+                    }
+                }, mOldSitesIds);
     }
 
     @Override
@@ -209,7 +203,7 @@ public void onResume() {
         }
     }
 
-    private void refreshAccountDetails(LoginHeaderViewHolder holder, SiteList sites) {
+    private void bindHeaderViewHolder(LoginHeaderViewHolder holder, SiteList sites) {
         if (!isAdded()) {
             return;
         }
@@ -231,13 +225,24 @@ private void refreshAccountDetails(LoginHeaderViewHolder holder, SiteList sites)
 
         if (sites.size() == 0) {
             holder.hideSitesHeading();
-//            mConnectMore.setText(R.string.connect_site);
         } else {
             holder.showSitesHeading(StringUtils.getQuantityString(
                     getActivity(), R.string.login_epilogue_mysites_one, R.string.login_epilogue_mysites_one,
                     R.string.login_epilogue_mysites_other, sites.size()));
+        }
+    }
 
-//            mConnectMore.setText(R.string.connect_more);
+    private void bindFooterViewHolder(LoginFooterViewHolder holder, SiteList sites) {
+        holder.itemView.setVisibility(mShowAndReturn ? View.GONE : View.VISIBLE);
+        holder.itemView.setOnClickListener(v -> {
+            if (mLoginEpilogueListener != null) {
+                mLoginEpilogueListener.onConnectAnotherSite();
+            }
+        });
+        if (sites.size() == 0) {
+            holder.bindText(getString(R.string.connect_site));
+        } else {
+            holder.bindText(getString(R.string.connect_more));
         }
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginFooterViewHolder.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginFooterViewHolder.java
new file mode 100644
index 000000000000..0526743807c9
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginFooterViewHolder.java
@@ -0,0 +1,21 @@
+package org.wordpress.android.ui.accounts.login;
+
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.wordpress.android.R;
+
+public class LoginFooterViewHolder extends RecyclerView.ViewHolder {
+    private final TextView mFooterTextView;
+
+    LoginFooterViewHolder(View view) {
+        super(view);
+        mFooterTextView = view.findViewById(R.id.footer_text_view);
+    }
+
+    public void bindText(String text) {
+        mFooterTextView.setText(text);
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerAdapter.java
index c56b94450436..22df125dbf83 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerAdapter.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerAdapter.java
@@ -56,10 +56,10 @@ public interface OnDataLoadedListener {
         void onAfterLoad();
     }
 
-    public interface HeaderHandler {
-        RecyclerView.ViewHolder onCreateViewHolder(LayoutInflater layoutInflater, ViewGroup parent,
-                                                   boolean attachToRoot);
-        void onBindViewHolder(RecyclerView.ViewHolder holder, SiteList sites);
+    public interface ViewHolderHandler<T extends RecyclerView.ViewHolder> {
+        T onCreateViewHolder(LayoutInflater layoutInflater, ViewGroup parent, boolean attachToRoot);
+
+        void onBindViewHolder(T holder, SiteList sites);
     }
 
     private final @LayoutRes int mItemLayoutReourceId;
@@ -75,7 +75,8 @@ RecyclerView.ViewHolder onCreateViewHolder(LayoutInflater layoutInflater, ViewGr
 
     private final LayoutInflater mInflater;
     private final HashSet<Integer> mSelectedPositions = new HashSet<>();
-    private final HeaderHandler mHeaderHandler;
+    private final ViewHolderHandler mHeaderHandler;
+    private final ViewHolderHandler mFooterHandler;
 
     private boolean mIsMultiSelectEnabled;
     private final boolean mIsInSearchMode;
@@ -97,6 +98,7 @@ RecyclerView.ViewHolder onCreateViewHolder(LayoutInflater layoutInflater, ViewGr
 
     private static final int VIEW_TYPE_HEADER = 0;
     private static final int VIEW_TYPE_ITEM = 1;
+    private static final int VIEW_TYPE_FOOTER = 2;
 
     @Inject AccountStore mAccountStore;
     @Inject SiteStore mSiteStore;
@@ -139,7 +141,20 @@ public SitePickerAdapter(Context context,
                              String lastSearch,
                              boolean isInSearchMode,
                              OnDataLoadedListener dataLoadedListener,
-                             HeaderHandler headerHandler,
+                             ViewHolderHandler<?> headerHandler,
+                             ArrayList<Integer> ignoreSitesIds) {
+        this(context, itemLayoutResourceId, currentLocalBlogId, lastSearch, isInSearchMode, dataLoadedListener,
+                headerHandler, null, ignoreSitesIds);
+    }
+
+    public SitePickerAdapter(Context context,
+                             @LayoutRes int itemLayoutResourceId,
+                             int currentLocalBlogId,
+                             String lastSearch,
+                             boolean isInSearchMode,
+                             OnDataLoadedListener dataLoadedListener,
+                             ViewHolderHandler<?> headerHandler,
+                             ViewHolderHandler<?> footerHandler,
                              ArrayList<Integer> ignoreSitesIds) {
         super();
         ((WordPress) context.getApplicationContext()).component().inject(this);
@@ -164,6 +179,7 @@ public SitePickerAdapter(Context context,
                         context.getResources().getInteger(R.integer.selected_list_item_opacity));
 
         mHeaderHandler = headerHandler;
+        mFooterHandler = footerHandler;
         mSelectedItemPos = getPositionOffset();
 
         mIgnoreSitesIds = ignoreSitesIds;
@@ -173,7 +189,7 @@ public SitePickerAdapter(Context context,
 
     @Override
     public int getItemCount() {
-        return (mHeaderHandler != null ? 1 : 0) + mSites.size();
+        return (mHeaderHandler != null ? 1 : 0) + mSites.size() + (mFooterHandler != null ? 1 : 0);
     }
 
     private int getSitesCount() {
@@ -182,8 +198,11 @@ private int getSitesCount() {
 
     @Override
     public long getItemId(int position) {
-        if (mHeaderHandler != null && position == 0) {
-            return RecyclerView.NO_ID;
+        int viewType = getItemViewType(position);
+        if (viewType == VIEW_TYPE_HEADER) {
+            return -1;
+        } else if (viewType == VIEW_TYPE_FOOTER) {
+            return -2;
         } else {
             return getItem(position).mLocalId;
         }
@@ -191,10 +210,12 @@ public long getItemId(int position) {
 
     @Override
     public int getItemViewType(int position) {
-        if (mHeaderHandler == null) {
-            return VIEW_TYPE_ITEM;
+        if (mHeaderHandler != null && position == 0) {
+            return VIEW_TYPE_HEADER;
+        } else if (mFooterHandler != null && position == getItemCount() - 1) {
+            return VIEW_TYPE_FOOTER;
         } else {
-            return position == 0 ? VIEW_TYPE_HEADER : VIEW_TYPE_ITEM;
+            return VIEW_TYPE_ITEM;
         }
     }
 
@@ -220,6 +241,8 @@ void setOnSiteClickListener(OnSiteClickListener listener) {
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         if (viewType == VIEW_TYPE_HEADER) {
             return mHeaderHandler.onCreateViewHolder(mInflater, parent, false);
+        } else if (viewType == VIEW_TYPE_FOOTER) {
+            return mFooterHandler.onCreateViewHolder(mInflater, parent, false);
         } else {
             View itemView = mInflater.inflate(mItemLayoutReourceId, parent, false);
             return new SiteViewHolder(itemView);
@@ -235,6 +258,11 @@ public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder viewHolder,
             return;
         }
 
+        if (viewType == VIEW_TYPE_FOOTER) {
+            mFooterHandler.onBindViewHolder(viewHolder, mSites);
+            return;
+        }
+
         SiteRecord site = getItem(position);
 
         final SiteViewHolder holder = (SiteViewHolder) viewHolder;
diff --git a/WordPress/src/main/res/layout/login_epilogue_footer.xml b/WordPress/src/main/res/layout/login_epilogue_footer.xml
new file mode 100644
index 000000000000..f968bbea9956
--- /dev/null
+++ b/WordPress/src/main/res/layout/login_epilogue_footer.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/one_line_list_item_height"
+    android:background="?selectableItemBackground">
+
+    <org.wordpress.android.widgets.WPTextView
+        android:id="@+id/footer_text_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="16dp"
+        android:layout_marginStart="16dp"
+        android:textAppearance="?textAppearanceBody2"
+        android:textColor="?colorPrimary"
+        tools:text="@string/connect_site" />
+
+</FrameLayout>

From 5e935137985275168819bde5fc8fdcacdd77630f Mon Sep 17 00:00:00 2001
From: Renan Ferrari <renan.fb@gmail.com>
Date: Mon, 18 May 2020 13:14:17 -0300
Subject: [PATCH 10/17] Update login epilogue secondary button strings

---
 WordPress/src/main/res/values/strings.xml                     | 4 ++--
 libs/login/WordPressLoginFlow/src/main/res/values/strings.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index b5f4f9c90bcf..eaa097c9c762 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -2323,8 +2323,8 @@
     <string name="login_magic_link_email_requesting">Requesting log-in email</string>
     <string name="enter_wpcom_password">Enter your WordPress.com password.</string>
     <string name="enter_wpcom_password_google">To proceed with this Google account, please provide the matching WordPress.com password. This will be asked only once.</string>
-    <string name="connect_more">Connect Another Site</string>
-    <string name="connect_site">Connect Site</string>
+    <string name="connect_more">Connect another site</string>
+    <string name="connect_site">Connect a site</string>
     <string name="login_continue">Continue</string>
     <string name="login_done">Done</string>
     <string name="login_already_logged_in_wpcom">Already logged in to WordPress.com</string>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/values/strings.xml b/libs/login/WordPressLoginFlow/src/main/res/values/strings.xml
index ea5b31567bc6..52d1a3ae68fe 100644
--- a/libs/login/WordPressLoginFlow/src/main/res/values/strings.xml
+++ b/libs/login/WordPressLoginFlow/src/main/res/values/strings.xml
@@ -33,8 +33,8 @@
     <string name="magic_link_unavailable_error_message">Currently unavailable. Please enter your password</string>
     <string name="enter_wpcom_password">Enter your WordPress.com password.</string>
     <string name="enter_wpcom_password_google">To proceed with this Google account, please provide the matching WordPress.com password. This will be asked only once.</string>
-    <string name="connect_more">Connect Another Site</string>
-    <string name="connect_site">Connect Site</string>
+    <string name="connect_more">Connect another site</string>
+    <string name="connect_site">Connect a site</string>
     <string name="login_continue">Continue</string>
     <string name="login_done">Done</string>
     <string name="login_already_logged_in_wpcom">Already logged in to WordPress.com</string>

From 24d52e8353a903b3c1cabed59935450b07d288d9 Mon Sep 17 00:00:00 2001
From: Renan Ferrari <renan.fb@gmail.com>
Date: Mon, 18 May 2020 18:20:58 -0300
Subject: [PATCH 11/17] Remove temporary activities from debug manifest

---
 WordPress/src/debug/AndroidManifest.xml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/WordPress/src/debug/AndroidManifest.xml b/WordPress/src/debug/AndroidManifest.xml
index 024e31d507ed..299ee8c21a87 100644
--- a/WordPress/src/debug/AndroidManifest.xml
+++ b/WordPress/src/debug/AndroidManifest.xml
@@ -8,19 +8,6 @@
         tools:replace="android:name,android:supportsRtl"
         android:name=".WordPressDebug"
         android:supportsRtl="true">
-
-        <!-- Temporarily adding these activities here, so we are able to launch them from adb -->
-        <activity
-            android:name=".ui.accounts.LoginEpilogueActivity"
-            android:label="@string/login_epilogue_screen_title"
-            android:theme="@style/LoginTheme"
-            android:exported="true" />
-
-        <activity
-            android:name=".ui.accounts.SignupEpilogueActivity"
-            android:label="@string/signup_epilogue_screen_title"
-            android:theme="@style/LoginTheme"
-            android:exported="true" />
     </application>
 
     <!--

From a0f5eca02e4afaa679a3ee9585d633deda6940aa Mon Sep 17 00:00:00 2001
From: Renan Ferrari <renan.fb@gmail.com>
Date: Tue, 19 May 2020 12:27:50 -0300
Subject: [PATCH 12/17] Update site list item icon content description

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

diff --git a/WordPress/src/main/res/layout/base_site_listitem.xml b/WordPress/src/main/res/layout/base_site_listitem.xml
index 0dd227b91f42..50ddda166ed3 100644
--- a/WordPress/src/main/res/layout/base_site_listitem.xml
+++ b/WordPress/src/main/res/layout/base_site_listitem.xml
@@ -10,8 +10,8 @@
         android:layout_width="@dimen/blavatar_sz"
         android:layout_height="@dimen/blavatar_sz"
         android:layout_marginEnd="@dimen/margin_extra_large"
+        android:contentDescription="@string/blavatar_desc"
         android:gravity="center_vertical"
-        android:importantForAccessibility="no"
         android:src="@drawable/bg_rectangle_neutral_10_radius_4dp_globe_32dp" />
 
     <LinearLayout

From 93609387ded344e3613e4e9adc462a82f34b39eb Mon Sep 17 00:00:00 2001
From: Renan Ferrari <renan.fb@gmail.com>
Date: Tue, 19 May 2020 12:35:17 -0300
Subject: [PATCH 13/17] Remove unused resources

---
 WordPress/src/main/res/drawable/bg_oval_white.xml   | 11 -----------
 WordPress/src/main/res/drawable/blavatar_border.xml | 11 -----------
 .../main/res/drawable/ic_user_circle_white_24dp.xml | 13 -------------
 WordPress/src/main/res/values/dimens.xml            |  3 ---
 WordPress/src/main/res/values/strings.xml           |  5 +----
 .../src/main/res/values/strings.xml                 |  2 --
 6 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 WordPress/src/main/res/drawable/bg_oval_white.xml
 delete mode 100644 WordPress/src/main/res/drawable/blavatar_border.xml
 delete mode 100644 WordPress/src/main/res/drawable/ic_user_circle_white_24dp.xml

diff --git a/WordPress/src/main/res/drawable/bg_oval_white.xml b/WordPress/src/main/res/drawable/bg_oval_white.xml
deleted file mode 100644
index 31548c1bcf11..000000000000
--- a/WordPress/src/main/res/drawable/bg_oval_white.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval" >
-
-    <solid
-        android:color="@android:color/white" >
-    </solid>
-
-</shape>
diff --git a/WordPress/src/main/res/drawable/blavatar_border.xml b/WordPress/src/main/res/drawable/blavatar_border.xml
deleted file mode 100644
index 96818bc142b2..000000000000
--- a/WordPress/src/main/res/drawable/blavatar_border.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <stroke
-        android:width="1dp"
-        android:color="@color/neutral_10"/>
-    <padding
-        android:left="1dp"
-        android:top="1dp"
-        android:right="1dp"
-        android:bottom="1dp"/>
-</shape>
diff --git a/WordPress/src/main/res/drawable/ic_user_circle_white_24dp.xml b/WordPress/src/main/res/drawable/ic_user_circle_white_24dp.xml
deleted file mode 100644
index df67fcdb1e83..000000000000
--- a/WordPress/src/main/res/drawable/ic_user_circle_white_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0" >
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,2C6.477,2 2,6.477 2,12s4.477,10 10,10 10,-4.477 10,-10S17.523,2 12,2zM12,20.5c-4.694,0 -8.5,-3.806 -8.5,-8.5S7.306,3.5 12,3.5s8.5,3.806 8.5,8.5 -3.806,8.5 -8.5,8.5zM12,12.5c-3.038,0 -5.5,1.728 -5.5,3.5s2.462,3.5 5.5,3.5 5.5,-1.728 5.5,-3.5 -2.462,-3.5 -5.5,-3.5zM12,12c1.657,0 3,-1.343 3,-3s-1.343,-3 -3,-3 -3,1.343 -3,3 1.343,3 3,3z" >
-    </path>
-
-</vector>
diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml
index 3ec6b09b225c..baeae41e581b 100644
--- a/WordPress/src/main/res/values/dimens.xml
+++ b/WordPress/src/main/res/values/dimens.xml
@@ -263,9 +263,6 @@
     <dimen name="me_list_row_padding_horizontal">@dimen/content_margin</dimen>
 
     <!--site picker-->
-    <dimen name="site_picker_blavatar_margin_left">7dp</dimen>
-    <dimen name="site_picker_blavatar_margin_right">15dp</dimen>
-
     <dimen name="menu_item_height">48dp</dimen>
     <dimen name="menu_item_width">256sp</dimen>
     <dimen name="menu_item_margin_normal">16dp</dimen>
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index eaa097c9c762..762733dac830 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -2325,10 +2325,9 @@
     <string name="enter_wpcom_password_google">To proceed with this Google account, please provide the matching WordPress.com password. This will be asked only once.</string>
     <string name="connect_more">Connect another site</string>
     <string name="connect_site">Connect a site</string>
-    <string name="login_continue">Continue</string>
+    <string name="login_continue" tools:ignore="UnusedResources">Continue</string>
     <string name="login_done">Done</string>
     <string name="login_already_logged_in_wpcom">Already logged in to WordPress.com</string>
-    <string name="login_username_at">\@%s</string>
     <string name="enter_site_address">Enter the address of the WordPress site you\'d like to connect.</string>
     <string name="enter_site_address_share_intent">Enter the address of your WordPress site you\'d like to share the content to.</string>
     <string name="login_site_address">Site address</string>
@@ -2346,7 +2345,6 @@
     <string name="login_empty_2fa">Please enter a verification code</string>
     <string name="login_email_button_signup">Don\'t have an account? %1$sSign up%2$s</string>
     <string name="login_email_client_not_found">Can\'t detect your email client app</string>
-    <string name="login_logged_in_as">Logged in as</string>
     <string name="login_epilogue_mysites_one">My site</string>
     <string name="login_epilogue_mysites_other">My sites</string>
     <string name="login_google_button_suffix">Log in with Google.</string>
@@ -2384,7 +2382,6 @@
     <string name="signup_epilogue_error_generic">There was some trouble updating your account. You can retry or revert your changes to continue.</string>
     <string name="signup_epilogue_error_button_negative">Revert</string>
     <string name="signup_epilogue_error_button_positive">Retry</string>
-    <string name="signup_epilogue_heading">New account</string>
     <string name="signup_epilogue_hint_display">Display Name</string>
     <string name="signup_epilogue_hint_password">Password (optional)</string>
     <string name="signup_epilogue_hint_password_detail">You can always log in with a magic link like the one you just used, but you can also set up a password if you prefer.</string>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/values/strings.xml b/libs/login/WordPressLoginFlow/src/main/res/values/strings.xml
index 52d1a3ae68fe..35a838c0f961 100644
--- a/libs/login/WordPressLoginFlow/src/main/res/values/strings.xml
+++ b/libs/login/WordPressLoginFlow/src/main/res/values/strings.xml
@@ -38,7 +38,6 @@
     <string name="login_continue">Continue</string>
     <string name="login_done">Done</string>
     <string name="login_already_logged_in_wpcom">Already logged in to WordPress.com</string>
-    <string name="login_username_at">\@%s</string>
     <string name="enter_site_address">Enter the address of the WordPress site you\'d like to connect.</string>
     <string name="enter_site_address_share_intent">Enter the address of your WordPress site you\'d like to share the content to.</string>
     <string name="login_site_address">Site address</string>
@@ -56,7 +55,6 @@
     <string name="login_empty_2fa">Please enter a verification code</string>
     <string name="login_email_button_signup">Don\'t have an account? %1$sSign up%2$s</string>
     <string name="login_email_client_not_found">Can\'t detect your email client app</string>
-    <string name="login_logged_in_as">Logged in as</string>
     <string name="login_google_button_suffix">Log in with Google.</string>
     <string name="login_error_button">Close</string>
     <string name="login_error_email_not_found_v2">There\'s no WordPress.com account matching this Google account.</string>

From 0c47f218ac584b2095b76e464264e6a87227049c Mon Sep 17 00:00:00 2001
From: Renan Ferrari <renan.fb@gmail.com>
Date: Tue, 19 May 2020 15:20:00 -0300
Subject: [PATCH 14/17] Update login epilogue header avatar handling

---
 .../accounts/login/LoginEpilogueFragment.java | 24 +++++-----
 .../accounts/login/LoginHeaderViewHolder.java | 45 +++++++++++++------
 2 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java
index f8f11b68c5d0..9b6caa6a0dd9 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java
@@ -18,12 +18,12 @@
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.analytics.AnalyticsTracker;
+import org.wordpress.android.fluxc.model.AccountModel;
 import org.wordpress.android.fluxc.model.SiteModel;
 import org.wordpress.android.login.LoginBaseFormFragment;
 import org.wordpress.android.ui.main.SitePickerAdapter;
 import org.wordpress.android.ui.main.SitePickerAdapter.SiteList;
 import org.wordpress.android.ui.main.SitePickerAdapter.ViewHolderHandler;
-import org.wordpress.android.util.GravatarUtils;
 import org.wordpress.android.util.StringUtils;
 import org.wordpress.android.util.analytics.AnalyticsUtils;
 import org.wordpress.android.util.image.ImageManager;
@@ -209,26 +209,22 @@ private void bindHeaderViewHolder(LoginHeaderViewHolder holder, SiteList sites)
         }
 
         final boolean isWpcom = mAccountStore.hasAccessToken();
+        final boolean hasSites = sites.size() != 0;
 
         if (isWpcom) {
-            holder.updateLoggedInAsHeading(getContext(), mImageManager, mAccountStore.getAccount());
-        } else if (sites.size() != 0) {
-            SiteModel site = mSiteStore.getSiteByLocalId(sites.get(0).getLocalId());
-            int avatarSz = getResources().getDimensionPixelSize(R.dimen.avatar_sz_large);
-
-            String avatarUrl = GravatarUtils.gravatarFromEmail(site.getEmail(), avatarSz);
-            String username = site.getUsername();
-            String displayName = site.getDisplayName();
-
-            holder.updateLoggedInAsHeading(getContext(), mImageManager, avatarUrl, username, displayName);
+            final AccountModel account = mAccountStore.getAccount();
+            holder.updateLoggedInAsHeading(getContext(), mImageManager, account);
+        } else if (hasSites) {
+            final SiteModel site = mSiteStore.getSiteByLocalId(sites.get(0).getLocalId());
+            holder.updateLoggedInAsHeading(getContext(), mImageManager, site);
         }
 
-        if (sites.size() == 0) {
-            holder.hideSitesHeading();
-        } else {
+        if (hasSites) {
             holder.showSitesHeading(StringUtils.getQuantityString(
                     getActivity(), R.string.login_epilogue_mysites_one, R.string.login_epilogue_mysites_one,
                     R.string.login_epilogue_mysites_other, sites.size()));
+        } else {
+            holder.hideSitesHeading();
         }
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginHeaderViewHolder.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginHeaderViewHolder.java
index 1eadc7a37f80..300a7a2b0982 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginHeaderViewHolder.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginHeaderViewHolder.java
@@ -10,21 +10,23 @@
 
 import org.wordpress.android.R;
 import org.wordpress.android.fluxc.model.AccountModel;
+import org.wordpress.android.fluxc.model.SiteModel;
 import org.wordpress.android.util.GravatarUtils;
 import org.wordpress.android.util.StringUtils;
 import org.wordpress.android.util.image.ImageManager;
-import org.wordpress.android.util.image.ImageType;
+
+import static org.wordpress.android.util.image.ImageType.AVATAR_WITHOUT_BACKGROUND;
 
 /**
  * ViewHolder for a RecyclerView header used on screens shown after a user logs in.
  */
-public class LoginHeaderViewHolder extends RecyclerView.ViewHolder {
+class LoginHeaderViewHolder extends RecyclerView.ViewHolder {
     private final ImageView mAvatarImageView;
     private final TextView mDisplayNameTextView;
     private final TextView mUsernameTextView;
     private final TextView mMySitesHeadingTextView;
 
-    public LoginHeaderViewHolder(View view) {
+    LoginHeaderViewHolder(View view) {
         super(view);
         mAvatarImageView = view.findViewById(R.id.avatar);
         mDisplayNameTextView = view.findViewById(R.id.display_name);
@@ -32,15 +34,23 @@ public LoginHeaderViewHolder(View view) {
         mMySitesHeadingTextView = view.findViewById(R.id.my_sites_heading);
     }
 
-    public void updateLoggedInAsHeading(Context context, ImageManager imageManager, AccountModel defaultAccount) {
-        updateLoggedInAsHeading(context, imageManager, constructGravatarUrl(context, defaultAccount),
-                                defaultAccount.getUserName(), defaultAccount.getDisplayName());
+    void updateLoggedInAsHeading(Context context, ImageManager imageManager, AccountModel account) {
+        final String avatarUrl = constructGravatarUrl(context, account);
+        final String username = account.getUserName();
+        final String displayName = account.getDisplayName();
+        updateLoggedInAsHeading(imageManager, avatarUrl, username, displayName);
+    }
+
+    void updateLoggedInAsHeading(Context context, ImageManager imageManager, SiteModel site) {
+        final String avatarUrl = constructGravatarUrl(context, site);
+        final String username = site.getUsername();
+        final String displayName = site.getDisplayName();
+        updateLoggedInAsHeading(imageManager, avatarUrl, username, displayName);
     }
 
-    public void updateLoggedInAsHeading(Context context, ImageManager imageManager, String avatarUrl, String username,
-                                        String displayName) {
-        imageManager.loadIntoCircle(mAvatarImageView, ImageType.AVATAR_WITHOUT_BACKGROUND,
-                StringUtils.notNullStr(avatarUrl));
+    void updateLoggedInAsHeading(ImageManager imageManager, String avatarUrl, String username, String displayName) {
+        imageManager.loadIntoCircle(mAvatarImageView, AVATAR_WITHOUT_BACKGROUND, StringUtils.notNullStr(avatarUrl));
+
         mUsernameTextView.setText(username);
 
         if (!TextUtils.isEmpty(displayName)) {
@@ -50,17 +60,24 @@ public void updateLoggedInAsHeading(Context context, ImageManager imageManager,
         }
     }
 
-    public void showSitesHeading(String text) {
+    void showSitesHeading(String text) {
         mMySitesHeadingTextView.setVisibility(View.VISIBLE);
         mMySitesHeadingTextView.setText(text);
     }
 
-    public void hideSitesHeading() {
+    void hideSitesHeading() {
         mMySitesHeadingTextView.setVisibility(View.GONE);
     }
 
+    private int getAvatarSize(Context context) {
+        return context.getResources().getDimensionPixelSize(R.dimen.avatar_sz_large);
+    }
+
     private String constructGravatarUrl(Context context, AccountModel account) {
-        int avatarSz = context.getResources().getDimensionPixelSize(R.dimen.avatar_sz_large);
-        return GravatarUtils.fixGravatarUrl(account.getAvatarUrl(), avatarSz);
+        return GravatarUtils.fixGravatarUrl(account.getAvatarUrl(), getAvatarSize(context));
+    }
+
+    private String constructGravatarUrl(Context context, SiteModel site) {
+        return GravatarUtils.gravatarFromEmail(site.getEmail(), getAvatarSize(context));
     }
 }

From 215d86ce7e6e7f52229b15cda2db4fa5cb47835b Mon Sep 17 00:00:00 2001
From: Renan Ferrari <renan.fb@gmail.com>
Date: Tue, 26 May 2020 12:44:37 -0300
Subject: [PATCH 15/17] Reintroduce shared layout components for the epilogue
 screen

---
 .../ui/ShareIntentReceiverFragment.java       |  2 +-
 .../accounts/login/LoginHeaderViewHolder.java |  8 +--
 .../signup/SignupEpilogueFragment.java        | 10 ++--
 .../main/res/layout/login_epilogue_header.xml | 35 +-----------
 .../layout/login_include_epilogue_header.xml  | 56 +++++++++++++++++++
 ...login_include_epilogue_sites_subheader.xml |  9 +++
 .../layout/share_intent_receiver_header.xml   | 11 ++--
 .../src/main/res/layout/signup_epilogue.xml   | 47 +---------------
 8 files changed, 83 insertions(+), 95 deletions(-)
 create mode 100644 WordPress/src/main/res/layout/login_include_epilogue_header.xml
 create mode 100644 WordPress/src/main/res/layout/login_include_epilogue_sites_subheader.xml

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 05079f31388a..2f118bbde556 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverFragment.java
@@ -200,7 +200,7 @@ static class HeaderViewHolder extends RecyclerView.ViewHolder {
 
         HeaderViewHolder(View view) {
             super(view);
-            mHeaderTextView = view.findViewById(R.id.header_text_view);
+            mHeaderTextView = view.findViewById(R.id.login_epilogue_header_sites_subheader);
         }
 
         void bindText(String text) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginHeaderViewHolder.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginHeaderViewHolder.java
index 300a7a2b0982..567b2760336a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginHeaderViewHolder.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginHeaderViewHolder.java
@@ -28,10 +28,10 @@ class LoginHeaderViewHolder extends RecyclerView.ViewHolder {
 
     LoginHeaderViewHolder(View view) {
         super(view);
-        mAvatarImageView = view.findViewById(R.id.avatar);
-        mDisplayNameTextView = view.findViewById(R.id.display_name);
-        mUsernameTextView = view.findViewById(R.id.username);
-        mMySitesHeadingTextView = view.findViewById(R.id.my_sites_heading);
+        mAvatarImageView = view.findViewById(R.id.login_epilogue_header_avatar);
+        mDisplayNameTextView = view.findViewById(R.id.login_epilogue_header_title);
+        mUsernameTextView = view.findViewById(R.id.login_epilogue_header_subtitle);
+        mMySitesHeadingTextView = view.findViewById(R.id.login_epilogue_header_sites_subheader);
     }
 
     void updateLoggedInAsHeading(Context context, ImageManager imageManager, AccountModel account) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java
index af4a2ab141c9..86f1fe5dd758 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java
@@ -170,7 +170,7 @@ protected ViewGroup createMainView(LayoutInflater inflater, ViewGroup container,
 
     @Override
     protected void setupContent(ViewGroup rootView) {
-        final FrameLayout headerAvatarLayout = rootView.findViewById(R.id.signup_epilogue_header_avatar_layout);
+        final FrameLayout headerAvatarLayout = rootView.findViewById(R.id.login_epilogue_header_avatar_layout);
         headerAvatarLayout.setEnabled(mIsEmailSignup);
         headerAvatarLayout.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -189,12 +189,12 @@ public boolean onLongClick(View view) {
             }
         });
         ViewUtilsKt.redirectContextClickToLongPressListener(headerAvatarLayout);
-        mHeaderAvatarAdd = rootView.findViewById(R.id.signup_epilogue_header_avatar_add);
+        mHeaderAvatarAdd = rootView.findViewById(R.id.login_epilogue_header_avatar_add);
         mHeaderAvatarAdd.setVisibility(mIsEmailSignup ? View.VISIBLE : View.GONE);
-        mHeaderAvatar = rootView.findViewById(R.id.signup_epilogue_header_avatar);
-        mHeaderDisplayName = rootView.findViewById(R.id.signup_epilogue_header_display);
+        mHeaderAvatar = rootView.findViewById(R.id.login_epilogue_header_avatar);
+        mHeaderDisplayName = rootView.findViewById(R.id.login_epilogue_header_title);
         mHeaderDisplayName.setText(mDisplayName);
-        mHeaderEmailAddress = rootView.findViewById(R.id.signup_epilogue_header_email);
+        mHeaderEmailAddress = rootView.findViewById(R.id.login_epilogue_header_subtitle);
         mHeaderEmailAddress.setText(mEmailAddress);
         WPLoginInputRow inputDisplayName = rootView.findViewById(R.id.signup_epilogue_input_display);
         mEditTextDisplayName = inputDisplayName.getEditText();
diff --git a/WordPress/src/main/res/layout/login_epilogue_header.xml b/WordPress/src/main/res/layout/login_epilogue_header.xml
index 63dd15cfa2c0..20f738532c31 100644
--- a/WordPress/src/main/res/layout/login_epilogue_header.xml
+++ b/WordPress/src/main/res/layout/login_epilogue_header.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/header"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -9,37 +7,8 @@
     android:paddingStart="@dimen/margin_extra_large"
     android:paddingTop="@dimen/margin_extra_large">
 
-    <ImageView
-        android:id="@+id/avatar"
-        android:layout_width="@dimen/avatar_sz_login_epilogue"
-        android:layout_height="@dimen/avatar_sz_login_epilogue"
-        android:importantForAccessibility="no"
-        android:src="@drawable/ic_user_circle_no_padding_grey_24dp" />
+    <include layout="@layout/login_include_epilogue_header" />
 
-    <org.wordpress.android.widgets.WPTextView
-        android:id="@+id/display_name"
-        style="@style/LoginTheme.Headline"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_extra_large"
-        tools:text="Pamela Nguyen" />
+    <include layout="@layout/login_include_epilogue_sites_subheader" />
 
-    <org.wordpress.android.widgets.WPTextView
-        android:id="@+id/username"
-        style="@style/LoginTheme.Username"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_small"
-        android:layout_marginBottom="@dimen/margin_medium"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        tools:text="pamelanguyen" />
-
-    <TextView
-        android:id="@+id/my_sites_heading"
-        style="@style/LoginTheme.Heading"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="@dimen/margin_extra_large"
-        android:text="@string/login_epilogue_mysites_other" />
 </LinearLayout>
diff --git a/WordPress/src/main/res/layout/login_include_epilogue_header.xml b/WordPress/src/main/res/layout/login_include_epilogue_header.xml
new file mode 100644
index 000000000000..6ca8004c1f93
--- /dev/null
+++ b/WordPress/src/main/res/layout/login_include_epilogue_header.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:id="@+id/login_epilogue_header_avatar_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:clickable="false"
+        android:contentDescription="@string/content_description_add_avatar"
+        android:enabled="false"
+        android:focusable="true">
+
+        <ImageView
+            android:id="@+id/login_epilogue_header_avatar"
+            android:layout_width="@dimen/avatar_sz_login_epilogue"
+            android:layout_height="@dimen/avatar_sz_login_epilogue"
+            android:importantForAccessibility="no"
+            android:src="@drawable/ic_user_circle_no_padding_grey_24dp" />
+
+        <ImageView
+            android:id="@+id/login_epilogue_header_avatar_add"
+            android:layout_width="@dimen/add_avatar_button_size"
+            android:layout_height="@dimen/add_avatar_button_size"
+            android:layout_gravity="top|end"
+            android:background="@drawable/bg_oval_surface"
+            android:importantForAccessibility="no"
+            android:src="@drawable/ic_add_white_24dp"
+            android:visibility="gone"
+            app:tint="?attr/colorPrimary"
+            tools:visibility="visible" />
+    </FrameLayout>
+
+    <org.wordpress.android.widgets.WPTextView
+        android:id="@+id/login_epilogue_header_title"
+        style="@style/LoginTheme.Headline"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_extra_large"
+        tools:text="Pamela Nguyen" />
+
+    <org.wordpress.android.widgets.WPTextView
+        android:id="@+id/login_epilogue_header_subtitle"
+        style="@style/LoginTheme.Username"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_small"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        tools:text="pamelanguyen@gmail.com" />
+</LinearLayout>
diff --git a/WordPress/src/main/res/layout/login_include_epilogue_sites_subheader.xml b/WordPress/src/main/res/layout/login_include_epilogue_sites_subheader.xml
new file mode 100644
index 000000000000..7904b6edf26f
--- /dev/null
+++ b/WordPress/src/main/res/layout/login_include_epilogue_sites_subheader.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/login_epilogue_header_sites_subheader"
+    style="@style/LoginTheme.Heading"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="@dimen/margin_extra_large"
+    tools:text="@string/login_epilogue_mysites_other" />
diff --git a/WordPress/src/main/res/layout/share_intent_receiver_header.xml b/WordPress/src/main/res/layout/share_intent_receiver_header.xml
index 93a0c63a2fe3..3ebe33835e5d 100644
--- a/WordPress/src/main/res/layout/share_intent_receiver_header.xml
+++ b/WordPress/src/main/res/layout/share_intent_receiver_header.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/header_text_view"
-    style="@style/LoginTheme.Heading"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingEnd="@dimen/margin_extra_large"
-    android:paddingStart="@dimen/margin_extra_large"
-    android:paddingTop="@dimen/margin_extra_large"
-    android:text="@string/share_intent_pick_site" />
+    android:paddingStart="@dimen/margin_extra_large">
+
+    <include layout="@layout/login_include_epilogue_sites_subheader" />
+</FrameLayout>
diff --git a/WordPress/src/main/res/layout/signup_epilogue.xml b/WordPress/src/main/res/layout/signup_epilogue.xml
index 5ae4750cd5b2..9d4edad28620 100644
--- a/WordPress/src/main/res/layout/signup_epilogue.xml
+++ b/WordPress/src/main/res/layout/signup_epilogue.xml
@@ -23,52 +23,7 @@
                 android:orientation="vertical"
                 android:padding="@dimen/margin_extra_large">
 
-                <FrameLayout
-                    android:id="@+id/signup_epilogue_header_avatar_layout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="?attr/selectableItemBackgroundBorderless"
-                    android:clickable="true"
-                    android:contentDescription="@string/content_description_add_avatar"
-                    android:focusable="true">
-
-                    <ImageView
-                        android:id="@+id/signup_epilogue_header_avatar"
-                        android:layout_width="@dimen/avatar_sz_login_epilogue"
-                        android:layout_height="@dimen/avatar_sz_login_epilogue"
-                        android:importantForAccessibility="no"
-                        android:src="@drawable/ic_user_circle_no_padding_grey_24dp" />
-
-                    <ImageView
-                        android:id="@+id/signup_epilogue_header_avatar_add"
-                        android:layout_width="@dimen/add_avatar_button_size"
-                        android:layout_height="@dimen/add_avatar_button_size"
-                        android:layout_gravity="top|end"
-                        android:background="@drawable/bg_oval_surface"
-                        android:importantForAccessibility="no"
-                        android:src="@drawable/ic_add_white_24dp"
-                        android:visibility="gone"
-                        app:tint="?attr/colorPrimary"
-                        tools:visibility="visible" />
-                </FrameLayout>
-
-                <org.wordpress.android.widgets.WPTextView
-                    android:id="@+id/signup_epilogue_header_display"
-                    style="@style/LoginTheme.Headline"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/margin_extra_large"
-                    tools:text="Pamela Nguyen" />
-
-                <org.wordpress.android.widgets.WPTextView
-                    android:id="@+id/signup_epilogue_header_email"
-                    style="@style/LoginTheme.Username"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/margin_small"
-                    android:focusable="true"
-                    android:focusableInTouchMode="true"
-                    tools:text="pamelanguyen@gmail.com" />
+                <include layout="@layout/login_include_epilogue_header" />
 
                 <org.wordpress.android.login.widgets.WPLoginInputRow
                     android:id="@+id/signup_epilogue_input_display"

From d137f2d587855c2449e4d58178ab66c92ccb0def Mon Sep 17 00:00:00 2001
From: Renan Ferrari <renan.fb@gmail.com>
Date: Tue, 26 May 2020 13:26:25 -0300
Subject: [PATCH 16/17] Update epilogue header margins

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

diff --git a/WordPress/src/main/res/layout/login_include_epilogue_header.xml b/WordPress/src/main/res/layout/login_include_epilogue_header.xml
index 6ca8004c1f93..045879ff07b6 100644
--- a/WordPress/src/main/res/layout/login_include_epilogue_header.xml
+++ b/WordPress/src/main/res/layout/login_include_epilogue_header.xml
@@ -41,7 +41,7 @@
         style="@style/LoginTheme.Headline"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_extra_large"
+        android:layout_marginTop="@dimen/margin_large"
         tools:text="Pamela Nguyen" />
 
     <org.wordpress.android.widgets.WPTextView
@@ -49,7 +49,7 @@
         style="@style/LoginTheme.Username"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_small"
+        android:layout_marginTop="@dimen/margin_extra_small"
         android:focusable="true"
         android:focusableInTouchMode="true"
         tools:text="pamelanguyen@gmail.com" />

From ee4040dd7f24b7f9b51f9ecf3d5e835dd882cf51 Mon Sep 17 00:00:00 2001
From: Renan Ferrari <renan.fb@gmail.com>
Date: Tue, 16 Jun 2020 18:00:02 -0300
Subject: [PATCH 17/17] Update layout to use dimens resource

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

diff --git a/WordPress/src/main/res/layout/login_epilogue_footer.xml b/WordPress/src/main/res/layout/login_epilogue_footer.xml
index f968bbea9956..dd5e88d98ed5 100644
--- a/WordPress/src/main/res/layout/login_epilogue_footer.xml
+++ b/WordPress/src/main/res/layout/login_epilogue_footer.xml
@@ -10,8 +10,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginEnd="16dp"
-        android:layout_marginStart="16dp"
+        android:layout_marginEnd="@dimen/margin_extra_large"
+        android:layout_marginStart="@dimen/margin_extra_large"
         android:textAppearance="?textAppearanceBody2"
         android:textColor="?colorPrimary"
         tools:text="@string/connect_site" />