diff --git a/README.md b/README.md
index 69f29902..f40d41a8 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,8 @@ Especially thanks to dartss
- [x] Functions
- [x] `SSH` Terminal, `SFTP`
- [x] `Docker & Pkg` Manager
- - [x] Status charts
+ - [x] `Status` charts
+ - [x] `Code editor`
- [x] `Ping` and etc.
- [x] Localization ( English, 简体中文, Deutsch, 繁體中文. [How to contribute?](#l10n-guide))
- [x] Desktop support
@@ -56,7 +57,7 @@ If ServerBox app has any bug, please open an [issue](https://github.com/lollipop
- 
+ 
|
diff --git a/README_zh.md b/README_zh.md
index d1d316bc..6f2e5e2b 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -29,6 +29,7 @@
- [x] `SSH` 终端, `SFTP`
- [x] `Docker & 包` 管理器
- [x] 状态图表
+ - [x] 代码编辑器
- [x] `Ping` 和 更多
- [x] 本地化 ( English, 简体中文, Deutsch, 繁體中文。 [如何贡献？](#l10n-guide))
- [x] 桌面端支持
@@ -56,7 +57,7 @@
-
+
|
diff --git a/imgs/editor.jpg b/imgs/editor.jpg
new file mode 100644
index 00000000..b824cccd
Binary files /dev/null and b/imgs/editor.jpg differ
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 8964abba..f66806f7 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 = 329;
+ CURRENT_PROJECT_VERSION = 333;
DEVELOPMENT_TEAM = BA88US33G6;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -368,7 +368,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 1.0.329;
+ MARKETING_VERSION = 1.0.333;
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 = 329;
+ CURRENT_PROJECT_VERSION = 333;
DEVELOPMENT_TEAM = BA88US33G6;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -499,7 +499,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 1.0.329;
+ MARKETING_VERSION = 1.0.333;
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 = 329;
+ CURRENT_PROJECT_VERSION = 333;
DEVELOPMENT_TEAM = BA88US33G6;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -524,7 +524,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 1.0.329;
+ MARKETING_VERSION = 1.0.333;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart
index a82f4ab8..b41fc32c 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 = 329;
- static const String engine = "3.10.0";
- static const String buildAt = "2023-05-27 22:51:11.684423";
+ static const int build = 333;
+ static const String engine = "3.10.2";
+ static const String buildAt = "2023-05-28 19:42:38.911830";
static const int modifications = 7;
}
diff --git a/lib/view/page/editor.dart b/lib/view/page/editor.dart
index 073509ff..bc4ca1b1 100644
--- a/lib/view/page/editor.dart
+++ b/lib/view/page/editor.dart
@@ -65,6 +65,7 @@ class _EditorPageState extends State {
return Scaffold(
backgroundColor: _codeTheme['root']!.backgroundColor,
appBar: AppBar(
+ centerTitle: true,
title: TwoLineText(up: getFileName(widget.path) ?? '', down: _s.editor),
actions: [
PopupMenuButton(
diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj
index 286b5ed9..94f82b2e 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 = 329;
+ CURRENT_PROJECT_VERSION = 333;
GENERATE_INFOPLIST_FILE = YES;
- MARKETING_VERSION = 1.0.329;
+ MARKETING_VERSION = 1.0.333;
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 = 329;
+ CURRENT_PROJECT_VERSION = 333;
GENERATE_INFOPLIST_FILE = YES;
- MARKETING_VERSION = 1.0.329;
+ MARKETING_VERSION = 1.0.333;
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 = 329;
+ CURRENT_PROJECT_VERSION = 333;
GENERATE_INFOPLIST_FILE = YES;
- MARKETING_VERSION = 1.0.329;
+ MARKETING_VERSION = 1.0.333;
PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
diff --git a/make.dart b/make.dart
index dc2c59b9..4aa8f771 100755
--- a/make.dart
+++ b/make.dart
@@ -10,7 +10,7 @@ const buildDataFilePath = 'lib/data/res/build_data.dart';
const apkPath = 'build/app/outputs/flutter-apk/app-release.apk';
const ipaPath = 'build/ios/ipa/$appName.ipa';
const appleXCConfigPath = 'Runner.xcodeproj/project.pbxproj';
-const releaseDirPath = '/Volumes/bc4/releases';
+const releaseDirPath = './release';
var regAppleProjectVer = RegExp(r'CURRENT_PROJECT_VERSION = .+;');
var regAppleMarketVer = RegExp(r'MARKETING_VERSION = .+');
@@ -108,6 +108,8 @@ Future flutterBuild(
final args = [
'build',
buildType,
+ '--build-number=$build',
+ '--build-name=1.0.$build',
];
final skslPath = '$buildType.sksl.json';
if (await File(skslPath).exists()) {
@@ -118,8 +120,6 @@ Future flutterBuild(
if (isAndroid) {
args.addAll([
'--target-platform=android-arm64',
- '--build-number=$build',
- '--build-name=1.0.$build',
]);
}
print('\n[$buildType]\nBuilding with args: ${args.join(' ')}');