From e11d505409a5fc92cffe46a74f27c385c40c64ba Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Wed, 20 Mar 2024 20:29:22 -0600 Subject: [PATCH] opt.: rm settings of backup --- lib/data/model/app/backup.dart | 21 ------------------- lib/data/res/default.dart | 1 - lib/view/page/setting/seq/srv_detail_seq.dart | 5 ++--- 3 files changed, 2 insertions(+), 25 deletions(-) diff --git a/lib/data/model/app/backup.dart b/lib/data/model/app/backup.dart index a3b5571f..c04e8600 100644 --- a/lib/data/model/app/backup.dart +++ b/lib/data/model/app/backup.dart @@ -24,7 +24,6 @@ class Backup { final List snippets; final List keys; final Map container; - final Map settings; final Map history; final int? lastModTime; @@ -35,7 +34,6 @@ class Backup { required this.snippets, required this.keys, required this.container, - required this.settings, required this.history, this.lastModTime, }); @@ -52,7 +50,6 @@ class Backup { .map((e) => PrivateKeyInfo.fromJson(e)) .toList(), container = json['container'] ?? {}, - settings = json['settings'] ?? {}, lastModTime = json['lastModTime'], history = json['history'] ?? {}; @@ -63,7 +60,6 @@ class Backup { 'snippets': snippets, 'keys': keys, 'container': container, - 'settings': settings, 'lastModTime': lastModTime, 'history': history, }; @@ -75,7 +71,6 @@ class Backup { snippets = Stores.snippet.fetch(), keys = Stores.key.fetch(), container = Stores.container.box.toJson(), - settings = Stores.setting.box.toJson(), lastModTime = Stores.lastModTime, history = Stores.history.box.toJson(); @@ -95,22 +90,6 @@ class Backup { return; } - // Settings - final nowSettingsKeys = Stores.setting.box.keys.toSet(); - final bakSettingsKeys = settings.keys.toSet(); - final newSettingsKeys = bakSettingsKeys.difference(nowSettingsKeys); - final delSettingsKeys = nowSettingsKeys.difference(bakSettingsKeys); - final updateSettingsKeys = nowSettingsKeys.intersection(bakSettingsKeys); - for (final k in newSettingsKeys) { - Stores.setting.box.put(k, settings[k]); - } - for (final k in delSettingsKeys) { - Stores.setting.box.delete(k); - } - for (final k in updateSettingsKeys) { - Stores.setting.box.put(k, settings[k]); - } - // Snippets final nowSnippets = Stores.snippet.box.keys.toSet(); final bakSnippets = snippets.map((e) => e.name).toSet(); diff --git a/lib/data/res/default.dart b/lib/data/res/default.dart index 25a48642..4a3dab5b 100644 --- a/lib/data/res/default.dart +++ b/lib/data/res/default.dart @@ -1,6 +1,5 @@ import 'dart:ui'; - abstract final class Defaults { static const primaryColor = Color.fromARGB(255, 145, 58, 31); diff --git a/lib/view/page/setting/seq/srv_detail_seq.dart b/lib/view/page/setting/seq/srv_detail_seq.dart index c29ea75d..91420316 100644 --- a/lib/view/page/setting/seq/srv_detail_seq.dart +++ b/lib/view/page/setting/seq/srv_detail_seq.dart @@ -42,9 +42,8 @@ class _ServerDetailOrderPageState extends State { return ServerDetailCards.names; } }(); - final disabled = ServerDetailCards.names - .where((e) => !keys.contains(e)) - .toList(); + final disabled = + ServerDetailCards.names.where((e) => !keys.contains(e)).toList(); final allKeys = [...keys, ...disabled]; return ReorderableListView.builder( padding: const EdgeInsets.all(7),