From e6cef687c1a6cb1d424964e60468a7c65ae727c0 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Mon, 21 Nov 2022 15:52:19 +0100
Subject: [PATCH 1/4] Make content of jetpack overlay scrollable on portrait

---
 .../layout/jetpack_powered_bottom_sheet.xml   | 122 ++++++++++--------
 1 file changed, 70 insertions(+), 52 deletions(-)

diff --git a/WordPress/src/main/res/layout/jetpack_powered_bottom_sheet.xml b/WordPress/src/main/res/layout/jetpack_powered_bottom_sheet.xml
index 03e63488d1aa..c545588897a4 100644
--- a/WordPress/src/main/res/layout/jetpack_powered_bottom_sheet.xml
+++ b/WordPress/src/main/res/layout/jetpack_powered_bottom_sheet.xml
@@ -4,8 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="@dimen/margin_extra_extra_medium_large"
-    android:paddingEnd="@dimen/margin_extra_extra_medium_large"
     android:background="@color/jetpack_powered_bottom_sheet_background">
 
     <include
@@ -18,60 +16,80 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <com.airbnb.lottie.LottieAnimationView
-        android:id="@+id/illustration_view"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_64dp"
-        android:scaleType="centerCrop"
+        android:orientation="vertical"
         app:layout_constraintTop_toBottomOf="@id/handle"
-        app:layout_constraintStart_toStartOf="parent"
-        app:lottie_rawRes="@raw/wp2jp_left"
-        app:lottie_enableMergePathsForKitKatAndAbove="true"
-        app:lottie_autoPlay="true"
-        app:lottie_loop="false" />
+        app:layout_constraintBottom_toBottomOf="parent">
 
-    <TextView
-        android:id="@+id/title"
-        style="@style/TextAppearance.Material3.HeadlineMedium"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_extra_medium_large"
-        android:text="@string/wp_jetpack_powered_better_with_jetpack"
-        android:textSize="@dimen/m3_sys_typescale_headline_large_text_size"
-        android:textFontWeight="700"
-        app:layout_constraintTop_toBottomOf="@id/illustration_view"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        tools:targetApi="p" />
+        <ScrollView
+            android:id="@+id/scroll_view"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
 
-    <TextView
-        android:id="@+id/caption"
-        style="?attr/textAppearanceBody1"
-        android:text="@string/wp_jetpack_powered_features"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_extra_medium_large"
-        app:layout_constraintTop_toBottomOf="@id/title"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingStart="@dimen/margin_extra_extra_medium_large"
+                android:paddingEnd="@dimen/margin_extra_extra_medium_large"
+                android:paddingBottom="@dimen/jetpack_banner_height">
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/primary_button"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/jetpack_banner_height"
-        android:layout_marginBottom="@dimen/margin_64dp"
-        android:backgroundTint="@color/jetpack_green_40"
-        android:gravity="center"
-        android:minHeight="@dimen/margin_64dp"
-        app:cornerRadius="@dimen/margin_small_medium"
-        android:text="@string/wp_jetpack_get_new_jetpack_app"
-        android:textAppearance="?attr/textAppearanceSubtitle2"
-        android:textColor="?attr/colorOnSecondary"
-        app:layout_constraintTop_toBottomOf="@id/caption"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+                <com.airbnb.lottie.LottieAnimationView
+                    android:id="@+id/illustration_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_64dp"
+                    android:scaleType="centerCrop"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:lottie_rawRes="@raw/wp2jp_left"
+                    app:lottie_enableMergePathsForKitKatAndAbove="true"
+                    app:lottie_autoPlay="true"
+                    app:lottie_loop="false" />
+
+                <TextView
+                    android:id="@+id/title"
+                    style="@style/TextAppearance.Material3.HeadlineMedium"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_extra_medium_large"
+                    android:text="@string/wp_jetpack_powered_better_with_jetpack"
+                    android:textSize="@dimen/m3_sys_typescale_headline_large_text_size"
+                    android:textFontWeight="700"
+                    app:layout_constraintTop_toBottomOf="@id/illustration_view"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    tools:targetApi="p" />
+
+                <TextView
+                    android:id="@+id/caption"
+                    style="?attr/textAppearanceBody1"
+                    android:text="@string/wp_jetpack_powered_features"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_extra_medium_large"
+                    app:layout_constraintTop_toBottomOf="@id/title"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"/>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </ScrollView>
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/primary_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_extra_extra_medium_large"
+            android:layout_marginEnd="@dimen/margin_extra_extra_medium_large"
+            android:layout_marginBottom="@dimen/margin_64dp"
+            android:backgroundTint="@color/jetpack_green_40"
+            android:gravity="center"
+            android:minHeight="@dimen/margin_64dp"
+            app:cornerRadius="@dimen/margin_small_medium"
+            android:text="@string/wp_jetpack_get_new_jetpack_app"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
+            android:textColor="?attr/colorOnSecondary"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+    </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>

