migrate: fl_lib

2025-12-17 07:14:28 +01:00 · 2025-03-24 23:07:52 +08:00
parent 24d64b835d
commit 2a2f348063
7 changed files with 46 additions and 34 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,4 @@ untranlated.json
 .vscode/settings.json
 more_build_data.json
 trans.txt
+android/app/.cxx
--- a/lib/view/page/home/appbar.dart
+++ b/lib/view/page/home/appbar.dart
@@ -15,7 +15,7 @@ final class _AppBar extends StatelessWidget implements PreferredSizeWidget {
  @override
  Size get preferredSize {
    final height = switch (Pfs.type) {
-      Pfs.macos => paddingTop + (CustomAppBar.sysStatusBarHeight ?? 0),
+      Pfs.macos => paddingTop + CustomAppBar.sysStatusBarHeight,
      _ => paddingTop,
    };
    return Size.fromHeight(height);
--- a/lib/view/page/setting/platform/platform_pub.dart
+++ b/lib/view/page/setting/platform/platform_pub.dart
@@ -19,8 +19,8 @@ abstract final class PlatformPublicSettings {
          title: Text(libL10n.bioAuth),
          subtitle: can == true
              ? null
-              : const Text(
-                  'Not available',
+              : Text(
+                  libL10n.notExistFmt(libL10n.bioAuth),
                  style: UIs.textGrey,
                ),
          trailing: can == true
--- a/lib/view/page/ssh/page.dart
+++ b/lib/view/page/ssh/page.dart
@@ -154,7 +154,7 @@ class SSHPageState extends State<SSHPage>
          _media.padding.top,
      child: Padding(
        padding: EdgeInsets.only(
-          top: widget.notFromTab ? CustomAppBar.sysStatusBarHeight ?? 0 : 0,
+          top: widget.notFromTab ? CustomAppBar.sysStatusBarHeight : 0,
          left: _horizonPadding,
          right: _horizonPadding,
        ),
@@ -172,7 +172,7 @@ class SSHPageState extends State<SSHPage>
          showToolbar: isMobile,
          viewOffset: Offset(
            2 * _horizonPadding,
-            CustomAppBar.sysStatusBarHeight ?? _media.padding.top,
+            CustomAppBar.sysStatusBarHeight,
          ),
          hideScrollBar: false,
          focusNode: widget.focusNode,
--- a/macos/Runner.xcodeproj/project.pbxproj
+++ b/macos/Runner.xcodeproj/project.pbxproj
@@ -653,7 +653,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "Server Box";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = serverbox;
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = serverbox_lkmm;
 				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -66,10 +66,10 @@ packages:
    dependency: transitive
    description:
      name: archive
-      sha256: "0c64e928dcbefddecd234205422bcfc2b5e6d31be0b86fef0d0dd48d7b4c9742"
+      sha256: "7dcbd0f87fe5f61cb28da39a1a8b70dbc106e2fe0516f7836eb7bb2948481a12"
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.4"
+    version: "4.0.5"
  args:
    dependency: transitive
    description:
@@ -82,10 +82,10 @@ packages:
    dependency: transitive
    description:
      name: asn1lib
-      sha256: "068190d6c99c436287936ba5855af2e1fa78d8083ae65b4db6a281780da727ae"
+      sha256: e02d018628c870ef2d7f03e33f9ad179d89ff6ec52ca6c56bcb80bcef979867f
      url: "https://pub.dev"
    source: hosted
-    version: "1.6.0"
+    version: "1.6.2"
  async:
    dependency: transitive
    description:
@@ -186,10 +186,10 @@ packages:
    dependency: transitive
    description:
      name: camera_avfoundation
-      sha256: "3057ada0b30402e3a9b6dffec365c9736a36edbf04abaecc67c4309eadc86b49"
+      sha256: ba48b65a3a97004276ede882e6b838d9667642ff462c95a8bb57ca8a82b6bd25
      url: "https://pub.dev"
    source: hosted
-    version: "0.9.18+9"
+    version: "0.9.18+11"
  camera_platform_interface:
    dependency: transitive
    description:
@@ -339,9 +339,11 @@ packages:
  dartssh2:
    dependency: "direct main"
    description:
-      path: "../dartssh2"
-      relative: true
-    source: path
+      path: "."
+      ref: master
+      resolved-ref: "262f41491ec6e558f4799935924b3c222869e698"
+      url: "https://github.com/lollipopkit/dartssh2"
+    source: git
    version: "2.12.0"
  dbus:
    dependency: transitive
@@ -403,18 +405,18 @@ packages:
    dependency: "direct main"
    description:
      name: extended_image
-      sha256: "85199f9233e03abc2ce2e68cbb2991648666af4a527ae4e6250935be8edfddae"
+      sha256: fcefcf3cba32696c639e9e305a790039709d05a7139320b91bb9d300993452e2
      url: "https://pub.dev"
    source: hosted
-    version: "9.1.0"
+    version: "10.0.0"
  extended_image_library:
    dependency: transitive
    description:
      name: extended_image_library
-      sha256: e61dafd94400fff6ef7ed1523d445ff3af137f198f3228e4a3107bc5b4bec5d1
+      sha256: ae468c31c375064964de11cbb31310a58c4462df6e3bae1a0bc0066f586795d5
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.6"
+    version: "5.0.0"
  fake_async:
    dependency: transitive
    description:
@@ -443,10 +445,10 @@ packages:
    dependency: "direct main"
    description:
      name: file_picker
-      sha256: ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810
+      sha256: "8d938fd5c11dc81bf1acd4f7f0486c683fe9e79a0b13419e27730f9ce4d8a25b"
      url: "https://pub.dev"
    source: hosted
-    version: "8.3.7"
+    version: "9.2.1"
  fixnum:
    dependency: transitive
    description:
@@ -476,8 +478,8 @@ packages:
    dependency: "direct main"
    description:
      path: "."
-      ref: "v1.0.251"
-      resolved-ref: "5774f9e56e6255293a40dc750692dc600056a288"
+      ref: "v1.0.258"
+      resolved-ref: db7c450e3c696c8cada32aeb728bc4a14c155dd6
      url: "https://github.com/lppcg/fl_lib"
    source: git
    version: "0.0.1"
@@ -623,10 +625,10 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_reorderable_grid_view
-      sha256: a7e0f9d5ba12fd232eb07fbb7f570ae35491045a6bba1858f6eb50c675526dfe
+      sha256: f5db90ae62f8307daef9a884e09ed2d883838592e92185017a4431fe8e78899e
      url: "https://pub.dev"
    source: hosted
-    version: "5.4.1"
+    version: "5.5.0"
  flutter_riverpod:
    dependency: transitive
    description:
@@ -785,10 +787,10 @@ packages:
    dependency: transitive
    description:
      name: image
-      sha256: "13d3349ace88f12f4a0d175eb5c12dcdd39d35c4c109a8a13dfeb6d0bd9e31c3"
+      sha256: "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928"
      url: "https://pub.dev"
    source: hosted
-    version: "4.5.3"
+    version: "4.5.4"
  intl:
    dependency: "direct main"
    description:
@@ -1653,6 +1655,15 @@ packages:
      url: "https://github.com/lollipopkit/webdav_client"
    source: git
    version: "1.2.2"
+  webdav_client_plus:
+    dependency: transitive
+    description:
+      path: "."
+      ref: "v1.0.86"
+      resolved-ref: "7e08000e20c001b15a747c9564adfbfd45c7cadc"
+      url: "https://github.com/lollipopkit/webdav_client"
+    source: git
+    version: "1.2.2"
  win32:
    dependency: transitive
    description:
@@ -1720,4 +1731,4 @@ packages:
    version: "1.1.2"
 sdks:
  dart: ">=3.7.0 <4.0.0"
-  flutter: ">=3.27.0"
+  flutter: ">=3.29.0"
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -25,15 +25,15 @@ dependencies:
  fl_chart: ^0.70.2
  wakelock_plus: ^1.2.4
  wake_on_lan: ^4.1.1+3
-  extended_image: ^9.0.7
-  file_picker: ^8.3.7
+  extended_image: ^10.0.0
+  file_picker: ^9.2.1
  json_annotation: ^4.9.0
  choice: ^2.3.2
  flutter_reorderable_grid_view: ^5.1.0
  dartssh2:
    git:
      url: https://github.com/lollipopkit/dartssh2
-      ref: no-etm
+      ref: master
  circle_chart:
    git:
      url: https://github.com/lollipopkit/circle_chart
@@ -61,11 +61,11 @@ dependencies:
  fl_lib:
    git:
      url: https://github.com/lppcg/fl_lib
-      ref: v1.0.251
+      ref: v1.0.258

 dependency_overrides:
-  dartssh2:
-    path: ../dartssh2
+  # dartssh2:
+  #   path: ../dartssh2
  # xterm:
  #   path: ../xterm.dart
  # fl_lib: