From b9c1aa6ded4edcf9caa0c6ad250845cc332e53ab Mon Sep 17 00:00:00 2001
From: Jonny Andrew <jonny.andrew@protonmail.com>
Date: Mon, 24 Oct 2022 09:31:15 +0100
Subject: [PATCH] Remove redundant view group

---
 .../bottom_sheet_attachment_type_selector.xml | 144 +++++++++---------
 1 file changed, 69 insertions(+), 75 deletions(-)

diff --git a/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml b/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml
index 3aec5b5c20..79a60624cf 100644
--- a/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml
+++ b/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml
@@ -1,92 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?colorSurface"
-    android:orientation="vertical">
+    android:background="?colorSurface">
 
-    <androidx.core.widget.NestedScrollView
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
-        <LinearLayout
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/gallery"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            app:actionTitle="@string/attachment_type_selector_gallery"
+            app:leftIcon="@drawable/ic_attachment_gallery"
+            app:tint="?colorPrimary"
+            app:titleTextColor="?vctr_content_primary" />
 
-            <im.vector.app.core.ui.views.BottomSheetActionButton
-                android:id="@+id/gallery"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:actionTitle="@string/attachment_type_selector_gallery"
-                app:leftIcon="@drawable/ic_attachment_gallery"
-                app:tint="?colorPrimary"
-                app:titleTextColor="?vctr_content_primary" />
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/stickers"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:actionTitle="@string/attachment_type_selector_sticker"
+            app:leftIcon="@drawable/ic_attachment_sticker"
+            app:tint="?colorPrimary"
+            app:titleTextColor="?vctr_content_primary" />
 
-            <im.vector.app.core.ui.views.BottomSheetActionButton
-                android:id="@+id/stickers"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:actionTitle="@string/attachment_type_selector_sticker"
-                app:leftIcon="@drawable/ic_attachment_sticker"
-                app:tint="?colorPrimary"
-                app:titleTextColor="?vctr_content_primary" />
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/file"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:actionTitle="@string/attachment_type_selector_file"
+            app:leftIcon="@drawable/ic_attachment_file"
+            app:tint="?colorPrimary"
+            app:titleTextColor="?vctr_content_primary" />
 
-            <im.vector.app.core.ui.views.BottomSheetActionButton
-                android:id="@+id/file"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:actionTitle="@string/attachment_type_selector_file"
-                app:leftIcon="@drawable/ic_attachment_file"
-                app:tint="?colorPrimary"
-                app:titleTextColor="?vctr_content_primary" />
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/voiceBroadcast"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:actionTitle="@string/attachment_type_selector_voice_broadcast"
+            app:leftIcon="@drawable/ic_attachment_voice_broadcast"
+            app:tint="?colorPrimary"
+            app:titleTextColor="?vctr_content_primary" />
 
-            <im.vector.app.core.ui.views.BottomSheetActionButton
-                android:id="@+id/voiceBroadcast"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:actionTitle="@string/attachment_type_selector_voice_broadcast"
-                app:leftIcon="@drawable/ic_attachment_voice_broadcast"
-                app:tint="?colorPrimary"
-                app:titleTextColor="?vctr_content_primary" />
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/poll"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:actionTitle="@string/attachment_type_selector_poll"
+            app:leftIcon="@drawable/ic_attachment_poll"
+            app:tint="?colorPrimary"
+            app:titleTextColor="?vctr_content_primary" />
 
-            <im.vector.app.core.ui.views.BottomSheetActionButton
-                android:id="@+id/poll"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:actionTitle="@string/attachment_type_selector_poll"
-                app:leftIcon="@drawable/ic_attachment_poll"
-                app:tint="?colorPrimary"
-                app:titleTextColor="?vctr_content_primary" />
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/location"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:actionTitle="@string/attachment_type_selector_location"
+            app:leftIcon="@drawable/ic_attachment_location"
+            app:tint="?colorPrimary"
+            app:titleTextColor="?vctr_content_primary" />
 
-            <im.vector.app.core.ui.views.BottomSheetActionButton
-                android:id="@+id/location"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:actionTitle="@string/attachment_type_selector_location"
-                app:leftIcon="@drawable/ic_attachment_location"
-                app:tint="?colorPrimary"
-                app:titleTextColor="?vctr_content_primary" />
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/camera"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:actionTitle="@string/attachment_type_selector_camera"
+            app:leftIcon="@drawable/ic_attachment_camera"
+            app:tint="?colorPrimary"
+            app:titleTextColor="?vctr_content_primary" />
 
-            <im.vector.app.core.ui.views.BottomSheetActionButton
-                android:id="@+id/camera"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:actionTitle="@string/attachment_type_selector_camera"
-                app:leftIcon="@drawable/ic_attachment_camera"
-                app:tint="?colorPrimary"
-                app:titleTextColor="?vctr_content_primary" />
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/contact"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:actionTitle="@string/attachment_type_selector_contact"
+            app:leftIcon="@drawable/ic_attachment_contact_white_24dp"
+            app:tint="?colorPrimary"
+            app:titleTextColor="?vctr_content_primary" />
 
-            <im.vector.app.core.ui.views.BottomSheetActionButton
-                android:id="@+id/contact"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:actionTitle="@string/attachment_type_selector_contact"
-                app:leftIcon="@drawable/ic_attachment_contact_white_24dp"
-                app:tint="?colorPrimary"
-                app:titleTextColor="?vctr_content_primary" />
-
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
-</LinearLayout>
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>