diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 00d3f767..f67780fb 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -360,7 +360,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 365; + CURRENT_PROJECT_VERSION = 368; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -368,7 +368,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.365; + MARKETING_VERSION = 1.0.368; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -491,7 +491,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 365; + CURRENT_PROJECT_VERSION = 368; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -499,7 +499,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.365; + MARKETING_VERSION = 1.0.368; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -516,7 +516,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 365; + CURRENT_PROJECT_VERSION = 368; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -524,7 +524,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.365; + MARKETING_VERSION = 1.0.368; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; diff --git a/lib/core/update.dart b/lib/core/update.dart index 0c4bfca5..bf5b565f 100644 --- a/lib/core/update.dart +++ b/lib/core/update.dart @@ -60,11 +60,11 @@ Future doUpdate(BuildContext context, {bool force = false}) async { if (update.build.min.current! > BuildData.build) { showRoundDialog( context: context, - child: Text(s.updateTipTooLow(newest)), + child: Text('Current version is too low\nplease update to v$newest'), actions: [ TextButton( onPressed: () => _doUpdate(url, context, s), - child: Text(s.ok), + child: const Text('ok'), ) ], ); @@ -73,7 +73,7 @@ Future doUpdate(BuildContext context, {bool force = false}) async { showSnackBarWithAction( context, - '${s.updateTip(newest)} \n${update.changelog.current}', + 'Update: v$newest\n${update.changelog.current}', s.update, () => _doUpdate(url, context, s), ); diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index 958e29cc..17c34984 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -2,8 +2,8 @@ class BuildData { static const String name = "ServerBox"; - static const int build = 365; + static const int build = 368; static const String engine = "3.10.3"; - static const String buildAt = "2023-06-27 00:42:16.407149"; - static const int modifications = 3; + static const String buildAt = "2023-06-27 14:36:00.133078"; + static const int modifications = 6; } diff --git a/lib/view/page/editor.dart b/lib/view/page/editor.dart index d0230a7a..36bb7620 100644 --- a/lib/view/page/editor.dart +++ b/lib/view/page/editor.dart @@ -6,9 +6,11 @@ import 'package:code_text_field/code_text_field.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_highlight/theme_map.dart'; +import 'package:flutter_highlight/themes/a11y-light.dart'; import 'package:flutter_highlight/themes/monokai.dart'; import 'package:toolbox/core/extension/navigator.dart'; import 'package:toolbox/core/utils/misc.dart'; +import 'package:toolbox/core/utils/ui.dart'; import 'package:toolbox/data/res/highlight.dart'; import 'package:toolbox/data/store/setting.dart'; import 'package:toolbox/locator.dart'; @@ -38,7 +40,13 @@ class _EditorPageState extends State with AfterLayoutMixin { _controller = CodeController( language: suffix2HighlightMap[_langCode], ); - _codeTheme = themeMap[_setting.editorTheme.fetch()] ?? monokaiTheme; + + if (isDarkMode(context)) { + _codeTheme = themeMap[_setting.editorDarkTheme.fetch()] ?? monokaiTheme; + } else { + _codeTheme = themeMap[_setting.editorTheme.fetch()] ?? a11yLightTheme; + } + _focusNode.requestFocus(); } diff --git a/lib/view/page/process.dart b/lib/view/page/process.dart index 06ea24bf..d0263438 100644 --- a/lib/view/page/process.dart +++ b/lib/view/page/process.dart @@ -124,7 +124,12 @@ class _ProcessPageState extends State { child: TwoLineText(up: proc.pid.toString(), down: proc.user), ), title: Text(proc.binary), - subtitle: Text(proc.command, style: grey, maxLines: 3, overflow: TextOverflow.fade,), + subtitle: Text( + proc.command, + style: grey, + maxLines: 3, + overflow: TextOverflow.fade, + ), trailing: Row( mainAxisSize: MainAxisSize.min, children: [ diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index abbb2b4a..2b116c00 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -475,9 +475,9 @@ baseConfigurationReference = C1C758C41C4E208965A68933 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 365; + CURRENT_PROJECT_VERSION = 368; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.365; + MARKETING_VERSION = 1.0.368; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -490,9 +490,9 @@ baseConfigurationReference = 15AF97DF993E8968098D6EBE /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 365; + CURRENT_PROJECT_VERSION = 368; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.365; + MARKETING_VERSION = 1.0.368; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -505,9 +505,9 @@ baseConfigurationReference = 7CFA7DE7FABA75685DFB6948 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 365; + CURRENT_PROJECT_VERSION = 368; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.365; + MARKETING_VERSION = 1.0.368; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0;