Merge pull request #1600 from keymapperorg/feature/320-group-key-maps

Feature/320 group key maps

Author: sds100

app/schemas/io.github.sds100.keymapper.data.db.AppDatabase/16.json

@@ -0,0 +1,18 @@
+package io.github.sds100.keymapper.home
+
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.Dp
+import androidx.navigation.NavHostController
+import io.github.sds100.keymapper.floating.ListFloatingLayoutsViewModel
+
+@Composable
+fun HomeFloatingLayoutsScreen(
+    modifier: Modifier = Modifier,
+    viewModel: ListFloatingLayoutsViewModel,
+    navController: NavHostController,
+    snackbarState: SnackbarHostState,
+    fabBottomPadding: Dp,
+) {
+}

app/src/free/java/io/github/sds100/keymapper/home/HomeFloatingLayoutsScreen.kt

@@ -4,7 +4,7 @@ import io.github.sds100.keymapper.actions.PerformActionsUseCase
 import io.github.sds100.keymapper.constraints.DetectConstraintsUseCase
 import io.github.sds100.keymapper.data.repositories.PreferenceRepository
 import io.github.sds100.keymapper.mappings.FingerprintGesturesSupportedUseCase
-import io.github.sds100.keymapper.mappings.PauseMappingsUseCase
+import io.github.sds100.keymapper.mappings.PauseKeyMapsUseCase
 import io.github.sds100.keymapper.mappings.keymaps.detection.DetectKeyMapsUseCase
 import io.github.sds100.keymapper.reroutekeyevents.RerouteKeyEventsUseCase
 import io.github.sds100.keymapper.system.devices.DevicesAdapter
