From 82a46572d993a638acab68b37661cfab4ae475fa Mon Sep 17 00:00:00 2001
From: parneet-guraya <gurayaparneet@gmail.com>
Date: Thu, 29 Feb 2024 17:08:45 +0530
Subject: [PATCH] wrap inside scroll view

Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
---
 .../com/nextcloud/talk/chat/ChatActivity.kt   |   2 +-
 .../dialog/FileAttachmentPreviewFragment.kt   |   6 +-
 .../layout/dialog_file_attachment_preview.xml | 146 +++++++++---------
 3 files changed, 78 insertions(+), 76 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
index 92dd22c1c..77ec8f886 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -4385,7 +4385,7 @@ class ChatActivity :
             val lon = data["longitude"]!!
             metaData =
                 "{\"type\":\"geo-location\",\"id\":\"geo:$lat,$lon\",\"latitude\":\"$lat\"," +
-                    "\"longitude\":\"$lon\",\"name\":\"$name\"}"
+                "\"longitude\":\"$lon\",\"name\":\"$name\"}"
         }
 
         when (type) {
diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/FileAttachmentPreviewFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/FileAttachmentPreviewFragment.kt
index e01db5379..9c53b81e5 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/dialog/FileAttachmentPreviewFragment.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/FileAttachmentPreviewFragment.kt
@@ -53,7 +53,6 @@ class FileAttachmentPreviewFragment : DialogFragment() {
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-
         arguments?.let {
             files = it.getString(FILE_NAMES_ARG, "")
             filesList = it.getStringArrayList(FILES_TO_UPLOAD_ARG)!!
@@ -100,10 +99,7 @@ class FileAttachmentPreviewFragment : DialogFragment() {
         private const val FILES_TO_UPLOAD_ARG = "FILES_TO_UPLOAD_ARG"
 
         @JvmStatic
-        fun newInstance(
-            filenames: String,
-            filesToUpload: MutableList<String>,
-        ): FileAttachmentPreviewFragment {
+        fun newInstance(filenames: String, filesToUpload: MutableList<String>): FileAttachmentPreviewFragment {
             val fileAttachmentFragment = FileAttachmentPreviewFragment()
             val args = Bundle()
             args.putString(FILE_NAMES_ARG, filenames)
diff --git a/app/src/main/res/layout/dialog_file_attachment_preview.xml b/app/src/main/res/layout/dialog_file_attachment_preview.xml
index 91bc4148c..ea9867f74 100644
--- a/app/src/main/res/layout/dialog_file_attachment_preview.xml
+++ b/app/src/main/res/layout/dialog_file_attachment_preview.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Julius Linus
@@ -18,85 +17,92 @@
   ~ You should have received a copy of the GNU General Public License
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:background="@color/white"
-    tools:visibility="visible">
-
-    <com.google.android.material.textview.MaterialTextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/standard_margin"
-        android:text="@string/nc_add_file"
-        android:textSize="@dimen/md_title_textsize" />
-
-    <com.google.android.material.divider.MaterialDivider
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="100dp">
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/dialog_file_attachment_preview_filenames"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/standard_margin"
-            android:textSize="@dimen/headline_text_size"
-            tools:text="a.png\nb.png\nc.png"/>
-
-    </ScrollView>
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/dialog_file_attachment_preview_layout"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/standard_margin">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/dialog_file_attachment_preview_caption"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/nc_caption"
-            android:maxLines="3"
-            tools:text="a.png\nb.png\nc.png"/>
-
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <com.google.android.material.divider.MaterialDivider
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+    tools:background="@color/white">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/standard_half_margin"
-        android:gravity="end"
-        android:orientation="horizontal"
-        android:paddingStart="@dimen/dialog_padding"
-        android:paddingEnd="@dimen/dialog_padding"
-        android:paddingBottom="@dimen/dialog_padding_top_bottom">
+        android:orientation="vertical">
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/button_close"
-            style="@style/Button.Borderless"
-            android:layout_width="wrap_content"
+        <com.google.android.material.textview.MaterialTextView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:minHeight="@dimen/min_size_clickable_area"
-            android:text="@string/nc_no" />
+            android:layout_margin="@dimen/standard_margin"
+            android:text="@string/nc_add_file"
+            android:textSize="@dimen/md_title_textsize" />
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/button_send"
-            style="@style/Button.Borderless"
-            android:layout_width="wrap_content"
+        <com.google.android.material.divider.MaterialDivider
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="100dp">
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/dialog_file_attachment_preview_filenames"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/standard_margin"
+                android:textSize="@dimen/headline_text_size"
+                tools:text="a.png\nb.png\nc.png" />
+
+        </androidx.core.widget.NestedScrollView>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/dialog_file_attachment_preview_layout"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:minHeight="@dimen/min_size_clickable_area"
-            android:text="@string/nc_yes" />
+            android:layout_margin="@dimen/standard_margin">
 
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/dialog_file_attachment_preview_caption"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/nc_caption"
+                android:maxLines="3"
+                tools:text="a.png\nb.png\nc.png" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.divider.MaterialDivider
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/standard_half_margin"
+            android:gravity="end"
+            android:orientation="horizontal"
+            android:paddingStart="@dimen/dialog_padding"
+            android:paddingEnd="@dimen/dialog_padding"
+            android:paddingBottom="@dimen/dialog_padding_top_bottom">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/button_close"
+                style="@style/Button.Borderless"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:minHeight="@dimen/min_size_clickable_area"
+                android:text="@string/nc_no" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/button_send"
+                style="@style/Button.Borderless"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:minHeight="@dimen/min_size_clickable_area"
+                android:text="@string/nc_yes" />
+
+        </LinearLayout>
     </LinearLayout>
-</LinearLayout>
+
+</ScrollView>