Upgrade to v1.5.1

Author: niuhuan

ci/version.code.txt

@@ -1 +1 @@
-v1.4.6
+v1.5.1

ci/version.info.txt

@@ -1,3 +1,4 @@
-- [x] 修复 分流2 / 分流3, API速度得到提高
-- [x] 看此本子多人也在看
-- [x] 本子神推荐/魔推荐
+- [x] 修复一些BUG
+- [x] 优化阅读器 (之前丢了一部分代码, 导致被回滚了, 全屏按钮重新写了一遍)
+- [x] 优化导入导出 / 保存图片等文件系统交互操作
+- [x] 优化推荐栏目

lib/basic/Cross.dart

@@ -2,7 +2,7 @@
 import 'dart:io';
 
 import 'package:clipboard/clipboard.dart';
-import 'package:filesystem_picker/filesystem_picker.dart';
+import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:pikapika/basic/Common.dart';
@@ -77,13 +77,12 @@ Future<dynamic> _saveImageAndroid(String path, BuildContext context) async {
 
 /// 选择一个文件夹用于保存文件
 Future<String?> chooseFolder(BuildContext context) async {
-  return FilesystemPicker.open(
-    title: '选择一个文件夹',
-    pickText: '将文件保存到这里',
-    context: context,
-    fsType: FilesystemType.folder,
-    rootDirectory:
-        Directory.fromUri(Uri.file(await currentChooserRoot())).absolute,
+  return FilePicker.platform.getDirectoryPath(
+    dialogTitle: "选择一个文件夹, 将文件保存到这里",
+    initialDirectory: Directory
+        .fromUri(Uri.file(await currentChooserRoot()))
+        .absolute
+        .path,
   );
 }
 

lib/screens/ComicCollectionsScreen.dart

@@ -73,7 +73,12 @@ class _ComicCollectionsScreenState extends State<ComicCollectionsScreen> {
                 color: appBarTheme.backgroundColor,
                 child: TabBar(
                   indicatorColor: theme.dividerColor,
-                  tabs: collection.map((e) => Tab(text: e.title)).toList(),
+                  tabs: collection
+                      .map((e) => Tab(
+                          text: e.title.indexOf("推薦") > 0
+                              ? e.title.substring(0, e.title.indexOf("推薦"))
+                              : e.title))
+                      .toList(),
                 ),
               ),
               body: TabBarView(

lib/screens/DownloadImportScreen.dart

@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:filesystem_picker/filesystem_picker.dart';
+import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:pikapika/basic/Channels.dart';
 import 'package:pikapika/basic/Common.dart';
@@ -43,7 +43,7 @@ class _DownloadImportScreenState extends State<DownloadImportScreen> {
   }
 
   @override
-  Widget build(BuildContext context){
+  Widget build(BuildContext context) {
     return rightClickPop(
       child: buildScreen(context),
       context: context,
@@ -96,15 +96,15 @@ class _DownloadImportScreenState extends State<DownloadImportScreen> {
           defaultToast(context, "$e");
           return;
         }
-        String? path = await FilesystemPicker.open(
-          title: '选择要导入的文件',
-          context: context,
-          rootDirectory: Directory(chooseRoot),
-          fsType: FilesystemType.file,
-          folderIconColor: Colors.teal,
-          allowedExtensions: ['.zip'],
-          fileTileSelectMode: FileTileSelectMode.wholeTile,
+        var ls = await FilePicker.platform.pickFiles(
+          dialogTitle: '选择要导入的文件',
+          allowMultiple: false,
+          initialDirectory: chooseRoot,
+          type: FileType.custom,
+          allowedExtensions: ['zip'],
+          allowCompression: false,
         );
+        String? path = ls != null && ls.count > 0 ? ls.paths[0] : null;
         if (path != null) {
           try {
             setState(() {