feat: show number picker when creating new chats or adding members (#532)

* feat: show number picker when adding members to group

Refs: https://github.com/FossifyOrg/Messages/issues/456

* feat: always show number picker when creating new chats

Refs: https://github.com/FossifyOrg/Messages/issues/153

* docs: update changelog

* docs: update changelog

* docs: update changelog

* feat: never show add person as an action button

* feat: never show add person as an action button

* docs: update changelog

app/src/main/kotlin/org/fossify/messages/activities/NewConversationActivity.kt

@@ -7,7 +7,6 @@ import android.view.WindowManager
 import android.widget.Toast
 import com.google.gson.Gson
 import com.reddit.indicatorfastscroll.FastScrollItemIndicator
-import org.fossify.commons.dialogs.RadioGroupDialog
 import org.fossify.commons.extensions.applyColorFilter
 import org.fossify.commons.extensions.areSystemAnimationsEnabled
 import org.fossify.commons.extensions.beGone
@@ -16,11 +15,11 @@ import org.fossify.commons.extensions.beVisibleIf
 import org.fossify.commons.extensions.getColorStateList
 import org.fossify.commons.extensions.getContrastColor
 import org.fossify.commons.extensions.getMyContactsCursor
-import org.fossify.commons.extensions.getPhoneNumberTypeText
 import org.fossify.commons.extensions.getProperPrimaryColor
 import org.fossify.commons.extensions.getProperTextColor
 import org.fossify.commons.extensions.hasPermission
 import org.fossify.commons.extensions.hideKeyboard
+import org.fossify.commons.extensions.maybeShowNumberPickerDialog
 import org.fossify.commons.extensions.normalizeString
 import org.fossify.commons.extensions.onTextChangeListener
 import org.fossify.commons.extensions.toast
@@ -33,7 +32,6 @@ import org.fossify.commons.helpers.NavigationIcon
 import org.fossify.commons.helpers.PERMISSION_READ_CONTACTS
 import org.fossify.commons.helpers.SimpleContactsHelper
 import org.fossify.commons.helpers.ensureBackgroundThread
-import org.fossify.commons.models.RadioItem
 import org.fossify.commons.models.SimpleContact
 import org.fossify.messages.R
 import org.fossify.messages.adapters.ContactsAdapter
@@ -200,30 +198,8 @@ class NewConversationActivity : SimpleActivity() {
             ContactsAdapter(this, contacts, binding.contactsList) {
                 hideKeyboard()
                 val contact = it as SimpleContact
-                val phoneNumbers = contact.phoneNumbers
-                if (phoneNumbers.size > 1) {
-                    val primaryNumber = contact.phoneNumbers.find { it.isPrimary }
-                    if (primaryNumber != null) {
-                        launchThreadActivity(primaryNumber.value, contact.name)
-                    } else {
-                        val items = ArrayList<RadioItem>()
-                        phoneNumbers.forEachIndexed { index, phoneNumber ->
-                            val type = getPhoneNumberTypeText(phoneNumber.type, phoneNumber.label)
-                            items.add(
-                                RadioItem(
-                                    index,
-                                    "${phoneNumber.normalizedNumber} ($type)",
-                                    phoneNumber.normalizedNumber
-                                )
-                            )
-                        }
-
-                        RadioGroupDialog(this, items) {
-                            launchThreadActivity(it as String, contact.name)
-                        }
-                    }
-                } else {
-                    launchThreadActivity(phoneNumbers.first().normalizedNumber, contact.name)
+                maybeShowNumberPickerDialog(contact.phoneNumbers) { number ->
+                    launchThreadActivity(number.normalizedNumber, contact.name)
                 }
             }.apply {
                 binding.contactsList.adapter = this

app/src/main/kotlin/org/fossify/messages/activities/ThreadActivity.kt

@@ -79,6 +79,7 @@ import org.fossify.commons.extensions.isDynamicTheme
 import org.fossify.commons.extensions.isOrWasThankYouInstalled
 import org.fossify.commons.extensions.isVisible
 import org.fossify.commons.extensions.launchActivityIntent
+import org.fossify.commons.extensions.maybeShowNumberPickerDialog
 import org.fossify.commons.extensions.normalizeString
 import org.fossify.commons.extensions.notificationManager
 import org.fossify.commons.extensions.onTextChangeListener
@@ -623,7 +624,12 @@ class ThreadActivity : SimpleActivity() {
                     val currContacts =
                         (binding.addContactOrNumber.adapter as AutoCompleteTextViewAdapter).resultList
                     val selectedContact = currContacts[position]
-                    addSelectedContact(selectedContact)
+                    maybeShowNumberPickerDialog(selectedContact.phoneNumbers) { phoneNumber ->
+                        val contactWithSelectedNumber = selectedContact.copy(
+                            phoneNumbers = arrayListOf(phoneNumber)
+                        )
+                        addSelectedContact(contactWithSelectedNumber)
+                    }
                 }
 
                 binding.addContactOrNumber.onTextChangeListener {

app/src/main/res/menu/menu_thread.xml

@@ -23,10 +23,9 @@
         app:showAsAction="always" />
     <item
         android:id="@+id/manage_people"
-        android:icon="@drawable/ic_add_person_vector"
-        android:showAsAction="ifRoom"
+        android:showAsAction="never"
         android:title="@string/add_person"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="never" />
     <item
         android:id="@+id/add_number_to_contact"
         android:title="@string/add_number_to_contact"