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

Add empty state for members list in AddGroupDetailsFragment.

Browse Source
This commit is contained in:
Alex Hart
2021-01-08 17:31:23 -04:00
committed by Alan Evans
parent 4320a81846
commit ae5f9fb8ac
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsFragment.java
View File

@@ -92,6 +92,7 @@ public class AddGroupDetailsFragment extends LoggingFragment {
ImageView avatar = view.findViewById(R.id.group_avatar); ImageView avatar = view.findViewById(R.id.group_avatar);
View mmsWarning = view.findViewById(R.id.mms_warning); View mmsWarning = view.findViewById(R.id.mms_warning);
LearnMoreTextView gv2Warning = view.findViewById(R.id.gv2_warning); LearnMoreTextView gv2Warning = view.findViewById(R.id.gv2_warning);
View addLater = view.findViewById(R.id.add_later);
avatarPlaceholder = VectorDrawableCompat.create(getResources(), R.drawable.ic_camera_outline_32_ultramarine, requireActivity().getTheme()); avatarPlaceholder = VectorDrawableCompat.create(getResources(), R.drawable.ic_camera_outline_32_ultramarine, requireActivity().getTheme());
@@ -106,7 +107,10 @@ public class AddGroupDetailsFragment extends LoggingFragment {
name.addTextChangedListener(new AfterTextChanged(editable -> viewModel.setName(editable.toString()))); name.addTextChangedListener(new AfterTextChanged(editable -> viewModel.setName(editable.toString())));
toolbar.setNavigationOnClickListener(unused -> callback.onNavigationButtonPressed()); toolbar.setNavigationOnClickListener(unused -> callback.onNavigationButtonPressed());
create.setOnClickListener(v -> handleCreateClicked()); create.setOnClickListener(v -> handleCreateClicked());
viewModel.getMembers().observe(getViewLifecycleOwner(), members::setMembers); viewModel.getMembers().observe(getViewLifecycleOwner(), list -> {
addLater.setVisibility(list.isEmpty() ? View.VISIBLE : View.GONE);
members.setMembers(list);
});
viewModel.getCanSubmitForm().observe(getViewLifecycleOwner(), isFormValid -> setCreateEnabled(isFormValid, true)); viewModel.getCanSubmitForm().observe(getViewLifecycleOwner(), isFormValid -> setCreateEnabled(isFormValid, true));
viewModel.getIsMms().observe(getViewLifecycleOwner(), isMms -> { viewModel.getIsMms().observe(getViewLifecycleOwner(), isMms -> {
mmsWarning.setVisibility(isMms ? View.VISIBLE : View.GONE); mmsWarning.setVisibility(isMms ? View.VISIBLE : View.GONE);

13
app/src/main/res/layout/add_group_details_fragment.xml
View File

@@ -107,6 +107,19 @@
app:layout_constraintTop_toBottomOf="@id/gv2_warning" app:layout_constraintTop_toBottomOf="@id/gv2_warning"
app:layout_goneMarginTop="30dp" /> app:layout_goneMarginTop="30dp" />
<TextView
android:id="@+id/add_later"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@string/AddGroupDetailsFragment__you_can_add_or_invite_friends_after_creating_this_group"
android:textAppearance="@style/TextAppearance.Signal.Body2"
android:textColor="@color/signal_text_secondary"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/member_list_header" />
<org.thoughtcrime.securesms.groups.ui.GroupMemberListView <org.thoughtcrime.securesms.groups.ui.GroupMemberListView
android:id="@+id/member_list" android:id="@+id/member_list"
android:layout_width="match_parent" android:layout_width="match_parent"

1
app/src/main/res/values/strings.xml
View File

@@ -703,6 +703,7 @@
<string name="AddGroupDetailsFragment__create_group">Create group</string> <string name="AddGroupDetailsFragment__create_group">Create group</string>
<string name="AddGroupDetailsFragment__create">Create</string> <string name="AddGroupDetailsFragment__create">Create</string>
<string name="AddGroupDetailsFragment__members">Members</string> <string name="AddGroupDetailsFragment__members">Members</string>
<string name="AddGroupDetailsFragment__you_can_add_or_invite_friends_after_creating_this_group">You can add or invite friends after creating this group.</string>
<string name="AddGroupDetailsFragment__group_name_required">Group name (required)</string> <string name="AddGroupDetailsFragment__group_name_required">Group name (required)</string>
<string name="AddGroupDetailsFragment__group_name_optional">Group name (optional)</string> <string name="AddGroupDetailsFragment__group_name_optional">Group name (optional)</string>
<string name="AddGroupDetailsFragment__this_field_is_required">This field is required.</string> <string name="AddGroupDetailsFragment__this_field_is_required">This field is required.</string>