From e686387d882823392ecf24570538e69a0bbe27cd Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Thu, 21 Dec 2023 14:06:18 +0800 Subject: [PATCH] opt.: docker rm container `-f` & font setting item --- .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/core/utils/misc.dart | 2 +- lib/data/res/build_data.dart | 8 ++--- 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/docker.dart | 21 ++++++++---- lib/view/page/server/detail.dart | 11 ++++-- 15 files changed, 72 insertions(+), 32 deletions(-) diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n.dart b/.dart_tool/flutter_gen/gen_l10n/l10n.dart index f6caeaaa..010b2d7b 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n.dart @@ -608,6 +608,12 @@ abstract class S { /// **'Font size'** String get fontSize; + /// No description provided for @force. + /// + /// In en, this message translates to: + /// **'Force'** + String get force; + /// No description provided for @foundNUpdate. /// /// 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 1e32c04c..51275121 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n_de.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n_de.dart @@ -273,6 +273,9 @@ class SDe extends S { @override String get fontSize => 'Schriftgröße'; + @override + String get force => 'freiwillig'; + @override String foundNUpdate(Object count) { return 'Update $count gefunden'; diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart b/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart index c1ed7a8a..5bf91497 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart @@ -273,6 +273,9 @@ class SEn extends S { @override String get fontSize => 'Font size'; + @override + String get force => 'Force'; + @override String foundNUpdate(Object count) { return 'Found $count update'; diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n_id.dart b/.dart_tool/flutter_gen/gen_l10n/l10n_id.dart index b2c3d9b5..50884e0e 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n_id.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n_id.dart @@ -273,6 +273,9 @@ class SId extends S { @override String get fontSize => 'Ukuran huruf'; + @override + String get force => 'sukarela'; + @override String foundNUpdate(Object count) { return 'Menemukan $count pembaruan'; diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart b/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart index 6cdb057f..fcde10f0 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart @@ -273,6 +273,9 @@ class SZh extends S { @override String get fontSize => '字体大小'; + @override + String get force => '强制'; + @override String foundNUpdate(Object count) { return '找到 $count 个更新'; @@ -1083,6 +1086,9 @@ class SZhTw extends SZh { @override String get fontSize => '字體大小'; + @override + String get force => '強制'; + @override String foundNUpdate(Object count) { return '找到 $count 個更新'; diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 16aff68c..c19c2a30 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 = 685; + CURRENT_PROJECT_VERSION = 686; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -596,7 +596,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.685; + MARKETING_VERSION = 1.0.686; 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 = 685; + CURRENT_PROJECT_VERSION = 686; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -730,7 +730,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.685; + MARKETING_VERSION = 1.0.686; 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 = 685; + CURRENT_PROJECT_VERSION = 686; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -758,7 +758,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.685; + MARKETING_VERSION = 1.0.686; 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 = 685; + CURRENT_PROJECT_VERSION = 686; 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.685; + MARKETING_VERSION = 1.0.686; 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 = 685; + CURRENT_PROJECT_VERSION = 686; 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.685; + MARKETING_VERSION = 1.0.686; 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 = 685; + CURRENT_PROJECT_VERSION = 686; 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.685; + MARKETING_VERSION = 1.0.686; 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 = 685; + CURRENT_PROJECT_VERSION = 686; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -902,7 +902,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.685; + MARKETING_VERSION = 1.0.686; 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 = 685; + CURRENT_PROJECT_VERSION = 686; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -943,7 +943,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.685; + MARKETING_VERSION = 1.0.686; 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 = 685; + CURRENT_PROJECT_VERSION = 686; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -981,7 +981,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.685; + MARKETING_VERSION = 1.0.686; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = ServerBox; diff --git a/lib/core/utils/misc.dart b/lib/core/utils/misc.dart index ac7c74fd..5532777e 100644 --- a/lib/core/utils/misc.dart +++ b/lib/core/utils/misc.dart @@ -24,7 +24,7 @@ Future getToken() async { } String? getFileName(String? path) { - if (path == null) { + if (path == null || path.isEmpty) { return null; } return path.split('/').last; diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index 032f4b37..ad44a757 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 = 685; + static const int build = 686; static const String engine = "3.16.4"; - static const String buildAt = "2023-12-20 14:09:17"; - static const int modifications = 4; - static const int script = 32; + static const String buildAt = "2023-12-20 17:26:32"; + static const int modifications = 2; + static const int script = 33; } diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb index 6010da03..cb02d16d 100644 --- a/lib/l10n/app_de.arb +++ b/lib/l10n/app_de.arb @@ -85,6 +85,7 @@ "followSystem": "System verfolgen", "font": "Schriftarten", "fontSize": "Schriftgröße", + "force": "freiwillig", "foundNUpdate": "Update {count} gefunden", "fullScreen": "Vollbildmodus", "fullScreenJitter": "Jitter im Vollbildmodus", diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 0efc269a..2b7dee8b 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -85,6 +85,7 @@ "followSystem": "Follow system", "font": "Font", "fontSize": "Font size", + "force": "Force", "foundNUpdate": "Found {count} update", "fullScreen": "Full screen mode", "fullScreenJitter": "Full screen jitter", diff --git a/lib/l10n/app_id.arb b/lib/l10n/app_id.arb index 6b48b3fb..8002bee8 100644 --- a/lib/l10n/app_id.arb +++ b/lib/l10n/app_id.arb @@ -85,6 +85,7 @@ "followSystem": "Ikuti sistem", "font": "Font", "fontSize": "Ukuran huruf", + "force": "sukarela", "foundNUpdate": "Menemukan {count} pembaruan", "fullScreen": "Mode Layar Penuh", "fullScreenJitter": "Jitter layar penuh", diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb index 5f7a110b..9a4b0e31 100644 --- a/lib/l10n/app_zh.arb +++ b/lib/l10n/app_zh.arb @@ -85,6 +85,7 @@ "followSystem": "跟随系统", "font": "字体", "fontSize": "字体大小", + "force": "强制", "foundNUpdate": "找到 {count} 个更新", "fullScreen": "全屏模式", "fullScreenJitter": "全屏模式抖动", diff --git a/lib/l10n/app_zh_tw.arb b/lib/l10n/app_zh_tw.arb index 444d82db..39f138ba 100644 --- a/lib/l10n/app_zh_tw.arb +++ b/lib/l10n/app_zh_tw.arb @@ -85,6 +85,7 @@ "followSystem": "跟隨系統", "font": "字體", "fontSize": "字體大小", + "force": "強制", "foundNUpdate": "找到 {count} 個更新", "fullScreen": "全屏模式", "fullScreenJitter": "全屏模式抖動", diff --git a/lib/view/page/docker.dart b/lib/view/page/docker.dart index ff48640c..b78f68ee 100644 --- a/lib/view/page/docker.dart +++ b/lib/view/page/docker.dart @@ -365,16 +365,25 @@ class _DockerManagePageState extends State { context.showRoundDialog( title: Text(l10n.attention), child: Column( + mainAxisSize: MainAxisSize.min, children: [ Text(l10n.askContinue( '${l10n.delete} Container(${dItem.name})', )), - StatefulBuilder(builder: (_, setState) { - return Checkbox( - value: force, - onChanged: (val) => setState(() => force = val ?? false), - ); - }), + UIs.height13, + Row( + children: [ + StatefulBuilder(builder: (_, setState) { + return Checkbox( + value: force, + onChanged: (val) => setState( + () => force = val ?? false, + ), + ); + }), + Text(l10n.force), + ], + ) ], ), actions: [ diff --git a/lib/view/page/server/detail.dart b/lib/view/page/server/detail.dart index 5a35bafa..11ac7a95 100644 --- a/lib/view/page/server/detail.dart +++ b/lib/view/page/server/detail.dart @@ -641,11 +641,16 @@ class _ServerDetailPageState extends State crossAxisAlignment: CrossAxisAlignment.start, children: [ Text('${battery.name}', style: UIs.text15), - Text('${battery.status.name} - ${battery.cycle} - ${battery.powerNow}', style: UIs.text13Grey), + Text( + '${battery.status.name} - ${battery.cycle} - ${battery.powerNow}', + style: UIs.text13Grey, + ), ], ), - Text('${battery.percent?.toStringAsFixed(0)}%', - style: UIs.text13Grey), + Text( + '${battery.percent?.toStringAsFixed(0)}%', + style: UIs.text13Grey, + ), ], ), );