opt.: backup & titlebar

lib/view/page/backup.dart

@@ -6,6 +6,7 @@ import 'package:toolbox/core/extension/context/common.dart';
 import 'package:toolbox/core/extension/context/dialog.dart';
 import 'package:toolbox/core/extension/context/locale.dart';
 import 'package:toolbox/core/extension/context/snackbar.dart';
+import 'package:toolbox/core/utils/misc.dart';
 import 'package:toolbox/core/utils/sync/icloud.dart';
 import 'package:toolbox/core/utils/platform/base.dart';
 import 'package:toolbox/core/utils/share.dart';
@@ -14,16 +15,14 @@ import 'package:toolbox/data/model/app/backup.dart';
 import 'package:toolbox/data/res/logger.dart';
 import 'package:toolbox/data/res/path.dart';
 import 'package:toolbox/data/res/store.dart';
+import 'package:toolbox/data/res/ui.dart';
+import 'package:toolbox/view/widget/appbar.dart';
 import 'package:toolbox/view/widget/expand_tile.dart';
 import 'package:toolbox/view/widget/cardx.dart';
 import 'package:toolbox/view/widget/input_field.dart';
 import 'package:toolbox/view/widget/store_switch.dart';
 import 'package:toolbox/view/widget/value_notifier.dart';
 
-import '../../core/utils/misc.dart';
-import '../../data/res/ui.dart';
-import '../widget/custom_appbar.dart';
-
 class BackupPage extends StatelessWidget {
   BackupPage({super.key});
 
@@ -86,57 +85,7 @@ class BackupPage extends StatelessWidget {
           ListTile(
             trailing: const Icon(Icons.restore),
             title: Text(l10n.restore),
-            onTap: () async {
-              final path = await pickOneFile();
-              if (path == null) return;
-
-              final file = File(path);
-              if (!await file.exists()) {
-                context.showSnackBar(l10n.fileNotExist(path));
-                return;
-              }
-
-              final text = await file.readAsString();
-              if (text.isEmpty) {
-                context.showSnackBar(l10n.fieldMustNotEmpty);
-                return;
-              }
-
-              try {
-                context.showLoadingDialog();
-                final backup =
-                    await compute(Backup.fromJsonString, text.trim());
-                if (backupFormatVersion != backup.version) {
-                  context.showSnackBar(l10n.backupVersionNotMatch);
-                  return;
-                }
-
-                await context.showRoundDialog(
-                  title: Text(l10n.restore),
-                  child: Text(l10n.askContinue(
-                    '${l10n.restore} ${l10n.backup}(${backup.date})',
-                  )),
-                  actions: [
-                    TextButton(
-                      onPressed: () => context.pop(),
-                      child: Text(l10n.cancel),
-                    ),
-                    TextButton(
-                      onPressed: () async {
-                        await backup.restore(force: true);
-                        context.pop();
-                      },
-                      child: Text(l10n.ok),
-                    ),
-                  ],
-                );
-              } catch (e, trace) {
-                Loggers.app.warning('Import backup failed', e, trace);
-                context.showSnackBar(e.toString());
-              } finally {
-                context.pop();
-              }
-            },
+            onTap: () async => _onTapFileRestore(context),
           ),
         ],
       ),
