new: backup support settings

lib/data/model/app/backup.dart

@@ -10,6 +10,7 @@ class Backup {
   final List<Snippet> snippets;
   final List<PrivateKeyInfo> keys;
   final Map<String, String> dockerHosts;
+  final Map<String, dynamic> settings;
 
   Backup({
     required this.version,
@@ -18,6 +19,7 @@ class Backup {
     required this.snippets,
     required this.keys,
     required this.dockerHosts,
+    required this.settings,
   });
 
   Backup.fromJson(Map<String, dynamic> json)
@@ -31,7 +33,8 @@ class Backup {
         keys = (json['keys'] as List)
             .map((e) => PrivateKeyInfo.fromJson(e))
             .toList(),
-        dockerHosts = json['dockerHosts'] ?? {};
+        dockerHosts = json['dockerHosts'] ?? {},
+        settings = json['settings'] ?? {};
 
   Map<String, dynamic> toJson() => {
         'version': version,
@@ -39,5 +42,7 @@ class Backup {
         'spis': spis,
         'snippets': snippets,
         'keys': keys,
+        'dockerHosts': dockerHosts,
+        'settings': settings,
       };
 }

lib/view/page/backup.dart

@@ -7,16 +7,16 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:toolbox/core/extension/context.dart';
 import 'package:toolbox/data/res/path.dart';
+import 'package:toolbox/view/widget/round_rect_card.dart';
 
-import '../../core/extension/colorx.dart';
 import '../../core/utils/misc.dart';
 import '../../core/utils/ui.dart';
 import '../../data/model/app/backup.dart';
-import '../../data/res/color.dart';
 import '../../data/res/ui.dart';
 import '../../data/store/docker.dart';
 import '../../data/store/private_key.dart';
 import '../../data/store/server.dart';
+import '../../data/store/setting.dart';
 import '../../data/store/snippet.dart';
 import '../../locator.dart';
 import '../widget/custom_appbar.dart';
@@ -30,6 +30,7 @@ class BackupPage extends StatelessWidget {
   final _snippet = locator<SnippetStore>();
   final _privateKey = locator<PrivateKeyStore>();
   final _dockerHosts = locator<DockerStore>();
+  final _setting = locator<SettingStore>();
 
   @override
   Widget build(BuildContext context) {
@@ -56,8 +57,55 @@ class BackupPage extends StatelessWidget {
             textAlign: TextAlign.center,
           ),
         ),
-        const SizedBox(height: 107),
+        height77,
-        _buildCard(s.restore, Icons.download, media, () async {
+        _buildCard(
+          s.restore,
+          Icons.download,
+          media,
+          () => _onRestore(context, s),
+        ),
+        height13,
+        const SizedBox(
+          width: 37,
+          child: Divider(),
+        ),
+        height13,
+        _buildCard(
+          s.backup,
+          Icons.save,
+          media,
+          () => _onBackup(context, s),
+        )
+      ],
+    ));
+  }
+
+  Widget _buildCard(
+    String text,
+    IconData icon,
+    MediaQueryData media,
+    FutureOr Function() onTap,
+  ) {
+    return RoundRectCard(
+      InkWell(
+        onTap: onTap,
+        child: Padding(
+          padding: const EdgeInsets.symmetric(vertical: 7, horizontal: 17),
+          child: Row(
+            mainAxisSize: MainAxisSize.min,
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Icon(icon, size: 20),
+              width7,
+              Text(text),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Future<void> _onRestore(BuildContext context, S s) async {
     final path = await pickOneFile();
     if (path == null) {
       showSnackBar(context, Text(s.notSelected));
@@ -70,18 +118,9 @@ class BackupPage extends StatelessWidget {
     }
     final text = await file.readAsString();
     _import(text, context, s);
-        }),
+  }
-        height13,
+
-        const SizedBox(
+  Future<void> _onBackup(BuildContext context, S s) async {
-          width: 37,
-          child: Divider(),
-        ),
-        height13,
-        _buildCard(
-          s.backup,
-          Icons.file_upload,
-          media,
-          () async {
     final result = _diyEncrtpt(
       json.encode(
         Backup(
@@ -91,47 +130,13 @@ class BackupPage extends StatelessWidget {
           snippets: _snippet.fetch(),
           keys: _privateKey.fetch(),
           dockerHosts: _dockerHosts.fetchAll(),
+          settings: _setting.toJson(),
         ),
       ),
     );
     final path = '${(await docDir).path}/srvbox_bak.json';
     await File(path).writeAsString(result);
     await shareFiles(context, [path]);
-          },
-        )
-      ],
-    ));
-  }
-
-  Widget _buildCard(
-    String text,
-    IconData icon,
-    MediaQueryData media,
-    FutureOr Function() onTap,
-  ) {
-    final textColor = primaryColor.isBrightColor ? Colors.black : Colors.white;
-    return GestureDetector(
-      onTap: onTap,
-      child: Container(
-        decoration: BoxDecoration(
-            borderRadius: BorderRadius.circular(37), color: primaryColor),
-        child: Padding(
-          padding: const EdgeInsets.symmetric(vertical: 7, horizontal: 17),
-          child: Row(
-            mainAxisSize: MainAxisSize.min,
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              Icon(
-                icon,
-                color: textColor,
-              ),
-              width7,
-              Text(text, style: TextStyle(color: textColor)),
-            ],
-          ),
-        ),
-      ),
-    );
   }
 
   Future<void> _import(String text, BuildContext context, S s) async {

lib/view/page/home.dart

@@ -241,20 +241,20 @@ class _HomePageState extends State<HomePage>
             onTap: () => AppRoute.keyList().go(context),
           ),
           ListTile(
-            leading: const Icon(Icons.download),
+            leading: const Icon(Icons.file_open),
-            title: Text(_s.download),
+            title: Text(_s.files),
             onTap: () => AppRoute.localStorage().go(context),
           ),
-          ListTile(
-            leading: const Icon(Icons.import_export),
-            title: Text(_s.backup),
-            onTap: () => AppRoute.backup().go(context),
-          ),
           ListTile(
             leading: const Icon(Icons.code),
             title: Text(_s.convert),
             onTap: () => AppRoute.convert().go(context),
           ),
+          ListTile(
+            leading: const Icon(Icons.import_export),
+            title: Text(_s.backupAndRestore),
+            onTap: () => AppRoute.backup().go(context),
+          ),
           ListTile(
             leading: const Icon(Icons.text_snippet),
             title: Text('${_s.about} & ${_s.feedback}'),