Some fixes

T8RIN · Mar 12, 2023 · 6732306 · 6732306
1 parent 6b4269a
commit 6732306
Show file tree

Hide file tree

Showing 11 changed files with 363 additions and 348 deletions.
diff --git a/app/src/main/java/ru/tech/imageresizershrinker/batch_resize/BatchResizeScreen.kt b/app/src/main/java/ru/tech/imageresizershrinker/batch_resize/BatchResizeScreen.kt
@@ -78,10 +78,11 @@ fun BatchResizeScreen(
     pushNewUris: (List<Uri>?) -> Unit,
     getSavingFolder: (name: String, ext: String) -> SavingFolder,
     savingPathString: String,
+    showConfetti: () -> Unit,
     viewModel: BatchResizeViewModel = viewModel()
 ) {
     val context = LocalContext.current as ComponentActivity
-    val toastHostState = rememberToastHostState()
+    val toastHostState = LocalToastHost.current
     val scope = rememberCoroutineScope()
     val themeState = LocalDynamicThemeState.current
 
@@ -172,6 +173,7 @@ fun BatchResizeScreen(
                 }
             }
             showSaveLoading = false
+            showConfetti()
         }
     }
 
@@ -844,7 +846,6 @@ fun BatchResizeScreen(
                 }
             }
 
-            ToastHost(hostState = toastHostState)
             BackHandler {
                 if (viewModel.uris?.isNotEmpty() == true) showExitDialog = true
                 else if (navController.backstack.entries.isNotEmpty()) {

diff --git a/app/src/main/java/ru/tech/imageresizershrinker/bytes_resize_screen/BytesResizeScreen.kt b/app/src/main/java/ru/tech/imageresizershrinker/bytes_resize_screen/BytesResizeScreen.kt
@@ -80,10 +80,11 @@ fun BytesResizeScreen(
     pushNewUris: (List<Uri>?) -> Unit,
     getSavingFolder: (name: String, ext: String) -> SavingFolder,
     savingPathString: String,
+    showConfetti: () -> Unit,
     viewModel: BytesResizeViewModel = viewModel()
 ) {
     val context = LocalContext.current as ComponentActivity
-    val toastHostState = rememberToastHostState()
+    val toastHostState = LocalToastHost.current
     val scope = rememberCoroutineScope()
     val themeState = LocalDynamicThemeState.current
 
@@ -176,6 +177,7 @@ fun BytesResizeScreen(
                 }
             }
             showSaveLoading = false
+            showConfetti()
         }
     }
 
@@ -657,7 +659,6 @@ fun BytesResizeScreen(
                 }
             }
 
