Skip to content

#2106 fix: show dialog when using in-app keyboard switcher to disable auto-switch #2113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sds100 wants to merge 1 commit into
base: develop
Choose a base branch
from
+29 −1
Open

#2106 fix: show dialog when using in-app keyboard switcher to disable auto-switch #2113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...c/main/java/io/github/sds100/keymapper/base/actions/keyevent/FixKeyEventActionDelegate.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ class FixKeyEventActionDelegateImpl @Inject constructor(
preferenceRepository.get(Keys.keyEventActionsUseSystemBridge)
.map { it ?: PreferenceDefaults.KEY_EVENT_ACTIONS_USE_SYSTEM_BRIDGE }

override val isAutoSwitchImeEnabled: Flow<Boolean> =
preferenceRepository.get(Keys.changeImeOnInputFocus)
.map { it ?: PreferenceDefaults.CHANGE_IME_ON_INPUT_FOCUS }

private val showBottomSheet: MutableStateFlow<Boolean> = MutableStateFlow(false)

@OptIn(ExperimentalCoroutinesApi::class)
Expand Down Expand Up @@ -166,6 +170,7 @@ class FixKeyEventActionDelegateImpl @Inject constructor(

interface FixKeyEventActionDelegate {
val fixKeyEventActionState: StateFlow<FixKeyEventActionState?>
val isAutoSwitchImeEnabled: Flow<Boolean>

fun showFixKeyEventActionBottomSheet()
fun dismissFixKeyEventActionBottomSheet()
Expand Down
22 changes: 21 additions & 1 deletion base/src/main/java/io/github/sds100/keymapper/base/home/KeyMapListViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,7 +907,27 @@ class KeyMapListViewModel(
}

fun showInputMethodPicker() {
showInputMethodPickerUseCase.show(fromForeground = true)
coroutineScope.launch {
val autoSwitchEnabled = isAutoSwitchImeEnabled.first()

if (autoSwitchEnabled) {
val response = showDialog(
"disable_auto_switch_ime_dialog",
DialogModel.Alert(
title = getString(R.string.dialog_title_disable_auto_switch_ime),
message = getString(R.string.dialog_message_disable_auto_switch_ime),
positiveButtonText = getString(R.string.pos_ok),
negativeButtonText = getString(R.string.neg_cancel),
),
)

if (response != DialogResponse.POSITIVE) return@launch

onAutoSwitchImeCheckedChange(false)
}

showInputMethodPickerUseCase.show(fromForeground = true)
}
}

private suspend fun onAutomaticBackupResult(result: KMResult<*>) {
Expand Down
3 changes: 3 additions & 0 deletions base/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1901,4 +1901,7 @@
<string name="dialog_bug_report_discord_button">Open Discord</string>
<string name="dialog_bug_report_email_button">Email us</string>

<string name="dialog_title_disable_auto_switch_ime">Disable auto-switch keyboard?</string>
<string name="dialog_message_disable_auto_switch_ime">Choosing a keyboard here will disable the automatic keyboard switching feature. You can re-enable it in Settings.</string>

</resources>
Loading