From df84aeb8b236a845b91ae49f79cd1f87c210b5ab Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Mon, 25 Sep 2023 17:43:45 +0800 Subject: [PATCH] chore: `sync` tip --- .dart_tool/flutter_gen/gen_l10n/l10n.dart | 6 ++++ .dart_tool/flutter_gen/gen_l10n/l10n_de.dart | 3 ++ .dart_tool/flutter_gen/gen_l10n/l10n_en.dart | 3 ++ .dart_tool/flutter_gen/gen_l10n/l10n_id.dart | 3 ++ .dart_tool/flutter_gen/gen_l10n/l10n_zh.dart | 6 ++++ ios/Runner.xcodeproj/project.pbxproj | 36 ++++++++++---------- lib/data/res/build_data.dart | 6 ++-- lib/l10n/app_de.arb | 1 + lib/l10n/app_en.arb | 1 + lib/l10n/app_id.arb | 1 + lib/l10n/app_zh.arb | 1 + lib/l10n/app_zh_tw.arb | 1 + lib/view/page/backup.dart | 8 ++++- macos/Runner.xcodeproj/project.pbxproj | 12 +++---- 14 files changed, 60 insertions(+), 28 deletions(-) diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n.dart b/.dart_tool/flutter_gen/gen_l10n/l10n.dart index e9738c88..9bed564a 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n.dart @@ -1298,6 +1298,12 @@ abstract class S { /// **'Are you sure to delete server [{server}]?'** String sureToDeleteServer(Object server); + /// No description provided for @syncTip. + /// + /// In en, this message translates to: + /// **'After auto sync, a restart may be required for some changes to take effect.'** + String get syncTip; + /// No description provided for @system. /// /// In en, this message translates to: diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n_de.dart b/.dart_tool/flutter_gen/gen_l10n/l10n_de.dart index 1971042a..2994a909 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n_de.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n_de.dart @@ -640,6 +640,9 @@ class SDe extends S { return 'Bist du sicher, dass du [$server] löschen willst?'; } + @override + String get syncTip => 'Nach der automatischen Synchronisierung kann es erforderlich sein, die App neu zu starten, damit bestimmte Änderungen wirksam werden.'; + @override String get system => 'Systeme'; diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart b/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart index 9e91711a..403f6428 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart @@ -640,6 +640,9 @@ class SEn extends S { return 'Are you sure to delete server [$server]?'; } + @override + String get syncTip => 'After auto sync, a restart may be required for some changes to take effect.'; + @override String get system => 'System'; diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n_id.dart b/.dart_tool/flutter_gen/gen_l10n/l10n_id.dart index a33a8f12..5ae10106 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n_id.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n_id.dart @@ -640,6 +640,9 @@ class SId extends S { return 'Apakah Anda pasti akan menghapus server [$server]?'; } + @override + String get syncTip => 'Setelah sinkronisasi otomatis, mungkin perlu memulai ulang aplikasi agar perubahan tertentu dapat diterapkan.'; + @override String get system => 'Sistem'; diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart b/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart index bacff7e5..5a11ddbb 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart @@ -640,6 +640,9 @@ class SZh extends S { return '你确定要删除服务器 [$server] 吗？'; } + @override + String get syncTip => '在自动同步后，可能需要重新启动，某些更改才能生效。'; + @override String get system => '系统'; @@ -1384,6 +1387,9 @@ class SZhTw extends SZh { return '你確定要刪除服務器 [$server] 嗎？'; } + @override + String get syncTip => '在自動同步後，可能需要重新啟動，某些更改才能生效。'; + @override String get system => '系統'; diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 6504ce66..21f917e2 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 = 574; + CURRENT_PROJECT_VERSION = 575; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -596,7 +596,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.574; + MARKETING_VERSION = 1.0.575; 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 = 574; + CURRENT_PROJECT_VERSION = 575; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -730,7 +730,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.574; + MARKETING_VERSION = 1.0.575; 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 = 574; + CURRENT_PROJECT_VERSION = 575; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -758,7 +758,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.574; + MARKETING_VERSION = 1.0.575; 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 = 574; + CURRENT_PROJECT_VERSION = 575; 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.574; + MARKETING_VERSION = 1.0.575; 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 = 574; + CURRENT_PROJECT_VERSION = 575; 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.574; + MARKETING_VERSION = 1.0.575; 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 = 574; + CURRENT_PROJECT_VERSION = 575; 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.574; + MARKETING_VERSION = 1.0.575; 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 = 574; + CURRENT_PROJECT_VERSION = 575; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -902,7 +902,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.574; + MARKETING_VERSION = 1.0.575; 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 = 574; + CURRENT_PROJECT_VERSION = 575; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -943,7 +943,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.574; + MARKETING_VERSION = 1.0.575; 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 = 574; + CURRENT_PROJECT_VERSION = 575; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -981,7 +981,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.574; + MARKETING_VERSION = 1.0.575; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = ServerBox; diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index aea18e3a..4051ac6f 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 = 574; + static const int build = 575; static const String engine = "3.13.5"; - static const String buildAt = "2023-09-24 15:49:22"; - static const int modifications = 12; + static const String buildAt = "2023-09-24 15:59:57"; + static const int modifications = 13; static const int script = 18; } diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb index d3e8c9fa..1a0805e1 100644 --- a/lib/l10n/app_de.arb +++ b/lib/l10n/app_de.arb @@ -200,6 +200,7 @@ "sureNoPwd": "Bist du sicher, dass du kein Passwort verwenden willst?", "sureStop": "Sind Sie sicher, dass Sie [{item}] stoppen möchten?", "sureToDeleteServer": "Bist du sicher, dass du [{server}] löschen willst?", + "syncTip": "Nach der automatischen Synchronisierung kann es erforderlich sein, die App neu zu starten, damit bestimmte Änderungen wirksam werden.", "system": "Systeme", "tag": "Tags", "terminal": "Terminal", diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index ad85fd37..90fa927c 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -200,6 +200,7 @@ "sureNoPwd": "Are you sure to use no password?", "sureStop": "Sure to stop [{item}] ?", "sureToDeleteServer": "Are you sure to delete server [{server}]?", + "syncTip": "After auto sync, a restart may be required for some changes to take effect.", "system": "System", "tag": "Tags", "terminal": "Terminal", diff --git a/lib/l10n/app_id.arb b/lib/l10n/app_id.arb index dcecaebc..b4ef8f4d 100644 --- a/lib/l10n/app_id.arb +++ b/lib/l10n/app_id.arb @@ -200,6 +200,7 @@ "sureNoPwd": "Apakah Anda pasti tidak menggunakan kata sandi?", "sureStop": "Anda yakin ingin menghentikan [{item}]?", "sureToDeleteServer": "Apakah Anda pasti akan menghapus server [{server}]?", + "syncTip": "Setelah sinkronisasi otomatis, mungkin perlu memulai ulang aplikasi agar perubahan tertentu dapat diterapkan.", "system": "Sistem", "tag": "Tag", "terminal": "Terminal", diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb index 43a1455a..5e454a49 100644 --- a/lib/l10n/app_zh.arb +++ b/lib/l10n/app_zh.arb @@ -200,6 +200,7 @@ "sureNoPwd": "确认使用无密码？", "sureStop": "确定要停止 [{item}] 吗？", "sureToDeleteServer": "你确定要删除服务器 [{server}] 吗？", + "syncTip": "在自动同步后，可能需要重新启动，某些更改才能生效。", "system": "系统", "tag": "标签", "terminal": "终端", diff --git a/lib/l10n/app_zh_tw.arb b/lib/l10n/app_zh_tw.arb index 79307a0c..2f1cedc5 100644 --- a/lib/l10n/app_zh_tw.arb +++ b/lib/l10n/app_zh_tw.arb @@ -200,6 +200,7 @@ "sureNoPwd": "確認使用無密碼？", "sureStop": "確定要停止 [{item}] 嗎？", "sureToDeleteServer": "你確定要刪除服務器 [{server}] 嗎？", + "syncTip": "在自動同步後，可能需要重新啟動，某些更改才能生效。", "system": "系統", "tag": "标签", "terminal": "终端機", diff --git a/lib/view/page/backup.dart b/lib/view/page/backup.dart index 98c44ead..d9a34ba8 100644 --- a/lib/view/page/backup.dart +++ b/lib/view/page/backup.dart @@ -35,6 +35,12 @@ class BackupPage extends StatelessWidget { } Widget _buildBody(BuildContext context) { + final tip = () { + if (isMacOS || isIOS) { + return '${l10n.syncTip}\n${l10n.backupTip}'; + } + return l10n.backupTip; + }(); return Column( mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, @@ -44,7 +50,7 @@ class BackupPage extends StatelessWidget { Padding( padding: const EdgeInsets.all(37), child: Text( - l10n.backupTip, + tip, textAlign: TextAlign.center, ), ), diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index e5b4ab34..42485205 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -476,9 +476,9 @@ baseConfigurationReference = C1C758C41C4E208965A68933 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 574; + CURRENT_PROJECT_VERSION = 575; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.574; + MARKETING_VERSION = 1.0.575; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -491,9 +491,9 @@ baseConfigurationReference = 15AF97DF993E8968098D6EBE /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 574; + CURRENT_PROJECT_VERSION = 575; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.574; + MARKETING_VERSION = 1.0.575; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -506,9 +506,9 @@ baseConfigurationReference = 7CFA7DE7FABA75685DFB6948 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 574; + CURRENT_PROJECT_VERSION = 575; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.574; + MARKETING_VERSION = 1.0.575; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0;