From e89ccd7ad4251964039ee89390ba0bff7179ddab Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Sat, 21 Oct 2023 19:02:21 +0800 Subject: [PATCH] fix: can't restore settings from backup --- ios/Runner.xcodeproj/project.pbxproj | 36 ++++++++++++++-------------- lib/core/route.dart | 3 ++- lib/data/model/app/backup.dart | 3 +++ lib/data/model/app/menu.dart | 4 ++-- lib/data/res/build_data.dart | 8 +++---- lib/view/page/setting/srv_seq.dart | 3 ++- macos/Runner/MainFlutterWindow.swift | 7 +++++- make.dart | 1 - 8 files changed, 37 insertions(+), 28 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 645a1981..334c5e7f 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -586,7 +586,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 597; + CURRENT_PROJECT_VERSION = 603; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -596,7 +596,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.597; + MARKETING_VERSION = 1.0.603; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -720,7 +720,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 597; + CURRENT_PROJECT_VERSION = 603; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -730,7 +730,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.597; + MARKETING_VERSION = 1.0.603; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -748,7 +748,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 597; + CURRENT_PROJECT_VERSION = 603; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -758,7 +758,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.597; + MARKETING_VERSION = 1.0.603; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -779,7 +779,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 597; + CURRENT_PROJECT_VERSION = 603; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -792,7 +792,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.597; + MARKETING_VERSION = 1.0.603; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; @@ -818,7 +818,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 597; + CURRENT_PROJECT_VERSION = 603; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -831,7 +831,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.597; + MARKETING_VERSION = 1.0.603; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -854,7 +854,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 597; + CURRENT_PROJECT_VERSION = 603; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -867,7 +867,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.597; + MARKETING_VERSION = 1.0.603; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -890,7 +890,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 597; + CURRENT_PROJECT_VERSION = 603; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -902,7 +902,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.597; + MARKETING_VERSION = 1.0.603; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; @@ -931,7 +931,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 597; + CURRENT_PROJECT_VERSION = 603; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -943,7 +943,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.597; + MARKETING_VERSION = 1.0.603; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = ServerBox; @@ -969,7 +969,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 597; + CURRENT_PROJECT_VERSION = 603; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -981,7 +981,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.597; + MARKETING_VERSION = 1.0.603; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = ServerBox; diff --git a/lib/core/route.dart b/lib/core/route.dart index 28d66bad..f36dbaff 100644 --- a/lib/core/route.dart +++ b/lib/core/route.dart @@ -209,7 +209,8 @@ class AppRoute { return AppRoute(AndroidSettingsPage(key: key), 'android_setting'); } - static AppRoute snippetResult({Key? key, required List results}) { + static AppRoute snippetResult( + {Key? key, required List results}) { return AppRoute( SnippetResultPage( key: key, diff --git a/lib/data/model/app/backup.dart b/lib/data/model/app/backup.dart index c492aa11..1bb3ce29 100644 --- a/lib/data/model/app/backup.dart +++ b/lib/data/model/app/backup.dart @@ -69,6 +69,9 @@ class Backup { } Future restore() async { + for (final s in settings.keys) { + Stores.setting.box.put(s, settings[s]); + } for (final s in snippets) { Stores.snippet.put(s); } diff --git a/lib/data/model/app/menu.dart b/lib/data/model/app/menu.dart index 13080e44..b2e41d01 100644 --- a/lib/data/model/app/menu.dart +++ b/lib/data/model/app/menu.dart @@ -15,7 +15,7 @@ enum ServerTabMenuType { case ServerTabMenuType.sftp: return Icons.insert_drive_file; //case ServerTabMenuType.snippet: - //return Icons.code; + //return Icons.code; case ServerTabMenuType.pkg: return Icons.system_security_update; case ServerTabMenuType.docker: @@ -32,7 +32,7 @@ enum ServerTabMenuType { case ServerTabMenuType.sftp: return 'SFTP'; //case ServerTabMenuType.snippet: - //return l10n.snippet; + //return l10n.snippet; case ServerTabMenuType.pkg: return l10n.pkg; case ServerTabMenuType.docker: diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index 25649784..bcfcf343 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -2,9 +2,9 @@ class BuildData { static const String name = "ServerBox"; - static const int build = 601; + static const int build = 603; static const String engine = "3.13.7"; - static const String buildAt = "2023-10-17 20:28:10"; - static const int modifications = 4; - static const int script = 21; + static const String buildAt = "2023-10-18 20:37:38"; + static const int modifications = 7; + static const int script = 22; } diff --git a/lib/view/page/setting/srv_seq.dart b/lib/view/page/setting/srv_seq.dart index 436cd1ae..b9f24fc7 100644 --- a/lib/view/page/setting/srv_seq.dart +++ b/lib/view/page/setting/srv_seq.dart @@ -3,6 +3,7 @@ import 'package:toolbox/core/extension/context/locale.dart'; import 'package:toolbox/core/extension/order.dart'; import 'package:toolbox/data/res/provider.dart'; import 'package:toolbox/data/res/store.dart'; +import 'package:toolbox/data/res/ui.dart'; import 'package:toolbox/view/widget/cardx.dart'; import '../../widget/custom_appbar.dart'; @@ -56,7 +57,7 @@ class _ServerOrderPageState extends State { index: index, child: CardX(ListTile( title: Text(spi.name), - subtitle: Text(spi.id), + subtitle: Text(spi.id, style: UIs.textGrey), leading: CircleAvatar( child: Text(spi.name[0]), ), diff --git a/macos/Runner/MainFlutterWindow.swift b/macos/Runner/MainFlutterWindow.swift index 2a301d4c..6715bce3 100644 --- a/macos/Runner/MainFlutterWindow.swift +++ b/macos/Runner/MainFlutterWindow.swift @@ -6,7 +6,12 @@ class MainFlutterWindow: NSWindow { let flutterViewController = FlutterViewController() let windowFrame = self.frame self.contentViewController = flutterViewController - let newWindowRect = NSRect(x: windowFrame.origin.x, y: windowFrame.origin.y, width: 300, height: 600) + let newWindowRect = NSRect( + x: windowFrame.origin.x, + y: windowFrame.origin.y, + width: 400, + height: 777 + ) self.setFrame(newWindowRect, display: true) RegisterGeneratedPlugins(registry: flutterViewController) diff --git a/make.dart b/make.dart index b43755c5..50bf074c 100755 --- a/make.dart +++ b/make.dart @@ -134,7 +134,6 @@ Future flutterBuild(String buildType) async { if (exitCode != 0) { print(buildResult.stdout); print(buildResult.stderr); - print('\nBuild failed with exit code $exitCode'); exit(exitCode); } }