Refactor conversation settings screens into a single fragment with new UI.

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java

@@ -44,7 +44,6 @@ import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.TextWatcher;
-import android.view.Display;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.Menu;
@@ -66,12 +65,12 @@ import android.widget.Toast;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 import androidx.annotation.WorkerThread;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.pm.ShortcutInfoCompat;
 import androidx.core.content.pm.ShortcutManagerCompat;
@@ -130,6 +129,7 @@ import org.thoughtcrime.securesms.components.reminder.Reminder;
 import org.thoughtcrime.securesms.components.reminder.ReminderView;
 import org.thoughtcrime.securesms.components.reminder.ServiceOutageReminder;
 import org.thoughtcrime.securesms.components.reminder.UnauthorizedReminder;
+import org.thoughtcrime.securesms.components.settings.conversation.ConversationSettingsActivity;
 import org.thoughtcrime.securesms.contacts.ContactAccessor;
 import org.thoughtcrime.securesms.contacts.ContactAccessor.ContactData;
 import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
@@ -142,7 +142,6 @@ import org.thoughtcrime.securesms.conversation.ConversationMessage.ConversationM
 import org.thoughtcrime.securesms.conversation.ui.error.SafetyNumberChangeDialog;
 import org.thoughtcrime.securesms.conversation.ui.groupcall.GroupCallViewModel;
 import org.thoughtcrime.securesms.conversation.ui.mentions.MentionsPickerViewModel;
-import org.thoughtcrime.securesms.search.MessageResult;
 import org.thoughtcrime.securesms.crypto.ReentrantSessionLock;
 import org.thoughtcrime.securesms.crypto.SecurityEvent;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
@@ -174,7 +173,6 @@ import org.thoughtcrime.securesms.groups.ui.GroupChangeFailureReason;
 import org.thoughtcrime.securesms.groups.ui.GroupErrors;
 import org.thoughtcrime.securesms.groups.ui.LeaveGroupDialog;
 import org.thoughtcrime.securesms.groups.ui.invitesandrequests.ManagePendingAndRequestingMembersActivity;
-import org.thoughtcrime.securesms.groups.ui.managegroup.ManageGroupActivity;
 import org.thoughtcrime.securesms.groups.ui.migration.GroupsV1MigrationInitiationBottomSheetDialogFragment;
 import org.thoughtcrime.securesms.groups.ui.migration.GroupsV1MigrationSuggestionsDialog;
 import org.thoughtcrime.securesms.insights.InsightsLauncher;
@@ -239,8 +237,8 @@ import org.thoughtcrime.securesms.recipients.RecipientFormattingException;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.recipients.RecipientUtil;
 import org.thoughtcrime.securesms.recipients.ui.disappearingmessages.RecipientDisappearingMessagesActivity;
-import org.thoughtcrime.securesms.recipients.ui.managerecipient.ManageRecipientActivity;
 import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity;
+import org.thoughtcrime.securesms.search.MessageResult;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.sms.OutgoingEncryptedMessage;
@@ -338,6 +336,9 @@ public class ConversationActivity extends PassphraseRequiredActivity
   private static final String TAG = Log.tag(ConversationActivity.class);
 
   private static final String STATE_REACT_WITH_ANY_PAGE = "STATE_REACT_WITH_ANY_PAGE";
+  private static final String STATE_HANDLED_INIT_SEARCH = "STATE_HANDLED_INIT_SEARCH";
+
+  private static final int REQUEST_CODE_SETTINGS = 1000;
 
   private static final int PICK_GALLERY        = 1;
   private static final int PICK_DOCUMENT       = 2;
@@ -496,13 +497,15 @@ public class ConversationActivity extends PassphraseRequiredActivity
       }
     });
     initializeInsightObserver();
+
+    handleStartWithSearchOpen();
   }
 
   @Override
   protected void onNewIntent(Intent intent) {
     super.onNewIntent(intent);
     Log.i(TAG, "onNewIntent()");
-    
+
     if (isFinishing()) {
       Log.w(TAG, "Activity is finishing...");
       return;
@@ -549,6 +552,8 @@ public class ConversationActivity extends PassphraseRequiredActivity
     }
 
     searchNav.setVisibility(View.GONE);
+
+    handleStartWithSearchOpen();
   }
 
   @Override
