#320 fix tests and other tweaks

Author: sds100

app/src/main/java/io/github/sds100/keymapper/backup/BackupManager.kt

@@ -457,7 +457,7 @@ class BackupManagerImpl(
             if (backupContent.groups != null) {
                 val groupUids = backupContent.groups.map { it.uid }.toMutableSet()
 
-                groupRepository.groups.first()
+                groupRepository.getAllGroups().first()
                     .map { it.uid }
                     .toSet()
                     .also { groupUids.addAll(it) }

app/src/main/java/io/github/sds100/keymapper/data/repositories/GroupRepository.kt

@@ -20,8 +20,8 @@ interface GroupRepository {
 
     fun getKeyMapsByGroup(groupUid: String): Flow<KeyMapEntitiesWithGroup>
     suspend fun getGroup(uid: String): GroupEntity?
-    suspend fun getAllGroups(): Flow<List<GroupEntity>>
-    suspend fun getGroups(vararg uid: String): Flow<List<GroupEntity>>
+    fun getAllGroups(): Flow<List<GroupEntity>>
+    fun getGroups(vararg uid: String): Flow<List<GroupEntity>>
     fun getGroupsByParent(uid: String?): Flow<List<GroupEntity>>
     fun getGroupWithSubGroups(uid: String): Flow<GroupEntityWithSubGroups>
     suspend fun insert(groupEntity: GroupEntity)
@@ -46,12 +46,12 @@ class RoomGroupRepository(
         return withContext(dispatchers.io()) { dao.getById(uid) }
     }
 
-    override suspend fun getAllGroups(): Flow<List<GroupEntity>> {
-        return withContext(dispatchers.io()) { dao.getAll() }
+    override fun getAllGroups(): Flow<List<GroupEntity>> {
+        return dao.getAll().flowOn(dispatchers.io())
     }
 
-    override suspend fun getGroups(vararg uid: String): Flow<List<GroupEntity>> {
-        return withContext(dispatchers.io()) { dao.getManyByIdFlow(*uid) }
+    override fun getGroups(vararg uid: String): Flow<List<GroupEntity>> {
+        return dao.getManyByIdFlow(*uid).flowOn(dispatchers.io())
     }
 
     override fun getGroupsByParent(uid: String?): Flow<List<GroupEntity>> {

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

@@ -4,6 +4,7 @@ import androidx.activity.compose.LocalActivity
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.animateContentSize
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.slideInHorizontally
@@ -30,16 +31,19 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
 import androidx.core.net.toUri
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import io.github.sds100.keymapper.R
@@ -137,6 +141,8 @@ fun HomeKeyMapListScreen(
     val uriHandler = LocalUriHandler.current
     val helpUrl = stringResource(R.string.url_quick_start_guide)
 
+    var keyMapListBottomPadding by remember { mutableStateOf(100.dp) }
+
     HomeKeyMapListScreen(
         modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
         snackbarState = snackbarState,
@@ -156,6 +162,7 @@ fun HomeKeyMapListScreen(
         },
         listContent = {
             KeyMapList(
+                modifier = Modifier.animateContentSize(),
                 lazyListState = rememberLazyListState(),
                 listItems = state.listItems,
                 footerText = stringResource(R.string.home_key_map_list_footer_text),
@@ -165,6 +172,7 @@ fun HomeKeyMapListScreen(
                 onSelectedChange = viewModel::onKeyMapSelectedChanged,
                 onFixClick = viewModel::onFixClick,
                 onTriggerErrorClick = viewModel::onFixTriggerError,
+                bottomListPadding = keyMapListBottomPadding,
             )
         },
         appBarContent = {
@@ -212,6 +220,10 @@ fun HomeKeyMapListScreen(
                     )
 
                 SelectionBottomSheet(
+                    modifier = Modifier.onSizeChanged { size ->
+                        keyMapListBottomPadding =
+                            ((size.height.dp / 2) - 100.dp).coerceAtLeast(0.dp)
+                    },
                     enabled = selectionState.selectionCount > 0,
                     groups = selectionState.groups,
                     selectedKeyMapsEnabled = selectionState.selectedKeyMapsEnabled,

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

@@ -49,6 +49,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.google.accompanist.drawablepainter.rememberDrawablePainter
@@ -77,6 +78,7 @@ fun KeyMapList(
     onSelectedChange: (String, Boolean) -> Unit = { _, _ -> },
     onFixClick: (Error) -> Unit = {},
     onTriggerErrorClick: (TriggerError) -> Unit = {},
+    bottomListPadding: Dp = 100.dp,
 ) {
     when (listItems) {
         is State.Loading -> {
@@ -101,6 +103,7 @@ fun KeyMapList(
                         onSelectedChange,
                         onFixClick,
                         onTriggerErrorClick,
+                        bottomListPadding,
                     )
                 }
             }
@@ -149,6 +152,7 @@ private fun LoadedKeyMapList(
     onSelectedChange: (String, Boolean) -> Unit,
     onFixClick: (Error) -> Unit,
     onTriggerErrorClick: (TriggerError) -> Unit,
+    bottomListPadding: Dp,
 ) {
     val haptics = LocalHapticFeedback.current
 
@@ -187,7 +191,7 @@ private fun LoadedKeyMapList(
 
         // Give some space at the end of the list so that the FAB doesn't block the items.
         item {
-            Spacer(Modifier.height(100.dp))
+            Spacer(Modifier.height(bottomListPadding))
         }
     }
 }

app/src/test/java/io/github/sds100/keymapper/BackupManagerTest.kt

@@ -12,6 +12,7 @@ import io.github.sds100.keymapper.data.entities.ActionEntity
 import io.github.sds100.keymapper.data.entities.EntityExtra
 import io.github.sds100.keymapper.data.entities.KeyMapEntity
 import io.github.sds100.keymapper.data.repositories.FakePreferenceRepository
+import io.github.sds100.keymapper.data.repositories.GroupRepository
 import io.github.sds100.keymapper.data.repositories.PreferenceRepository
 import io.github.sds100.keymapper.mappings.keymaps.KeyMapRepository
 import io.github.sds100.keymapper.system.files.FakeFileAdapter
@@ -43,6 +44,7 @@ import org.junit.runner.RunWith
 import org.mockito.junit.MockitoJUnitRunner
 import org.mockito.kotlin.any
 import org.mockito.kotlin.anyVararg
+import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.never
 import org.mockito.kotlin.times
@@ -109,6 +111,9 @@ class BackupManagerTest {
             uuidGenerator = mockUuidGenerator,
             floatingButtonRepository = mock {},
             floatingLayoutRepository = mock {},
+            groupRepository = mock<GroupRepository> {
+                on { getAllGroups() } doReturn MutableStateFlow(emptyList())
+            },
         )
 
         parser = JsonParser()