chore: upgrade Flutter dependencies to latest resolvable versions

Integral-Tech · Integral-Tech · commit 13329ae008c0 · 2025-06-23T12:30:44.000+08:00
diff --git a/lib/logic/network/request.dart b/lib/logic/network/request.dart
@@ -16,7 +16,7 @@ class Request {
   }
 
   Future<Response<dynamic>> get(
-    url, {
+    String url, {
     Map<String, dynamic>? queryParameters,
     Options? options,
     CancelToken? cancelToken,
@@ -31,7 +31,7 @@ class Request {
   }
 
   Future<Response<dynamic>> post(
-    url, {
+    String url, {
     Object? data,
     Map<String, dynamic>? queryParameters,
     Options? options,
diff --git a/lib/pages/app/app_page.dart b/lib/pages/app/app_page.dart
@@ -197,12 +197,14 @@ class _AppPageState extends State<AppPage> with TickerProviderStateMixin {
                         onSelected: (AppMenuItem item) {
                           switch (item) {
                             case AppMenuItem.Copy:
-                              Utils.copyText(Utils.getShareUrl(
-                                  controller.id!, ShareType.apk));
+                              Utils.copyText(Utils.getShareUri(
+                                      controller.id!, ShareType.apk)
+                                  .toString());
                               break;
                             case AppMenuItem.Share:
-                              Share.share(Utils.getShareUrl(
-                                  controller.id!, ShareType.apk));
+                              SharePlus.instance.share(ShareParams(
+                                  uri: Utils.getShareUri(
+                                      controller.id!, ShareType.apk)));
                               break;
                             case AppMenuItem.Follow:
                               if (GlobalData().isLogin) {
diff --git a/lib/pages/blacklist/black_list_page.dart b/lib/pages/blacklist/black_list_page.dart
@@ -142,12 +142,12 @@ class _BlackListPageState extends State<BlackListPage> {
                     );
                   } else {
                     try {
-                      await Share.shareXFiles([
+                      await SharePlus.instance.share(ShareParams(files: [
                         XFile.fromData(utf8.encode(data),
                             mimeType: 'text/plain')
                       ], fileNameOverrides: [
                         fileName
-                      ]);
+                      ]));
                       SmartDialog.showToast('导出成功');
                     } catch (e) {
                       SmartDialog.showToast('导出失败');
diff --git a/lib/pages/chat/chat_page.dart b/lib/pages/chat/chat_page.dart
@@ -428,7 +428,7 @@ class _ChatPageState extends State<ChatPage> {
     );
   }
 
-  updatePanelType(PanelType type) async {
+  void updatePanelType(PanelType type) async {
     final isSwitchToKeyboard = PanelType.keyboard == type;
     final isSwitchToEmojiPanel = PanelType.emoji == type;
     bool isUpdated = false;
@@ -465,7 +465,7 @@ class _ChatPageState extends State<ChatPage> {
     }
   }
 
-  hidePanel() async {
+  void hidePanel() async {
     if (_focusNode.hasFocus) {
       await Future.delayed(const Duration(milliseconds: 100));
       _focusNode.unfocus();
diff --git a/lib/pages/feed/feed_page.dart b/lib/pages/feed/feed_page.dart
@@ -490,10 +490,12 @@ class _FeedPageState extends State<FeedPage> with TickerProviderStateMixin {
                         switch (item) {
                           case FeedMenuItem.Copy:
                             Utils.copyText(
-                                Utils.getShareUrl(_id, ShareType.feed));
+                                Utils.getShareUri(_id, ShareType.feed)
+                                    .toString());
                             break;
                           case FeedMenuItem.Share:
-                            Share.share(Utils.getShareUrl(_id, ShareType.feed));
+                            SharePlus.instance.share(ShareParams(
+                                uri: Utils.getShareUri(_id, ShareType.feed)));
                             break;
                           case FeedMenuItem.Fav:
                             if (_feedController.isFav) {
diff --git a/lib/pages/feed/reply/reply_dialog.dart b/lib/pages/feed/reply/reply_dialog.dart
@@ -90,14 +90,14 @@ class _ReplyDialogState extends State<ReplyDialog> with WidgetsBindingObserver {
     _focuslistener();
   }
 
-  _autoFocus() async {
+  void _autoFocus() async {
     await Future.delayed(const Duration(milliseconds: 300));
     if (mounted) {
       _replyContentFocusNode.requestFocus();
     }
   }
 
-  _focuslistener() {
+  void _focuslistener() {
     _replyContentFocusNode.addListener(() {
       if (_replyContentFocusNode.hasFocus) {
         // _keyBoardKey.currentState?.updateSelected(true);
@@ -632,7 +632,7 @@ class Debouncer {
 
   Debouncer({this.milliseconds});
 
-  run(DebounceCallback callback) {
+  void run(DebounceCallback callback) {
     if (_timer != null) {
       _timer!.cancel();
     }
diff --git a/lib/pages/feed/reply/reply_page.dart b/lib/pages/feed/reply/reply_page.dart
@@ -477,7 +477,7 @@ class _ReplyPageState extends State<ReplyPage>
     );
   }
 
-  updatePanelType(PanelType type) async {
+  void updatePanelType(PanelType type) async {
     final isSwitchToKeyboard = PanelType.keyboard == type;
     final isSwitchToEmojiPanel = PanelType.emoji == type;
     bool isUpdated = false;
@@ -514,7 +514,7 @@ class _ReplyPageState extends State<ReplyPage>
     }
   }
 
-  hidePanel() async {
+  void hidePanel() async {
     if (_focusNode.hasFocus) {
       await Future.delayed(const Duration(milliseconds: 100));
       _focusNode.unfocus();
diff --git a/lib/pages/history/history_controller.dart b/lib/pages/history/history_controller.dart
@@ -55,7 +55,7 @@ class HistoryController extends GetxController {
     dataList.value = <Datum>[];
   }
 
-  onDeleteFeed(dynamic id) {
+  void onDeleteFeed(dynamic id) {
     GStorage.onDeleteFeed(
       id.toString(),
       isHistory: type == HistoryType.History,
diff --git a/lib/pages/topic/topic_page.dart b/lib/pages/topic/topic_page.dart
@@ -208,24 +208,25 @@ class _TopicPageState extends State<TopicPage> with TickerProviderStateMixin {
                     onSelected: (TopicMenuItem item) {
                       switch (item) {
                         case TopicMenuItem.Copy:
-                          Utils.copyText(Utils.getShareUrl(
+                          Utils.copyText(Utils.getShareUri(
                             _topicController.entityType == 'topic'
                                 ? _topicController.title!
                                 : _topicController.id!,
                             _topicController.entityType == 'topic'
                                 ? ShareType.t
                                 : ShareType.product,
-                          ));
+                          ).toString());
                           break;
                         case TopicMenuItem.Share:
-                          Share.share(Utils.getShareUrl(
+                          SharePlus.instance.share(ShareParams(
+                              uri: Utils.getShareUri(
                             _topicController.entityType == 'topic'
                                 ? _topicController.title!
                                 : _topicController.id!,
                             _topicController.entityType == 'topic'
                                 ? ShareType.t
                                 : ShareType.product,
-                          ));
+                          )));
                           break;
                         case TopicMenuItem.Sort:
                           _showPopupMenu();
diff --git a/lib/pages/user/user_page.dart b/lib/pages/user/user_page.dart
@@ -241,12 +241,14 @@ class _UserPageState extends State<UserPage> {
                     onSelected: (UserMenuItem item) {
                       switch (item) {
                         case UserMenuItem.Copy:
-                          Utils.copyText(Utils.getShareUrl(
-                              _userController.uid, ShareType.u));
+                          Utils.copyText(Utils.getShareUri(
+                                  _userController.uid, ShareType.u)
+                              .toString());
                           break;
                         case UserMenuItem.Share:
-                          Share.share(Utils.getShareUrl(
-                              _userController.uid, ShareType.u));
+                          SharePlus.instance.share(ShareParams(
+                              uri: Utils.getShareUri(
+                                  _userController.uid, ShareType.u)));
                           break;
                         case UserMenuItem.Block:
                           GStorage.onBlock(
diff --git a/lib/utils/download_util.dart b/lib/utils/download_util.dart
@@ -109,9 +109,9 @@ class DownloadUtils {
         } else {
           final SaveResult result = await SaverGallery.saveImage(
             Uint8List.fromList(response.data),
-            name: picName,
+            fileName: picName,
             androidRelativePath: "Pictures/c001apk-flutter",
-            androidExistNotSave: true,
+            skipIfExists: true,
           );
 
           if (result.errorMessage != null) {
diff --git a/lib/utils/extensions.dart b/lib/utils/extensions.dart
@@ -176,7 +176,7 @@ extension NullableStringExt on String? {
     if (isNullOrBlank) {
       return '内容为空，取消操作'.toast();
     }
-    Share.share(this!);
+    SharePlus.instance.share(ShareParams(text: this!));
     // FlutterClipboard.copy(this!).then((_) => '尝试分享，并复制到剪切板'.toast());
   }
 }
diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart
@@ -60,8 +60,8 @@ class Utils {
     };
   }
 
-  static String getShareUrl(String id, ShareType type) {
-    return 'https://www.coolapk1s.com/${type.name}/$id';
+  static Uri getShareUri(String id, ShareType type) {
+    return Uri.https('www.coolapk1s.com', '${type.name}/$id');
   }
 
   static void report(dynamic id, ReportType reportType) {
@@ -92,7 +92,7 @@ class Utils {
     final String imgName = url.split('/').last;
     var path = '${temp.path}/$imgName';
     File(path).writeAsBytesSync(response.data);
-    Share.shareXFiles([XFile(path)], subject: url);
+    SharePlus.instance.share(ShareParams(files: [XFile(path)], subject: url));
   }
 
   static void copyText(String text) {
@@ -300,7 +300,7 @@ class Utils {
   //   );
   // }
 
-  static launchURL(String url) async {
+  static void launchURL(String url) async {
     try {
       final Uri uri = Uri.parse(url);
       if (!await launchUrl(uri)) {
@@ -351,7 +351,7 @@ class Utils {
   }
 
   // 完全相对时间显示
-  static String formatTimestampToRelativeTime(timeStamp) {
+  static String formatTimestampToRelativeTime(int timeStamp) {
     var difference = DateTime.now()
         .difference(DateTime.fromMillisecondsSinceEpoch(timeStamp * 1000));
 
@@ -371,8 +371,8 @@ class Utils {
   }
 
   // 时间显示，刚刚，x分钟前
-  static String dateFormat(timeStamp, {formatType = 'list'}) {
-    if (timeStamp == 0 || timeStamp == null || timeStamp == '') {
+  static String dateFormat(int timeStamp, {String formatType = 'list'}) {
+    if (timeStamp == 0) {
       return '';
     }
     // 当前时间
@@ -465,7 +465,7 @@ class Utils {
     return date;
   }
 
-  static String makeHeroTag(v) {
+  static String makeHeroTag(dynamic v) {
     return v.toString() + random.nextInt(9999).toString();
   }
 
@@ -518,7 +518,7 @@ class Utils {
   }
 
   // 版本对比
-  static bool needUpdate(localVersion, remoteVersion) {
+  static bool needUpdate(String localVersion, String remoteVersion) {
     List<String> localVersionList = localVersion.split('.');
     List<String> remoteVersionList = remoteVersion.split('v')[1].split('.');
     for (int i = 0; i < localVersionList.length; i++) {
@@ -534,7 +534,7 @@ class Utils {
   }
 
   // 时间戳转时间
-  static tampToSeektime(number) {
+  static String stampToSeektime(int number) {
     int hours = number ~/ 60;
     int minutes = number % 60;
 
diff --git a/pubspec.lock b/pubspec.lock
diff --git a/pubspec.yaml b/pubspec.yaml

Original file line number	Diff line number	Diff line change
`@@ -428,7 +428,7 @@ class _ChatPageState extends State<ChatPage> {`
`428`	`428`	`);`
`429`	`429`	`}`
`430`	`430`
`431`		`- updatePanelType(PanelType type) async {`
	`431`	`+ void updatePanelType(PanelType type) async {`
`432`	`432`	`final isSwitchToKeyboard = PanelType.keyboard == type;`
`433`	`433`	`final isSwitchToEmojiPanel = PanelType.emoji == type;`
`434`	`434`	`bool isUpdated = false;`
`@@ -465,7 +465,7 @@ class _ChatPageState extends State<ChatPage> {`
`465`	`465`	`}`
`466`	`466`	`}`
`467`	`467`
`468`		`- hidePanel() async {`
	`468`	`+ void hidePanel() async {`
`469`	`469`	`if (_focusNode.hasFocus) {`
`470`	`470`	`await Future.delayed(const Duration(milliseconds: 100));`
`471`	`471`	`_focusNode.unfocus();`
Original file line number	Diff line number	Diff line change
`@@ -90,14 +90,14 @@ class _ReplyDialogState extends State<ReplyDialog> with WidgetsBindingObserver {`
`90`	`90`	`_focuslistener();`
`91`	`91`	`}`
`92`	`92`
`93`		`- _autoFocus() async {`
	`93`	`+ void _autoFocus() async {`
`94`	`94`	`await Future.delayed(const Duration(milliseconds: 300));`
`95`	`95`	`if (mounted) {`
`96`	`96`	`_replyContentFocusNode.requestFocus();`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
`100`		`- _focuslistener() {`
	`100`	`+ void _focuslistener() {`
`101`	`101`	`_replyContentFocusNode.addListener(() {`
`102`	`102`	`if (_replyContentFocusNode.hasFocus) {`
`103`	`103`	`// _keyBoardKey.currentState?.updateSelected(true);`
`@@ -632,7 +632,7 @@ class Debouncer {`
`632`	`632`
`633`	`633`	`Debouncer({this.milliseconds});`
`634`	`634`
`635`		`- run(DebounceCallback callback) {`
	`635`	`+ void run(DebounceCallback callback) {`
`636`	`636`	`if (_timer != null) {`
`637`	`637`	`_timer!.cancel();`
`638`	`638`	`}`
Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,7 @@ class _ReplyPageState extends State<ReplyPage>`
`477`	`477`	`);`
`478`	`478`	`}`
`479`	`479`
`480`		`- updatePanelType(PanelType type) async {`
	`480`	`+ void updatePanelType(PanelType type) async {`
`481`	`481`	`final isSwitchToKeyboard = PanelType.keyboard == type;`
`482`	`482`	`final isSwitchToEmojiPanel = PanelType.emoji == type;`
`483`	`483`	`bool isUpdated = false;`
`@@ -514,7 +514,7 @@ class _ReplyPageState extends State<ReplyPage>`
`514`	`514`	`}`
`515`	`515`	`}`
`516`	`516`
`517`		`- hidePanel() async {`
	`517`	`+ void hidePanel() async {`
`518`	`518`	`if (_focusNode.hasFocus) {`
`519`	`519`	`await Future.delayed(const Duration(milliseconds: 100));`
`520`	`520`	`_focusNode.unfocus();`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ class HistoryController extends GetxController {`
`55`	`55`	`dataList.value = <Datum>[];`
`56`	`56`	`}`
`57`	`57`
`58`		`- onDeleteFeed(dynamic id) {`
	`58`	`+ void onDeleteFeed(dynamic id) {`
`59`	`59`	`GStorage.onDeleteFeed(`
`60`	`60`	`id.toString(),`
`61`	`61`	`isHistory: type == HistoryType.History,`