From b45f682d2cf0d23e21a0eb6c5166f6a19d58c496 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Mon, 21 Nov 2022 15:52:57 +0100
Subject: [PATCH 2/4] Make content of jetpack overlay scrollable on landscape

---
 .../jetpack_powered_bottom_sheet.xml          | 120 ++++++++++--------
 1 file changed, 69 insertions(+), 51 deletions(-)

diff --git a/WordPress/src/main/res/layout-land/jetpack_powered_bottom_sheet.xml b/WordPress/src/main/res/layout-land/jetpack_powered_bottom_sheet.xml
index efcaf3315e12..b221c4622fa1 100644
--- a/WordPress/src/main/res/layout-land/jetpack_powered_bottom_sheet.xml
+++ b/WordPress/src/main/res/layout-land/jetpack_powered_bottom_sheet.xml
@@ -4,8 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="@dimen/margin_extra_extra_medium_large"
-    android:paddingEnd="@dimen/margin_extra_extra_medium_large"
     android:background="@color/jetpack_powered_bottom_sheet_background">
 
     <include
@@ -18,59 +16,79 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <com.airbnb.lottie.LottieAnimationView
-        android:id="@+id/illustration_view"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_extra_extra_medium_large"
-        android:scaleType="centerCrop"
+        android:orientation="vertical"
         app:layout_constraintTop_toBottomOf="@id/handle"
-        app:layout_constraintStart_toStartOf="parent"
-        app:lottie_rawRes="@raw/wp2jp_left"
-        app:lottie_enableMergePathsForKitKatAndAbove="true"
-        app:lottie_autoPlay="true"
-        app:lottie_loop="false" />
+        app:layout_constraintBottom_toBottomOf="parent">
 
-    <TextView
-        android:id="@+id/title"
-        style="@style/TextAppearance.Material3.HeadlineMedium"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_extra_medium_large"
-        android:text="@string/wp_jetpack_powered_better_with_jetpack"
-        android:textFontWeight="700"
-        app:layout_constraintTop_toBottomOf="@id/illustration_view"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        tools:targetApi="p" />
+        <ScrollView
+            android:id="@+id/scroll_view"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
 
