From 065fd154291c3378f00af6f899bed0b64cd8b327 Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Sat, 11 Mar 2023 19:02:22 +0800 Subject: [PATCH] decrease `res` files --- README.md | 5 +- ios/Runner.xcodeproj/project.pbxproj | 12 +- ios/Runner/Info.plist | 116 +++++++++--------- lib/app.dart | 2 +- lib/data/model/ssh/terminal_color.dart | 2 +- lib/data/res/build_data.dart | 6 +- lib/data/res/icon.dart | 3 - lib/data/res/misc.dart | 1 + lib/data/res/padding.dart | 3 - lib/data/res/status.dart | 14 +-- .../{terminal_color.dart => terminal.dart} | 20 +++ lib/data/res/terminal_theme.dart | 23 ---- lib/data/res/{font_style.dart => ui.dart} | 10 ++ lib/data/store/setting.dart | 2 +- lib/view/page/backup.dart | 2 +- lib/view/page/docker.dart | 2 +- lib/view/page/home.dart | 3 +- lib/view/page/ping.dart | 2 +- lib/view/page/pkg.dart | 2 +- lib/view/page/private_key/edit.dart | 2 +- lib/view/page/private_key/list.dart | 2 +- lib/view/page/server/detail.dart | 3 +- lib/view/page/server/edit.dart | 2 +- lib/view/page/server/tab.dart | 2 +- lib/view/page/setting.dart | 6 +- lib/view/page/sftp/downloaded.dart | 2 +- lib/view/page/sftp/downloading.dart | 2 +- lib/view/page/snippet/edit.dart | 2 +- lib/view/page/snippet/list.dart | 2 +- lib/view/page/ssh.dart | 104 ++++++++-------- 30 files changed, 177 insertions(+), 182 deletions(-) delete mode 100644 lib/data/res/icon.dart delete mode 100644 lib/data/res/padding.dart rename lib/data/res/{terminal_color.dart => terminal.dart} (89%) delete mode 100644 lib/data/res/terminal_theme.dart rename lib/data/res/{font_style.dart => ui.dart} (65%) diff --git a/README.md b/README.md index 4cb1b1ac..112d2e14 100644 --- a/README.md +++ b/README.md @@ -28,11 +28,8 @@ Especially thanks to dartss ## 🔖 Feature - [x] Functions - - [x] `SSH` Terminal + - [x] `SSH` Terminal, `SFTP` - [x] `Docker & Pkg` Manager - - [x] `SFTP` - - [x] `Snippet` - - [x] `Ping` - [x] Status charts - [x] etc. - [x] i18n (English, Chinese) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 8fa9228c..a7b5de9f 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -356,7 +356,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 227; + CURRENT_PROJECT_VERSION = 228; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -364,7 +364,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.227; + MARKETING_VERSION = 1.0.228; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -486,7 +486,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 227; + CURRENT_PROJECT_VERSION = 228; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -494,7 +494,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.227; + MARKETING_VERSION = 1.0.228; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -510,7 +510,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 227; + CURRENT_PROJECT_VERSION = 228; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -518,7 +518,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.227; + MARKETING_VERSION = 1.0.228; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index cf3cd419..9f967916 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -1,62 +1,62 @@ - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ServerBox - CFBundlePackageType - APPL - CFBundleShortVersionString - $(MARKETING_VERSION) - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - LSRequiresIPhoneOS - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UIStatusBarHidden - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UIViewControllerBasedStatusBarAppearance - - CFBundleLocalizations - - en - zh - - CADisableMinimumFrameDurationOnPhone - - UIApplicationSupportsIndirectInputEvents - - UIBackgroundModes - - fetch - - LSSupportsOpeningDocumentsInPlace - - ITSAppUsesNonExemptEncryption - - + + CADisableMinimumFrameDurationOnPhone + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleLocalizations + + en + zh + + CFBundleName + ServerBox + CFBundlePackageType + APPL + CFBundleShortVersionString + $(MARKETING_VERSION) + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + ITSAppUsesNonExemptEncryption + + LSRequiresIPhoneOS + + LSSupportsOpeningDocumentsInPlace + + UIApplicationSupportsIndirectInputEvents + + UIBackgroundModes + + processing + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIStatusBarHidden + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + diff --git a/lib/app.dart b/lib/app.dart index 8a4a0df3..f593bad7 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -22,7 +22,7 @@ class MyApp extends StatelessWidget { builder: (_, colorValue, __) { primaryColor = Color(colorValue); return ValueListenableBuilder( - valueListenable: _setting.nightMode.listenable(), + valueListenable: _setting.themeMode.listenable(), builder: (_, mode, __) => _buildApp(mode), ); }, diff --git a/lib/data/model/ssh/terminal_color.dart b/lib/data/model/ssh/terminal_color.dart index 21588800..b45ba1fe 100644 --- a/lib/data/model/ssh/terminal_color.dart +++ b/lib/data/model/ssh/terminal_color.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:xterm/ui.dart'; -import '../../res/terminal_color.dart'; +import '../../res/terminal.dart'; class TerminalUITheme { final Color cursor; diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index d196b954..cfcaa288 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 = 227; + static const int build = 228; static const String engine = "Flutter 3.7.3 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision 9944297138 (2 weeks ago) • 2023-02-08 15:46:04 -0800\nEngine • revision 248290d6d5\nTools • Dart 2.19.2 • DevTools 2.20.1\n"; - static const String buildAt = "2023-02-25 18:23:00.718232"; - static const int modifications = 13; + static const String buildAt = "2023-02-25 20:13:29.020860"; + static const int modifications = 2; } diff --git a/lib/data/res/icon.dart b/lib/data/res/icon.dart deleted file mode 100644 index 9c7a5583..00000000 --- a/lib/data/res/icon.dart +++ /dev/null @@ -1,3 +0,0 @@ -import 'package:flutter/widgets.dart'; - -final appIcon = Image.asset('assets/app_icon.png'); diff --git a/lib/data/res/misc.dart b/lib/data/res/misc.dart index e24b0212..9ba58ccd 100644 --- a/lib/data/res/misc.dart +++ b/lib/data/res/misc.dart @@ -1,3 +1,4 @@ +/// RegExp for number final numReg = RegExp(r'\s{1,}'); /// Private Key max allowed size is 20kb diff --git a/lib/data/res/padding.dart b/lib/data/res/padding.dart deleted file mode 100644 index de1018e9..00000000 --- a/lib/data/res/padding.dart +++ /dev/null @@ -1,3 +0,0 @@ -import 'package:flutter/material.dart'; - -const roundRectCardPadding = EdgeInsets.symmetric(horizontal: 17, vertical: 13); diff --git a/lib/data/res/status.dart b/lib/data/res/status.dart index 19bc6f6d..77617382 100644 --- a/lib/data/res/status.dart +++ b/lib/data/res/status.dart @@ -5,14 +5,14 @@ import '../model/server/net_speed.dart'; import '../model/server/server_status.dart'; import '../model/server/tcp_status.dart'; -get _initMemory => Memory( +Memory get _initMemory => Memory( total: 1, used: 0, free: 1, cache: 0, avail: 1, ); -get _initOneTimeCpuStatus => OneTimeCpuStatus( +OneTimeCpuStatus get _initOneTimeCpuStatus => OneTimeCpuStatus( 'cpu', 0, 0, @@ -22,28 +22,28 @@ get _initOneTimeCpuStatus => OneTimeCpuStatus( 0, 0, ); -get initCpuStatus => CpuStatus( +CpuStatus get initCpuStatus => CpuStatus( [_initOneTimeCpuStatus], [_initOneTimeCpuStatus], '', ); -get _initNetSpeedPart => NetSpeedPart( +NetSpeedPart get _initNetSpeedPart => NetSpeedPart( '', BigInt.zero, BigInt.zero, BigInt.zero, ); -get initNetSpeed => NetSpeed( +NetSpeed get initNetSpeed => NetSpeed( [_initNetSpeedPart], [_initNetSpeedPart], ); -get _initSwap => Swap( +Swap get _initSwap => Swap( total: 1, used: 0, free: 1, cached: 0, ); -get initStatus => ServerStatus( +ServerStatus get initStatus => ServerStatus( cpu: initCpuStatus, mem: _initMemory, sysVer: 'Loading...', diff --git a/lib/data/res/terminal_color.dart b/lib/data/res/terminal.dart similarity index 89% rename from lib/data/res/terminal_color.dart rename to lib/data/res/terminal.dart index e24af98c..d19745d4 100644 --- a/lib/data/res/terminal_color.dart +++ b/lib/data/res/terminal.dart @@ -1,6 +1,26 @@ import 'package:flutter/material.dart'; import 'package:toolbox/data/model/ssh/terminal_color.dart'; +const termDarkTheme = TerminalUITheme( + cursor: Color(0XAAAEAFAD), + selection: Color(0XAAAEAFAD), + foreground: Color(0XFFCCCCCC), + background: Colors.black, + searchHitBackground: Color(0XFFFFFF2B), + searchHitBackgroundCurrent: Color(0XFF31FF26), + searchHitForeground: Color(0XFF000000), +); + +const termLightTheme = TerminalUITheme( + cursor: Color(0XFFAEAFAD), + selection: Color.fromARGB(102, 174, 175, 173), + foreground: Color(0XFF000000), + background: Color(0XFFFFFFFF), + searchHitBackground: Color(0XFFFFFF2B), + searchHitBackgroundCurrent: Color(0XFF31FF26), + searchHitForeground: Color(0XFF000000), +); + class VGATerminalColor extends TerminalColors { VGATerminalColor() : super( diff --git a/lib/data/res/terminal_theme.dart b/lib/data/res/terminal_theme.dart deleted file mode 100644 index 4cea661c..00000000 --- a/lib/data/res/terminal_theme.dart +++ /dev/null @@ -1,23 +0,0 @@ -import 'package:flutter/material.dart'; - -import '../model/ssh/terminal_color.dart'; - -const termDarkTheme = TerminalUITheme( - cursor: Color(0XAAAEAFAD), - selection: Color(0XAAAEAFAD), - foreground: Color(0XFFCCCCCC), - background: Colors.black, - searchHitBackground: Color(0XFFFFFF2B), - searchHitBackgroundCurrent: Color(0XFF31FF26), - searchHitForeground: Color(0XFF000000), -); - -const termLightTheme = TerminalUITheme( - cursor: Color(0XFFAEAFAD), - selection: Color.fromARGB(102, 174, 175, 173), - foreground: Color(0XFF000000), - background: Color(0XFFFFFFFF), - searchHitBackground: Color(0XFFFFFF2B), - searchHitBackgroundCurrent: Color(0XFF31FF26), - searchHitForeground: Color(0XFF000000), -); diff --git a/lib/data/res/font_style.dart b/lib/data/res/ui.dart similarity index 65% rename from lib/data/res/font_style.dart rename to lib/data/res/ui.dart index b4d9afa3..4553edc5 100644 --- a/lib/data/res/font_style.dart +++ b/lib/data/res/ui.dart @@ -1,5 +1,7 @@ import 'package:flutter/material.dart'; +/// Font style + const textSize18 = TextStyle(fontSize: 18); const textSize11 = TextStyle(fontSize: 11); const textSize13 = TextStyle(fontSize: 13); @@ -7,3 +9,11 @@ const textSize13Grey = TextStyle(color: Colors.grey, fontSize: 13); const textSize27 = TextStyle(fontSize: 27); const grey = TextStyle(color: Colors.grey); + +/// Icon + +final appIcon = Image.asset('assets/app_icon.png'); + +/// Padding + +const roundRectCardPadding = EdgeInsets.symmetric(horizontal: 17, vertical: 13); diff --git a/lib/data/store/setting.dart b/lib/data/store/setting.dart index b2522252..52eb9488 100644 --- a/lib/data/store/setting.dart +++ b/lib/data/store/setting.dart @@ -31,6 +31,6 @@ class SettingStore extends PersistentStore { property('maxRetryCount', defaultValue: 7); /// Night mode: 0 -> auto, 1 -> light, 2 -> dark - StoreProperty get nightMode => + StoreProperty get themeMode => property('nightMode', defaultValue: ThemeMode.system.index); } diff --git a/lib/view/page/backup.dart b/lib/view/page/backup.dart index 20f54ba8..5fd8077a 100644 --- a/lib/view/page/backup.dart +++ b/lib/view/page/backup.dart @@ -10,7 +10,7 @@ import 'package:toolbox/data/res/color.dart'; import '../../core/extension/colorx.dart'; import '../../core/utils/ui.dart'; import '../../data/model/app/backup.dart'; -import '../../data/res/font_style.dart'; +import '../../data/res/ui.dart'; import '../../data/store/private_key.dart'; import '../../data/store/server.dart'; import '../../data/store/setting.dart'; diff --git a/lib/view/page/docker.dart b/lib/view/page/docker.dart index 3e8c3aaa..6adcff42 100644 --- a/lib/view/page/docker.dart +++ b/lib/view/page/docker.dart @@ -8,8 +8,8 @@ import '../../data/model/server/server_private_info.dart'; import '../../data/provider/docker.dart'; import '../../data/provider/server.dart'; import '../../data/res/error.dart'; -import '../../data/res/font_style.dart'; import '../../data/res/menu.dart'; +import '../../data/res/ui.dart'; import '../../data/res/url.dart'; import '../../data/store/docker.dart'; import '../../locator.dart'; diff --git a/lib/view/page/home.dart b/lib/view/page/home.dart index 60fe9f9f..368c0da5 100644 --- a/lib/view/page/home.dart +++ b/lib/view/page/home.dart @@ -11,9 +11,8 @@ import '../../data/model/app/dynamic_color.dart'; import '../../data/model/app/navigation_item.dart'; import '../../data/provider/server.dart'; import '../../data/res/build_data.dart'; -import '../../data/res/font_style.dart'; -import '../../data/res/icon.dart'; import '../../data/res/tab.dart'; +import '../../data/res/ui.dart'; import '../../data/res/url.dart'; import '../../data/store/setting.dart'; import '../../locator.dart'; diff --git a/lib/view/page/ping.dart b/lib/view/page/ping.dart index f9f7c40c..29fac5a8 100644 --- a/lib/view/page/ping.dart +++ b/lib/view/page/ping.dart @@ -9,7 +9,7 @@ import '../../core/utils/ui.dart'; import '../../data/model/server/ping_result.dart'; import '../../data/provider/server.dart'; import '../../data/res/color.dart'; -import '../../data/res/font_style.dart'; +import '../../data/res/ui.dart'; import '../../locator.dart'; import '../widget/input_field.dart'; import '../widget/round_rect_card.dart'; diff --git a/lib/view/page/pkg.dart b/lib/view/page/pkg.dart index d792a276..ca6b2320 100644 --- a/lib/view/page/pkg.dart +++ b/lib/view/page/pkg.dart @@ -8,7 +8,7 @@ import '../../core/utils/ui.dart'; import '../../data/model/server/server_private_info.dart'; import '../../data/provider/pkg.dart'; import '../../data/provider/server.dart'; -import '../../data/res/font_style.dart'; +import '../../data/res/ui.dart'; import '../../locator.dart'; import '../widget/center_loading.dart'; import '../widget/round_rect_card.dart'; diff --git a/lib/view/page/private_key/edit.dart b/lib/view/page/private_key/edit.dart index 22d4867c..c2dac9d4 100644 --- a/lib/view/page/private_key/edit.dart +++ b/lib/view/page/private_key/edit.dart @@ -13,7 +13,7 @@ import '../../../core/utils/server.dart'; import '../../../core/utils/ui.dart'; import '../../../data/model/server/private_key_info.dart'; import '../../../data/provider/private_key.dart'; -import '../../../data/res/font_style.dart'; +import '../../../data/res/ui.dart'; import '../../../locator.dart'; import '../../widget/input_decoration.dart'; diff --git a/lib/view/page/private_key/list.dart b/lib/view/page/private_key/list.dart index 1b911270..debb993e 100644 --- a/lib/view/page/private_key/list.dart +++ b/lib/view/page/private_key/list.dart @@ -4,7 +4,7 @@ import 'package:provider/provider.dart'; import '../../../core/route.dart'; import '../../../data/provider/private_key.dart'; -import '../../../data/res/font_style.dart'; +import '../../../data/res/ui.dart'; import 'edit.dart'; import '../../../view/widget/round_rect_card.dart'; diff --git a/lib/view/page/server/detail.dart b/lib/view/page/server/detail.dart index 7bd81920..73d629fc 100644 --- a/lib/view/page/server/detail.dart +++ b/lib/view/page/server/detail.dart @@ -9,9 +9,8 @@ import '../../../data/model/server/server.dart'; import '../../../data/model/server/server_status.dart'; import '../../../data/provider/server.dart'; import '../../../data/res/color.dart'; -import '../../../data/res/font_style.dart'; -import '../../../data/res/padding.dart'; import '../../../data/res/sizedbox.dart'; +import '../../../data/res/ui.dart'; import '../../../data/store/setting.dart'; import '../../../locator.dart'; import '../../widget/round_rect_card.dart'; diff --git a/lib/view/page/server/edit.dart b/lib/view/page/server/edit.dart index 30446b91..f0e7fc90 100644 --- a/lib/view/page/server/edit.dart +++ b/lib/view/page/server/edit.dart @@ -10,7 +10,7 @@ import '../../../data/model/server/server_private_info.dart'; import '../../../data/provider/private_key.dart'; import '../../../data/provider/server.dart'; import '../../../data/res/color.dart'; -import '../../../data/res/font_style.dart'; +import '../../../data/res/ui.dart'; import '../../../data/store/private_key.dart'; import '../../../locator.dart'; import '../../widget/input_decoration.dart'; diff --git a/lib/view/page/server/tab.dart b/lib/view/page/server/tab.dart index a8ebeeb7..798e23b7 100644 --- a/lib/view/page/server/tab.dart +++ b/lib/view/page/server/tab.dart @@ -13,8 +13,8 @@ import '../../../data/model/server/server_status.dart'; import '../../../data/provider/server.dart'; import '../../../data/provider/snippet.dart'; import '../../../data/res/color.dart'; -import '../../../data/res/font_style.dart'; import '../../../data/res/menu.dart'; +import '../../../data/res/ui.dart'; import '../../../data/res/url.dart'; import '../../../data/store/setting.dart'; import '../../../locator.dart'; diff --git a/lib/view/page/setting.dart b/lib/view/page/setting.dart index e7e3e7e7..deb7e173 100644 --- a/lib/view/page/setting.dart +++ b/lib/view/page/setting.dart @@ -10,8 +10,8 @@ import '../../data/provider/app.dart'; import '../../data/provider/server.dart'; import '../../data/res/build_data.dart'; import '../../data/res/color.dart'; -import '../../data/res/font_style.dart'; import '../../data/res/tab.dart'; +import '../../data/res/ui.dart'; import '../../data/store/setting.dart'; import '../../locator.dart'; import '../widget/round_rect_card.dart'; @@ -50,7 +50,7 @@ class _SettingPageState extends State { _setting = locator(); _launchPageIdx = _setting.launchPage.fetch()!; _termThemeIdx = _setting.termColorIdx.fetch()!; - _nightMode = _setting.nightMode.fetch()!; + _nightMode = _setting.themeMode.fetch()!; _updateInterval = _setting.serverStatusUpdateInterval.fetch()!.toDouble(); _maxRetryCount = _setting.maxRetryCount.fetch()!.toDouble(); } @@ -400,7 +400,7 @@ class _SettingPageState extends State { }); }, onChangeEnd: (val) { - _setting.nightMode.put(val.toInt()); + _setting.themeMode.put(val.toInt()); }, label: _buildNightModeStr(_nightMode), divisions: 2, diff --git a/lib/view/page/sftp/downloaded.dart b/lib/view/page/sftp/downloaded.dart index e4006c99..180cdba5 100644 --- a/lib/view/page/sftp/downloaded.dart +++ b/lib/view/page/sftp/downloaded.dart @@ -9,8 +9,8 @@ import '../../../core/route.dart'; import '../../../core/utils/misc.dart'; import '../../../core/utils/ui.dart'; import '../../../data/model/app/path_with_prefix.dart'; -import '../../../data/res/font_style.dart'; import '../../../data/res/path.dart'; +import '../../../data/res/ui.dart'; import '../../widget/fade_in.dart'; import 'downloading.dart'; diff --git a/lib/view/page/sftp/downloading.dart b/lib/view/page/sftp/downloading.dart index 9418a21a..591fc578 100644 --- a/lib/view/page/sftp/downloading.dart +++ b/lib/view/page/sftp/downloading.dart @@ -7,7 +7,7 @@ import '../../../core/utils/misc.dart'; import '../../../core/utils/ui.dart'; import '../../../data/model/sftp/download_status.dart'; import '../../../data/provider/sftp_download.dart'; -import '../../../data/res/font_style.dart'; +import '../../../data/res/ui.dart'; import '../../widget/center_loading.dart'; import '../../widget/round_rect_card.dart'; diff --git a/lib/view/page/snippet/edit.dart b/lib/view/page/snippet/edit.dart index d742211e..aa7b22b4 100644 --- a/lib/view/page/snippet/edit.dart +++ b/lib/view/page/snippet/edit.dart @@ -5,7 +5,7 @@ import 'package:flutter_gen/gen_l10n/l10n.dart'; import '../../../core/utils/ui.dart'; import '../../../data/model/server/snippet.dart'; import '../../../data/provider/snippet.dart'; -import '../../../data/res/font_style.dart'; +import '../../../data/res/ui.dart'; import '../../../locator.dart'; import '../../widget/input_decoration.dart'; diff --git a/lib/view/page/snippet/list.dart b/lib/view/page/snippet/list.dart index dae80371..b4d44da4 100644 --- a/lib/view/page/snippet/list.dart +++ b/lib/view/page/snippet/list.dart @@ -2,9 +2,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:provider/provider.dart'; +import '../../../data/res/ui.dart'; import '/core/route.dart'; import '/data/provider/snippet.dart'; -import '/data/res/font_style.dart'; import 'edit.dart'; import '/view/widget/round_rect_card.dart'; diff --git a/lib/view/page/ssh.dart b/lib/view/page/ssh.dart index ff8dc6db..564147ca 100644 --- a/lib/view/page/ssh.dart +++ b/lib/view/page/ssh.dart @@ -17,7 +17,7 @@ import '../../data/model/server/server_private_info.dart'; import '../../data/model/ssh/virtual_key.dart'; import '../../data/provider/virtual_keyboard.dart'; import '../../data/res/color.dart'; -import '../../data/res/terminal_theme.dart'; +import '../../data/res/terminal.dart'; import '../../data/res/virtual_key.dart'; import '../../data/store/setting.dart'; import '../../locator.dart'; @@ -272,58 +272,56 @@ class _SSHPageState extends State { } void _onTapUp(TapUpDetails details, CellOffset offset) { - { - if (_menuController.isShown) { - _menuController.remove(); - return; - } - final selected = terminalSelected; - if (selected.trim().isEmpty) { - // _menuController.show( - // context: context, - // contextMenuBuilder: (context) { - // return TextSelectionToolbar( - // anchorAbove: detail.globalPosition, - // anchorBelow: detail.globalPosition, - // children: [ - // TextButton( - // child: Text( - // 'Paste', - // style: _menuTextStyle, - // ), - // onPressed: () async { - // _paste(); - // _menuController.remove(); - // }, - // ) - // ], - // ); - // }, - // ); - return; - } - _menuController.show( - context: context, - contextMenuBuilder: (context) { - return TextSelectionToolbar( - anchorAbove: details.globalPosition, - anchorBelow: details.globalPosition, - children: [ - TextButton( - child: Text( - _s.copy, - style: _menuTextStyle, - ), - onPressed: () { - _terminalController.setSelection(null); - copy(selected); - _menuController.remove(); - }, - ), - ], - ); - }, - ); + if (_menuController.isShown) { + _menuController.remove(); + return; } + final selected = terminalSelected; + if (selected.trim().isEmpty) { + // _menuController.show( + // context: context, + // contextMenuBuilder: (context) { + // return TextSelectionToolbar( + // anchorAbove: detail.globalPosition, + // anchorBelow: detail.globalPosition, + // children: [ + // TextButton( + // child: Text( + // 'Paste', + // style: _menuTextStyle, + // ), + // onPressed: () async { + // _paste(); + // _menuController.remove(); + // }, + // ) + // ], + // ); + // }, + // ); + return; + } + _menuController.show( + context: context, + contextMenuBuilder: (context) { + return TextSelectionToolbar( + anchorAbove: details.globalPosition, + anchorBelow: details.globalPosition, + children: [ + TextButton( + child: Text( + _s.copy, + style: _menuTextStyle, + ), + onPressed: () { + _terminalController.setSelection(null); + copy(selected); + _menuController.remove(); + }, + ), + ], + ); + }, + ); } }