@@ -25,7 +25,7 @@ class AccessibilityServiceController(
     detectKeyMapsUseCase: DetectKeyMapsUseCase,
     fingerprintGesturesSupportedUseCase: FingerprintGesturesSupportedUseCase,
     rerouteKeyEventsUseCase: RerouteKeyEventsUseCase,
-    pauseMappingsUseCase: PauseMappingsUseCase,
+    pauseKeyMapsUseCase: PauseKeyMapsUseCase,
     devicesAdapter: DevicesAdapter,
     suAdapter: SuAdapter,
     inputMethodAdapter: InputMethodAdapter,
@@ -40,7 +40,7 @@ class AccessibilityServiceController(
     detectKeyMapsUseCase,
     fingerprintGesturesSupportedUseCase,
     rerouteKeyEventsUseCase,
-    pauseMappingsUseCase,
+    pauseKeyMapsUseCase,
     devicesAdapter,
     suAdapter,
     inputMethodAdapter,

app/src/free/java/io/github/sds100/keymapper/mappings/keymaps/detection/KeyMapController.kt

@@ -218,7 +218,7 @@ class KeyMapperApp : MultiDexApplication() {
                 suAdapter,
                 permissionAdapter,
             ),
-            UseCases.pauseMappings(this),
+            UseCases.pauseKeyMaps(this),
             UseCases.showImePicker(this),
             UseCases.controlAccessibilityService(this),
             UseCases.toggleCompatibleIme(this),
@@ -231,7 +231,7 @@ class KeyMapperApp : MultiDexApplication() {
             appCoroutineScope,
             ServiceLocator.settingsRepository(this),
             ServiceLocator.inputMethodAdapter(this),
-            UseCases.pauseMappings(this),
+            UseCases.pauseKeyMaps(this),
             devicesAdapter,
             popupMessageAdapter,
             resourceProvider,

app/src/free/java/io/github/sds100/keymapper/system/accessibility/AccessibilityServiceController.kt

@@ -10,9 +10,11 @@ import io.github.sds100.keymapper.backup.BackupManagerImpl
 import io.github.sds100.keymapper.data.db.AppDatabase
 import io.github.sds100.keymapper.data.repositories.FloatingButtonRepository
 import io.github.sds100.keymapper.data.repositories.FloatingLayoutRepository
+import io.github.sds100.keymapper.data.repositories.GroupRepository
 import io.github.sds100.keymapper.data.repositories.PreferenceRepository
 import io.github.sds100.keymapper.data.repositories.RoomFloatingButtonRepository
 import io.github.sds100.keymapper.data.repositories.RoomFloatingLayoutRepository
+import io.github.sds100.keymapper.data.repositories.RoomGroupRepository
 import io.github.sds100.keymapper.data.repositories.RoomKeyMapRepository
 import io.github.sds100.keymapper.data.repositories.RoomLogRepository
 import io.github.sds100.keymapper.data.repositories.SettingsPreferenceRepository
@@ -138,6 +140,20 @@ object ServiceLocator {
         }
     }
 
+    @Volatile
+    private var groupRepository: GroupRepository? = null
+
+    fun groupRepository(context: Context): GroupRepository {
+        synchronized(this) {
+            return groupRepository ?: RoomGroupRepository(
+                database(context).groupDao(),
+                (context.applicationContext as KeyMapperApp).appCoroutineScope,
+            ).also {
+                this.groupRepository = it
+            }
+        }
+    }
+
     @Volatile
     private var backupManager: BackupManager? = null
 
@@ -156,6 +172,7 @@ object ServiceLocator {
         settingsRepository(context),
         floatingLayoutRepository(context),
         floatingButtonRepository(context),
+        groupRepository(context),
         soundsManager(context),
     )
 

app/src/main/java/io/github/sds100/keymapper/KeyMapperApp.kt

@@ -10,7 +10,7 @@ import io.github.sds100.keymapper.constraints.GetConstraintErrorUseCaseImpl
 import io.github.sds100.keymapper.floating.ListFloatingLayoutsUseCase
 import io.github.sds100.keymapper.floating.ListFloatingLayoutsUseCaseImpl
 import io.github.sds100.keymapper.mappings.FingerprintGesturesSupportedUseCaseImpl
-import io.github.sds100.keymapper.mappings.PauseMappingsUseCaseImpl
+import io.github.sds100.keymapper.mappings.PauseKeyMapsUseCaseImpl
 import io.github.sds100.keymapper.mappings.keymaps.ConfigKeyMapUseCase
 import io.github.sds100.keymapper.mappings.keymaps.CreateKeyMapShortcutUseCaseImpl
 import io.github.sds100.keymapper.mappings.keymaps.DisplayKeyMapUseCase
@@ -97,7 +97,7 @@ object UseCases {
 
     fun fingerprintGesturesSupported(ctx: Context) = FingerprintGesturesSupportedUseCaseImpl(ServiceLocator.settingsRepository(ctx))
 
-    fun pauseMappings(ctx: Context) = PauseMappingsUseCaseImpl(
+    fun pauseKeyMaps(ctx: Context) = PauseKeyMapsUseCaseImpl(
         ServiceLocator.settingsRepository(ctx),
         ServiceLocator.mediaAdapter(ctx),
     )
@@ -172,6 +172,7 @@ object UseCases {
     ) = DetectKeyMapsUseCaseImpl(
         ServiceLocator.roomKeyMapRepository(ctx),
         ServiceLocator.floatingButtonRepository(ctx),
+        ServiceLocator.groupRepository(ctx),
         ServiceLocator.settingsRepository(ctx),
         ServiceLocator.suAdapter(ctx),
         ServiceLocator.displayAdapter(ctx),

app/src/main/java/io/github/sds100/keymapper/ServiceLocator.kt

@@ -39,7 +39,7 @@ data class Action(
     }
 }
 
-object KeymapActionEntityMapper {
+object ActionEntityMapper {
     fun fromEntity(entity: ActionEntity): Action? {
         val data = ActionDataEntityMapper.fromEntity(entity) ?: return null
 

app/src/main/java/io/github/sds100/keymapper/UseCases.kt

@@ -1,7 +1,6 @@
 package io.github.sds100.keymapper.actions
 
 import io.github.sds100.keymapper.R
-import io.github.sds100.keymapper.home.ChooseAppStoreModel
 import io.github.sds100.keymapper.mappings.keymaps.ConfigKeyMapUseCase
 import io.github.sds100.keymapper.mappings.keymaps.KeyMap
 import io.github.sds100.keymapper.mappings.keymaps.ShortcutModel
@@ -14,6 +13,7 @@ import io.github.sds100.keymapper.util.getFullMessage
 import io.github.sds100.keymapper.util.isFixable
 import io.github.sds100.keymapper.util.mapData
 import io.github.sds100.keymapper.util.onFailure
+import io.github.sds100.keymapper.util.ui.ChooseAppStoreModel
 import io.github.sds100.keymapper.util.ui.DialogResponse
 import io.github.sds100.keymapper.util.ui.LinkType
 import io.github.sds100.keymapper.util.ui.NavDestination

app/src/main/java/io/github/sds100/keymapper/actions/Action.kt

@@ -16,7 +16,7 @@ class PauseMappingsBroadcastReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context?, intent: Intent?) {
         context ?: return
 
-        val useCase = UseCases.pauseMappings(context)
+        val useCase = UseCases.pauseKeyMaps(context)
 
         when (intent?.action) {
             Api.ACTION_PAUSE_MAPPINGS -> useCase.pause()