From 99e4f80be0eb41b0ba7140b62ece35083b2a0fdf Mon Sep 17 00:00:00 2001
From: Alan Evans <alan@signal.org>
Date: Sun, 7 Jun 2020 08:11:25 -0300
Subject: [PATCH] Allow whole row selection for Shared media in group settings.

---
 .../ui/managegroup/ManageGroupFragment.java   |  6 +-
 .../main/res/layout/group_manage_fragment.xml | 66 ++++++++++---------
 2 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java
index 6a5b8cfa7d..4c11283919 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java
@@ -76,7 +76,7 @@ public class ManageGroupFragment extends Fragment {
   private View                               accessControlCard;
   private View                               pendingMembersCard;
   private ManageGroupViewModel.CursorFactory cursorFactory;
-  private View                               photoRailLabel;
+  private View                               sharedMediaRow;
   private View                               editGroupAccessRow;
   private TextView                           editGroupAccessValue;
   private View                               editGroupMembershipRow;
@@ -149,7 +149,7 @@ public class ManageGroupFragment extends Fragment {
     groupMediaCard              = view.findViewById(R.id.group_media_card);
     accessControlCard           = view.findViewById(R.id.group_access_control_card);
     pendingMembersCard          = view.findViewById(R.id.group_pending_card);
-    photoRailLabel              = view.findViewById(R.id.rail_label);
+    sharedMediaRow              = view.findViewById(R.id.shared_media_row);
     editGroupAccessRow          = view.findViewById(R.id.edit_group_access_row);
     editGroupAccessValue        = view.findViewById(R.id.edit_group_access_value);
     editGroupMembershipRow      = view.findViewById(R.id.edit_group_membership_row);
@@ -224,7 +224,7 @@ public class ManageGroupFragment extends Fragment {
 
     viewModel.getGroupViewState().observe(getViewLifecycleOwner(), vs -> {
       if (vs == null) return;
-      photoRailLabel.setOnClickListener(v -> startActivity(MediaOverviewActivity.forThread(context, vs.getThreadId())));
+      sharedMediaRow.setOnClickListener(v -> startActivity(MediaOverviewActivity.forThread(context, vs.getThreadId())));
 
       setMediaCursorFactory(vs.getMediaCursorFactory());
 
diff --git a/app/src/main/res/layout/group_manage_fragment.xml b/app/src/main/res/layout/group_manage_fragment.xml
index 98c3cb70b9..98d4e46b6d 100644
--- a/app/src/main/res/layout/group_manage_fragment.xml
+++ b/app/src/main/res/layout/group_manage_fragment.xml
@@ -280,40 +280,44 @@
                 app:layout_constraintTop_toBottomOf="@id/group_notifications_card"
                 tools:visibility="visible">
 
-                <androidx.constraintlayout.widget.ConstraintLayout
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical">
 
-                    <TextView
-                        android:id="@+id/shared_media"
-                        android:layout_width="0dp"
-                        android:layout_height="0dp"
-                        android:gravity="center_vertical|start"
-                        android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
-                        android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding"
-                        android:text="@string/recipient_preference_activity__shared_media"
-                        android:textAlignment="viewStart"
-                        android:textAppearance="@style/Signal.Text.Body"
-                        app:layout_constraintBottom_toBottomOf="@id/rail_label"
-                        app:layout_constraintEnd_toStartOf="@+id/rail_label"
-                        app:layout_constraintHorizontal_bias="1.0"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                    <LinearLayout
+                        android:id="@+id/shared_media_row"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/group_manage_fragment_row_height"
+                        android:background="?selectableItemBackground"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:orientation="horizontal">
 
-                    <Button
-                        android:id="@+id/rail_label"
-                        style="@style/Widget.Signal.Button.TextButton.Ultramarine"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:minWidth="48dp"
-                        android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
-                        android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding"
-                        android:text="@string/ManageGroupActivity_see_all"
-                        android:textAppearance="@style/Signal.Text.Body"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_weight="1"
+                            android:gravity="center_vertical|start"
+                            android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
+                            android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding"
+                            android:text="@string/recipient_preference_activity__shared_media"
+                            android:textAlignment="viewStart"
+                            android:textAppearance="@style/Signal.Text.Body" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:gravity="center"
+                            android:minWidth="48dp"
+                            android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
+                            android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding"
+                            android:text="@string/ManageGroupActivity_see_all"
+                            android:textAppearance="@style/Signal.Text.Body"
+                            android:textColor="@color/ultramarine_text_button" />
+
+                    </LinearLayout>
 
                     <org.thoughtcrime.securesms.components.ThreadPhotoRailView
                         android:id="@+id/recent_photos"
@@ -322,9 +326,9 @@
                         android:layout_marginBottom="16dp"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/rail_label" />
+                        app:layout_constraintTop_toBottomOf="@id/shared_media_row" />
 
-                </androidx.constraintlayout.widget.ConstraintLayout>
+                </LinearLayout>
 
             </androidx.cardview.widget.CardView>