diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n.dart b/.dart_tool/flutter_gen/gen_l10n/l10n.dart index 18f41669a..972cacec6 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n.dart @@ -1064,6 +1064,12 @@ abstract class S { /// **'Password'** String get pwd; + /// No description provided for @reboot. + /// + /// In en, this message translates to: + /// **'Reboot'** + String get reboot; + /// No description provided for @remotePath. /// /// In en, this message translates to: @@ -1220,6 +1226,12 @@ abstract class S { /// **'Show distribution logo'** String get showDistLogo; + /// No description provided for @shutdown. + /// + /// In en, this message translates to: + /// **'Shutdown'** + String get shutdown; + /// No description provided for @snippet. /// /// In en, this message translates to: @@ -1274,6 +1286,12 @@ abstract class S { /// **'Success'** String get success; + /// No description provided for @suspend. + /// + /// In en, this message translates to: + /// **'Suspend'** + String get suspend; + /// No description provided for @suspendTip. /// /// 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 fe77074f0..a6d73a9f0 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n_de.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n_de.dart @@ -511,6 +511,9 @@ class SDe extends S { @override String get pwd => 'Passwort'; + @override + String get reboot => 'Neustart'; + @override String get remotePath => 'Entfernte Pfade'; @@ -591,6 +594,9 @@ class SDe extends S { @override String get showDistLogo => 'Distributionslogo anzeigen'; + @override + String get shutdown => 'Abschaltung'; + @override String get snippet => 'Snippet'; @@ -622,6 +628,9 @@ class SDe extends S { @override String get success => 'Erfolgreich'; + @override + String get suspend => 'Suspend'; + @override String get suspendTip => 'Die Suspend-Funktion erfordert Root-Rechte und systemd-Unterstützung.'; diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart b/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart index 1de99a32a..b2505fa61 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart @@ -511,6 +511,9 @@ class SEn extends S { @override String get pwd => 'Password'; + @override + String get reboot => 'Reboot'; + @override String get remotePath => 'Remote path'; @@ -591,6 +594,9 @@ class SEn extends S { @override String get showDistLogo => 'Show distribution logo'; + @override + String get shutdown => 'Shutdown'; + @override String get snippet => 'Snippet'; @@ -622,6 +628,9 @@ class SEn extends S { @override String get success => 'Success'; + @override + String get suspend => 'Suspend'; + @override String get suspendTip => 'The suspend function requires root privileges and systemd support.'; diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n_id.dart b/.dart_tool/flutter_gen/gen_l10n/l10n_id.dart index b533a9bed..871be0f89 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n_id.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n_id.dart @@ -511,6 +511,9 @@ class SId extends S { @override String get pwd => 'Kata sandi'; + @override + String get reboot => 'Reboot'; + @override String get remotePath => 'Jalur jarak jauh'; @@ -591,6 +594,9 @@ class SId extends S { @override String get showDistLogo => 'Tampilkan logo distribusi'; + @override + String get shutdown => 'Matikan'; + @override String get snippet => 'Snippet'; @@ -622,6 +628,9 @@ class SId extends S { @override String get success => 'Kesuksesan'; + @override + String get suspend => 'Suspend'; + @override String get suspendTip => 'Fungsi penangguhan memerlukan hak akses root dan dukungan systemd.'; diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart b/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart index c5a9bdf3c..aded03a94 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart @@ -511,6 +511,9 @@ class SZh extends S { @override String get pwd => '密码'; + @override + String get reboot => '重启'; + @override String get remotePath => '远端路径'; @@ -591,6 +594,9 @@ class SZh extends S { @override String get showDistLogo => '显示发行版 Logo'; + @override + String get shutdown => '关机'; + @override String get snippet => '代码片段'; @@ -622,6 +628,9 @@ class SZh extends S { @override String get success => '成功'; + @override + String get suspend => '挂起'; + @override String get suspendTip => 'suspend 功能需要 root 权限及 systemd 支持。'; @@ -1246,6 +1255,9 @@ class SZhTw extends SZh { @override String get pwd => '密碼'; + @override + String get reboot => '重启'; + @override String get remotePath => '遠端路徑'; @@ -1326,6 +1338,9 @@ class SZhTw extends SZh { @override String get showDistLogo => '顯示發行版 Logo'; + @override + String get shutdown => '关机'; + @override String get snippet => '程式片段'; @@ -1357,6 +1372,9 @@ class SZhTw extends SZh { @override String get success => '成功'; + @override + String get suspend => '挂起'; + @override String get suspendTip => 'suspend 功能需要 root 權限及 systemd 支持。'; diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 9a15bf9ba..21b805222 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 = 578; + CURRENT_PROJECT_VERSION = 580; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -596,7 +596,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.578; + MARKETING_VERSION = 1.0.580; 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 = 578; + CURRENT_PROJECT_VERSION = 580; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -730,7 +730,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.578; + MARKETING_VERSION = 1.0.580; 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 = 578; + CURRENT_PROJECT_VERSION = 580; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -758,7 +758,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.578; + MARKETING_VERSION = 1.0.580; 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 = 578; + CURRENT_PROJECT_VERSION = 580; 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.578; + MARKETING_VERSION = 1.0.580; 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 = 578; + CURRENT_PROJECT_VERSION = 580; 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.578; + MARKETING_VERSION = 1.0.580; 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 = 578; + CURRENT_PROJECT_VERSION = 580; 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.578; + MARKETING_VERSION = 1.0.580; 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 = 578; + CURRENT_PROJECT_VERSION = 580; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -902,7 +902,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.578; + MARKETING_VERSION = 1.0.580; 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 = 578; + CURRENT_PROJECT_VERSION = 580; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -943,7 +943,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.578; + MARKETING_VERSION = 1.0.580; 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 = 578; + CURRENT_PROJECT_VERSION = 580; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -981,7 +981,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.578; + MARKETING_VERSION = 1.0.580; 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 c439b6acb..b6a518f9d 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 = 578; - static const String engine = "3.13.5"; - static const String buildAt = "2023-09-25 19:49:19"; + static const int build = 580; + static const String engine = "3.13.6"; + static const String buildAt = "2023-10-05 19:51:55"; static const int modifications = 4; static const int script = 19; } diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb index 6a994ff0c..24e6d79ef 100644 --- a/lib/l10n/app_de.arb +++ b/lib/l10n/app_de.arb @@ -161,6 +161,7 @@ "process": "Prozess", "pushToken": "Push Token", "pwd": "Passwort", + "reboot": "Neustart", "remotePath": "Entfernte Pfade", "rename": "Umbenennen", "reportBugsOnGithubIssue": "Bitte Bugs auf {url} melden", @@ -187,6 +188,7 @@ "sftpRmrDirSummary": "Verwenden Sie \"rm -r\", um das Verzeichnis in SFTP zu löschen.", "sftpSSHConnected": "SFTP Verbunden", "showDistLogo": "Distributionslogo anzeigen", + "shutdown": "Abschaltung", "snippet": "Snippet", "speed": "Tempo", "spentTime": "Benötigte Zeit: {time}", @@ -196,6 +198,7 @@ "stats": "Statistik", "stop": "Stop", "success": "Erfolgreich", + "suspend": "Suspend", "suspendTip": "Die Suspend-Funktion erfordert Root-Rechte und systemd-Unterstützung.", "syncTip": "Nach der automatischen Synchronisierung kann es erforderlich sein, die App neu zu starten, damit bestimmte Änderungen wirksam werden.", "system": "Systeme", diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 9c51f30b2..c0a8e46d3 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -161,6 +161,7 @@ "process": "Process", "pushToken": "Push token", "pwd": "Password", + "reboot": "Reboot", "remotePath": "Remote path", "rename": "Rename", "reportBugsOnGithubIssue": "Please report bugs on {url}", @@ -187,6 +188,7 @@ "sftpRmrDirSummary": "Use `rm -r` to delete a folder in SFTP.", "sftpSSHConnected": "SFTP Connected", "showDistLogo": "Show distribution logo", + "shutdown": "Shutdown", "snippet": "Snippet", "speed": "Speed", "spentTime": "Spent time: {time}", @@ -196,6 +198,7 @@ "stats": "Stats", "stop": "Stop", "success": "Success", + "suspend": "Suspend", "suspendTip": "The suspend function requires root privileges and systemd support.", "syncTip": "After auto sync, a restart may be required for some changes to take effect.", "system": "System", diff --git a/lib/l10n/app_id.arb b/lib/l10n/app_id.arb index bcbaae67c..23fad6155 100644 --- a/lib/l10n/app_id.arb +++ b/lib/l10n/app_id.arb @@ -161,6 +161,7 @@ "process": "Proses", "pushToken": "Dorong token", "pwd": "Kata sandi", + "reboot": "Reboot", "remotePath": "Jalur jarak jauh", "rename": "Ganti nama", "reportBugsOnGithubIssue": "Harap laporkan bug di {url}", @@ -187,6 +188,7 @@ "sftpRmrDirSummary": "Gunakan `rm -r` untuk menghapus dir di SFTP", "sftpSSHConnected": "Sftp terhubung", "showDistLogo": "Tampilkan logo distribusi", + "shutdown": "Matikan", "snippet": "Snippet", "speed": "Kecepatan", "spentTime": "Menghabiskan waktu: {time}", @@ -196,6 +198,7 @@ "stats": "Statistik", "stop": "Berhenti", "success": "Kesuksesan", + "suspend": "Suspend", "suspendTip": "Fungsi penangguhan memerlukan hak akses root dan dukungan systemd.", "syncTip": "Setelah sinkronisasi otomatis, mungkin perlu memulai ulang aplikasi agar perubahan tertentu dapat diterapkan.", "system": "Sistem", diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb index 6616d0ba1..1a46d0170 100644 --- a/lib/l10n/app_zh.arb +++ b/lib/l10n/app_zh.arb @@ -161,6 +161,7 @@ "process": "进程", "pushToken": "消息推送 Token", "pwd": "密码", + "reboot": "重启", "remotePath": "远端路径", "rename": "重命名", "reportBugsOnGithubIssue": "请到 {url} 提交问题", @@ -187,6 +188,7 @@ "sftpRmrDirSummary": "在 SFTP 中使用 `rm -r` 来删除文件夹", "sftpSSHConnected": "SFTP 已连接...", "showDistLogo": "显示发行版 Logo", + "shutdown": "关机", "snippet": "代码片段", "speed": "速度", "spentTime": "耗时: {time}", @@ -196,6 +198,7 @@ "stats": "统计", "stop": "停止", "success": "成功", + "suspend": "挂起", "suspendTip": "suspend 功能需要 root 权限及 systemd 支持。", "syncTip": "在自动同步后，可能需要重新启动，某些更改才能生效。", "system": "系统", diff --git a/lib/l10n/app_zh_tw.arb b/lib/l10n/app_zh_tw.arb index 26bb35d9a..edf20e632 100644 --- a/lib/l10n/app_zh_tw.arb +++ b/lib/l10n/app_zh_tw.arb @@ -161,6 +161,7 @@ "process": "進程", "pushToken": "消息推送 Token", "pwd": "密碼", + "reboot": "重启", "remotePath": "遠端路徑", "rename": "重命名", "reportBugsOnGithubIssue": "請到 {url} 提交問題", @@ -187,6 +188,7 @@ "sftpRmrDirSummary": "在 SFTP 中使用 `rm -r` 來刪除文件夾", "sftpSSHConnected": "SFTP 已連接...", "showDistLogo": "顯示發行版 Logo", + "shutdown": "关机", "snippet": "程式片段", "speed": "速度", "spentTime": "耗時: {time}", @@ -196,6 +198,7 @@ "stats": "統計", "stop": "停止", "success": "成功", + "suspend": "挂起", "suspendTip": "suspend 功能需要 root 權限及 systemd 支持。", "syncTip": "在自動同步後，可能需要重新啟動，某些更改才能生效。", "system": "系統", diff --git a/lib/view/page/server/tab.dart b/lib/view/page/server/tab.dart index 113b9589c..7a51a3329 100644 --- a/lib/view/page/server/tab.dart +++ b/lib/view/page/server/tab.dart @@ -259,10 +259,11 @@ class _ServerPageState extends State context: context, ); }, - msg: 'Suspend ${srv.spi.name}', + typ: l10n.suspend, + name: srv.spi.name, ), icon: const Icon(Icons.stop), - tooltip: 'Suspend', + tooltip: l10n.suspend, ), IconButton( onPressed: () => _askFor( @@ -270,10 +271,11 @@ class _ServerPageState extends State ShellFunc.shutdown.exec, context: context, ), - msg: 'Shutdown ${srv.spi.name}', + typ: l10n.shutdown, + name: srv.spi.name, ), icon: const Icon(Icons.power_off), - tooltip: 'Shutdown', + tooltip: l10n.shutdown, ), IconButton( onPressed: () => _askFor( @@ -281,10 +283,11 @@ class _ServerPageState extends State ShellFunc.reboot.exec, context: context, ), - msg: 'Reboot ${srv.spi.name}', + typ: l10n.reboot, + name: srv.spi.name, ), icon: const Icon(Icons.restart_alt), - tooltip: 'Reboot', + tooltip: l10n.reboot, ), IconButton( onPressed: () => AppRoute.serverEdit(spi: srv.spi).go(context), @@ -542,10 +545,14 @@ class _ServerPageState extends State return 107; } - void _askFor({required void Function() func, required String msg}) { + void _askFor({ + required void Function() func, + required String typ, + required String name, + }) { context.showRoundDialog( title: Text(l10n.attention), - child: Text(l10n.askContinue(msg)), + child: Text(l10n.askContinue('$typ ${l10n.server}($name)')), actions: [ TextButton( onPressed: () { diff --git a/lib/view/page/setting/entry.dart b/lib/view/page/setting/entry.dart index d0ea9fb8b..0e3fdb7ea 100644 --- a/lib/view/page/setting/entry.dart +++ b/lib/view/page/setting/entry.dart @@ -332,44 +332,45 @@ class _SettingPageState extends State { onTap: () async { final ctrl = TextEditingController(text: primaryColor.toHex); await context.showRoundDialog( - title: Text(l10n.primaryColorSeed), - child: StatefulBuilder(builder: (context, setState) { - final children = [ - /// Plugin [dynamic_color] is not supported on iOS - if (!isIOS) - ListTile( - title: Text(l10n.followSystem), - trailing: StoreSwitch( - prop: _setting.useSystemPrimaryColor, - func: (_) => setState(() {}), - ), - ) - ]; - if (!_setting.useSystemPrimaryColor.fetch()) { - children.addAll([ - Input( - onSubmitted: _onSaveColor, - controller: ctrl, - hint: '#8b2252', - icon: Icons.colorize, + title: Text(l10n.primaryColorSeed), + child: StatefulBuilder(builder: (context, setState) { + final children = [ + /// Plugin [dynamic_color] is not supported on iOS + if (!isIOS) + ListTile( + title: Text(l10n.followSystem), + trailing: StoreSwitch( + prop: _setting.useSystemPrimaryColor, + func: (_) => setState(() {}), ), - ColorPicker( - color: primaryColor, - onColorChanged: (c) => ctrl.text = c.toHex, - ) - ]); - } - return Column( - mainAxisSize: MainAxisSize.min, - children: children, - ); - }), - actions: [ - TextButton( - onPressed: () => _onSaveColor(ctrl.text), - child: Text(l10n.ok), - ), - ]); + ) + ]; + if (!_setting.useSystemPrimaryColor.fetch()) { + children.addAll([ + Input( + onSubmitted: _onSaveColor, + controller: ctrl, + hint: '#8b2252', + icon: Icons.colorize, + ), + ColorPicker( + color: primaryColor, + onColorChanged: (c) => ctrl.text = c.toHex, + ) + ]); + } + return Column( + mainAxisSize: MainAxisSize.min, + children: children, + ); + }), + actions: [ + TextButton( + onPressed: () => _onSaveColor(ctrl.text), + child: Text(l10n.ok), + ), + ], + ); }, ); } diff --git a/lib/view/page/snippet/list.dart b/lib/view/page/snippet/list.dart index d2af4b616..4318a27d7 100644 --- a/lib/view/page/snippet/list.dart +++ b/lib/view/page/snippet/list.dart @@ -128,9 +128,9 @@ class _SnippetListPageState extends State { Future _runSnippet(Snippet snippet) async { final servers = await context.showPickDialog( - items: Pros.server.servers.toList(), - name: (e) => e.spi.name, - ); + items: Pros.server.servers.toList(), + name: (e) => e.spi.name, + ); if (servers == null) { return; } diff --git a/lib/view/page/storage/local.dart b/lib/view/page/storage/local.dart index b2413a8c5..1725d93a3 100644 --- a/lib/view/page/storage/local.dart +++ b/lib/view/page/storage/local.dart @@ -338,7 +338,7 @@ class _LocalStoragePageState extends State { final fileName = file.path.split('/').last; context.showRoundDialog( title: Text(l10n.delete), - child: Text(l10n.askContinue('${l10n.delete}: $fileName')), + child: Text(l10n.askContinue('${l10n.delete} $fileName')), actions: [ TextButton( onPressed: () => context.pop(), diff --git a/lib/view/page/storage/sftp.dart b/lib/view/page/storage/sftp.dart index aa6daec2e..32fdc6aa9 100644 --- a/lib/view/page/storage/sftp.dart +++ b/lib/view/page/storage/sftp.dart @@ -412,10 +412,10 @@ class _SftpPageState extends State with AfterLayoutMixin { final useRmr = Stores.setting.sftpRmrDir.fetch(); final text = () { if (isDir && !useRmr) { - return l10n.askContinue( - '${l10n.dirEmpty}\n${l10n.delete} ${l10n.files}(${file.filename})'); + return l10n + .askContinue('${l10n.dirEmpty}\n${l10n.delete} ${file.filename}'); } - return l10n.askContinue('${l10n.delete} ${l10n.files}(${file.filename})'); + return l10n.askContinue('${l10n.delete} ${file.filename}'); }(); context.showRoundDialog( child: Text(text), diff --git a/lib/view/widget/server_func_btns.dart b/lib/view/widget/server_func_btns.dart index 587e90933..9a37c0233 100644 --- a/lib/view/widget/server_func_btns.dart +++ b/lib/view/widget/server_func_btns.dart @@ -96,9 +96,9 @@ void _onTapMoreBtns( break; case ServerTabMenuType.snippet: final snippets = await context.showPickDialog( - items: Pros.snippet.snippets, - name: (e) => e.name, - ); + items: Pros.snippet.snippets, + name: (e) => e.name, + ); if (snippets == null) { return; } diff --git a/macos/Podfile.lock b/macos/Podfile.lock index f3479157e..8a23bebfe 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -57,4 +57,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 9ebaf0ce3d369aaa26a9ea0e159195ed94724cf3 -COCOAPODS: 1.12.1 +COCOAPODS: 1.13.0 diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 2e5345014..7970b263d 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 = 578; + CURRENT_PROJECT_VERSION = 580; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.578; + MARKETING_VERSION = 1.0.580; 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 = 578; + CURRENT_PROJECT_VERSION = 580; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.578; + MARKETING_VERSION = 1.0.580; 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 = 578; + CURRENT_PROJECT_VERSION = 580; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.578; + MARKETING_VERSION = 1.0.580; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0;