Merge pull request #308 from leonlatsch/master

leonlatsch · May 27, 2024 · e769bf5 · e769bf5
2 parents 1081497 + 28a47c5
commit e769bf5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/app/src/main/assets/open_source_licenses.json b/app/src/main/assets/open_source_licenses.json
diff --git a/...src/main/java/dev/leonlatsch/photok/gallery/albums/detail/ui/compose/AlbumDetailScreen.kt b/...src/main/java/dev/leonlatsch/photok/gallery/albums/detail/ui/compose/AlbumDetailScreen.kt
@@ -42,6 +42,7 @@ import androidx.navigation.NavController
 import dev.leonlatsch.photok.R
 import dev.leonlatsch.photok.gallery.albums.detail.ui.AlbumDetailUiEvent
 import dev.leonlatsch.photok.gallery.albums.detail.ui.AlbumDetailViewModel
+import dev.leonlatsch.photok.ui.components.ConfirmationDialog
 import dev.leonlatsch.photok.ui.theme.AppTheme
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -50,6 +51,8 @@ fun AlbumDetailScreen(viewModel: AlbumDetailViewModel, navController: NavControl
     val uiState by viewModel.uiState.collectAsState()
     val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()
 
+    var showConfirmDeleteDialog by remember { mutableStateOf(false) }
+
     AppTheme {
         Scaffold(
             topBar = {
@@ -83,7 +86,10 @@ fun AlbumDetailScreen(viewModel: AlbumDetailViewModel, navController: NavControl
                         ) {
                             DropdownMenuItem(
                                 text = { Text(stringResource(R.string.common_delete)) },
-                                onClick = { viewModel.handleUiEvent(AlbumDetailUiEvent.DeleteAlbum) },
+                                onClick = {
+                                    showMore = false
+                                    showConfirmDeleteDialog = true
+                                },
                                 leadingIcon = {
                                     Icon(
                                         painter = painterResource(R.drawable.ic_delete),
@@ -103,6 +109,13 @@ fun AlbumDetailScreen(viewModel: AlbumDetailViewModel, navController: NavControl
                     .padding(top = contentPadding.calculateTopPadding())
                     .nestedScroll(scrollBehavior.nestedScrollConnection)
             )
+
+            ConfirmationDialog(
+                show = showConfirmDeleteDialog,
+                onDismissRequest = { showConfirmDeleteDialog = false },
+                text = stringResource(R.string.common_are_you_sure),
+                onConfirm = { viewModel.handleUiEvent(AlbumDetailUiEvent.DeleteAlbum) }
+            )
         }
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,12 +1,12 @@
-#Thu Feb 22 14:12:51 UTC 2024
+#Sun May 26 21:51:40 UTC 2024
 android.nonTransitiveRClass=false
 kotlin.code.style=official
 kapt.incremental.apt=true
 android.defaults.buildfeatures.buildconfig=true
 android.nonFinalResIds=false
 android.databinding.incremental=true
-appVersionName=1.6.0
+appVersionName=1.7.0
 org.gradle.jvmargs=-Xmx2048m
-appVersionCode=27
+appVersionCode=28
 android.useAndroidX=true
 android.enableJetifier=true