@@ -774,6 +779,16 @@ public class ConversationActivity extends PassphraseRequiredActivity
     }
   }
 
+  private void handleStartWithSearchOpen() {
+    if (viewModel.getArgs().isWithSearchOpen()) {
+      toolbar.postDelayed(() -> {
+        if (searchViewItem.expandActionView()) {
+          searchViewModel.onSearchOpened();
+        }
+      }, 500);
+    }
+  }
+
   @Override
   protected void onSaveInstanceState(@NonNull Bundle outState) {
     super.onSaveInstanceState(outState);
@@ -1178,8 +1193,10 @@ public class ConversationActivity extends PassphraseRequiredActivity
 
     if (isInMessageRequest()) return;
 
-    Intent intent = ManageRecipientActivity.newIntentFromConversation(this, recipient.getId());
-    startActivitySceneTransition(intent, titleView.findViewById(R.id.contact_photo_image), "avatar");
+    Intent intent = ConversationSettingsActivity.forRecipient(this, recipient.getId());
+    Bundle bundle = ConversationSettingsActivity.createTransitionBundle(this, titleView.findViewById(R.id.contact_photo_image), toolbar);
+
+    ActivityCompat.startActivity(this, intent, bundle);
   }
 
   private void handleUnmuteNotifications() {
@@ -1338,9 +1355,10 @@ public class ConversationActivity extends PassphraseRequiredActivity
   }
 
   private void handleManageGroup() {
-    startActivityForResult(ManageGroupActivity.newIntent(ConversationActivity.this, recipient.get().requireGroupId()),
-                           GROUP_EDIT,
-                           ManageGroupActivity.createTransitionBundle(this, titleView.findViewById(R.id.contact_photo_image)));
+    Intent intent = ConversationSettingsActivity.forGroup(this, recipient.get().requireGroupId());
+    Bundle bundle = ConversationSettingsActivity.createTransitionBundle(this, titleView.findViewById(R.id.contact_photo_image), toolbar);
+
+    ActivityCompat.startActivity(this, intent, bundle);
   }
 
   private void handleDistributionBroadcastEnabled(MenuItem item) {

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationIntents.java

@@ -32,6 +32,7 @@ public class ConversationIntents {
   private static final String EXTRA_DISTRIBUTION_TYPE                = "distribution_type";
   private static final String EXTRA_STARTING_POSITION                = "starting_position";
   private static final String EXTRA_FIRST_TIME_IN_SELF_CREATED_GROUP = "first_time_in_group";
+  private static final String EXTRA_WITH_SEARCH_OPEN                 = "with_search_open";
 
   private ConversationIntents() {
   }
@@ -70,6 +71,7 @@ public class ConversationIntents {
     private final int              distributionType;
     private final int              startingPosition;
     private final boolean          firstTimeInSelfCreatedGroup;
+    private final boolean          withSearchOpen;
 
     static Args from(@NonNull Intent intent) {
       if (isBubbleIntent(intent)) {
@@ -81,6 +83,7 @@ public class ConversationIntents {
                         false,
                         ThreadDatabase.DistributionTypes.DEFAULT,
                         -1,
+                        false,
                         false);
       }
 
@@ -92,7 +95,8 @@ public class ConversationIntents {
                       intent.getBooleanExtra(EXTRA_BORDERLESS, false),
                       intent.getIntExtra(EXTRA_DISTRIBUTION_TYPE, ThreadDatabase.DistributionTypes.DEFAULT),
                       intent.getIntExtra(EXTRA_STARTING_POSITION, -1),
-                      intent.getBooleanExtra(EXTRA_FIRST_TIME_IN_SELF_CREATED_GROUP, false));
+                      intent.getBooleanExtra(EXTRA_FIRST_TIME_IN_SELF_CREATED_GROUP, false),
+                      intent.getBooleanExtra(EXTRA_WITH_SEARCH_OPEN, false));
     }
 
     private Args(@NonNull RecipientId recipientId,
@@ -103,7 +107,8 @@ public class ConversationIntents {
                  boolean isBorderless,
                  int distributionType,
                  int startingPosition,
-                 boolean firstTimeInSelfCreatedGroup)
+                 boolean firstTimeInSelfCreatedGroup,
+                 boolean withSearchOpen)
     {
       this.recipientId                 = recipientId;
       this.threadId                    = threadId;
@@ -114,6 +119,7 @@ public class ConversationIntents {
       this.distributionType            = distributionType;
       this.startingPosition            = startingPosition;
       this.firstTimeInSelfCreatedGroup = firstTimeInSelfCreatedGroup;
+      this.withSearchOpen              = withSearchOpen;
     }
 
     public @NonNull RecipientId getRecipientId() {
@@ -160,6 +166,10 @@ public class ConversationIntents {
     public @NonNull ChatColors getChatColors() {
       return Recipient.resolved(recipientId).getChatColors();
     }
+
+    public boolean isWithSearchOpen() {
+      return withSearchOpen;
+    }
   }
 
   public final static class Builder {
@@ -177,6 +187,7 @@ public class ConversationIntents {
     private Uri            dataUri;
     private String         dataType;
     private boolean        firstTimeInSelfCreatedGroup;
+    private boolean        withSearchOpen;
 
     private Builder(@NonNull Context context,
                     @NonNull RecipientId recipientId,
@@ -236,6 +247,11 @@ public class ConversationIntents {
       return this;
     }
 
+    public @NonNull Builder withSearchOpen(boolean withSearchOpen) {
+      this.withSearchOpen = withSearchOpen;
+      return this;
+    }
+
     public Builder firstTimeInSelfCreatedGroup() {
       this.firstTimeInSelfCreatedGroup = true;
       return this;
@@ -265,6 +281,7 @@ public class ConversationIntents {
       intent.putExtra(EXTRA_STARTING_POSITION, startingPosition);
       intent.putExtra(EXTRA_BORDERLESS, isBorderless);
       intent.putExtra(EXTRA_FIRST_TIME_IN_SELF_CREATED_GROUP, firstTimeInSelfCreatedGroup);
+      intent.putExtra(EXTRA_WITH_SEARCH_OPEN, withSearchOpen);
 
       if (draftText != null) {
         intent.putExtra(EXTRA_TEXT, draftText);

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java

@@ -2,6 +2,10 @@ package org.thoughtcrime.securesms.conversation;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
+import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
@@ -25,6 +29,8 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.ExpirationUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
+import java.util.Objects;
+
 public class ConversationTitleView extends RelativeLayout {
 
   private AvatarImageView avatar;
@@ -78,20 +84,21 @@ public class ConversationTitleView extends RelativeLayout {
     if   (recipient == null) setComposeTitle();
     else                     setRecipientTitle(recipient);
 
-    int startDrawable = 0;
-    int endDrawable   = 0;
+    Drawable startDrawable = null;
+    Drawable endDrawable   = null;
 
     if (recipient != null && recipient.isBlocked()) {
-      startDrawable = R.drawable.ic_block_white_18dp;
+      startDrawable = ContextCompat.getDrawable(getContext(), R.drawable.ic_block_white_18dp);
     } else if (recipient != null && recipient.isMuted()) {
-      startDrawable = R.drawable.ic_volume_off_white_18dp;
+      startDrawable = Objects.requireNonNull(ContextCompat.getDrawable(getContext(), R.drawable.ic_bell_disabled_16));
+      startDrawable.setBounds(0, 0, ViewUtil.dpToPx(18), ViewUtil.dpToPx(18));
     }
 
     if (recipient != null && recipient.isSystemContact() && !recipient.isSelf()) {
-      endDrawable = R.drawable.ic_profile_circle_outline_16;
+      endDrawable = ContextCompat.getDrawable(getContext(), R.drawable.ic_profile_circle_outline_16);
     }
 
-    title.setCompoundDrawablesRelativeWithIntrinsicBounds(startDrawable, 0, endDrawable, 0);
+    title.setCompoundDrawablesRelativeWithIntrinsicBounds(startDrawable, null, endDrawable, null);
     TextViewCompat.setCompoundDrawableTintList(title, ColorStateList.valueOf(ContextCompat.getColor(getContext(), R.color.signal_inverse_transparent_80)));
 
     if (recipient != null) {