Render GV1->GV2 migration event.

This commit is contained in:
Greyson Parrelli
2020-11-04 14:19:14 -05:00
committed by Alan Evans
parent 6bb9d27d4e
commit 5e536c3fa5
21 changed files with 447 additions and 26 deletions

View File

@@ -9,7 +9,10 @@ import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.annimon.stream.Stream;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.recipients.Recipient;
import java.util.List;
@@ -74,6 +77,10 @@ public final class GroupMemberListView extends RecyclerView {
membersAdapter.updateData(recipients);
}
public void setDisplayOnlyMembers(@NonNull List<Recipient> recipients) {
membersAdapter.updateData(Stream.of(recipients).map(r -> new GroupMemberEntry.FullMember(r, false)).toList());
}
@Override
protected void onMeasure(int widthSpec, int heightSpec) {
if (maxHeight > 0) {

View File

@@ -0,0 +1,79 @@
package org.thoughtcrime.securesms.groups.ui.migration;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.FragmentManager;
import androidx.lifecycle.ViewModelProviders;
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.groups.ui.GroupMemberListView;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientId;
import org.thoughtcrime.securesms.util.BottomSheetUtil;
import org.thoughtcrime.securesms.util.ThemeUtil;
import java.util.ArrayList;
import java.util.List;
public final class GroupsV1MigrationBottomSheetDialogFragment extends BottomSheetDialogFragment {
private static final String KEY_PENDING = "pending";
private GroupsV1MigrationViewModel viewModel;
private GroupMemberListView pendingList;
private TextView pendingTitle;
public static void showForLearnMore(@NonNull FragmentManager manager, @NonNull List<RecipientId> pendingRecipients) {
Bundle args = new Bundle();
args.putParcelableArrayList(KEY_PENDING, new ArrayList<>(pendingRecipients));
GroupsV1MigrationBottomSheetDialogFragment fragment = new GroupsV1MigrationBottomSheetDialogFragment();
fragment.setArguments(args);
fragment.show(manager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG);
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
setStyle(DialogFragment.STYLE_NORMAL,
ThemeUtil.isDarkTheme(requireContext()) ? R.style.Theme_Signal_RoundedBottomSheet
: R.style.Theme_Signal_RoundedBottomSheet_Light);
super.onCreate(savedInstanceState);
}
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
return inflater.inflate(R.layout.groupsv1_migration_learn_more_bottom_sheet, container, false);
}
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
this.pendingTitle = view.findViewById(R.id.gv1_learn_more_pending_title);
this.pendingList = view.findViewById(R.id.gv1_learn_more_pending_list);
List<RecipientId> pending = getArguments().containsKey(KEY_PENDING) ? getArguments().getParcelableArrayList(KEY_PENDING) : null;
this.viewModel = ViewModelProviders.of(this, new GroupsV1MigrationViewModel.Factory(pending)).get(GroupsV1MigrationViewModel.class);
viewModel.getPendingMembers().observe(getViewLifecycleOwner(), this::onPendingMembersChanged);
}
@Override
public void show(@NonNull FragmentManager manager, @Nullable String tag) {
BottomSheetUtil.show(manager, tag, this);
}
private void onPendingMembersChanged(@NonNull List<Recipient> pendingMembers) {
pendingTitle.setText(getResources().getQuantityText(R.plurals.GroupsV1MigrationLearnMore_these_members_will_need_to_accept_an_invite, pendingMembers.size()));
pendingList.setDisplayOnlyMembers(pendingMembers);
}
}

View File

@@ -0,0 +1,44 @@
package org.thoughtcrime.securesms.groups.ui.migration;
import androidx.annotation.NonNull;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import androidx.lifecycle.ViewModelProvider;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientId;
import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
import java.util.List;
class GroupsV1MigrationViewModel extends ViewModel {
private final MutableLiveData<List<Recipient>> pendingMembers;
private GroupsV1MigrationViewModel(@NonNull List<RecipientId> pendingMembers) {
this.pendingMembers = new MutableLiveData<>();
SignalExecutors.BOUNDED.execute(() -> {
this.pendingMembers.postValue(Recipient.resolvedList(pendingMembers));
});
}
@NonNull LiveData<List<Recipient>> getPendingMembers() {
return pendingMembers;
}
static class Factory extends ViewModelProvider.NewInstanceFactory {
private final List<RecipientId> pendingMembers;
Factory(List<RecipientId> pendingMembers) {
this.pendingMembers = pendingMembers;
}
@Override
public @NonNull<T extends ViewModel> T create(@NonNull Class<T> modelClass) {
return modelClass.cast(new GroupsV1MigrationViewModel(pendingMembers));
}
}
}