Skip to content

Commit 336012c

Browse files
committed
#1630 fix: show dropdown menu button in groups to sort key maps
1 parent 70a6b87 commit 336012c

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ fun KeyMapListAppBar(
160160
actions = {
161161
AppBarActions(
162162
onHelpClick,
163+
onSortClick,
163164
onSettingsClick,
164165
onAboutClick,
165166
onExportClick,
@@ -253,11 +254,13 @@ fun KeyMapListAppBar(
253254
AnimatedVisibility(!state.isEditingGroupName) {
254255
AppBarActions(
255256
onHelpClick,
257+
onSortClick,
256258
onSettingsClick,
257259
onAboutClick,
258260
onExportClick,
259261
onImportClick,
260262
showDeleteGroup = true,
263+
showSort = true,
261264
onDeleteGroupClick = {
262265
showDeleteGroupDialog = true
263266
},
@@ -529,11 +532,13 @@ private fun SelectingAppBar(
529532
@Composable
530533
private fun AppBarActions(
531534
onHelpClick: () -> Unit,
535+
onSortClick: () -> Unit,
532536
onSettingsClick: () -> Unit,
533537
onAboutClick: () -> Unit,
534538
onExportClick: () -> Unit,
535539
onImportClick: () -> Unit,
536540
showDeleteGroup: Boolean = false,
541+
showSort: Boolean = false,
537542
onDeleteGroupClick: () -> Unit = {},
538543
) {
539544
var expandedDropdown by rememberSaveable { mutableStateOf(false) }
@@ -555,6 +560,10 @@ private fun AppBarActions(
555560

556561
AppBarDropdownMenu(
557562
expanded = expandedDropdown,
563+
onSortClick = {
564+
expandedDropdown = false
565+
onSortClick()
566+
},
558567
onSettingsClick = {
559568
expandedDropdown = false
560569
onSettingsClick()
@@ -573,6 +582,7 @@ private fun AppBarActions(
573582
},
574583
onDismissRequest = { expandedDropdown = false },
575584
showDeleteGroup = showDeleteGroup,
585+
showSort = showSort,
576586
onDeleteGroupClick = {
577587
expandedDropdown = false
578588
onDeleteGroupClick()
@@ -810,12 +820,14 @@ private fun selectedTextTransition(
810820
@Composable
811821
private fun AppBarDropdownMenu(
812822
expanded: Boolean,
823+
onSortClick: () -> Unit = {},
813824
onSettingsClick: () -> Unit = {},
814825
onAboutClick: () -> Unit = {},
815826
onExportClick: () -> Unit = {},
816827
onImportClick: () -> Unit = {},
817828
onDismissRequest: () -> Unit = {},
818829
showDeleteGroup: Boolean = false,
830+
showSort: Boolean = false,
819831
onDeleteGroupClick: () -> Unit = {},
820832
) {
821833
DropdownMenu(
@@ -830,6 +842,14 @@ private fun AppBarDropdownMenu(
830842
)
831843
}
832844

845+
if (showSort) {
846+
DropdownMenuItem(
847+
leadingIcon = { Icon(Icons.AutoMirrored.Rounded.Sort, contentDescription = null) },
848+
text = { Text(stringResource(R.string.home_app_bar_sort)) },
849+
onClick = onSortClick,
850+
)
851+
}
852+
833853
DropdownMenuItem(
834854
leadingIcon = { Icon(Icons.Rounded.Settings, contentDescription = null) },
835855
text = { Text(stringResource(R.string.home_menu_settings)) },

0 commit comments

Comments
 (0)