#73 fix & opt.

- fix: reorder list default drag - opt.: android home widget grey text
2025-12-17 07:14:28 +01:00 · 2023-07-20 18:26:17 +08:00
parent 7f8fbfead3
commit 5a5e2fd1d1
16 changed files with 41 additions and 37 deletions
--- a/android/app/src/main/res/drawable/memory_24.xml
+++ b/android/app/src/main/res/drawable/memory_24.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="@color/widgetTitleText"
+<vector android:height="24dp" android:tint="@color/widgetSummaryText"
    android:viewportHeight="24" android:viewportWidth="24"
    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
    <path android:fillColor="@android:color/white" android:pathData="M15,9L9,9v6h6L15,9zM13,13h-2v-2h2v2zM21,11L21,9h-2L19,7c0,-1.1 -0.9,-2 -2,-2h-2L15,3h-2v2h-2L11,3L9,3v2L7,5c-1.1,0 -2,0.9 -2,2v2L3,9v2h2v2L3,13v2h2v2c0,1.1 0.9,2 2,2h2v2h2v-2h2v2h2v-2h2c1.1,0 2,-0.9 2,-2v-2h2v-2h-2v-2h2zM17,17L7,17L7,7h10v10z"/>
--- a/android/app/src/main/res/drawable/net_24.xml
+++ b/android/app/src/main/res/drawable/net_24.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="@color/widgetTitleText"
+<vector android:height="24dp" android:tint="@color/widgetSummaryText"
    android:viewportHeight="24" android:viewportWidth="24"
    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
    <path android:fillColor="@android:color/white" android:pathData="M7.77,6.76L6.23,5.48 0.82,12l5.41,6.52 1.54,-1.28L3.42,12l4.35,-5.24zM7,13h2v-2L7,11v2zM17,11h-2v2h2v-2zM11,13h2v-2h-2v2zM17.77,5.48l-1.54,1.28L20.58,12l-4.35,5.24 1.54,1.28L23.18,12l-5.41,-6.52z"/>
--- a/android/app/src/main/res/drawable/settings_24.xml
+++ b/android/app/src/main/res/drawable/settings_24.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="@color/widgetTitleText"
+<vector android:height="24dp" android:tint="@color/widgetSummaryText"
    android:viewportHeight="24" android:viewportWidth="24"
    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
    <path android:fillColor="@android:color/white" android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
--- a/android/app/src/main/res/drawable/speed_24.xml
+++ b/android/app/src/main/res/drawable/speed_24.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="@color/widgetTitleText"
+<vector android:height="24dp" android:tint="@color/widgetSummaryText"
    android:viewportHeight="24" android:viewportWidth="24"
    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
    <path android:fillColor="@android:color/white" android:pathData="M20.38,8.57l-1.23,1.85a8,8 0,0 1,-0.22 7.58L5.07,18A8,8 0,0 1,15.58 6.85l1.85,-1.23A10,10 0,0 0,3.35 19a2,2 0,0 0,1.72 1h13.85a2,2 0,0 0,1.74 -1,10 10,0 0,0 -0.27,-10.44zM10.59,15.41a2,2 0,0 0,2.83 0l5.66,-8.49 -8.49,5.66a2,2 0,0 0,0 2.83z"/>
--- a/android/app/src/main/res/drawable/storage_24.xml
+++ b/android/app/src/main/res/drawable/storage_24.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="@color/widgetTitleText"
+<vector android:height="24dp" android:tint="@color/widgetSummaryText"
    android:viewportHeight="24" android:viewportWidth="24"
    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
    <path android:fillColor="@android:color/white" android:pathData="M2,20h20v-4L2,16v4zM4,17h2v2L4,19v-2zM2,4v4h20L22,4L2,4zM6,7L4,7L4,5h2v2zM2,14h20v-4L2,10v4zM4,11h2v2L4,13v-2z"/>
--- 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" />

--- a/android/app/src/main/res/values-night/colors.xml
+++ b/android/app/src/main/res/values-night/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <color name="widgetBackground">#000000</color>
-    <color name="widgetTitleText">#FFFFFF</color>
+    <color name="widgetText">#FFFFFF</color>
    <color name="widgetSummaryText">#BBBBBB</color>
 </resources>
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -2,6 +2,6 @@
 <resources>
    <color name="colorLaunch">#EEEEEE</color>
    <color name="widgetBackground">#FFFFFF</color>
-    <color name="widgetTitleText">#000000</color>
+    <color name="widgetText">#000000</color>
    <color name="widgetSummaryText">#333333</color>
 </resources>
--- 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)";
--- 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<String, dynamic> 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;
  }
 }
--- 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;
 }
--- a/lib/view/page/server/detail.dart
+++ b/lib/view/page/server/detail.dart
@@ -33,7 +33,7 @@ class _ServerDetailPageState extends State<ServerDetailPage>
    with SingleTickerProviderStateMixin {
  late MediaQueryData _media;
  late S _s;
-  final Order _cardsOrder = [];
+  final Order<String> _cardsOrder = [];
  final _setting = locator<SettingStore>();

  @override
@@ -81,6 +81,7 @@ class _ServerDetailPageState extends State<ServerDetailPage>
            );
          });
        },
+        buildDefaultDragHandles: false,
        footer: height13,
        children: _buildMainList(si.status),
      ),
--- a/lib/view/page/server/tab.dart
+++ b/lib/view/page/server/tab.dart
@@ -117,6 +117,7 @@ class _ServerPageState extends State<ServerPage>
              all: _s.all,
            ),
            padding: const EdgeInsets.fromLTRB(7, 10, 7, 7),
+            buildDefaultDragHandles: false,
            onReorder: (oldIndex, newIndex) => setState(() {
              pro.serverOrder.moveByItem(
                filtered,
--- a/lib/view/page/snippet/list.dart
+++ b/lib/view/page/snippet/list.dart
@@ -71,6 +71,7 @@ class _SnippetListPageState extends State<SnippetListPage> {
        return ReorderableListView.builder(
          padding: const EdgeInsets.all(13),
          itemCount: filtered.length,
+          buildDefaultDragHandles: false,
          onReorder: (oldIdx, newIdx) => setState(() {
            provider.snippets.moveByItem(
              filtered,
--- 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<SSHVirtKeySettingPage> {
    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(
--- 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;