@@ -145,92 +94,25 @@ class BackupPage extends StatelessWidget {
 
   Widget _buildIcloud(BuildContext context) {
     return CardX(
-      ExpandTile(
-        leading: const Icon(Icons.cloud),
+      ListTile(
         title: const Text('iCloud'),
-        initiallyExpanded: true,
-        children: [
-          ListTile(
-            title: Text(l10n.auto),
-            trailing: StoreSwitch(
-              prop: Stores.setting.icloudSync,
-              validator: (p0) {
-                if (p0 && Stores.setting.webdavSync.fetch()) {
-                  context.showSnackBar(l10n.autoBackupConflict);
-                  return false;
-                }
-                return true;
-              },
-              callback: (val) async {
-                if (val) {
-                  icloudLoading.value = true;
-                  await ICloud.sync();
-                  icloudLoading.value = false;
-                }
-              },
-            ),
-          ),
-          ListTile(
-            title: Text(l10n.manual),
-            trailing: ValueBuilder(
-              listenable: icloudLoading,
-              build: () {
-                if (icloudLoading.value) {
-                  return UIs.centerSizedLoadingSmall;
-                }
-                return Row(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    TextButton(
-                      onPressed: () async {
-                        icloudLoading.value = true;
-                        try {
-                          final result = await ICloud.download(
-                            relativePath: Paths.bakName,
-                          );
-                          if (result != null) {
-                            Loggers.app
-                                .warning('Download backup failed: $result');
-                            return;
-                          }
-                        } catch (e, s) {
-                          Loggers.app.warning('Download backup failed', e, s);
-                          context.showSnackBar(e.toString());
-                          icloudLoading.value = false;
-                          return;
-                        }
-                        final dlFile =
-                            await File(await Paths.bak).readAsString();
-                        final dlBak =
-                            await compute(Backup.fromJsonString, dlFile);
-                        await dlBak.restore(force: true);
-                        icloudLoading.value = false;
-                      },
-                      child: Text(l10n.download),
-                    ),
-                    UIs.width7,
-                    TextButton(
-                      onPressed: () async {
-                        icloudLoading.value = true;
-                        await Backup.backup();
-                        final uploadResult =
-                            await ICloud.upload(relativePath: Paths.bakName);
-                        if (uploadResult != null) {
-                          Loggers.app.warning(
-                              'Upload iCloud backup failed: $uploadResult');
-                        } else {
-                          Loggers.app.info('Upload iCloud backup success');
-                        }
-                        icloudLoading.value = false;
-                      },
-                      child: Text(l10n.upload),
-                    ),
-                  ],
-                );
-              },
-            ),
-          ),
-        ],
+        trailing: StoreSwitch(
+          prop: Stores.setting.icloudSync,
+          validator: (p0) {
+            if (p0 && Stores.setting.webdavSync.fetch()) {
+              context.showSnackBar(l10n.autoBackupConflict);
+              return false;
+            }
+            return true;
+          },
+          callback: (val) async {
+            if (val) {
+              icloudLoading.value = true;
+              await ICloud.sync();
+              icloudLoading.value = false;
+            }
+          },
+        ),
       ),
     );
   }
@@ -245,67 +127,7 @@ class BackupPage extends StatelessWidget {
           ListTile(
             title: Text(l10n.setting),
             trailing: const Icon(Icons.settings),
-            onTap: () async {
-              final urlCtrl = TextEditingController(
-                text: Stores.setting.webdavUrl.fetch(),
-              );
-              final userCtrl = TextEditingController(
-                text: Stores.setting.webdavUser.fetch(),
-              );
-              final pwdCtrl = TextEditingController(
-                text: Stores.setting.webdavPwd.fetch(),
-              );
-              final result = await context.showRoundDialog<bool>(
-                title: const Text('WebDAV'),
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    Input(
-                      label: 'URL',
-                      hint: 'https://example.com/webdav/',
-                      controller: urlCtrl,
-                    ),
-                    Input(
-                      label: l10n.user,
-                      controller: userCtrl,
-                    ),
-                    Input(
-                      label: l10n.pwd,
-                      controller: pwdCtrl,
-                    ),
-                  ],
-                ),
-                actions: [
-                  TextButton(
-                    onPressed: () {
-                      context.pop(true);
-                    },
-                    child: Text(l10n.ok),
-                  ),
-                ],
-              );
-              if (result == true) {
-                final result = await Webdav.test(
-                  urlCtrl.text,
-                  userCtrl.text,
-                  pwdCtrl.text,
-                );
-                if (result == null) {
-                  context.showSnackBar(l10n.success);
-                } else {
-                  context.showSnackBar(result);
-                  return;
-                }
-                Webdav.changeClient(
-                  urlCtrl.text,
-                  userCtrl.text,
-                  pwdCtrl.text,
-                );
-                Stores.setting.webdavUrl.put(urlCtrl.text);
-                Stores.setting.webdavUser.put(userCtrl.text);
-                Stores.setting.webdavPwd.put(pwdCtrl.text);
-              }
-            },
+            onTap: () async => _onTapWebdavSetting(context),
           ),
           ListTile(
             title: Text(l10n.auto),
@@ -347,48 +169,12 @@ class BackupPage extends StatelessWidget {
                   mainAxisSize: MainAxisSize.min,
                   children: [
                     TextButton(
-                      onPressed: () async {
-                        webdavLoading.value = true;
-                        try {
-                          final result = await Webdav.download(
-                            relativePath: Paths.bakName,
-                          );
-                          if (result != null) {
-                            Loggers.app.warning(
-                                'Download webdav backup failed: $result');
-                            return;
-                          }
-                        } catch (e, s) {
-                          Loggers.app
-                              .warning('Download webdav backup failed', e, s);
-                          context.showSnackBar(e.toString());
-                          webdavLoading.value = false;
-                          return;
-                        }
-                        final dlFile =
-                            await File(await Paths.bak).readAsString();
-                        final dlBak =
-                            await compute(Backup.fromJsonString, dlFile);
-                        await dlBak.restore(force: true);
-                        webdavLoading.value = false;
-                      },
+                      onPressed: () async => _onTapWebdavDl(context),
                       child: Text(l10n.download),
                     ),
                     UIs.width7,
                     TextButton(
-                      onPressed: () async {
-                        webdavLoading.value = true;
-                        await Backup.backup();
-                        final uploadResult =
-                            await Webdav.upload(relativePath: Paths.bakName);
-                        if (uploadResult != null) {
-                          Loggers.app.warning(
-                              'Upload webdav backup failed: $uploadResult');
-                        } else {
-                          Loggers.app.info('Upload webdav backup success');
-                        }
-                        webdavLoading.value = false;
-                      },
+                      onPressed: () async => _onTapWebdavUp(context),
                       child: Text(l10n.upload),
                     ),
                   ],
@@ -400,4 +186,141 @@ class BackupPage extends StatelessWidget {
       ),
     );
   }
