From ea2977268b0050af2dda5c53b00d66607d525634 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Thu, 16 Nov 2023 11:04:23 +0800
Subject: [PATCH] Follow upstream API changes

---
 .../kotlin/com/hippo/ehviewer/ui/scene/HistoryFragment.kt | 8 ++++----
 .../com/hippo/ehviewer/ui/settings/PreferenceWidgets.kt   | 4 ++--
 app/src/main/kotlin/com/hippo/ehviewer/ui/tools/Dialog.kt | 3 ++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/HistoryFragment.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/HistoryFragment.kt
index a1ceeb853..dd484800d 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/HistoryFragment.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/HistoryFragment.kt
@@ -35,7 +35,7 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.SwipeToDismiss
+import androidx.compose.material3.SwipeToDismissBox
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
@@ -144,10 +144,10 @@ fun HistoryScreen(navigator: NavController) {
                         },
                     )
                     LocalTouchSlopProvider(Settings.touchSlopFactor.toFloat()) {
-                        SwipeToDismiss(
+                        SwipeToDismissBox(
                             state = dismissState,
-                            background = {},
-                            dismissContent = {
+                            backgroundContent = {},
+                            content = {
                                 // TODO: item delete & add animation
                                 // Bug tracker: https://issuetracker.google.com/issues/150812265
                                 GalleryInfoListItem(
diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/PreferenceWidgets.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/PreferenceWidgets.kt
index fb15e9d57..ad42261c6 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/PreferenceWidgets.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/PreferenceWidgets.kt
@@ -12,8 +12,8 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.AlertDialogDefaults
+import androidx.compose.material3.BasicAlertDialog
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -159,7 +159,7 @@ fun SimpleMenuPreference(title: String, @ArrayRes entry: Int, @ArrayRes entryVal
 
 @Composable
 private fun ProgressDialog() {
-    AlertDialog(
+    BasicAlertDialog(
         onDismissRequest = { },
         properties = DialogProperties(dismissOnBackPress = false, dismissOnClickOutside = false),
     ) {
diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/Dialog.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/Dialog.kt
index 949d5bbba..276c1a215 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/Dialog.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/Dialog.kt
@@ -19,6 +19,7 @@ import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.Info
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.AlertDialogDefaults
+import androidx.compose.material3.BasicAlertDialog
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -201,7 +202,7 @@ class DialogState {
                     cont.resume(it)
                 }
             }
-            AlertDialog(
+            BasicAlertDialog(
                 onDismissRequest = { cont.cancel() },
                 properties = DialogProperties(usePlatformDefaultWidth = respectDefaultWidth),
                 content = {