diff --git a/README.md b/README.md
index 40ca73de..b019a09d 100644
--- a/README.md
+++ b/README.md
@@ -19,30 +19,36 @@ A new Flutter project which provide a chart view to display server status data a
- 
+ 
|
- 
+ 
|
+
+
+
+ 
|
|
-
-
-
-
- 
+
|
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 9a9db0a5..d979c284 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -354,7 +354,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
- CURRENT_PROJECT_VERSION = 148;
+ CURRENT_PROJECT_VERSION = 149;
DEVELOPMENT_TEAM = BA88US33G6;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
@@ -362,7 +362,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 1.0.148;
+ MARKETING_VERSION = 1.0.149;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -484,7 +484,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
- CURRENT_PROJECT_VERSION = 148;
+ CURRENT_PROJECT_VERSION = 149;
DEVELOPMENT_TEAM = BA88US33G6;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
@@ -492,7 +492,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 1.0.148;
+ MARKETING_VERSION = 1.0.149;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -508,7 +508,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
- CURRENT_PROJECT_VERSION = 148;
+ CURRENT_PROJECT_VERSION = 149;
DEVELOPMENT_TEAM = BA88US33G6;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
@@ -516,7 +516,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 1.0.148;
+ MARKETING_VERSION = 1.0.149;
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 d6f3790a..027e3313 100644
--- a/lib/core/update.dart
+++ b/lib/core/update.dart
@@ -57,7 +57,7 @@ Future doUpdate(BuildContext context, {bool force = false}) async {
update.min > BuildData.build
? 'Your version is too old. \nPlease update to v1.0.$newest.'
: 'Update: v1.0.$newest available. \n${update.changelog}',
- 'Update', () async {
+ s.update, () async {
if (Platform.isAndroid) {
await RUpgrade.upgrade(update.android,
fileName: update.android.split('/').last, isAutoRequestInstall: true);
diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart
index 1f250ece..07090c7b 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 = 148;
+ static const int build = 149;
static const String engine =
"Flutter 3.0.1 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision fb57da5f94 (5 days ago) • 2022-05-19 15:50:29 -0700\nEngine • revision caaafc5604\nTools • Dart 2.17.1 • DevTools 2.12.2\n";
- static const String buildAt = "2022-05-25 13:19:00.526108";
- static const int modifications = 0;
+ static const String buildAt = "2022-05-25 13:35:39.361656";
+ static const int modifications = 4;
}
diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart
index 163a498d..27b2bc15 100644
--- a/lib/generated/intl/messages_en.dart
+++ b/lib/generated/intl/messages_en.dart
@@ -210,6 +210,7 @@ class MessageLookup extends MessageLookupByLibrary {
"unknownError": MessageLookupByLibrary.simpleMessage("Unknown error"),
"unkownConvertMode":
MessageLookupByLibrary.simpleMessage("Unknown convert mode"),
+ "update": MessageLookupByLibrary.simpleMessage("Update"),
"updateAll": MessageLookupByLibrary.simpleMessage("Update all"),
"updateIntervalEqual0": MessageLookupByLibrary.simpleMessage(
"You set to 0, will not update automatically.\nYou can pull to refresh manually."),
diff --git a/lib/generated/intl/messages_zh.dart b/lib/generated/intl/messages_zh.dart
index 170e6ec4..d76e1ceb 100644
--- a/lib/generated/intl/messages_zh.dart
+++ b/lib/generated/intl/messages_zh.dart
@@ -183,6 +183,7 @@ class MessageLookup extends MessageLookupByLibrary {
"unknown": MessageLookupByLibrary.simpleMessage("未知"),
"unknownError": MessageLookupByLibrary.simpleMessage("未知错误"),
"unkownConvertMode": MessageLookupByLibrary.simpleMessage("未知转换模式"),
+ "update": MessageLookupByLibrary.simpleMessage("更新"),
"updateAll": MessageLookupByLibrary.simpleMessage("更新全部"),
"updateIntervalEqual0": MessageLookupByLibrary.simpleMessage(
"你设置为0，服务器状态不会自动刷新。\n你可以手动下拉刷新。"),
diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart
index cf67b3bd..19aba532 100644
--- a/lib/generated/l10n.dart
+++ b/lib/generated/l10n.dart
@@ -1330,6 +1330,16 @@ class S {
args: [],
);
}
+
+ /// `Update`
+ String get update {
+ return Intl.message(
+ 'Update',
+ name: 'update',
+ desc: '',
+ args: [],
+ );
+ }
}
class AppLocalizationDelegate extends LocalizationsDelegate {
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
index 8b37bc99..dbbe8f18 100644
--- a/lib/l10n/intl_en.arb
+++ b/lib/l10n/intl_en.arb
@@ -126,5 +126,6 @@
"restoreSuccess": "Restore success. Restart app to apply.",
"clickSee": "Click here",
"feedback": "Feedback",
- "feedbackOnGithub": "If you have any questions, please feedback on Github."
+ "feedbackOnGithub": "If you have any questions, please feedback on Github.",
+ "update": "Update"
}
\ No newline at end of file
diff --git a/lib/l10n/intl_zh.arb b/lib/l10n/intl_zh.arb
index 9342603f..c9e29711 100644
--- a/lib/l10n/intl_zh.arb
+++ b/lib/l10n/intl_zh.arb
@@ -126,5 +126,6 @@
"restoreSuccess": "恢复成功，需要重启App来应用更改",
"clickSee": "点击查看",
"feedback": "反馈",
- "feedbackOnGithub": "如果你有任何问题，请在GitHub反馈"
+ "feedbackOnGithub": "如果你有任何问题，请在GitHub反馈",
+ "update": "更新"
}
\ No newline at end of file
diff --git a/lib/view/page/apt.dart b/lib/view/page/apt.dart
index d95f10f5..13ddbb76 100644
--- a/lib/view/page/apt.dart
+++ b/lib/view/page/apt.dart
@@ -87,7 +87,10 @@ class _AptManagePageState extends State
),
[
TextButton(
- onPressed: () => Navigator.of(context).pop(),
+ onPressed: () {
+ Navigator.of(context).pop();
+ Navigator.of(context).pop();
+ },
child: Text(s.cancel)),
TextButton(
onPressed: () => onSubmitted(),
diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj
index ab74168b..82914bcc 100644
--- a/macos/Runner.xcodeproj/project.pbxproj
+++ b/macos/Runner.xcodeproj/project.pbxproj
@@ -420,14 +420,14 @@
CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 148;
+ CURRENT_PROJECT_VERSION = 149;
DEVELOPMENT_TEAM = BA88US33G6;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
- MARKETING_VERSION = 1.0.148;
+ MARKETING_VERSION = 1.0.149;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
@@ -550,14 +550,14 @@
CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 148;
+ CURRENT_PROJECT_VERSION = 149;
DEVELOPMENT_TEAM = BA88US33G6;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
- MARKETING_VERSION = 1.0.148;
+ MARKETING_VERSION = 1.0.149;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -574,14 +574,14 @@
CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 148;
+ CURRENT_PROJECT_VERSION = 149;
DEVELOPMENT_TEAM = BA88US33G6;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
- MARKETING_VERSION = 1.0.148;
+ MARKETING_VERSION = 1.0.149;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
diff --git a/screenshots/apt.png b/screenshots/apt.png
new file mode 100644
index 00000000..6117d098
Binary files /dev/null and b/screenshots/apt.png differ
diff --git a/screenshots/convert.jpg b/screenshots/convert.jpg
deleted file mode 100644
index 79beb1e3..00000000
Binary files a/screenshots/convert.jpg and /dev/null differ
diff --git a/screenshots/convert.png b/screenshots/convert.png
new file mode 100644
index 00000000..26a15d61
Binary files /dev/null and b/screenshots/convert.png differ
diff --git a/screenshots/docker.png b/screenshots/docker.png
new file mode 100644
index 00000000..47f69753
Binary files /dev/null and b/screenshots/docker.png differ
diff --git a/screenshots/drawer.jpg b/screenshots/drawer.jpg
deleted file mode 100644
index d4372867..00000000
Binary files a/screenshots/drawer.jpg and /dev/null differ
diff --git a/screenshots/drawer.png b/screenshots/drawer.png
new file mode 100644
index 00000000..5d6feb37
Binary files /dev/null and b/screenshots/drawer.png differ
diff --git a/screenshots/ping.jpg b/screenshots/ping.jpg
deleted file mode 100644
index f189fe22..00000000
Binary files a/screenshots/ping.jpg and /dev/null differ
diff --git a/screenshots/ping.png b/screenshots/ping.png
new file mode 100644
index 00000000..ae20451e
Binary files /dev/null and b/screenshots/ping.png differ
diff --git a/screenshots/server_detail.jpg b/screenshots/server_detail.jpg
deleted file mode 100644
index e941d234..00000000
Binary files a/screenshots/server_detail.jpg and /dev/null differ
diff --git a/screenshots/server_detail.png b/screenshots/server_detail.png
new file mode 100644
index 00000000..e78a532e
Binary files /dev/null and b/screenshots/server_detail.png differ
+ 
+ 
+ 
+