-            ToastHost(hostState = toastHostState)
             BackHandler {
                 if (viewModel.uris?.isNotEmpty() == true) showExitDialog = true
                 else if (navController.backstack.entries.isNotEmpty()) {

diff --git a/app/src/main/java/ru/tech/imageresizershrinker/compare_screen/CompareScreen.kt b/app/src/main/java/ru/tech/imageresizershrinker/compare_screen/CompareScreen.kt
@@ -42,8 +42,7 @@ import ru.tech.imageresizershrinker.main_screen.components.Screen
 import ru.tech.imageresizershrinker.main_screen.components.block
 import ru.tech.imageresizershrinker.resize_screen.components.ImageNotPickedWidget
 import ru.tech.imageresizershrinker.resize_screen.components.LoadingDialog
-import ru.tech.imageresizershrinker.resize_screen.components.ToastHost
-import ru.tech.imageresizershrinker.resize_screen.components.rememberToastHostState
+import ru.tech.imageresizershrinker.resize_screen.components.LocalToastHost
 import ru.tech.imageresizershrinker.utils.BitmapUtils.getBitmapByUri
 import ru.tech.imageresizershrinker.widget.Marquee
 
@@ -57,7 +56,7 @@ fun CompareScreen(
     viewModel: CompareViewModel = viewModel()
 ) {
     val context = LocalContext.current
-    val toastHostState = rememberToastHostState()
+    val toastHostState = LocalToastHost.current
     val scope = rememberCoroutineScope()
     val themeState = LocalDynamicThemeState.current
 
@@ -289,7 +288,6 @@ fun CompareScreen(
 
     if (viewModel.isLoading) LoadingDialog()
 
-    ToastHost(hostState = toastHostState)
     BackHandler {
         if (navController.backstack.entries.isNotEmpty()) navController.pop()
         onGoBack()

diff --git a/app/src/main/java/ru/tech/imageresizershrinker/crop_screen/CropScreen.kt b/app/src/main/java/ru/tech/imageresizershrinker/crop_screen/CropScreen.kt
@@ -50,8 +50,7 @@ import ru.tech.imageresizershrinker.generate_palette.isScrollingUp
 import ru.tech.imageresizershrinker.main_screen.components.Screen
 import ru.tech.imageresizershrinker.resize_screen.components.ImageNotPickedWidget
 import ru.tech.imageresizershrinker.resize_screen.components.LoadingDialog
-import ru.tech.imageresizershrinker.resize_screen.components.ToastHost
-import ru.tech.imageresizershrinker.resize_screen.components.rememberToastHostState
+import ru.tech.imageresizershrinker.resize_screen.components.LocalToastHost
 import ru.tech.imageresizershrinker.utils.BitmapUtils.decodeBitmapFromUri
 import ru.tech.imageresizershrinker.utils.BitmapUtils.shareBitmap
 import ru.tech.imageresizershrinker.utils.ContextUtils.isExternalStorageWritable
@@ -68,10 +67,11 @@ fun CropScreen(
     pushNewUri: (Uri?) -> Unit,
     getSavingFolder: (name: String, ext: String) -> SavingFolder,
     savingPathString: String,
+    showConfetti: () -> Unit,
     viewModel: CropViewModel = viewModel()
 ) {
     val context = LocalContext.current as ComponentActivity
-    val toastHostState = rememberToastHostState()
+    val toastHostState = LocalToastHost.current
     val scope = rememberCoroutineScope()
     val themeState = LocalDynamicThemeState.current
 
@@ -157,6 +157,7 @@ fun CropScreen(
                 }
             }
             showSaveLoading = false
+            showConfetti()
         }
     }
 
@@ -417,7 +418,6 @@ fun CropScreen(
         )
     }
 
-    ToastHost(hostState = toastHostState)
     BackHandler {
         if (viewModel.bitmap != null) showExitDialog = true
         else if (navController.backstack.entries.isNotEmpty()) {

diff --git a/app/src/main/java/ru/tech/imageresizershrinker/generate_palette/GeneratePaletteScreen.kt b/app/src/main/java/ru/tech/imageresizershrinker/generate_palette/GeneratePaletteScreen.kt
@@ -49,8 +49,7 @@ import ru.tech.imageresizershrinker.pick_color_from_image.copyColorIntoClipboard
 import ru.tech.imageresizershrinker.pick_color_from_image.format
 import ru.tech.imageresizershrinker.resize_screen.components.ImageNotPickedWidget
 import ru.tech.imageresizershrinker.resize_screen.components.LoadingDialog
-import ru.tech.imageresizershrinker.resize_screen.components.ToastHost
-import ru.tech.imageresizershrinker.resize_screen.components.rememberToastHostState
+import ru.tech.imageresizershrinker.resize_screen.components.LocalToastHost
 import ru.tech.imageresizershrinker.theme.PaletteSwatch
 import ru.tech.imageresizershrinker.utils.BitmapUtils.decodeBitmapFromUri
 import ru.tech.imageresizershrinker.utils.LocalWindowSizeClass
@@ -66,7 +65,7 @@ fun GeneratePaletteScreen(
     viewModel: GeneratePaletteViewModel = viewModel()
 ) {
     val context = LocalContext.current
-    val toastHostState = rememberToastHostState()
+    val toastHostState = LocalToastHost.current
     val scope = rememberCoroutineScope()
     val themeState = LocalDynamicThemeState.current
 
@@ -345,7 +344,6 @@ fun GeneratePaletteScreen(
 
     if (viewModel.isLoading) LoadingDialog()
 
-    ToastHost(hostState = toastHostState)
     BackHandler {
         if (navController.backstack.entries.isNotEmpty()) navController.pop()
         onGoBack()