From df948179d85cdc5ae6591bfc5de61fa7537afa12 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Wed, 7 Apr 2021 14:00:22 -0300
Subject: [PATCH] Wrap add_money layout in ScrollView.

---
 .../layout/payments_add_money_fragment.xml    | 148 +++++++++---------
 1 file changed, 77 insertions(+), 71 deletions(-)

diff --git a/app/src/main/res/layout/payments_add_money_fragment.xml b/app/src/main/res/layout/payments_add_money_fragment.xml
index 73074f0e5c..be33706e93 100644
--- a/app/src/main/res/layout/payments_add_money_fragment.xml
+++ b/app/src/main/res/layout/payments_add_money_fragment.xml
@@ -1,86 +1,92 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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:fillViewport="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/payments_add_money_toolbar"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
-        app:title="@string/PaymentsAddMoneyFragment__add_funds"
-        app:titleTextAppearance="@style/TextAppearance.Signal.Body1.Bold" />
+        android:layout_height="wrap_content">
 
-    <LinearLayout
-        android:id="@+id/payments_add_money_qr_border"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="48dp"
-        android:layout_marginTop="32dp"
-        android:layout_marginEnd="48dp"
-        android:background="@drawable/payments_add_money_qr_border"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:padding="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/payments_add_money_toolbar">
-
-        <org.thoughtcrime.securesms.components.qr.QrView
-            android:id="@+id/payments_add_money_qr_image"
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/payments_add_money_toolbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:scaleType="fitXY"
-            app:qr_background_color="@color/white"
-            app:qr_foreground_color="@color/black" />
+            android:layout_height="?attr/actionBarSize"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:navigationIcon="@drawable/ic_arrow_left_24"
+            app:title="@string/PaymentsAddMoneyFragment__add_funds"
+            app:titleTextAppearance="@style/TextAppearance.Signal.Body1.Bold" />
 
-        <TextView
-            android:id="@+id/payments_add_money_your_wallet_address"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:id="@+id/payments_add_money_qr_border"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text="@string/PaymentsAddMoneyFragment__your_wallet_address"
-            android:textAppearance="@style/TextAppearance.Signal.Body2.Bold"
-            android:textColor="@color/signal_text_primary" />
+            android:layout_marginStart="48dp"
+            android:layout_marginTop="32dp"
+            android:layout_marginEnd="48dp"
+            android:background="@drawable/payments_add_money_qr_border"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:padding="16dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/payments_add_money_toolbar">
 
-        <TextView
-            android:id="@+id/payments_add_money_abbreviated_wallet_address"
-            android:layout_width="wrap_content"
+            <org.thoughtcrime.securesms.components.qr.QrView
+                android:id="@+id/payments_add_money_qr_image"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:scaleType="fitXY"
+                app:qr_background_color="@color/white"
+                app:qr_foreground_color="@color/black" />
+
+            <TextView
+                android:id="@+id/payments_add_money_your_wallet_address"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/PaymentsAddMoneyFragment__your_wallet_address"
+                android:textAppearance="@style/TextAppearance.Signal.Body2.Bold"
+                android:textColor="@color/signal_text_primary" />
+
+            <TextView
+                android:id="@+id/payments_add_money_abbreviated_wallet_address"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:textAppearance="@style/TextAppearance.Signal.Mono"
+                android:textColor="@color/signal_text_secondary"
+                tools:text="2sZNt8dF...AxD345i2" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/payments_add_money_copy_address_button"
+                style="@style/Signal.Widget.Button.Small.Primary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/PaymentsAddMoneyFragment__copy" />
+
+        </LinearLayout>
+
+        <org.thoughtcrime.securesms.util.views.LearnMoreTextView
+            android:id="@+id/payments_add_money_info"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:textAppearance="@style/TextAppearance.Signal.Mono"
+            android:layout_marginStart="64dp"
+            android:layout_marginTop="32dp"
+            android:layout_marginEnd="64dp"
+            android:lineSpacingExtra="6sp"
+            android:text="@string/PaymentsAddMoneyFragment__to_add_funds"
+            android:textAlignment="center"
+            android:textAppearance="@style/TextAppearance.Signal.Body2"
             android:textColor="@color/signal_text_secondary"
-            tools:text="2sZNt8dF...AxD345i2" />
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/payments_add_money_qr_border" />
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/payments_add_money_copy_address_button"
-            style="@style/Signal.Widget.Button.Small.Primary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="@string/PaymentsAddMoneyFragment__copy" />
-
-    </LinearLayout>
-
-    <org.thoughtcrime.securesms.util.views.LearnMoreTextView
-        android:id="@+id/payments_add_money_info"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="64dp"
-        android:layout_marginTop="32dp"
-        android:layout_marginEnd="64dp"
-        android:lineSpacingExtra="6sp"
-        android:text="@string/PaymentsAddMoneyFragment__to_add_funds"
-        android:textAlignment="center"
-        android:textAppearance="@style/TextAppearance.Signal.Body2"
-        android:textColor="@color/signal_text_secondary"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/payments_add_money_qr_border" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
\ No newline at end of file