diff --git a/android/app/src/main/res/drawable/memory_24.xml b/android/app/src/main/res/drawable/memory_24.xml index 782f0334..b25d1924 100644 --- a/android/app/src/main/res/drawable/memory_24.xml +++ b/android/app/src/main/res/drawable/memory_24.xml @@ -1,4 +1,4 @@ - diff --git a/android/app/src/main/res/drawable/net_24.xml b/android/app/src/main/res/drawable/net_24.xml index b42514db..8c6a3881 100644 --- a/android/app/src/main/res/drawable/net_24.xml +++ b/android/app/src/main/res/drawable/net_24.xml @@ -1,4 +1,4 @@ - diff --git a/android/app/src/main/res/drawable/settings_24.xml b/android/app/src/main/res/drawable/settings_24.xml index bc9438a9..04c52121 100644 --- a/android/app/src/main/res/drawable/settings_24.xml +++ b/android/app/src/main/res/drawable/settings_24.xml @@ -1,4 +1,4 @@ - diff --git a/android/app/src/main/res/drawable/speed_24.xml b/android/app/src/main/res/drawable/speed_24.xml index 56ecc4d7..86b448ff 100644 --- a/android/app/src/main/res/drawable/speed_24.xml +++ b/android/app/src/main/res/drawable/speed_24.xml @@ -1,4 +1,4 @@ - diff --git a/android/app/src/main/res/drawable/storage_24.xml b/android/app/src/main/res/drawable/storage_24.xml index 2ae99d06..fd652908 100644 --- a/android/app/src/main/res/drawable/storage_24.xml +++ b/android/app/src/main/res/drawable/storage_24.xml @@ -1,4 +1,4 @@ - diff --git a/android/app/src/main/res/layout/home_widget.xml b/android/app/src/main/res/layout/home_widget.xml index df71bc78..d6bdb3b3 100644 --- a/android/app/src/main/res/layout/home_widget.xml +++ b/android/app/src/main/res/layout/home_widget.xml @@ -12,7 +12,7 @@ android:id="@+id/widget_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/widgetTitleText" + android:textColor="@color/widgetText" android:textSize="23sp" android:textStyle="bold" tools:text="Server Name" /> @@ -45,7 +45,7 @@ android:layout_marginStart="11dp" android:singleLine="true" android:ellipsize = "marquee" - android:textColor="@color/widgetTitleText" + android:textColor="@color/widgetSummaryText" android:textSize="12.7sp" tools:text="CPU" /> @@ -73,7 +73,7 @@ android:layout_height="wrap_content" android:layout_marginStart="11dp" android:maxLines="1" - android:textColor="@color/widgetTitleText" + android:textColor="@color/widgetSummaryText" android:textSize="12.7sp" tools:text="Mem" /> @@ -100,7 +100,7 @@ android:layout_height="wrap_content" android:layout_marginStart="11dp" android:maxLines="1" - android:textColor="@color/widgetTitleText" + android:textColor="@color/widgetSummaryText" android:textSize="12.7sp" tools:text="Disk" /> @@ -126,7 +126,7 @@ android:layout_height="wrap_content" android:layout_marginStart="11dp" android:maxLines="1" - android:textColor="@color/widgetTitleText" + android:textColor="@color/widgetSummaryText" android:textSize="12.7sp" tools:text="Net" /> diff --git a/android/app/src/main/res/values-night/colors.xml b/android/app/src/main/res/values-night/colors.xml index 252bf018..00fa8002 100644 --- a/android/app/src/main/res/values-night/colors.xml +++ b/android/app/src/main/res/values-night/colors.xml @@ -1,6 +1,6 @@ #000000 - #FFFFFF + #FFFFFF #BBBBBB \ No newline at end of file diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml index e3ae284f..cd63695d 100644 --- a/android/app/src/main/res/values/colors.xml +++ b/android/app/src/main/res/values/colors.xml @@ -2,6 +2,6 @@ #EEEEEE #FFFFFF - #000000 + #000000 #333333 \ No newline at end of file diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 9726006a..7ede42cc 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -470,7 +470,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 379; + CURRENT_PROJECT_VERSION = 380; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -478,7 +478,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.379; + MARKETING_VERSION = 1.0.380; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -602,7 +602,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 379; + CURRENT_PROJECT_VERSION = 380; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -610,7 +610,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.379; + MARKETING_VERSION = 1.0.380; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -628,7 +628,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 379; + CURRENT_PROJECT_VERSION = 380; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -636,7 +636,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.379; + MARKETING_VERSION = 1.0.380; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -657,7 +657,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 379; + CURRENT_PROJECT_VERSION = 380; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -670,7 +670,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.379; + MARKETING_VERSION = 1.0.380; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; @@ -696,7 +696,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 379; + CURRENT_PROJECT_VERSION = 380; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -709,7 +709,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.379; + MARKETING_VERSION = 1.0.380; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -732,7 +732,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 379; + CURRENT_PROJECT_VERSION = 380; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -745,7 +745,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.379; + MARKETING_VERSION = 1.0.380; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/lib/data/model/server/server_private_info.dart b/lib/data/model/server/server_private_info.dart index 049a97b3..33e52b80 100644 --- a/lib/data/model/server/server_private_info.dart +++ b/lib/data/model/server/server_private_info.dart @@ -29,12 +29,12 @@ class ServerPrivateInfo { required this.pwd, this.pubKeyId, this.tags, - }) : id = '$user@$ip:$port'; + }) : id = '$name<$user@$ip:$port>'; ServerPrivateInfo.fromJson(Map json) { name = json["name"].toString(); ip = json["ip"].toString(); - port = json["port"].toInt(); + port = int.tryParse(json["port"]) ?? 22; user = json["user"].toString(); pwd = json["authorization"].toString(); pubKeyId = json["pubKeyId"]?.toString(); @@ -55,6 +55,6 @@ class ServerPrivateInfo { } bool shouldReconnect(ServerPrivateInfo old) { - return id != id || pwd != old.pwd || pubKeyId != old.pubKeyId; + return id != old.id || pwd != old.pwd || pubKeyId != old.pubKeyId; } } diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index 2b8bbdcb..18e2c014 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 = 379; + static const int build = 380; static const String engine = "3.10.6"; - static const String buildAt = "2023-07-19 19:18:31.520465"; - static const int modifications = 7; + static const String buildAt = "2023-07-20 18:08:32.806339"; + static const int modifications = 14; } diff --git a/lib/view/page/server/detail.dart b/lib/view/page/server/detail.dart index 649135df..d8173673 100644 --- a/lib/view/page/server/detail.dart +++ b/lib/view/page/server/detail.dart @@ -33,7 +33,7 @@ class _ServerDetailPageState extends State with SingleTickerProviderStateMixin { late MediaQueryData _media; late S _s; - final Order _cardsOrder = []; + final Order _cardsOrder = []; final _setting = locator(); @override @@ -81,6 +81,7 @@ class _ServerDetailPageState extends State ); }); }, + buildDefaultDragHandles: false, footer: height13, children: _buildMainList(si.status), ), diff --git a/lib/view/page/server/tab.dart b/lib/view/page/server/tab.dart index f60fe623..ed5ac841 100644 --- a/lib/view/page/server/tab.dart +++ b/lib/view/page/server/tab.dart @@ -117,6 +117,7 @@ class _ServerPageState extends State all: _s.all, ), padding: const EdgeInsets.fromLTRB(7, 10, 7, 7), + buildDefaultDragHandles: false, onReorder: (oldIndex, newIndex) => setState(() { pro.serverOrder.moveByItem( filtered, diff --git a/lib/view/page/snippet/list.dart b/lib/view/page/snippet/list.dart index ede4d2ca..3093a887 100644 --- a/lib/view/page/snippet/list.dart +++ b/lib/view/page/snippet/list.dart @@ -71,6 +71,7 @@ class _SnippetListPageState extends State { return ReorderableListView.builder( padding: const EdgeInsets.all(13), itemCount: filtered.length, + buildDefaultDragHandles: false, onReorder: (oldIdx, newIdx) => setState(() { provider.snippets.moveByItem( filtered, diff --git a/lib/view/page/ssh/virt_key_setting.dart b/lib/view/page/ssh/virt_key_setting.dart index 98bf2242..0a715d26 100644 --- a/lib/view/page/ssh/virt_key_setting.dart +++ b/lib/view/page/ssh/virt_key_setting.dart @@ -43,6 +43,7 @@ class _SSHVirtKeySettingPageState extends State { final allKeys = [...keys, ...disabled]; return ReorderableListView.builder( padding: const EdgeInsets.fromLTRB(11, 3, 0, 3), + buildDefaultDragHandles: false, itemBuilder: (_, idx) { final key = allKeys[idx]; return ListTile( diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 6b06b5ec..95e90227 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 = 379; + CURRENT_PROJECT_VERSION = 380; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.379; + MARKETING_VERSION = 1.0.380; 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 = 379; + CURRENT_PROJECT_VERSION = 380; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.379; + MARKETING_VERSION = 1.0.380; 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 = 379; + CURRENT_PROJECT_VERSION = 380; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.379; + MARKETING_VERSION = 1.0.380; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0;