From 5c9f9bc714a1d5e8b634db23111150469176891a Mon Sep 17 00:00:00 2001
From: Renan Lukas <14964993+RenanLukas@users.noreply.github.com>
Date: Fri, 17 May 2024 15:05:20 -0300
Subject: [PATCH] Fix scrolling of reader announcement card

---
 .../views/compose/ReaderAnnouncementCard.kt   |  8 +--
 .../res/layout/reader_fragment_layout.xml     | 55 ++++++++++++-------
 2 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/compose/ReaderAnnouncementCard.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/compose/ReaderAnnouncementCard.kt
index 6ae5bcac59df..e2e0c9c0a74c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/compose/ReaderAnnouncementCard.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/compose/ReaderAnnouncementCard.kt
@@ -37,7 +37,9 @@ fun ReaderAnnouncementCard(
     items: List<ReaderAnnouncementCardItemData>
 ) {
     Column(
-        modifier = Modifier.fillMaxWidth(),
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(Margin.ExtraLarge.value),
         verticalArrangement = Arrangement.spacedBy(Margin.ExtraLarge.value),
     ) {
         // Title
@@ -61,9 +63,6 @@ fun ReaderAnnouncementCard(
         // Done button
         Button(
             modifier = Modifier
-                .padding(
-                    horizontal = Margin.Large.value,
-                )
                 .fillMaxWidth(),
             onClick = { },
             elevation = ButtonDefaults.elevation(0.dp),
@@ -145,7 +144,6 @@ fun ReaderTagsFeedPostListItemPreview() {
         Box(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(16.dp)
         ) {
             ReaderAnnouncementCard(
                 items = listOf(
diff --git a/WordPress/src/main/res/layout/reader_fragment_layout.xml b/WordPress/src/main/res/layout/reader_fragment_layout.xml
index 6d5eef001958..081157fd6aa8 100644
--- a/WordPress/src/main/res/layout/reader_fragment_layout.xml
+++ b/WordPress/src/main/res/layout/reader_fragment_layout.xml
@@ -18,30 +18,45 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="match_parent"
+        android:paddingBottom="56dp"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <FrameLayout
+            android:id="@+id/container"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/reader_announcement_card_compose_view" />
 
         <androidx.compose.ui.platform.ComposeView
             android:id="@+id/reader_announcement_card_compose_view"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            app:layout_scrollFlags="scroll|enterAlways" />
-
-    </LinearLayout>
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <FrameLayout
+            android:id="@+id/interests_fragment_container"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <include
+            android:id="@+id/jetpack_banner"
+            layout="@layout/jetpack_banner"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <FrameLayout
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
-
-    <include
-        android:id="@+id/jetpack_banner"
-        layout="@layout/jetpack_banner" />
-
-    <FrameLayout
-        android:id="@+id/interests_fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>