From 6e1621fef14c6e7ae42deac4ebe45957be5630d1 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 2 Aug 2021 10:26:51 -0300
Subject: [PATCH] Allow content of basic megaphones to scroll.

Fixes #11507
---
 .../main/res/layout/basic_megaphone_view.xml  | 142 +++++++++---------
 1 file changed, 74 insertions(+), 68 deletions(-)

diff --git a/app/src/main/res/layout/basic_megaphone_view.xml b/app/src/main/res/layout/basic_megaphone_view.xml
index 6b2a002232..b34fc5aef6 100644
--- a/app/src/main/res/layout/basic_megaphone_view.xml
+++ b/app/src/main/res/layout/basic_megaphone_view.xml
@@ -18,82 +18,88 @@
       app:cardUseCompatPadding="true"
       app:contentPadding="0dp">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:clickable="true"
-        android:paddingStart="8dp"
-        android:paddingTop="16dp"
-        android:paddingEnd="8dp"
-        android:paddingBottom="8dp">
+        android:layout_height="wrap_content">
 
-      <com.airbnb.lottie.LottieAnimationView
-          android:id="@+id/basic_megaphone_image"
-          android:layout_width="64dp"
-          android:layout_height="64dp"
-          android:layout_marginStart="8dp"
-          android:scaleType="centerInside"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toTopOf="parent"
-          tools:src="@tools:sample/avatars" />
-
-      <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-          android:id="@+id/basic_megaphone_title"
-          style="@style/Signal.Text.Body"
-          android:layout_width="0dp"
+      <androidx.constraintlayout.widget.ConstraintLayout
+          android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:layout_marginStart="12dp"
-          android:layout_marginEnd="8dp"
-          android:fontFamily="sans-serif-medium"
-          app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintStart_toEndOf="@id/basic_megaphone_image"
-          app:layout_constraintTop_toTopOf="@id/basic_megaphone_image"
-          tools:text="Avengers HQ Destroyed!" />
+          android:clickable="true"
+          android:paddingStart="8dp"
+          android:paddingTop="16dp"
+          android:paddingEnd="8dp"
+          android:paddingBottom="8dp">
 
-      <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-          android:id="@+id/basic_megaphone_body"
-          style="@style/Signal.Text.Preview"
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:layout_marginEnd="8dp"
-          android:textColor="@color/megaphone_body_text_color"
-          app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintStart_toStartOf="@id/basic_megaphone_title"
-          app:layout_constraintTop_toBottomOf="@id/basic_megaphone_title"
-          tools:text="Where was the 'hero' Spider-Man during the battle?" />
+        <com.airbnb.lottie.LottieAnimationView
+            android:id="@+id/basic_megaphone_image"
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:layout_marginStart="8dp"
+            android:scaleType="centerInside"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:src="@tools:sample/avatars" />
 
-      <androidx.constraintlayout.widget.Barrier
-          android:id="@+id/basic_megaphone_content_barrier"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          app:barrierDirection="bottom"
-          app:constraint_referenced_ids="basic_megaphone_image,basic_megaphone_body,basic_megaphone_title" />
+        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+            android:id="@+id/basic_megaphone_title"
+            style="@style/Signal.Text.Body"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="8dp"
+            android:fontFamily="sans-serif-medium"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/basic_megaphone_image"
+            app:layout_constraintTop_toTopOf="@id/basic_megaphone_image"
+            tools:text="Avengers HQ Destroyed!" />
 
-      <Button
-          android:id="@+id/basic_megaphone_action"
-          style="@style/Button.Borderless"
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:layout_marginTop="4dp"
-          app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintStart_toEndOf="@id/basic_megaphone_secondary"
-          app:layout_constraintTop_toBottomOf="@id/basic_megaphone_content_barrier"
-          tools:text="*sigh*"
-          tools:visibility="visible" />
+        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+            android:id="@+id/basic_megaphone_body"
+            style="@style/Signal.Text.Preview"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:textColor="@color/megaphone_body_text_color"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@id/basic_megaphone_title"
+            app:layout_constraintTop_toBottomOf="@id/basic_megaphone_title"
+            tools:text="Where was the 'hero' Spider-Man during the battle?" />
 
-      <Button
-          android:id="@+id/basic_megaphone_secondary"
-          style="@style/Button.Borderless"
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:layout_marginTop="4dp"
-          android:text="@string/Megaphones_remind_me_later"
-          app:layout_constraintEnd_toStartOf="@id/basic_megaphone_action"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toBottomOf="@id/basic_megaphone_content_barrier"
-          tools:visibility="visible" />
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/basic_megaphone_content_barrier"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:barrierDirection="bottom"
+            app:constraint_referenced_ids="basic_megaphone_image,basic_megaphone_body,basic_megaphone_title" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+        <Button
+            android:id="@+id/basic_megaphone_action"
+            style="@style/Button.Borderless"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/basic_megaphone_secondary"
+            app:layout_constraintTop_toBottomOf="@id/basic_megaphone_content_barrier"
+            tools:text="*sigh*"
+            tools:visibility="visible" />
+
+        <Button
+            android:id="@+id/basic_megaphone_secondary"
+            style="@style/Button.Borderless"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:text="@string/Megaphones_remind_me_later"
+            app:layout_constraintEnd_toStartOf="@id/basic_megaphone_action"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/basic_megaphone_content_barrier"
+            tools:visibility="visible" />
+
+      </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </ScrollView>
 
   </androidx.cardview.widget.CardView>