update version code

v1.1.0-patch

.github/workflows/main.yml

@@ -2,6 +2,9 @@ name: Build ALL
 run-name: Build ALL
 on:
   workflow_dispatch: {}
+  release:
+    types: [published]
+
 jobs:
   Build_MacOS:
     runs-on: macos-15
@@ -139,3 +142,45 @@ jobs:
           name: arch_build
           path: build/linux/arch/
 
+  Release:
+    runs-on: ubuntu-latest
+    needs: [Build_MacOS, Build_IOS, Build_Android, Build_Windows, Build_Linux]
+    if: github.event_name == 'release'  # 仅在 push 事件时执行
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          name: venera.dmg
+          path: outputs
+      - uses: actions/download-artifact@v4
+        with:
+          name: app-ios.ipa
+          path: outputs
+      - uses: actions/download-artifact@v4
+        with:
+          name: apks
+          path: outputs
+      - uses: actions/download-artifact@v4
+        with:
+          name: windows_build
+          path: outputs
+      - uses: actions/download-artifact@v4
+        with:
+          name: deb_build
+          path: outputs
+      - uses: actions/download-artifact@v4
+        with:
+          name: arch_build
+          path: outputs
+      - uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ github.ref_name }}
+          files: |
+            outputs/*.ipa
+            outputs/*.dmg
+            outputs/*.apk
+            outputs/*.zip
+            outputs/*.exe
+            outputs/*.deb
+            outputs/*.zst
+        env:
+          GITHUB_TOKEN: ${{ secrets.ACTION_GITHUB_TOKEN }}

android/.gitignore

@@ -11,3 +11,4 @@ GeneratedPluginRegistrant.java
 key.properties
 **/*.keystore
 **/*.jks
+/app/.cxx/

android/app/build.gradle

@@ -34,6 +34,8 @@ android {
 
     splits{
         abi {
+            reset()
+            include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
             enable true
             universalApk true
         }

android/app/src/main/AndroidManifest.xml

@@ -53,6 +53,7 @@
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
+        <meta-data android:name="io.flutter.embedding.android.EnableImpeller" android:value="false"/>
     </application>
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility and

android/app/src/main/kotlin/com/github/wgh136/venera/MainActivity.kt

@@ -8,8 +8,8 @@ import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.os.Environment
-import android.provider.DocumentsContract
 import android.provider.Settings
+import android.util.Log
 import android.view.KeyEvent
 import androidx.activity.result.ActivityResultCallback
 import androidx.activity.result.ActivityResultLauncher
@@ -96,11 +96,7 @@ class MainActivity : FlutterFragmentActivity() {
                         if (pickedDirectoryUri == null)
                             res.success(null)
                         else
-                            try {
-                                res.success(onPickedDirectory(pickedDirectoryUri))
-                            } catch (e: Exception) {
-                                res.error("Failed to Copy Files", e.toString(), null)
-                            }
+                            onPickedDirectory(pickedDirectoryUri, res)
                     }
                 }
 
@@ -134,8 +130,9 @@ class MainActivity : FlutterFragmentActivity() {
         }
 
         val selectFileChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "venera/select_file")
-        selectFileChannel.setMethodCallHandler { _, res ->
-            openFile(res)
+        selectFileChannel.setMethodCallHandler { req, res ->
+            val mimeType = req.arguments<String>()
+            openFile(res, mimeType!!)
         }
     }
 
@@ -166,26 +163,40 @@ class MainActivity : FlutterFragmentActivity() {
         return super.onKeyDown(keyCode, event)
     }
 
-    /// copy the directory to tmp directory, return copied directory
-    private fun onPickedDirectory(uri: Uri): String {
-        if (!hasStoragePermission()) {
-            // dart:io cannot access the directory without permission.
-            // so we need to copy the directory to cache directory
-            val contentResolver = contentResolver
-            var tmp = cacheDir
-            tmp = File(tmp, "getDirectoryPathTemp")
-            tmp.mkdir()
-            Thread {
-                copyDirectory(contentResolver, uri, tmp)
-            }.start()
-
-            return tmp.absolutePath
-        } else {
-            val docId = DocumentsContract.getTreeDocumentId(uri)
-            val split: Array<String?> = docId.split(":".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
-            return if ((split.size >= 2) && (split[1] != null)) split[1]!!
-            else File.separator
+    /// Ensure that the directory is accessible by dart:io
+    private fun onPickedDirectory(uri: Uri, result: MethodChannel.Result) {
+        if (hasStoragePermission()) {
+            var plain = uri.toString()
+            if(plain.contains("%3A")) {
+                plain = Uri.decode(plain)
+            }
+            val externalStoragePrefix = "content://com.android.externalstorage.documents/tree/primary:";
+            if(plain.startsWith(externalStoragePrefix)) {
+                val path = plain.substring(externalStoragePrefix.length)
+                result.success(Environment.getExternalStorageDirectory().absolutePath + "/" + path)
+            }
+            // The uri cannot be parsed to plain path, use copy method
         }
+        // dart:io cannot access the directory without permission.
+        // so we need to copy the directory to cache directory
+        val contentResolver = contentResolver
+        var tmp = cacheDir
+        var dirName = DocumentFile.fromTreeUri(this, uri)?.name
+        tmp = File(tmp, dirName!!)
+        if(tmp.exists()) {
+            tmp.deleteRecursively()
+        }
+        tmp.mkdir()
+        Thread {
+            try {
+                copyDirectory(contentResolver, uri, tmp)
+                result.success(tmp.absolutePath)
+            }
+            catch (e: Exception) {
+                result.error("copy error", e.message, null)
+            }
+        }.start()
+
     }
 
     private fun copyDirectory(resolver: ContentResolver, srcUri: Uri, destDir: File) {
@@ -197,11 +208,12 @@ class MainActivity : FlutterFragmentActivity() {
                 copyDirectory(resolver, file.uri, newDir)
             } else {
                 val newFile = File(destDir, file.name!!)
-                val inputStream = resolver.openInputStream(file.uri) ?: return
-                val outputStream = FileOutputStream(newFile)
-                inputStream.copyTo(outputStream)
-                inputStream.close()
-                outputStream.close()
+                resolver.openInputStream(file.uri)?.use { input ->
+                    FileOutputStream(newFile).use { output ->
+                        input.copyTo(output, bufferSize = DEFAULT_BUFFER_SIZE)
+                        output.flush()
+                    }
+                }
             }
         }
     }
@@ -277,10 +289,10 @@ class MainActivity : FlutterFragmentActivity() {
         }
     }
 
-    private fun openFile(result: MethodChannel.Result) {
+    private fun openFile(result: MethodChannel.Result, mimeType: String) {
         val intent = Intent(Intent.ACTION_OPEN_DOCUMENT)
         intent.addCategory(Intent.CATEGORY_OPENABLE)
-        intent.type = "*/*"
+        intent.type = mimeType
         startContractForResult(ActivityResultContracts.StartActivityForResult(), intent){ activityResult ->
             if (activityResult.resultCode != Activity.RESULT_OK) {
                 result.success(null)
@@ -312,20 +324,26 @@ class MainActivity : FlutterFragmentActivity() {
                     // ignore
                 }
             }
-            // copy file to cache directory
-            val cacheDir = cacheDir
-            val newFile = File(cacheDir, fileName)
-            val inputStream = contentResolver.openInputStream(uri)
-            if (inputStream == null) {
-                result.success(null)
-                return@startContractForResult
+            // use copy method
+            val tmp = File(cacheDir, fileName)
+            if(tmp.exists()) {
+                tmp.delete()
             }
-            val outputStream = FileOutputStream(newFile)
-            inputStream.copyTo(outputStream)
-            inputStream.close()
-            outputStream.close()
-            // send file path to flutter
-            result.success(newFile.absolutePath)
+            Log.i("Venera", "copy file (${fileName}) to ${tmp.absolutePath}")
+            Thread {
+                try {
+                    contentResolver.openInputStream(uri)?.use { input ->
+                        FileOutputStream(tmp).use { output ->
+                            input.copyTo(output, bufferSize = DEFAULT_BUFFER_SIZE)
+                            output.flush()
+                        }
+                    }
+                    result.success(tmp.absolutePath)
+                }
+                catch (e: Exception) {
+                    result.error("copy error", e.message, null)
+                }
+            }.start()
         }
     }
 }

assets/init.js

