Add split-pane UI for create group screen.

Author: jeffrey-signal

app/src/main/AndroidManifest.xml

@@ -1059,6 +1059,11 @@
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:exported="false"/>
 
+    <activity
+        android:name=".groups.ui.creategroup.CreateGroupActivityV2"
+        android:exported="false"
+        android:theme="@style/Signal.DayNight.NoActionBar" />
+
     <activity android:name=".groups.ui.addtogroup.AddToGroupsActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:exported="false"/>

app/src/main/java/org/thoughtcrime/securesms/components/ContactFilterView.java

@@ -147,6 +147,11 @@ public void focusAndShowKeyboard() {
     ViewUtil.focusAndShowKeyboard(searchText);
   }
 
+  public void setText(String text) {
+    searchText.setText(text);
+    searchText.setSelection(text.length());
+  }
+
   public void clear() {
     searchText.setText("");
     notifyListener();

app/src/main/java/org/thoughtcrime/securesms/contacts/selection/ContactSelectionArguments.kt

@@ -86,21 +86,21 @@ data class ContactSelectionArguments(
       )
     }
   }
-}
 
-private object Defaults {
-  const val DISPLAY_MODE = ContactSelectionDisplayMode.FLAG_ALL
-  const val IS_REFRESHABLE = true
-  const val ENABLE_CREATE_NEW_GROUP = false
-  const val ENABLE_FIND_BY_USERNAME = false
-  const val ENABLE_FIND_BY_PHONE_NUMBER = false
-  const val INCLUDE_RECENTS = false
-  const val INCLUDE_CHAT_TYPES = false
-  val SELECTION_LIMITS: SelectionLimits? = null
-  val CURRENT_SELECTION: Set<RecipientId> = emptySet()
-  const val DISPLAY_CHIPS = true
-  const val RECYCLER_PADDING_BOTTOM = -1
-  const val RECYCLER_CHILD_CLIPPING = true
+  object Defaults {
+    const val DISPLAY_MODE = ContactSelectionDisplayMode.FLAG_ALL
+    const val IS_REFRESHABLE = true
+    const val ENABLE_CREATE_NEW_GROUP = false
+    const val ENABLE_FIND_BY_USERNAME = false
+    const val ENABLE_FIND_BY_PHONE_NUMBER = false
+    const val INCLUDE_RECENTS = false
+    const val INCLUDE_CHAT_TYPES = false
+    val SELECTION_LIMITS: SelectionLimits? = null
+    val CURRENT_SELECTION: Set<RecipientId> = emptySet()
+    const val DISPLAY_CHIPS = true
+    const val RECYCLER_PADDING_BOTTOM = -1
+    const val RECYCLER_CHILD_CLIPPING = true
 
-  fun canSelectSelf(selectionLimits: SelectionLimits?): Boolean = selectionLimits == null
+    fun canSelectSelf(selectionLimits: SelectionLimits?): Boolean = selectionLimits == null
+  }
 }

app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivity.kt

