From 6a0254623f983e0df988f432720b27e61a68233a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lollipopkit=F0=9F=8F=B3=EF=B8=8F=E2=80=8D=E2=9A=A7?=
=?UTF-8?q?=EF=B8=8F?= <10864310+lollipopkit@users.noreply.github.com>
Date: Fri, 26 Jul 2024 20:22:30 +0800
Subject: [PATCH] opt.: json input experience
---
.github/FUNDING.yml | 2 +-
README.md | 14 ++++-
README_zh.md | 11 +++-
ios/Runner.xcodeproj/project.pbxproj | 36 +++++------
lib/data/res/build_data.dart | 2 +-
lib/data/res/github_id.dart | 9 +++
lib/view/page/server/edit.dart | 70 ++++++++++-----------
lib/view/page/server/tab.dart | 21 ++++---
lib/view/page/setting/platform/android.dart | 5 +-
macos/Runner.xcodeproj/project.pbxproj | 12 ++--
pubspec.lock | 4 +-
pubspec.yaml | 4 +-
12 files changed, 110 insertions(+), 80 deletions(-)
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index f5583877..4a3362ba 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -11,4 +11,4 @@ issuehunt: # Replace with a single IssueHunt username
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
polar: # Replace with a single Polar username
buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+custom: ['https://afdian.com/a/lollipopkit'] # Replace with up to 4 custom sponsorship URLs
diff --git a/README.md b/README.md
index 707b4dea..680a102b 100644
--- a/README.md
+++ b/README.md
@@ -27,11 +27,13 @@ Linux / Windows | [GitHub](https://github.com/lollipopkit/flutter_server_box/rel
- Github releases are built by Github Actions
- Other sources are built by themselves
+
## 🔖 Feature
- `Status chart` (CPU, Sensors, GPU...), `SSH` Term, `SFTP`, `Docker & Pkg & Process`...
- Platform specific: `Bio auth`、`Msg push`、`Home widget`、`watchOS App`...
- English, 简体中文; Deutsch [@its-tom](https://github.com/its-tom), 繁體中文 [@kalashnikov](https://github.com/kalashnikov), Indonesian [@azkadev](https://github.com/azkadev), Français [@FrancXPT](https://github.com/FrancXPT), Dutch [@QazCetelic](https://github.com/QazCetelic); Español, Русский язык, Português, 日本語 (Generated by GPT)
+
## 🏙️ ScreenShots
@@ -60,8 +62,16 @@ After you read the above, you can open an [issue](https://github.com/lollipopkit
## 🧱 Contribution
-- Any positive contribution is welcome.
-- [l10n guide](https://blog.lolli.tech/faq/) can be found in my blog.
+Any positive contribution is welcome.
+
+### Development
+1. Setup [Flutter](https://flutter.dev/docs/get-started/install) environment.
+2. Clone this repo, run `flutter run` to start the app.
+3. Run `dart run fl_build -p PLATFORM` to build the app.
+
+### Translation
+- [Guide](https://blog.lpkt.cn/posts/faq/) can be found in my blog.
+- We need your help! Just feel free to open a PR.
## 💡 My other apps
diff --git a/README_zh.md b/README_zh.md
index 523cbc78..a15d53db 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -26,6 +26,7 @@ Linux / Windows | [GitHub](https://github.com/lollipopkit/flutter_server_box/rel
- Github 的包由 Github Actions 构建
- 其他来源由其所有者构建
+
## 🔖 特点
- `状态图表`(CPU、传感器、GPU 等), `SSH` 终端, `SFTP`, `Docker & 包 & 进程` 管理器...
- 特殊支持:`生物认证`、`推送`、`桌面小部件`、`watchOS App`、`跟随系统颜色`...
@@ -65,9 +66,15 @@ Linux / Windows | [GitHub](https://github.com/lollipopkit/flutter_server_box/rel
## 🧱 贡献
-- 任何正面的贡献都欢迎。
-- [本地化翻译指南](https://blog.lolli.tech/faq/) 可在我的博客中找到。
+任何正面的贡献都欢迎。
+### 开发
+1. 安装 [Flutter](https://flutter.dev/docs/get-started/install)
+2. 克隆这个仓库, 运行 `flutter run` 启动应用
+3. 运行 `dart run fl_build -p PLATFORM` 构建应用
+
+### 翻译
+[指南](https://blog.lolli.tech/faq/) 可在我的博客中找到。
## 💡 我的其它 Apps
- [GPT Box](https://github.com/lollipopkit/flutter_gpt_box) - 支持 OpenAI API 的 第三方全平台客户端。
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 576c4086..55828aef 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -690,7 +690,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
- CURRENT_PROJECT_VERSION = 1026;
+ CURRENT_PROJECT_VERSION = 1030;
DEVELOPMENT_TEAM = BA88US33G6;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -700,7 +700,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 1.0.1026;
+ MARKETING_VERSION = 1.0.1030;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -826,7 +826,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
- CURRENT_PROJECT_VERSION = 1026;
+ CURRENT_PROJECT_VERSION = 1030;
DEVELOPMENT_TEAM = BA88US33G6;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -836,7 +836,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 1.0.1026;
+ MARKETING_VERSION = 1.0.1030;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -854,7 +854,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
- CURRENT_PROJECT_VERSION = 1026;
+ CURRENT_PROJECT_VERSION = 1030;
DEVELOPMENT_TEAM = BA88US33G6;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -864,7 +864,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 1.0.1026;
+ MARKETING_VERSION = 1.0.1030;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -885,7 +885,7 @@
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 1026;
+ CURRENT_PROJECT_VERSION = 1030;
DEVELOPMENT_TEAM = BA88US33G6;
GCC_C_LANGUAGE_STANDARD = gnu11;
GENERATE_INFOPLIST_FILE = YES;
@@ -898,7 +898,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
- MARKETING_VERSION = 1.0.1026;
+ MARKETING_VERSION = 1.0.1030;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget;
@@ -924,7 +924,7 @@
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 1026;
+ CURRENT_PROJECT_VERSION = 1030;
DEVELOPMENT_TEAM = BA88US33G6;
GCC_C_LANGUAGE_STANDARD = gnu11;
GENERATE_INFOPLIST_FILE = YES;
@@ -937,7 +937,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
- MARKETING_VERSION = 1.0.1026;
+ MARKETING_VERSION = 1.0.1030;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget;
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -960,7 +960,7 @@
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 1026;
+ CURRENT_PROJECT_VERSION = 1030;
DEVELOPMENT_TEAM = BA88US33G6;
GCC_C_LANGUAGE_STANDARD = gnu11;
GENERATE_INFOPLIST_FILE = YES;
@@ -973,7 +973,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
- MARKETING_VERSION = 1.0.1026;
+ MARKETING_VERSION = 1.0.1030;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget;
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -996,7 +996,7 @@
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 1026;
+ CURRENT_PROJECT_VERSION = 1030;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = BA88US33G6;
ENABLE_PREVIEWS = YES;
@@ -1008,7 +1008,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 1.0.1026;
+ MARKETING_VERSION = 1.0.1030;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd;
@@ -1037,7 +1037,7 @@
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 1026;
+ CURRENT_PROJECT_VERSION = 1030;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = BA88US33G6;
ENABLE_PREVIEWS = YES;
@@ -1049,7 +1049,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 1.0.1026;
+ MARKETING_VERSION = 1.0.1030;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd;
PRODUCT_NAME = ServerBox;
@@ -1075,7 +1075,7 @@
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 1026;
+ CURRENT_PROJECT_VERSION = 1030;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = BA88US33G6;
ENABLE_PREVIEWS = YES;
@@ -1087,7 +1087,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 1.0.1026;
+ MARKETING_VERSION = 1.0.1030;
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 3609673b..ad8f2f6f 100644
--- a/lib/data/res/build_data.dart
+++ b/lib/data/res/build_data.dart
@@ -2,6 +2,6 @@
class BuildData {
static const String name = "ServerBox";
- static const int build = 1026;
+ static const int build = 1030;
static const int script = 54;
}
diff --git a/lib/data/res/github_id.dart b/lib/data/res/github_id.dart
index 65d2878f..03b1e006 100644
--- a/lib/data/res/github_id.dart
+++ b/lib/data/res/github_id.dart
@@ -85,6 +85,15 @@ abstract final class GithubIds {
'Mooling0602',
'IllTamer',
'marlkiller',
+ 'hlarc',
+ 'itsandrewpao',
+ 'StudyingLover',
+ 'QJAG1024',
+ 'Wuming-HUST',
+ 'WolfCanglong',
+ 'liwenjie119',
+ 'logce',
+ 'h-lyf',
};
}
diff --git a/lib/view/page/server/edit.dart b/lib/view/page/server/edit.dart
index 829d20c9..adf32958 100644
--- a/lib/view/page/server/edit.dart
+++ b/lib/view/page/server/edit.dart
@@ -1,5 +1,3 @@
-import 'dart:convert';
-
import 'package:fl_lib/fl_lib.dart';
import 'package:flutter/material.dart';
import 'package:icons_plus/icons_plus.dart';
@@ -30,7 +28,6 @@ class _ServerEditPageState extends State with AfterLayoutMixin {
final _usernameController = TextEditingController();
final _passwordController = TextEditingController();
final _pveAddrCtrl = TextEditingController();
- final _customCmdCtrl = TextEditingController();
final _preferTempDevCtrl = TextEditingController();
final _logoUrlCtrl = TextEditingController();
final _wolMacCtrl = TextEditingController();
@@ -50,6 +47,7 @@ class _ServerEditPageState extends State with AfterLayoutMixin {
final _jumpServer = ValueNotifier(null);
final _pveIgnoreCert = ValueNotifier(false);
final _env = {}.vn;
+ final _customCmds = {}.vn;
var _tags = [];
@@ -68,7 +66,6 @@ class _ServerEditPageState extends State with AfterLayoutMixin {
_portFocus.dispose();
_usernameFocus.dispose();
_pveAddrCtrl.dispose();
- _customCmdCtrl.dispose();
_preferTempDevCtrl.dispose();
_logoUrlCtrl.dispose();
_wolMacCtrl.dispose();
@@ -84,10 +81,13 @@ class _ServerEditPageState extends State with AfterLayoutMixin {
@override
Widget build(BuildContext context) {
- return Scaffold(
- appBar: _buildAppBar(),
- body: _buildForm(),
- floatingActionButton: _buildFAB(),
+ return GestureDetector(
+ onTap: () => _focusScope.unfocus(),
+ child: Scaffold(
+ appBar: _buildAppBar(),
+ body: _buildForm(),
+ floatingActionButton: _buildFAB(),
+ ),
);
}
@@ -198,7 +198,6 @@ class _ServerEditPageState extends State with AfterLayoutMixin {
),
),
_buildAuth(),
- _buildEnvs(),
_buildJumpServer(),
_buildMore(),
];
@@ -340,6 +339,10 @@ class _ServerEditPageState extends State with AfterLayoutMixin {
suggestion: false,
),
UIs.height7,
+ Text(l10n.envVars, style: UIs.text13Grey),
+ UIs.height7,
+ _buildEnvs(),
+ UIs.height7,
..._buildPVEs(),
UIs.height7,
..._buildCustomCmds(),
@@ -408,15 +411,26 @@ class _ServerEditPageState extends State with AfterLayoutMixin {
return [
Text(l10n.customCmd, style: UIs.text13Grey),
UIs.height7,
- Input(
- controller: _customCmdCtrl,
- type: TextInputType.text,
- maxLines: 3,
- label: 'JSON',
- icon: Icons.code,
- hint: '{${l10n.customCmdHint}}',
- suggestion: false,
- ),
+ _customCmds.listenVal(
+ (vals) {
+ return ListTile(
+ leading: const Icon(BoxIcons.bxs_file_json).paddingOnly(left: 10),
+ title: const Text('JSON'),
+ subtitle: vals.isEmpty
+ ? null
+ : Text(vals.keys.join(','), style: UIs.textGrey),
+ trailing: const Icon(Icons.keyboard_arrow_right),
+ onTap: () async {
+ final res = await KvEditor.route.go(
+ context,
+ args: KvEditorArgs(data: _customCmds.value),
+ );
+ if (res == null) return;
+ _customCmds.value = res;
+ },
+ );
+ },
+ ).cardx,
ListTile(
leading: const Padding(
padding: EdgeInsets.only(left: 10),
@@ -556,19 +570,11 @@ class _ServerEditPageState extends State with AfterLayoutMixin {
if (_portController.text.isEmpty) {
_portController.text = '22';
}
- final customCmds = () {
- if (_customCmdCtrl.text.isEmpty) return null;
- try {
- return json.decode(_customCmdCtrl.text).cast();
- } catch (e) {
- context.showSnackBar(l10n.invalidJson);
- return null;
- }
- }();
+ final customCmds = _customCmds.value;
final custom = ServerCustom(
pveAddr: _pveAddrCtrl.text.selfIfNotNullEmpty,
pveIgnoreCert: _pveIgnoreCert.value,
- cmds: customCmds,
+ cmds: customCmds.isEmpty ? null : customCmds,
preferTempDev: _preferTempDevCtrl.text.selfIfNotNullEmpty,
logoUrl: _logoUrlCtrl.text.selfIfNotNullEmpty,
);
@@ -670,13 +676,7 @@ class _ServerEditPageState extends State with AfterLayoutMixin {
if (custom != null) {
_pveAddrCtrl.text = custom.pveAddr ?? '';
_pveIgnoreCert.value = custom.pveIgnoreCert;
- try {
- // Add a null check here to prevent setting `null` to the controller
- final encoded = json.encode(custom.cmds!);
- if (encoded.isNotEmpty) {
- _customCmdCtrl.text = encoded;
- }
- } catch (_) {}
+ _customCmds.value = custom.cmds ?? {};
_preferTempDevCtrl.text = custom.preferTempDev ?? '';
_logoUrlCtrl.text = custom.logoUrl ?? '';
}
diff --git a/lib/view/page/server/tab.dart b/lib/view/page/server/tab.dart
index 27d2505f..e654b975 100644
--- a/lib/view/page/server/tab.dart
+++ b/lib/view/page/server/tab.dart
@@ -504,12 +504,15 @@ class _ServerPageState extends State
),
};
- final wrapped = SizedBox(
- height: _kCardHeightMin,
- width: 27,
- child: child,
- );
- if (onTap == null) return wrapped;
+ // Or the loading icon will be rescaled.
+ final wrapped = child is SizedBox
+ ? child
+ : SizedBox(
+ height: _kCardHeightMin,
+ width: 27,
+ child: child,
+ );
+ if (onTap == null) return wrapped.paddingOnly(left: 10);
return InkWell(
borderRadius: BorderRadius.circular(7),
onTap: onTap,
@@ -650,9 +653,9 @@ ${ss.err?.message ?? l10n.unknownError}
.toList();
static const _kCardHeightMin = 23.0;
- static const _kCardHeightFlip = 97.0;
- static const _kCardHeightNormal = 106.0;
- static const _kCardHeightMoveOutFuncs = 132.0;
+ static const _kCardHeightFlip = 99.0;
+ static const _kCardHeightNormal = 108.0;
+ static const _kCardHeightMoveOutFuncs = 135.0;
double? _calcCardHeight(ServerConn cs, bool flip) {
if (_textFactorDouble != 1.0) return null;
diff --git a/lib/view/page/setting/platform/android.dart b/lib/view/page/setting/platform/android.dart
index fbfb21a2..e6649ffd 100644
--- a/lib/view/page/setting/platform/android.dart
+++ b/lib/view/page/setting/platform/android.dart
@@ -44,8 +44,9 @@ class _AndroidSettingsPageState extends State {
Widget _buildBgRun() {
return ListTile(
- title: Text(l10n.bgRun),
- subtitle: Text(l10n.bgRunTip, style: UIs.textGrey),
+ // title: Text(l10n.bgRun),
+ // subtitle: Text(l10n.bgRunTip, style: UIs.textGrey),
+ title: TipText(text: l10n.bgRun, tip: l10n.bgRunTip),
trailing: StoreSwitch(prop: Stores.setting.bgRun),
);
}
diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj
index aa8f8e08..eefaf423 100644
--- a/macos/Runner.xcodeproj/project.pbxproj
+++ b/macos/Runner.xcodeproj/project.pbxproj
@@ -471,7 +471,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 1026;
+ CURRENT_PROJECT_VERSION = 1030;
DEVELOPMENT_TEAM = BA88US33G6;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "Server Box";
@@ -481,7 +481,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
- MARKETING_VERSION = 1.0.1026;
+ MARKETING_VERSION = 1.0.1030;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
PRODUCT_NAME = "Server Box";
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -608,7 +608,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 1026;
+ CURRENT_PROJECT_VERSION = 1030;
DEVELOPMENT_TEAM = BA88US33G6;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "Server Box";
@@ -618,7 +618,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
- MARKETING_VERSION = 1.0.1026;
+ MARKETING_VERSION = 1.0.1030;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
PRODUCT_NAME = "Server Box";
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -638,7 +638,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "3rd Party Mac Developer Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 1026;
+ CURRENT_PROJECT_VERSION = 1030;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=macosx*]" = BA88US33G6;
INFOPLIST_FILE = Runner/Info.plist;
@@ -649,7 +649,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
- MARKETING_VERSION = 1.0.1026;
+ MARKETING_VERSION = 1.0.1030;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
PRODUCT_NAME = "Server Box";
PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/pubspec.lock b/pubspec.lock
index 690fb80e..8b3f106c 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -385,8 +385,8 @@ packages:
dependency: "direct main"
description:
path: "."
- ref: "v1.0.87"
- resolved-ref: a5cfc603d2f5ea9bb2caa91ab1ab9dadded46622
+ ref: "v1.0.88"
+ resolved-ref: fd87becb3c112edac090903e78d863b5ca93a70e
url: "https://github.com/lppcg/fl_lib"
source: git
version: "0.0.1"
diff --git a/pubspec.yaml b/pubspec.yaml
index 2d934833..56cef8e7 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
name: server_box
description: server status & toolbox app.
publish_to: 'none'
-version: 1.0.1026+1026
+version: 1.0.1030+1030
environment:
sdk: ">=3.0.0"
@@ -62,7 +62,7 @@ dependencies:
fl_lib:
git:
url: https://github.com/lppcg/fl_lib
- ref: v1.0.87
+ ref: v1.0.88
dependency_overrides:
# dartssh2: