Support for Q Roles

Closes #1409
This commit is contained in:
moezbhatti
2019-10-28 00:26:32 -04:00
parent 24e185ee62
commit d1d99f5283
12 changed files with 47 additions and 15 deletions
@@ -43,6 +43,7 @@ import com.google.android.material.snackbar.Snackbar
import com.jakewharton.rxbinding2.view.clicks
import com.jakewharton.rxbinding2.widget.textChanges
import com.moez.QKSMS.R
import com.moez.QKSMS.common.Navigator
import com.moez.QKSMS.common.base.QkThemedActivity
import com.moez.QKSMS.common.util.DateFormatter
import com.moez.QKSMS.common.util.extensions.autoScrollToStart
@@ -78,6 +79,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
@Inject lateinit var contactsAdapter: ContactAdapter
@Inject lateinit var dateFormatter: DateFormatter
@Inject lateinit var messageAdapter: MessagesAdapter
@Inject lateinit var navigator: Navigator
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
override val activityVisibleIntent: Subject<Boolean> = PublishSubject.create()
@@ -250,6 +252,10 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
.show()
}
override fun requestDefaultSms() {
navigator.showDefaultSmsDialog(this)
}
override fun requestStoragePermission() {
ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), 0)
}
@@ -61,6 +61,7 @@ interface ComposeView : QkView<ComposeState> {
fun clearSelection()
fun showDetails(details: String)
fun requestDefaultSms()
fun requestStoragePermission()
fun requestSmsPermission()
fun requestCamera()
@@ -357,7 +357,7 @@ class ComposeViewModel @Inject constructor(
// Delete the messages
view.optionsItemIntent
.filter { it == R.id.delete }
.filter { permissionManager.isDefaultSms().also { if (!it) navigator.showDefaultSmsDialog() } }
.filter { permissionManager.isDefaultSms().also { if (!it) view.requestDefaultSms() } }
.withLatestFrom(view.messagesSelectedIntent, conversation) { _, messages, conversation ->
deleteMessages.execute(DeleteMessages.Params(messages, conversation.id))
}
@@ -631,7 +631,7 @@ class ComposeViewModel @Inject constructor(
// Send a message when the send button is clicked, and disable editing mode if it's enabled
view.sendIntent
.filter { permissionManager.isDefaultSms().also { if (!it) navigator.showDefaultSmsDialog() } }
.filter { permissionManager.isDefaultSms().also { if (!it) view.requestDefaultSms() } }
.filter { permissionManager.hasSendSms().also { if (!it) view.requestSmsPermission() } }
.withLatestFrom(view.textChangedIntent) { _, body -> body }
.map { body -> body.toString() }