diff --git a/app/src/main/java/com/aurora/store/compose/ui/favourite/FavouriteScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/favourite/FavouriteScreen.kt index 82e909c77..cd6e9b867 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/favourite/FavouriteScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/favourite/FavouriteScreen.kt @@ -117,7 +117,7 @@ private fun ScreenContent( @Composable fun SetupMenu() { - FavouriteMenu { menuItem -> + FavouriteMenu(items = favourites.itemCount) { menuItem -> when (menuItem) { MenuItem.IMPORT -> onImportFavourites() MenuItem.EXPORT -> onExportFavourites() @@ -130,7 +130,7 @@ private fun ScreenContent( TopAppBar( title = stringResource(R.string.title_favourites_manager), onNavigateUp = onNavigateUp, - actions = { if (favourites.itemCount != 0) SetupMenu() } + actions = { SetupMenu() } ) } ) { paddingValues -> diff --git a/app/src/main/java/com/aurora/store/compose/ui/favourite/menu/FavouriteMenu.kt b/app/src/main/java/com/aurora/store/compose/ui/favourite/menu/FavouriteMenu.kt index 93604236d..11eedd5fd 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/favourite/menu/FavouriteMenu.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/favourite/menu/FavouriteMenu.kt @@ -34,6 +34,7 @@ import com.aurora.store.compose.preview.ThemePreviewProvider fun FavouriteMenu( modifier: Modifier = Modifier, isExpanded: Boolean = false, + items: Int = 0, onMenuItemClicked: (menuItem: MenuItem) -> Unit = {} ) { var expanded by remember { mutableStateOf(isExpanded) } @@ -56,7 +57,8 @@ fun FavouriteMenu( ) DropdownMenuItem( text = { Text(text = stringResource(R.string.action_export)) }, - onClick = { onClick(MenuItem.EXPORT) } + onClick = { onClick(MenuItem.EXPORT) }, + enabled = items > 0 ) } }