From 565317d99c1a7c9b0d3bd650adeb420fd8cd9cf4 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Thu, 21 Dec 2023 22:41:48 -0500
Subject: [PATCH] Show MIUI warning more prominently in CreateBackupScreen

---
 .../screen/data/CreateBackupScreen.kt         | 97 +++++++++----------
 .../commonMain/resources/MR/base/strings.xml  |  2 +-
 2 files changed, 48 insertions(+), 51 deletions(-)

diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/data/CreateBackupScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/data/CreateBackupScreen.kt
index 261a1b20a..7fd166802 100644
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/data/CreateBackupScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/data/CreateBackupScreen.kt
@@ -4,10 +4,8 @@ import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -28,6 +26,7 @@ import cafe.adriel.voyager.core.model.rememberScreenModel
 import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import eu.kanade.presentation.components.AppBar
+import eu.kanade.presentation.components.WarningBanner
 import eu.kanade.presentation.util.Screen
 import eu.kanade.tachiyomi.data.backup.create.BackupCreateFlags
 import eu.kanade.tachiyomi.data.backup.create.BackupCreateJob
@@ -77,63 +76,61 @@ class CreateBackupScreen : Screen() {
                 )
             },
         ) { contentPadding ->
-            Column(
+            LazyColumn(
                 modifier = Modifier
                     .padding(contentPadding)
                     .fillMaxSize(),
             ) {
-                LazyColumn(
-                    modifier = Modifier
-                        .weight(1f)
-                        .padding(horizontal = MaterialTheme.padding.medium),
-                ) {
+                if (DeviceUtil.isMiui && DeviceUtil.isMiuiOptimizationDisabled()) {
                     item {
-                        LabeledCheckbox(
-                            label = stringResource(MR.strings.manga),
-                            checked = true,
-                            onCheckedChange = {},
-                            enabled = false,
-                        )
-                    }
-                    BackupChoices.forEach { (k, v) ->
-                        item {
-                            LabeledCheckbox(
-                                label = stringResource(v),
-                                checked = state.flags.contains(k),
-                                onCheckedChange = {
-                                    model.toggleFlag(k)
-                                },
-                            )
-                        }
+                        WarningBanner(MR.strings.restore_miui_warning)
                     }
                 }
-
-                HorizontalDivider()
-
-                Button(
-                    modifier = Modifier
-                        .padding(horizontal = 16.dp, vertical = 8.dp)
-                        .fillMaxWidth(),
-                    onClick = {
-                        if (!BackupCreateJob.isManualJobRunning(context)) {
-                            if (DeviceUtil.isMiui && DeviceUtil.isMiuiOptimizationDisabled()) {
-                                context.toast(MR.strings.restore_miui_warning, Toast.LENGTH_LONG)
-                            }
-                            try {
-                                chooseBackupDir.launch(Backup.getFilename())
-                            } catch (e: ActivityNotFoundException) {
-                                context.toast(MR.strings.file_picker_error)
-                            }
-                        } else {
-                            context.toast(MR.strings.backup_in_progress)
-                        }
-                    },
-                ) {
-                    Text(
-                        text = stringResource(MR.strings.action_create),
-                        color = MaterialTheme.colorScheme.onPrimary,
+                item {
+                    LabeledCheckbox(
+                        label = stringResource(MR.strings.manga),
+                        checked = true,
+                        onCheckedChange = {},
+                        enabled = false,
+                        modifier = Modifier.padding(horizontal = MaterialTheme.padding.medium),
                     )
                 }
+                BackupChoices.forEach { (k, v) ->
+                    item {
+                        LabeledCheckbox(
+                            label = stringResource(v),
+                            checked = state.flags.contains(k),
+                            onCheckedChange = {
+                                model.toggleFlag(k)
+                            },
+                            modifier = Modifier.padding(horizontal = MaterialTheme.padding.medium),
+                        )
+                    }
+                }
+            }
+
+            HorizontalDivider()
+
+            Button(
+                modifier = Modifier
+                    .padding(horizontal = 16.dp, vertical = 8.dp)
+                    .fillMaxWidth(),
+                onClick = {
+                    if (!BackupCreateJob.isManualJobRunning(context)) {
+                        try {
+                            chooseBackupDir.launch(Backup.getFilename())
+                        } catch (e: ActivityNotFoundException) {
+                            context.toast(MR.strings.file_picker_error)
+                        }
+                    } else {
+                        context.toast(MR.strings.backup_in_progress)
+                    }
+                },
+            ) {
+                Text(
+                    text = stringResource(MR.strings.action_create),
+                    color = MaterialTheme.colorScheme.onPrimary,
+                )
             }
         }
     }
diff --git a/i18n/src/commonMain/resources/MR/base/strings.xml b/i18n/src/commonMain/resources/MR/base/strings.xml
index 5711a53cc..0961e4706 100644
--- a/i18n/src/commonMain/resources/MR/base/strings.xml
+++ b/i18n/src/commonMain/resources/MR/base/strings.xml
@@ -521,7 +521,7 @@
     <string name="pref_storage_usage">Storage usage</string>
     <string name="pref_clear_chapter_cache">Clear chapter cache</string>
     <string name="used_cache">Used: %1$s</string>
-    <string name="cache_deleted">Cache cleared. %1$d files have been deleted</string>
+    <string name="cache_deleted">Cache cleared, %1$d files deleted</string>
     <string name="cache_delete_error">Error occurred while clearing</string>
     <string name="pref_auto_clear_chapter_cache">Clear chapter cache on app launch</string>