@@ -877,11 +877,13 @@ function Comic({id, title, subtitle, subTitle, cover, tags, description, maxPage
 /**
  * Create a comic details object
  * @param title {string}
+ * @param subtitle {string}
+ * @param subTitle {string} - equal to subtitle
  * @param cover {string}
  * @param description {string?}
  * @param tags {Map<string, string[]> | {} | null | undefined}
- * @param chapters {Map<string, string> | {} | null | undefined}} - key: chapter id, value: chapter title
- * @param isFavorite {boolean | null | undefined}} - favorite status. If the comic source supports multiple folders, this field should be null
+ * @param chapters {Map<string, string> | {} | null | undefined} - key: chapter id, value: chapter title
+ * @param isFavorite {boolean | null | undefined} - favorite status. If the comic source supports multiple folders, this field should be null
  * @param subId {string?} - a param which is passed to comments api
  * @param thumbnails {string[]?} - for multiple page thumbnails, set this to null, and use `loadThumbnails` api to load thumbnails
  * @param recommend {Comic[]?} - related comics
@@ -894,10 +896,12 @@ function Comic({id, title, subtitle, subTitle, cover, tags, description, maxPage
  * @param url {string?}
  * @param stars {number?} - 0-5, double
  * @param maxPage {number?}
+ * @param comments {Comment[]?}- `since 1.0.7` App will display comments in the details page.
  * @constructor
  */
-function ComicDetails({title, cover, description, tags, chapters, isFavorite, subId, thumbnails, recommend, commentCount, likesCount, isLiked, uploader, updateTime, uploadTime, url, stars, maxPage}) {
+function ComicDetails({title, subtitle, subTitle, cover, description, tags, chapters, isFavorite, subId, thumbnails, recommend, commentCount, likesCount, isLiked, uploader, updateTime, uploadTime, url, stars, maxPage, comments}) {
     this.title = title;
+    this.subtitle = subtitle ?? subTitle;
     this.cover = cover;
     this.description = description;
     this.tags = tags;
@@ -915,6 +919,7 @@ function ComicDetails({title, cover, description, tags, chapters, isFavorite, su
     this.url = url;
     this.stars = stars;
     this.maxPage = maxPage;
+    this.comments = comments;
 }
 
 /**

assets/translation.json

@@ -41,9 +41,14 @@
     "Select a folder": "选择一个文件夹",
     "Folder": "文件夹",
     "Confirm": "确认",
-    "Are you sure you want to delete this comic?": "您确定要删除这部漫画吗？",
-    "Are you sure you want to delete @a selected comics?": "您确定要删除 @a 部漫画吗？",
+    "Remove comic from favorite?": "从收藏中移除漫画？",
+    "Move": "移动",
+    "Move to folder": "移动到文件夹",
+    "Copy to folder": "复制到文件夹",
+    "Delete Comic": "删除漫画",
+    "Delete @c comics?": "删除 @c 本漫画？",
     "Add comic source": "添加漫画源",
+    "Delete comic source '@n' ?": "删除漫画源 '@n' ？",
     "Select file": "选择文件",
     "View list": "查看列表",
     "Open help": "打开帮助",
@@ -100,6 +105,7 @@
     "Continuous (Right to Left)": "连续（从右到左）",
     "Continuous (Top to Bottom)": "连续（从上到下）",
     "Auto page turning interval": "自动翻页间隔",
+    "The number of pic in screen (Only Gallery Mode)": "同屏幕图片数量(仅画廊模式)",
     "Theme Mode": "主题模式",
     "System": "系统",
     "Light": "浅色",
@@ -132,7 +138,8 @@
     "Block": "屏蔽",
     "Add new favorite to": "添加新收藏到",
     "Move favorite after reading": "阅读后移动收藏",
-    "Are you sure you want to delete this folder?" : "确定要删除这个收藏夹吗？",
+    "Delete folder?" : "刪除文件夾？",
+    "Delete folder '@f' ?" : "删除文件夹 '@f' ？",
     "Import from file": "从文件导入",
     "Failed to import": "导入失败",
     "Cache Limit": "缓存限制",
@@ -146,7 +153,7 @@
     "If the directory contains a file named 'cover.*', it will be used as the cover image. Otherwise the first image will be used." : "如果目录包含一个名为'cover.*'的文件，它将被用作封面图片。否则将使用第一张图片。",
     "The directory name will be used as the comic title. And the name of chapter directories will be used as the chapter titles.\n" : "目录名称将被用作漫画标题。章节目录的名称将被用作章节标题。\n",
     "Export as cbz": "导出为cbz",
-    "Select a cbz file." : "选择一个cbz文件",
+    "Select a cbz/zip file." : "选择一个cbz/zip文件",
     "A cbz file" : "一个cbz文件",
     "Fullscreen": "全屏",
     "Exit": "退出",
@@ -215,7 +222,7 @@
     "Authorization Required": "需要身份验证",
     "Sync": "同步",
     "The folder is Linked to @source": "文件夹已关联到 @source",
-    "Source Folder": "源收藏夹",
+    "Source Folder": "源文件夹",
     "Use a config file": "使用配置文件",
     "Comic Source list": "漫画源列表",
     "View": "查看",
@@ -229,7 +236,22 @@
     "No Explore Pages": "没有探索页面",
     "Add a comic source in home page": "在主页添加一个漫画源",
     "Please check your settings": "请检查您的设置",
-    "No Category Pages": "没有分类页面"
+    "No Category Pages": "没有分类页面",
+    "Chapter @ep": "第 @ep 章",
+    "Page @page": "第 @page 页",
+    "Also remove files on disk": "同时删除磁盘上的文件",
+    "Copy to app local path": "将漫画复制到本地存储目录中",
+    "Delete all unavailable local favorite items": "删除所有无效的本地收藏",
+    "Deleted @a favorite items.": "已删除 @a 条无效收藏",
+    "New version available": "有新版本可用",
+    "A new version is available. Do you want to update now?" : "有新版本可用。您要现在更新吗？",
+    "No new version available": "没有新版本可用",
+    "Export as pdf": "导出为pdf",
+    "Export as epub": "导出为epub",
+    "Aggregated Search": "聚合搜索",
+    "No search results found": "未找到搜索结果",
+    "Added @c comics to download queue." : "已添加 @c 本漫画到下载队列",
+    "Download started": "下载已开始"
   },
   "zh_TW": {
     "Home": "首頁",
@@ -275,9 +297,14 @@
     "Select a folder": "選擇一個文件夾",
     "Folder": "文件夾",
     "Confirm": "確認",
-    "Are you sure you want to delete this comic?": "您確定要刪除這部漫畫嗎？",
-    "Are you sure you want to delete @a selected comics?": "您確定要刪除 @a 部漫畫嗎？",
+    "Remove comic from favorite?": "從收藏中移除漫畫？",
+    "Move": "移動",
+    "Move to folder": "移動到文件夾",
+    "Copy to folder": "複製到文件夾",
+    "Delete Comic": "刪除漫畫",
+    "Delete @c comics?": "刪除 @c 本漫畫？",
     "Add comic source": "添加漫畫源",
+    "Delete comic source '@n' ?": "刪除漫畫源 '@n' ？",
     "Select file": "選擇文件",
     "View list": "查看列表",
     "Open help": "打開幫助",
@@ -332,6 +359,7 @@
     "Continuous (Right to Left)": "連續（從右到左）",
     "Continuous (Top to Bottom)": "連續（從上到下）",
     "Auto page turning interval": "自動翻頁間隔",
+    "The number of pic in screen (Only Gallery Mode)": "同螢幕圖片數量(僅畫廊模式)",
     "Theme Mode": "主題模式",
     "System": "系統",
     "Light": "浅色",
@@ -364,7 +392,8 @@
     "Block": "屏蔽",
     "Add new favorite to": "添加新收藏到",
     "Move favorite after reading": "閱讀後移動收藏",
-    "Are you sure you want to delete this folder?" : "確定要刪除這個收藏夾嗎？",
+    "Delete folder?" : "刪除文件夾？",
+    "Delete folder '@f' ?" : "刪除文件夾 '@f' ？",
     "Import from file": "從文件匯入",
     "Failed to import": "匯入失敗",
     "Cache Limit": "緩存限制",
@@ -378,7 +407,7 @@
     "If the directory contains a file named 'cover.*', it will be used as the cover image. Otherwise the first image will be used." : "如果目錄包含一個名為'cover.*'的文件，它將被用作封面圖片。否則將使用第一張圖片。",
     "The directory name will be used as the comic title. And the name of chapter directories will be used as the chapter titles.\n" : "目錄名稱將被用作漫畫標題。章節目錄的名稱將被用作章節標題。\n",
     "Export as cbz": "匯出為cbz",
-    "Select a cbz file." : "選擇一個cbz文件",
+    "Select a cbz/zip file." : "選擇一個cbz/zip文件",
     "A cbz file" : "一個cbz文件",
     "Fullscreen": "全螢幕",
     "Exit": "退出",
@@ -447,7 +476,7 @@
     "Authorization Required": "需要身份驗證",
     "Sync": "同步",
     "The folder is Linked to @source": "文件夾已關聯到 @source",
-    "Source Folder": "源收藏夾",
+    "Source Folder": "源文件夾",
     "Use a config file": "使用配置文件",
     "Comic Source list": "漫畫源列表",
     "View": "查看",
@@ -461,6 +490,21 @@
     "No Explore Pages": "沒有探索頁面",
     "Add a comic source in home page": "在主頁添加一個漫畫源",
     "Please check your settings": "請檢查您的設定",
-    "No Category Pages": "沒有分類頁面"
+    "No Category Pages": "沒有分類頁面",
+    "Chapter @ep": "第 @ep 章",
+    "Page @page": "第 @page 頁",
+    "Also remove files on disk": "同時刪除磁盤上的文件",
+    "Copy to app local path": "將漫畫複製到本地儲存目錄中",
+    "Delete all unavailable local favorite items": "刪除所有無效的本地收藏",
+    "Deleted @a favorite items.": "已刪除 @a 條無效收藏",
+    "New version available": "有新版本可用",
+    "A new version is available. Do you want to update now?" : "有新版本可用。您要現在更新嗎？",
+    "No new version available": "沒有新版本可用",
+    "Export as pdf": "匯出為pdf",
+    "Export as epub": "匯出為epub",
+    "Aggregated Search": "聚合搜索",
+    "No search results found": "未找到搜索結果",
+    "Added @c comics to download queue." : "已添加 @c 本漫畫到下載隊列",
+    "Download started": "下載已開始"
   }
 }

lib/components/appbar.dart

@@ -76,7 +76,7 @@ class _AppbarState extends State<Appbar> {
     var content = Container(
       decoration: BoxDecoration(
         color: widget.backgroundColor ??
-            context.colorScheme.surface.withOpacity(0.72),
+            context.colorScheme.surface.toOpacity(0.72),
       ),
       height: _kAppBarHeight + context.padding.top,
       child: Row(
@@ -115,6 +115,11 @@ class _AppbarState extends State<Appbar> {
   }
 }
 
+enum AppbarStyle {
+  blur,
+  shadow,
+}
+
 class SliverAppbar extends StatelessWidget {
   const SliverAppbar({
     super.key,
@@ -122,6 +127,7 @@ class SliverAppbar extends StatelessWidget {
     this.leading,
     this.actions,
     this.radius = 0,
+    this.style = AppbarStyle.blur,
   });
 
   final Widget? leading;
@@ -132,6 +138,8 @@ class SliverAppbar extends StatelessWidget {
 
   final double radius;
 
+  final AppbarStyle style;
+
   @override
   Widget build(BuildContext context) {
     return SliverPersistentHeader(
@@ -142,6 +150,7 @@ class SliverAppbar extends StatelessWidget {
         actions: actions,
         topPadding: MediaQuery.of(context).padding.top,
         radius: radius,
+        style: style,
       ),
     );
   }
@@ -160,57 +169,73 @@ class _MySliverAppBarDelegate extends SliverPersistentHeaderDelegate {
 
   final double radius;
 
-  _MySliverAppBarDelegate(
-      {this.leading,
-      required this.title,
-      this.actions,
-      required this.topPadding,
-      this.radius = 0});
+  final AppbarStyle style;
+
+  _MySliverAppBarDelegate({
+    this.leading,
+    required this.title,
+    this.actions,
+    required this.topPadding,
+    this.radius = 0,
+    this.style = AppbarStyle.blur,
+  });
 
   @override
   Widget build(
       BuildContext context, double shrinkOffset, bool overlapsContent) {
-    return SizedBox.expand(
-      child: BlurEffect(
-        blur: 15,
-        child: Material(
-          color: context.colorScheme.surface.withOpacity(0.72),
-          elevation: 0,
-          borderRadius: BorderRadius.circular(radius),
-          child: Row(
-            children: [
-              const SizedBox(width: 8),
-              leading ??
-                  (Navigator.of(context).canPop()
-                      ? Tooltip(
-                          message: "Back".tl,
-                          child: IconButton(
-                            icon: const Icon(Icons.arrow_back),
-                            onPressed: () => Navigator.maybePop(context),
-                          ),
-                        )
-                      : const SizedBox()),
-              const SizedBox(
-                width: 16,
-              ),
-              Expanded(
-                child: DefaultTextStyle(
-                  style:
-                      DefaultTextStyle.of(context).style.copyWith(fontSize: 20),
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
-                  child: title,
-                ),
-              ),
-              ...?actions,
-              const SizedBox(
-                width: 8,
-              )
-            ],
-          ).paddingTop(topPadding),
+    var body = Row(
+      children: [
+        const SizedBox(width: 8),
+        leading ??
+            (Navigator.of(context).canPop()
+                ? Tooltip(
+                    message: "Back".tl,
+                    child: IconButton(
+                      icon: const Icon(Icons.arrow_back),
+                      onPressed: () => Navigator.maybePop(context),
+                    ),
+                  )
+                : const SizedBox()),
+        const SizedBox(
+          width: 16,
         ),
-      ),
-    );
+        Expanded(
+          child: DefaultTextStyle(
+            style: DefaultTextStyle.of(context).style.copyWith(fontSize: 20),
+            maxLines: 1,
+            overflow: TextOverflow.ellipsis,
+            child: title,
+          ),
+        ),
+        ...?actions,
+        const SizedBox(
+          width: 8,
+        )
+      ],
+    ).paddingTop(topPadding);
+
+    if (style == AppbarStyle.blur) {
+      return SizedBox.expand(
+        child: BlurEffect(
+          blur: 15,
+          child: Material(
+            color: context.colorScheme.surface.toOpacity(0.72),
+            elevation: 0,
+            borderRadius: BorderRadius.circular(radius),
+            child: body,
+          ),
+        ),
+      );
+    } else {
+      return SizedBox.expand(
+        child: Material(
+          color: context.colorScheme.surface,
+          elevation: shrinkOffset == 0 ? 0 : 2,
+          borderRadius: BorderRadius.circular(radius),
+          child: body,
+        ),
+      );
+    }
   }
 
   @override
@@ -224,7 +249,10 @@ class _MySliverAppBarDelegate extends SliverPersistentHeaderDelegate {
     return oldDelegate is! _MySliverAppBarDelegate ||
         leading != oldDelegate.leading ||
         title != oldDelegate.title ||
-        actions != oldDelegate.actions;
+        actions != oldDelegate.actions ||
+        topPadding != oldDelegate.topPadding ||
+        radius != oldDelegate.radius ||
+        style != oldDelegate.style;
   }
 }
 
@@ -269,12 +297,21 @@ class _FilledTabBarState extends State<FilledTabBar> {
     super.dispose();
   }
 
+  PageStorageBucket get bucket => PageStorage.of(context);
+
   @override
   void didChangeDependencies() {
     _controller = widget.controller ?? DefaultTabController.of(context);
-    _controller.animation!.addListener(onTabChanged);
     initPainter();
     super.didChangeDependencies();
+    var prevIndex = bucket.readState(context) as int?;
+    if (prevIndex != null &&
+        prevIndex != _controller.index &&
+        prevIndex >= 0 &&
+        prevIndex < widget.tabs.length) {
+      _controller.index = prevIndex;
+    }
+    _controller.animation!.addListener(onTabChanged);
   }
 
   @override
@@ -303,7 +340,7 @@ class _FilledTabBarState extends State<FilledTabBar> {
   @override
   Widget build(BuildContext context) {
     return AnimatedBuilder(
-      animation: _controller,
+      animation: _controller.animation ?? _controller,
       builder: buildTabBar,
     );
   }
@@ -318,6 +355,7 @@ class _FilledTabBarState extends State<FilledTabBar> {
       controller: scrollController,
       builder: (context, controller, physics) {
         return SingleChildScrollView(
+          key: const PageStorageKey('scroll'),
           scrollDirection: Axis.horizontal,
           padding: EdgeInsets.zero,
           controller: controller,
@@ -358,6 +396,7 @@ class _FilledTabBarState extends State<FilledTabBar> {
     }
     updateScrollOffset(i);
     previousIndex = i;
+    bucket.writeState(context, i);
   }
 
   void updateScrollOffset(int i) {
@@ -398,7 +437,7 @@ class _FilledTabBarState extends State<FilledTabBar> {
           padding: const EdgeInsets.symmetric(horizontal: 16),
           child: DefaultTextStyle(
             style: DefaultTextStyle.of(context).style.copyWith(
-                  color: i == _controller.index
+                  color: i == _controller.animation?.value.round()
                       ? context.colorScheme.primary
                       : context.colorScheme.onSurface,
                   fontWeight: FontWeight.w500,
@@ -695,6 +734,7 @@ class _SliverSearchBarDelegate extends SliverPersistentHeaderDelegate {
                       icon: const Icon(Icons.clear),
                       onPressed: () {
                         editingController.clear();
+                        onChanged?.call("");
                       },
                     );
             },

lib/components/button.dart

@@ -214,7 +214,7 @@ class _ButtonState extends State<Button> {
             boxShadow: (isHover && !isLoading && (widget.type == ButtonType.filled || widget.type == ButtonType.normal))
                 ? [
                     BoxShadow(
-                      color: Colors.black.withOpacity(0.1),
+                      color: Colors.black.toOpacity(0.1),
                       blurRadius: 2,
                       offset: const Offset(0, 1),
                     )
@@ -248,7 +248,7 @@ class _ButtonState extends State<Button> {
     if (widget.type == ButtonType.filled) {
       var color = widget.color ?? context.colorScheme.primary;
       if (isHover) {
-        return color.withOpacity(0.9);
+        return color.toOpacity(0.9);
       } else {
         return color;
       }
@@ -256,13 +256,13 @@ class _ButtonState extends State<Button> {
     if (widget.type == ButtonType.normal) {
       var color = widget.color ?? context.colorScheme.surfaceContainer;
       if (isHover) {
-        return color.withOpacity(0.9);
+        return color.toOpacity(0.9);
       } else {
         return color;
       }
     }
     if (isHover) {
-      return context.colorScheme.outline.withOpacity(0.2);
+      return context.colorScheme.outline.toOpacity(0.2);
     }
     return Colors.transparent;
   }
@@ -345,7 +345,7 @@ class _IconButtonState extends State<_IconButton> {
                   ? Theme.of(context)
                   .colorScheme
                   .outlineVariant
-                  .withOpacity(0.4)
+                  .toOpacity(0.4)
                   : null,
               borderRadius: BorderRadius.circular((iconSize + 12) / 2),
             ),

lib/components/comic.dart

@@ -1,14 +1,14 @@
 part of 'components.dart';
 
 class ComicTile extends StatelessWidget {
-  const ComicTile({
-    super.key,
-    required this.comic,
-    this.enableLongPressed = true,
-    this.badge,
-    this.menuOptions,
-    this.onTap,
-  });
+  const ComicTile(
+      {super.key,
+      required this.comic,
+      this.enableLongPressed = true,
+      this.badge,
+      this.menuOptions,
+      this.onTap,
+      this.onLongPressed});
 
   final Comic comic;
 
@@ -20,6 +20,8 @@ class ComicTile extends StatelessWidget {
 
   final VoidCallback? onTap;
 
+  final VoidCallback? onLongPressed;
+
   void _onTap() {
     if (onTap != null) {
       onTap!();
@@ -29,11 +31,19 @@ class ComicTile extends StatelessWidget {
         ?.to(() => ComicPage(id: comic.id, sourceKey: comic.sourceKey));
   }
 
+  void _onLongPressed(context) {
+    if (onLongPressed != null) {
+      onLongPressed!();
+      return;
+    }
+    onLongPress(context);
+  }
+
   void onLongPress(BuildContext context) {
     var renderBox = context.findRenderObject() as RenderBox;
     var size = renderBox.size;
     var location = renderBox.localToGlobal(
-      Offset(size.width / 2, size.height / 2),
+      Offset((size.width - 242) / 2, size.height / 2),
     );
     showMenu(location, context);
   }
@@ -134,7 +144,7 @@ class ComicTile extends StatelessWidget {
                 if (history != null)
                   Container(
                     height: 24,
-                    color: Colors.blue.withOpacity(0.9),
+                    color: Colors.blue.toOpacity(0.9),
                     constraints: const BoxConstraints(minWidth: 24),
                     padding: const EdgeInsets.symmetric(horizontal: 4),
                     child: CustomPaint(
@@ -153,9 +163,9 @@ class ComicTile extends StatelessWidget {
   Widget buildImage(BuildContext context) {
     ImageProvider image;
     if (comic is LocalComic) {
-      image = FileImage((comic as LocalComic).coverFile);
-    } else if (comic.cover.startsWith('file://')) {
-      image = FileImage(File(comic.cover.substring(7)));
+      image = LocalComicImageProvider(comic as LocalComic);
+    } else if (comic is History) {
+      image = HistoryImageProvider(comic as History);
     } else if (comic.sourceKey == 'local') {
       var localComic = LocalManager().find(comic.id, ComicType.local);
       if (localComic == null) {
@@ -183,7 +193,7 @@ class ComicTile extends StatelessWidget {
       return InkWell(
           borderRadius: BorderRadius.circular(12),
           onTap: _onTap,
-          onLongPress: enableLongPressed ? () => onLongPress(context) : null,
+          onLongPress: enableLongPressed ? () => _onLongPressed(context) : null,
           onSecondaryTapDown: (detail) => onSecondaryTap(detail, context),
           child: Padding(
             padding: const EdgeInsets.fromLTRB(16, 8, 24, 8),
@@ -233,7 +243,7 @@ class ComicTile extends StatelessWidget {
               borderRadius: BorderRadius.circular(8),
               onTap: _onTap,
               onLongPress:
-                  enableLongPressed ? () => onLongPress(context) : null,
+                  enableLongPressed ? () => _onLongPressed(context) : null,
               onSecondaryTapDown: (detail) => onSecondaryTap(detail, context),
               child: Column(
                 children: [
@@ -253,39 +263,49 @@ class ComicTile extends StatelessWidget {
                               child: buildImage(context),
                             ),
                           ),
-                          Positioned(
-                              bottom: 0,
-                              right: 0,
-                              child: Padding(
+                          Align(
+                            alignment: Alignment.bottomRight,
+                            child: (() {
+                              final subtitle =
+                                  comic.subtitle?.replaceAll('\n', '').trim();
+                              final text = comic.description.isNotEmpty
+                                  ? comic.description.split('|').join('\n')
+                                  : (subtitle?.isNotEmpty == true
+                                      ? subtitle
+                                      : null);
+                              final scale =
+                                  (appdata.settings['comicTileScale'] as num)
+                                      .toDouble();
+                              final fortSize = scale < 0.85
+                                  ? 8.0 // 小尺寸
+                                  : (scale < 1.0 ? 10.0 : 12.0);
+
+                              if (text == null) {
+                                return const SizedBox
+                                    .shrink(); // 如果没有文本，则不显示任何内容
+                              }
+
+                              return Padding(
                                 padding: const EdgeInsets.symmetric(
-                                    horizontal: 4, vertical: 4),
+                                    horizontal: 2, vertical: 2),
                                 child: ClipRRect(
-                                  borderRadius: const BorderRadius.only(
-                                    topLeft: Radius.circular(10.0),
-                                    topRight: Radius.circular(10.0),
-                                    bottomRight: Radius.circular(10.0),
-                                    bottomLeft: Radius.circular(10.0),
+                                  borderRadius: const BorderRadius.all(
+                                    Radius.circular(10.0),
                                   ),
                                   child: Container(
-                                    color: Colors.black.withOpacity(0.5),
+                                    color: Colors.black.toOpacity(0.5),
                                     child: Padding(
                                       padding:
                                           const EdgeInsets.fromLTRB(8, 6, 8, 6),
                                       child: ConstrainedBox(
                                         constraints: BoxConstraints(
-                                          maxWidth: constraints.maxWidth * 0.88,
+                                          maxWidth: constraints.maxWidth,
                                         ),
                                         child: Text(
-                                          comic.description.isEmpty
-                                              ? comic.subtitle
-                                                      ?.replaceAll('\n', '') ??
-                                                  ''
-                                              : comic.description
-                                                  .split('|')
-                                                  .join('\n'),
-                                          style: const TextStyle(
+                                          text,
+                                          style: TextStyle(
                                             fontWeight: FontWeight.w500,
-                                            fontSize: 12,
+                                            fontSize: fortSize,
                                             color: Colors.white,
                                           ),
                                           textAlign: TextAlign.right,
@@ -296,7 +316,9 @@ class ComicTile extends StatelessWidget {
                                     ),
                                   ),
                                 ),
-                              )),
+                              );
+                            })(),
+                          ),
                         ],
                       ),
                     ),
@@ -307,7 +329,6 @@ class ComicTile extends StatelessWidget {
                       comic.title.replaceAll('\n', ''),
                       style: const TextStyle(
                         fontWeight: FontWeight.w500,
-                        fontSize: 14.0,
                       ),
                       maxLines: 1,
                       overflow: TextOverflow.ellipsis,
@@ -454,7 +475,7 @@ class _ComicDescription extends StatelessWidget {
             subtitle,
             style: TextStyle(
                 fontSize: 10.0,
-                color: context.colorScheme.onSurface.withOpacity(0.7)),
+                color: context.colorScheme.onSurface.toOpacity(0.7)),
             maxLines: 1,
             softWrap: true,
             overflow: TextOverflow.ellipsis,
@@ -635,6 +656,7 @@ class SliverGridComics extends StatefulWidget {
       this.badgeBuilder,
       this.menuBuilder,
       this.onTap,
+      this.onLongPressed,
       this.selections});
 
   final List<Comic> comics;
@@ -649,6 +671,8 @@ class SliverGridComics extends StatefulWidget {
 
   final void Function(Comic)? onTap;
 
+  final void Function(Comic)? onLongPressed;
+
   @override
   State<SliverGridComics> createState() => _SliverGridComicsState();
 }
@@ -699,6 +723,7 @@ class _SliverGridComicsState extends State<SliverGridComics> {
       badgeBuilder: widget.badgeBuilder,
       menuBuilder: widget.menuBuilder,
       onTap: widget.onTap,
+      onLongPressed: widget.onLongPressed,
     );
   }
 }
@@ -710,6 +735,7 @@ class _SliverGridComics extends StatelessWidget {
     this.badgeBuilder,
     this.menuBuilder,
     this.onTap,
+    this.onLongPressed,
     this.selection,
   });
 
@@ -725,6 +751,8 @@ class _SliverGridComics extends StatelessWidget {
 
   final void Function(Comic)? onTap;
 
+  final void Function(Comic)? onLongPressed;
+
   @override
   Widget build(BuildContext context) {
     return SliverGrid(
@@ -741,14 +769,18 @@ class _SliverGridComics extends StatelessWidget {
             badge: badge,
             menuOptions: menuBuilder?.call(comics[index]),
             onTap: onTap != null ? () => onTap!(comics[index]) : null,
+            onLongPressed: onLongPressed != null
+                ? () => onLongPressed!(comics[index])
+                : null,
           );
-          if(selection == null) {
+          if (selection == null) {
             return comic;
           }
-          return Container(
+          return AnimatedContainer(
+            duration: const Duration(milliseconds: 150),
             decoration: BoxDecoration(
               color: isSelected
-                  ? Theme.of(context).colorScheme.surfaceContainer
+                  ? Theme.of(context).colorScheme.secondaryContainer.toOpacity(0.72)
                   : null,
               borderRadius: BorderRadius.circular(12),
             ),
@@ -799,6 +831,8 @@ class ComicList extends StatefulWidget {
     this.trailingSliver,
     this.errorLeading,
     this.menuBuilder,
+    this.controller,
+    this.refreshHandlerCallback,
   });
 
   final Future<Res<List<Comic>>> Function(int page)? loadPage;
@@ -813,6 +847,10 @@ class ComicList extends StatefulWidget {
 
   final List<MenuEntry> Function(Comic)? menuBuilder;
 
+  final ScrollController? controller;
+
+  final void Function(VoidCallback c)? refreshHandlerCallback;
+
   @override
   State<ComicList> createState() => ComicListState();
 }
@@ -830,6 +868,51 @@ class ComicListState extends State<ComicList> {
 
   String? _nextUrl;
 
+  Map<String, dynamic> get state => {
+    'maxPage': _maxPage,
+    'data': _data,
+    'page': _page,
+    'error': _error,
+    'loading': _loading,
+    'nextUrl': _nextUrl,
+  };
+
+  void restoreState(Map<String, dynamic>? state) {
+    if (state == null) {
+      return;
+    }
+    _maxPage = state['maxPage'];
+    _data.clear();
+    _data.addAll(state['data']);
+    _page = state['page'];
+    _error = state['error'];
+    _loading.clear();
+    _loading.addAll(state['loading']);
+    _nextUrl = state['nextUrl'];
+  }
+
+  void storeState() {
+    PageStorage.of(context).writeState(context, state);
+  }
+
+  void refresh() {
+    _data.clear();
+    _page = 1;
+    _maxPage = null;
+    _error = null;
+    _nextUrl = null;
+    _loading.clear();
+    storeState();
+    setState(() {});
+  }
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    restoreState(PageStorage.of(context).readState(context));
+    widget.refreshHandlerCallback?.call(refresh);
+  }
+
   void remove(Comic c) {
     if (_data[_page] == null || !_data[_page]!.remove(c)) {
       for (var page in _data.values) {
@@ -977,15 +1060,20 @@ class ComicListState extends State<ComicList> {
           while (_data[page] == null) {
             await _fetchNext();
           }
-          setState(() {});
+          if(mounted) {
+            setState(() {});
+          }
         } catch (e) {
-          setState(() {
-            _error = e.toString();
-          });
+          if(mounted) {
+            setState(() {
+              _error = e.toString();
+            });
+          }
         }
       }
     } finally {
       _loading[page] = false;
+      storeState();
     }
   }
 
@@ -1034,6 +1122,8 @@ class ComicListState extends State<ComicList> {
       );
     }
     return SmoothCustomScrollView(
+      key: const PageStorageKey('scroll'),
+      controller: widget.controller,
       slivers: [
         if (widget.leadingSliver != null) widget.leadingSliver!,
         if (_maxPage != 1) _buildSliverPageSelector(),

lib/components/components.dart

@@ -1,5 +1,3 @@
-library components;
-
 import 'dart:async';
 import 'dart:collection';
 import 'dart:math' as math;
@@ -19,13 +17,14 @@ import 'package:venera/foundation/consts.dart';
 import 'package:venera/foundation/favorites.dart';
 import 'package:venera/foundation/history.dart';
 import 'package:venera/foundation/image_provider/cached_image.dart';
+import 'package:venera/foundation/image_provider/history_image_provider.dart';
+import 'package:venera/foundation/image_provider/local_comic_image.dart';
 import 'package:venera/foundation/local.dart';
 import 'package:venera/foundation/res.dart';
 import 'package:venera/network/cloudflare.dart';
 import 'package:venera/pages/comic_page.dart';
 import 'package:venera/pages/favorites/favorites_page.dart';
 import 'package:venera/utils/ext.dart';
-import 'package:venera/utils/io.dart';
 import 'package:venera/utils/tags_translation.dart';
 import 'package:venera/utils/translations.dart';
 

lib/components/custom_slider.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:venera/foundation/app.dart';
 
 /// patched slider.dart with RtL support
 class _SliderDefaultsM3 extends SliderThemeData {
@@ -15,45 +16,45 @@ class _SliderDefaultsM3 extends SliderThemeData {
   Color? get inactiveTrackColor => _colors.surfaceContainerHighest;
 
   @override
-  Color? get secondaryActiveTrackColor => _colors.primary.withOpacity(0.54);
+  Color? get secondaryActiveTrackColor => _colors.primary.toOpacity(0.54);
 
   @override
-  Color? get disabledActiveTrackColor => _colors.onSurface.withOpacity(0.38);
+  Color? get disabledActiveTrackColor => _colors.onSurface.toOpacity(0.38);
 
   @override
-  Color? get disabledInactiveTrackColor => _colors.onSurface.withOpacity(0.12);
+  Color? get disabledInactiveTrackColor => _colors.onSurface.toOpacity(0.12);
 
   @override
-  Color? get disabledSecondaryActiveTrackColor => _colors.onSurface.withOpacity(0.12);
+  Color? get disabledSecondaryActiveTrackColor => _colors.onSurface.toOpacity(0.12);
 
   @override
-  Color? get activeTickMarkColor => _colors.onPrimary.withOpacity(0.38);
+  Color? get activeTickMarkColor => _colors.onPrimary.toOpacity(0.38);
 
   @override
-  Color? get inactiveTickMarkColor => _colors.onSurfaceVariant.withOpacity(0.38);
+  Color? get inactiveTickMarkColor => _colors.onSurfaceVariant.toOpacity(0.38);
 
   @override
-  Color? get disabledActiveTickMarkColor => _colors.onSurface.withOpacity(0.38);
+  Color? get disabledActiveTickMarkColor => _colors.onSurface.toOpacity(0.38);
 
   @override
-  Color? get disabledInactiveTickMarkColor => _colors.onSurface.withOpacity(0.38);
+  Color? get disabledInactiveTickMarkColor => _colors.onSurface.toOpacity(0.38);
 
   @override
   Color? get thumbColor => _colors.primary;
 
   @override
-  Color? get disabledThumbColor => Color.alphaBlend(_colors.onSurface.withOpacity(0.38), _colors.surface);
+  Color? get disabledThumbColor => Color.alphaBlend(_colors.onSurface.toOpacity(0.38), _colors.surface);
 
   @override
   Color? get overlayColor => WidgetStateColor.resolveWith((Set<WidgetState> states) {
     if (states.contains(WidgetState.dragged)) {
-      return _colors.primary.withOpacity(0.1);
+      return _colors.primary.toOpacity(0.1);
     }
     if (states.contains(WidgetState.hovered)) {
-      return _colors.primary.withOpacity(0.08);
+      return _colors.primary.toOpacity(0.08);
     }
     if (states.contains(WidgetState.focused)) {
-      return _colors.primary.withOpacity(0.1);
+      return _colors.primary.toOpacity(0.1);
     }
 
     return Colors.transparent;

lib/components/flyout.dart

@@ -141,7 +141,7 @@ class FlyoutState extends State<Flyout> {
                     animation: animation,
                     builder: (context, builder) {
                       return ColoredBox(
-                        color: Colors.black.withOpacity(0.3 * animation.value),
+                        color: Colors.black.toOpacity(0.3 * animation.value),
                       );
                     },
                   ),
@@ -185,12 +185,18 @@ class FlyoutContent extends StatelessWidget {
         child: Material(
           borderRadius: BorderRadius.circular(8),
           type: MaterialType.card,
-          color: context.colorScheme.surface.withOpacity(0.82),
+          color: context.colorScheme.surface.toOpacity(0.82),
           child: Container(
             constraints: const BoxConstraints(
               minWidth: minFlyoutWidth,
             ),
             padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
+            decoration: BoxDecoration(
+              borderRadius: BorderRadius.circular(8),
+              border: context.brightness == ui.Brightness.dark
+                  ? Border.all(color: context.colorScheme.outlineVariant)
+                  : null,
+            ),
             child: Column(
               mainAxisSize: MainAxisSize.min,
               crossAxisAlignment: CrossAxisAlignment.start,
@@ -215,108 +221,3 @@ class FlyoutContent extends StatelessWidget {
     );
   }
 }
-
-class FlyoutTextButton extends StatefulWidget {
-  const FlyoutTextButton(
-      {super.key,
-      required this.child,
-      required this.flyoutBuilder,
-      this.navigator});
-
-  final Widget child;
-
-  final WidgetBuilder flyoutBuilder;
-
-  final NavigatorState? navigator;
-
-  @override
-  State<FlyoutTextButton> createState() => _FlyoutTextButtonState();
-}
-
-class _FlyoutTextButtonState extends State<FlyoutTextButton> {
-  final FlyoutController _controller = FlyoutController();
-
-  @override
-  Widget build(BuildContext context) {
-    return Flyout(
-        controller: _controller,
-        flyoutBuilder: widget.flyoutBuilder,
-        navigator: widget.navigator,
-        child: TextButton(
-          onPressed: () {
-            _controller.show();
-          },
-          child: widget.child,
-        ));
-  }
-}
-
-class FlyoutIconButton extends StatefulWidget {
-  const FlyoutIconButton(
-      {super.key,
-      required this.icon,
-      required this.flyoutBuilder,
-      this.navigator});
-
-  final Widget icon;
-
-  final WidgetBuilder flyoutBuilder;
-
-  final NavigatorState? navigator;
-
-  @override
-  State<FlyoutIconButton> createState() => _FlyoutIconButtonState();
-}
-
-class _FlyoutIconButtonState extends State<FlyoutIconButton> {
-  final FlyoutController _controller = FlyoutController();
-
-  @override
-  Widget build(BuildContext context) {
-    return Flyout(
-        controller: _controller,
-        flyoutBuilder: widget.flyoutBuilder,
-        navigator: widget.navigator,
-        child: IconButton(
-          onPressed: () {
-            _controller.show();
-          },
-          icon: widget.icon,
-        ));
-  }
-}
-
-class FlyoutFilledButton extends StatefulWidget {
-  const FlyoutFilledButton(
-      {super.key,
-      required this.child,
-      required this.flyoutBuilder,
-      this.navigator});
-
-  final Widget child;
-
-  final WidgetBuilder flyoutBuilder;
-
-  final NavigatorState? navigator;
-
-  @override
-  State<FlyoutFilledButton> createState() => _FlyoutFilledButtonState();
-}
-
-class _FlyoutFilledButtonState extends State<FlyoutFilledButton> {
-  final FlyoutController _controller = FlyoutController();
-
-  @override
-  Widget build(BuildContext context) {
-    return Flyout(
-        controller: _controller,
-        flyoutBuilder: widget.flyoutBuilder,
-        navigator: widget.navigator,
-        child: ElevatedButton(
-          onPressed: () {
-            _controller.show();
-          },
-          child: widget.child,
-        ));
-  }
-}

lib/components/gesture.dart

@@ -1,7 +1,8 @@
 part of 'components.dart';
 
 class MouseBackDetector extends StatelessWidget {
-  const MouseBackDetector({super.key, required this.onTapDown, required this.child});
+  const MouseBackDetector(
+      {super.key, required this.onTapDown, required this.child});
 
   final Widget child;
 
@@ -20,3 +21,45 @@ class MouseBackDetector extends StatelessWidget {
     );
   }
 }
+
+class AnimatedTapRegion extends StatefulWidget {
+  const AnimatedTapRegion({
+    super.key,
+    required this.child,
+    required this.onTap,
+    this.borderRadius = 0,
+  });
+
+  final Widget child;
+
+  final void Function() onTap;
+
+  final double borderRadius;
+
+  @override
+  State<AnimatedTapRegion> createState() => _AnimatedTapRegionState();
+}
+
+class _AnimatedTapRegionState extends State<AnimatedTapRegion> {
+  bool isHovered = false;
+
+  @override
+  Widget build(BuildContext context) {
+    return MouseRegion(
+      onEnter: (_) => setState(() => isHovered = true),
+      onExit: (_) => setState(() => isHovered = false),
+      child: GestureDetector(
+        onTap: widget.onTap,
+        child: ClipRRect(
+          borderRadius: BorderRadius.circular(widget.borderRadius),
+          clipBehavior: Clip.antiAlias,
+          child: AnimatedScale(
+            duration: _fastAnimationDuration,
+            scale: isHovered ? 1.1 : 1,
+            child: widget.child,
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/components/loading.dart

@@ -96,6 +96,20 @@ class ListLoadingIndicator extends StatelessWidget {
   }
 }
 
+class SliverListLoadingIndicator extends StatelessWidget {
+  const SliverListLoadingIndicator({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    // SliverToBoxAdapter can not been lazy loaded.
+    // Use SliverList to make sure the animation can be lazy loaded.
+    return SliverList.list(children: const [
+      SizedBox(),
+      ListLoadingIndicator(),
+    ]);
+  }
+}
+
 abstract class LoadingState<T extends StatefulWidget, S extends Object>
     extends State<T> {
   bool isLoading = false;
@@ -299,9 +313,7 @@ abstract class MultiPageLoadingState<T extends StatefulWidget, S extends Object>
 
   Widget buildLoading(BuildContext context) {
     return Center(
-      child: const CircularProgressIndicator(
-        strokeWidth: 2,
-      ).fixWidth(32).fixHeight(32),
+      child: const CircularProgressIndicator().fixWidth(32).fixHeight(32),
     );
   }
 

lib/components/menu.dart

@@ -20,6 +20,8 @@ class _MenuRoute<T> extends PopupRoute<T> {
   @override
   String? get barrierLabel => "menu";
 
+  double get entryHeight => App.isMobile ? 42 : 36;
+
   @override
   Widget buildPage(BuildContext context, Animation<double> animation,
       Animation<double> secondaryAnimation) {
@@ -30,7 +32,7 @@ class _MenuRoute<T> extends PopupRoute<T> {
       left = size.width - width - 10;
     }
     var top = location.dy;
-    var height = 16 + 32 * entries.length;
+    var height = 16 + entryHeight * entries.length;
     if (top + height > size.height - 15) {
       top = size.height - height - 15;
     }
@@ -42,9 +44,12 @@ class _MenuRoute<T> extends PopupRoute<T> {
           child: Container(
             decoration: BoxDecoration(
               borderRadius: BorderRadius.circular(4),
+              border: context.brightness == Brightness.dark
+                  ? Border.all(color: context.colorScheme.outlineVariant)
+                  : null,
               boxShadow: [
                 BoxShadow(
-                  color: context.colorScheme.shadow.withOpacity(0.2),
+                  color: context.colorScheme.shadow.toOpacity(0.2),
                   blurRadius: 8,
                   blurStyle: BlurStyle.outer,
                 ),
@@ -53,9 +58,7 @@ class _MenuRoute<T> extends PopupRoute<T> {
             child: BlurEffect(
               borderRadius: BorderRadius.circular(4),
               child: Material(
-                color: context.brightness == Brightness.light
-                    ? const Color(0xFFFAFAFA).withOpacity(0.82)
-                    : const Color(0xFF090909).withOpacity(0.82),
+                color: context.colorScheme.surface.toOpacity(0.78),
                 borderRadius: BorderRadius.circular(4),
                 child: Container(
                   width: width,
@@ -83,7 +86,7 @@ class _MenuRoute<T> extends PopupRoute<T> {
         entry.onClick();
       },
       child: SizedBox(
-        height: App.isMobile ? 42 : 36,
+        height: entryHeight,
         child: Padding(
           padding: const EdgeInsets.symmetric(horizontal: 12),
           child: Row(
@@ -92,9 +95,13 @@ class _MenuRoute<T> extends PopupRoute<T> {
                 Icon(
                   entry.icon,
                   size: 18,
+                  color: entry.color
                 ),
               const SizedBox(width: 12),
-              Text(entry.text),
+              Text(
+                  entry.text,
+                  style: TextStyle(color: entry.color)
+              ),
             ],
           ),
         ),
@@ -119,7 +126,8 @@ class _MenuRoute<T> extends PopupRoute<T> {
 class MenuEntry {
   final String text;
   final IconData? icon;
+  final Color? color;
   final void Function() onClick;
 
-  MenuEntry({required this.text, this.icon, required this.onClick});
+  MenuEntry({required this.text, this.icon, this.color, required this.onClick});
 }

lib/components/message.dart

@@ -46,21 +46,28 @@ class _ToastOverlay extends StatelessWidget {
           child: IconTheme(
             data: IconThemeData(
                 color: Theme.of(context).colorScheme.onInverseSurface),
-            child: Container(
-              padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 16),
-              child: Row(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  if (icon != null) icon!.paddingRight(8),
-                  Text(
-                    message,
-                    style: const TextStyle(
-                        fontSize: 16, fontWeight: FontWeight.w500),
-                    maxLines: 3,
-                    overflow: TextOverflow.ellipsis,
-                  ),
-                  if (trailing != null) trailing!.paddingLeft(8)
-                ],
+            child: IntrinsicWidth(
+              child: Container(
+                padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 16),
+                constraints: BoxConstraints(
+                  maxWidth: context.width - 32,
+                ),
+                child: Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    if (icon != null) icon!.paddingRight(8),
+                    Expanded(
+                      child: Text(
+                        message,
+                        style: const TextStyle(
+                            fontSize: 16, fontWeight: FontWeight.w500),
+                        maxLines: 3,
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                    ),
+                    if (trailing != null) trailing!.paddingLeft(8)
+                  ],
+                ),
               ),
             ),
           ),
@@ -135,6 +142,7 @@ Future<void> showConfirmDialog({
   required String content,
   required void Function() onConfirm,
   String confirmText = "Confirm",
+  Color? btnColor,
 }) {
   return showDialog(
     context: context,
@@ -147,6 +155,9 @@ Future<void> showConfirmDialog({
             context.pop();
             onConfirm();
           },
+          style: FilledButton.styleFrom(
+            backgroundColor: btnColor,
+          ),
           child: Text(confirmText.tl),
         ),
       ],
@@ -216,7 +227,7 @@ LoadingDialogController showLoadingDialog(BuildContext context,
         );
       });
 
-  var navigator = Navigator.of(context);
+  var navigator = Navigator.of(context, rootNavigator: true);
 
   navigator.push(loadingDialogRoute).then((value) => controller.closed = true);
 

lib/components/navigation_bar.dart

@@ -23,14 +23,15 @@ class PaneActionEntry {
 }
 
 class NaviPane extends StatefulWidget {
-  const NaviPane({required this.paneItems,
-    required this.paneActions,
-    required this.pageBuilder,
-    this.initialPage = 0,
-    this.onPageChanged,
-    required this.observer,
-    required this.navigatorKey,
-    super.key});
+  const NaviPane(
+      {required this.paneItems,
+      required this.paneActions,
+      required this.pageBuilder,
+      this.initialPage = 0,
+      this.onPageChanged,
+      required this.observer,
+      required this.navigatorKey,
+      super.key});
 
   final List<PaneItemEntry> paneItems;
 
@@ -47,10 +48,16 @@ class NaviPane extends StatefulWidget {
   final GlobalKey<NavigatorState> navigatorKey;
 
   @override
-  State<NaviPane> createState() => _NaviPaneState();
+  State<NaviPane> createState() => NaviPaneState();
+
+  static NaviPaneState of(BuildContext context) {
+    return context.findAncestorStateOfType<NaviPaneState>()!;
+  }
 }
 
-class _NaviPaneState extends State<NaviPane>
+typedef NaviItemTapListener = void Function(int);
+
+class NaviPaneState extends State<NaviPane>
     with SingleTickerProviderStateMixin {
   late int _currentPage = widget.initialPage;
 
@@ -66,28 +73,41 @@ class _NaviPaneState extends State<NaviPane>
 
   late AnimationController controller;
 
+  final _naviItemTapListeners = <NaviItemTapListener>[];
+
+  void addNaviItemTapListener(NaviItemTapListener listener) {
+    _naviItemTapListeners.add(listener);
+  }
+
+  void removeNaviItemTapListener(NaviItemTapListener listener) {
+    _naviItemTapListeners.remove(listener);
+  }
+
   static const _kBottomBarHeight = 58.0;
 
-  static const _kFoldedSideBarWidth = 80.0;
+  static const _kFoldedSideBarWidth = 72.0;
 
-  static const _kSideBarWidth = 256.0;
+  static const _kSideBarWidth = 224.0;
 
   static const _kTopBarHeight = 48.0;
 
   double get bottomBarHeight =>
-      _kBottomBarHeight + MediaQuery
-          .of(context)
-          .padding
-          .bottom;
+      _kBottomBarHeight + MediaQuery.of(context).padding.bottom;
 
   void onNavigatorStateChange() {
     onRebuild(context);
   }
 
   void updatePage(int index) {
+    for (var listener in _naviItemTapListeners) {
+      listener(index);
+    }
     if (widget.observer.routes.length > 1) {
       widget.navigatorKey.currentState!.popUntil((route) => route.isFirst);
     }
+    if (currentPage == index) {
+      return;
+    }
     setState(() {
       currentPage = index;
     });
@@ -114,10 +134,7 @@ class _NaviPaneState extends State<NaviPane>
   }
 
   double targetFormContext(BuildContext context) {
-    var width = MediaQuery
-        .of(context)
-        .size
-        .width;
+    var width = MediaQuery.of(context).size.width;
     double target = 0;
     if (width > changePoint) {
       target = 2;
@@ -186,14 +203,13 @@ class _NaviPaneState extends State<NaviPane>
     return Navigator(
       observers: [widget.observer],
       key: widget.navigatorKey,
-      onGenerateRoute: (settings) =>
-          AppPageRoute(
-            preventRebuild: false,
-            isRootRoute: true,
-            builder: (context) {
-              return _NaviMainView(state: this);
-            },
-          ),
+      onGenerateRoute: (settings) => AppPageRoute(
+        preventRebuild: false,
+        isRootRoute: true,
+        builder: (context) {
+          return _NaviMainView(state: this);
+        },
+      ),
     );
   }
 
@@ -230,20 +246,14 @@ class _NaviPaneState extends State<NaviPane>
 
   Widget buildBottom() {
     return Material(
-      textStyle: Theme
-          .of(context)
-          .textTheme
-          .labelSmall,
+      textStyle: Theme.of(context).textTheme.labelSmall,
       elevation: 0,
       child: Container(
         height: _kBottomBarHeight,
         decoration: BoxDecoration(
           border: Border(
             top: BorderSide(
-              color: Theme
-                  .of(context)
-                  .colorScheme
-                  .outlineVariant,
+              color: Theme.of(context).colorScheme.outlineVariant,
               width: 1,
             ),
           ),
@@ -251,7 +261,7 @@ class _NaviPaneState extends State<NaviPane>
         child: Row(
           children: List<Widget>.generate(
             widget.paneItems.length,
-                (index) {
+            (index) {
               return Expanded(
                 child: _SingleBottomNaviWidget(
                   enabled: currentPage == index,
@@ -271,7 +281,7 @@ class _NaviPaneState extends State<NaviPane>
 
   Widget buildLeft() {
     final value = controller.value;
-    const paddingHorizontal = 16.0;
+    const paddingHorizontal = 12.0;
     return Material(
       child: Container(
         width: _kFoldedSideBarWidth +
@@ -281,57 +291,39 @@ class _NaviPaneState extends State<NaviPane>
         decoration: BoxDecoration(
           border: Border(
             right: BorderSide(
-              color: Theme
-                  .of(context)
-                  .colorScheme
-                  .outlineVariant,
-              width: 1,
+              color: Theme.of(context).colorScheme.outlineVariant,
+              width: 1.0,
             ),
           ),
         ),
-        child: Row(
+        child: Column(
           children: [
-            SizedBox(
-              width: value == 3
-                  ? (_kSideBarWidth - paddingHorizontal * 2 - 1)
-                  : (_kFoldedSideBarWidth - paddingHorizontal * 2 - 1),
-              child: Column(
-                children: [
-                  const SizedBox(height: 16),
-                  SizedBox(height: MediaQuery
-                      .of(context)
-                      .padding
-                      .top),
-                  ...List<Widget>.generate(
-                    widget.paneItems.length,
-                        (index) =>
-                        _SideNaviWidget(
-                          enabled: currentPage == index,
-                          entry: widget.paneItems[index],
-                          showTitle: value == 3,
-                          onTap: () {
-                            updatePage(index);
-                          },
-                          key: ValueKey(index),
-                        ),
-                  ),
-                  const Spacer(),
-                  ...List<Widget>.generate(
-                    widget.paneActions.length,
-                        (index) =>
-                        _PaneActionWidget(
-                          entry: widget.paneActions[index],
-                          showTitle: value == 3,
-                          key: ValueKey(index + widget.paneItems.length),
-                        ),
-                  ),
-                  const SizedBox(
-                    height: 16,
-                  )
-                ],
+            const SizedBox(height: 16),
+            SizedBox(height: MediaQuery.of(context).padding.top),
+            ...List<Widget>.generate(
+              widget.paneItems.length,
+              (index) => _SideNaviWidget(
+                enabled: currentPage == index,
+                entry: widget.paneItems[index],
+                showTitle: value == 3,
+                onTap: () {
+                  updatePage(index);
+                },
+                key: ValueKey(index),
               ),
             ),
             const Spacer(),
+            ...List<Widget>.generate(
+              widget.paneActions.length,
+              (index) => _PaneActionWidget(
+                entry: widget.paneActions[index],
+                showTitle: value == 3,
+                key: ValueKey(index + widget.paneItems.length),
+              ),
+            ),
+            const SizedBox(
+              height: 16,
+            )
           ],
         ),
       ),
@@ -339,12 +331,13 @@ class _NaviPaneState extends State<NaviPane>
   }
 }
 
-class _SideNaviWidget extends StatefulWidget {
-  const _SideNaviWidget({required this.enabled,
-    required this.entry,
-    required this.onTap,
-    required this.showTitle,
-    super.key});
+class _SideNaviWidget extends StatelessWidget {
+  const _SideNaviWidget(
+      {required this.enabled,
+      required this.entry,
+      required this.onTap,
+      required this.showTitle,
+      super.key});
 
   final bool enabled;
 
@@ -354,60 +347,37 @@ class _SideNaviWidget extends StatefulWidget {
 
   final bool showTitle;
 
-  @override
-  State<_SideNaviWidget> createState() => _SideNaviWidgetState();
-}
-
-class _SideNaviWidgetState extends State<_SideNaviWidget> {
-  bool isHovering = false;
-
   @override
   Widget build(BuildContext context) {
-    final colorScheme = Theme
-        .of(context)
-        .colorScheme;
-    final icon =
-    Icon(widget.enabled ? widget.entry.activeIcon : widget.entry.icon);
-    return MouseRegion(
-      cursor: SystemMouseCursors.click,
-      onEnter: (details) => setState(() => isHovering = true),
-      onExit: (details) => setState(() => isHovering = false),
-      child: GestureDetector(
-        behavior: HitTestBehavior.translucent,
-        onTap: widget.onTap,
-        child: AnimatedContainer(
-            duration: const Duration(milliseconds: 180),
-            margin: const EdgeInsets.symmetric(vertical: 4),
-            padding: const EdgeInsets.symmetric(horizontal: 12),
-            width: double.infinity,
-            height: 42,
-            decoration: BoxDecoration(
-              color: widget.enabled
-                  ? colorScheme.primaryContainer
-                  : isHovering
-                  ? colorScheme.surfaceContainerHigh
-                  : null,
-              borderRadius: BorderRadius.circular(8),
-            ),
-            child: widget.showTitle
-                ? Row(
-              children: [
-                icon,
-                const SizedBox(
-                  width: 12,
-                ),
-                Text(widget.entry.label)
-              ],
-            )
-                : Center(
-              child: icon,
-            )),
+    final colorScheme = Theme.of(context).colorScheme;
+    final icon = Icon(enabled ? entry.activeIcon : entry.icon);
+    return InkWell(
+      borderRadius: BorderRadius.circular(12),
+      onTap: onTap,
+      child: AnimatedContainer(
+        duration: const Duration(milliseconds: 180),
+        padding: const EdgeInsets.symmetric(horizontal: 12),
+        height: 38,
+        decoration: BoxDecoration(
+          color: enabled ? colorScheme.primaryContainer : null,
+          borderRadius: BorderRadius.circular(12),
+        ),
+        child: showTitle ? Row(
+          children: [
+            icon,
+            const SizedBox(width: 12),
+            Text(entry.label)
+          ],
+        ) : Align(
+          alignment: Alignment.centerLeft,
+          child: icon,
+        ),
       ),
-    );
+    ).paddingVertical(4);
   }
 }
 
-class _PaneActionWidget extends StatefulWidget {
+class _PaneActionWidget extends StatelessWidget {
   const _PaneActionWidget(
       {required this.entry, required this.showTitle, super.key});
 
@@ -415,58 +385,37 @@ class _PaneActionWidget extends StatefulWidget {
 
   final bool showTitle;
 
-  @override
-  State<_PaneActionWidget> createState() => _PaneActionWidgetState();
-}
-
-class _PaneActionWidgetState extends State<_PaneActionWidget> {
-  bool isHovering = false;
-
   @override
   Widget build(BuildContext context) {
-    final colorScheme = Theme
-        .of(context)
-        .colorScheme;
-    final icon = Icon(widget.entry.icon);
-    return MouseRegion(
-      cursor: SystemMouseCursors.click,
-      onEnter: (details) => setState(() => isHovering = true),
-      onExit: (details) => setState(() => isHovering = false),
-      child: GestureDetector(
-        behavior: HitTestBehavior.translucent,
-        onTap: widget.entry.onTap,
-        child: AnimatedContainer(
-            duration: const Duration(milliseconds: 180),
-            margin: const EdgeInsets.symmetric(vertical: 4),
-            padding: const EdgeInsets.symmetric(horizontal: 12),
-            width: double.infinity,
-            height: 42,
-            decoration: BoxDecoration(
-                color: isHovering ? colorScheme.surfaceContainerHigh : null,
-                borderRadius: BorderRadius.circular(8)),
-            child: widget.showTitle
-                ? Row(
-              children: [
-                icon,
-                const SizedBox(
-                  width: 12,
-                ),
-                Text(widget.entry.label)
-              ],
-            )
-                : Center(
-              child: icon,
-            )),
+    final icon = Icon(entry.icon);
+    return InkWell(
+      onTap: entry.onTap,
+      borderRadius: BorderRadius.circular(12),
+      child: AnimatedContainer(
+        duration: const Duration(milliseconds: 180),
+        padding: const EdgeInsets.symmetric(horizontal: 12),
+        height: 38,
+        child: showTitle ? Row(
+          children: [
+            icon,
+            const SizedBox(width: 12),
+            Text(entry.label)
+          ],
+        ) : Align(
+          alignment: Alignment.centerLeft,
+          child: icon,
+        ),
       ),
-    );
+    ).paddingVertical(4);
   }
 }
 
 class _SingleBottomNaviWidget extends StatefulWidget {
-  const _SingleBottomNaviWidget({required this.enabled,
-    required this.entry,
-    required this.onTap,
-    super.key});
+  const _SingleBottomNaviWidget(
+      {required this.enabled,
+      required this.entry,
+      required this.onTap,
+      super.key});
 
   final bool enabled;
 
@@ -534,11 +483,9 @@ class _SingleBottomNaviWidgetState extends State<_SingleBottomNaviWidget>
 
   Widget buildContent() {
     final value = controller.value;
-    final colorScheme = Theme
-        .of(context)
-        .colorScheme;
+    final colorScheme = Theme.of(context).colorScheme;
     final icon =
-    Icon(widget.enabled ? widget.entry.activeIcon : widget.entry.icon);
+        Icon(widget.enabled ? widget.entry.activeIcon : widget.entry.icon);
     return Center(
       child: Container(
         width: 64,
@@ -639,12 +586,12 @@ class _NaviPopScope extends StatelessWidget {
     Widget res = App.isIOS
         ? child
         : PopScope(
-      canPop: App.isAndroid ? false : true,
-      onPopInvokedWithResult: (value, result) {
-        action();
-      },
-      child: child,
-    );
+            canPop: App.isAndroid ? false : true,
+            onPopInvokedWithResult: (value, result) {
+              action();
+            },
+            child: child,
+          );
     if (popGesture) {
       res = GestureDetector(
           onPanStart: (details) {
@@ -670,14 +617,14 @@ class _NaviPopScope extends StatelessWidget {
 class _NaviMainView extends StatefulWidget {
   const _NaviMainView({required this.state});
 
-  final _NaviPaneState state;
+  final NaviPaneState state;
 
   @override
   State<_NaviMainView> createState() => _NaviMainViewState();
 }
 
 class _NaviMainViewState extends State<_NaviMainView> {
-  _NaviPaneState get state => widget.state;
+  NaviPaneState get state => widget.state;
 
   @override
   void initState() {
@@ -703,8 +650,8 @@ class _NaviMainViewState extends State<_NaviMainView> {
             ),
           ),
         ),
-        if (shouldShowAppBar) state.buildBottom().paddingBottom(
-            context.padding.bottom),
+        if (shouldShowAppBar)
+          state.buildBottom().paddingBottom(context.padding.bottom),
       ],
     );
   }

lib/components/scroll.dart

@@ -78,6 +78,9 @@ class _SmoothScrollProviderState extends State<SmoothScrollProvider> {
       },
       onPointerSignal: (pointerSignal) {
         if (pointerSignal is PointerScrollEvent) {
+          if (HardwareKeyboard.instance.isShiftPressed) {
+            return;
+          }
           if (pointerSignal.kind == PointerDeviceKind.mouse &&
               !_isMouseScroll) {
             setState(() {

lib/components/select.dart

@@ -267,13 +267,14 @@ class OptionChip extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Container(
+    return AnimatedContainer(
+      duration: _fastAnimationDuration,
       decoration: BoxDecoration(
         color: isSelected
-            ? context.colorScheme.primaryContainer
+            ? context.colorScheme.secondaryContainer
             : context.colorScheme.surface,
         border: isSelected
-            ? Border.all(color: context.colorScheme.primaryContainer)
+            ? Border.all(color: context.colorScheme.secondaryContainer)
             : Border.all(color: context.colorScheme.outline),
         borderRadius: BorderRadius.circular(8),
       ),

lib/components/window_frame.dart

@@ -563,7 +563,7 @@ class _VirtualWindowFrameState extends State<VirtualWindowFrame>
         boxShadow: <BoxShadow>[
           if (!_isMaximized && !_isFullScreen)
             BoxShadow(
-              color: Colors.black.withOpacity(0.1),
+              color: Colors.black.toOpacity(0.1),
               offset: Offset(0.0, _isFocused ? 4 : 2),
               blurRadius: 6,
             )

lib/foundation/app.dart

@@ -10,7 +10,7 @@ export "widget_utils.dart";
 export "context.dart";
 
 class _App {
-  final version = "1.0.6";
+  final version = "1.1.1";
 
   bool get isAndroid => Platform.isAndroid;
 
@@ -63,22 +63,9 @@ class _App {
     }
   }
 
-  var mainColor = Colors.blue;
-
   Future<void> init() async {
     cachePath = (await getApplicationCacheDirectory()).path;
     dataPath = (await getApplicationSupportDirectory()).path;
-    mainColor = switch (appdata.settings['color']) {
-      'red' => Colors.red,
-      'pink' => Colors.pink,
-      'purple' => Colors.purple,
-      'green' => Colors.green,
-      'orange' => Colors.orange,
-      'blue' => Colors.blue,
-      'yellow' => Colors.yellow,
-      'cyan' => Colors.cyan,
-      _ => Colors.blue,
-    };
   }
 
   Function? _forceRebuildHandler;

lib/foundation/appdata.dart

@@ -92,7 +92,7 @@ class _Settings with ChangeNotifier {
   final _data = <String, dynamic>{
     'comicDisplayMode': 'detailed', // detailed, brief
     'comicTileScale': 1.00, // 0.75-1.25
-    'color': 'blue', // red, pink, purple, green, orange, blue
+    'color': 'system', // red, pink, purple, green, orange, blue
     'theme_mode': 'system', // light, dark, system
     'newFavoriteAddTo': 'end', // start, end
     'moveFavoriteAfterRead': 'none', // none, end, start
@@ -106,6 +106,7 @@ class _Settings with ChangeNotifier {
     'defaultSearchTarget': null,
     'autoPageTurningInterval': 5, // in seconds
     'readerMode': 'galleryLeftToRight', // values of [ReaderMode]
+    'readerScreenPicNumber': 1, // 1 - 5
     'enableTapToTurnPages': true,
     'enablePageAnimation': true,
     'language': 'system', // system, zh-CN, zh-TW, en-US

lib/foundation/comic_source/category.dart

@@ -1,4 +1,4 @@
-part of comic_source;
+part of 'comic_source.dart';
 
 class CategoryData {
   /// The title is displayed in the tab bar.

lib/foundation/comic_source/comic_source.dart

@@ -1,4 +1,4 @@
-library comic_source;
+library;
 
 import 'dart:async';
 import 'dart:collection';
@@ -215,6 +215,8 @@ class ComicSource {
 
   final StarRatingFunc? starRatingFunc;
 
+  final ArchiveDownloader? archiveDownloader;
+
   Future<void> loadData() async {
     var file = File("${App.dataPath}/comic_source/$key.data");
     if (await file.exists()) {
@@ -284,6 +286,7 @@ class ComicSource {
     this.enableTagsSuggestions,
     this.enableTagsTranslate,
     this.starRatingFunc,
+    this.archiveDownloader,
   );
 }
 
@@ -465,3 +468,11 @@ class LinkHandler {
 
   const LinkHandler(this.domains, this.linkToId);
 }
+
+class ArchiveDownloader {
+  final Future<Res<List<ArchiveInfo>>> Function(String cid) getArchives;
+
+  final Future<Res<String>> Function(String cid, String aid) getDownloadUrl;
+
+  const ArchiveDownloader(this.getArchives, this.getDownloadUrl);
+}

lib/foundation/comic_source/models.dart

@@ -160,6 +160,8 @@ class ComicDetails with HistoryMixin {
   @override
   final int? maxPage;
 
+  final List<Comment>? comments;
+
   static Map<String, List<String>> _generateMap(Map<dynamic, dynamic> map) {
     var res = <String, List<String>>{};
     map.forEach((key, value) {
@@ -170,7 +172,7 @@ class ComicDetails with HistoryMixin {
 
   ComicDetails.fromJson(Map<String, dynamic> json)
       : title = json["title"],
-        subTitle = json["subTitle"],
+        subTitle = json["subtitle"],
         cover = json["cover"],
         description = json["description"],
         tags = _generateMap(json["tags"]),
@@ -193,7 +195,10 @@ class ComicDetails with HistoryMixin {
         updateTime = json["updateTime"],
         url = json["url"],
         stars = (json["stars"] as num?)?.toDouble(),
-        maxPage = json["maxPage"];
+        maxPage = json["maxPage"],
+        comments = (json["comments"] as List?)
+            ?.map((e) => Comment.fromJson(e))
+            .toList();
 
   Map<String, dynamic> toJson() {
     return {
@@ -227,3 +232,14 @@ class ComicDetails with HistoryMixin {
 
   ComicType get comicType => ComicType(sourceKey.hashCode);
 }
+
+class ArchiveInfo {
+  final String title;
+  final String description;
+  final String id;
+
+  ArchiveInfo.fromJson(Map<String, dynamic> json)
+      : title = json["title"],
+        description = json["description"],
+        id = json["id"];
+}

lib/foundation/comic_source/parser.dart

@@ -90,11 +90,10 @@ class ComicSourceParser {
     var className = line1.split("class")[1].split("extends ComicSource").first;
     className = className.trim();
     JsEngine().runCode("""
-      (() => {
-        $js
+      (() => { $js
         this['temp'] = new $className()
       }).call()
-    """);
+    """, className);
     _name = JsEngine().runCode("this['temp'].name") ??
         (throw ComicSourceParseException('name is required'));
     var key = JsEngine().runCode("this['temp'].key") ??
@@ -153,11 +152,12 @@ class ComicSourceParser {
       _getValue("search.enableTagsSuggestions") ?? false,
       _getValue("comic.enableTagsTranslate") ?? false,
       _parseStarRatingFunc(),
+      _parseArchiveDownloader(),
     );
 
     await source.loadData();
 
-    if(_checkExists("init")) {
+    if (_checkExists("init")) {
       Future.delayed(const Duration(milliseconds: 50), () {
         JsEngine().runCode("ComicSource.sources.$_key.init()");
       });
@@ -988,4 +988,35 @@ class ComicSourceParser {
       }
     };
   }
+
+  ArchiveDownloader? _parseArchiveDownloader() {
+    if (!_checkExists("comic.archive")) {
+      return null;
+    }
+    return ArchiveDownloader(
+      (cid) async {
+        try {
+          var res = await JsEngine().runCode("""
+              ComicSource.sources.$_key.comic.archive.getArchives(${jsonEncode(cid)})
+            """);
+          return Res(
+              (res as List).map((e) => ArchiveInfo.fromJson(e)).toList());
+        } catch (e, s) {
+          Log.error("Network", "$e\n$s");
+          return Res.error(e.toString());
+        }
+      },
+      (cid, aid) async {
+        try {
+          var res = await JsEngine().runCode("""
+              ComicSource.sources.$_key.comic.archive.getDownloadUrl(${jsonEncode(cid)}, ${jsonEncode(aid)})
+            """);
+          return Res(res as String);
+        } catch (e, s) {
+          Log.error("Network", "$e\n$s");
+          return Res.error(e.toString());
+        }
+      },
+    );
+  }
 }

lib/foundation/favorites.dart

@@ -4,7 +4,9 @@ import 'package:flutter/foundation.dart';
 import 'package:sqlite3/sqlite3.dart';
 import 'package:venera/foundation/appdata.dart';
 import 'package:venera/foundation/image_provider/local_favorite_image.dart';
+import 'package:venera/foundation/local.dart';
 import 'package:venera/foundation/log.dart';
+import 'package:venera/utils/tags_translation.dart';
 import 'dart:io';
 
 import 'app.dart';
@@ -12,10 +14,7 @@ import 'comic_source/comic_source.dart';
 import 'comic_type.dart';
 
 String _getTimeString(DateTime time) {
-  return time
-      .toIso8601String()
-      .replaceFirst("T", " ")
-      .substring(0, 19);
+  return time.toIso8601String().replaceFirst("T", " ").substring(0, 19);
 }
 
 class FavoriteItem implements Comic {
@@ -29,15 +28,14 @@ class FavoriteItem implements Comic {
   String coverPath;
   late String time;
 
-  FavoriteItem({
-    required this.id,
-    required this.name,
-    required this.coverPath,
-    required this.author,
-    required this.type,
-    required this.tags,
-    DateTime? favoriteTime
-  }) {
+  FavoriteItem(
+      {required this.id,
+      required this.name,
+      required this.coverPath,
+      required this.author,
+      required this.type,
+      required this.tags,
+      DateTime? favoriteTime}) {
     var t = favoriteTime ?? DateTime.now();
     time = _getTimeString(t);
   }
@@ -75,7 +73,9 @@ class FavoriteItem implements Comic {
 
   @override
   String get description {
-    return "$time | ${type == ComicType.local ? 'local' : type.comicSource?.name ?? "Unknown"}";
+    return appdata.settings['comicDisplayMode'] == 'detailed'
+        ? "$time | ${type == ComicType.local ? 'local' : type.comicSource?.name ?? "Unknown"}"
+        : "${type.comicSource?.name ?? "Unknown"} | $time";
   }
 
   @override
@@ -178,6 +178,28 @@ class LocalFavoritesManager with ChangeNotifier {
         source_folder text
       );
     """);
+    for (var folder in _getFolderNamesWithDB()) {
+      var columns = _db.select("""
+        pragma table_info("$folder");
+      """);
+      if (!columns.any((element) => element["name"] == "translated_tags")) {
+        _db.execute("""
+          alter table "$folder"
+          add column translated_tags TEXT;
+        """);
+        var comics = getAllComics(folder);
+        for (var comic in comics) {
+          var translatedTags = _translateTags(comic.tags);
+          _db.execute("""
+            update "$folder"
+            set translated_tags = ?
+            where id == ? and type == ?;
+          """, [translatedTags, comic.id, comic.type.value]);
+        }
+      } else {
+        break;
+      }
+    }
   }
 
   List<String> find(String id, ComicType type) {
@@ -339,6 +361,7 @@ class LocalFavoritesManager with ChangeNotifier {
         cover_path TEXT,
         time TEXT,
         display_order int,
+        translated_tags TEXT,
         primary key (id, type)
       );
     """);
@@ -353,7 +376,8 @@ class LocalFavoritesManager with ChangeNotifier {
     """, [folder, source, networkFolder]);
   }
 
-  bool isLinkedToNetworkFolder(String folder, String source, String networkFolder) {
+  bool isLinkedToNetworkFolder(
+      String folder, String source, String networkFolder) {
     var res = _db.select("""
       select * from folder_sync
       where folder_name == ? and source_key == ? and source_folder == ?;
@@ -391,6 +415,17 @@ class LocalFavoritesManager with ChangeNotifier {
     return FavoriteItem.fromRow(res.first);
   }
 
+  String _translateTags(List<String> tags) {
+    var res = <String>[];
+    for (var tag in tags) {
+      var translated = tag.translateTagsToCN;
+      if (translated != tag) {
+        res.add(translated);
+      }
+    }
+    return res.join(",");
+  }
+
   /// add comic to a folder.
   /// return true if success, false if already exists
   bool addComic(String folder, FavoriteItem comic, [int? order]) {
@@ -405,6 +440,7 @@ class LocalFavoritesManager with ChangeNotifier {
     if (res.isNotEmpty) {
       return false;
     }
+    var translatedTags = _translateTags(comic.tags);
     final params = [
       comic.id,
       comic.name,
@@ -412,28 +448,64 @@ class LocalFavoritesManager with ChangeNotifier {
       comic.type.value,
       comic.tags.join(","),
       comic.coverPath,
-      comic.time
+      comic.time,
+      translatedTags
     ];
     if (order != null) {
       _db.execute("""
-        insert into "$folder" (id, name, author, type, tags, cover_path, time, display_order)
-        values (?, ?, ?, ?, ?, ?, ?, ?);
+        insert into "$folder" (id, name, author, type, tags, cover_path, time, translated_tags, display_order)
+        values (?, ?, ?, ?, ?, ?, ?, ?, ?);
       """, [...params, order]);
     } else if (appdata.settings['newFavoriteAddTo'] == "end") {
       _db.execute("""
-        insert into "$folder" (id, name, author, type, tags, cover_path, time, display_order)
-        values (?, ?, ?, ?, ?, ?, ?, ?);
+        insert into "$folder" (id, name, author, type, tags, cover_path, time, translated_tags, display_order)
+        values (?, ?, ?, ?, ?, ?, ?, ?, ?);
       """, [...params, maxValue(folder) + 1]);
     } else {
       _db.execute("""
-        insert into "$folder" (id, name, author, type, tags, cover_path, time, display_order)
-        values (?, ?, ?, ?, ?, ?, ?, ?);
+        insert into "$folder" (id, name, author, type, tags, cover_path, time, translated_tags, display_order)
+        values (?, ?, ?, ?, ?, ?, ?, ?, ?);
       """, [...params, minValue(folder) - 1]);
     }
     notifyListeners();
     return true;
   }
 
+  void moveFavorite(
+      String sourceFolder, String targetFolder, String id, ComicType type) {
+    _modifiedAfterLastCache = true;
+
+    if (!existsFolder(sourceFolder)) {
+      throw Exception("Source folder does not exist");
+    }
+    if (!existsFolder(targetFolder)) {
+      throw Exception("Target folder does not exist");
+    }
+
+    var res = _db.select("""
+    select * from "$targetFolder"
+    where id == ? and type == ?;
+  """, [id, type.value]);
+
+    if (res.isNotEmpty) {
+      return;
+    }
+
+    _db.execute("""
+      insert into "$targetFolder" (id, name, author, type, tags, cover_path, time, display_order)
+      select id, name, author, type, tags, cover_path, time, ?
+      from "$sourceFolder"
+      where id == ? and type == ?;
+    """, [minValue(targetFolder) - 1, id, type.value]);
+
+    _db.execute("""
+    delete from "$sourceFolder"
+    where id == ? and type == ?;
+  """, [id, type.value]);
+
+    notifyListeners();
+  }
+
   /// delete a folder
   void deleteFolder(String name) {
     _modifiedAfterLastCache = true;
@@ -462,6 +534,23 @@ class LocalFavoritesManager with ChangeNotifier {
     notifyListeners();
   }
 
+  Future<int> removeInvalid() async {
+    int count = 0;
+    await Future.microtask(() {
+      var all = allComics();
+      for (var c in all) {
+        var comicSource = c.type.comicSource;
+        if ((c.type == ComicType.local &&
+                LocalManager().find(c.id, c.type) == null) ||
+            (c.type != ComicType.local && comicSource == null)) {
+          deleteComicWithId(c.folder, c.id, c.type);
+          count++;
+        }
+      }
+    });
+    return count;
+  }
+
   Future<void> clearAll() async {
     _db.dispose();
     File("${App.dataPath}/local_favorite.db").deleteSync();
@@ -542,6 +631,33 @@ class LocalFavoritesManager with ChangeNotifier {
     notifyListeners();
   }
 
+  List<FavoriteItem> searchInFolder(String folder, String keyword) {
+    var keywordList = keyword.split(" ");
+    keyword = keywordList.first;
+    keyword = "%$keyword%";
+    var res = _db.select("""
+      SELECT * FROM "$folder" 
+      WHERE name LIKE ? OR author LIKE ? OR tags LIKE ? OR translated_tags LIKE ?;
+    """, [keyword, keyword, keyword, keyword]);
+    var comics = res.map((e) => FavoriteItem.fromRow(e)).toList();
+    bool test(FavoriteItem comic, String keyword) {
+      if (comic.name.contains(keyword)) {
+        return true;
+      } else if (comic.author.contains(keyword)) {
+        return true;
+      } else if (comic.tags.any((element) => element.contains(keyword))) {
+        return true;
+      }
+      return false;
+    }
+
+    for (var i = 1; i < keywordList.length; i++) {
+      comics =
+          comics.where((element) => test(element, keywordList[i])).toList();
+    }
+    return comics;
+  }
+
   List<FavoriteItemWithFolderInfo> search(String keyword) {
     var keywordList = keyword.split(" ");
     keyword = keywordList.first;
@@ -550,8 +666,8 @@ class LocalFavoritesManager with ChangeNotifier {
       keyword = "%$keyword%";
       var res = _db.select("""
         SELECT * FROM "$table" 
-        WHERE name LIKE ? OR author LIKE ? OR tags LIKE ?;
-      """, [keyword, keyword, keyword]);
+        WHERE name LIKE ? OR author LIKE ? OR tags LIKE ? OR translated_tags LIKE ?;
+      """, [keyword, keyword, keyword, keyword]);
       for (var comic in res) {
         comics.add(
             FavoriteItemWithFolderInfo(FavoriteItem.fromRow(comic), table));

lib/foundation/history.dart

@@ -2,7 +2,9 @@ import 'dart:async';
 
 import 'package:flutter/widgets.dart' show ChangeNotifier;
 import 'package:sqlite3/sqlite3.dart';
+import 'package:venera/foundation/comic_source/comic_source.dart';
 import 'package:venera/foundation/comic_type.dart';
+import 'package:venera/utils/translations.dart';
 
 import 'app.dart';
 
@@ -22,21 +24,25 @@ abstract mixin class HistoryMixin {
   HistoryType get historyType;
 }
 
-class History {
+class History implements Comic {
   HistoryType type;
 
   DateTime time;
 
+  @override
   String title;
 
+  @override
   String subtitle;
 
+  @override
   String cover;
   
   int ep;
 
   int page;
 
+  @override
   String id;
 
   /// readEpisode is a set of episode numbers that have been read.
@@ -44,6 +50,7 @@ class History {
   /// The number of episodes is 1-based.
   Set<int> readEpisode;
 
+  @override
   int? maxPage;
 
   History.fromModel(
@@ -137,6 +144,47 @@ class History {
 
   @override
   int get hashCode => Object.hash(id, type);
+
+  @override
+  String get description {
+    var res = "";
+    if (ep >= 1) {
+      res += "Chapter @ep".tlParams({
+        "ep": ep,
+      });
+    }
+    if (page >= 1) {
+      if (ep >= 1) {
+        res += " - ";
+      }
+      res += "Page @page".tlParams({
+        "page": page,
+      });
+    }
+    return res;
+  }
+
+  @override
+  String? get favoriteId => null;
+
+  @override
+  String? get language => null;
+
+  @override
+  String get sourceKey => type == ComicType.local
+      ? 'local'
+      : type.comicSource?.key ?? "Unknown:${type.value}";
+
+  @override
+  double? get stars => null;
+
+  @override
+  List<String>? get tags => null;
+
+  @override
+  Map<String, dynamic> toJson() {
+    throw UnimplementedError();
+  }
 }
 
 class HistoryManager with ChangeNotifier {

lib/foundation/image_provider/base_image_provider.dart

@@ -1,6 +1,6 @@
 import 'dart:async' show Future, StreamController, scheduleMicrotask;
-import 'dart:collection';
 import 'dart:convert';
+import 'dart:math';
 import 'dart:ui' as ui show Codec;
 import 'dart:ui';
 import 'package:flutter/foundation.dart';
@@ -11,6 +11,39 @@ abstract class BaseImageProvider<T extends BaseImageProvider<T>>
     extends ImageProvider<T> {
   const BaseImageProvider();
 
+  static double? _effectiveScreenWidth;
+
+  static const double _normalComicImageRatio = 0.72;
+
+  static const double _minComicImageWidth = 1920 * _normalComicImageRatio;
+
+  static TargetImageSize _getTargetSize(width, height) {
+    if (_effectiveScreenWidth == null) {
+      final screens = PlatformDispatcher.instance.displays;
+      for (var screen in screens) {
+        if (screen.size.width > screen.size.height) {
+          _effectiveScreenWidth = max(
+            _effectiveScreenWidth ?? 0,
+            screen.size.height * _normalComicImageRatio,
+          );
+        } else {
+          _effectiveScreenWidth = max(
+            _effectiveScreenWidth ?? 0,
+            screen.size.width
+          );
+        }
+      }
+      if (_effectiveScreenWidth! < _minComicImageWidth) {
+        _effectiveScreenWidth = _minComicImageWidth;
+      }
+    }
+    if (width > _effectiveScreenWidth!) {
+      height = (height * _effectiveScreenWidth! / width).round();
+      width = _effectiveScreenWidth!.round();
+    }
+    return TargetImageSize(width: width, height: height);
+  }
+
   @override
   ImageStreamCompleter loadImage(T key, ImageDecoderCallback decode) {
     final chunkEvents = StreamController<ImageChunkEvent>();
@@ -46,19 +79,12 @@ abstract class BaseImageProvider<T extends BaseImageProvider<T>>
 
       while (data == null && !stop) {
         try {
-          if(_cache.containsKey(key.key)){
-            data = _cache[key.key];
-          } else {
-            data = await load(chunkEvents);
-            _checkCacheSize();
-            _cache[key.key] = data;
-            _cacheSize += data.length;
-          }
+          data = await load(chunkEvents);
         } catch (e) {
-          if(e.toString().contains("Invalid Status Code: 404")) {
+          if (e.toString().contains("Invalid Status Code: 404")) {
             rethrow;
           }
-          if(e.toString().contains("Invalid Status Code: 403")) {
+          if (e.toString().contains("Invalid Status Code: 403")) {
             rethrow;
           }
           if (e.toString().contains("handshake")) {
@@ -74,23 +100,24 @@ abstract class BaseImageProvider<T extends BaseImageProvider<T>>
         }
       }
 
-      if(stop) {
+      if (stop) {
         throw Exception("Image loading is stopped");
       }
 
-      if(data!.isEmpty) {
+      if (data!.isEmpty) {
         throw Exception("Empty image data");
       }
 
       try {
         final buffer = await ImmutableBuffer.fromUint8List(data);
-        return await decode(buffer);
+        return await decode(buffer, getTargetSize: _getTargetSize);
       } catch (e) {
         await CacheManager().delete(this.key);
         if (data.length < 2 * 1024) {
           // data is too short, it's likely that the data is text, not image
           try {
-            var text = const Utf8Codec(allowMalformed: false).decoder.convert(data);
+            var text =
+                const Utf8Codec(allowMalformed: false).decoder.convert(data);
             throw Exception("Expected image data, but got text: $text");
           } catch (e) {
             // ignore
@@ -108,30 +135,6 @@ abstract class BaseImageProvider<T extends BaseImageProvider<T>>
     }
   }
 
-  static final _cache = LinkedHashMap<String, Uint8List>();
-
-  static var _cacheSize = 0;
-
-  static var _cacheSizeLimit = 50 * 1024 * 1024;
-
-  static void _checkCacheSize(){
-    while (_cacheSize > _cacheSizeLimit){
-      var firstKey = _cache.keys.first;
-      _cacheSize -= _cache[firstKey]!.length;
-      _cache.remove(firstKey);
-    }
-  }
-
-  static void clearCache(){
-    _cache.clear();
-    _cacheSize = 0;
-  }
-
-  static void setCacheSizeLimit(int size){
-    _cacheSizeLimit = size;
-    _checkCacheSize();
-  }
-
   Future<Uint8List> load(StreamController<ImageChunkEvent> chunkEvents);
 
   String get key;

lib/foundation/image_provider/cached_image.dart

@@ -2,12 +2,15 @@ import 'dart:async' show Future, StreamController;
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:venera/network/images.dart';
+import 'package:venera/utils/io.dart';
 import 'base_image_provider.dart';
 import 'cached_image.dart' as image_provider;
 
 class CachedImageProvider
     extends BaseImageProvider<image_provider.CachedImageProvider> {
   /// Image provider for normal image.
+  ///
+  /// [url] is the url of the image. Local file path is also supported.
   const CachedImageProvider(this.url, {this.headers, this.sourceKey, this.cid});
 
   final String url;
@@ -18,18 +21,35 @@ class CachedImageProvider
 
   final String? cid;
 
+  static int loadingCount = 0;
+
+  static const _kMaxLoadingCount = 8;
+
   @override
   Future<Uint8List> load(StreamController<ImageChunkEvent> chunkEvents) async {
-    await for (var progress in ImageDownloader.loadThumbnail(url, sourceKey, cid)) {
-      chunkEvents.add(ImageChunkEvent(
-        cumulativeBytesLoaded: progress.currentBytes,
-        expectedTotalBytes: progress.totalBytes,
-      ));
-      if(progress.imageBytes != null) {
-        return progress.imageBytes!;
-      }
+    while(loadingCount > _kMaxLoadingCount) {
+      await Future.delayed(const Duration(milliseconds: 100));
+    }
+    loadingCount++;
+    try {
+      if(url.startsWith("file://")) {
+        var file = File(url.substring(7));
+        return file.readAsBytes();
+      }
+      await for (var progress in ImageDownloader.loadThumbnail(url, sourceKey, cid)) {
+        chunkEvents.add(ImageChunkEvent(
+          cumulativeBytesLoaded: progress.currentBytes,
+          expectedTotalBytes: progress.totalBytes,
+        ));
+        if(progress.imageBytes != null) {
+          return progress.imageBytes!;
+        }
+      }
+      throw "Error: Empty response body.";
+    }
+    finally {
+      loadingCount--;
     }
-    throw "Error: Empty response body.";
   }
 
   @override

lib/foundation/image_provider/history_image_provider.dart

@@ -0,0 +1,57 @@
+import 'dart:async' show Future, StreamController;
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:venera/foundation/local.dart';
+import 'package:venera/network/images.dart';
+import '../history.dart';
+import 'base_image_provider.dart';
+import 'history_image_provider.dart' as image_provider;
+
+class HistoryImageProvider
+    extends BaseImageProvider<image_provider.HistoryImageProvider> {
+  /// Image provider for normal image.
+  ///
+  /// [url] is the url of the image. Local file path is also supported.
+  const HistoryImageProvider(this.history);
+
+  final History history;
+
+  @override
+  Future<Uint8List> load(StreamController<ImageChunkEvent> chunkEvents) async {
+    var url = history.cover;
+    if (!url.contains('/')) {
+      var localComic = LocalManager().find(history.id, history.type);
+      if (localComic != null) {
+        return localComic.coverFile.readAsBytes();
+      }
+      var comicSource =
+          history.type.comicSource ?? (throw "Comic source not found.");
+      var comic = await comicSource.loadComicInfo!(history.id);
+      url = comic.data.cover;
+      history.cover = url;
+      HistoryManager().addHistory(history);
+    }
+    await for (var progress in ImageDownloader.loadThumbnail(
+      url,
+      history.type.sourceKey,
+      history.id,
+    )) {
+      chunkEvents.add(ImageChunkEvent(
+        cumulativeBytesLoaded: progress.currentBytes,
+        expectedTotalBytes: progress.totalBytes,
+      ));
+      if (progress.imageBytes != null) {
+        return progress.imageBytes!;
+      }
+    }
+    throw "Error: Empty response body.";
+  }
+
+  @override
+  Future<HistoryImageProvider> obtainKey(ImageConfiguration configuration) {
+    return SynchronousFuture(this);
+  }
+
+  @override
+  String get key => "history${history.id}${history.type.value}";
+}

lib/foundation/image_provider/local_comic_image.dart

@@ -0,0 +1,66 @@
+import 'dart:async' show Future, StreamController;
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:venera/foundation/local.dart';
+import 'package:venera/utils/io.dart';
+import 'base_image_provider.dart';
+import 'local_comic_image.dart' as image_provider;
+
+class LocalComicImageProvider
+    extends BaseImageProvider<image_provider.LocalComicImageProvider> {
+  /// Image provider for normal image.
+  ///
+  /// [url] is the url of the image. Local file path is also supported.
+  const LocalComicImageProvider(this.comic);
+
+  final LocalComic comic;
+
+  @override
+  Future<Uint8List> load(StreamController<ImageChunkEvent> chunkEvents) async {
+    File? file = comic.coverFile;
+    if(! await file.exists()) {
+      file = null;
+      var dir = Directory(comic.directory);
+      if (! await dir.exists()) {
+        throw "Error: Comic not found.";
+      }
+      Directory? firstDir;
+      await for (var entity in dir.list()) {
+        if(entity is File) {
+          if(["jpg", "jpeg", "png", "webp", "gif", "jpe", "jpeg"].contains(entity.extension)) {
+            file = entity;
+            break;
+          }
+        } else if(entity is Directory) {
+          firstDir ??= entity;
+        }
+      }
+      if(file == null && firstDir != null) {
+        await for (var entity in firstDir.list()) {
+          if(entity is File) {
+            if(["jpg", "jpeg", "png", "webp", "gif", "jpe", "jpeg"].contains(entity.extension)) {
+              file = entity;
+              break;
+            }
+          }
+        }
+      }
+    }
+    if(file == null) {
+      throw "Error: Cover not found.";
+    }
+    var data = await file.readAsBytes();
+    if(data.isEmpty) {
+      throw "Exception: Empty file(${file.path}).";
+    }
+    return data;
+  }
+
+  @override
+  Future<LocalComicImageProvider> obtainKey(ImageConfiguration configuration) {
+    return SynchronousFuture(this);
+  }
+
+  @override
+  String get key => "local${comic.id}${comic.comicType.value}";
+}

lib/foundation/image_provider/reader_image.dart

@@ -2,6 +2,7 @@ import 'dart:async' show Future, StreamController;
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:venera/network/images.dart';
+import 'package:venera/utils/io.dart';
 import 'base_image_provider.dart';
 import 'reader_image.dart' as image_provider;
 
@@ -20,6 +21,14 @@ class ReaderImageProvider
 
   @override
   Future<Uint8List> load(StreamController<ImageChunkEvent> chunkEvents) async {
+    if (imageKey.startsWith('file://')) {
+      var file = File(imageKey);
+      if (await file.exists()) {
+        return file.readAsBytes();
+      }
+      throw "Error: File not found.";
+    }
+
     await for (var event
         in ImageDownloader.loadComicImage(imageKey, sourceKey, cid, eid)) {
       chunkEvents.add(ImageChunkEvent(

lib/foundation/js_engine.dart

@@ -2,6 +2,7 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:math' as math;
 import 'package:crypto/crypto.dart';
+import 'package:dio/io.dart';
 import 'package:flutter/services.dart';
 import 'package:html/parser.dart' as html;
 import 'package:html/dom.dart' as dom;
@@ -184,7 +185,23 @@ class JsEngine with _JSEngineApi {
       if (headers["user-agent"] == null && headers["User-Agent"] == null) {
         headers["User-Agent"] = webUA;
       }
-      response = await _dio!.request(req["url"],
+      var dio = _dio;
+      if (headers['http_client'] == "dart:io") {
+        dio = Dio(BaseOptions(
+          responseType: ResponseType.plain,
+          validateStatus: (status) => true,
+        ));
+        var proxy = await AppDio.getProxy();
+        dio.httpClientAdapter = IOHttpClientAdapter(
+          createHttpClient: () {
+            return HttpClient()
+              ..findProxy = (uri) => proxy == null ? "DIRECT" : "PROXY $proxy";
+          },
+        );
+        dio.interceptors.add(CookieManagerSql(SingleInstanceCookieJar.instance!));
+        dio.interceptors.add(LogInterceptor());
+      }
+      response = await dio!.request(req["url"],
           data: req["data"],
           options: Options(
               method: req['http_method'],

lib/foundation/local.dart

@@ -72,11 +72,12 @@ class LocalComic with HistoryMixin implements Comic {
         createdAt = DateTime.fromMillisecondsSinceEpoch(row[9] as int);
 
   File get coverFile => File(FilePath.join(
-        LocalManager().path,
-        directory,
+        baseDir,
         cover,
       ));
 
+  String get baseDir => (directory.contains('/') || directory.contains('\\')) ? directory : FilePath.join(LocalManager().path, directory);
+
   @override
   String get description => "";
 
@@ -150,6 +151,8 @@ class LocalManager with ChangeNotifier {
   /// path to the directory where all the comics are stored
   late String path;
 
+  Directory get directory => Directory(path);
+
   // return error message if failed
   Future<String?> setNewPath(String newPath) async {
     var newDir = Directory(newPath);
@@ -161,7 +164,7 @@ class LocalManager with ChangeNotifier {
     }
     try {
       await copyDirectoryIsolate(
-        Directory(path),
+        directory,
         newDir,
       );
       await File(FilePath.join(App.dataPath, 'local_path')).writeAsString(newPath);
@@ -169,11 +172,32 @@ class LocalManager with ChangeNotifier {
       Log.error("IO", e, s);
       return e.toString();
     }
-    await Directory(path).deleteIgnoreError(recursive:true);
+    await directory.deleteContents(recursive: true);
     path = newPath;
     return null;
   }
 
+  Future<String> findDefaultPath() async {
+    if (App.isAndroid) {
+      var external = await getExternalStorageDirectories();
+      if (external != null && external.isNotEmpty) {
+        return FilePath.join(external.first.path, 'local');
+      } else {
+        return FilePath.join(App.dataPath, 'local');
+      }
+    } else if (App.isIOS) {
+      var oldPath = FilePath.join(App.dataPath, 'local');
+      if (Directory(oldPath).existsSync() && Directory(oldPath).listSync().isNotEmpty) {
+        return oldPath;
+      } else {
+        var directory = await getApplicationDocumentsDirectory();
+        return FilePath.join(directory.path, 'local');
+      }
+    } else {
+      return FilePath.join(App.dataPath, 'local');
+    }
+  }
+
   Future<void> init() async {
     _db = sqlite3.open(
       '${App.dataPath}/local.db',
@@ -195,20 +219,19 @@ class LocalManager with ChangeNotifier {
     ''');
     if (File(FilePath.join(App.dataPath, 'local_path')).existsSync()) {
       path = File(FilePath.join(App.dataPath, 'local_path')).readAsStringSync();
+      if (!directory.existsSync()) {
+        path = await findDefaultPath();
+      }
     } else {
-      if (App.isAndroid) {
-        var external = await getExternalStorageDirectories();
-        if (external != null && external.isNotEmpty) {
-          path = FilePath.join(external.first.path, 'local');
-        } else {
-          path = FilePath.join(App.dataPath, 'local');
-        }
-      } else {
-        path = FilePath.join(App.dataPath, 'local');
+      path = await findDefaultPath();
+    }
+    try {
+      if (!directory.existsSync()) {
+        await directory.create();
       }
     }
-    if (!Directory(path).existsSync()) {
-      await Directory(path).create();
+    catch(e, s) {
+      Log.error("IO", "Failed to create local folder: $e", s);
     }
     restoreDownloadingTasks();
   }
@@ -333,7 +356,7 @@ class LocalManager with ChangeNotifier {
       throw "Invalid ep";
     }
     var comic = find(id, type) ?? (throw "Comic Not Found");
-    var directory = Directory(FilePath.join(path, comic.directory));
+    var directory = Directory(comic.baseDir);
     if (comic.chapters != null) {
       var cid = ep is int
           ? comic.chapters!.keys.elementAt(ep - 1)
@@ -343,8 +366,9 @@ class LocalManager with ChangeNotifier {
     var files = <File>[];
     await for (var entity in directory.list()) {
       if (entity is File) {
-        if (entity.absolute.path.replaceFirst(path, '').substring(1) ==
-            comic.cover) {
+        // Do not exclude comic.cover, since it may be the first page of the chapter.
+        // A file with name starting with 'cover.' is not a comic page.
+        if (entity.name.startsWith('cover.')) {
           continue;
         }
         //Hidden file in some file system
@@ -365,7 +389,7 @@ class LocalManager with ChangeNotifier {
     return files.map((e) => "file://${e.path}").toList();
   }
 
-  Future<bool> isDownloaded(String id, ComicType type, [int? ep]) async {
+  bool isDownloaded(String id, ComicType type, [int? ep]) {
     var comic = find(id, type);
     if (comic == null) return false;
     if (comic.chapters == null || ep == null) return true;
@@ -453,7 +477,6 @@ class LocalManager with ChangeNotifier {
     if(HistoryManager().findSync(c.id, c.comicType) != null) {
       HistoryManager().remove(c.id, c.comicType);
     }
-    assert(c.comicType == ComicType.local);
     var folders = LocalFavoritesManager().find(c.id, c.comicType);
     for (var f in folders) {
       LocalFavoritesManager().deleteComicWithId(f, c.id, c.comicType);

lib/foundation/log.dart

@@ -32,11 +32,11 @@ class Log {
   static const String? logFile = null;
 
   static void printWarning(String text) {
-    print('\x1B[33m$text\x1B[0m');
+    debugPrint('\x1B[33m$text\x1B[0m');
   }
 
   static void printError(String text) {
-    print('\x1B[31m$text\x1B[0m');
+    debugPrint('\x1B[31m$text\x1B[0m');
   }
 
   static void addLog(LogLevel level, String title, String content) {
@@ -44,15 +44,15 @@ class Log {
       content = "${content.substring(0, maxLogLength)}...";
     }
 
-    if (kDebugMode) {
-      switch (level) {
-        case LogLevel.error:
-          printError(content);
-        case LogLevel.warning:
-          printWarning(content);
-        case LogLevel.info:
-          print(content);
-      }
+    switch (level) {
+      case LogLevel.error:
+        printError(content);
+      case LogLevel.warning:
+        printWarning(content);
+      case LogLevel.info:
+        if(kDebugMode) {
+          debugPrint(content);
+        }
     }
 
     var newLog = LogItem(level, title, content);

lib/foundation/state_controller.dart

@@ -1,14 +1,18 @@
 import 'package:flutter/material.dart';
 
 class SimpleController extends StateController {
-  final void Function()? refresh_;
+  final void Function()? refreshFunction;
 
-  SimpleController({this.refresh_});
+  final Map<String, dynamic> Function()? control;
+
+  SimpleController({this.refreshFunction, this.control});
 
   @override
   void refresh() {
-    (refresh_ ?? super.refresh)();
+    (refreshFunction ?? super.refresh)();
   }
+
+  Map<String, dynamic> get controlMap => control?.call() ?? {};
 }
 
 abstract class StateController {
@@ -71,8 +75,8 @@ abstract class StateController {
 
   static SimpleController putSimpleController(
       void Function() onUpdate, Object? tag,
-      {void Function()? refresh}) {
-    var controller = SimpleController(refresh_: refresh);
+      {void Function()? refresh, Map<String, dynamic> Function()? control}) {
+    var controller = SimpleController(refreshFunction: refresh, control: control);
     controller.stateUpdaters.add(Pair(null, onUpdate));
     _controllers.add(StateControllerWrapped(controller, false, tag));
     return controller;
@@ -202,6 +206,7 @@ abstract class StateWithController<T extends StatefulWidget> extends State<T> {
       },
       tag,
       refresh: refresh,
+      control: () => control,
     );
     super.initState();
   }
@@ -218,6 +223,8 @@ abstract class StateWithController<T extends StatefulWidget> extends State<T> {
   }
 
   Object? get tag;
+
+  Map<String, dynamic> get control => {};
 }
 
 class Pair<M, V>{

lib/foundation/widget_utils.dart

@@ -111,4 +111,10 @@ extension StyledText on TextStyle {
   TextStyle get s40 => copyWith(fontSize: 40);
 
   TextStyle withColor(Color? color) => copyWith(color: color);
+}
+
+extension ColorExt on Color {
+  Color toOpacity(double opacity) {
+    return withValues(alpha: opacity);
+  }
 }

lib/init.dart

@@ -1,3 +1,4 @@
+import 'package:flutter_saf/flutter_saf.dart';
 import 'package:venera/foundation/app.dart';
 import 'package:venera/foundation/cache_manager.dart';
 import 'package:venera/foundation/comic_source/comic_source.dart';
@@ -12,15 +13,16 @@ import 'package:venera/utils/translations.dart';
 import 'foundation/appdata.dart';
 
 Future<void> init() async {
+  await SAFTaskWorker().init();
   await AppTranslation.init();
   await appdata.init();
   await App.init();
   await HistoryManager().init();
+  await TagsTranslation.readData();
   await LocalFavoritesManager().init();
   SingleInstanceCookieJar("${App.dataPath}/cookie.db");
   await JsEngine().init();
   await ComicSource.init();
   await LocalManager().init();
-  await TagsTranslation.readData();
   CacheManager().setLimitSize(appdata.settings['cacheSize']);
 }

lib/main.dart

@@ -1,15 +1,15 @@
 import 'dart:async';
 import 'package:desktop_webview_window/desktop_webview_window.dart';
+import 'package:dynamic_color/dynamic_color.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:rhttp/rhttp.dart';
 import 'package:venera/foundation/log.dart';
 import 'package:venera/pages/auth_page.dart';
-import 'package:venera/pages/comic_source_page.dart';
 import 'package:venera/pages/main_page.dart';
-import 'package:venera/pages/settings/settings_page.dart';
 import 'package:venera/utils/app_links.dart';
+import 'package:venera/utils/io.dart';
 import 'package:window_manager/window_manager.dart';
 import 'components/components.dart';
 import 'components/window_frame.dart';
@@ -21,40 +21,42 @@ void main(List<String> args) {
   if (runWebViewTitleBarWidget(args)) {
     return;
   }
-  runZonedGuarded(() async {
-    await Rhttp.init();
-    WidgetsFlutterBinding.ensureInitialized();
-    await init();
-    if (App.isAndroid) {
-      handleLinks();
-    }
-    FlutterError.onError = (details) {
-      Log.error(
-          "Unhandled Exception", "${details.exception}\n${details.stack}");
-    };
-    runApp(const MyApp());
-    if (App.isDesktop) {
-      await windowManager.ensureInitialized();
-      windowManager.waitUntilReadyToShow().then((_) async {
-        await windowManager.setTitleBarStyle(
-          TitleBarStyle.hidden,
-          windowButtonVisibility: App.isMacOS,
-        );
-        if (App.isLinux) {
-          await windowManager.setBackgroundColor(Colors.transparent);
-        }
-        await windowManager.setMinimumSize(const Size(500, 600));
-        if (!App.isLinux) {
-          // https://github.com/leanflutter/window_manager/issues/460
-          var placement = await WindowPlacement.loadFromFile();
-          await placement.applyToWindow();
-          await windowManager.show();
-          WindowPlacement.loop();
-        }
-      });
-    }
-  }, (error, stack) {
-    Log.error("Unhandled Exception", "$error\n$stack");
+  overrideIO(() {
+    runZonedGuarded(() async {
+      await Rhttp.init();
+      WidgetsFlutterBinding.ensureInitialized();
+      await init();
+      if (App.isAndroid) {
+        handleLinks();
+      }
+      FlutterError.onError = (details) {
+        Log.error(
+            "Unhandled Exception", "${details.exception}\n${details.stack}");
+      };
+      runApp(const MyApp());
+      if (App.isDesktop) {
+        await windowManager.ensureInitialized();
+        windowManager.waitUntilReadyToShow().then((_) async {
+          await windowManager.setTitleBarStyle(
+            TitleBarStyle.hidden,
+            windowButtonVisibility: App.isMacOS,
+          );
+          if (App.isLinux) {
+            await windowManager.setBackgroundColor(Colors.transparent);
+          }
+          await windowManager.setMinimumSize(const Size(500, 600));
+          if (!App.isLinux) {
+            // https://github.com/leanflutter/window_manager/issues/460
+            var placement = await WindowPlacement.loadFromFile();
+            await placement.applyToWindow();
+            await windowManager.show();
+            WindowPlacement.loop();
+          }
+        });
+      }
+    }, (error, stack) {
+      Log.error("Unhandled Exception", "$error\n$stack");
+    });
   });
 }
 
@@ -68,7 +70,6 @@ class MyApp extends StatefulWidget {
 class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
   @override
   void initState() {
-    checkUpdates();
     App.registerForceRebuild(forceRebuild);
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
     WidgetsBinding.instance.addObserver(this);
@@ -81,7 +82,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
 
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) {
-    if(!App.isMobile) {
+    if (!App.isMobile || !appdata.settings['authorizationRequired']) {
       return;
     }
     if (state == AppLifecycleState.inactive && hideContentOverlay == null) {
@@ -103,8 +104,8 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
       hideContentOverlay = null;
     }
     if (state == AppLifecycleState.hidden &&
-        appdata.settings['authorizationRequired'] &&
-        !isAuthPageActive) {
+        !isAuthPageActive &&
+        !IO.isSelectingFiles) {
       isAuthPageActive = true;
       App.rootContext.to(
         () => AuthPage(
@@ -128,6 +129,20 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
     setState(() {});
   }
 
+  Color translateColorSetting() {
+    return switch (appdata.settings['color']) {
+      'red' => Colors.red,
+      'pink' => Colors.pink,
+      'purple' => Colors.purple,
+      'green' => Colors.green,
+      'orange' => Colors.orange,
+      'blue' => Colors.blue,
+      'yellow' => Colors.yellow,
+      'cyan' => Colors.cyan,
+      _ => Colors.blue,
+    };
+  }
+
   @override
   Widget build(BuildContext context) {
     Widget home;
@@ -140,106 +155,93 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
     } else {
       home = const MainPage();
     }
-    return MaterialApp(
-      home: home,
-      debugShowCheckedModeBanner: false,
-      theme: ThemeData(
-        colorScheme: ColorScheme.fromSeed(
-          seedColor: App.mainColor,
-          surface: Colors.white,
-          primary: App.mainColor.shade600,
-          // ignore: deprecated_member_use
-          background: Colors.white,
-        ),
-        fontFamily: App.isWindows ? "Microsoft YaHei" : null,
-      ),
-      navigatorKey: App.rootNavigatorKey,
-      darkTheme: ThemeData(
-        colorScheme: ColorScheme.fromSeed(
-          seedColor: App.mainColor,
+    return DynamicColorBuilder(builder: (light, dark) {
+      if (appdata.settings['color'] != 'system' || light == null || dark == null) {
+        var color = translateColorSetting();
+        light = ColorScheme.fromSeed(
+          seedColor: color,
+        );
+        dark = ColorScheme.fromSeed(
+          seedColor: color,
           brightness: Brightness.dark,
-          surface: Colors.black,
-          primary: App.mainColor.shade400,
-          // ignore: deprecated_member_use
-          background: Colors.black,
+        );
+      }
+      return MaterialApp(
+        home: home,
+        debugShowCheckedModeBanner: false,
+        theme: ThemeData(
+          colorScheme: light.copyWith(
+            surface: Colors.white,
+          ),
+          fontFamily: App.isWindows ? "Microsoft YaHei" : null,
         ),
-        fontFamily: App.isWindows ? "Microsoft YaHei" : null,
-      ),
-      themeMode: switch (appdata.settings['theme_mode']) {
-        'light' => ThemeMode.light,
-        'dark' => ThemeMode.dark,
-        _ => ThemeMode.system
-      },
-      localizationsDelegates: const [
-        GlobalMaterialLocalizations.delegate,
-        GlobalWidgetsLocalizations.delegate,
-        GlobalCupertinoLocalizations.delegate,
-      ],
-      locale: () {
-        var lang = appdata.settings['language'];
-        if (lang == 'system') {
-          return null;
-        }
-        return switch (lang) {
-          'zh-CN' => const Locale('zh', 'CN'),
-          'zh-TW' => const Locale('zh', 'TW'),
-          'en-US' => const Locale('en'),
-          _ => null
-        };
-      }(),
-      supportedLocales: const [
-        Locale('en'),
-        Locale('zh', 'CN'),
-        Locale('zh', 'TW'),
-      ],
-      builder: (context, widget) {
-        ErrorWidget.builder = (details) {
-          Log.error(
-              "Unhandled Exception", "${details.exception}\n${details.stack}");
-          return Material(
-            child: Center(
-              child: Text(details.exception.toString()),
-            ),
-          );
-        };
-        if (widget != null) {
-          widget = OverlayWidget(widget);
-          if (App.isDesktop) {
-            widget = Shortcuts(
-              shortcuts: {
-                LogicalKeySet(LogicalKeyboardKey.escape): VoidCallbackIntent(
-                  App.pop,
-                ),
-              },
-              child: MouseBackDetector(
-                onTapDown: App.pop,
-                child: WindowFrame(widget),
+        navigatorKey: App.rootNavigatorKey,
+        darkTheme: ThemeData(
+          colorScheme: dark.copyWith(
+            surface: Colors.black,
+          ),
+          fontFamily: App.isWindows ? "Microsoft YaHei" : null,
+        ),
+        themeMode: switch (appdata.settings['theme_mode']) {
+          'light' => ThemeMode.light,
+          'dark' => ThemeMode.dark,
+          _ => ThemeMode.system
+        },
+        localizationsDelegates: const [
+          GlobalMaterialLocalizations.delegate,
+          GlobalWidgetsLocalizations.delegate,
+          GlobalCupertinoLocalizations.delegate,
+        ],
+        locale: () {
+          var lang = appdata.settings['language'];
+          if (lang == 'system') {
+            return null;
+          }
+          return switch (lang) {
+            'zh-CN' => const Locale('zh', 'CN'),
+            'zh-TW' => const Locale('zh', 'TW'),
+            'en-US' => const Locale('en'),
+            _ => null
+          };
+        }(),
+        supportedLocales: const [
+          Locale('en'),
+          Locale('zh', 'CN'),
+          Locale('zh', 'TW'),
+        ],
+        builder: (context, widget) {
+          ErrorWidget.builder = (details) {
+            Log.error(
+                "Unhandled Exception", "${details.exception}\n${details.stack}");
+            return Material(
+              child: Center(
+                child: Text(details.exception.toString()),
               ),
             );
+          };
+          if (widget != null) {
+            widget = OverlayWidget(widget);
+            if (App.isDesktop) {
+              widget = Shortcuts(
+                shortcuts: {
+                  LogicalKeySet(LogicalKeyboardKey.escape): VoidCallbackIntent(
+                    App.pop,
+                  ),
+                },
+                child: MouseBackDetector(
+                  onTapDown: App.pop,
+                  child: WindowFrame(widget),
+                ),
+              );
+            }
+            return _SystemUiProvider(Material(
+              child: widget,
+            ));
           }
-          return _SystemUiProvider(Material(
-            child: widget,
-          ));
-        }
-        throw ('widget is null');
-      },
-    );
-  }
-
-  void checkUpdates() async {
-    if (!appdata.settings['checkUpdateOnStart']) {
-      return;
-    }
-    var lastCheck = appdata.implicitData['lastCheckUpdate'] ?? 0;
-    var now = DateTime.now().millisecondsSinceEpoch;
-    if (now - lastCheck < 24 * 60 * 60 * 1000) {
-      return;
-    }
-    appdata.implicitData['lastCheckUpdate'] = now;
-    appdata.writeImplicitData();
-    await Future.delayed(const Duration(milliseconds: 300));
-    await checkUpdateUi(false);
-    await ComicSourcePage.checkComicSourceUpdate(true);
+          throw ('widget is null');
+        },
+      );
+    });
   }
 }
 

lib/network/app_dio.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:convert';
-import 'dart:io';
 
 import 'package:dio/dio.dart';
 import 'package:flutter/services.dart';
@@ -97,6 +96,9 @@ class MyLogInterceptor implements Interceptor {
 
   @override
   void onRequest(RequestOptions options, RequestInterceptorHandler handler) {
+    Log.info("Network", "${options.method} ${options.uri}\n"
+        "headers:\n${options.headers}\n"
+        "data:\n${options.data}");
     options.connectTimeout = const Duration(seconds: 15);
     options.receiveTimeout = const Duration(seconds: 15);
     options.sendTimeout = const Duration(seconds: 15);
@@ -278,13 +280,8 @@ class RHttpAdapter implements HttpClientAdapter {
       headers[key] ??= [];
       headers[key]!.add(entry.$2);
     }
-    var data = res.body;
-    if (headers['content-encoding']?.contains('gzip') ?? false) {
-      // rhttp does not support gzip decoding
-      data = gzip.decoder.bind(data).map((data) => Uint8List.fromList(data));
-    }
     return ResponseBody(
-      data,
+      res.body,
       res.statusCode,
       statusMessage: null,
       isRedirect: false,

lib/network/download.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:isolate';
 
 import 'package:flutter/widgets.dart' show ChangeNotifier;
 import 'package:venera/foundation/appdata.dart';
@@ -11,13 +12,14 @@ import 'package:venera/network/images.dart';
 import 'package:venera/utils/ext.dart';
 import 'package:venera/utils/file_type.dart';
 import 'package:venera/utils/io.dart';
+import 'package:zip_flutter/zip_flutter.dart';
+
+import 'file_downloader.dart';
 
 abstract class DownloadTask with ChangeNotifier {
   /// 0-1
   double get progress;
 
-  bool get isComplete;
-
   bool get isError;
 
   bool get isPaused;
@@ -106,10 +108,7 @@ class ImagesDownloadTask extends DownloadTask with _TransferSpeedMixin {
   }
 
   @override
-  String? get cover => _cover;
-
-  @override
-  bool get isComplete => _totalCount == _downloadedCount;
+  String? get cover => _cover ?? comic?.cover;
 
   @override
   String get message => _message;
@@ -159,7 +158,8 @@ class ImagesDownloadTask extends DownloadTask with _TransferSpeedMixin {
 
   var tasks = <int, _ImageDownloadWrapper>{};
 
-  int get _maxConcurrentTasks => (appdata.settings["downloadThreads"] as num).toInt();
+  int get _maxConcurrentTasks =>
+      (appdata.settings["downloadThreads"] as num).toInt();
 
   void _scheduleTasks() {
     var images = _images![_images!.keys.elementAt(_chapter)]!;
@@ -235,25 +235,26 @@ class ImagesDownloadTask extends DownloadTask with _TransferSpeedMixin {
     }
 
     if (path == null) {
-      var dir = await LocalManager().findValidDirectory(
-        comicId,
-        comicType,
-        comic!.title,
-      );
-      if (!(await dir.exists())) {
-        try {
+      try {
+        var dir = await LocalManager().findValidDirectory(
+          comicId,
+          comicType,
+          comic!.title,
+        );
+        if (!(await dir.exists())) {
           await dir.create();
-        } catch (e) {
-          _setError("Error: $e");
-          return;
         }
+        path = dir.path;
+      } catch (e, s) {
+        Log.error("Download", e.toString(), s);
+        _setError("Error: $e");
+        return;
       }
-      path = dir.path;
     }
 
     await LocalManager().saveCurrentDownloadingTasks();
 
-    if (cover == null) {
+    if (_cover == null) {
       var res = await runWithRetry(() async {
         Uint8List? data;
         await for (var progress
@@ -266,11 +267,13 @@ class ImagesDownloadTask extends DownloadTask with _TransferSpeedMixin {
           throw "Failed to download cover";
         }
         var fileType = detectFileType(data);
-        var file = File(FilePath.join(path!, "cover${fileType.ext}"));
+        var file =
+            File(FilePath.join(path!, "cover${fileType.ext}"));
         file.writeAsBytesSync(data);
-        return file.path;
+        return "file://${file.path}";
       });
       if (res.error) {
+        Log.error("Download", res.errorMessage!);
         _setError("Error: ${res.errorMessage}");
         return;
       } else {
@@ -294,6 +297,7 @@ class ImagesDownloadTask extends DownloadTask with _TransferSpeedMixin {
           return;
         }
         if (res.error) {
+          Log.error("Download", res.errorMessage!);
           _setError("Error: ${res.errorMessage}");
           return;
         } else {
@@ -323,6 +327,7 @@ class ImagesDownloadTask extends DownloadTask with _TransferSpeedMixin {
             return;
           }
           if (res.error) {
+            Log.error("Download", res.errorMessage!);
             _setError("Error: ${res.errorMessage}");
             return;
           } else {
@@ -347,6 +352,7 @@ class ImagesDownloadTask extends DownloadTask with _TransferSpeedMixin {
           return;
         }
         if (task.error != null) {
+          Log.error("Download", task.error.toString());
           _setError("Error: ${task.error}");
           return;
         }
@@ -375,14 +381,13 @@ class ImagesDownloadTask extends DownloadTask with _TransferSpeedMixin {
     _message = message;
     notifyListeners();
     stopRecorder();
-    Log.error("Download", message);
   }
 
   @override
   int get speed => currentSpeed;
 
   @override
-  String get title => comic?.title ?? comicTitle ??  "Loading...";
+  String get title => comic?.title ?? comicTitle ?? "Loading...";
 
   @override
   Map<String, dynamic> toJson() {
@@ -448,7 +453,8 @@ class ImagesDownloadTask extends DownloadTask with _TransferSpeedMixin {
       }).toList(),
       directory: Directory(path!).name,
       chapters: comic!.chapters,
-      cover: File(_cover!).uri.pathSegments.last,
+      cover:
+          File(_cover!.split("file://").last).name,
       comicType: ComicType(source.key.hashCode),
       downloadedChapters: chapters ?? [],
       createdAt: DateTime.now(),
@@ -577,7 +583,7 @@ abstract mixin class _TransferSpeedMixin {
 
   void onData(int length) {
     if (timer == null) return;
-    if(length < 0) {
+    if (length < 0) {
       return;
     }
     _bytesSinceLastSecond += length;
@@ -603,3 +609,216 @@ abstract mixin class _TransferSpeedMixin {
     _bytesSinceLastSecond = 0;
   }
 }
+
+class ArchiveDownloadTask extends DownloadTask {
+  final String archiveUrl;
+
+  final ComicDetails comic;
+
+  late ComicSource source;
+
+  /// Download comic by archive url
+  ///
+  /// Currently only support zip file and comics without chapters
+  ArchiveDownloadTask(this.archiveUrl, this.comic) {
+    source = ComicSource.find(comic.sourceKey)!;
+  }
+
+  FileDownloader? _downloader;
+
+  String _message = "Fetching comic info...";
+
+  bool _isRunning = false;
+
+  bool _isError = false;
+
+  void _setError(String message) {
+    _isRunning = false;
+    _isError = true;
+    _message = message;
+    notifyListeners();
+    Log.error("Download", message);
+  }
+
+  @override
+  void cancel() async {
+    _isRunning = false;
+    await _downloader?.stop();
+    if (path != null) {
+      Directory(path!).deleteIgnoreError(recursive: true);
+    }
+    path = null;
+    LocalManager().removeTask(this);
+  }
+
+  @override
+  ComicType get comicType => ComicType(source.key.hashCode);
+
+  @override
+  String? get cover => comic.cover;
+
+  @override
+  String get id => comic.id;
+
+  @override
+  bool get isError => _isError;
+
+  @override
+  bool get isPaused => !_isRunning;
+
+  @override
+  String get message => _message;
+
+  int _currentBytes = 0;
+
+  int _expectedBytes = 0;
+
+  int _speed = 0;
+
+  @override
+  void pause() {
+    _isRunning = false;
+    _message = "Paused";
+    _downloader?.stop();
+    notifyListeners();
+  }
+
+  @override
+  double get progress =>
+      _expectedBytes == 0 ? 0 : _currentBytes / _expectedBytes;
+
+  @override
+  void resume() async {
+    if (_isRunning) {
+      return;
+    }
+    _isError = false;
+    _isRunning = true;
+    notifyListeners();
+    _message = "Downloading...";
+
+    if (path == null) {
+      var dir = await LocalManager().findValidDirectory(
+        comic.id,
+        comicType,
+        comic.title,
+      );
+      if (!(await dir.exists())) {
+        try {
+          await dir.create();
+        } catch (e) {
+          _setError("Error: $e");
+          return;
+        }
+      }
+      path = dir.path;
+    }
+
+    var resultFile = File(FilePath.join(path!, "archive.zip"));
+
+    Log.info("Download", "Downloading $archiveUrl");
+
+    _downloader = FileDownloader(archiveUrl, resultFile.path);
+
+    bool isDownloaded = false;
+
+    try {
+      await for (var status in _downloader!.start()) {
+        _currentBytes = status.downloadedBytes;
+        _expectedBytes = status.totalBytes;
+        _message =
+            "${bytesToReadableString(_currentBytes)}/${bytesToReadableString(_expectedBytes)}";
+        _speed = status.bytesPerSecond;
+        isDownloaded = status.isFinished;
+        notifyListeners();
+      }
+    } catch (e) {
+      _setError("Error: $e");
+      return;
+    }
+
+    if (!_isRunning) {
+      return;
+    }
+
+    if (!isDownloaded) {
+      _setError("Error: Download failed");
+      return;
+    }
+
+    try {
+      await extractArchive(path!);
+    } catch (e) {
+      _setError("Failed to extract archive: $e");
+      return;
+    }
+
+    await resultFile.deleteIgnoreError();
+
+    LocalManager().completeTask(this);
+  }
+
+  static Future<void> extractArchive(String path) async {
+    var resultFile = FilePath.join(path, "archive.zip");
+    await Isolate.run(() {
+      ZipFile.openAndExtract(resultFile, path);
+    });
+  }
+
+  @override
+  int get speed => _speed;
+
+  @override
+  String get title => comic.title;
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      "type": "ArchiveDownloadTask",
+      "archiveUrl": archiveUrl,
+      "comic": comic.toJson(),
+      "path": path,
+    };
+  }
+
+  static ArchiveDownloadTask? fromJson(Map<String, dynamic> json) {
+    if (json["type"] != "ArchiveDownloadTask") {
+      return null;
+    }
+    return ArchiveDownloadTask(
+      json["archiveUrl"],
+      ComicDetails.fromJson(json["comic"]),
+    )..path = json["path"];
+  }
+
+  String _findCover() {
+    var files = Directory(path!).listSync();
+    for (var f in files) {
+      if (f.name.startsWith('cover')) {
+        return f.name;
+      }
+    }
+    files.sort((a, b) {
+      return a.name.compareTo(b.name);
+    });
+    return files.first.name;
+  }
+
+  @override
+  LocalComic toLocalComic() {
+    return LocalComic(
+      id: comic.id,
+      title: title,
+      subtitle: comic.subTitle ?? '',
+      tags: comic.tags.entries.expand((e) {
+        return e.value.map((v) => "${e.key}:$v");
+      }).toList(),
+      directory: Directory(path!).name,
+      chapters: null,
+      cover: _findCover(),
+      comicType: ComicType(source.key.hashCode),
+      downloadedChapters: [],
+      createdAt: DateTime.now(),
+    );
+  }
+}

lib/network/file_downloader.dart

@@ -0,0 +1,298 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:dio/io.dart';
+import 'package:venera/network/app_dio.dart';
+import 'package:venera/utils/ext.dart';
+
+class FileDownloader {
+  final String url;
+  final String savePath;
+  final int maxConcurrent;
+
+  FileDownloader(this.url, this.savePath, {this.maxConcurrent = 4});
+
+  int _currentBytes = 0;
+
+  int _lastBytes = 0;
+
+  late int _fileSize;
+
+  final _dio = Dio();
+
+  RandomAccessFile? _file;
+
+  bool _isWriting = false;
+
+  int _kChunkSize = 16 * 1024 * 1024;
+
+  bool _canceled = false;
+
+  late List<_DownloadBlock> _blocks;
+
+  Future<void> _writeStatus() async {
+    var file = File("$savePath.download");
+    await file.writeAsString(_blocks.map((e) => e.toString()).join("\n"));
+  }
+
+  Future<void> _readStatus() async {
+    var file = File("$savePath.download");
+    if (!await file.exists()) {
+      return;
+    }
+
+    var lines = await file.readAsLines();
+    _blocks = lines.map((e) => _DownloadBlock.fromString(e)).toList();
+  }
+
+  /// create file and write empty bytes
+  Future<void> _prepareFile() async {
+    var file = File(savePath);
+    if (await file.exists()) {
+      if (file.lengthSync() == _fileSize &&
+          File("$savePath.download").existsSync()) {
+        _file = await file.open(mode: FileMode.append);
+        return;
+      } else {
+        await file.delete();
+      }
+    }
+
+    await file.create(recursive: true);
+    _file = await file.open(mode: FileMode.append);
+    await _file!.truncate(_fileSize);
+  }
+
+  Future<void> _createTasks() async {
+    var res = await _dio.head(url);
+    var length = res.headers["content-length"]?.first;
+    _fileSize = length == null ? 0 : int.parse(length);
+
+    await _prepareFile();
+
+    if (File("$savePath.download").existsSync()) {
+      await _readStatus();
+      _currentBytes = _blocks.fold<int>(0,
+          (previousValue, element) => previousValue + element.downloadedBytes);
+    } else {
+      if (_fileSize > 1024 * 1024 * 1024) {
+        _kChunkSize = 64 * 1024 * 1024;
+      } else if (_fileSize > 512 * 1024 * 1024) {
+        _kChunkSize = 32 * 1024 * 1024;
+      }
+
+      _blocks = [];
+      for (var i = 0; i < _fileSize; i += _kChunkSize) {
+        var end = i + _kChunkSize;
+        if (end > _fileSize) {
+          _blocks.add(_DownloadBlock(i, _fileSize, 0, false));
+        } else {
+          _blocks.add(_DownloadBlock(i, i + _kChunkSize, 0, false));
+        }
+      }
+    }
+  }
+
+  Stream<DownloadingStatus> start() {
+    var stream = StreamController<DownloadingStatus>();
+    _download(stream);
+    return stream.stream;
+  }
+
+  void _reportStatus(StreamController<DownloadingStatus> stream) {
+    stream.add(DownloadingStatus(_currentBytes, _fileSize, 0));
+  }
+
+  void _download(StreamController<DownloadingStatus> resultStream) async {
+    try {
+      var proxy = await AppDio.getProxy();
+      _dio.httpClientAdapter = IOHttpClientAdapter(
+        createHttpClient: () {
+          return HttpClient()
+            ..findProxy = (uri) => proxy == null ? "DIRECT" : "PROXY $proxy";
+        },
+      );
+
+      // get file size
+      await _createTasks();
+
+      if (_canceled) return;
+
+      // check if file is downloaded
+      if (_currentBytes >= _fileSize) {
+        await _file!.close();
+        _file = null;
+        _reportStatus(resultStream);
+        resultStream.close();
+        return;
+      }
+
+      _reportStatus(resultStream);
+
+      Timer.periodic(const Duration(seconds: 1), (timer) {
+        if (_canceled || _currentBytes >= _fileSize) {
+          timer.cancel();
+          return;
+        }
+        resultStream.add(DownloadingStatus(
+            _currentBytes, _fileSize, _currentBytes - _lastBytes));
+        _lastBytes = _currentBytes;
+      });
+
+      // start downloading
+      await _scheduleDownload();
+      if (_canceled) {
+        resultStream.close();
+        return;
+      }
+      await _file!.close();
+      _file = null;
+      await File("$savePath.download").delete();
+
+      // check if download is finished
+      if (_currentBytes < _fileSize) {
+        resultStream
+            .addError(Exception("Download failed: Expected $_fileSize bytes, "
+                "but only $_currentBytes bytes downloaded."));
+        resultStream.close();
+      }
+
+      resultStream.add(DownloadingStatus(_currentBytes, _fileSize, 0, true));
+      resultStream.close();
+    } catch (e, s) {
+      await _file?.close();
+      _file = null;
+      resultStream.addError(e, s);
+      resultStream.close();
+    }
+  }
+
+  Future<void> _scheduleDownload() async {
+    var tasks = <Future>[];
+    while (true) {
+      if (_canceled) return;
+      if (tasks.length >= maxConcurrent) {
+        await Future.any(tasks);
+      }
+      final block = _blocks.firstWhereOrNull((element) =>
+          !element.downloading &&
+          element.end - element.start > element.downloadedBytes);
+      if (block == null) {
+        break;
+      }
+      block.downloading = true;
+      var task = _fetchBlock(block);
+      task.then((value) => tasks.remove(task), onError: (e) {
+        if(_canceled) return;
+        throw e;
+      });
+      tasks.add(task);
+    }
+    await Future.wait(tasks);
+  }
+
+  Future<void> _fetchBlock(_DownloadBlock block) async {
+    final start = block.start;
+    final end = block.end;
+
+    if (start > _fileSize) {
+      return;
+    }
+
+    var options = Options(
+      responseType: ResponseType.stream,
+      headers: {
+        "Range": "bytes=${start + block.downloadedBytes}-${end - 1}",
+        "Accept": "*/*",
+        "Accept-Encoding": "deflate, gzip",
+      },
+      preserveHeaderCase: true,
+    );
+    var res = await _dio.get<ResponseBody>(url, options: options);
+    if (_canceled) return;
+    if (res.data == null) {
+      throw Exception("Failed to block $start-$end");
+    }
+
+    var buffer = <int>[];
+    await for (var data in res.data!.stream) {
+      if (_canceled) return;
+      buffer.addAll(data);
+      if (buffer.length > 16 * 1024) {
+        if (_isWriting) continue;
+        _currentBytes += buffer.length;
+        _isWriting = true;
+        await _file!.setPosition(start + block.downloadedBytes);
+        await _file!.writeFrom(buffer);
+        block.downloadedBytes += buffer.length;
+        buffer.clear();
+        await _writeStatus();
+        _isWriting = false;
+      }
+    }
+
+    if (buffer.isNotEmpty) {
+      while (_isWriting) {
+        await Future.delayed(const Duration(milliseconds: 10));
+      }
+      _isWriting = true;
+      _currentBytes += buffer.length;
+      await _file!.setPosition(start + block.downloadedBytes);
+      await _file!.writeFrom(buffer);
+      block.downloadedBytes += buffer.length;
+      await _writeStatus();
+      _isWriting = false;
+    }
+
+    block.downloading = false;
+  }
+
+  Future<void> stop() async {
+    _canceled = true;
+    await _file?.close();
+    _file = null;
+  }
+}
+
+class DownloadingStatus {
+  /// The current downloaded bytes
+  final int downloadedBytes;
+
+  /// The total bytes of the file
+  final int totalBytes;
+
+  /// Whether the download is finished
+  final bool isFinished;
+
+  /// The download speed in bytes per second
+  final int bytesPerSecond;
+
+  const DownloadingStatus(
+      this.downloadedBytes, this.totalBytes, this.bytesPerSecond,
+      [this.isFinished = false]);
+
+  @override
+  String toString() {
+    return "Downloaded: $downloadedBytes/$totalBytes ${isFinished ? "Finished" : ""}";
+  }
+}
+
+class _DownloadBlock {
+  final int start;
+  final int end;
+  int downloadedBytes;
+  bool downloading;
+
+  _DownloadBlock(this.start, this.end, this.downloadedBytes, this.downloading);
+
+  @override
+  String toString() {
+    return "$start-$end-$downloadedBytes";
+  }
+
+  _DownloadBlock.fromString(String str)
+      : start = int.parse(str.split("-")[0]),
+        end = int.parse(str.split("-")[1]),
+        downloadedBytes = int.parse(str.split("-")[2]),
+        downloading = false;
+}

lib/pages/aggregated_search_page.dart

@@ -0,0 +1,230 @@
+import "package:flutter/material.dart";
+import "package:shimmer/shimmer.dart";
+import "package:venera/components/components.dart";
+import "package:venera/foundation/app.dart";
+import "package:venera/foundation/comic_source/comic_source.dart";
+import "package:venera/foundation/image_provider/cached_image.dart";
+import "package:venera/pages/search_result_page.dart";
+import "package:venera/utils/translations.dart";
+
+import "comic_page.dart";
+
+class AggregatedSearchPage extends StatefulWidget {
+  const AggregatedSearchPage({super.key, required this.keyword});
+
+  final String keyword;
+
+  @override
+  State<AggregatedSearchPage> createState() => _AggregatedSearchPageState();
+}
+
+class _AggregatedSearchPageState extends State<AggregatedSearchPage> {
+  late final List<ComicSource> sources;
+
+  late final SearchBarController controller;
+
+  var _keyword = "";
+
+  @override
+  void initState() {
+    sources = ComicSource.all().where((e) => e.searchPageData != null).toList();
+    _keyword = widget.keyword;
+    controller = SearchBarController(
+      currentText: widget.keyword,
+      onSearch: (text) {
+        setState(() {
+          _keyword = text;
+        });
+      },
+    );
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return SmoothCustomScrollView(slivers: [
+      SliverSearchBar(controller: controller),
+      SliverList(
+        key: ValueKey(_keyword),
+        delegate: SliverChildBuilderDelegate(
+          (context, index) {
+            final source = sources[index];
+            return _SliverSearchResult(source: source, keyword: _keyword);
+          },
+          childCount: sources.length,
+        ),
+      ),
+    ]);
+  }
+}
+
+class _SliverSearchResult extends StatefulWidget {
+  const _SliverSearchResult({required this.source, required this.keyword});
+
+  final ComicSource source;
+
+  final String keyword;
+
+  @override
+  State<_SliverSearchResult> createState() => _SliverSearchResultState();
+}
+
+class _SliverSearchResultState extends State<_SliverSearchResult>
+    with AutomaticKeepAliveClientMixin {
+  bool isLoading = true;
+
+  static const _kComicHeight = 144.0;
+
+  get _comicWidth => _kComicHeight * 0.72;
+
+  static const _kLeftPadding = 16.0;
+
+  List<Comic>? comics;
+
+  void load() async {
+    final data = widget.source.searchPageData!;
+    var options =
+        (data.searchOptions ?? []).map((e) => e.defaultValue).toList();
+    if (data.loadPage != null) {
+      var res = await data.loadPage!(widget.keyword, 1, options);
+      if (!res.error) {
+        setState(() {
+          comics = res.data;
+          isLoading = false;
+        });
+      }
+    } else if (data.loadNext != null) {
+      var res = await data.loadNext!(widget.keyword, null, options);
+      if (!res.error) {
+        setState(() {
+          comics = res.data;
+          isLoading = false;
+        });
+      }
+    }
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    load();
+  }
+
+  Widget buildPlaceHolder() {
+    return Container(
+      height: _kComicHeight,
+      width: _comicWidth,
+      margin: const EdgeInsets.only(left: _kLeftPadding),
+      decoration: BoxDecoration(
+        color: context.colorScheme.surfaceContainerLow,
+        borderRadius: BorderRadius.circular(8),
+      ),
+    );
+  }
+
+  Widget buildComic(Comic c) {
+    return AnimatedTapRegion(
+      borderRadius: 8,
+      onTap: () {
+        context.to(() => ComicPage(
+          id: c.id,
+          sourceKey: c.sourceKey,
+        ));
+      },
+      child: Container(
+        height: _kComicHeight,
+        width: _comicWidth,
+        decoration: BoxDecoration(
+          color: context.colorScheme.surfaceContainerLow,
+        ),
+        child: AnimatedImage(
+          width: _comicWidth,
+          height: _kComicHeight,
+          fit: BoxFit.cover,
+          image: CachedImageProvider(c.cover),
+        ),
+      ),
+    ).paddingLeft(_kLeftPadding);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    super.build(context);
+    return InkWell(
+      onTap: () {
+        context.to(
+          () => SearchResultPage(
+            text: widget.keyword,
+            sourceKey: widget.source.key,
+          ),
+        );
+      },
+      child: Column(
+        children: [
+          ListTile(
+            mouseCursor: SystemMouseCursors.click,
+            title: Text(widget.source.name),
+          ),
+          if (isLoading)
+            SizedBox(
+              height: _kComicHeight,
+              width: double.infinity,
+              child: Shimmer.fromColors(
+                baseColor: context.colorScheme.surfaceContainerLow,
+                highlightColor: context.colorScheme.surfaceContainer,
+                direction: ShimmerDirection.ltr,
+                child: LayoutBuilder(builder: (context, constrains) {
+                  var itemWidth = _comicWidth + _kLeftPadding;
+                  var items = (constrains.maxWidth / itemWidth).ceil();
+                  return Stack(
+                    children: [
+                      Positioned(
+                        left: 0,
+                        top: 0,
+                        bottom: 0,
+                        child: Row(
+                          children: List.generate(
+                            items,
+                            (index) => buildPlaceHolder(),
+                          ),
+                        ),
+                      )
+                    ],
+                  );
+                }),
+              ),
+            )
+          else if (comics == null || comics!.isEmpty)
+            SizedBox(
+              height: _kComicHeight,
+              child: Column(
+                children: [
+                  Row(
+                    children: [
+                      const Icon(Icons.error_outline),
+                      const SizedBox(width: 8),
+                      Text("No search results found".tl),
+                    ],
+                  ),
+                  const Spacer(),
+                ],
+              ).paddingHorizontal(16),
+            )
+          else
+            SizedBox(
+              height: _kComicHeight,
+              child: ListView(
+                scrollDirection: Axis.horizontal,
+                children: [
+                  for (var c in comics!) buildComic(c),
+                ],
+              ),
+            ),
+        ],
+      ).paddingBottom(16),
+    );
+  }
+
+  @override
+  bool get wantKeepAlive => true;
+}

lib/pages/auth_page.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';
 import 'package:local_auth/local_auth.dart';
 import 'package:venera/utils/translations.dart';
@@ -14,6 +15,16 @@ class AuthPage extends StatefulWidget {
 
 class _AuthPageState extends State<AuthPage> {
 
+  @override
+  void initState() {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if(SchedulerBinding.instance.lifecycleState != AppLifecycleState.paused) {
+        auth();
+      }
+    });
+    super.initState();
+  }
+
   @override
   Widget build(BuildContext context) {
     return PopScope(

lib/pages/categories_page.dart

@@ -53,6 +53,7 @@ class CategoriesPage extends StatelessWidget {
             child: Column(
               children: [
                 FilledTabBar(
+                  key: PageStorageKey(categories.toString()),
                   tabs: categories.map((e) {
                     String title = e;
                     try {
@@ -261,7 +262,7 @@ class _CategoryPage extends StatelessWidget {
         builder: (context) {
           return Material(
             borderRadius: const BorderRadius.all(Radius.circular(8)),
-            color: context.colorScheme.primaryContainer.withOpacity(0.72),
+            color: context.colorScheme.primaryContainer.toOpacity(0.72),
             child: InkWell(
               borderRadius: const BorderRadius.all(Radius.circular(8)),
               onTap: () => onClick(tag, param),

lib/pages/comic_page.dart

@@ -115,6 +115,7 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
         buildDescription(),
         buildInfo(),
         buildChapters(),
+        buildComments(),
         buildThumbnails(),
         buildRecommend(),
         SliverPadding(padding: EdgeInsets.only(bottom: context.padding.bottom)),
@@ -222,7 +223,8 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
             children: [
               SelectableText(comic.title, style: ts.s18),
               if (comic.subTitle != null)
-                SelectableText(comic.subTitle!, style: ts.s14),
+                SelectableText(comic.subTitle!, style: ts.s14)
+                    .paddingVertical(4),
               Text(
                 (ComicSource.find(comic.sourceKey)?.name) ?? '',
                 style: ts.s12,
@@ -549,6 +551,16 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
       SliverGridComics(comics: comic.recommend!),
     ]);
   }
+
+  Widget buildComments() {
+    if (comic.comments == null || comic.comments!.isEmpty) {
+      return const SliverPadding(padding: EdgeInsets.zero);
+    }
+    return _CommentsPart(
+      comments: comic.comments!,
+      showMore: showComments,
+    );
+  }
 }
 
 abstract mixin class _ComicPageActions {
@@ -671,6 +683,122 @@ abstract mixin class _ComicPageActions {
       App.rootContext.showMessage(message: "The comic is downloaded".tl);
       return;
     }
+
+    if (comicSource.archiveDownloader != null) {
+      bool useNormalDownload = false;
+      List<ArchiveInfo>? archives;
+      int selected = -1;
+      bool isLoading = false;
+      bool isGettingLink = false;
+      await showDialog(
+        context: App.rootContext,
+        builder: (context) {
+          return StatefulBuilder(
+            builder: (context, setState) {
+              return ContentDialog(
+                title: "Download".tl,
+                content: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    RadioListTile<int>(
+                      value: -1,
+                      groupValue: selected,
+                      title: Text("Normal".tl),
+                      onChanged: (v) {
+                        setState(() {
+                          selected = v!;
+                        });
+                      },
+                    ),
+                    ExpansionTile(
+                      title: Text("Archive".tl),
+                      shape: const RoundedRectangleBorder(
+                        borderRadius: BorderRadius.zero,
+                      ),
+                      collapsedShape: const RoundedRectangleBorder(
+                        borderRadius: BorderRadius.zero,
+                      ),
+                      onExpansionChanged: (b) {
+                        if (!isLoading && b && archives == null) {
+                          isLoading = true;
+                          comicSource.archiveDownloader!
+                              .getArchives(comic.id)
+                              .then((value) {
+                            if (value.success) {
+                              archives = value.data;
+                            } else {
+                              App.rootContext
+                                  .showMessage(message: value.errorMessage!);
+                            }
+                            setState(() {
+                              isLoading = false;
+                            });
+                          });
+                        }
+                      },
+                      children: [
+                        if (archives == null)
+                          const ListLoadingIndicator().toCenter()
+                        else
+                          for (int i = 0; i < archives!.length; i++)
+                            RadioListTile<int>(
+                              value: i,
+                              groupValue: selected,
+                              onChanged: (v) {
+                                setState(() {
+                                  selected = v!;
+                                });
+                              },
+                              title: Text(archives![i].title),
+                              subtitle: Text(archives![i].description),
+                            )
+                      ],
+                    )
+                  ],
+                ),
+                actions: [
+                  Button.filled(
+                    isLoading: isGettingLink,
+                    onPressed: () async {
+                      if (selected == -1) {
+                        useNormalDownload = true;
+                        context.pop();
+                        return;
+                      }
+                      setState(() {
+                        isGettingLink = true;
+                      });
+                      var res =
+                          await comicSource.archiveDownloader!.getDownloadUrl(
+                        comic.id,
+                        archives![selected].id,
+                      );
+                      if (res.error) {
+                        App.rootContext.showMessage(message: res.errorMessage!);
+                        setState(() {
+                          isGettingLink = false;
+                        });
+                      } else if (context.mounted) {
+                        LocalManager()
+                            .addTask(ArchiveDownloadTask(res.data, comic));
+                        App.rootContext
+                            .showMessage(message: "Download started".tl);
+                        context.pop();
+                      }
+                    },
+                    child: Text("Confirm".tl),
+                  ),
+                ],
+              );
+            },
+          );
+        },
+      );
+      if (!useNormalDownload) {
+        return;
+      }
+    }
+
     if (comic.chapters == null) {
       LocalManager().addTask(ImagesDownloadTask(
         source: comicSource,
@@ -988,14 +1116,12 @@ class _ComicChaptersState extends State<_ComicChapters> {
                 (state.history?.readEpisode ?? const {}).contains(i + 1);
             return Padding(
               padding: const EdgeInsets.fromLTRB(8, 4, 8, 4),
-              child: InkWell(
-                borderRadius: const BorderRadius.all(Radius.circular(16)),
-                child: Material(
-                  elevation: 5,
-                  color: context.colorScheme.surface,
-                  surfaceTintColor: context.colorScheme.surfaceTint,
+              child: Material(
+                color: context.colorScheme.surfaceContainer,
+                borderRadius: const BorderRadius.all(Radius.circular(12)),
+                child: InkWell(
+                  onTap: () => state.read(i + 1),
                   borderRadius: const BorderRadius.all(Radius.circular(12)),
-                  shadowColor: Colors.transparent,
                   child: Padding(
                     padding:
                         const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
@@ -1006,19 +1132,18 @@ class _ComicChaptersState extends State<_ComicChapters> {
                         textAlign: TextAlign.center,
                         overflow: TextOverflow.ellipsis,
                         style: TextStyle(
-                            color:
-                                visited ? context.colorScheme.outline : null),
+                          color: visited ? context.colorScheme.outline : null,
+                        ),
                       ),
                     ),
                   ),
                 ),
-                onTap: () => state.read(i + 1),
               ),
             );
           }),
           gridDelegate: const SliverGridDelegateWithFixedHeight(
               maxCrossAxisExtent: 200, itemHeight: 48),
-        ),
+        ).sliverPadding(const EdgeInsets.symmetric(horizontal: 8)),
         if (eps.length > 20 && !showAll)
           SliverToBoxAdapter(
             child: Align(
@@ -1201,9 +1326,7 @@ class _ComicThumbnailsState extends State<_ComicThumbnails> {
             ),
           )
         else if (isLoading)
-          const SliverToBoxAdapter(
-            child: ListLoadingIndicator(),
-          ),
+          const SliverListLoadingIndicator(),
         const SliverToBoxAdapter(
           child: Divider(),
         ),
@@ -1670,3 +1793,152 @@ class _SelectDownloadChapterState extends State<_SelectDownloadChapter> {
     );
   }
 }
+
+class _CommentsPart extends StatefulWidget {
+  const _CommentsPart({
+    required this.comments,
+    required this.showMore,
+  });
+
+  final List<Comment> comments;
+
+  final void Function() showMore;
+
+  @override
+  State<_CommentsPart> createState() => _CommentsPartState();
+}
+
+class _CommentsPartState extends State<_CommentsPart> {
+  final scrollController = ScrollController();
+
+  late List<Comment> comments;
+
+  @override
+  void initState() {
+    comments = widget.comments;
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return MultiSliver(
+      children: [
+        SliverToBoxAdapter(
+          child: ListTile(
+            title: Text("Comments".tl),
+            trailing: Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                IconButton(
+                  icon: const Icon(Icons.chevron_left),
+                  onPressed: () {
+                    scrollController.animateTo(
+                      scrollController.position.pixels - 340,
+                      duration: const Duration(milliseconds: 200),
+                      curve: Curves.ease,
+                    );
+                  },
+                ),
+                IconButton(
+                  icon: const Icon(Icons.chevron_right),
+                  onPressed: () {
+                    scrollController.animateTo(
+                      scrollController.position.pixels + 340,
+                      duration: const Duration(milliseconds: 200),
+                      curve: Curves.ease,
+                    );
+                  },
+                ),
+              ],
+            ),
+          ),
+        ),
+        SliverToBoxAdapter(
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              SizedBox(
+                height: 184,
+                child: MediaQuery.removePadding(
+                  removeTop: true,
+                  context: context,
+                  child: ListView.builder(
+                    controller: scrollController,
+                    scrollDirection: Axis.horizontal,
+                    itemCount: comments.length,
+                    itemBuilder: (context, index) {
+                      return _CommentWidget(comment: comments[index]);
+                    },
+                  ),
+                ),
+              ),
+              const SizedBox(height: 8),
+              _ActionButton(
+                icon: const Icon(Icons.comment),
+                text: "View more".tl,
+                onPressed: widget.showMore,
+                iconColor: context.useTextColor(Colors.green),
+              ).fixHeight(48).paddingRight(8).toAlign(Alignment.centerRight),
+              const SizedBox(height: 8),
+            ],
+          ),
+        ),
+        const SliverToBoxAdapter(
+          child: Divider(),
+        ),
+      ],
+    );
+  }
+}
+
+class _CommentWidget extends StatelessWidget {
+  const _CommentWidget({required this.comment});
+
+  final Comment comment;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      height: double.infinity,
+      margin: const EdgeInsets.fromLTRB(16, 8, 0, 8),
+      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+      width: 324,
+      decoration: BoxDecoration(
+        color: context.colorScheme.surfaceContainerLow,
+        borderRadius: BorderRadius.circular(12),
+      ),
+      child: Column(
+        children: [
+          Row(
+            children: [
+              if (comment.avatar != null)
+                Container(
+                  width: 36,
+                  height: 36,
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(18),
+                    color: context.colorScheme.surfaceContainer,
+                  ),
+                  clipBehavior: Clip.antiAlias,
+                  child: Image(
+                    image: CachedImageProvider(comment.avatar!),
+                    width: 36,
+                    height: 36,
+                    fit: BoxFit.cover,
+                  ),
+                ).paddingRight(8),
+              Text(comment.userName, style: ts.bold),
+            ],
+          ),
+          const SizedBox(height: 4),
+          Expanded(
+            child: RichCommentContent(text: comment.content).fixWidth(324),
+          ),
+          const SizedBox(height: 4),
+          if (comment.time != null)
+            Text(comment.time!, style: ts.s12).toAlign(Alignment.centerLeft),
+        ],
+      ),
+    );
+  }
+}

lib/pages/comic_source_page.dart

@@ -231,7 +231,10 @@ class _BodyState extends State<_Body> {
     showConfirmDialog(
       context: App.rootContext,
       title: "Delete".tl,
-      content: "Are you sure you want to delete it?".tl,
+      content: "Delete comic source '@n' ?".tlParams({
+        "n": source.name,
+      }),
+      btnColor: context.colorScheme.error,
       onConfirm: () {
         var file = File(source.filePath);
         file.delete();

lib/pages/comments_page.dart

@@ -510,7 +510,7 @@ class _CommentContent extends StatelessWidget {
     if (!text.contains('<') && !text.contains('http')) {
       return SelectableText(text);
     } else {
-      return _RichCommentContent(text: text);
+      return RichCommentContent(text: text);
     }
   }
 }
@@ -595,7 +595,7 @@ class _Tag {
   static void handleLink(String link) async {
     if (link.isURL) {
       if (await handleAppLink(Uri.parse(link))) {
-        App.rootContext.pop();
+        Navigator.of(App.rootContext).maybePop();
       } else {
         launchUrlString(link);
       }
@@ -610,16 +610,16 @@ class _CommentImage {
   const _CommentImage(this.url, this.link);
 }
 
-class _RichCommentContent extends StatefulWidget {
-  const _RichCommentContent({required this.text});
+class RichCommentContent extends StatefulWidget {
+  const RichCommentContent({super.key, required this.text});
 
   final String text;
 
   @override
-  State<_RichCommentContent> createState() => _RichCommentContentState();
+  State<RichCommentContent> createState() => _RichCommentContentState();
 }
 
-class _RichCommentContentState extends State<_RichCommentContent> {
+class _RichCommentContentState extends State<RichCommentContent> {
   var textSpan = <InlineSpan>[];
   var images = <_CommentImage>[];
 
@@ -639,6 +639,8 @@ class _RichCommentContentState extends State<_RichCommentContent> {
     int i = 0;
     var buffer = StringBuffer();
     var text = widget.text;
+    text = text.replaceAll('\r\n', '\n');
+    text = text.replaceAll('&amp;', '&');
 
     void writeBuffer() {
       if (buffer.isEmpty) return;

lib/pages/downloading_page.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:venera/components/components.dart';
 import 'package:venera/foundation/app.dart';
+import 'package:venera/foundation/image_provider/cached_image.dart';
 import 'package:venera/foundation/local.dart';
 import 'package:venera/network/download.dart';
 import 'package:venera/utils/io.dart';
@@ -161,8 +162,8 @@ class _DownloadTaskTileState extends State<_DownloadTaskTile> {
             clipBehavior: Clip.antiAlias,
             child: widget.task.cover == null
                 ? null
-                : Image.file(
-                    File(widget.task.cover!),
+                : Image(
+                    image: CachedImageProvider(widget.task.cover!),
                     filterQuality: FilterQuality.medium,
                     fit: BoxFit.cover,
                   ),
@@ -206,6 +207,7 @@ class _DownloadTaskTileState extends State<_DownloadTaskTile> {
                   Text(
                     widget.task.message,
                     style: ts.s12,
+                    maxLines: 3,
                   ),
                 const SizedBox(height: 4),
                 LinearProgressIndicator(

lib/pages/explore_page.dart

@@ -46,6 +46,18 @@ class _ExplorePageState extends State<ExplorePage>
     }
   }
 
+  void onNaviItemTapped(int index) {
+    if (index == 2) {
+      int page = controller.index;
+      String currentPageId = pages[page];
+      StateController.find<SimpleController>(tag: currentPageId)
+          .control!()['toTop']
+          ?.call();
+    }
+  }
+
+  NaviPaneState? naviPane;
+
   @override
   void initState() {
     pages = List<String>.from(appdata.settings["explore_pages"]);
@@ -59,13 +71,21 @@ class _ExplorePageState extends State<ExplorePage>
       vsync: this,
     );
     appdata.settings.addListener(onSettingsChanged);
+    NaviPane.of(context).addNaviItemTapListener(onNaviItemTapped);
     super.initState();
   }
 
+  @override
+  void didChangeDependencies() {
+    naviPane = NaviPane.of(context);
+    super.didChangeDependencies();
+  }
+
   @override
   void dispose() {
     controller.dispose();
     appdata.settings.removeListener(onSettingsChanged);
+    naviPane?.removeNaviItemTapListener(onNaviItemTapped);
     super.dispose();
   }
 
@@ -90,12 +110,14 @@ class _ExplorePageState extends State<ExplorePage>
     return Tab(text: i.ts(comicSource.key), key: Key(i));
   }
 
-  Widget buildBody(String i) => _SingleExplorePage(i, key: Key(i));
+  Widget buildBody(String i) => Material(
+        child: _SingleExplorePage(i, key: PageStorageKey(i)),
+      );
 
   Widget buildEmpty() {
     var msg = "No Explore Pages".tl;
     msg += '\n';
-    if(ComicSource.isEmpty) {
+    if (ComicSource.isEmpty) {
       msg += "Add a comic source in home page".tl;
     } else {
       msg += "Please check your settings".tl;
@@ -127,7 +149,7 @@ class _ExplorePageState extends State<ExplorePage>
 
     Widget tabBar = Material(
       child: FilledTabBar(
-        key: Key(pages.toString()),
+        key: PageStorageKey(pages.toString()),
         tabs: pages.map((e) => buildTab(e)).toList(),
         controller: controller,
       ),
@@ -220,18 +242,14 @@ class _SingleExplorePageState extends StateWithController<_SingleExplorePage>
     with AutomaticKeepAliveClientMixin<_SingleExplorePage> {
   late final ExplorePageData data;
 
-  bool loading = true;
-
-  String? message;
-
-  List<ExplorePagePart>? parts;
-
   late final String comicSourceKey;
 
-  int key = 0;
-
   bool _wantKeepAlive = true;
 
+  var scrollController = ScrollController();
+
+  VoidCallback? refreshHandler;
+
   void onSettingsChanged() {
     var explorePages = appdata.settings["explore_pages"];
     if (!explorePages.contains(widget.title)) {
@@ -266,14 +284,34 @@ class _SingleExplorePageState extends StateWithController<_SingleExplorePage>
   Widget build(BuildContext context) {
     super.build(context);
     if (data.loadMultiPart != null) {
-      return buildMultiPart();
+      return _MultiPartExplorePage(
+        key: const PageStorageKey("comic_list"),
+        data: data,
+        controller: scrollController,
+        comicSourceKey: comicSourceKey,
+        refreshHandlerCallback: (c) {
+          refreshHandler = c;
+        },
+      );
     } else if (data.loadPage != null || data.loadNext != null) {
-      return buildComicList();
+      return ComicList(
+        loadPage: data.loadPage,
+        loadNext: data.loadNext,
+        key: const PageStorageKey("comic_list"),
+        controller: scrollController,
+        refreshHandlerCallback: (c) {
+          refreshHandler = c;
+        },
+      );
     } else if (data.loadMixed != null) {
       return _MixedExplorePage(
         data,
         comicSourceKey,
-        key: ValueKey(key),
+        key: const PageStorageKey("comic_list"),
+        controller: scrollController,
+        refreshHandlerCallback: (c) {
+          refreshHandler = c;
+        },
       );
     } else {
       return const Center(
@@ -282,91 +320,59 @@ class _SingleExplorePageState extends StateWithController<_SingleExplorePage>
     }
   }
 
-  Widget buildComicList() {
-    return ComicList(
-      loadPage: data.loadPage,
-      loadNext: data.loadNext,
-      key: ValueKey(key),
-    );
-  }
-
-  void load() async {
-    var res = await data.loadMultiPart!();
-    loading = false;
-    if (mounted) {
-      setState(() {
-        if (res.error) {
-          message = res.errorMessage;
-        } else {
-          parts = res.data;
-        }
-      });
-    }
-  }
-
-  Widget buildMultiPart() {
-    if (loading) {
-      load();
-      return const Center(
-        child: CircularProgressIndicator(),
-      );
-    } else if (message != null) {
-      return NetworkError(
-        message: message!,
-        retry: refresh,
-        withAppbar: false,
-      );
-    } else {
-      return buildPage();
-    }
-  }
-
-  Widget buildPage() {
-    return SmoothCustomScrollView(
-      slivers: _buildPage().toList(),
-    );
-  }
-
-  Iterable<Widget> _buildPage() sync* {
-    for (var part in parts!) {
-      yield* _buildExplorePagePart(part, comicSourceKey);
-    }
-  }
-
   @override
   Object? get tag => widget.title;
 
   @override
   void refresh() {
-    message = null;
-    if (data.loadMultiPart != null) {
-      setState(() {
-        loading = true;
-      });
-    } else {
-      setState(() {
-        key++;
-      });
-    }
+    refreshHandler?.call();
   }
 
   @override
   bool get wantKeepAlive => _wantKeepAlive;
+
+  void toTop() {
+    if (scrollController.hasClients) {
+      scrollController.animateTo(
+        scrollController.position.minScrollExtent,
+        duration: const Duration(milliseconds: 200),
+        curve: Curves.easeInOut,
+      );
+    }
+  }
+
+  @override
+  Map<String, dynamic> get control => {"toTop": toTop};
 }
 
 class _MixedExplorePage extends StatefulWidget {
-  const _MixedExplorePage(this.data, this.sourceKey, {super.key});
+  const _MixedExplorePage(this.data, this.sourceKey,
+      {super.key, this.controller, required this.refreshHandlerCallback});
 
   final ExplorePageData data;
 
   final String sourceKey;
 
+  final ScrollController? controller;
+
+  final void Function(VoidCallback c) refreshHandlerCallback;
+
   @override
   State<_MixedExplorePage> createState() => _MixedExplorePageState();
 }
 
 class _MixedExplorePageState
     extends MultiPageLoadingState<_MixedExplorePage, Object> {
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    widget.refreshHandlerCallback(refresh);
+  }
+
+  void refresh() {
+    reset();
+  }
+
   Iterable<Widget> buildSlivers(BuildContext context, List<Object> data) sync* {
     List<Comic> cache = [];
     for (var part in data) {
@@ -394,9 +400,10 @@ class _MixedExplorePageState
   @override
   Widget buildContent(BuildContext context, List<Object> data) {
     return SmoothCustomScrollView(
+      controller: widget.controller,
       slivers: [
         ...buildSlivers(context, data),
-        if (haveNextPage) const ListLoadingIndicator().toSliver()
+        const SliverListLoadingIndicator(),
       ],
     );
   }
@@ -477,3 +484,125 @@ Iterable<Widget> _buildExplorePagePart(
   yield buildTitle(part);
   yield buildComics(part);
 }
+
+class _MultiPartExplorePage extends StatefulWidget {
+  const _MultiPartExplorePage({
+    super.key,
+    required this.data,
+    required this.controller,
+    required this.comicSourceKey,
+    required this.refreshHandlerCallback,
+  });
+
+  final ExplorePageData data;
+
+  final ScrollController controller;
+
+  final String comicSourceKey;
+
+  final void Function(VoidCallback c) refreshHandlerCallback;
+
+  @override
+  State<_MultiPartExplorePage> createState() => _MultiPartExplorePageState();
+}
+
+class _MultiPartExplorePageState extends State<_MultiPartExplorePage> {
+  late final ExplorePageData data;
+
+  List<ExplorePagePart>? parts;
+
+  bool loading = true;
+
+  String? message;
+
+  Map<String, dynamic> get state => {
+        "loading": loading,
+        "message": message,
+        "parts": parts,
+      };
+
+  void restoreState(dynamic state) {
+    if (state == null) return;
+    loading = state["loading"];
+    message = state["message"];
+    parts = state["parts"];
+  }
+
+  void storeState() {
+    PageStorage.of(context).writeState(context, state);
+  }
+
+  void refresh() {
+    setState(() {
+      loading = true;
+      message = null;
+      parts = null;
+    });
+    storeState();
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    data = widget.data;
+  }
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    restoreState(PageStorage.of(context).readState(context));
+    widget.refreshHandlerCallback(refresh);
+  }
+
+  void load() async {
+    var res = await data.loadMultiPart!();
+    loading = false;
+    if (mounted) {
+      setState(() {
+        if (res.error) {
+          message = res.errorMessage;
+        } else {
+          parts = res.data;
+        }
+      });
+      storeState();
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (loading) {
+      load();
+      return const Center(
+        child: CircularProgressIndicator(),
+      );
+    } else if (message != null) {
+      return NetworkError(
+        message: message!,
+        retry: () {
+          setState(() {
+            loading = true;
+            message = null;
+          });
+        },
+        withAppbar: false,
+      );
+    } else {
+      return buildPage();
+    }
+  }
+
+  Widget buildPage() {
+    return SmoothCustomScrollView(
+      key: const PageStorageKey('scroll'),
+      controller: widget.controller,
+      slivers: _buildPage().toList(),
+    );
+  }
+
+  Iterable<Widget> _buildPage() sync* {
+    for (var part in parts!) {
+      yield* _buildExplorePagePart(part, widget.comicSourceKey);
+    }
+  }
+}

lib/pages/favorites/favorite_actions.dart

@@ -83,7 +83,7 @@ void addFavorite(Comic comic) {
   showDialog(
     context: App.rootContext,
     builder: (context) {
-      String? selectedFolder;
+      String? selectedFolder = appdata.settings['quickFavorite'];
 
       return StatefulBuilder(builder: (context, setState) {
         return ContentDialog(

lib/pages/favorites/favorites_page.dart

@@ -1,7 +1,6 @@
 import 'dart:convert';
 import 'dart:math';
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_reorderable_grid_view/widgets/reorderable_builder.dart';
 import 'package:venera/components/components.dart';
@@ -9,10 +8,12 @@ import 'package:venera/foundation/app.dart';
 import 'package:venera/foundation/appdata.dart';
 import 'package:venera/foundation/comic_source/comic_source.dart';
 import 'package:venera/foundation/comic_type.dart';
+import 'package:venera/foundation/consts.dart';
 import 'package:venera/foundation/favorites.dart';
 import 'package:venera/foundation/local.dart';
 import 'package:venera/foundation/res.dart';
 import 'package:venera/network/download.dart';
+import 'package:venera/pages/comic_page.dart';
 import 'package:venera/utils/io.dart';
 import 'package:venera/utils/translations.dart';
 
@@ -93,7 +94,7 @@ class _FavoritesPageState extends State<FavoritesPage>  {
       barrierDismissible: true,
       fullscreenDialog: true,
       opaque: false,
-      barrierColor: Colors.black.withOpacity(0.36),
+      barrierColor: Colors.black.toOpacity(0.36),
       pageBuilder: (context, animation, secondary) {
         return Align(
           alignment: Alignment.centerLeft,
@@ -151,14 +152,14 @@ class _FavoritesPageState extends State<FavoritesPage>  {
       );
     }
     if (!isNetwork) {
-      return _LocalFavoritesPage(folder: folder!, key: Key(folder!));
+      return _LocalFavoritesPage(folder: folder!, key: PageStorageKey("local_$folder"));
     } else {
       var favoriteData = getFavoriteDataOrNull(folder!);
       if (favoriteData == null) {
         folder = null;
         return buildBody();
       } else {
-        return NetworkFavoritePage(favoriteData, key: Key(folder!));
+        return NetworkFavoritePage(favoriteData, key: PageStorageKey("network_$folder"));
       }
     }
   }
@@ -168,4 +169,4 @@ abstract interface class FolderList {
   void update();
 
   void updateFolders();
-}
+}

lib/pages/favorites/local_favorites_page.dart

@@ -17,10 +17,30 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
   String? networkSource;
   String? networkFolder;
 
+  Map<Comic, bool> selectedComics = {};
+
+  var selectedLocalFolders = <String>{};
+
+  late List<String> added = [];
+
+  String keyword = "";
+
+  bool searchMode = false;
+
+  bool multiSelectMode = false;
+
+  int? lastSelectedIndex;
+
   void updateComics() {
-    setState(() {
-      comics = LocalFavoritesManager().getAllComics(widget.folder);
-    });
+    if (keyword.isEmpty) {
+      setState(() {
+        comics = LocalFavoritesManager().getAllComics(widget.folder);
+      });
+    } else {
+      setState(() {
+        comics = LocalFavoritesManager().searchInFolder(widget.folder, keyword);
+      });
+    }
   }
 
   @override
@@ -33,218 +53,577 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
     super.initState();
   }
 
+  void selectAll() {
+    setState(() {
+      selectedComics = comics.asMap().map((k, v) => MapEntry(v, true));
+    });
+  }
+
+  void invertSelection() {
+    setState(() {
+      comics.asMap().forEach((k, v) {
+        selectedComics[v] = !selectedComics.putIfAbsent(v, () => false);
+      });
+      selectedComics.removeWhere((k, v) => !v);
+    });
+  }
+
+  bool downloadComic(FavoriteItem c) {
+    var source = c.type.comicSource;
+    if (source != null) {
+      bool isDownloaded = LocalManager().isDownloaded(
+        c.id,
+        (c).type,
+      );
+      if (isDownloaded) {
+        return false;
+      }
+      LocalManager().addTask(ImagesDownloadTask(
+        source: source,
+        comicId: c.id,
+        comicTitle: c.title,
+      ));
+      return true;
+    }
+    return false;
+  }
+
+  void downloadSelected() {
+    int count = 0;
+    for (var c in selectedComics.keys) {
+      if (downloadComic(c as FavoriteItem)) {
+        count++;
+      }
+    }
+    if (count > 0) {
+      context.showMessage(
+        message: "Added @c comics to download queue.".tlParams({"c": count}),
+      );
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
-    return SmoothCustomScrollView(
-      slivers: [
-        SliverAppbar(
-          leading: Tooltip(
-            message: "Folders".tl,
-            child: context.width <= _kTwoPanelChangeWidth
-                ? IconButton(
-                    icon: const Icon(Icons.menu),
-                    color: context.colorScheme.primary,
-                    onPressed: favPage.showFolderSelector,
-                  )
-                : const SizedBox(),
-          ),
-          title: GestureDetector(
-            onTap: context.width < _kTwoPanelChangeWidth
-                ? favPage.showFolderSelector
-                : null,
-            child: Text(favPage.folder ?? "Unselected".tl),
-          ),
-          actions: [
-            if (networkSource != null)
+    var body = Scaffold(
+      body: SmoothCustomScrollView(slivers: [
+        if (!searchMode && !multiSelectMode)
+          SliverAppbar(
+            style: context.width < changePoint
+                ? AppbarStyle.shadow
+                : AppbarStyle.blur,
+            leading: Tooltip(
+              message: "Folders".tl,
+              child: context.width <= _kTwoPanelChangeWidth
+                  ? IconButton(
+                      icon: const Icon(Icons.menu),
+                      color: context.colorScheme.primary,
+                      onPressed: favPage.showFolderSelector,
+                    )
+                  : const SizedBox(),
+            ),
+            title: GestureDetector(
+              onTap: context.width < _kTwoPanelChangeWidth
+                  ? favPage.showFolderSelector
+                  : null,
+              child: Text(favPage.folder ?? "Unselected".tl),
+            ),
+            actions: [
+              if (networkSource != null)
+                Tooltip(
+                  message: "Sync".tl,
+                  child: Flyout(
+                    flyoutBuilder: (context) {
+                      var sourceName = ComicSource.find(networkSource!)?.name ??
+                          networkSource!;
+                      var text = "The folder is Linked to @source".tlParams({
+                        "source": sourceName,
+                      });
+                      if (networkFolder != null && networkFolder!.isNotEmpty) {
+                        text += "\n${"Source Folder".tl}: $networkFolder";
+                      }
+                      return FlyoutContent(
+                        title: "Sync".tl,
+                        content: Text(text),
+                        actions: [
+                          Button.filled(
+                            child: Text("Update".tl),
+                            onPressed: () {
+                              context.pop();
+                              importNetworkFolder(
+                                networkSource!,
+                                widget.folder,
+                                networkFolder!,
+                              ).then(
+                                (value) {
+                                  updateComics();
+                                },
+                              );
+                            },
+                          ),
+                        ],
+                      );
+                    },
+                    child: Builder(builder: (context) {
+                      return IconButton(
+                        icon: const Icon(Icons.sync),
+                        onPressed: () {
+                          Flyout.of(context).show();
+                        },
+                      );
+                    }),
+                  ),
+                ),
               Tooltip(
-                message: "Sync".tl,
-                child: Flyout(
-                  flyoutBuilder: (context) {
-                    var sourceName = ComicSource.find(networkSource!)?.name ??
-                        networkSource!;
-                    var text = "The folder is Linked to @source".tlParams({
-                      "source": sourceName,
+                message: "Search".tl,
+                child: IconButton(
+                  icon: const Icon(Icons.search),
+                  onPressed: () {
+                    setState(() {
+                      searchMode = true;
                     });
-                    if(networkFolder != null && networkFolder!.isNotEmpty) {
-                      text += "\n${"Source Folder".tl}: $networkFolder";
-                    }
-                    return FlyoutContent(
-                      title: "Sync".tl,
-                      content: Text(text),
-                      actions: [
-                        Button.filled(
-                          child: Text("Update".tl),
-                          onPressed: () {
-                            context.pop();
-                            importNetworkFolder(
-                              networkSource!,
+                  },
+                ),
+              ),
+              MenuButton(
+                entries: [
+                  MenuEntry(
+                      icon: Icons.edit_outlined,
+                      text: "Rename".tl,
+                      onClick: () {
+                        showInputDialog(
+                          context: App.rootContext,
+                          title: "Rename".tl,
+                          hintText: "New Name".tl,
+                          onConfirm: (value) {
+                            var err = validateFolderName(value.toString());
+                            if (err != null) {
+                              return err;
+                            }
+                            LocalFavoritesManager().rename(
                               widget.folder,
-                              networkFolder!,
-                            ).then(
-                              (value) {
-                                updateComics();
+                              value.toString(),
+                            );
+                            favPage.folderList?.updateFolders();
+                            favPage.setFolder(false, value.toString());
+                            return null;
+                          },
+                        );
+                      }),
+                  MenuEntry(
+                      icon: Icons.reorder,
+                      text: "Reorder".tl,
+                      onClick: () {
+                        context.to(
+                          () {
+                            return _ReorderComicsPage(
+                              widget.folder,
+                              (comics) {
+                                this.comics = comics;
                               },
                             );
                           },
-                        ),
-                      ],
-                    );
-                  },
-                  child: Builder(builder: (context) {
-                    return IconButton(
-                      icon: const Icon(Icons.sync),
-                      onPressed: () {
-                        Flyout.of(context).show();
-                      },
-                    );
-                  }),
-                ),
+                        ).then(
+                          (value) {
+                            if (mounted) {
+                              setState(() {});
+                            }
+                          },
+                        );
+                      }),
+                  MenuEntry(
+                      icon: Icons.upload_file,
+                      text: "Export".tl,
+                      onClick: () {
+                        var json = LocalFavoritesManager().folderToJson(
+                          widget.folder,
+                        );
+                        saveFile(
+                          data: utf8.encode(json),
+                          filename: "${widget.folder}.json",
+                        );
+                      }),
+                  MenuEntry(
+                      icon: Icons.update,
+                      text: "Update Comics Info".tl,
+                      onClick: () {
+                        updateComicsInfo(widget.folder).then((newComics) {
+                          if (mounted) {
+                            setState(() {
+                              comics = newComics;
+                            });
+                          }
+                        });
+                      }),
+                  MenuEntry(
+                      icon: Icons.delete_outline,
+                      text: "Delete Folder".tl,
+                      color: context.colorScheme.error,
+                      onClick: () {
+                        showConfirmDialog(
+                          context: App.rootContext,
+                          title: "Delete".tl,
+                          content: "Delete folder '@f' ?".tlParams({
+                            "f": widget.folder,
+                          }),
+                          btnColor: context.colorScheme.error,
+                          onConfirm: () {
+                            favPage.setFolder(false, null);
+                            LocalFavoritesManager().deleteFolder(widget.folder);
+                            favPage.folderList?.updateFolders();
+                          },
+                        );
+                      }),
+                ],
               ),
-            MenuButton(
-              entries: [
+            ],
+          )
+        else if (multiSelectMode)
+          SliverAppbar(
+            style: context.width < changePoint
+                ? AppbarStyle.shadow
+                : AppbarStyle.blur,
+            leading: Tooltip(
+              message: "Cancel".tl,
+              child: IconButton(
+                icon: const Icon(Icons.close),
+                onPressed: () {
+                  setState(() {
+                    multiSelectMode = false;
+                    selectedComics.clear();
+                  });
+                },
+              ),
+            ),
+            title: Text(
+                "Selected @c comics".tlParams({"c": selectedComics.length})),
+            actions: [
+              MenuButton(entries: [
+                MenuEntry(
+                    icon: Icons.drive_file_move,
+                    text: "Move to folder".tl,
+                    onClick: () => favoriteOption('move')),
+                MenuEntry(
+                    icon: Icons.copy,
+                    text: "Copy to folder".tl,
+                    onClick: () => favoriteOption('add')),
+                MenuEntry(
+                    icon: Icons.select_all,
+                    text: "Select All".tl,
+                    onClick: selectAll),
+                MenuEntry(
+                    icon: Icons.deselect,
+                    text: "Deselect".tl,
+                    onClick: _cancel),
+                MenuEntry(
+                    icon: Icons.flip,
+                    text: "Invert Selection".tl,
+                    onClick: invertSelection),
                 MenuEntry(
                     icon: Icons.delete_outline,
-                    text: "Delete Folder".tl,
+                    text: "Delete Comic".tl,
+                    color: context.colorScheme.error,
                     onClick: () {
                       showConfirmDialog(
-                        context: App.rootContext,
+                        context: context,
                         title: "Delete".tl,
-                        content:
-                            "Are you sure you want to delete this folder?".tl,
+                        content: "Delete @c comics?"
+                            .tlParams({"c": selectedComics.length}),
+                        btnColor: context.colorScheme.error,
                         onConfirm: () {
-                          favPage.setFolder(false, null);
-                          LocalFavoritesManager().deleteFolder(widget.folder);
-                          favPage.folderList?.updateFolders();
+                          _deleteComicWithId();
                         },
                       );
                     }),
                 MenuEntry(
-                    icon: Icons.edit_outlined,
-                    text: "Rename".tl,
-                    onClick: () {
-                      showInputDialog(
-                        context: App.rootContext,
-                        title: "Rename".tl,
-                        hintText: "New Name".tl,
-                        onConfirm: (value) {
-                          var err = validateFolderName(value.toString());
-                          if (err != null) {
-                            return err;
-                          }
-                          LocalFavoritesManager().rename(
-                            widget.folder,
-                            value.toString(),
-                          );
-                          favPage.folderList?.updateFolders();
-                          favPage.setFolder(false, value.toString());
-                          return null;
-                        },
-                      );
-                    }),
-                MenuEntry(
-                    icon: Icons.reorder,
-                    text: "Reorder".tl,
-                    onClick: () {
-                      context.to(
-                        () {
-                          return _ReorderComicsPage(
-                            widget.folder,
-                            (comics) {
-                              this.comics = comics;
-                            },
-                          );
-                        },
-                      ).then(
-                        (value) {
-                          if (mounted) {
-                            setState(() {});
-                          }
-                        },
-                      );
-                    }),
-                MenuEntry(
-                    icon: Icons.upload_file,
-                    text: "Export".tl,
-                    onClick: () {
-                      var json = LocalFavoritesManager().folderToJson(
-                        widget.folder,
-                      );
-                      saveFile(
-                        data: utf8.encode(json),
-                        filename: "${widget.folder}.json",
-                      );
-                    }),
-                MenuEntry(
-                    icon: Icons.update,
-                    text: "Update Comics Info".tl,
-                    onClick: () {
-                      updateComicsInfo(widget.folder).then((newComics) {
-                        if (mounted) {
-                          setState(() {
-                            comics = newComics;
-                          });
-                        }
-                      });
-                    }),
-                MenuEntry(
-                    icon: Icons.download,
-                    text: "Download All".tl,
-                    onClick: () async {
-                      int count = 0;
-                      for (var c in comics) {
-                        if (await LocalManager().isDownloaded(c.id, c.type)) {
-                          continue;
-                        }
-                        var comicSource = c.type.comicSource;
-                        if (comicSource == null) {
-                          continue;
-                        }
-                        LocalManager().addTask(ImagesDownloadTask(
-                          source: comicSource,
-                          comicId: c.id,
-                          comic: null,
-                          comicTitle: c.name,
-                        ));
-                        count++;
-                      }
-                      context.showMessage(
-                          message: "Added @count comics to download queue."
-                              .tlParams({
-                        "count": count.toString(),
-                      }));
-                    }),
-              ],
+                  icon: Icons.download,
+                  text: "Download".tl,
+                  onClick: downloadSelected,
+                ),
+              ]),
+            ],
+          )
+        else if (searchMode)
+          SliverAppbar(
+            style: context.width < changePoint
+                ? AppbarStyle.shadow
+                : AppbarStyle.blur,
+            leading: Tooltip(
+              message: "Cancel".tl,
+              child: IconButton(
+                icon: const Icon(Icons.close),
+                onPressed: () {
+                  setState(() {
+                    searchMode = false;
+                    keyword = "";
+                    updateComics();
+                  });
+                },
+              ),
             ),
-          ],
-        ),
+            title: TextField(
+              autofocus: true,
+              decoration: InputDecoration(
+                hintText: "Search".tl,
+                border: InputBorder.none,
+              ),
+              onChanged: (v) {
+                keyword = v;
+                updateComics();
+              },
+            ),
+          ),
         SliverGridComics(
           comics: comics,
+          selections: selectedComics,
           menuBuilder: (c) {
             return [
               MenuEntry(
-                icon: Icons.delete_outline,
-                text: "Delete".tl,
+                icon: Icons.download,
+                text: "Download".tl,
                 onClick: () {
-                  showConfirmDialog(
-                    context: context,
-                    title: "Delete".tl,
-                    content: "Are you sure you want to delete this comic?".tl,
-                    onConfirm: () {
-                      LocalFavoritesManager().deleteComicWithId(
-                        widget.folder,
-                        c.id,
-                        (c as FavoriteItem).type,
-                      );
-                      updateComics();
-                    },
+                  downloadComic(c as FavoriteItem);
+                  context.showMessage(
+                    message: "Download started".tl,
                   );
                 },
               ),
             ];
           },
+          onTap: multiSelectMode
+              ? (c) {
+                  setState(() {
+                    if (selectedComics.containsKey(c as FavoriteItem)) {
+                      selectedComics.remove(c);
+                      _checkExitSelectMode();
+                    } else {
+                      selectedComics[c] = true;
+                    }
+                    lastSelectedIndex = comics.indexOf(c);
+                  });
+                }
+              : (c) {
+                  App.mainNavigatorKey?.currentContext
+                      ?.to(() => ComicPage(id: c.id, sourceKey: c.sourceKey));
+                },
+          onLongPressed: (c) {
+            setState(() {
+              if (!multiSelectMode) {
+                multiSelectMode = true;
+                if (!selectedComics.containsKey(c as FavoriteItem)) {
+                  selectedComics[c] = true;
+                }
+                lastSelectedIndex = comics.indexOf(c);
+              } else {
+                if (lastSelectedIndex != null) {
+                  int start = lastSelectedIndex!;
+                  int end = comics.indexOf(c as FavoriteItem);
+                  if (start > end) {
+                    int temp = start;
+                    start = end;
+                    end = temp;
+                  }
+
+                  for (int i = start; i <= end; i++) {
+                    if (i == lastSelectedIndex) continue;
+
+                    var comic = comics[i];
+                    if (selectedComics.containsKey(comic)) {
+                      selectedComics.remove(comic);
+                    } else {
+                      selectedComics[comic] = true;
+                    }
+                  }
+                }
+                lastSelectedIndex = comics.indexOf(c as FavoriteItem);
+              }
+              _checkExitSelectMode();
+            });
+          },
         ),
-      ],
+      ]),
     );
+    return PopScope(
+      canPop: !multiSelectMode && !searchMode,
+      onPopInvokedWithResult: (didPop, result) {
+        if (multiSelectMode) {
+          setState(() {
+            multiSelectMode = false;
+            selectedComics.clear();
+          });
+        } else if (searchMode) {
+          setState(() {
+            searchMode = false;
+            keyword = "";
+            updateComics();
+          });
+        }
+      },
+      child: body,
+    );
+  }
+
+  void favoriteOption(String option) {
+    var targetFolders = LocalFavoritesManager()
+        .folderNames
+        .where((folder) => folder != favPage.folder)
+        .toList();
+
+    showPopUpWidget(
+      App.rootContext,
+      StatefulBuilder(
+        builder: (context, setState) {
+          return PopUpWidgetScaffold(
+            title: favPage.folder ?? "Unselected".tl,
+            body: Padding(
+              padding: EdgeInsets.only(bottom: context.padding.bottom + 16),
+              child: Container(
+                constraints:
+                    const BoxConstraints(maxHeight: 700, maxWidth: 500),
+                child: Column(
+                  children: [
+                    Expanded(
+                      child: ListView.builder(
+                        itemCount: targetFolders.length + 1,
+                        itemBuilder: (context, index) {
+                          if (index == targetFolders.length) {
+                            return SizedBox(
+                              height: 36,
+                              child: Center(
+                                child: TextButton(
+                                  onPressed: () {
+                                    newFolder().then((v) {
+                                      setState(() {
+                                        targetFolders = LocalFavoritesManager()
+                                            .folderNames
+                                            .where((folder) =>
+                                                folder != favPage.folder)
+                                            .toList();
+                                      });
+                                    });
+                                  },
+                                  child: Row(
+                                    mainAxisSize: MainAxisSize.min,
+                                    children: [
+                                      const Icon(Icons.add, size: 20),
+                                      const SizedBox(width: 4),
+                                      Text("New Folder".tl),
+                                    ],
+                                  ),
+                                ),
+                              ),
+                            );
+                          }
+                          var folder = targetFolders[index];
+                          var disabled = false;
+                          if (selectedLocalFolders.isNotEmpty) {
+                            if (added.contains(folder) &&
+                                !added.contains(selectedLocalFolders.first)) {
+                              disabled = true;
+                            } else if (!added.contains(folder) &&
+                                added.contains(selectedLocalFolders.first)) {
+                              disabled = true;
+                            }
+                          }
+                          return CheckboxListTile(
+                            title: Row(
+                              children: [
+                                Text(folder),
+                                const SizedBox(width: 8),
+                              ],
+                            ),
+                            value: selectedLocalFolders.contains(folder),
+                            onChanged: disabled
+                                ? null
+                                : (v) {
+                                    setState(() {
+                                      if (v!) {
+                                        selectedLocalFolders.add(folder);
+                                      } else {
+                                        selectedLocalFolders.remove(folder);
+                                      }
+                                    });
+                                  },
+                          );
+                        },
+                      ),
+                    ),
+                    Center(
+                      child: FilledButton(
+                        onPressed: () {
+                          if (selectedLocalFolders.isEmpty) {
+                            return;
+                          }
+                          if (option == 'move') {
+                            for (var c in selectedComics.keys) {
+                              for (var s in selectedLocalFolders) {
+                                LocalFavoritesManager().moveFavorite(
+                                    favPage.folder as String,
+                                    s,
+                                    c.id,
+                                    (c as FavoriteItem).type);
+                              }
+                            }
+                          } else {
+                            for (var c in selectedComics.keys) {
+                              for (var s in selectedLocalFolders) {
+                                LocalFavoritesManager().addComic(
+                                  s,
+                                  FavoriteItem(
+                                    id: c.id,
+                                    name: c.title,
+                                    coverPath: c.cover,
+                                    author: c.subtitle ?? '',
+                                    type: ComicType((c.sourceKey == 'local'
+                                        ? 0
+                                        : c.sourceKey.hashCode)),
+                                    tags: c.tags ?? [],
+                                  ),
+                                );
+                              }
+                            }
+                          }
+                          App.rootContext.pop();
+                          updateComics();
+                          _cancel();
+                        },
+                        child: Text(option == 'move' ? "Move".tl : "Add".tl),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  void _checkExitSelectMode() {
+    if (selectedComics.isEmpty) {
+      setState(() {
+        multiSelectMode = false;
+      });
+    }
+  }
+
+  void _cancel() {
+    setState(() {
+      selectedComics.clear();
+      multiSelectMode = false;
+    });
+  }
+
+  void _deleteComicWithId() {
+    for (var c in selectedComics.keys) {
+      LocalFavoritesManager().deleteComicWithId(
+        widget.folder,
+        c.id,
+        (c as FavoriteItem).type,
+      );
+    }
+    updateComics();
+    _cancel();
   }
 }
 
@@ -266,12 +645,19 @@ class _ReorderComicsPageState extends State<_ReorderComicsPage> {
   late var comics = LocalFavoritesManager().getAllComics(widget.name);
   bool changed = false;
 
-  Color lightenColor(Color color, double lightenValue) {
-    int red = (color.red + ((255 - color.red) * lightenValue)).round();
-    int green = (color.green + ((255 - color.green) * lightenValue)).round();
-    int blue = (color.blue + ((255 - color.blue) * lightenValue)).round();
+  static int _floatToInt8(double x) {
+    return (x * 255.0).round() & 0xff;
+  }
 
-    return Color.fromARGB(color.alpha, red, green, blue);
+  Color lightenColor(Color color, double lightenValue) {
+    int red =
+        (_floatToInt8(color.r) + ((255 - color.r) * lightenValue)).round();
+    int green = (_floatToInt8(color.g) * 255 + ((255 - color.g) * lightenValue))
+        .round();
+    int blue = (_floatToInt8(color.b) * 255 + ((255 - color.b) * lightenValue))
+        .round();
+
+    return Color.fromARGB(_floatToInt8(color.a), red, green, blue);
   }
 
   @override
@@ -284,6 +670,7 @@ class _ReorderComicsPageState extends State<_ReorderComicsPage> {
 
   @override
   Widget build(BuildContext context) {
+    var type = appdata.settings['comicDisplayMode'];
     var tiles = comics.map(
       (e) {
         var comicSource = e.type.comicSource;
@@ -296,7 +683,9 @@ class _ReorderComicsPageState extends State<_ReorderComicsPage> {
             e.id,
             e.author,
             e.tags,
-            "${e.time} | ${comicSource?.name ?? "Unknown"}",
+            type == 'detailed'
+                ? "${e.time} | ${comicSource?.name ?? "Unknown"}"
+                : "${e.type.comicSource?.name ?? "Unknown"} | ${e.time}",
             comicSource?.key ??
                 (e.type == ComicType.local ? "local" : "Unknown"),
             null,
@@ -321,7 +710,7 @@ class _ReorderComicsPageState extends State<_ReorderComicsPage> {
           ),
         ],
       ),
-      body: ReorderableBuilder(
+      body: ReorderableBuilder<FavoriteItem>(
         key: reorderWidgetKey,
         scrollController: _scrollController,
         longPressDelay: App.isDesktop
@@ -330,14 +719,14 @@ class _ReorderComicsPageState extends State<_ReorderComicsPage> {
         onReorder: (reorderFunc) {
           changed = true;
           setState(() {
-            comics = reorderFunc(comics) as List<FavoriteItem>;
+            comics = reorderFunc(comics);
           });
           widget.onReorder(comics);
         },
         dragChildBoxDecoration: BoxDecoration(
           borderRadius: BorderRadius.circular(16),
           color: lightenColor(
-            Theme.of(context).splashColor.withOpacity(1),
+            Theme.of(context).splashColor.withAlpha(255),
             0.2,
           ),
         ),

lib/pages/favorites/network_favorites_page.dart

@@ -19,8 +19,8 @@ Future<bool> _deleteComic(
       bool loading = false;
       return StatefulBuilder(builder: (context, setState) {
         return ContentDialog(
-          title: "Delete".tl,
-          content: Text("Are you sure you want to delete this comic?".tl)
+          title: "Remove".tl,
+          content: Text("Remove comic from favorite?".tl)
               .paddingHorizontal(16),
           actions: [
             Button.filled(
@@ -94,6 +94,9 @@ class _NormalFavoritePageState extends State<_NormalFavoritePage> {
     return ComicList(
       key: comicListKey,
       leadingSliver: SliverAppbar(
+        style: context.width < changePoint
+            ? AppbarStyle.shadow
+            : AppbarStyle.blur,
         leading: Tooltip(
           message: "Folders".tl,
           child: context.width <= _kTwoPanelChangeWidth
@@ -211,6 +214,9 @@ class _MultiFolderFavoritesPageState extends State<_MultiFolderFavoritesPage> {
   @override
   Widget build(BuildContext context) {
     var sliverAppBar = SliverAppbar(
+      style: context.width < changePoint
+          ? AppbarStyle.shadow
+          : AppbarStyle.blur,
       leading: Tooltip(
         message: "Folders".tl,
         child: context.width <= _kTwoPanelChangeWidth
@@ -424,7 +430,7 @@ class _FolderTile extends StatelessWidget {
         return StatefulBuilder(builder: (context, setState) {
           return ContentDialog(
             title: "Delete".tl,
-            content: Text("Are you sure you want to delete this folder?".tl)
+            content: Text("Delete folder?".tl)
                 .paddingHorizontal(16),
             actions: [
               Button.filled(

lib/pages/favorites/side_bar.dart

@@ -179,7 +179,7 @@ class _LeftBarState extends State<_LeftBar> implements FolderList {
         alignment: Alignment.centerLeft,
         decoration: BoxDecoration(
           color: isSelected
-              ? context.colorScheme.primaryContainer.withOpacity(0.36)
+              ? context.colorScheme.primaryContainer.toOpacity(0.36)
               : null,
           border: Border(
             left: BorderSide(
@@ -214,7 +214,7 @@ class _LeftBarState extends State<_LeftBar> implements FolderList {
         alignment: Alignment.centerLeft,
         decoration: BoxDecoration(
           color: isSelected
-              ? context.colorScheme.primaryContainer.withOpacity(0.36)
+              ? context.colorScheme.primaryContainer.toOpacity(0.36)
               : null,
           border: Border(
             left: BorderSide(

lib/pages/history_page.dart

@@ -4,8 +4,6 @@ import 'package:venera/foundation/app.dart';
 import 'package:venera/foundation/comic_source/comic_source.dart';
 import 'package:venera/foundation/comic_type.dart';
 import 'package:venera/foundation/history.dart';
-import 'package:venera/foundation/local.dart';
-import 'package:venera/utils/ext.dart';
 import 'package:venera/utils/translations.dart';
 
 class HistoryPage extends StatefulWidget {
@@ -78,31 +76,7 @@ class _HistoryPageState extends State<HistoryPage> {
             ],
           ),
           SliverGridComics(
-            comics: comics.map(
-              (e) {
-                var cover = e.cover;
-                if (!cover.isURL) {
-                  var localComic = LocalManager().find(
-                    e.id,
-                    e.type,
-                  );
-                  if(localComic != null) {
-                    cover = "file://${localComic.coverFile.path}";
-                  }
-                }
-                return Comic(
-                  e.title,
-                  cover,
-                  e.id,
-                  e.subtitle,
-                  null,
-                  getDescription(e),
-                  e.type.comicSource?.key ?? "Invalid:${e.type.value}",
-                  null,
-                  null,
-                );
-              },
-            ).toList(),
+            comics: comics,
             badgeBuilder: (c) {
               return ComicSource.find(c.sourceKey)?.name;
             },
@@ -111,12 +85,18 @@ class _HistoryPageState extends State<HistoryPage> {
                 MenuEntry(
                   icon: Icons.remove,
                   text: 'Remove'.tl,
+                  color: context.colorScheme.error,
                   onClick: () {
-                    if (c.sourceKey.startsWith("Invalid")) {
+                    if (c.sourceKey.startsWith("Unknown")) {
                       HistoryManager().remove(
                         c.id,
                         ComicType(int.parse(c.sourceKey.split(':')[1])),
                       );
+                    } else if (c.sourceKey == 'local') {
+                      HistoryManager().remove(
+                        c.id,
+                        ComicType.local,
+                      );
                     } else {
                       HistoryManager().remove(
                         c.id,

lib/pages/home_page.dart

@@ -1,29 +1,23 @@
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:sliver_tools/sliver_tools.dart';
 import 'package:venera/components/components.dart';
 import 'package:venera/foundation/app.dart';
 import 'package:venera/foundation/comic_source/comic_source.dart';
-import 'package:venera/foundation/comic_type.dart';
 import 'package:venera/foundation/consts.dart';
 import 'package:venera/foundation/favorites.dart';
 import 'package:venera/foundation/history.dart';
-import 'package:venera/foundation/image_provider/cached_image.dart';
+import 'package:venera/foundation/image_provider/history_image_provider.dart';
+import 'package:venera/foundation/image_provider/local_comic_image.dart';
 import 'package:venera/foundation/local.dart';
-import 'package:venera/foundation/log.dart';
 import 'package:venera/pages/accounts_page.dart';
 import 'package:venera/pages/comic_page.dart';
 import 'package:venera/pages/comic_source_page.dart';
 import 'package:venera/pages/downloading_page.dart';
 import 'package:venera/pages/history_page.dart';
 import 'package:venera/pages/search_page.dart';
-import 'package:venera/utils/cbz.dart';
 import 'package:venera/utils/data_sync.dart';
-import 'package:venera/utils/ext.dart';
-import 'package:venera/utils/io.dart';
+import 'package:venera/utils/import_comic.dart';
 import 'package:venera/utils/translations.dart';
-import 'package:sqlite3/sqlite3.dart' as sql;
-import 'dart:math';
 
 import 'local_comics_page.dart';
 
@@ -59,7 +53,7 @@ class _SearchBar extends StatelessWidget {
         width: double.infinity,
         margin: const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
         child: Material(
-          color: context.colorScheme.surfaceContainer,
+          color: context.colorScheme.surfaceContainerHigh,
           borderRadius: BorderRadius.circular(32),
           child: InkWell(
             borderRadius: BorderRadius.circular(32),
@@ -270,21 +264,6 @@ class _HistoryState extends State<_History> {
                     scrollDirection: Axis.horizontal,
                     itemCount: history.length,
                     itemBuilder: (context, index) {
-                      var cover = history[index].cover;
-                      ImageProvider imageProvider = CachedImageProvider(
-                        cover,
-                        sourceKey: history[index].type.comicSource?.key,
-                        cid: history[index].id,
-                      );
-                      if (!cover.isURL) {
-                        var localComic = LocalManager().find(
-                          history[index].id,
-                          history[index].type,
-                        );
-                        if (localComic != null) {
-                          imageProvider = FileImage(localComic.coverFile);
-                        }
-                      }
                       return InkWell(
                         onTap: () {
                           context.to(
@@ -307,7 +286,7 @@ class _HistoryState extends State<_History> {
                           ),
                           clipBehavior: Clip.antiAlias,
                           child: AnimatedImage(
-                            image: imageProvider,
+                            image: HistoryImageProvider(history[index]),
                             width: 96,
                             height: 128,
                             fit: BoxFit.cover,
@@ -424,8 +403,8 @@ class _LocalState extends State<_Local> {
                           ),
                           clipBehavior: Clip.antiAlias,
                           child: AnimatedImage(
-                            image: FileImage(
-                              local[index].coverFile,
+                            image: LocalComicImageProvider(
+                              local[index],
                             ),
                             width: 96,
                             height: 128,
@@ -502,6 +481,10 @@ class _ImportComicsWidgetState extends State<_ImportComicsWidget> {
 
   String? selectedFolder;
 
+  bool copyToLocalFolder = true;
+
+  bool cancelled = false;
+
   @override
   void dispose() {
     loading = false;
@@ -513,7 +496,7 @@ class _ImportComicsWidgetState extends State<_ImportComicsWidget> {
     String info = [
       "Select a directory which contains the comic files.".tl,
       "Select a directory which contains the comic directories.".tl,
-      "Select a cbz file.".tl,
+      "Select a cbz/zip file.".tl,
       "Select an EhViewer database and a download folder.".tl
     ][type];
     List<String> importMethods = [
@@ -535,22 +518,23 @@ class _ImportComicsWidgetState extends State<_ImportComicsWidget> {
               ),
             )
           : Column(
-              key: key,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                const SizedBox(width: 600),
-                ...List.generate(importMethods.length, (index) {
-                  return RadioListTile(
-                    title: Text(importMethods[index]),
-                    value: index,
-                    groupValue: type,
-                    onChanged: (value) {
-                      setState(() {
-                        type = value as int;
-                      });
-                    },
-                  );
-                }),
+            key: key,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              const SizedBox(width: 600),
+              ...List.generate(importMethods.length, (index) {
+                return RadioListTile(
+                  title: Text(importMethods[index]),
+                  value: index,
+                  groupValue: type,
+                  onChanged: (value) {
+                    setState(() {
+                      type = value as int;
+                    });
+                  },
+                );
+              }),
+              if(type != 3)
                 ListTile(
                   title: Text("Add to favorites".tl),
                   trailing: Select(
@@ -564,10 +548,20 @@ class _ImportComicsWidgetState extends State<_ImportComicsWidget> {
                     },
                   ),
                 ).paddingHorizontal(8),
-                const SizedBox(height: 8),
-                Text(info).paddingHorizontal(24),
-              ],
-            ),
+              if(!App.isIOS && !App.isMacOS)
+                CheckboxListTile(
+                  enabled: true,
+                  title: Text("Copy to app local path".tl),
+                  value: copyToLocalFolder,
+                  onChanged:(v) {
+                    setState(() {
+                      copyToLocalFolder = !copyToLocalFolder;
+                    });
+                  }).paddingHorizontal(8),
+              const SizedBox(height: 8),
+              Text(info).paddingHorizontal(24),
+            ],
+          ),
       actions: [
         Button.text(
           child: Row(
@@ -584,7 +578,7 @@ class _ImportComicsWidgetState extends State<_ImportComicsWidget> {
           onPressed: () {
             showDialog(
               context: context,
-              barrierColor: Colors.black.withOpacity(0.2),
+              barrierColor: Colors.black.toOpacity(0.2),
               builder: (context) {
                 var help = '';
                 help +=
@@ -624,323 +618,28 @@ class _ImportComicsWidgetState extends State<_ImportComicsWidget> {
   }
 
   void selectAndImport() async {
-    if (type == 2) {
-      var xFile = await selectFile(ext: ['cbz']);
-      var controller = showLoadingDialog(context, allowCancel: false);
-      try {
-        var cache = FilePath.join(App.cachePath, xFile?.name ?? 'temp.cbz');
-        await xFile!.saveTo(cache);
-        var comic = await CBZ.import(File(cache));
-        if (selectedFolder != null) {
-          LocalFavoritesManager().addComic(
-              selectedFolder!,
-              FavoriteItem(
-                id: comic.id,
-                name: comic.title,
-                coverPath: comic.cover,
-                author: comic.subtitle,
-                type: comic.comicType,
-                tags: comic.tags,
-              ));
-        }
-        await File(cache).deleteIgnoreError();
-      } catch (e, s) {
-        Log.error("Import Comic", e.toString(), s);
-        context.showMessage(message: e.toString());
-      }
-      controller.close();
-      return;
-    } else if (type == 3) {
-      var dbFile = await selectFile(ext: ['db']);
-      final picker = DirectoryPicker();
-      final comicSrc = await picker.pickDirectory();
-      if (dbFile == null || comicSrc == null) {
-        return;
-      }
-
-      bool cancelled = false;
-      var controller = showLoadingDialog(context, onCancel: () { cancelled = true; });
-
-      try {
-        var cache = FilePath.join(App.cachePath, dbFile.name);
-        await dbFile.saveTo(cache);
-        var db = sql.sqlite3.open(cache);
-
-        Future<void> addTagComics(String destFolder, List<sql.Row> comics) async {
-          for(var comic in comics) {
-            if(cancelled) {
-              return;
-            }
-            var comicDir = Directory(FilePath.join(comicSrc.path, comic['DIRNAME'] as String));
-            if(!(await comicDir.exists())) {
-              continue;
-            }
-            String titleJP = comic['TITLE_JPN'] == null ? "" : comic['TITLE_JPN'] as String;
-            String title = titleJP == "" ? comic['TITLE'] as String : titleJP;
-            if (LocalManager().findByName(title) != null) {
-              Log.info("Import Comic", "Comic already exists: $title");
-              continue;
-            }
-            
-            String coverURL = await comicDir.joinFile(".thumb").exists() ? 
-              comicDir.joinFile(".thumb").path : 
-              (comic['THUMB'] as String).replaceAll('s.exhentai.org', 'ehgt.org');
-            int downloadedTimeStamp = comic['TIME'] as int;
-            DateTime downloadedTime = 
-              downloadedTimeStamp != 0 ? 
-              DateTime.fromMillisecondsSinceEpoch(downloadedTimeStamp) : DateTime.now();
-            var comicObj = LocalComic(
-              id: LocalManager().findValidId(ComicType.local),
-              title: title,
-              subtitle: '',
-              tags: [
-                //1 >> x
-                [
-                  "MISC",
-                  "DOUJINSHI",
-                  "MANGA",
-                  "ARTISTCG",
-                  "GAMECG",
-                  "IMAGE SET",
-                  "COSPLAY",
-                  "ASIAN PORN",
-                  "NON-H",
-                  "WESTERN",
-                ][(log(comic['CATEGORY'] as int) / ln2).floor()]
-              ],
-              directory: comicDir.path,
-              chapters: null,
-              cover: coverURL,
-              comicType: ComicType.local,
-              downloadedChapters: [],
-              createdAt: downloadedTime,
-            );
-            LocalManager().add(comicObj, comicObj.id);
-            LocalFavoritesManager().addComic(
-              destFolder,
-              FavoriteItem(
-                id: comicObj.id,
-                name: comicObj.title,
-                coverPath: comicObj.cover,
-                author: comicObj.subtitle,
-                type: comicObj.comicType,
-                tags: comicObj.tags,
-                favoriteTime: downloadedTime
-              ),
-            );
-          }
-        }
-
-        //default folder
-        {
-          var defaultFolderName = '(EhViewer)Default'.tl;
-          if(!LocalFavoritesManager().existsFolder(defaultFolderName)) {
-            LocalFavoritesManager().createFolder(defaultFolderName);
-          }
-          var comicList = db.select("""
-              SELECT * 
-              FROM DOWNLOAD_DIRNAME DN
-              LEFT JOIN DOWNLOADS DL
-              ON DL.GID = DN.GID
-              WHERE DL.LABEL IS NULL AND DL.STATE = 3
-              ORDER BY DL.TIME DESC
-            """).toList();
-          await addTagComics(defaultFolderName, comicList);
-        }
-
-        var folders = db.select("""
-            SELECT * FROM DOWNLOAD_LABELS;
-          """);
-
-        for (var folder in folders) {
-          if(cancelled) {
-            break;
-          }
-          var label = folder["LABEL"] as String;
-          var folderName = '(EhViewer)$label';
-          if(!LocalFavoritesManager().existsFolder(folderName)) {
-            LocalFavoritesManager().createFolder(folderName);
-          }
-          var comicList = db.select("""
-              SELECT * 
-              FROM DOWNLOAD_DIRNAME DN
-              LEFT JOIN DOWNLOADS DL
-              ON DL.GID = DN.GID
-              WHERE DL.LABEL = ? AND DL.STATE = 3
-              ORDER BY DL.TIME DESC
-            """, [label]).toList();
-          await addTagComics(folderName, comicList);
-        }
-        db.dispose();
-        await File(cache).deleteIgnoreError();
-      } catch (e, s) {
-        Log.error("Import Comic", e.toString(), s);
-        context.showMessage(message: e.toString());
-      }
-      controller.close();
-      return;
-    }
     height = key.currentContext!.size!.height;
+
     setState(() {
       loading = true;
     });
-    final picker = DirectoryPicker();
-    final path = await picker.pickDirectory();
-    if (!loading) {
-      picker.dispose();
-      return;
-    }
-    if (path == null) {
+    var importer = ImportComic(
+        selectedFolder: selectedFolder,
+        copyToLocal: copyToLocalFolder);
+    var result = switch(type) {
+      0 => await importer.directory(true),
+      1 => await importer.directory(false),
+      2 => await importer.cbz(),
+      3 => await importer.ehViewer(),
+      int() => true,
+    };
+    if(result) {
+      context.pop();
+    } else {
       setState(() {
         loading = false;
       });
-      return;
     }
-    Map<Directory, LocalComic> comics = {};
-    if (type == 0) {
-      var result = await checkSingleComic(path);
-      if (result != null) {
-        comics[path] = result;
-      } else {
-        context.showMessage(message: "Invalid Comic".tl);
-        setState(() {
-          loading = false;
-        });
-        return;
-      }
-    } else {
-      await for (var entry in path.list()) {
-        if (entry is Directory) {
-          var result = await checkSingleComic(entry);
-          if (result != null) {
-            comics[entry] = result;
-          }
-        }
-      }
-    }
-    bool shouldCopy = true;
-    for (var comic in comics.keys) {
-      if (comic.parent.path == LocalManager().path) {
-        shouldCopy = false;
-        break;
-      }
-    }
-    if (shouldCopy && comics.isNotEmpty) {
-      try {
-        // copy the comics to the local directory
-        await compute<Map<String, dynamic>, void>(_copyDirectories, {
-          'toBeCopied': comics.keys.map((e) => e.path).toList(),
-          'destination': LocalManager().path,
-        });
-      } catch (e) {
-        context.showMessage(message: "Failed to import comics".tl);
-        Log.error("Import Comic", e.toString());
-        setState(() {
-          loading = false;
-        });
-        return;
-      }
-    }
-    for (var comic in comics.values) {
-      LocalManager().add(comic, LocalManager().findValidId(ComicType.local));
-      if (selectedFolder != null) {
-        LocalFavoritesManager().addComic(
-            selectedFolder!,
-            FavoriteItem(
-              id: comic.id,
-              name: comic.title,
-              coverPath: comic.cover,
-              author: comic.subtitle,
-              type: comic.comicType,
-              tags: comic.tags,
-            ));
-      }
-    }
-    context.pop();
-    context.showMessage(
-        message: "Imported @a comics".tlParams({
-      'a': comics.length,
-    }));
-  }
-
-  static _copyDirectories(Map<String, dynamic> data) {
-    var toBeCopied = data['toBeCopied'] as List<String>;
-    var destination = data['destination'] as String;
-    for (var dir in toBeCopied) {
-      var source = Directory(dir);
-      var dest = Directory("$destination/${source.name}");
-      if (dest.existsSync()) {
-        // The destination directory already exists, and it is not managed by the app.
-        // Rename the old directory to avoid conflicts.
-        Log.info("Import Comic",
-            "Directory already exists: ${source.name}\nRenaming the old directory.");
-        dest.rename(
-            findValidDirectoryName(dest.parent.path, "${dest.path}_old"));
-      }
-      dest.createSync();
-      copyDirectory(source, dest);
-    }
-  }
-
-  Future<LocalComic?> checkSingleComic(Directory directory) async {
-    if (!(await directory.exists())) return null;
-    var name = directory.name;
-    if (LocalManager().findByName(name) != null) {
-      Log.info("Import Comic", "Comic already exists: $name");
-      return null;
-    }
-    bool hasChapters = false;
-    var chapters = <String>[];
-    var coverPath = ''; // relative path to the cover image
-    await for (var entry in directory.list()) {
-      if (entry is Directory) {
-        hasChapters = true;
-        chapters.add(entry.name);
-        await for (var file in entry.list()) {
-          if (file is Directory) {
-            Log.info("Import Comic",
-                "Invalid Chapter: ${entry.name}\nA directory is found in the chapter directory.");
-            return null;
-          }
-        }
-      } else if (entry is File) {
-        if (entry.name.startsWith('cover')) {
-          coverPath = entry.name;
-        }
-        const imageExtensions = ['jpg', 'jpeg', 'png', 'webp', 'gif', 'jpe'];
-        if (!coverPath.startsWith('cover') &&
-            imageExtensions.contains(entry.extension)) {
-          coverPath = entry.name;
-        }
-      }
-    }
-    chapters.sort();
-    if (hasChapters && coverPath == '') {
-      // use the first image in the first chapter as the cover
-      var firstChapter = Directory('${directory.path}/${chapters.first}');
-      await for (var entry in firstChapter.list()) {
-        if (entry is File) {
-          coverPath = entry.name;
-          break;
-        }
-      }
-    }
-    if (coverPath == '') {
-      Log.info("Import Comic", "Invalid Comic: $name\nNo cover image found.");
-      return null;
-    }
-    return LocalComic(
-      id: '0',
-      title: name,
-      subtitle: '',
-      tags: [],
-      directory: directory.name,
-      chapters: hasChapters ? Map.fromIterables(chapters, chapters) : null,
-      cover: coverPath,
-      comicType: ComicType.local,
-      downloadedChapters: chapters,
-      createdAt: DateTime.now(),
-    );
   }
 }
 

lib/pages/local_comics_page.dart

@@ -4,9 +4,12 @@ import 'package:venera/foundation/app.dart';
 import 'package:venera/foundation/appdata.dart';
 import 'package:venera/foundation/comic_source/comic_source.dart';
 import 'package:venera/foundation/local.dart';
+import 'package:venera/foundation/log.dart';
 import 'package:venera/pages/downloading_page.dart';
 import 'package:venera/utils/cbz.dart';
+import 'package:venera/utils/epub.dart';
 import 'package:venera/utils/io.dart';
+import 'package:venera/utils/pdf.dart';
 import 'package:venera/utils/translations.dart';
 
 class LocalComicsPage extends StatefulWidget {
@@ -298,24 +301,15 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
                             return StatefulBuilder(builder: (context, state) {
                               return ContentDialog(
                                 title: "Delete".tl,
-                                content: Column(
-                                  children: [
-                                    Text("Delete selected comics?".tl)
-                                        .paddingVertical(8),
-                                    Transform.scale(
-                                        scale: 0.9,
-                                        child: CheckboxListTile(
-                                            title: Text(
-                                                "Also remove files on disk".tl),
-                                            value: removeComicFile,
-                                            onChanged: (v) {
-                                              state(() {
-                                                removeComicFile =
-                                                    !removeComicFile;
-                                              });
-                                            })),
-                                  ],
-                                ).paddingHorizontal(16).paddingVertical(8),
+                                content: CheckboxListTile(
+                                  title: Text("Also remove files on disk".tl),
+                                  value: removeComicFile,
+                                  onChanged: (v) {
+                                    state(() {
+                                      removeComicFile = !removeComicFile;
+                                    });
+                                  },
+                                ),
                                 actions: [
                                   FilledButton(
                                     onPressed: () {
@@ -369,6 +363,61 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
                       }
                       controller.close();
                     }),
+                if (!multiSelectMode)
+                  MenuEntry(
+                    icon: Icons.picture_as_pdf_outlined,
+                    text: "Export as pdf".tl,
+                    onClick: () async {
+                      var cache = FilePath.join(App.cachePath, 'temp.pdf');
+                      var controller = showLoadingDialog(
+                        context,
+                        allowCancel: false,
+                      );
+                      try {
+                        await createPdfFromComicIsolate(
+                          comic: c as LocalComic,
+                          savePath: cache,
+                        );
+                        await saveFile(
+                          file: File(cache),
+                          filename: "${c.title}.pdf",
+                        );
+                      } catch (e, s) {
+                        Log.error("PDF Export", e, s);
+                        context.showMessage(message: e.toString());
+                      } finally {
+                        controller.close();
+                        File(cache).deleteIgnoreError();
+                      }
+                    },
+                  ),
+                if (!multiSelectMode)
+                  MenuEntry(
+                    icon: Icons.import_contacts_outlined,
+                    text: "Export as epub".tl,
+                    onClick: () async {
+                      var controller = showLoadingDialog(
+                        context,
+                        allowCancel: false,
+                      );
+                      File? file;
+                      try {
+                        file = await createEpubWithLocalComic(
+                          c as LocalComic,
+                        );
+                        await saveFile(
+                          file: file,
+                          filename: "${c.title}.epub",
+                        );
+                      } catch (e, s) {
+                        Log.error("EPUB Export", e, s);
+                        context.showMessage(message: e.toString());
+                      } finally {
+                        controller.close();
+                        file?.deleteIgnoreError();
+                      }
+                    },
+                  )
               ];
             },
           ),
@@ -379,12 +428,12 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
     return PopScope(
       canPop: !multiSelectMode && !searchMode,
       onPopInvokedWithResult: (didPop, result) {
-        if(multiSelectMode) {
+        if (multiSelectMode) {
           setState(() {
             multiSelectMode = false;
             selectedComics.clear();
           });
-        } else if(searchMode) {
+        } else if (searchMode) {
           setState(() {
             searchMode = false;
             keyword = "";

lib/pages/main_page.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:venera/foundation/appdata.dart';
 import 'package:venera/pages/categories_page.dart';
 import 'package:venera/pages/search_page.dart';
 import 'package:venera/pages/settings/settings_page.dart';
@@ -6,6 +7,7 @@ import 'package:venera/utils/translations.dart';
 
 import '../components/components.dart';
 import '../foundation/app.dart';
+import 'comic_source_page.dart';
 import 'explore_page.dart';
 import 'favorites/favorites_page.dart';
 import 'home_page.dart';
@@ -34,8 +36,25 @@ class _MainPageState extends State<MainPage> {
     _navigatorKey!.currentContext!.pop();
   }
 
+  void checkUpdates() async {
+    if (!appdata.settings['checkUpdateOnStart']) {
+      return;
+    }
+    var lastCheck = appdata.implicitData['lastCheckUpdate'] ?? 0;
+    var now = DateTime.now().millisecondsSinceEpoch;
+    if (now - lastCheck < 24 * 60 * 60 * 1000) {
+      return;
+    }
+    appdata.implicitData['lastCheckUpdate'] = now;
+    appdata.writeImplicitData();
+    await Future.delayed(const Duration(milliseconds: 300));
+    await checkUpdateUi(false);
+    await ComicSourcePage.checkComicSourceUpdate(true);
+  }
+
   @override
   void initState() {
+    checkUpdates();
     _observer = NaviObserver();
     _navigatorKey = GlobalKey();
     App.mainNavigatorKey = _navigatorKey;
@@ -43,10 +62,18 @@ class _MainPageState extends State<MainPage> {
   }
 
   final _pages = [
-    const HomePage(),
-    const FavoritesPage(),
-    const ExplorePage(),
-    const CategoriesPage(),
+    const HomePage(
+      key: PageStorageKey('home'),
+    ),
+    const FavoritesPage(
+      key: PageStorageKey('favorites'),
+    ),
+    const ExplorePage(
+      key: PageStorageKey('explore'),
+    ),
+    const CategoriesPage(
+      key: PageStorageKey('categories'),
+    ),
   ];
 
   var index = 0;

lib/pages/reader/gesture.dart

@@ -103,6 +103,9 @@ class _ReaderGestureDetectorState extends State<_ReaderGestureDetector> {
   }
 
   void onMouseWheel(bool forward) {
+    if (HardwareKeyboard.instance.isControlPressed) {
+      return;
+    }
     if (context.reader.mode.key.startsWith('gallery')) {
       if (forward) {
         if (!context.reader.toNextPage()) {
@@ -265,5 +268,5 @@ class _DragListener {
   void Function(Offset offset)? onMove;
   void Function()? onEnd;
 
-  _DragListener({this.onStart, this.onMove, this.onEnd});
+  _DragListener({this.onMove, this.onEnd});
 }

lib/pages/reader/images.dart

@@ -83,7 +83,8 @@ class _ReaderImagesState extends State<_ReaderImages> {
       );
     } else {
       if (reader.mode.isGallery) {
-        return _GalleryMode(key: Key(reader.mode.key));
+        return _GalleryMode(
+            key: Key('${reader.mode.key}_${reader.imagesPerPage}'));
       } else {
         return _ContinuousMode(key: Key(reader.mode.key));
       }
@@ -110,6 +111,10 @@ class _GalleryModeState extends State<_GalleryMode>
 
   late _ReaderState reader;
 
+  int get totalPages => ((reader.images!.length + reader.imagesPerPage - 1) /
+          reader.imagesPerPage)
+      .ceil();
+
   @override
   void initState() {
     reader = context.reader;
@@ -124,8 +129,14 @@ class _GalleryModeState extends State<_GalleryMode>
 
   void cache(int current) {
     for (int i = current + 1; i <= current + preCacheCount; i++) {
-      if (i <= reader.maxPage && !cached[i]) {
-        _precacheImage(i, context);
+      if (i <= totalPages && !cached[i]) {
+        int startIndex = (i - 1) * reader.imagesPerPage;
+        int endIndex =
+            math.min(startIndex + reader.imagesPerPage, reader.images!.length);
+        for (int i = startIndex; i < endIndex; i++) {
+          precacheImage(
+              _createImageProviderFromKey(reader.images![i], context), context);
+        }
         cached[i] = true;
       }
     }
@@ -141,32 +152,46 @@ class _GalleryModeState extends State<_GalleryMode>
       scrollDirection: reader.mode == ReaderMode.galleryTopToBottom
           ? Axis.vertical
           : Axis.horizontal,
-      itemCount: reader.images!.length + 2,
+      itemCount: totalPages + 2,
       builder: (BuildContext context, int index) {
-        ImageProvider? imageProvider;
-        if (index != 0 && index != reader.images!.length + 1) {
-          imageProvider = _createImageProvider(index, context);
-        } else {
+        if (index == 0 || index == totalPages + 1) {
           return PhotoViewGalleryPageOptions.customChild(
             scaleStateController: PhotoViewScaleStateController(),
             child: const SizedBox(),
           );
+        } else {
+          int pageIndex = index - 1;
+          int startIndex = pageIndex * reader.imagesPerPage;
+          int endIndex = math.min(
+              startIndex + reader.imagesPerPage, reader.images!.length);
+          List<String> pageImages =
+              reader.images!.sublist(startIndex, endIndex);
+
+          cached[index] = true;
+          cache(index);
+
+          photoViewControllers[index] = PhotoViewController();
+
+          if (reader.imagesPerPage == 1) {
+            return PhotoViewGalleryPageOptions(
+              filterQuality: FilterQuality.medium,
+              controller: photoViewControllers[index],
+              imageProvider:
+                  _createImageProviderFromKey(pageImages[0], context),
+              fit: BoxFit.contain,
+              errorBuilder: (_, error, s, retry) {
+                return NetworkError(message: error.toString(), retry: retry);
+              },
+            );
+          }
+
+          return PhotoViewGalleryPageOptions.customChild(
+            controller: photoViewControllers[index],
+            minScale: PhotoViewComputedScale.contained * 1.0,
+            maxScale: PhotoViewComputedScale.covered * 10.0,
+            child: buildPageImages(pageImages),
+          );
         }
-
-        cached[index] = true;
-        cache(index);
-
-        photoViewControllers[index] ??= PhotoViewController();
-
-        return PhotoViewGalleryPageOptions(
-          filterQuality: FilterQuality.medium,
-          controller: photoViewControllers[index],
-          imageProvider: imageProvider,
-          fit: BoxFit.contain,
-          errorBuilder: (_, error, s, retry) {
-            return NetworkError(message: error.toString(), retry: retry);
-          },
-        );
       },
       pageController: controller,
       loadingBuilder: (context, event) => Center(
@@ -186,9 +211,9 @@ class _GalleryModeState extends State<_GalleryMode>
           if (!reader.toPrevChapter()) {
             reader.toPage(1);
           }
-        } else if (i == reader.maxPage + 1) {
+        } else if (i == totalPages + 1) {
           if (!reader.toNextChapter()) {
-            reader.toPage(reader.maxPage);
+            reader.toPage(totalPages);
           }
         } else {
           reader.setPage(i);
@@ -198,9 +223,30 @@ class _GalleryModeState extends State<_GalleryMode>
     );
   }
 
+  Widget buildPageImages(List<String> images) {
+    Axis axis = (reader.mode == ReaderMode.galleryTopToBottom)
+        ? Axis.vertical
+        : Axis.horizontal;
+
+    List<Widget> imageWidgets = images.map((imageKey) {
+      ImageProvider imageProvider =
+          _createImageProviderFromKey(imageKey, context);
+      return Expanded(
+        child: Image(
+          image: imageProvider,
+          fit: BoxFit.contain,
+        ),
+      );
+    }).toList();
+
+    return axis == Axis.vertical
+        ? Column(children: imageWidgets)
+        : Row(children: imageWidgets);
+  }
+
   @override
   Future<void> animateToPage(int page) {
-    if ((page - controller.page!).abs() > 1) {
+    if ((page - controller.page!.round()).abs() > 1) {
       controller.jumpToPage(page > controller.page! ? page - 1 : page + 1);
     }
     return controller.animateToPage(
@@ -223,7 +269,7 @@ class _GalleryModeState extends State<_GalleryMode>
 
   @override
   void handleLongPressDown(Offset location) {
-    if(!appdata.settings['enableLongPressToZoom']) {
+    if (!appdata.settings['enableLongPressToZoom']) {
       return;
     }
     var photoViewController = photoViewControllers[reader.page]!;
@@ -237,7 +283,7 @@ class _GalleryModeState extends State<_GalleryMode>
 
   @override
   void handleLongPressUp(Offset location) {
-    if(!appdata.settings['enableLongPressToZoom']) {
+    if (!appdata.settings['enableLongPressToZoom']) {
       return;
     }
     var photoViewController = photoViewControllers[reader.page]!;
@@ -473,7 +519,9 @@ class _ContinuousModeState extends State<_ContinuousMode>
     );
     var width = MediaQuery.of(context).size.width;
     var height = MediaQuery.of(context).size.height;
-    if(appdata.settings['limitImageWidth'] && width / height > 0.7) {
+    if (appdata.settings['limitImageWidth'] &&
+        width / height > 0.7 &&
+        reader.mode == ReaderMode.continuousTopToBottom) {
       width = height * 0.7;
     }
 
@@ -521,7 +569,7 @@ class _ContinuousModeState extends State<_ContinuousMode>
 
   @override
   void handleLongPressDown(Offset location) {
-    if(!appdata.settings['enableLongPressToZoom']) {
+    if (!appdata.settings['enableLongPressToZoom']) {
       return;
     }
     double target = photoViewController.getInitialScale!.call()! * 1.75;
@@ -534,7 +582,7 @@ class _ContinuousModeState extends State<_ContinuousMode>
 
   @override
   void handleLongPressUp(Offset location) {
-    if(!appdata.settings['enableLongPressToZoom']) {
+    if (!appdata.settings['enableLongPressToZoom']) {
       return;
     }
     double target = photoViewController.getInitialScale!.call()!;
@@ -598,19 +646,21 @@ class _ContinuousModeState extends State<_ContinuousMode>
   }
 }
 
+ImageProvider _createImageProviderFromKey(
+    String imageKey, BuildContext context) {
+  var reader = context.reader;
+  return ReaderImageProvider(
+    imageKey,
+    reader.type.comicSource?.key,
+    reader.cid,
+    reader.eid,
+  );
+}
+
 ImageProvider _createImageProvider(int page, BuildContext context) {
   var reader = context.reader;
   var imageKey = reader.images![page - 1];
-  if (imageKey.startsWith('file://')) {
-    return FileImage(File(imageKey.replaceFirst("file://", '')));
-  } else {
-    return ReaderImageProvider(
-      imageKey,
-      reader.type.comicSource!.key,
-      reader.cid,
-      reader.eid,
-    );
-  }
+  return _createImageProviderFromKey(imageKey, context);
 }
 
 void _precacheImage(int page, BuildContext context) {

lib/pages/reader/reader.dart

@@ -1,6 +1,7 @@
-library venera_reader;
+library;
 
 import 'dart:async';
+import 'dart:math' as math;
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
@@ -8,6 +9,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_memory_info/flutter_memory_info.dart';
 import 'package:photo_view/photo_view.dart';
 import 'package:photo_view/photo_view_gallery.dart';
 import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
@@ -20,6 +22,7 @@ import 'package:venera/foundation/comic_type.dart';
 import 'package:venera/foundation/history.dart';
 import 'package:venera/foundation/image_provider/reader_image.dart';
 import 'package:venera/foundation/local.dart';
+import 'package:venera/foundation/log.dart';
 import 'package:venera/pages/settings/settings_page.dart';
 import 'package:venera/utils/data_sync.dart';
 import 'package:venera/utils/file_type.dart';
@@ -59,7 +62,7 @@ class Reader extends StatefulWidget {
 
   final String name;
 
-  /// Map<Chapter ID, Chapter Name>.
+  /// key: Chapter ID, value: Chapter Name
   /// null if the comic is a gallery
   final Map<String, String>? chapters;
 
@@ -82,7 +85,8 @@ class _ReaderState extends State<Reader> with _ReaderLocation, _ReaderWindow {
   }
 
   @override
-  int get maxPage => images?.length ?? 1;
+  int get maxPage =>
+      ((images?.length ?? 1) + imagesPerPage - 1) ~/ imagesPerPage;
 
   ComicType get type => widget.type;
 
@@ -94,6 +98,30 @@ class _ReaderState extends State<Reader> with _ReaderLocation, _ReaderWindow {
 
   late ReaderMode mode;
 
+  int get imagesPerPage => appdata.settings['readerScreenPicNumber'] ?? 1;
+
+  int _lastImagesPerPage = appdata.settings['readerScreenPicNumber'] ?? 1;
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    _checkImagesPerPageChange();
+  }
+
+  void _checkImagesPerPageChange() {
+    int currentImagesPerPage = imagesPerPage;
+    if (_lastImagesPerPage != currentImagesPerPage) {
+      _adjustPageForImagesPerPageChange(_lastImagesPerPage, currentImagesPerPage);
+      _lastImagesPerPage = currentImagesPerPage;
+    }
+  }
+
+  void _adjustPageForImagesPerPageChange(int oldImagesPerPage, int newImagesPerPage) {
+    int previousImageIndex = (page - 1) * oldImagesPerPage;
+    int newPage = (previousImageIndex ~/ newImagesPerPage) + 1;
+    page = newPage;
+  }
+
   History? history;
 
   @override
@@ -116,9 +144,27 @@ class _ReaderState extends State<Reader> with _ReaderLocation, _ReaderWindow {
     if(appdata.settings['enableTurnPageByVolumeKey']) {
       handleVolumeEvent();
     }
+    setImageCacheSize();
     super.initState();
   }
 
+  void setImageCacheSize() async {
+    var availableRAM = await MemoryInfo.getFreePhysicalMemorySize();
+    if (availableRAM == null) return;
+    int maxImageCacheSize;
+    if (availableRAM < 1 << 30) {
+      maxImageCacheSize = 100 << 20;
+    } else if (availableRAM < 2 << 30) {
+      maxImageCacheSize = 200 << 20;
+    } else if (availableRAM < 4 << 30) {
+      maxImageCacheSize = 300 << 20;
+    } else {
+      maxImageCacheSize = 500 << 20;
+    }
+    Log.info("Reader", "Detect available RAM: $availableRAM, set image cache size to $maxImageCacheSize");
+    PaintingBinding.instance.imageCache.maximumSizeBytes = maxImageCacheSize;
+  }
+
   @override
   void dispose() {
     autoPageTurningTimer?.cancel();
@@ -128,11 +174,13 @@ class _ReaderState extends State<Reader> with _ReaderLocation, _ReaderWindow {
     Future.microtask(() {
       DataSync().onDataChanged();
     });
+    PaintingBinding.instance.imageCache.maximumSizeBytes = 100 << 20;
     super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
+    _checkImagesPerPageChange();
     return KeyboardListener(
       focusNode: focusNode,
       autofocus: true,

lib/pages/reader/scaffold.dart

@@ -167,10 +167,10 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
       child: Container(
         padding: EdgeInsets.only(top: context.padding.top),
         decoration: BoxDecoration(
-          color: context.colorScheme.surface.withOpacity(0.82),
+          color: context.colorScheme.surface.toOpacity(0.82),
           border: Border(
             bottom: BorderSide(
-              color: Colors.grey.withOpacity(0.5),
+              color: Colors.grey.toOpacity(0.5),
               width: 0.5,
             ),
           ),
@@ -357,10 +357,10 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
     return BlurEffect(
       child: Container(
         decoration: BoxDecoration(
-          color: context.colorScheme.surface.withOpacity(0.82),
+          color: context.colorScheme.surface.toOpacity(0.82),
           border: Border(
             top: BorderSide(
-              color: Colors.grey.withOpacity(0.5),
+              color: Colors.grey.toOpacity(0.5),
               width: 0.5,
             ),
           ),
@@ -641,7 +641,7 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
                       color: Theme.of(context)
                           .colorScheme
                           .surfaceTint
-                          .withOpacity(0.2),
+                          .toOpacity(0.2),
                       child: const SizedBox.expand(),
                     ),
                   ),

lib/pages/search_page.dart

@@ -7,6 +7,7 @@ import 'package:venera/foundation/app.dart';
 import 'package:venera/foundation/appdata.dart';
 import 'package:venera/foundation/comic_source/comic_source.dart';
 import 'package:venera/foundation/state_controller.dart';
+import 'package:venera/pages/aggregated_search_page.dart';
 import 'package:venera/pages/search_result_page.dart';
 import 'package:venera/utils/app_links.dart';
 import 'package:venera/utils/ext.dart';
@@ -27,6 +28,8 @@ class _SearchPageState extends State<SearchPage> {
 
   String searchTarget = "";
 
+  bool aggregatedSearch = false;
+
   var focusNode = FocusNode();
 
   var options = <String>[];
@@ -36,15 +39,21 @@ class _SearchPageState extends State<SearchPage> {
   }
 
   void search([String? text]) {
-    context
-        .to(
-          () => SearchResultPage(
-            text: text ?? controller.text,
-            sourceKey: searchTarget,
-            options: options,
-          ),
-        )
-        .then((_) => update());
+    if (aggregatedSearch) {
+      context
+          .to(() => AggregatedSearchPage(keyword: text ?? controller.text))
+          .then((_) => update());
+    } else {
+      context
+          .to(
+            () => SearchResultPage(
+              text: text ?? controller.text,
+              sourceKey: searchTarget,
+              options: options,
+            ),
+          )
+          .then((_) => update());
+    }
   }
 
   var suggestions = <Pair<String, TranslationType>>[];
@@ -189,6 +198,7 @@ class _SearchPageState extends State<SearchPage> {
           children: [
             ListTile(
               contentPadding: EdgeInsets.zero,
+              leading: const Icon(Icons.search),
               title: Text("Search in".tl),
             ),
             Wrap(
@@ -197,8 +207,9 @@ class _SearchPageState extends State<SearchPage> {
               children: sources.map((e) {
                 return OptionChip(
                   text: e.name,
-                  isSelected: searchTarget == e.key,
+                  isSelected: searchTarget == e.key || aggregatedSearch,
                   onTap: () {
+                    if (aggregatedSearch) return;
                     setState(() {
                       searchTarget = e.key;
                       useDefaultOptions();
@@ -207,6 +218,18 @@ class _SearchPageState extends State<SearchPage> {
                 );
               }).toList(),
             ),
+            ListTile(
+              contentPadding: EdgeInsets.zero,
+              title: Text("Aggregated Search".tl),
+              leading: Checkbox(
+                value: aggregatedSearch,
+                onChanged: (value) {
+                  setState(() {
+                    aggregatedSearch = value ?? false;
+                  });
+                },
+              ),
+            ),
           ],
         ),
       ),
@@ -221,6 +244,10 @@ class _SearchPageState extends State<SearchPage> {
   }
 
   Widget buildSearchOptions() {
+    if (aggregatedSearch) {
+      return const SliverToBoxAdapter(child: SizedBox());
+    }
+
     var children = <Widget>[];
 
     final searchOptions =
@@ -262,9 +289,9 @@ class _SearchPageState extends State<SearchPage> {
       delegate: SliverChildBuilderDelegate(
         (context, index) {
           if (index == 0) {
-            return const Divider(
-              thickness: 0.6,
-            ).paddingTop(16);
+            return const SizedBox(
+              height: 16,
+            );
           }
           if (index == 1) {
             return ListTile(

lib/pages/search_result_page.dart

@@ -14,14 +14,14 @@ class SearchResultPage extends StatefulWidget {
     super.key,
     required this.text,
     required this.sourceKey,
-    required this.options,
+    this.options,
   });
 
   final String text;
 
   final String sourceKey;
 
-  final List<String> options;
+  final List<String>? options;
 
   @override
   State<SearchResultPage> createState() => _SearchResultPageState();
@@ -99,7 +99,7 @@ class _SearchResultPageState extends State<SearchResultPage> {
       onSearch: search,
     );
     sourceKey = widget.sourceKey;
-    options = widget.options;
+    options = widget.options ?? const [];
     validateOptions();
     text = widget.text;
     appdata.addSearchHistory(text);

lib/pages/settings/about.dart

@@ -68,6 +68,13 @@ class _AboutSettingsState extends State<AboutSettings> {
             launchUrlString("https://github.com/venera-app/venera");
           },
         ).toSliver(),
+        ListTile(
+          title: const Text("Telegram"),
+          trailing: const Icon(Icons.open_in_new),
+          onTap: () {
+            launchUrlString("https://t.me/venera_release");
+          },
+        ).toSliver(),
       ],
     );
   }
@@ -86,29 +93,33 @@ Future<bool> checkUpdate() async {
 }
 
 Future<void> checkUpdateUi([bool showMessageIfNoUpdate = true]) async {
-  var value = await checkUpdate();
-  if (value) {
-    showDialog(
-        context: App.rootContext,
-        builder: (context) {
-          return ContentDialog(
-            title: "New version available".tl,
-            content: Text(
-                "A new version is available. Do you want to update now?".tl),
-            actions: [
-              Button.text(
-                onPressed: () {
-                  Navigator.pop(context);
-                  launchUrlString(
-                      "https://github.com/venera-app/venera/releases");
-                },
-                child: Text("Update".tl),
-              ),
-            ],
-          );
-        });
-  } else if (showMessageIfNoUpdate) {
-    App.rootContext.showMessage(message: "No new version available".tl);
+  try {
+    var value = await checkUpdate();
+    if (value) {
+      showDialog(
+          context: App.rootContext,
+          builder: (context) {
+            return ContentDialog(
+              title: "New version available".tl,
+              content: Text(
+                  "A new version is available. Do you want to update now?".tl),
+              actions: [
+                Button.text(
+                  onPressed: () {
+                    Navigator.pop(context);
+                    launchUrlString(
+                        "https://github.com/venera-app/venera/releases");
+                  },
+                  child: Text("Update".tl),
+                ),
+              ],
+            );
+          });
+    } else if (showMessageIfNoUpdate) {
+      App.rootContext.showMessage(message: "No new version available".tl);
+    }
+  } catch (e, s) {
+    Log.error("Check Update", e.toString(), s);
   }
 }
 

lib/pages/settings/app.dart

@@ -34,25 +34,8 @@ class _AppSettingsState extends State<AppSettings> {
           callback: () async {
             String? result;
             if (App.isAndroid) {
-              var channel = const MethodChannel("venera/storage");
-              var permission = await channel.invokeMethod('');
-              if (permission != true) {
-                context.showMessage(message: "Permission denied".tl);
-                return;
-              }
-              var path = await selectDirectory();
-              if (path != null) {
-                // check if the path is writable
-                var testFile = File(FilePath.join(path, "test"));
-                try {
-                  await testFile.writeAsBytes([1]);
-                  await testFile.delete();
-                } catch (e) {
-                  context.showMessage(message: "Permission denied".tl);
-                  return;
-                }
-                result = path;
-              }
+              var picker = DirectoryPicker();
+              result = (await picker.pickDirectory())?.path;
             } else if (App.isIOS) {
               result = await selectDirectoryIOS();
             } else {
@@ -127,16 +110,23 @@ class _AppSettingsState extends State<AppSettings> {
           title: "Import App Data".tl,
           callback: () async {
             var controller = showLoadingDialog(context);
-            var file = await selectFile(ext: ['venera']);
+            var file = await selectFile(ext: ['venera', 'picadata']);
             if (file != null) {
-              var cacheFile = File(FilePath.join(App.cachePath, "temp.venera"));
+              var cacheFile = File(FilePath.join(App.cachePath, "import_data_temp"));
               await file.saveTo(cacheFile.path);
               try {
-                await importAppData(cacheFile);
+                if(file.name.endsWith('picadata')) {
+                  await importPicaData(cacheFile);
+                } else {
+                  await importAppData(cacheFile);
+                }
               } catch (e, s) {
                 Log.error("Import data", e.toString(), s);
                 context.showMessage(message: "Failed to import data".tl);
               }
+              finally {
+                cacheFile.deleteIgnoreError();
+              }
             }
             controller.close();
           },

lib/pages/settings/appearance.dart

@@ -29,6 +29,7 @@ class _AppearanceSettingsState extends State<AppearanceSettings> {
           title: "Theme Color".tl,
           settingKey: "color",
           optionTranslation: {
+            "system": "System".tl,
             "red": "Red".tl,
             "pink": "Pink".tl,
             "purple": "Purple".tl,

lib/pages/settings/explore_settings.dart

@@ -94,7 +94,7 @@ class _ExploreSettingsState extends State<ExploreSettings> {
 }
 
 class _ManageBlockingWordView extends StatefulWidget {
-  const _ManageBlockingWordView({super.key});
+  const _ManageBlockingWordView();
 
   @override
   State<_ManageBlockingWordView> createState() =>
@@ -135,7 +135,7 @@ class _ManageBlockingWordViewState extends State<_ManageBlockingWordView> {
   void add() {
     showDialog(
       context: App.rootContext,
-      barrierColor: Colors.black.withOpacity(0.1),
+      barrierColor: Colors.black.toOpacity(0.1),
       builder: (context) {
         var controller = TextEditingController();
         String? error;

lib/pages/settings/local_favorites.dart

@@ -38,6 +38,16 @@ class _LocalFavoritesSettingsState extends State<LocalFavoritesSettings> {
             for (var e in LocalFavoritesManager().folderNames) e: e
           },
         ).toSliver(),
+        _CallbackSetting(
+          title: "Delete all unavailable local favorite items".tl,
+          callback: () async {
+            var controller = showLoadingDialog(context);
+            var count = await LocalFavoritesManager().removeInvalid();
+            controller.close();
+            context.showMessage(message: "Deleted @a favorite items".tlParams({'a': count}));
+          },
+          actionTitle: 'Delete'.tl,
+        ).toSliver(),
       ],
     );
   }

lib/pages/settings/reader.dart

@@ -41,6 +41,11 @@ class _ReaderSettingsState extends State<ReaderSettings> {
             "continuousTopToBottom": "Continuous (Top to Bottom)".tl,
           },
           onChanged: () {
+            var readerMode = appdata.settings['readerMode'];
+            if (readerMode?.toLowerCase().startsWith('continuous') ?? false) {
+              appdata.settings['readerScreenPicNumber'] = 1;
+              widget.onChanged?.call('readerScreenPicNumber');
+            }
             widget.onChanged?.call("readerMode");
           },
         ).toSliver(),
@@ -54,6 +59,25 @@ class _ReaderSettingsState extends State<ReaderSettings> {
             widget.onChanged?.call("autoPageTurningInterval");
           },
         ).toSliver(),
+        SliverToBoxAdapter(
+          child: AbsorbPointer(
+            absorbing: (appdata.settings['readerMode']?.toLowerCase().startsWith('continuous') ?? false),
+            child: AnimatedOpacity(
+              opacity: (appdata.settings['readerMode']?.toLowerCase().startsWith('continuous') ?? false) ? 0.5 : 1.0,
+              duration: Duration(milliseconds: 300),
+              child: _SliderSetting(
+                title: "The number of pic in screen (Only Gallery Mode)".tl,
+                settingsIndex: "readerScreenPicNumber",
+                interval: 1,
+                min: 1,
+                max: 5,
+                onChanged: () {
+                  widget.onChanged?.call("readerScreenPicNumber");
+                },
+              ),
+            ),
+          ),
+        ),
         _SwitchSetting(
           title: 'Long press to zoom'.tl,
           settingKey: 'enableLongPressToZoom',

lib/pages/settings/setting_components.dart

@@ -384,7 +384,7 @@ class _MultiPagesFilterState extends State<_MultiPagesFilter> {
   Widget build(BuildContext context) {
     var tiles = keys.map((e) => buildItem(e)).toList();
 
-    var view = ReorderableBuilder(
+    var view = ReorderableBuilder<String>(
       key: reorderWidgetKey,
       scrollController: scrollController,
       longPressDelay: App.isDesktop
@@ -542,7 +542,7 @@ class _SettingPartTitle extends StatelessWidget {
         decoration: BoxDecoration(
           border: Border(
             bottom: BorderSide(
-              color: context.colorScheme.onSurface.withOpacity(0.1),
+              color: context.colorScheme.onSurface.withValues(alpha: 0.1),
             ),
           ),
         ),

lib/pages/settings/settings_page.dart

@@ -178,8 +178,9 @@ class _SettingsPageState extends State<SettingsPage> implements PopEntry {
           Positioned.fill(child: buildLeft()),
           Positioned(
             left: offset,
-            width: MediaQuery.of(context).size.width,
-            height: MediaQuery.of(context).size.height,
+            right: 0,
+            top: 0,
+            bottom: 0,
             child: Listener(
               onPointerDown: handlePointerDown,
               child: AnimatedSwitcher(
@@ -266,7 +267,7 @@ class _SettingsPageState extends State<SettingsPage> implements PopEntry {
         height: 46,
         padding: const EdgeInsets.fromLTRB(12, 0, 12, 0),
         decoration: BoxDecoration(
-          color: selected ? colors.primaryContainer.withOpacity(0.36) : null,
+          color: selected ? colors.primaryContainer.toOpacity(0.36) : null,
           border: Border(
             left: BorderSide(
               color: selected ? colors.primary : Colors.transparent,

lib/pages/webview.dart

@@ -70,6 +70,8 @@ class AppWebview extends StatefulWidget {
 
   final bool singlePage;
 
+  static WebViewEnvironment? webViewEnvironment;
+
   @override
   State<AppWebview> createState() => _AppWebviewState();
 }
@@ -117,7 +119,50 @@ class _AppWebviewState extends State<AppWebview> {
       )
     ];
 
-    Widget body = InAppWebView(
+    Widget body = (App.isWindows && AppWebview.webViewEnvironment == null)
+        ? FutureBuilder(
+            future: WebViewEnvironment.create(
+              settings: WebViewEnvironmentSettings(
+                userDataFolder: "${App.dataPath}\\webview",
+              ),
+            ),
+            builder: (context, e) {
+              if(e.error != null) {
+                return Center(child: Text("Error: ${e.error}"));
+              }
+              if(e.data == null) {
+                return const Center(child: CircularProgressIndicator());
+              }
+              AppWebview.webViewEnvironment = e.data;
+              return createWebviewWithEnvironment(AppWebview.webViewEnvironment);
+            },
+          )
+        : createWebviewWithEnvironment(AppWebview.webViewEnvironment);
+
+    body = Stack(
+      children: [
+        Positioned.fill(child: body),
+        if (_progress < 1.0)
+          const Positioned.fill(
+              child: Center(child: CircularProgressIndicator()))
+      ],
+    );
+
+    return Scaffold(
+        appBar: Appbar(
+          title: Text(
+            title,
+            maxLines: 1,
+            overflow: TextOverflow.ellipsis,
+          ),
+          actions: actions,
+        ),
+        body: body);
+  }
+
+  Widget createWebviewWithEnvironment(WebViewEnvironment? e) {
+    return InAppWebView(
+      webViewEnvironment: e,
       initialSettings: InAppWebViewSettings(
         isInspectable: true,
       ),
@@ -155,26 +200,6 @@ class _AppWebviewState extends State<AppWebview> {
         }
       },
     );
-
-    body = Stack(
-      children: [
-        Positioned.fill(child: body),
-        if (_progress < 1.0)
-          const Positioned.fill(
-              child: Center(child: CircularProgressIndicator()))
-      ],
-    );
-
-    return Scaffold(
-        appBar: Appbar(
-          title: Text(
-            title,
-            maxLines: 1,
-            overflow: TextOverflow.ellipsis,
-          ),
-          actions: actions,
-        ),
-        body: body);
   }
 }
 

lib/utils/cbz.dart

@@ -86,6 +86,9 @@ abstract class CBZ {
       var ext = e.path.split('.').last;
       return !['jpg', 'jpeg', 'png', 'webp', 'gif', 'jpe'].contains(ext);
     });
+    if(files.isEmpty) {
+      throw Exception('No images found in the archive');
+    }
     files.sort((a, b) => a.path.compareTo(b.path));
     var coverFile = files.firstWhereOrNull(
       (element) =>
@@ -101,14 +104,14 @@ abstract class CBZ {
       FilePath.join(LocalManager().path, sanitizeFileName(metaData.title)),
     );
     dest.createSync();
-    coverFile.copy(
-        FilePath.join(dest.path, 'cover.${coverFile.path.split('.').last}'));
+    coverFile.copyMem(
+        FilePath.join(dest.path, 'cover.${coverFile.extension}'));
     if (metaData.chapters == null) {
       for (var i = 0; i < files.length; i++) {
         var src = files[i];
         var dst = File(
             FilePath.join(dest.path, '${i + 1}.${src.path.split('.').last}'));
-        src.copy(dst.path);
+        await src.copyMem(dst.path);
       }
     } else {
       dest.createSync();
@@ -126,7 +129,7 @@ abstract class CBZ {
           var src = chapter.value[i];
           var dst = File(FilePath.join(
               chapterDir.path, '${i + 1}.${src.path.split('.').last}'));
-          src.copy(dst.path);
+          await src.copyMem(dst.path);
         }
       }
     }
@@ -139,10 +142,9 @@ abstract class CBZ {
       directory: dest.name,
       chapters: cpMap,
       downloadedChapters: cpMap?.keys.toList() ?? [],
-      cover: 'cover.${coverFile.path.split('.').last}',
+      cover: 'cover.${coverFile.extension}',
       createdAt: DateTime.now(),
     );
-    LocalManager().add(comic);
     await cache.delete(recursive: true);
     return comic;
   }
@@ -161,7 +163,7 @@ abstract class CBZ {
         var dstName =
             '${i.toString().padLeft(width, '0')}.${image.split('.').last}';
         var dst = File(FilePath.join(cache.path, dstName));
-        await src.copy(dst.path);
+        await src.copyMem(dst.path);
         i++;
       }
     } else {
@@ -184,18 +186,18 @@ abstract class CBZ {
       }
       int i = 1;
       for (var image in allImages) {
-        var src = File(image.replaceFirst('file://', ''));
+        var src = File(image);
         var width = allImages.length.toString().length;
         var dstName =
             '${i.toString().padLeft(width, '0')}.${image.split('.').last}';
         var dst = File(FilePath.join(cache.path, dstName));
-        await src.copy(dst.path);
+        await src.copyMem(dst.path);
         i++;
       }
     }
     var cover = comic.coverFile;
     await cover
-        .copy(FilePath.join(cache.path, 'cover.${cover.path.split('.').last}'));
+        .copyMem(FilePath.join(cache.path, 'cover.${cover.path.split('.').last}'));
     await File(FilePath.join(cache.path, 'metadata.json')).writeAsString(
       jsonEncode(
         ComicMetaData(

lib/utils/data.dart

@@ -1,11 +1,14 @@
 import 'dart:convert';
 import 'dart:isolate';
 
+import 'package:sqlite3/sqlite3.dart';
 import 'package:venera/foundation/app.dart';
 import 'package:venera/foundation/appdata.dart';
 import 'package:venera/foundation/comic_source/comic_source.dart';
+import 'package:venera/foundation/comic_type.dart';
 import 'package:venera/foundation/favorites.dart';
 import 'package:venera/foundation/history.dart';
+import 'package:venera/foundation/log.dart';
 import 'package:venera/network/cookie_jar.dart';
 import 'package:zip_flutter/zip_flutter.dart';
 
@@ -43,59 +46,165 @@ Future<File> exportAppData() async {
 Future<void> importAppData(File file, [bool checkVersion = false]) async {
   var cacheDirPath = FilePath.join(App.cachePath, 'temp_data');
   var cacheDir = Directory(cacheDirPath);
-  await Isolate.run(() {
-    ZipFile.openAndExtract(file.path, cacheDirPath);
-  });
-  var historyFile = cacheDir.joinFile("history.db");
-  var localFavoriteFile = cacheDir.joinFile("local_favorite.db");
-  var appdataFile = cacheDir.joinFile("appdata.json");
-  var cookieFile = cacheDir.joinFile("cookie.db");
-  if (checkVersion && appdataFile.existsSync()) {
-    var data = jsonDecode(await appdataFile.readAsString());
-    var version = data["settings"]["dataVersion"];
-    if (version is int && version <= appdata.settings["dataVersion"]) {
-      return;
-    }
+  if (cacheDir.existsSync()) {
+    cacheDir.deleteSync(recursive: true);
   }
-  if (await historyFile.exists()) {
-    HistoryManager().close();
-    File(FilePath.join(App.dataPath, "history.db")).deleteIfExistsSync();
-    historyFile.renameSync(FilePath.join(App.dataPath, "history.db"));
-    HistoryManager().init();
-  }
-  if (await localFavoriteFile.exists()) {
-    LocalFavoritesManager().close();
-    File(FilePath.join(App.dataPath, "local_favorite.db")).deleteIfExistsSync();
-    localFavoriteFile
-        .renameSync(FilePath.join(App.dataPath, "local_favorite.db"));
-    LocalFavoritesManager().init();
-  }
-  if (await appdataFile.exists()) {
-    // proxy settings should be kept
-    var proxySettings = appdata.settings["proxy"];
-    File(FilePath.join(App.dataPath, "appdata.json")).deleteIfExistsSync();
-    appdataFile.renameSync(FilePath.join(App.dataPath, "appdata.json"));
-    await appdata.init();
-    appdata.settings["proxy"] = proxySettings;
-    appdata.saveData();
-  }
-  if (await cookieFile.exists()) {
-    SingleInstanceCookieJar.instance?.dispose();
-    File(FilePath.join(App.dataPath, "cookie.db")).deleteIfExistsSync();
-    cookieFile.renameSync(FilePath.join(App.dataPath, "cookie.db"));
-    SingleInstanceCookieJar.instance =
-        SingleInstanceCookieJar(FilePath.join(App.dataPath, "cookie.db"))
-          ..init();
-  }
-  var comicSourceDir = FilePath.join(cacheDirPath, "comic_source");
-  if (Directory(comicSourceDir).existsSync()) {
-    for (var file in Directory(comicSourceDir).listSync()) {
-      if (file is File) {
-        var targetFile = FilePath.join(App.dataPath, "comic_source", file.name);
-        File(targetFile).deleteIfExistsSync();
-        await file.copy(targetFile);
+  cacheDir.createSync();
+  try {
+    await Isolate.run(() {
+      ZipFile.openAndExtract(file.path, cacheDirPath);
+    });
+    var historyFile = cacheDir.joinFile("history.db");
+    var localFavoriteFile = cacheDir.joinFile("local_favorite.db");
+    var appdataFile = cacheDir.joinFile("appdata.json");
+    var cookieFile = cacheDir.joinFile("cookie.db");
+    if (checkVersion && appdataFile.existsSync()) {
+      var data = jsonDecode(await appdataFile.readAsString());
+      var version = data["settings"]["dataVersion"];
+      if (version is int && version <= appdata.settings["dataVersion"]) {
+        return;
       }
     }
-    await ComicSource.reload();
+    if (await historyFile.exists()) {
+      HistoryManager().close();
+      File(FilePath.join(App.dataPath, "history.db")).deleteIfExistsSync();
+      historyFile.renameSync(FilePath.join(App.dataPath, "history.db"));
+      HistoryManager().init();
+    }
+    if (await localFavoriteFile.exists()) {
+      LocalFavoritesManager().close();
+      File(FilePath.join(App.dataPath, "local_favorite.db"))
+          .deleteIfExistsSync();
+      localFavoriteFile
+          .renameSync(FilePath.join(App.dataPath, "local_favorite.db"));
+      LocalFavoritesManager().init();
+    }
+    if (await appdataFile.exists()) {
+      // proxy settings & authorization setting should be kept
+      var proxySettings = appdata.settings["proxy"];
+      var authSettings = appdata.settings["authorizationRequired"];
+      File(FilePath.join(App.dataPath, "appdata.json")).deleteIfExistsSync();
+      appdataFile.renameSync(FilePath.join(App.dataPath, "appdata.json"));
+      await appdata.init();
+      appdata.settings["proxy"] = proxySettings;
+      appdata.settings["authorizationRequired"] = authSettings;
+      appdata.saveData();
+    }
+    if (await cookieFile.exists()) {
+      SingleInstanceCookieJar.instance?.dispose();
+      File(FilePath.join(App.dataPath, "cookie.db")).deleteIfExistsSync();
+      cookieFile.renameSync(FilePath.join(App.dataPath, "cookie.db"));
+      SingleInstanceCookieJar.instance =
+          SingleInstanceCookieJar(FilePath.join(App.dataPath, "cookie.db"))
+            ..init();
+    }
+    var comicSourceDir = FilePath.join(cacheDirPath, "comic_source");
+    if (Directory(comicSourceDir).existsSync()) {
+      for (var file in Directory(comicSourceDir).listSync()) {
+        if (file is File) {
+          var targetFile =
+              FilePath.join(App.dataPath, "comic_source", file.name);
+          File(targetFile).deleteIfExistsSync();
+          await file.copy(targetFile);
+        }
+      }
+      await ComicSource.reload();
+    }
+  } finally {
+    cacheDir.deleteIgnoreError(recursive: true);
+  }
+}
+
+Future<void> importPicaData(File file) async {
+  var cacheDirPath = FilePath.join(App.cachePath, 'temp_data');
+  var cacheDir = Directory(cacheDirPath);
+  if (cacheDir.existsSync()) {
+    cacheDir.deleteSync(recursive: true);
+  }
+  cacheDir.createSync();
+  try {
+    await Isolate.run(() {
+      ZipFile.openAndExtract(file.path, cacheDirPath);
+    });
+    var localFavoriteFile = cacheDir.joinFile("local_favorite.db");
+    if (localFavoriteFile.existsSync()) {
+      var db = sqlite3.open(localFavoriteFile.path);
+      try {
+        var folderNames = db
+            .select("SELECT name FROM sqlite_master WHERE type='table';")
+            .map((e) => e["name"] as String)
+            .toList();
+        folderNames.removeWhere((e) => e == "folder_order" || e == "folder_sync");
+        for (var folderName in folderNames) {
+          if (!LocalFavoritesManager().existsFolder(folderName)) {
+            LocalFavoritesManager().createFolder(folderName);
+          }
+          for (var comic in db.select("SELECT * FROM \"$folderName\";")) {
+            LocalFavoritesManager().addComic(
+              folderName,
+              FavoriteItem(
+                id: comic['target'],
+                name: comic['name'],
+                coverPath: comic['cover_path'],
+                author: comic['author'],
+                type: ComicType(switch(comic['type']) {
+                  0 => 'picacg'.hashCode,
+                  1 => 'ehentai'.hashCode,
+                  2 => 'jm'.hashCode,
+                  3 => 'hitomi'.hashCode,
+                  4 => 'wnacg'.hashCode,
+                  6 => 'nhentai'.hashCode,
+                  _ => comic['type']
+                }),
+                tags: comic['tags'].split(','),
+              ),
+            );
+          }
+        }
+      }
+      catch(e) {
+        Log.error("Import Data", "Failed to import local favorite: $e");
+      }
+      finally {
+        db.dispose();
+      }
+    }
+    var historyFile = cacheDir.joinFile("history.db");
+    if (historyFile.existsSync()) {
+      var db = sqlite3.open(historyFile.path);
+      try {
+        for (var comic in db.select("SELECT * FROM history;")) {
+          HistoryManager().addHistory(
+            History.fromMap({
+              "type": switch(comic['type']) {
+                0 => 'picacg'.hashCode,
+                1 => 'ehentai'.hashCode,
+                2 => 'jm'.hashCode,
+                3 => 'hitomi'.hashCode,
+                4 => 'wnacg'.hashCode,
+                6 => 'nhentai'.hashCode,
+                _ => comic['type']
+              },
+              "id": comic['target'],
+              "maxPage": comic["max_page"],
+              "ep": comic["ep"],
+              "page": comic["page"],
+              "time": comic["time"],
+              "title": comic["title"],
+              "subtitle": comic["subtitle"],
+              "cover": comic["cover"],
+            }),
+          );
+        }
+      }
+      catch(e) {
+        Log.error("Import Data", "Failed to import history: $e");
+      }
+      finally {
+        db.dispose();
+      }
+    }
+  } finally {
+    cacheDir.deleteIgnoreError(recursive: true);
   }
 }

lib/utils/epub.dart

@@ -0,0 +1,210 @@
+import 'dart:isolate';
+
+import 'package:uuid/uuid.dart';
+import 'package:venera/foundation/app.dart';
+import 'package:venera/foundation/local.dart';
+import 'package:venera/utils/file_type.dart';
+import 'package:venera/utils/io.dart';
+import 'package:zip_flutter/zip_flutter.dart';
+
+class EpubData {
+  final String title;
+
+  final String author;
+
+  final File cover;
+
+  final Map<String, List<File>> chapters;
+
+  const EpubData({
+    required this.title,
+    required this.author,
+    required this.cover,
+    required this.chapters,
+  });
+}
+
+Future<File> createEpubComic(EpubData data, String cacheDir) async {
+  final workingDir = Directory(FilePath.join(cacheDir, 'epub'));
+  if (workingDir.existsSync()) {
+    workingDir.deleteSync(recursive: true);
+  }
+  workingDir.createSync(recursive: true);
+
+  // mimetype
+  workingDir.joinFile('mimetype').writeAsStringSync('application/epub+zip');
+
+  // META-INF
+  Directory(FilePath.join(workingDir.path, 'META-INF')).createSync();
+  File(FilePath.join(workingDir.path, 'META-INF', 'container.xml'))
+      .writeAsStringSync('''
+<?xml version="1.0"?>
+<container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
+  <rootfiles>
+    <rootfile full-path="content.opf" media-type="application/oebps-package+xml"/>
+  </rootfiles>
+</container>
+  ''');
+
+  Directory(FilePath.join(workingDir.path, 'OEBPS')).createSync();
+
+  // copy images, create html files
+  final imageDir = Directory(FilePath.join(workingDir.path, 'OEBPS', 'images'));
+  imageDir.createSync();
+  final coverExt = data.cover.extension;
+  final coverMime = FileType.fromExtension(coverExt).mime;
+  imageDir
+      .joinFile('cover.$coverExt')
+      .writeAsBytesSync(data.cover.readAsBytesSync());
+  int imgIndex = 0;
+  int chapterIndex = 0;
+  var manifestStrBuilder = StringBuffer();
+  manifestStrBuilder.writeln(
+      '        <item id="cover_image" href="OEBPS/images/cover.$coverExt" media-type="$coverMime"/>');
+  manifestStrBuilder.writeln(
+      '        <item id="toc" href="toc.ncx" media-type="application/x-dtbncx+xml"/>');
+  for (final chapter in data.chapters.keys) {
+    var images = <String>[];
+    for (final image in data.chapters[chapter]!) {
+      final ext = image.extension;
+      imageDir
+          .joinFile('img$imgIndex.$ext')
+          .writeAsBytesSync(image.readAsBytesSync());
+      images.add('images/img$imgIndex.$ext');
+      var mime = FileType.fromExtension(ext).mime;
+      manifestStrBuilder.writeln(
+          '        <item id="img$imgIndex" href="OEBPS/images/img$imgIndex$ext" media-type="$mime"/>');
+      imgIndex++;
+    }
+    var html =
+        File(FilePath.join(workingDir.path, 'OEBPS', '$chapterIndex.html'));
+    html.writeAsStringSync('''
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" 
+    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <title>$chapter</title>
+    <style type="text/css">
+        img { 
+            max-width: 100%;
+            height: auto;
+        }
+        body {
+            margin: 0;
+            padding: 0;
+        }
+    </style>
+</head>
+<body>
+    <h1>$chapter</h1>
+    <div>
+${images.map((e) => '        <img src="$e" alt="$e"/>').join('\n')}
+    </div>
+</body>
+</html>
+    ''');
+    manifestStrBuilder.writeln(
+        '        <item id="chapter$chapterIndex" href="OEBPS/$chapterIndex.html" media-type="application/xhtml+xml"/>');
+    chapterIndex++;
+  }
+
+  // content.opf
+  final contentOpf =
+      File(FilePath.join(workingDir.path, 'content.opf'));
+  final uuid = const Uuid().v4();
+  var spineStrBuilder = StringBuffer();
+  for (var i = 0; i < chapterIndex; i++) {
+    var idRef = 'idref="chapter$i"';
+    spineStrBuilder.writeln('        <itemref $idRef/>');
+  }
+  contentOpf.writeAsStringSync('''
+<?xml version="1.0" encoding="UTF-8"?>
+<package version="3.0" 
+    xmlns="http://www.idpf.org/2007/opf"
+    xmlns:dc="http://purl.org/dc/elements/1.1/">
+    <metadata>
+        <dc:title>${data.title}</dc:title>
+        <dc:creator>${data.author}</dc:creator>
+        <dc:identifier id="book_id">urn:uuid:$uuid</dc:identifier>
+        <meta name="cover" content="cover_image"/>
+    </metadata>
+    <manifest>
+${manifestStrBuilder.toString()}       
+    </manifest>
+    <spine toc="toc">
+${spineStrBuilder.toString()}
+    </spine>
+</package>
+  ''');
+
+  // toc.ncx
+  final tocNcx = File(FilePath.join(workingDir.path, 'toc.ncx'));
+  var navMapStrBuilder = StringBuffer();
+  var playOrder = 2;
+  final chapterNames = data.chapters.keys.toList();
+  for (var i = 0; i < chapterIndex; i++) {
+    navMapStrBuilder
+        .writeln('        <navPoint id="chapter$i" playOrder="$playOrder">');
+    navMapStrBuilder.writeln(
+        '            <navLabel><text>${chapterNames[i]}</text></navLabel>');
+    navMapStrBuilder.writeln('            <content src="OEBPS/$i.html"/>');
+    navMapStrBuilder.writeln('        </navPoint>');
+    playOrder++;
+  }
+
+  tocNcx.writeAsStringSync('''
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE ncx PUBLIC "-//NISO//DTD ncx 2005-1//EN" "http://www.daisy.org/z3986/2005/ncx-2005-1.dtd">
+<ncx xmlns="http://www.daisy.org/z3986/2005/ncx" version="2005-1">
+    <head>
+        <meta name="dtb:uid" content="urn:uuid:$uuid"/>
+        <meta name="dtb:depth" content="1"/>
+        <meta name="dtb:totalPageCount" content="0"/>
+        <meta name="dtb:maxPageNumber" content="0"/>
+    </head>
+    <docTitle>
+        <text>${data.title}</text>
+    </docTitle>
+    <navMap>
+${navMapStrBuilder.toString()}
+    </navMap>
+</ncx>
+  ''');
+
+  // zip
+  final zipPath = FilePath.join(cacheDir, '${data.title}.epub');
+  ZipFile.compressFolder(workingDir.path, zipPath);
+
+  workingDir.deleteSync(recursive: true);
+
+  return File(zipPath);
+}
+
+Future<File> createEpubWithLocalComic(LocalComic comic) async {
+  var chapters = <String, List<File>>{};
+  if (comic.chapters == null) {
+    chapters[comic.title] =
+        (await LocalManager().getImages(comic.id, comic.comicType, 0))
+            .map((e) => File(e))
+            .toList();
+  } else {
+    for (var chapter in comic.chapters!.keys) {
+      chapters[comic.chapters![chapter]!] = (await LocalManager()
+              .getImages(comic.id, comic.comicType, chapter))
+          .map((e) => File(e))
+          .toList();
+    }
+  }
+  var data = EpubData(
+    title: comic.title,
+    author: comic.subtitle,
+    cover: comic.coverFile,
+    chapters: chapters,
+  );
+
+  final cacheDir = App.cachePath;
+
+  return Isolate.run(() => overrideIO(() async {
+        return createEpubComic(data, cacheDir);
+      }));
+}

lib/utils/file_type.dart

@@ -10,8 +10,14 @@ class FileType {
     if(ext.startsWith('.')) {
       ext = ext.substring(1);
     }
-    var mime = lookupMimeType('no-file.$ext');
-    return FileType(".$ext", mime ?? 'application/octet-stream');
+    var mime = lookupMimeType('no-file.$ext') ?? 'application/octet-stream';
+    // Android doesn't support some mime types
+    mime = switch(mime) {
+      'text/javascript' => 'application/octet-stream',
+      'application/x-cbr' => 'application/octet-stream',
+      _ => mime,
+    };
+    return FileType(".$ext", mime);
   }
 }
 

lib/utils/import_comic.dart

@@ -0,0 +1,354 @@
+import 'dart:math';
+
+import 'package:flutter/foundation.dart';
+import 'package:venera/components/components.dart';
+import 'package:venera/foundation/app.dart';
+import 'package:venera/foundation/comic_type.dart';
+import 'package:venera/foundation/favorites.dart';
+import 'package:venera/foundation/local.dart';
+import 'package:venera/foundation/log.dart';
+import 'package:sqlite3/sqlite3.dart' as sql;
+import 'package:venera/utils/ext.dart';
+import 'package:venera/utils/translations.dart';
+import 'cbz.dart';
+import 'io.dart';
+
+class ImportComic {
+  final String? selectedFolder;
+  final bool copyToLocal;
+
+  const ImportComic({this.selectedFolder, this.copyToLocal = true});
+
+  Future<bool> cbz() async {
+    var file = await selectFile(ext: ['cbz', 'zip']);
+    Map<String?, List<LocalComic>> imported = {};
+    if (file == null) {
+      return false;
+    }
+    var controller = showLoadingDialog(App.rootContext, allowCancel: false);
+    try {
+      var comic = await CBZ.import(File(file.path));
+      imported[selectedFolder] = [comic];
+    } catch (e, s) {
+      Log.error("Import Comic", e.toString(), s);
+      App.rootContext.showMessage(message: e.toString());
+    }
+    controller.close();
+    return registerComics(imported, false);
+  }
+
+  Future<bool> ehViewer() async {
+    var dbFile = await selectFile(ext: ['db']);
+    final picker = DirectoryPicker();
+    final comicSrc = await picker.pickDirectory();
+    Map<String?, List<LocalComic>> imported = {};
+    if (dbFile == null || comicSrc == null) {
+      return false;
+    }
+
+    bool cancelled = false;
+    var controller = showLoadingDialog(App.rootContext, onCancel: () {
+      cancelled = true;
+    });
+
+    try {
+      var db = sql.sqlite3.open(dbFile.path);
+
+      Future<List<LocalComic>> validateComics(List<sql.Row> comics) async {
+        List<LocalComic> imported = [];
+        for (var comic in comics) {
+          if (cancelled) {
+            return imported;
+          }
+          var comicDir = Directory(
+              FilePath.join(comicSrc.path, comic['DIRNAME'] as String));
+          String titleJP =
+              comic['TITLE_JPN'] == null ? "" : comic['TITLE_JPN'] as String;
+          String title = titleJP == "" ? comic['TITLE'] as String : titleJP;
+          int timeStamp = comic['TIME'] as int;
+          DateTime downloadTime = timeStamp != 0
+              ? DateTime.fromMillisecondsSinceEpoch(timeStamp)
+              : DateTime.now();
+          var comicObj = await _checkSingleComic(comicDir,
+              title: title,
+              tags: [
+                //1 >> x
+                [
+                  "MISC",
+                  "DOUJINSHI",
+                  "MANGA",
+                  "ARTISTCG",
+                  "GAMECG",
+                  "IMAGE SET",
+                  "COSPLAY",
+                  "ASIAN PORN",
+                  "NON-H",
+                  "WESTERN",
+                ][(log(comic['CATEGORY'] as int) / ln2).floor()]
+              ],
+              createTime: downloadTime);
+          if (comicObj == null) {
+            continue;
+          }
+          imported.add(comicObj);
+        }
+        return imported;
+      }
+
+      var tags = <String>[""];
+      tags.addAll(db.select("""
+            SELECT * FROM DOWNLOAD_LABELS LB
+            ORDER BY  LB.TIME DESC;
+          """).map((r) => r['LABEL'] as String).toList());
+
+      for (var tag in tags) {
+        if (cancelled) {
+          break;
+        }
+        var folderName = tag == '' ? '(EhViewer)Default'.tl : '(EhViewer)$tag';
+        var comicList = db.select("""
+              SELECT * 
+              FROM DOWNLOAD_DIRNAME DN
+              LEFT JOIN DOWNLOADS DL
+              ON DL.GID = DN.GID
+              WHERE DL.LABEL ${tag == '' ? 'IS NULL' : '= \'$tag\''} AND DL.STATE = 3
+              ORDER BY DL.TIME DESC
+            """).toList();
+
+        var validComics = await validateComics(comicList);
+        imported[folderName] = validComics;
+        if (validComics.isNotEmpty &&
+            !LocalFavoritesManager().existsFolder(folderName)) {
+          LocalFavoritesManager().createFolder(folderName);
+        }
+      }
+      db.dispose();
+
+      //Android specific
+      var cache = FilePath.join(App.cachePath, dbFile.name);
+      await File(cache).deleteIgnoreError();
+    } catch (e, s) {
+      Log.error("Import Comic", e.toString(), s);
+      App.rootContext.showMessage(message: e.toString());
+    }
+    controller.close();
+    if (cancelled) return false;
+    return registerComics(imported, copyToLocal);
+  }
+
+  Future<bool> directory(bool single) async {
+    final picker = DirectoryPicker();
+    final path = await picker.pickDirectory();
+    if (path == null) {
+      return false;
+    }
+    Map<String?, List<LocalComic>> imported = {selectedFolder: []};
+    try {
+      if (single) {
+        var result = await _checkSingleComic(path);
+        if (result != null) {
+          imported[selectedFolder]!.add(result);
+        } else {
+          App.rootContext.showMessage(message: "Invalid Comic".tl);
+          return false;
+        }
+      } else {
+        await for (var entry in path.list()) {
+          if (entry is Directory) {
+            var result = await _checkSingleComic(entry);
+            if (result != null) {
+              imported[selectedFolder]!.add(result);
+            }
+          }
+        }
+      }
+    } catch (e, s) {
+      Log.error("Import Comic", e.toString(), s);
+      App.rootContext.showMessage(message: e.toString());
+    }
+    return registerComics(imported, copyToLocal);
+  }
+
+  //Automatically search for cover image and chapters
+  Future<LocalComic?> _checkSingleComic(Directory directory,
+      {String? id,
+      String? title,
+      String? subtitle,
+      List<String>? tags,
+      DateTime? createTime}) async {
+    if (!(await directory.exists())) return null;
+    var name = title ?? directory.name;
+    if (LocalManager().findByName(name) != null) {
+      Log.info("Import Comic", "Comic already exists: $name");
+      return null;
+    }
+    bool hasChapters = false;
+    var chapters = <String>[];
+    var coverPath = ''; // relative path to the cover image
+    var fileList = <String>[];
+    await for (var entry in directory.list()) {
+      if (entry is Directory) {
+        hasChapters = true;
+        chapters.add(entry.name);
+        await for (var file in entry.list()) {
+          if (file is Directory) {
+            Log.info("Import Comic",
+                "Invalid Chapter: ${entry.name}\nA directory is found in the chapter directory.");
+            return null;
+          }
+        }
+      } else if (entry is File) {
+        const imageExtensions = ['jpg', 'jpeg', 'png', 'webp', 'gif', 'jpe'];
+        if (imageExtensions.contains(entry.extension)) {
+          fileList.add(entry.name);
+        }
+      }
+    }
+
+    if (fileList.isEmpty) {
+      return null;
+    }
+
+    fileList.sort();
+    coverPath = fileList.firstWhereOrNull((l) => l.startsWith('cover')) ??
+        fileList.first;
+
+    chapters.sort();
+    if (hasChapters && coverPath == '') {
+      // use the first image in the first chapter as the cover
+      var firstChapter = Directory('${directory.path}/${chapters.first}');
+      await for (var entry in firstChapter.list()) {
+        if (entry is File) {
+          coverPath = entry.name;
+          break;
+        }
+      }
+    }
+    if (coverPath == '') {
+      Log.info("Import Comic", "Invalid Comic: $name\nNo cover image found.");
+      return null;
+    }
+    return LocalComic(
+      id: id ?? '0',
+      title: name,
+      subtitle: subtitle ?? '',
+      tags: tags ?? [],
+      directory: directory.path,
+      chapters: hasChapters ? Map.fromIterables(chapters, chapters) : null,
+      cover: coverPath,
+      comicType: ComicType.local,
+      downloadedChapters: chapters,
+      createdAt: createTime ?? DateTime.now(),
+    );
+  }
+
+  static Future<Map<String, String>> _copyDirectories(
+      Map<String, dynamic> data) async {
+    return overrideIO(() async {
+      var toBeCopied = data['toBeCopied'] as List<String>;
+      var destination = data['destination'] as String;
+      Map<String, String> result = {};
+      for (var dir in toBeCopied) {
+        var source = Directory(dir);
+        var dest = Directory("$destination/${source.name}");
+        if (dest.existsSync()) {
+          // The destination directory already exists, and it is not managed by the app.
+          // Rename the old directory to avoid conflicts.
+          Log.info("Import Comic",
+              "Directory already exists: ${source.name}\nRenaming the old directory.");
+          dest.renameSync(
+              findValidDirectoryName(dest.parent.path, "${dest.path}_old"));
+        }
+        dest.createSync();
+        await copyDirectory(source, dest);
+        result[source.path] = dest.path;
+      }
+      return result;
+    });
+  }
+
+  Future<Map<String?, List<LocalComic>>> _copyComicsToLocalDir(
+      Map<String?, List<LocalComic>> comics) async {
+    var destPath = LocalManager().path;
+    Map<String?, List<LocalComic>> result = {};
+    for (var favoriteFolder in comics.keys) {
+      result[favoriteFolder] = comics[favoriteFolder]!
+          .where((c) => c.directory.startsWith(destPath))
+          .toList();
+      comics[favoriteFolder]!
+          .removeWhere((c) => c.directory.startsWith(destPath));
+
+      if (comics[favoriteFolder]!.isEmpty) {
+        continue;
+      }
+
+      try {
+        // copy the comics to the local directory
+        var pathMap = await compute<Map<String, dynamic>, Map<String, String>>(
+            _copyDirectories, {
+          'toBeCopied':
+              comics[favoriteFolder]!.map((e) => e.directory).toList(),
+          'destination': destPath,
+        });
+        //Construct a new object since LocalComic.directory is a final String
+        for (var c in comics[favoriteFolder]!) {
+          result[favoriteFolder]!.add(LocalComic(
+            id: c.id,
+            title: c.title,
+            subtitle: c.subtitle,
+            tags: c.tags,
+            directory: pathMap[c.directory]!,
+            chapters: c.chapters,
+            cover: c.cover,
+            comicType: c.comicType,
+            downloadedChapters: c.downloadedChapters,
+            createdAt: c.createdAt,
+          ));
+        }
+      } catch (e, s) {
+        App.rootContext.showMessage(message: "Failed to copy comics".tl);
+        Log.error("Import Comic", e.toString(), s);
+        return result;
+      }
+    }
+    return result;
+  }
+
+  Future<bool> registerComics(
+      Map<String?, List<LocalComic>> importedComics, bool copy) async {
+    try {
+      if (copy) {
+        importedComics = await _copyComicsToLocalDir(importedComics);
+      }
+      int importedCount = 0;
+      for (var folder in importedComics.keys) {
+        for (var comic in importedComics[folder]!) {
+          var id = LocalManager().findValidId(ComicType.local);
+          LocalManager().add(comic, id);
+          importedCount++;
+          if (folder != null) {
+            LocalFavoritesManager().addComic(
+                folder,
+                FavoriteItem(
+                    id: id,
+                    name: comic.title,
+                    coverPath: comic.cover,
+                    author: comic.subtitle,
+                    type: comic.comicType,
+                    tags: comic.tags,
+                    favoriteTime: comic.createdAt));
+          }
+        }
+      }
+      App.rootContext.showMessage(
+          message: "Imported @a comics".tlParams({
+        'a': importedCount,
+      }));
+    } catch (e, s) {
+      App.rootContext.showMessage(message: "Failed to register comics".tl);
+      Log.error("Import Comic", e.toString(), s);
+      return false;
+    }
+    return true;
+  }
+}

lib/utils/io.dart

@@ -4,6 +4,7 @@ import 'dart:isolate';
 
 import 'package:flutter/services.dart';
 import 'package:flutter_file_dialog/flutter_file_dialog.dart';
+import 'package:flutter_saf/flutter_saf.dart';
 import 'package:venera/foundation/app.dart';
 import 'package:venera/utils/ext.dart';
 import 'package:path/path.dart' as p;
@@ -14,6 +15,16 @@ import 'package:venera/utils/file_type.dart';
 export 'dart:io';
 export 'dart:typed_data';
 
+class IO {
+  /// A global flag used to indicate whether the app is selecting files.
+  ///
+  /// Select file and other similar file operations will launch external programs,
+  /// causing the app to lose focus. AppLifecycleState will be set to paused.
+  static bool get isSelectingFiles => _isSelectingFiles;
+
+  static bool _isSelectingFiles = false;
+}
+
 class FilePath {
   const FilePath._();
 
@@ -62,6 +73,15 @@ extension FileSystemEntityExt on FileSystemEntity {
 
 extension FileExtension on File {
   String get extension => path.split('.').last;
+
+  /// Copy the file to the specified path using memory.
+  ///
+  /// This method prevents errors caused by files from different file systems.
+  Future<void> copyMem(String newPath) async {
+    var newFile = File(newPath);
+    // Stream is not usable since [AndroidFile] does not support [openRead].
+    await newFile.writeAsBytes(await readAsBytes());
+  }
 }
 
 extension DirectoryExtension on Directory {
@@ -84,6 +104,20 @@ extension DirectoryExtension on Directory {
   File joinFile(String name) {
     return File(FilePath.join(path, name));
   }
+
+  void deleteContentsSync({recursive = true}) {
+    if (!existsSync()) return;
+    for (var f in listSync()) {
+      f.deleteIfExistsSync(recursive: recursive);
+    }
+  }
+
+  Future<void> deleteContents({recursive = true}) async {
+    if (!existsSync()) return;
+    for (var f in listSync()) {
+      await f.deleteIfExists(recursive: recursive);
+    }
+  }
 }
 
 String sanitizeFileName(String fileName) {
@@ -113,12 +147,13 @@ String sanitizeFileName(String fileName) {
 Future<void> copyDirectory(Directory source, Directory destination) async {
   List<FileSystemEntity> contents = source.listSync();
   for (FileSystemEntity content in contents) {
-    String newPath = destination.path +
-        Platform.pathSeparator +
-        content.path.split(Platform.pathSeparator).last;
+    String newPath = FilePath.join(destination.path, content.name);
 
     if (content is File) {
-      content.copySync(newPath);
+      var resultFile = File(newPath);
+      resultFile.createSync();
+      var data = content.readAsBytesSync();
+      resultFile.writeAsBytesSync(data);
     } else if (content is Directory) {
       Directory newDirectory = Directory(newPath);
       newDirectory.createSync();
@@ -129,9 +164,7 @@ Future<void> copyDirectory(Directory source, Directory destination) async {
 
 Future<void> copyDirectoryIsolate(
     Directory source, Directory destination) async {
-  await Isolate.run(() {
-    copyDirectory(source, destination);
-  });
+  await Isolate.run(() => overrideIO(() => copyDirectory(source, destination)));
 }
 
 String findValidDirectoryName(String path, String directory) {
@@ -147,36 +180,42 @@ String findValidDirectoryName(String path, String directory) {
 }
 
 class DirectoryPicker {
-  String? _directory;
+  /// Pick a directory.
+  ///
+  /// The directory may not be usable after the instance is GCed.
+  DirectoryPicker();
 
-  final _methodChannel = const MethodChannel("venera/method_channel");
-
-  Future<Directory?> pickDirectory() async {
-    if (App.isWindows || App.isLinux) {
-      var d = await file_selector.getDirectoryPath();
-      _directory = d;
-      return d == null ? null : Directory(d);
-    } else if (App.isAndroid) {
-      var d = await _methodChannel.invokeMethod<String?>("getDirectoryPath");
-      _directory = d;
-      return d == null ? null : Directory(d);
-    } else {
-      // ios, macos
-      var d = await _methodChannel.invokeMethod<String?>("getDirectoryPath");
-      _directory = d;
-      return d == null ? null : Directory(d);
-    }
-  }
-
-  Future<void> dispose() async {
-    if (_directory == null) {
-      return;
-    }
-    if (App.isAndroid && _directory != null) {
-      return Directory(_directory!).deleteIgnoreError(recursive: true);
+  static final _finalizer = Finalizer<String>((path) {
+    if (path.startsWith(App.cachePath)) {
+      Directory(path).deleteIgnoreError();
     }
     if (App.isIOS || App.isMacOS) {
-      await _methodChannel.invokeMethod("stopAccessingSecurityScopedResource");
+      _methodChannel.invokeMethod("stopAccessingSecurityScopedResource");
+    }
+  });
+
+  static const _methodChannel = MethodChannel("venera/method_channel");
+
+  Future<Directory?> pickDirectory() async {
+    IO._isSelectingFiles = true;
+    try {
+      String? directory;
+      if (App.isWindows || App.isLinux) {
+        directory = await file_selector.getDirectoryPath();
+      } else if (App.isAndroid) {
+        directory = (await AndroidDirectory.pickDirectory())?.path;
+      } else {
+        // ios, macos
+        directory =
+            await _methodChannel.invokeMethod<String?>("getDirectoryPath");
+      }
+      if (directory == null) return null;
+      _finalizer.attach(this, directory);
+      return Directory(directory);
+    } finally {
+      Future.delayed(const Duration(milliseconds: 100), () {
+        IO._isSelectingFiles = false;
+      });
     }
   }
 }
@@ -186,53 +225,76 @@ class IOSDirectoryPicker {
 
   // 调用 iOS 目录选择方法
   static Future<String?> selectDirectory() async {
+    IO._isSelectingFiles = true;
     try {
       final String? path = await _channel.invokeMethod('selectDirectory');
       return path;
     } catch (e) {
       // 返回报错信息
       return e.toString();
+    } finally {
+      Future.delayed(const Duration(milliseconds: 100), () {
+        IO._isSelectingFiles = false;
+      });
     }
   }
 }
 
-Future<file_selector.XFile?> selectFile({required List<String> ext}) async {
-  var extensions = App.isMacOS || App.isIOS ? null : ext;
-  if (App.isAndroid) {
-    for (var e in ext) {
-      var fileType = FileType.fromExtension(e);
-      if (fileType.mime == "application/octet-stream") {
-        extensions = null;
-        break;
-      }
-    }
-  }
-  file_selector.XTypeGroup typeGroup = file_selector.XTypeGroup(
-    label: 'files',
-    extensions: extensions,
-  );
-  file_selector.XFile? file;
-  if (extensions == null && App.isAndroid) {
-    const selectFileChannel = MethodChannel("venera/select_file");
-    var filePath = await selectFileChannel.invokeMethod("selectFile");
-    if (filePath == null) return null;
-    file = file_selector.XFile(filePath);
-  } else {
-    file = await file_selector.openFile(
-      acceptedTypeGroups: <file_selector.XTypeGroup>[typeGroup],
+Future<FileSelectResult?> selectFile({required List<String> ext}) async {
+  IO._isSelectingFiles = true;
+  try {
+    var extensions = App.isMacOS || App.isIOS ? null : ext;
+    file_selector.XTypeGroup typeGroup = file_selector.XTypeGroup(
+      label: 'files',
+      extensions: extensions,
     );
-    if (file == null) return null;
+    FileSelectResult? file;
+    if (App.isAndroid) {
+      const selectFileChannel = MethodChannel("venera/select_file");
+      String mimeType = "*/*";
+      if (ext.length == 1) {
+        mimeType = FileType.fromExtension(ext[0]).mime;
+        if (mimeType == "application/octet-stream") {
+          mimeType = "*/*";
+        }
+      }
+      var filePath = await selectFileChannel.invokeMethod(
+        "selectFile",
+        mimeType,
+      );
+      if (filePath == null) return null;
+      file = FileSelectResult(filePath);
+    } else {
+      var xFile = await file_selector.openFile(
+        acceptedTypeGroups: <file_selector.XTypeGroup>[typeGroup],
+      );
+      if (xFile == null) return null;
+      file = FileSelectResult(xFile.path);
+    }
+    if (!ext.contains(file.path.split(".").last)) {
+      App.rootContext.showMessage(
+        message: "Invalid file type: ${file.path.split(".").last}",
+      );
+      return null;
+    }
+    return file;
+  } finally {
+    Future.delayed(const Duration(milliseconds: 100), () {
+      IO._isSelectingFiles = false;
+    });
   }
-  if (!ext.contains(file.path.split(".").last)) {
-    App.rootContext.showMessage(message: "Invalid file type");
-    return null;
-  }
-  return file;
 }
 
 Future<String?> selectDirectory() async {
-  var path = await file_selector.getDirectoryPath();
-  return path;
+  IO._isSelectingFiles = true;
+  try {
+    var path = await file_selector.getDirectoryPath();
+    return path;
+  } finally {
+    Future.delayed(const Duration(milliseconds: 100), () {
+      IO._isSelectingFiles = false;
+    });
+  }
 }
 
 // selectDirectoryIOS
@@ -245,26 +307,72 @@ Future<void> saveFile(
   if (data == null && file == null) {
     throw Exception("data and file cannot be null at the same time");
   }
-  if (data != null) {
-    var cache = FilePath.join(App.cachePath, filename);
-    if (File(cache).existsSync()) {
-      File(cache).deleteSync();
+  IO._isSelectingFiles = true;
+  try {
+    if (data != null) {
+      var cache = FilePath.join(App.cachePath, filename);
+      if (File(cache).existsSync()) {
+        File(cache).deleteSync();
+      }
+      await File(cache).writeAsBytes(data);
+      file = File(cache);
     }
-    await File(cache).writeAsBytes(data);
-    file = File(cache);
+    if (App.isMobile) {
+      final params = SaveFileDialogParams(sourceFilePath: file!.path);
+      await FlutterFileDialog.saveFile(params: params);
+    } else {
+      final result = await file_selector.getSaveLocation(
+        suggestedName: filename,
+      );
+      if (result != null) {
+        var xFile = file_selector.XFile(file!.path);
+        await xFile.saveTo(result.path);
+      }
+    }
+  } finally {
+    Future.delayed(const Duration(milliseconds: 100), () {
+      IO._isSelectingFiles = false;
+    });
   }
-  if (App.isMobile) {
-    final params = SaveFileDialogParams(sourceFilePath: file!.path);
-    await FlutterFileDialog.saveFile(params: params);
-  } else {
-    final result = await file_selector.getSaveLocation(
-      suggestedName: filename,
-    );
-    if (result != null) {
-      var xFile = file_selector.XFile(file!.path);
-      await xFile.saveTo(result.path);
+}
+
+class _IOOverrides extends IOOverrides {
+  @override
+  Directory createDirectory(String path) {
+    if (App.isAndroid) {
+      var dir = AndroidDirectory.fromPathSync(path);
+      if (dir == null) {
+        return super.createDirectory(path);
+      }
+      return dir;
+    } else {
+      return super.createDirectory(path);
     }
   }
+
+  @override
+  File createFile(String path) {
+    if (path.startsWith("file://")) {
+      path = path.substring(7);
+    }
+    if (App.isAndroid) {
+      var f = AndroidFile.fromPathSync(path);
+      if (f == null) {
+        return super.createFile(path);
+      }
+      return f;
+    } else {
+      return super.createFile(path);
+    }
+  }
+
+}
+
+T overrideIO<T>(T Function() f) {
+  return IOOverrides.runWithIOOverrides<T>(
+    f,
+    _IOOverrides(),
+  );
 }
 
 class Share {
@@ -302,3 +410,27 @@ String bytesToReadableString(int bytes) {
     return "${(bytes / 1024 / 1024 / 1024).toStringAsFixed(2)} GB";
   }
 }
+
+class FileSelectResult {
+  final String path;
+
+  static final _finalizer = Finalizer<String>((path) {
+    if (path.startsWith(App.cachePath)) {
+      File(path).deleteIgnoreError();
+    }
+  });
+
+  FileSelectResult(this.path) {
+    _finalizer.attach(this, path);
+  }
+
+  Future<void> saveTo(String path) async {
+    await File(this.path).copy(path);
+  }
+
+  Future<Uint8List> readAsBytes() {
+    return File(path).readAsBytes();
+  }
+
+  String get name => File(path).name;
+}

lib/utils/pdf.dart

@@ -0,0 +1,92 @@
+import 'dart:isolate';
+
+import 'package:pdf/widgets.dart';
+import 'package:venera/foundation/local.dart';
+import 'package:venera/utils/io.dart';
+
+Future<void> _createPdfFromComic({
+  required LocalComic comic,
+  required String savePath,
+  required String localPath,
+}) async {
+  final pdf = Document(
+    title: comic.title,
+    author: comic.subTitle ?? "",
+    producer: "Venera",
+  );
+
+  pdf.document.outline;
+
+  var baseDir = comic.directory.contains('/') || comic.directory.contains('\\')
+      ? comic.directory
+      : FilePath.join(localPath, comic.directory);
+
+  // add cover
+  var imageData = File(FilePath.join(baseDir, comic.cover)).readAsBytesSync();
+  pdf.addPage(Page(
+    build: (Context context) {
+      return Image(MemoryImage(imageData), fit: BoxFit.contain);
+    },
+  ));
+
+  bool multiChapters = comic.chapters != null;
+
+  void reorderFiles(List<FileSystemEntity> files) {
+    files.removeWhere(
+        (element) => element is! File || element.path.startsWith('cover'));
+    files.sort((a, b) {
+      var aName = (a as File).name;
+      var bName = (b as File).name;
+      var aNumber = int.tryParse(aName);
+      var bNumber = int.tryParse(bName);
+      if (aNumber != null && bNumber != null) {
+        return aNumber.compareTo(bNumber);
+      }
+      return aName.compareTo(bName);
+    });
+  }
+
+  if (!multiChapters) {
+    var files = Directory(baseDir).listSync();
+    reorderFiles(files);
+
+    for (var file in files) {
+      var imageData = (file as File).readAsBytesSync();
+      pdf.addPage(Page(
+        build: (Context context) {
+          return Image(MemoryImage(imageData), fit: BoxFit.contain);
+        },
+      ));
+    }
+  } else {
+    for (var chapter in comic.chapters!.keys) {
+      var files = Directory(FilePath.join(baseDir, chapter)).listSync();
+      reorderFiles(files);
+      for (var file in files) {
+        var imageData = (file as File).readAsBytesSync();
+        pdf.addPage(Page(
+          build: (Context context) {
+            return Image(MemoryImage(imageData), fit: BoxFit.contain);
+          },
+        ));
+      }
+    }
+  }
+
+  final file = File(savePath);
+  file.writeAsBytesSync(await pdf.save());
+}
+
+Future<void> createPdfFromComicIsolate({
+  required LocalComic comic,
+  required String savePath,
+}) async {
+  var localPath = LocalManager().path;
+  return Isolate.run(() => overrideIO(() async {
+        return await _createPdfFromComic(
+          comic: comic,
+          savePath: savePath,
+          localPath: localPath,
+        );
+      }));
+}

pubspec.lock

@@ -33,6 +33,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.6.1"
   args:
     dependency: transitive
     description:
@@ -49,6 +57,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.11.0"
+  barcode:
+    dependency: transitive
+    description:
+      name: barcode
+      sha256: ab180ce22c6555d77d45f0178a523669db67f95856e3378259ef2ffeb43e6003
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.8"
   battery_plus:
     dependency: "direct main"
     description:
@@ -65,6 +81,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.1"
+  bidi:
+    dependency: transitive
+    description:
+      name: bidi
+      sha256: "9a712c7ddf708f7c41b1923aa83648a3ed44cfd75b04f72d598c45e5be287f9d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.12"
   boolean_selector:
     dependency: transitive
     description:
@@ -101,18 +125,18 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.19.0"
   convert:
     dependency: transitive
     description:
       name: convert
-      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.1.2"
   cross_file:
     dependency: transitive
     description:
@@ -133,10 +157,10 @@ packages:
     dependency: transitive
     description:
       name: csslib
-      sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb"
+      sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.2"
   dbus:
     dependency: transitive
     description:
@@ -170,6 +194,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
+  dynamic_color:
+    dependency: "direct main"
+    description:
+      name: dynamic_color
+      sha256: eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.7.0"
   fake_async:
     dependency: transitive
     description:
@@ -190,10 +222,10 @@ packages:
     dependency: transitive
     description:
       name: file
-      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
+      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "7.0.1"
   file_selector:
     dependency: "direct main"
     description:
@@ -206,10 +238,10 @@ packages:
     dependency: transitive
     description:
       name: file_selector_android
-      sha256: ec439df07c4999faad319ce8ad9e971795c2f1d7132ad5a793b9370a863c6128
+      sha256: "98ac58e878b05ea2fdb204e7f4fc4978d90406c9881874f901428e01d3b18fbc"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.1+10"
+    version: "0.5.1+12"
   file_selector_ios:
     dependency: transitive
     description:
@@ -222,10 +254,10 @@ packages:
     dependency: transitive
     description:
       name: file_selector_linux
-      sha256: "712ce7fab537ba532c8febdb1a8f167b32441e74acd68c3ccb2e36dcb52c4ab2"
+      sha256: "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.3"
+    version: "0.9.3+2"
   file_selector_macos:
     dependency: transitive
     description:
@@ -262,10 +294,10 @@ packages:
     dependency: transitive
     description:
       name: fixnum
-      sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
+      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -299,10 +331,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_inappwebview_internal_annotations
-      sha256: "5f80fd30e208ddded7dbbcd0d569e7995f9f63d45ea3f548d8dd4c0b473fb4c8"
+      sha256: "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.2.0"
   flutter_inappwebview_ios:
     dependency: transitive
     description:
@@ -347,15 +379,23 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1"
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "5.0.0"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_memory_info:
+    dependency: "direct main"
+    description:
+      name: flutter_memory_info
+      sha256: "1f112f1d7503aa1681fc8e923f6cd0e847bb2fbeec3753ed021cf1e5f7e9cd74"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.0.1"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -377,18 +417,27 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_reorderable_grid_view
-      sha256: "93a2b9e279bf40b9333428a67e70e520ca1528554984eb6f6304538400897e64"
+      sha256: "732bcb1b29d5130c11a70e6acec512941fafe241f0e80bffd93ca6e415819915"
       url: "https://pub.dev"
     source: hosted
-    version: "5.3.2"
+    version: "5.4.0"
   flutter_rust_bridge:
     dependency: transitive
     description:
       name: flutter_rust_bridge
-      sha256: "5fe868d3cb8cbc4d83091748552e03f00ccfa41b8e44691bc382611f831d5f8b"
+      sha256: fb9d3c9395eae3c71d4fe3ec343b9f30636c9988150c8bb33b60047549b34e3d
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.1"
+    version: "2.6.0"
+  flutter_saf:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: "3315082b9f7055655610e4f6f136b69e48228c05"
+      resolved-ref: "3315082b9f7055655610e4f6f136b69e48228c05"
+      url: "https://github.com/pkuislm/flutter_saf.git"
+    source: git
+    version: "0.0.1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -452,10 +501,26 @@ packages:
     dependency: transitive
     description:
       name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      sha256: "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.1.1"
+  http_profile:
+    dependency: transitive
+    description:
+      name: http_profile
+      sha256: "7e679e355b09aaee2ab5010915c932cce3f2d1c11c3b2dc177891687014ffa78"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.3.0"
   intl:
     dependency: "direct main"
     description:
@@ -468,10 +533,10 @@ packages:
     dependency: transitive
     description:
       name: io
-      sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
+      sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   js:
     dependency: transitive
     description:
@@ -492,18 +557,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.5"
+    version: "10.0.7"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.8"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -516,10 +581,10 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
+      sha256: "4a16b3f03741e1252fda5de3ce712666d010ba2122f8e912c94f9f7b90e1a4c3"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "5.1.0"
   local_auth:
     dependency: "direct main"
     description:
@@ -597,10 +662,10 @@ packages:
     dependency: "direct main"
     description:
       name: mime
-      sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a"
+      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.6"
+    version: "2.0.0"
   mime_type:
     dependency: transitive
     description:
@@ -617,30 +682,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.9.0"
+  path_parsing:
+    dependency: transitive
+    description:
+      name: path_parsing
+      sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
   path_provider:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
+      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7"
+      sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.10"
+    version: "2.2.15"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
+      sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
   path_provider_linux:
     dependency: transitive
     description:
@@ -665,6 +738,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.0"
+  pdf:
+    dependency: "direct main"
+    description:
+      name: pdf
+      sha256: "05df53f8791587402493ac97b9869d3824eccbc77d97855f4545cf72df3cae07"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.11.1"
   petitparser:
     dependency: transitive
     description:
@@ -686,10 +767,10 @@ packages:
     dependency: transitive
     description:
       name: platform
-      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
+      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.5"
+    version: "3.1.6"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -706,14 +787,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.9.1"
+  qr:
+    dependency: transitive
+    description:
+      name: qr
+      sha256: "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.2"
   rhttp:
     dependency: "direct main"
     description:
       name: rhttp
-      sha256: "92fb57dea6338370efe1e4e2101e8b521f91f15bc60ef6908469b4392dd9803a"
+      sha256: "581d57b5b6056d31489af94db8653a1c11d7b59050cbbc41ece4279e50414de5"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.1"
+    version: "0.9.6"
   screen_retriever:
     dependency: transitive
     description:
@@ -767,23 +856,31 @@ packages:
     dependency: "direct main"
     description:
       name: share_plus
-      sha256: "468c43f285207c84bcabf5737f33b914ceb8eb38398b91e5e3ad1698d1b72a52"
+      sha256: "9c9bafd4060728d7cdb2464c341743adbd79d327cb067ec7afb64583540b47c8"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.2"
+    version: "10.1.2"
   share_plus_platform_interface:
     dependency: transitive
     description:
       name: share_plus_platform_interface
-      sha256: "6ababf341050edff57da8b6990f11f4e99eaba837865e2e6defe16d039619db5"
+      sha256: c57c0bbfec7142e3a0f55633be504b796af72e60e3c791b44d5a017b985f7a48
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.0"
+    version: "5.0.1"
+  shimmer:
+    dependency: "direct main"
+    description:
+      name: shimmer
+      sha256: "5f88c883a22e9f9f299e5ba0e4f7e6054857224976a5d9f839d4ebdc94a14ac9"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
   sliver_tools:
     dependency: "direct main"
     description:
@@ -812,26 +909,26 @@ packages:
     dependency: "direct main"
     description:
       name: sqlite3
-      sha256: bb174b3ec2527f9c5f680f73a89af8149dd99782fbb56ea88ad0807c5638f2ed
+      sha256: cb7f4e9dc1b52b1fa350f7b3d41c662e75fc3d399555fa4e5efcf267e9a4fbb5
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.7"
+    version: "2.5.0"
   sqlite3_flutter_libs:
     dependency: "direct main"
     description:
       name: sqlite3_flutter_libs
-      sha256: "62bbb4073edbcdf53f40c80775f33eea01d301b7b81417e5b3fb7395416258c1"
+      sha256: "636b0fe8a2de894e5455572f6cbbc458f4ffecfe9f860b79439e27041ea4f0b9"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.24"
+    version: "0.5.27"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.12.0"
   stream_channel:
     dependency: transitive
     description:
@@ -844,10 +941,10 @@ packages:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   term_glyph:
     dependency: transitive
     description:
@@ -860,18 +957,18 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "0.7.3"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.4.0"
   upower:
     dependency: transitive
     description:
@@ -884,42 +981,42 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3"
+      sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.0"
+    version: "6.3.1"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: f0c73347dfcfa5b3db8bc06e1502668265d39c08f310c29bff4e28eea9699f79
+      sha256: "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.9"
+    version: "6.3.14"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e
+      sha256: "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.1"
+    version: "6.3.2"
   url_launcher_linux:
     dependency: transitive
     description:
       name: url_launcher_linux
-      sha256: e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af
+      sha256: "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "3.2.1"
   url_launcher_macos:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672"
+      sha256: "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.1"
+    version: "3.2.2"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -940,10 +1037,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_windows
-      sha256: "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185"
+      sha256: "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.2"
+    version: "3.1.3"
   uuid:
     dependency: "direct main"
     description:
@@ -964,10 +1061,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.5"
+    version: "14.3.0"
   web:
     dependency: transitive
     description:
@@ -989,10 +1086,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a"
+      sha256: "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69"
       url: "https://pub.dev"
     source: hosted
-    version: "5.5.4"
+    version: "5.9.0"
   window_manager:
     dependency: "direct main"
     description:
@@ -1005,10 +1102,10 @@ packages:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
+      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "1.1.0"
   xml:
     dependency: transitive
     description:
@@ -1035,5 +1132,5 @@ packages:
     source: git
     version: "0.0.1"
 sdks:
-  dart: ">=3.5.4 <4.0.0"
-  flutter: ">=3.24.5"
+  dart: ">=3.6.0 <4.0.0"
+  flutter: ">=3.27.0"

pubspec.yaml

@@ -2,11 +2,11 @@ name: venera
 description: "A comic app."
 publish_to: 'none'
 
-version: 1.0.6+106
+version: 1.1.1+111
 
 environment:
-  sdk: '>=3.5.0 <4.0.0'
-  flutter: 3.24.5
+  sdk: '>=3.6.0 <4.0.0'
+  flutter: 3.27.0
 
 dependencies:
   flutter:
@@ -14,7 +14,7 @@ dependencies:
   path_provider: any
   flutter_localizations:
     sdk: flutter
-  intl: any
+  intl: ^0.19.0
   window_manager: ^0.4.3
   sqlite3: ^2.4.7
   sqlite3_flutter_libs: any
@@ -32,14 +32,14 @@ dependencies:
     git:
       url: https://github.com/wgh136/photo_view
       ref: 94724a0b
-  mime: ^1.0.5
+  mime: ^2.0.0
   share_plus: ^10.0.2
   scrollable_positioned_list:
     git:
       url: https://github.com/venera-app/flutter.widgets
       ref: 09e756b1f1b04e6298318d99ec20a787fb360f59
       path: packages/scrollable_positioned_list
-  flutter_reorderable_grid_view: 5.3.2
+  flutter_reorderable_grid_view: ^5.4.0
   yaml: any
   uuid: ^4.5.1
   desktop_webview_window:
@@ -58,18 +58,26 @@ dependencies:
     git:
       url: https://github.com/venera-app/lodepng_flutter
       ref: d1c96cd6503103b3270dfe2f320d4a1c93780f53
-  rhttp: 0.9.1
+  rhttp: 0.9.6
   webdav_client:
     git:
       url: https://github.com/wgh136/webdav_client
       ref: 285f87f15bccd2d5d5ff443761348c6ee47b98d1
   battery_plus: ^6.2.0
   local_auth: ^2.3.0
+  flutter_saf:
+    git: 
+      url: https://github.com/pkuislm/flutter_saf.git
+      ref: 3315082b9f7055655610e4f6f136b69e48228c05
+  pdf: ^3.11.1
+  dynamic_color: ^1.7.0
+  shimmer: ^3.0.0
+  flutter_memory_info: ^0.0.1
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^3.0.0
+  flutter_lints: ^5.0.0
   flutter_to_arch:
     git: https://github.com/wgh136/flutter_to_arch
   flutter_to_debian:

windows/.gitignore

@@ -15,3 +15,4 @@ x86/
 *.[Cc]ache
 # but keep track of directories ending in .cache
 !*.[Cc]ache/
+/ChineseSimplified.isl

windows/build.iss

@@ -58,6 +58,7 @@ Source: "{#RootPath}\build\windows\x64\runner\Release\local_auth_windows_plugin.
 Source: "{#RootPath}\build\windows\x64\runner\Release\zip_flutter.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#RootPath}\build\windows\x64\runner\Release\rhttp.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#RootPath}\build\windows\x64\runner\Release\lodepng_flutter.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#RootPath}\build\windows\x64\runner\Release\dynamic_color_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#RootPath}\build\windows\x64\runner\Release\data\*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
@@ -66,4 +67,4 @@ Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
 Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
 
 [Run]
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall