From b72333b75f0ab2179429f98f07947d136a38aed6 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Wed, 31 May 2023 21:25:55 +0200
Subject: [PATCH 1/2] Fix channel groups sheet buttons not visible

---
 .../res/layout/dialog_edit_channel_group.xml  | 33 +++++++++--------
 .../res/layout/dialog_subscription_groups.xml | 37 ++++++++++---------
 2 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/app/src/main/res/layout/dialog_edit_channel_group.xml b/app/src/main/res/layout/dialog_edit_channel_group.xml
index e63296b72..5ad4bb7c6 100644
--- a/app/src/main/res/layout/dialog_edit_channel_group.xml
+++ b/app/src/main/res/layout/dialog_edit_channel_group.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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:orientation="vertical">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
         android:layout_marginHorizontal="20dp"
+        android:layout_marginTop="20dp"
         android:hint="@string/group_name"
         app:startIconDrawable="@drawable/ic_edit">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/group_name"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content" />
 
     </com.google.android.material.textfield.TextInputLayout>
 
@@ -37,36 +37,37 @@
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/search_input"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/channelsRV"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"/>
+            android:layout_height="0dp"
+            android:layout_marginTop="10dp"
+            android:layout_weight="1" />
 
         <LinearLayout
             android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_gravity="end"
-            android:paddingVertical="10dp"
-            android:layout_height="wrap_content">
+            android:paddingVertical="10dp">
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/cancel"
                 style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
-                android:text="@string/cancel"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content"
+                android:text="@string/cancel" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/confirm"
                 style="@style/Widget.Material3.Button.ElevatedButton"
                 android:layout_width="wrap_content"
-                android:text="@string/okay"
+                android:layout_height="wrap_content"
                 android:layout_marginHorizontal="16dp"
-                android:layout_height="wrap_content"/>
+                android:text="@string/okay" />
 
         </LinearLayout>
 
@@ -77,6 +78,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_marginVertical="20dp"/>
+        android:layout_marginVertical="20dp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_subscription_groups.xml b/app/src/main/res/layout/dialog_subscription_groups.xml
index 049ec40d4..582b53634 100644
--- a/app/src/main/res/layout/dialog_subscription_groups.xml
+++ b/app/src/main/res/layout/dialog_subscription_groups.xml
@@ -1,44 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <TextView
-        android:text="@string/channel_groups"
-        android:textStyle="bold"
-        android:textSize="24sp"
-        android:layout_marginTop="18dp"
-        android:layout_marginStart="18dp"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:layout_marginStart="18dp"
+        android:layout_marginTop="18dp"
+        android:text="@string/channel_groups"
+        android:textSize="24sp"
+        android:textStyle="bold" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/groupsRV"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"/>
+        android:layout_height="0dp"
+        android:layout_marginTop="20dp"
+        android:layout_weight="1" />
 
     <LinearLayout
         android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="end"
-        android:paddingVertical="10dp"
-        android:layout_height="wrap_content">
+        android:paddingVertical="10dp">
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/new_group"
-            android:layout_width="wrap_content"
-            android:text="@string/new_group"
             style="@style/Widget.Material3.Button.OutlinedButton"
-            android:layout_height="wrap_content"/>
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/new_group" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/confirm"
             style="@style/Widget.Material3.Button.ElevatedButton"
             android:layout_width="wrap_content"
-            android:text="@string/okay"
+            android:layout_height="wrap_content"
             android:layout_marginHorizontal="16dp"
-            android:layout_height="wrap_content"/>
+            android:text="@string/okay" />
 
     </LinearLayout>
 

From 52a2cfafa9ac60946f85f1e96d4dd8c05a2259ae Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Wed, 31 May 2023 21:27:30 +0200
Subject: [PATCH 2/2] Move button to edit channel groups to start

---
 .../res/layout/fragment_subscriptions.xml     | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/layout/fragment_subscriptions.xml b/app/src/main/res/layout/fragment_subscriptions.xml
index 1eefa1d60..f4022d751 100644
--- a/app/src/main/res/layout/fragment_subscriptions.xml
+++ b/app/src/main/res/layout/fragment_subscriptions.xml
@@ -142,6 +142,16 @@
                             android:layout_height="wrap_content"
                             android:orientation="horizontal">
 
+                            <ImageView
+                                android:id="@+id/edit_groups"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:layout_marginEnd="6dp"
+                                android:layout_marginStart="12dp"
+                                android:background="?attr/selectableItemBackgroundBorderless"
+                                android:src="@drawable/ic_edit" />
+
                             <com.google.android.material.chip.ChipGroup
                                 android:id="@+id/channel_groups"
                                 android:layout_width="wrap_content"
@@ -159,15 +169,6 @@
 
                             </com.google.android.material.chip.ChipGroup>
 
-                            <ImageView
-                                android:id="@+id/edit_groups"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center"
-                                android:layout_marginHorizontal="10dp"
-                                android:background="?attr/selectableItemBackgroundBorderless"
-                                android:src="@drawable/ic_edit" />
-
                         </LinearLayout>
 
                     </HorizontalScrollView>