reduce padding in selection bottom sheet

Author: sds100

app/src/main/java/io/github/sds100/keymapper/groups/GroupRow.kt

@@ -66,14 +66,17 @@ fun GroupRow(
         },
         overflow = FlowRowOverflow.expandOrCollapseIndicator(
             expandIndicator = {
+                // Some padding is required on the end to stop it overflowing the screen.
                 ViewAllButton(
+                    modifier = Modifier.padding(end = 16.dp),
                     onClick = { viewAllState = true },
                     text = stringResource(R.string.home_new_view_all_groups_button),
                     enabled = enabled,
                 )
             },
             collapseIndicator = {
                 ViewAllButton(
+                    modifier = Modifier.padding(end = 16.dp),
                     onClick = { viewAllState = false },
                     text = stringResource(R.string.home_new_hide_groups_button),
                     enabled = enabled,

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

@@ -70,7 +70,7 @@ fun SelectionBottomSheet(
         tonalElevation = BottomSheetDefaults.Elevation,
         color = BottomSheetDefaults.ContainerColor,
     ) {
-        Column(Modifier.padding(16.dp)) {
+        Column {
             Row(
                 modifier = Modifier
                     .height(intrinsicSize = IntrinsicSize.Min),
@@ -80,6 +80,8 @@ fun SelectionBottomSheet(
                         .weight(1f)
                         .horizontalScroll(state = rememberScrollState()),
                 ) {
+                    Spacer(Modifier.width(16.dp))
+
                     SelectionButton(
                         text = stringResource(R.string.home_multi_select_duplicate),
                         icon = Icons.Rounded.ContentCopy,
@@ -100,17 +102,18 @@ fun SelectionBottomSheet(
                         enabled = enabled,
                         onClick = onExportClick,
                     )
+
+                    Spacer(Modifier.width(16.dp))
                 }
 
                 VerticalDivider(
-                    modifier = Modifier.padding(
-                        vertical = 8.dp,
-                        horizontal = 16.dp,
-                    ),
+                    modifier = Modifier.padding(vertical = 8.dp),
                 )
 
                 KeyMapsEnabledSwitch(
-                    modifier = Modifier.width(IntrinsicSize.Max),
+                    modifier = Modifier
+                        .padding(horizontal = 16.dp)
+                        .width(IntrinsicSize.Max),
                     state = selectedKeyMapsEnabled,
                     enabled = enabled,
                     onCheckedChange = onEnabledKeyMapsChange,
@@ -124,14 +127,15 @@ fun SelectionBottomSheet(
             Spacer(modifier = Modifier.height(8.dp))
 
             Text(
-                stringResource(R.string.home_move_to_group),
+                modifier = Modifier.padding(horizontal = 16.dp),
+                text = stringResource(R.string.home_move_to_group),
                 style = MaterialTheme.typography.labelLarge,
             )
 
-            Spacer(modifier = Modifier.height(16.dp))
-
             GroupRow(
-                modifier = Modifier.fillMaxWidth(),
+                modifier = Modifier
+                    .padding(horizontal = 16.dp, vertical = 4.dp)
+                    .fillMaxWidth(),
                 groups = groups,
                 onNewGroupClick = onNewGroupClick,
                 onGroupClick = onMoveToGroupClick,
@@ -254,6 +258,31 @@ private fun PreviewGroups() {
                     name = "Key Mapper",
                     icon = null,
                 ),
+                GroupListItemModel(
+                    uid = "3",
+                    name = "Key Mapper",
+                    icon = null,
+                ),
+                GroupListItemModel(
+                    uid = "3",
+                    name = "Key Mapper",
+                    icon = null,
+                ),
+                GroupListItemModel(
+                    uid = "3",
+                    name = "Key Mapper",
+                    icon = null,
+                ),
+                GroupListItemModel(
+                    uid = "3",
+                    name = "Key Mapper",
+                    icon = null,
+                ),
+                GroupListItemModel(
+                    uid = "3",
+                    name = "Key Mapper",
+                    icon = null,
+                ),
             ),
             selectedKeyMapsEnabled = SelectedKeyMapsEnabled.ALL,
             onDuplicateClick = {},