-    <TextView
-        android:id="@+id/caption"
-        style="?attr/textAppearanceBody1"
-        android:text="@string/wp_jetpack_powered_features"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_extra_medium_large"
-        app:layout_constraintTop_toBottomOf="@id/title"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingStart="@dimen/margin_extra_extra_medium_large"
+                android:paddingEnd="@dimen/margin_extra_extra_medium_large"
+                android:paddingBottom="@dimen/margin_extra_extra_large">
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/primary_button"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_extra_extra_large"
-        android:layout_marginBottom="@dimen/margin_64dp"
-        android:backgroundTint="@color/jetpack_green_40"
-        android:gravity="center"
-        android:minHeight="@dimen/margin_64dp"
-        app:cornerRadius="@dimen/margin_small_medium"
-        android:text="@string/wp_jetpack_get_new_jetpack_app"
-        android:textAppearance="?attr/textAppearanceSubtitle2"
-        android:textColor="?attr/colorOnSecondary"
-        app:layout_constraintTop_toBottomOf="@id/caption"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+                <com.airbnb.lottie.LottieAnimationView
+                    android:id="@+id/illustration_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_extra_extra_medium_large"
+                    android:scaleType="centerCrop"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:lottie_rawRes="@raw/wp2jp_left"
+                    app:lottie_enableMergePathsForKitKatAndAbove="true"
+                    app:lottie_autoPlay="true"
+                    app:lottie_loop="false" />
+
+                <TextView
+                    android:id="@+id/title"
+                    style="@style/TextAppearance.Material3.HeadlineMedium"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_extra_medium_large"
+                    android:text="@string/wp_jetpack_powered_better_with_jetpack"
+                    android:textFontWeight="700"
+                    app:layout_constraintTop_toBottomOf="@id/illustration_view"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    tools:targetApi="p" />
+
+                <TextView
+                    android:id="@+id/caption"
+                    style="?attr/textAppearanceBody1"
+                    android:text="@string/wp_jetpack_powered_features"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_extra_medium_large"
+                    app:layout_constraintTop_toBottomOf="@id/title"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"/>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </ScrollView>
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/primary_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_extra_extra_medium_large"
+            android:layout_marginEnd="@dimen/margin_extra_extra_medium_large"
+            android:layout_marginBottom="@dimen/margin_64dp"
+            android:backgroundTint="@color/jetpack_green_40"
+            android:gravity="center"
+            android:minHeight="@dimen/margin_64dp"
+            app:cornerRadius="@dimen/margin_small_medium"
+            android:text="@string/wp_jetpack_get_new_jetpack_app"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
+            android:textColor="?attr/colorOnSecondary"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+    </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>

From a943add5ded4a29cc89c502fd657fea3fa263139 Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Mon, 21 Nov 2022 19:00:48 +0100
Subject: [PATCH 3/4] Add release notes for #17503

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

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index dd565d9854f8..f0fed4169e58 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -3,6 +3,7 @@
 21.3
 -----
 * [*] [Jetpack-only] Comments: fix a crash in My Site > Comments with Jetpack standalone plugins. [https://github.com/wordpress-mobile/WordPress-Android/pull/17456]
+* [*] [internal] Fix an issue preventing the text and button on the 'WordPress is Better with Jetpack' overlay to be entirely visible with big fonts. [https://github.com/wordpress-mobile/WordPress-Android/pull/17503]
 
 21.2
 -----

From 8ff221676b628abd5ea73b523709f1aef8891edc Mon Sep 17 00:00:00 2001
From: Ovi Trif <octrif@gmail.com>
Date: Tue, 22 Nov 2022 12:28:20 +0100
Subject: [PATCH 4/4] Use 32dp bottom margin for button in landscape

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

diff --git a/WordPress/src/main/res/layout-land/jetpack_powered_bottom_sheet.xml b/WordPress/src/main/res/layout-land/jetpack_powered_bottom_sheet.xml
index b221c4622fa1..128543dbe04a 100644
--- a/WordPress/src/main/res/layout-land/jetpack_powered_bottom_sheet.xml
+++ b/WordPress/src/main/res/layout-land/jetpack_powered_bottom_sheet.xml
@@ -81,7 +81,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/margin_extra_extra_medium_large"
             android:layout_marginEnd="@dimen/margin_extra_extra_medium_large"
-            android:layout_marginBottom="@dimen/margin_64dp"
+            android:layout_marginBottom="@dimen/margin_extra_extra_medium_large"
             android:backgroundTint="@color/jetpack_green_40"
             android:gravity="center"
             android:minHeight="@dimen/margin_64dp"