allow inserting not saved numbers in New Message activity
This commit is contained in:
parent
3a23552326
commit
013fa62606
|
@ -3,12 +3,11 @@ package com.simplemobiletools.smsmessenger.activities
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.view.WindowManager
|
import android.view.WindowManager
|
||||||
import com.simplemobiletools.commons.extensions.hideKeyboard
|
import com.simplemobiletools.commons.extensions.*
|
||||||
import com.simplemobiletools.commons.extensions.onTextChangeListener
|
|
||||||
import com.simplemobiletools.commons.extensions.updateTextColors
|
|
||||||
import com.simplemobiletools.commons.helpers.PERMISSION_READ_CONTACTS
|
import com.simplemobiletools.commons.helpers.PERMISSION_READ_CONTACTS
|
||||||
import com.simplemobiletools.smsmessenger.R
|
import com.simplemobiletools.smsmessenger.R
|
||||||
import com.simplemobiletools.smsmessenger.adapters.ContactsAdapter
|
import com.simplemobiletools.smsmessenger.adapters.ContactsAdapter
|
||||||
|
import com.simplemobiletools.smsmessenger.extensions.config
|
||||||
import com.simplemobiletools.smsmessenger.extensions.getAvailableContacts
|
import com.simplemobiletools.smsmessenger.extensions.getAvailableContacts
|
||||||
import com.simplemobiletools.smsmessenger.extensions.getThreadId
|
import com.simplemobiletools.smsmessenger.extensions.getThreadId
|
||||||
import com.simplemobiletools.smsmessenger.helpers.THREAD_ID
|
import com.simplemobiletools.smsmessenger.helpers.THREAD_ID
|
||||||
|
@ -54,20 +53,32 @@ class NewMessageActivity : SimpleActivity() {
|
||||||
|
|
||||||
filteredContacts.sortWith(compareBy { !it.name.startsWith(searchString, true) })
|
filteredContacts.sortWith(compareBy { !it.name.startsWith(searchString, true) })
|
||||||
setupAdapter(filteredContacts)
|
setupAdapter(filteredContacts)
|
||||||
|
|
||||||
|
new_message_confirm.beVisibleIf(searchString.length > 2)
|
||||||
|
}
|
||||||
|
|
||||||
|
new_message_confirm.applyColorFilter(config.textColor)
|
||||||
|
new_message_confirm.setOnClickListener {
|
||||||
|
val number = new_message_to.value
|
||||||
|
launchThreadActivity(number, number)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setupAdapter(contacts: ArrayList<Contact>) {
|
private fun setupAdapter(contacts: ArrayList<Contact>) {
|
||||||
ContactsAdapter(this, contacts, suggestions_list, null) {
|
ContactsAdapter(this, contacts, suggestions_list, null) {
|
||||||
hideKeyboard()
|
hideKeyboard()
|
||||||
Intent(this, ThreadActivity::class.java).apply {
|
launchThreadActivity((it as Contact).phoneNumber, it.name)
|
||||||
putExtra(THREAD_ID, getThreadId((it as Contact).phoneNumber).toInt())
|
|
||||||
putExtra(THREAD_NAME, it.name)
|
|
||||||
putExtra(THREAD_NUMBER, it.phoneNumber)
|
|
||||||
startActivity(this)
|
|
||||||
}
|
|
||||||
}.apply {
|
}.apply {
|
||||||
suggestions_list.adapter = this
|
suggestions_list.adapter = this
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun launchThreadActivity(phoneNumber: String, name: String) {
|
||||||
|
Intent(this, ThreadActivity::class.java).apply {
|
||||||
|
putExtra(THREAD_ID, getThreadId(phoneNumber).toInt())
|
||||||
|
putExtra(THREAD_NAME, name)
|
||||||
|
putExtra(THREAD_NUMBER, phoneNumber)
|
||||||
|
startActivity(this)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,12 +11,25 @@
|
||||||
android:layout_height="@dimen/normal_icon_size"
|
android:layout_height="@dimen/normal_icon_size"
|
||||||
android:layout_marginStart="@dimen/activity_margin"
|
android:layout_marginStart="@dimen/activity_margin"
|
||||||
android:layout_marginEnd="@dimen/activity_margin"
|
android:layout_marginEnd="@dimen/activity_margin"
|
||||||
|
android:layout_toStartOf="@+id/new_message_confirm"
|
||||||
android:background="@android:color/transparent"
|
android:background="@android:color/transparent"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:hint="@string/select_contact_or_number"
|
android:hint="@string/select_contact_or_number"
|
||||||
android:inputType="textCapWords"
|
android:inputType="textCapWords"
|
||||||
android:textSize="@dimen/big_text_size" />
|
android:textSize="@dimen/big_text_size" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/new_message_confirm"
|
||||||
|
android:layout_width="@dimen/normal_icon_size"
|
||||||
|
android:layout_height="@dimen/normal_icon_size"
|
||||||
|
android:layout_alignTop="@+id/new_message_to"
|
||||||
|
android:layout_alignBottom="@+id/new_message_to"
|
||||||
|
android:layout_alignParentEnd="true"
|
||||||
|
android:background="?selectableItemBackgroundBorderless"
|
||||||
|
android:padding="@dimen/medium_margin"
|
||||||
|
android:src="@drawable/ic_check_vector"
|
||||||
|
android:visibility="gone" />
|
||||||
|
|
||||||
<View
|
<View
|
||||||
android:id="@+id/message_divider_two"
|
android:id="@+id/message_divider_two"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|
Loading…
Reference in New Issue