fix #214

lollipopkit · Nov 13, 2023 · d3a6b16 · d3a6b16
1 parent b2f6094
commit d3a6b16
Show file tree

Hide file tree

Showing 14 changed files with 34 additions and 50 deletions.
diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n.dart b/.dart_tool/flutter_gen/gen_l10n/l10n.dart
@@ -530,12 +530,6 @@ abstract class S {
   /// **'Extra args'**
   String get extraArgs;
 
-  /// No description provided for @fabOpenSSHSession.
-  ///
-  /// In en, this message translates to:
-  /// **'Click the FAB to open a session'**
-  String get fabOpenSSHSession;
-
   /// No description provided for @failed.
   ///
   /// 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
@@ -230,9 +230,6 @@ class SDe extends S {
   @override
   String get extraArgs => 'Extra args';
 
-  @override
-  String get fabOpenSSHSession => 'Klicken Sie auf die FAB, um eine Sitzung zu öffnen';
-
   @override
   String get failed => 'Failed';
 

diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart b/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart
@@ -230,9 +230,6 @@ class SEn extends S {
   @override
   String get extraArgs => 'Extra args';
 
-  @override
-  String get fabOpenSSHSession => 'Click the FAB to open a session';
-
   @override
   String get failed => 'Failed';
 

diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n_id.dart b/.dart_tool/flutter_gen/gen_l10n/l10n_id.dart
@@ -230,9 +230,6 @@ class SId extends S {
   @override
   String get extraArgs => 'Args ekstra';
 
-  @override
-  String get fabOpenSSHSession => 'Klik FAB untuk membuka sesi';
-
   @override
   String get failed => 'Gagal';
 

diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart b/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart
@@ -230,9 +230,6 @@ class SZh extends S {
   @override
   String get extraArgs => '额外参数';
 
-  @override
-  String get fabOpenSSHSession => '点击右下FAB来开启新的SSH终端';
-
   @override
   String get failed => '失败';
 
@@ -1022,9 +1019,6 @@ class SZhTw extends SZh {
   @override
   String get extraArgs => '額外參數';
 
-  @override
-  String get fabOpenSSHSession => '點擊右下FAB來開啟新的SSH終端';
-
   @override
   String get failed => '失敗';
 

diff --git 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 = 636;
+				CURRENT_PROJECT_VERSION = 638;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -596,7 +596,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.636;
+				MARKETING_VERSION = 1.0.638;
 				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 = 636;
+				CURRENT_PROJECT_VERSION = 638;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -730,7 +730,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.636;
+				MARKETING_VERSION = 1.0.638;
 				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 = 636;
+				CURRENT_PROJECT_VERSION = 638;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -758,7 +758,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.636;
+				MARKETING_VERSION = 1.0.638;
 				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 = 636;
+				CURRENT_PROJECT_VERSION = 638;
 				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.636;
+				MARKETING_VERSION = 1.0.638;
 				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 = 636;
+				CURRENT_PROJECT_VERSION = 638;
 				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.636;
+				MARKETING_VERSION = 1.0.638;
 				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 = 636;
+				CURRENT_PROJECT_VERSION = 638;
 				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.636;
+				MARKETING_VERSION = 1.0.638;
 				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 = 636;
+				CURRENT_PROJECT_VERSION = 638;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_PREVIEWS = YES;
@@ -902,7 +902,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.636;
+				MARKETING_VERSION = 1.0.638;
 				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 = 636;
+				CURRENT_PROJECT_VERSION = 638;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_PREVIEWS = YES;
@@ -943,7 +943,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.636;
+				MARKETING_VERSION = 1.0.638;
 				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 = 636;
+				CURRENT_PROJECT_VERSION = 638;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_PREVIEWS = YES;
@@ -981,7 +981,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.636;
+				MARKETING_VERSION = 1.0.638;
 				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
@@ -2,9 +2,9 @@
 
 class BuildData {
   static const String name = "ServerBox";
-  static const int build = 636;
-  static const String engine = "3.13.8";
-  static const String buildAt = "2023-11-07 19:05:38";
+  static const int build = 638;
+  static const String engine = "3.13.9";
+  static const String buildAt = "2023-11-12 17:32:24";
   static const int modifications = 2;
   static const int script = 26;
 }
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
@@ -72,7 +72,6 @@
   "experimentalFeature": "Experimentelles Feature",
   "export": "Export",
   "extraArgs": "Extra args",
-  "fabOpenSSHSession": "Klicken Sie auf die FAB, um eine Sitzung zu öffnen",
   "failed": "Failed",
   "feedback": "Feedback",
   "feedbackOnGithub": "Wenn du Fragen hast, stelle diese bitte auf Github.",

diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -72,7 +72,6 @@
   "experimentalFeature": "Experimental feature",
   "export": "Export",
   "extraArgs": "Extra args",
-  "fabOpenSSHSession": "Click the FAB to open a session",
   "failed": "Failed",
   "feedback": "Feedback",
   "feedbackOnGithub": "If you have any questions, please feedback on Github.",

diff --git a/lib/l10n/app_id.arb b/lib/l10n/app_id.arb
@@ -72,7 +72,6 @@
   "experimentalFeature": "Fitur eksperimental",
   "export": "Ekspor",
   "extraArgs": "Args ekstra",
-  "fabOpenSSHSession": "Klik FAB untuk membuka sesi",
   "failed": "Gagal",
   "feedback": "Masukan",
   "feedbackOnGithub": "Jika Anda memiliki pertanyaan, silakan umpan balik tentang GitHub.",

diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb
@@ -72,7 +72,6 @@
   "experimentalFeature": "实验性功能",
   "export": "导出",
   "extraArgs": "额外参数",
-  "fabOpenSSHSession": "点击右下FAB来开启新的SSH终端",
   "failed": "失败",
   "feedback": "反馈",
   "feedbackOnGithub": "如果你有任何问题，请在GitHub反馈",

diff --git a/lib/l10n/app_zh_tw.arb b/lib/l10n/app_zh_tw.arb
@@ -72,7 +72,6 @@
   "experimentalFeature": "實驗性功能",
   "export": "導出",
   "extraArgs": "額外參數",
-  "fabOpenSSHSession": "點擊右下FAB來開啟新的SSH終端",
   "failed": "失敗",
   "feedback": "反饋",
   "feedbackOnGithub": "如果你有任何問題，請在GitHub反饋",

diff --git a/lib/view/page/ssh/page.dart b/lib/view/page/ssh/page.dart
@@ -31,7 +31,13 @@ const _echoPWD = 'echo \$PWD';
 class SSHPage extends StatefulWidget {
   final ServerPrivateInfo spi;
   final String? initCmd;
-  const SSHPage({Key? key, required this.spi, this.initCmd}) : super(key: key);
+  final bool pop;
+  const SSHPage({
+    Key? key,
+    required this.spi,
+    this.initCmd,
+    this.pop = true,
+  }) : super(key: key);
 
   @override
   _SSHPageState createState() => _SSHPageState();
@@ -362,7 +368,7 @@ class _SSHPageState extends State<SSHPage> with AutomaticKeepAliveClientMixin {
     }
 
     await session.done;
-    if (mounted) {
+    if (mounted && widget.pop) {
       context.pop();
     }
   }

diff --git a/lib/view/page/ssh/tab.dart b/lib/view/page/ssh/tab.dart
@@ -49,7 +49,10 @@ class _SSHTabPageState extends State<SSHTabPage>
           UIs.width7,
           InkWell(
             borderRadius: BorderRadius.circular(17),
-            child: const Padding(padding: EdgeInsets.all(7), child: Icon(Icons.close, size: 17),),
+            child: const Padding(
+              padding: EdgeInsets.all(7),
+              child: Icon(Icons.close, size: 17),
+            ),
             onTap: () async {
               final confirm = await context.showRoundDialog<bool>(
                 title: Text(l10n.attention),
@@ -110,6 +113,7 @@ class _SSHTabPageState extends State<SSHTabPage>
               _tabIds[name] = SSHPage(
                 key: key,
                 spi: spi,
+                pop: false,
               );
               _tabKeys[name] = key;
               _refreshTabs();