From eff4cede0f7409e0db96b6237b283af88f43bebd Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 21 Jun 2024 18:20:53 +0200
Subject: [PATCH] fix: can't add channel to group if more than ~10 groups

---
 app/build.gradle.kts                                        | 4 +++-
 app/src/main/res/layout/add_channel_to_group_row.xml        | 3 ++-
 ...l_to_group_sheet.xml => dialog_add_channel_to_group.xml} | 6 ++++--
 3 files changed, 9 insertions(+), 4 deletions(-)
 rename app/src/main/res/layout/{add_channel_to_group_sheet.xml => dialog_add_channel_to_group.xml} (91%)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 7a4cefb834..6165c9495d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -126,7 +126,6 @@ dependencies {
     implementation(libs.kotlinx.serialization)
     implementation(libs.kotlinx.datetime)
     implementation(libs.kotlinx.serialization.retrofit)
-    testImplementation(libs.testng)
 
     /* Cronet and Coil */
     coreLibraryDesugaring(libs.desugaring)
@@ -144,4 +143,7 @@ dependencies {
 
     /* AndroidX Paging */
     implementation(libs.androidx.paging)
+
+    /* Testing */
+    testImplementation(libs.testng)
 }
diff --git a/app/src/main/res/layout/add_channel_to_group_row.xml b/app/src/main/res/layout/add_channel_to_group_row.xml
index de888845c7..34f0e273b7 100644
--- a/app/src/main/res/layout/add_channel_to_group_row.xml
+++ b/app/src/main/res/layout/add_channel_to_group_row.xml
@@ -3,7 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:padding="12dp">
+    android:paddingHorizontal="12dp"
+    android:paddingVertical="3dp">
 
     <CheckBox
         android:id="@+id/group_checkbox"
diff --git a/app/src/main/res/layout/add_channel_to_group_sheet.xml b/app/src/main/res/layout/dialog_add_channel_to_group.xml
similarity index 91%
rename from app/src/main/res/layout/add_channel_to_group_sheet.xml
rename to app/src/main/res/layout/dialog_add_channel_to_group.xml
index a31711394a..04f3bd8272 100644
--- a/app/src/main/res/layout/add_channel_to_group_sheet.xml
+++ b/app/src/main/res/layout/dialog_add_channel_to_group.xml
@@ -14,7 +14,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:orientation="vertical">
 
             <!-- Drag handle for accessibility -->
@@ -47,7 +47,8 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/groupsRV"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="0dp"
+                android:layout_weight="1" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -57,6 +58,7 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/cancel"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/cancel" />