TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 09:28:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow whole row selection for Shared media in group settings.

Browse Source
This commit is contained in:
Alan Evans 2020-06-07 08:11:25 -03:00
parent 702dae9fcd
commit 99e4f80be0
2 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java
View File

@ -76,7 +76,7 @@ public class ManageGroupFragment extends Fragment {
private View accessControlCard; private View accessControlCard;
private View pendingMembersCard; private View pendingMembersCard;
private ManageGroupViewModel.CursorFactory cursorFactory; private ManageGroupViewModel.CursorFactory cursorFactory;
private View photoRailLabel; private View sharedMediaRow;
private View editGroupAccessRow; private View editGroupAccessRow;
private TextView editGroupAccessValue; private TextView editGroupAccessValue;
private View editGroupMembershipRow; private View editGroupMembershipRow;
@ -149,7 +149,7 @@ public class ManageGroupFragment extends Fragment {
groupMediaCard = view.findViewById(R.id.group_media_card); groupMediaCard = view.findViewById(R.id.group_media_card);
accessControlCard = view.findViewById(R.id.group_access_control_card); accessControlCard = view.findViewById(R.id.group_access_control_card);
pendingMembersCard = view.findViewById(R.id.group_pending_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); editGroupAccessRow = view.findViewById(R.id.edit_group_access_row);
editGroupAccessValue = view.findViewById(R.id.edit_group_access_value); editGroupAccessValue = view.findViewById(R.id.edit_group_access_value);
editGroupMembershipRow = view.findViewById(R.id.edit_group_membership_row); editGroupMembershipRow = view.findViewById(R.id.edit_group_membership_row);
@ -224,7 +224,7 @@ public class ManageGroupFragment extends Fragment {
viewModel.getGroupViewState().observe(getViewLifecycleOwner(), vs -> { viewModel.getGroupViewState().observe(getViewLifecycleOwner(), vs -> {
if (vs == null) return; 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()); setMediaCursorFactory(vs.getMediaCursorFactory());

66
app/src/main/res/layout/group_manage_fragment.xml
View File

@ -280,40 +280,44 @@
app:layout_constraintTop_toBottomOf="@id/group_notifications_card" app:layout_constraintTop_toBottomOf="@id/group_notifications_card"
tools:visibility="visible"> tools:visibility="visible">
<androidx.constraintlayout.widget.ConstraintLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<TextView <LinearLayout
android:id="@+id/shared_media" android:id="@+id/shared_media_row"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="@dimen/group_manage_fragment_row_height"
android:gravity="center_vertical|start" android:background="?selectableItemBackground"
android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding" android:clickable="true"
android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding" android:focusable="true"
android:text="@string/recipient_preference_activity__shared_media" android:orientation="horizontal">
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" />
<Button <TextView
android:id="@+id/rail_label" android:layout_width="0dp"
style="@style/Widget.Signal.Button.TextButton.Ultramarine" android:layout_height="match_parent"
android:layout_width="wrap_content" android:layout_gravity="center_horizontal"
android:layout_height="wrap_content" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical|start"
android:minWidth="48dp" android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding" android:paddingEnd="@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:text="@string/ManageGroupActivity_see_all" android:textAlignment="viewStart"
android:textAppearance="@style/Signal.Text.Body" android:textAppearance="@style/Signal.Text.Body" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> <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 <org.thoughtcrime.securesms.components.ThreadPhotoRailView
android:id="@+id/recent_photos" android:id="@+id/recent_photos"
@ -322,9 +326,9 @@
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="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> </androidx.cardview.widget.CardView>