#1652 feat: Bring back the menu button to show input method picker

Author: sds100

CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [3.0.1](https://github.com/sds100/KeyMapper/releases/tag/v3.0.1)
 
+#### TO BE RELEASED
+
+## Added
+
+- #1652 Bring back the menu button to show input method picker
+
 ## Changed
 
 - #1654 The Key Mapper keyboard is now required again for Text actions because the accessibility service API does not work in all situations.

app/src/main/java/io/github/sds100/keymapper/home/HomeKeyMapListScreen.kt

@@ -188,6 +188,7 @@ fun HomeKeyMapListScreen(
                 onHelpClick = { uriHandler.openUriSafe(ctx, helpUrl) },
                 onExportClick = viewModel::onExportClick,
                 onImportClick = { importFileLauncher.launch(FileUtils.MIME_TYPE_ALL) },
+                onInputMethodPickerClick = viewModel::showInputMethodPicker,
                 onTogglePausedClick = viewModel::onTogglePausedClick,
                 onFixWarningClick = viewModel::onFixWarningClick,
                 onBackClick = {

app/src/main/java/io/github/sds100/keymapper/home/HomeViewModel.kt

@@ -19,6 +19,7 @@ import io.github.sds100.keymapper.mappings.keymaps.ListKeyMapsUseCase
 import io.github.sds100.keymapper.mappings.keymaps.trigger.SetupGuiKeyboardUseCase
 import io.github.sds100.keymapper.onboarding.OnboardingUseCase
 import io.github.sds100.keymapper.sorting.SortKeyMapsUseCase
+import io.github.sds100.keymapper.system.inputmethod.ShowInputMethodPickerUseCase
 import io.github.sds100.keymapper.util.ui.DialogResponse
 import io.github.sds100.keymapper.util.ui.NavigationViewModel
 import io.github.sds100.keymapper.util.ui.NavigationViewModelImpl
@@ -48,6 +49,7 @@ class HomeViewModel(
     private val setupGuiKeyboard: SetupGuiKeyboardUseCase,
     private val sortKeyMaps: SortKeyMapsUseCase,
     private val listFloatingLayouts: ListFloatingLayoutsUseCase,
+    private val showInputMethodPickerUseCase: ShowInputMethodPickerUseCase,
 ) : ViewModel(),
     ResourceProvider by resourceProvider,
     PopupViewModel by PopupViewModelImpl(),
@@ -78,6 +80,7 @@ class HomeViewModel(
             showAlertsUseCase,
             pauseKeyMaps,
             backupRestore,
+            showInputMethodPickerUseCase,
         )
     }
 
@@ -186,6 +189,7 @@ class HomeViewModel(
         private val setupGuiKeyboard: SetupGuiKeyboardUseCase,
         private val sortKeyMaps: SortKeyMapsUseCase,
         private val listFloatingLayouts: ListFloatingLayoutsUseCase,
+        private val showInputMethodPickerUseCase: ShowInputMethodPickerUseCase,
     ) : ViewModelProvider.NewInstanceFactory() {
 
         override fun <T : ViewModel> create(modelClass: Class<T>): T = HomeViewModel(
@@ -198,6 +202,7 @@ class HomeViewModel(
             setupGuiKeyboard,
             sortKeyMaps,
             listFloatingLayouts,
+            showInputMethodPickerUseCase,
         ) as T
     }
 }

app/src/main/java/io/github/sds100/keymapper/home/KeyMapListAppBar.kt

@@ -42,6 +42,7 @@ import androidx.compose.material.icons.rounded.Edit
 import androidx.compose.material.icons.rounded.ErrorOutline
 import androidx.compose.material.icons.rounded.Info
 import androidx.compose.material.icons.rounded.IosShare
+import androidx.compose.material.icons.rounded.Keyboard
 import androidx.compose.material.icons.rounded.MoreVert
 import androidx.compose.material.icons.rounded.PauseCircleOutline
 import androidx.compose.material.icons.rounded.PlayCircleOutline
@@ -122,6 +123,7 @@ fun KeyMapListAppBar(
     onFixWarningClick: (String) -> Unit = {},
     onExportClick: () -> Unit = {},
     onImportClick: () -> Unit = {},
+    onInputMethodPickerClick: () -> Unit = {},
     onBackClick: () -> Unit = {},
     onSelectAllClick: () -> Unit = {},
     scrollBehavior: TopAppBarScrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(),
@@ -186,6 +188,10 @@ fun KeyMapListAppBar(
                                     expandedDropdown = false
                                     onImportClick()
                                 },
+                                onInputMethodPickerClick = {
+                                    expandedDropdown = false
+                                    onInputMethodPickerClick()
+                                },
                                 onDismissRequest = { expandedDropdown = false },
                             )
                         },
@@ -827,6 +833,7 @@ private fun RootGroupDropdownMenu(
     onAboutClick: () -> Unit = {},
     onExportClick: () -> Unit = {},
     onImportClick: () -> Unit = {},
+    onInputMethodPickerClick: () -> Unit = {},
     onDismissRequest: () -> Unit = {},
 ) {
     DropdownMenu(
@@ -848,6 +855,11 @@ private fun RootGroupDropdownMenu(
             text = { Text(stringResource(R.string.home_menu_import)) },
             onClick = onImportClick,
         )
+        DropdownMenuItem(
+            leadingIcon = { Icon(Icons.Rounded.Keyboard, contentDescription = null) },
+            text = { Text(stringResource(R.string.home_menu_input_method_picker)) },
+            onClick = onInputMethodPickerClick,
+        )
         DropdownMenuItem(
             leadingIcon = { Icon(Icons.Rounded.Info, contentDescription = null) },
             text = { Text(stringResource(R.string.home_menu_about)) },

app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/KeyMapListViewModel.kt

@@ -26,6 +26,7 @@ import io.github.sds100.keymapper.mappings.keymaps.trigger.TriggerErrorSnapshot
 import io.github.sds100.keymapper.sorting.SortKeyMapsUseCase
 import io.github.sds100.keymapper.sorting.SortViewModel
 import io.github.sds100.keymapper.system.accessibility.ServiceState
+import io.github.sds100.keymapper.system.inputmethod.ShowInputMethodPickerUseCase
 import io.github.sds100.keymapper.system.permissions.Permission
 import io.github.sds100.keymapper.util.Error
 import io.github.sds100.keymapper.util.Result
@@ -82,6 +83,7 @@ class KeyMapListViewModel(
     private val showAlertsUseCase: ShowHomeScreenAlertsUseCase,
     private val pauseKeyMaps: PauseKeyMapsUseCase,
     private val backupRestore: BackupRestoreMappingsUseCase,
+    private val showInputMethodPickerUseCase: ShowInputMethodPickerUseCase,
 
 ) : PopupViewModel by PopupViewModelImpl(),
     ResourceProvider by resourceProvider,
@@ -845,6 +847,10 @@ class KeyMapListViewModel(
         }
     }
 
+    fun showInputMethodPicker() {
+        showInputMethodPickerUseCase.show(fromForeground = true)
+    }
+
     private suspend fun onAutomaticBackupResult(result: Result<*>) {
         when (result) {
             is Success -> {}

app/src/main/java/io/github/sds100/keymapper/util/Inject.kt

@@ -39,6 +39,7 @@ import io.github.sds100.keymapper.system.apps.ChooseAppViewModel
 import io.github.sds100.keymapper.system.apps.DisplayAppShortcutsUseCaseImpl
 import io.github.sds100.keymapper.system.bluetooth.ChooseBluetoothDeviceUseCaseImpl
 import io.github.sds100.keymapper.system.bluetooth.ChooseBluetoothDeviceViewModel
+import io.github.sds100.keymapper.system.inputmethod.ShowInputMethodPickerUseCaseImpl
 import io.github.sds100.keymapper.system.intents.ConfigIntentViewModel
 
 /**
@@ -182,6 +183,7 @@ object Inject {
             UseCases.displayKeyMap(ctx),
         ),
         UseCases.listFloatingLayouts(ctx),
+        ShowInputMethodPickerUseCaseImpl(ServiceLocator.inputMethodAdapter(ctx))
     )
 
     fun settingsViewModel(context: Context): SettingsViewModel.Factory = SettingsViewModel.Factory(

app/src/main/res/values/strings.xml

@@ -1355,6 +1355,7 @@
     <string name="home_menu_about">About</string>
     <string name="home_menu_export">Export all</string>
     <string name="home_menu_import">Import</string>
+    <string name="home_menu_input_method_picker">Choose keyboard</string>
     <string name="home_importing_snackbar">Importing…</string>
     <string name="home_importing_finished_snackbar">Importing successful!</string>
     <string name="home_exporting_snackbar">Exporting…</string>