From f0aa8438250591ea631bc8010e9ed30df03eedfa Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Tue, 18 Aug 2020 10:05:24 +1000
Subject: [PATCH] Tweak edit closed group screen layout

---
 res/layout/activity_edit_closed_group.xml     | 52 ++++++++++---------
 res/values/strings.xml                        |  4 +-
 .../conversation/ConversationActivity.java    |  1 -
 3 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/res/layout/activity_edit_closed_group.xml b/res/layout/activity_edit_closed_group.xml
index 9bcbfac4c3..90105bc840 100644
--- a/res/layout/activity_edit_closed_group.xml
+++ b/res/layout/activity_edit_closed_group.xml
@@ -17,36 +17,35 @@
             android:id="@+id/ctnGroupNameSection"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/large_spacing"
-            android:layout_marginTop="@dimen/small_spacing"
-            android:layout_marginRight="@dimen/large_spacing">
+            android:padding="@dimen/large_spacing"
+            android:gravity="center">
 
             <LinearLayout
                 android:id="@+id/cntGroupNameEdit"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
+                android:gravity="center"
                 android:orientation="horizontal"
                 android:visibility="invisible"
                 tools:visibility="visible">
 
                 <ImageView
                     android:id="@+id/btnCancelGroupNameEdit"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
-                    android:layout_gravity="center"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
                     android:src="@drawable/ic_close_white_24dp"/>
 
                 <EditText
                     style="@style/SessionEditText"
                     android:id="@+id/edtGroupName"
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
                     android:layout_gravity="center"
-                    android:layout_marginStart="4dp"
-                    android:layout_marginEnd="4dp"
+                    android:layout_marginStart="@dimen/small_spacing"
+                    android:layout_marginEnd="@dimen/small_spacing"
                     android:textAlignment="center"
+                    android:paddingTop="12dp"
+                    android:paddingBottom="12dp"
                     android:inputType="text"
                     android:singleLine="true"
                     android:imeOptions="actionDone"
@@ -54,8 +53,8 @@
 
                 <ImageView
                     android:id="@+id/btnSaveGroupNameEdit"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
                     android:layout_gravity="center"
                     android:src="@drawable/ic_check_white_24dp"/>
 
@@ -65,8 +64,6 @@
                 android:id="@+id/cntGroupNameDisplay"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:paddingVertical="@dimen/medium_spacing"
                 android:gravity="center"
                 android:visibility="visible"
                 tools:visibility="invisible">
@@ -85,6 +82,7 @@
                     android:drawableEnd="@drawable/ic_edit_white_24dp"
                     android:drawablePadding="@dimen/small_spacing"
                     tools:text="SomeGroupName"/>
+
             </LinearLayout>
 
         </RelativeLayout>
@@ -96,17 +94,17 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/large_spacing"
+                android:layout_marginStart="@dimen/medium_spacing"
                 android:layout_marginTop="@dimen/small_spacing"
-                android:layout_marginEnd="@dimen/massive_spacing"
+                android:layout_marginEnd="@dimen/small_spacing"
                 android:layout_marginBottom="@dimen/small_spacing"
                 android:layout_weight="1"
-                android:alpha="0.8"
                 android:text="@string/activity_edit_closed_group_edit_members"
                 android:textColor="@color/text"
                 android:textSize="@dimen/medium_font_size" />
@@ -114,17 +112,23 @@
             <Button
                 android:id="@+id/addMembersClosedGroupButton"
                 style="@style/MediumProminentOutlineButton"
-                android:layout_width="135dp"
+                android:layout_width="wrap_content"
                 android:layout_height="@dimen/small_button_height"
                 android:layout_marginTop="@dimen/small_spacing"
-                android:layout_marginRight="@dimen/large_spacing"
-                android:layout_marginLeft="@dimen/very_large_spacing"
+                android:layout_marginEnd="@dimen/medium_spacing"
+                android:layout_marginStart="@dimen/small_spacing"
                 android:layout_marginBottom="@dimen/small_spacing"
-                android:layout_weight="1"
+                android:paddingStart="@dimen/medium_spacing"
+                android:paddingEnd="@dimen/medium_spacing"
                 android:text="@string/activity_edit_closed_group_add_members" />
 
         </LinearLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/separator" />
+
         <android.support.v7.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 88844b54fa..158f0f8a67 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1835,9 +1835,9 @@
 
     <!-- Next round of translation -->
 
-    <string name="activity_edit_closed_group_title">Edit Closed Group</string>
+    <string name="activity_edit_closed_group_title">Edit Group</string>
     <string name="activity_edit_closed_group_edit_text_hint">Enter a new group name</string>
-    <string name="activity_edit_closed_group_edit_members">Edit members</string>
+    <string name="activity_edit_closed_group_edit_members">Members</string>
     <string name="activity_edit_closed_group_add_members">Add members</string>
     <string name="activity_edit_closed_group_group_name_missing_error">Group name can\'t be empty</string>
     <string name="activity_edit_closed_group_group_name_too_long_error">Please enter a shorter group name</string>
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 8d71df078d..2d7525e804 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -153,7 +153,6 @@ import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil;
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewViewModel;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.loki.activities.EditClosedGroupActivity;
-import org.thoughtcrime.securesms.loki.activities.EditClosedGroupActivityKt;
 import org.thoughtcrime.securesms.loki.activities.HomeActivity;
 import org.thoughtcrime.securesms.loki.database.LokiThreadDatabase;
 import org.thoughtcrime.securesms.loki.database.LokiThreadDatabaseDelegate;