diff --git a/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt b/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt index ce10166d..df81490f 100644 --- a/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt +++ b/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt @@ -108,6 +108,9 @@ class Preferences @Inject constructor( val black = rxPrefs.getBoolean("black", false) val autoColor = rxPrefs.getBoolean("autoColor", true) val systemFont = rxPrefs.getBoolean("systemFont", false) + val showStt = rxPrefs.getBoolean("showStt", true) + val showSttOffsetX = rxPrefs.getFloat("showSttOffsetX", Float.MIN_VALUE) + val showSttOffsetY = rxPrefs.getFloat("showSttOffsetY", Float.MIN_VALUE) val textSize = rxPrefs.getInteger("textSize", TEXT_SIZE_NORMAL) val blockingManager = rxPrefs.getInteger("blockingManager", BLOCKING_MANAGER_QKSMS) val drop = rxPrefs.getBoolean("drop", false) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt index 06de9b73..5c783439 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt @@ -32,14 +32,13 @@ import android.provider.MediaStore import android.speech.RecognizerIntent import android.text.format.DateFormat import android.view.ContextMenu -import android.view.GestureDetector -import android.view.GestureDetector.SimpleOnGestureListener +import android.view.DragEvent.ACTION_DRAG_ENDED +import android.view.DragEvent.ACTION_DRAG_EXITED +import android.view.DragEvent.ACTION_DROP import android.view.Menu import android.view.MenuItem -import android.view.MotionEvent import android.view.View -import android.view.View.OnTouchListener -import androidx.activity.result.contract.ActivityResultContracts +import android.widget.Toast import androidx.appcompat.app.AlertDialog import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintSet @@ -62,6 +61,7 @@ import dev.octoshrimpy.quik.common.base.QkThemedActivity import dev.octoshrimpy.quik.common.util.DateFormatter import dev.octoshrimpy.quik.common.util.extensions.autoScrollToStart import dev.octoshrimpy.quik.common.util.extensions.hideKeyboard +import dev.octoshrimpy.quik.common.util.extensions.makeToast import dev.octoshrimpy.quik.common.util.extensions.scrapViews import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint import dev.octoshrimpy.quik.common.util.extensions.setTint @@ -108,6 +108,9 @@ import kotlinx.android.synthetic.main.compose_activity.sendAsGroupBackground import kotlinx.android.synthetic.main.compose_activity.sendAsGroupSwitch import kotlinx.android.synthetic.main.compose_activity.sim import kotlinx.android.synthetic.main.compose_activity.simIndex +import kotlinx.android.synthetic.main.compose_activity.speechToTextFrame +import kotlinx.android.synthetic.main.compose_activity.speechToTextIcon +import kotlinx.android.synthetic.main.compose_activity.speechToTextIconBorder import kotlinx.android.synthetic.main.compose_activity.toolbarSubtitle import kotlinx.android.synthetic.main.compose_activity.toolbarTitle import kotlinx.android.synthetic.main.main_activity.toolbar @@ -160,31 +163,12 @@ class ComposeActivity : QkThemedActivity(), ComposeView { override val backPressedIntent: Subject = PublishSubject.create() override val confirmDeleteIntent: Subject> = PublishSubject.create() override val messageLinkAskIntent: Subject by lazy { messageAdapter.messageLinkClicks } + override val speechRecogniserIntent by lazy { speechToTextIcon.clicks() } private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ComposeViewModel::class.java] } private var cameraDestination: Uri? = null - private val speechResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> - if (result.resultCode != Activity.RESULT_OK) - return@registerForActivityResult - - // check returned results are good - val match = result.data?.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS) - if ((match === null) || (match.size < 1) || (match[0].isNullOrEmpty())) - return@registerForActivityResult - - // get the edit text view - val message = findViewById(R.id.message) - if (message === null) - return@registerForActivityResult - - // populate message box with data returned by STT, set cursor to end, and focus - message.append(match[0]) - message.setSelection(message.text.length) - message.requestFocus() - } - override fun onCreate(savedInstanceState: Bundle?) { AndroidInjection.inject(this) super.onCreate(savedInstanceState) @@ -215,58 +199,59 @@ class ComposeActivity : QkThemedActivity(), ComposeView { .doOnNext { loading.setTint(it.theme) } .doOnNext { attach.setBackgroundTint(it.theme) } .doOnNext { attach.setTint(it.textPrimary) } + .doOnNext { speechToTextIconBorder.setBackgroundTint(it.theme) } + .doOnNext { speechToTextIcon.setBackgroundTint(it.textPrimary) } + .doOnNext { speechToTextIcon.setTint(it.theme) } .doOnNext { messageAdapter.theme = it } .autoDisposable(scope()) .subscribe() - message.setOnTouchListener(object : OnTouchListener { - private val gestureDetector = - GestureDetector(this@ComposeActivity, object : SimpleOnGestureListener() { - private var lastUpEvent: MotionEvent? = null - - override fun onDoubleTap(e: MotionEvent): Boolean { - val speechRecognizerIntent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH) - .putExtra( - RecognizerIntent.EXTRA_LANGUAGE_MODEL, - RecognizerIntent.LANGUAGE_MODEL_FREE_FORM - ) - // include if want a custom message that the STT can (optionally) display .putExtra(RecognizerIntent.EXTRA_PROMPT, "Speak your message") - speechResultLauncher.launch(speechRecognizerIntent) - return true - } - - override fun onSingleTapConfirmed(e: MotionEvent): Boolean { - if (lastUpEvent !== null) { - message.onTouchEvent(lastUpEvent) - lastUpEvent?.recycle() - lastUpEvent = null - } - return true - } - - override fun onSingleTapUp(e: MotionEvent): Boolean { - lastUpEvent = MotionEvent.obtain(e) - return true // don't show soft keyboard on this event - } - }) - - override fun onTouch(v: View, e: MotionEvent): Boolean { - return gestureDetector.onTouchEvent(e) - } - }) - // context menu registration for message parts messagePartContextMenuRegistrar .mapNotNull { it } .autoDisposable(scope()) .subscribe { registerForContextMenu(it) } + // drag drop handlers for speech-to-text icon + speechToTextIcon.setOnLongClickListener { + it.startDragAndDrop(null, View.DragShadowBuilder(speechToTextFrame), null, 0) + speechToTextFrame.isVisible = false + + contentView.setOnDragListener { _, event -> + when (event.action) { + ACTION_DROP -> { + speechToTextFrame.x = (event.x - (speechToTextFrame.width / 2)) + speechToTextFrame.y =(event.y - (speechToTextFrame.height / 2)) + + // get offset from root view as a percentage of root view for saving + prefs.showSttOffsetX.set((speechToTextFrame.x - contentView.x) / contentView.width) + prefs.showSttOffsetY.set((speechToTextFrame.y - contentView.y) / contentView.height) + } + ACTION_DRAG_ENDED, ACTION_DRAG_EXITED -> { + speechToTextFrame.isVisible = true + } + } + true + } + true + } + window.callback = ComposeWindowCallback(window.callback, this) } override fun onStart() { super.onStart() activityVisibleIntent.onNext(true) + + // if first time stt icon is shown (since setting reset), pop up an instruction toast + if (prefs.showStt.get() && + (prefs.showSttOffsetX.get() == Float.MIN_VALUE) && + (prefs.showSttOffsetX.get() == Float.MIN_VALUE)) { + makeToast(R.string.compose_toast_drag_stt, Toast.LENGTH_LONG) + // reset to new flag value that indicates 'not first time through, but not customised' + prefs.showSttOffsetX.set(Float.MAX_VALUE) + prefs.showSttOffsetY.set(Float.MAX_VALUE) + } } override fun onPause() { @@ -375,6 +360,19 @@ class ComposeActivity : QkThemedActivity(), ComposeView { // if scheduling mode is set, show schedule dialog if (state.scheduling) scheduleAction.onNext(true) + + if (prefs.showStt.get()) { + speechToTextFrame.isVisible = true + + var xPercent = prefs.showSttOffsetX.get() + var yPercent = prefs.showSttOffsetY.get() + + // if the stt icon has a custom position, move it + if ((xPercent != Float.MAX_VALUE) && (yPercent != Float.MAX_VALUE)) { + speechToTextFrame.x = (contentView.x + (xPercent * contentView.width)) + speechToTextFrame.y = (contentView.y + (yPercent * contentView.height)) + } + } } override fun clearSelection() = messageAdapter.clearSelection() @@ -460,6 +458,18 @@ class ComposeActivity : QkThemedActivity(), ComposeView { startActivityForResult(intent, ComposeView.SelectContactRequestCode) } + override fun startSpeechRecognition() { + startActivityForResult( + Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH).putExtra( + RecognizerIntent.EXTRA_LANGUAGE_MODEL, + RecognizerIntent.LANGUAGE_MODEL_FREE_FORM + ), + // include below if want a custom message that the STT can (optionally) display + // .putExtra(RecognizerIntent.EXTRA_PROMPT, "Speak your message") + ComposeView.SpeechRecognitionRequestCode + ) + } + override fun themeChanged() { messageList.scrapViews() } @@ -576,6 +586,21 @@ class ComposeActivity : QkThemedActivity(), ComposeView { data?.data?.let(contactSelectedIntent::onNext) } + ComposeView.SpeechRecognitionRequestCode -> { + // check returned results are good + val match = data?.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS) + if ((match !== null) && (match.size > 0) && (!match[0].isNullOrEmpty())) { + // get the edit text view + val messageEditBox = findViewById(R.id.message) + if (messageEditBox !== null) { + // populate message box with data returned by STT, set cursor to end, and focus + messageEditBox.append(match[0]) + messageEditBox.setSelection(messageEditBox.text.length) + messageEditBox.requestFocus() + } + } + } + else -> super.onActivityResult(requestCode, resultCode, data) } } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt index 64f5669c..ef537990 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt @@ -34,8 +34,9 @@ interface ComposeView : QkView { companion object { const val SelectContactRequestCode = 0 const val TakePhotoRequestCode = 1 - const val AttachAFileRequestCode = 4 const val AttachContactRequestCode = 3 + const val AttachAFileRequestCode = 4 + const val SpeechRecognitionRequestCode = 5 const val CameraDestinationKey = "camera_destination" } @@ -73,6 +74,7 @@ interface ComposeView : QkView { val backPressedIntent: Observable val confirmDeleteIntent: Observable> val messageLinkAskIntent: Observable + val speechRecogniserIntent: Observable<*> fun clearSelection() fun toggleSelectAll() @@ -93,5 +95,6 @@ interface ComposeView : QkView { fun scrollToMessage(id: Long) fun showQksmsPlusSnackbar(@StringRes message: Int) fun showDeleteDialog( messages: List) + fun startSpeechRecognition() } \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt index 789e886b..b99423be 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt @@ -761,6 +761,11 @@ class ComposeViewModel @Inject constructor( .autoDisposable(view.scope()) .subscribe() + // speech recognition button clicked + view.speechRecogniserIntent + .autoDisposable(view.scope()) + .subscribe { view.startSpeechRecognition() } + // Send a message when the send button is clicked, and disable editing mode if it's enabled view.sendIntent .withLatestFrom(view.textChangedIntent) { _, body -> body.toString() } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt index 4c302dfe..54defd2d 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt @@ -184,6 +184,8 @@ class SettingsController : QkController newState { copy(autoColor = autoColor) } } disposables += prefs.systemFont.asObservable() - .subscribe { enabled -> newState { copy(systemFontEnabled = enabled) } } + .subscribe { enabled -> newState { copy(systemFontEnabled = enabled) } } + + disposables += prefs.showStt.asObservable() + .subscribe { enabled -> newState { copy(showStt = enabled) } } disposables += prefs.unicode.asObservable() .subscribe { enabled -> newState { copy(stripUnicodeEnabled = enabled) } } @@ -207,6 +210,12 @@ class SettingsPresenter @Inject constructor( R.id.systemFont -> prefs.systemFont.set(!prefs.systemFont.get()) + R.id.showStt -> { + prefs.showStt.set(!prefs.showStt.get()) + prefs.showSttOffsetX.set(Float.MIN_VALUE) + prefs.showSttOffsetY.set(Float.MIN_VALUE) + } + R.id.unicode -> prefs.unicode.set(!prefs.unicode.get()) R.id.mobileOnly -> prefs.mobileOnly.set(!prefs.mobileOnly.get()) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt index c87522bc..0b8b270d 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt @@ -39,6 +39,9 @@ data class SettingsState( val textSizeSummary: String = "", val textSizeId: Int = Preferences.TEXT_SIZE_NORMAL, val systemFontEnabled: Boolean = false, + val showStt: Boolean = true, + val showSttOffsetX: Float = Float.MIN_VALUE, + val showSttOffsetY: Float = Float.MAX_VALUE, val splitSmsEnabled: Boolean = false, val stripUnicodeEnabled: Boolean = false, val mobileOnly: Boolean = false, diff --git a/presentation/src/main/res/drawable/ic_speech_to_text_black.xml b/presentation/src/main/res/drawable/ic_speech_to_text_black.xml new file mode 100644 index 00000000..48de1c61 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_speech_to_text_black.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/layout/compose_activity.xml b/presentation/src/main/res/layout/compose_activity.xml index 95f8b1e4..fb19ed9a 100644 --- a/presentation/src/main/res/layout/compose_activity.xml +++ b/presentation/src/main/res/layout/compose_activity.xml @@ -27,6 +27,41 @@ android:orientation="vertical" tools:context="dev.octoshrimpy.quik.feature.compose.ComposeActivity"> + + + + + + + + + + Message item Attachment + Move the speech-to-text button anywhere you like + Sending… Delivered %s Failed to send. Tap to try again @@ -240,6 +242,7 @@ Automatic contact colors Font size Use system font + Show the speech-to-text button Automatic emoji Notifications Tap to customize