+
+  Future<void> _onTapFileRestore(BuildContext context) async {
+    final path = await pickOneFile();
+    if (path == null) return;
+
+    final file = File(path);
+    if (!await file.exists()) {
+      context.showSnackBar(l10n.fileNotExist(path));
+      return;
+    }
+
+    final text = await file.readAsString();
+    if (text.isEmpty) {
+      context.showSnackBar(l10n.fieldMustNotEmpty);
+      return;
+    }
+
+    try {
+      context.showLoadingDialog();
+      final backup = await compute(Backup.fromJsonString, text.trim());
+      if (backupFormatVersion != backup.version) {
+        context.showSnackBar(l10n.backupVersionNotMatch);
+        return;
+      }
+
+      await context.showRoundDialog(
+        title: Text(l10n.restore),
+        child: Text(l10n.askContinue(
+          '${l10n.restore} ${l10n.backup}(${backup.date})',
+        )),
+        actions: [
+          TextButton(
+            onPressed: () => context.pop(),
+            child: Text(l10n.cancel),
+          ),
+          TextButton(
+            onPressed: () async {
+              await backup.restore(force: true);
+              context.pop();
+            },
+            child: Text(l10n.ok),
+          ),
+        ],
+      );
+    } catch (e, trace) {
+      Loggers.app.warning('Import backup failed', e, trace);
+      context.showSnackBar(e.toString());
+    } finally {
+      context.pop();
+    }
+  }
+
+  Future<void> _onTapWebdavDl(BuildContext context) async {
+    webdavLoading.value = true;
+    try {
+      final result = await Webdav.download(
+        relativePath: Paths.bakName,
+      );
+      if (result != null) {
+        Loggers.app.warning('Download webdav backup failed: $result');
+        return;
+      }
+    } catch (e, s) {
+      Loggers.app.warning('Download webdav backup failed', e, s);
+      context.showSnackBar(e.toString());
+      webdavLoading.value = false;
+      return;
+    }
+    final dlFile = await File(await Paths.bak).readAsString();
+    final dlBak = await compute(Backup.fromJsonString, dlFile);
+    await dlBak.restore(force: true);
+    webdavLoading.value = false;
+  }
+
+  Future<void> _onTapWebdavUp(BuildContext context) async {
+    webdavLoading.value = true;
+    await Backup.backup();
+    final uploadResult = await Webdav.upload(relativePath: Paths.bakName);
+    if (uploadResult != null) {
+      Loggers.app.warning('Upload webdav backup failed: $uploadResult');
+    } else {
+      Loggers.app.info('Upload webdav backup success');
+    }
+    webdavLoading.value = false;
+  }
+
+  Future<void> _onTapWebdavSetting(BuildContext context) async {
+    final urlCtrl = TextEditingController(
+      text: Stores.setting.webdavUrl.fetch(),
+    );
+    final userCtrl = TextEditingController(
+      text: Stores.setting.webdavUser.fetch(),
+    );
+    final pwdCtrl = TextEditingController(
+      text: Stores.setting.webdavPwd.fetch(),
+    );
+    final result = await context.showRoundDialog<bool>(
+      title: const Text('WebDAV'),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Input(
+            label: 'URL',
+            hint: 'https://example.com/webdav/',
+            controller: urlCtrl,
+          ),
+          Input(
+            label: l10n.user,
+            controller: userCtrl,
+          ),
+          Input(
+            label: l10n.pwd,
+            controller: pwdCtrl,
+          ),
+        ],
+      ),
+      actions: [
+        TextButton(
+          onPressed: () {
+            context.pop(true);
+          },
+          child: Text(l10n.ok),
+        ),
+      ],
+    );
+    if (result == true) {
+      final result =
+          await Webdav.test(urlCtrl.text, userCtrl.text, pwdCtrl.text);
+      if (result == null) {
+        context.showSnackBar(l10n.success);
+      } else {
+        context.showSnackBar(result);
+        return;
+      }
+      Webdav.changeClient(urlCtrl.text, userCtrl.text, pwdCtrl.text);
+    }
+  }
 }