@@ -117,22 +117,24 @@ private fun NewConversationScreen(
     contract = FindByActivity.Contract(),
     onResult = { recipientId ->
       if (recipientId != null) {
-        viewModel.onMessage(recipientId)
+        viewModel.openConversation(recipientId)
       }
     }
   )
 
   val coroutineScope = rememberCoroutineScope()
   val callbacks = remember {
     object : UiCallbacks {
+      override fun onSearchQueryChanged(query: String) = viewModel.onSearchQueryChanged(query)
       override fun onCreateNewGroup() = createGroupLauncher.launch(CreateGroupActivity.newIntent(context))
       override fun onFindByUsername() = findByLauncher.launch(FindByMode.USERNAME)
       override fun onFindByPhoneNumber() = findByLauncher.launch(FindByMode.PHONE_NUMBER)
-      override fun shouldAllowSelection(id: RecipientId): Boolean = true
-      override fun onRecipientSelected(id: RecipientId?, phone: PhoneNumber?) = viewModel.onRecipientSelected(id, phone)
-      override fun onMessage(id: RecipientId) = viewModel.onMessage(id)
-      override fun onVoiceCall(recipient: Recipient) = CommunicationActions.startVoiceCall(context, recipient, viewModel::onUserAlreadyInACall)
-      override fun onVideoCall(recipient: Recipient) = CommunicationActions.startVideoCall(context, recipient, viewModel::onUserAlreadyInACall)
+      override suspend fun shouldAllowSelection(id: RecipientId?, phone: PhoneNumber?): Boolean = true
+      override fun onRecipientSelected(id: RecipientId?, phone: PhoneNumber?) = viewModel.openConversation(id, phone)
+      override fun onPendingRecipientSelectionsConsumed() = Unit
+      override fun onMessage(id: RecipientId) = viewModel.openConversation(id)
+      override fun onVoiceCall(recipient: Recipient) = CommunicationActions.startVoiceCall(context, recipient, viewModel::showUserAlreadyInACall)
+      override fun onVideoCall(recipient: Recipient) = CommunicationActions.startVideoCall(context, recipient, viewModel::showUserAlreadyInACall)
 
       override fun onRemove(recipient: Recipient) = viewModel.showRemoveConfirmation(recipient)
       override fun onRemoveConfirmed(recipient: Recipient) {
@@ -146,8 +148,8 @@ private fun NewConversationScreen(
 
       override fun onInviteToSignal() = context.startActivity(AppSettingsActivity.invite(context))
       override fun onRefresh() = viewModel.refresh()
-      override fun onUserMessageDismissed(userMessage: UserMessage) = viewModel.onUserMessageDismissed()
-      override fun onContactsListReset() = viewModel.onContactsListReset()
+      override fun onUserMessageDismissed(userMessage: UserMessage) = viewModel.clearUserMessage()
+      override fun onContactsListReset() = viewModel.clearShouldResetContactsList()
       override fun onBackPressed() = closeScreen()
     }
   }
@@ -256,7 +258,7 @@ private fun NewConversationScreenUi(
     snackbarHostState = snackbarHostState
   )
 
-  if (uiState.isRefreshingRecipient) {
+  if (uiState.isLookingUpRecipient) {
     Dialogs.IndeterminateProgressDialog()
   }
 }
@@ -320,11 +322,13 @@ private interface UiCallbacks :
   fun onBackPressed()
 
   object Empty : UiCallbacks {
+    override fun onSearchQueryChanged(query: String) = Unit
     override fun onCreateNewGroup() = Unit
     override fun onFindByUsername() = Unit
     override fun onFindByPhoneNumber() = Unit
-    override fun shouldAllowSelection(id: RecipientId): Boolean = true
+    override suspend fun shouldAllowSelection(id: RecipientId?, phone: PhoneNumber?): Boolean = true
     override fun onRecipientSelected(id: RecipientId?, phone: PhoneNumber?) = Unit
+    override fun onPendingRecipientSelectionsConsumed() = Unit
     override fun onMessage(id: RecipientId) = Unit
     override fun onVoiceCall(recipient: Recipient) = Unit
     override fun onVideoCall(recipient: Recipient) = Unit
@@ -347,6 +351,7 @@ private fun NewConversationRecipientPicker(
   modifier: Modifier = Modifier
 ) {
   RecipientPicker(
+    searchQuery = uiState.searchQuery,
     isRefreshing = uiState.isRefreshingContacts,
     shouldResetContactsList = uiState.shouldResetContactsList,
     callbacks = RecipientPickerCallbacks(

app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationViewModel.kt

@@ -37,41 +37,39 @@ class NewConversationViewModel : ViewModel() {
 
   private val contactsManagementRepo = ContactsManagementRepository(AppDependencies.application)
 
-  fun onMessage(id: RecipientId): Unit = openConversation(recipientId = id)
+  fun onSearchQueryChanged(query: String) {
+    internalUiState.update { it.copy(searchQuery = query) }
+  }
+
+  fun openConversation(recipientId: RecipientId) {
+    internalUiState.update { it.copy(pendingDestination = recipientId) }
+  }
 
-  fun onRecipientSelected(id: RecipientId?, phone: PhoneNumber?) {
+  fun openConversation(id: RecipientId?, phone: PhoneNumber?) {
     when {
       id != null -> openConversation(recipientId = id)
 
       SignalStore.account.isRegistered -> {
-        Log.d(TAG, "[onRecipientSelected] Missing recipientId: attempting to look up.")
-        resolveAndOpenConversation(phone)
+        Log.d(TAG, "[openConversation] Missing recipientId: attempting to look up.")
+        resolveAndOpenConversation(phone!!)
       }
 
-      else -> Log.w(TAG, "[onRecipientSelected] Cannot look up recipient: account not registered.")
+      else -> Log.w(TAG, "[openConversation] Cannot look up recipient: account not registered.")
     }
   }
 
-  private fun openConversation(recipientId: RecipientId) {
-    internalUiState.update { it.copy(pendingDestination = recipientId) }
-  }
-
-  private fun resolveAndOpenConversation(phone: PhoneNumber?) {
+  private fun resolveAndOpenConversation(phone: PhoneNumber) {
     viewModelScope.launch {
-      internalUiState.update { it.copy(isRefreshingRecipient = true) }
+      internalUiState.update { it.copy(isLookingUpRecipient = true) }
 
       val lookupResult = withContext(Dispatchers.IO) {
-        if (phone != null) {
-          RecipientRepository.lookupNewE164(inputE164 = phone.value)
-        } else {
-          RecipientRepository.LookupResult.InvalidEntry
-        }
+        RecipientRepository.lookupNewE164(inputE164 = phone.value)
       }
 
       when (lookupResult) {
         is RecipientRepository.LookupResult.Success -> {
           val recipient = Recipient.resolved(lookupResult.recipientId)
-          internalUiState.update { it.copy(isRefreshingRecipient = false) }
+          internalUiState.update { it.copy(isLookingUpRecipient = false) }
 
           if (recipient.isRegistered && recipient.hasServiceId) {
             openConversation(recipient.id)
@@ -83,7 +81,7 @@ class NewConversationViewModel : ViewModel() {
         is RecipientRepository.LookupResult.NotFound, is RecipientRepository.LookupResult.InvalidEntry -> {
           internalUiState.update {
             it.copy(
-              isRefreshingRecipient = false,
+              isLookingUpRecipient = false,
               userMessage = Info.RecipientNotSignalUser(phone)
             )
           }
@@ -92,7 +90,7 @@ class NewConversationViewModel : ViewModel() {
         is RecipientRepository.LookupResult.NetworkError -> {
           internalUiState.update {
             it.copy(
-              isRefreshingRecipient = false,
+              isLookingUpRecipient = false,
               userMessage = Info.NetworkError
             )
           }
@@ -137,11 +135,11 @@ class NewConversationViewModel : ViewModel() {
     }
   }
 
-  fun onUserAlreadyInACall() {
+  fun showUserAlreadyInACall() {
     internalUiState.update { it.copy(userMessage = Info.UserAlreadyInAnotherCall) }
   }
 
-  fun onContactsListReset() {
+  fun clearShouldResetContactsList() {
     internalUiState.update { it.copy(shouldResetContactsList = false) }
   }
 
@@ -157,14 +155,15 @@ class NewConversationViewModel : ViewModel() {
     }
   }
 
-  fun onUserMessageDismissed() {
+  fun clearUserMessage() {
     internalUiState.update { it.copy(userMessage = null) }
   }
 }
 
 data class NewConversationUiState(
   val forceSplitPaneOnCompactLandscape: Boolean = SignalStore.internal.forceSplitPaneOnCompactLandscape,
-  val isRefreshingRecipient: Boolean = false,
+  val searchQuery: String = "",
+  val isLookingUpRecipient: Boolean = false,
   val isRefreshingContacts: Boolean = false,
   val shouldResetContactsList: Boolean = false,
   val pendingDestination: RecipientId? = null,
@@ -174,7 +173,7 @@ data class NewConversationUiState(
     sealed interface Info : UserMessage {
       data class RecipientRemoved(val recipient: Recipient) : Info
       data class RecipientBlocked(val recipient: Recipient) : Info
-      data class RecipientNotSignalUser(val phone: PhoneNumber?) : Info
+      data class RecipientNotSignalUser(val phone: PhoneNumber) : Info
       data object UserAlreadyInAnotherCall : Info
       data object NetworkError : Info
     }