Merge pull request #96 from venera-app/dev

v1.1.0-patch

.github/workflows/linux.yml

@@ -1,33 +0,0 @@
-name: Build Linux
-run-name: Build Linux
-on:
-  workflow_dispatch: {}
-jobs:
-  Build_Linux:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: subosito/flutter-action@v2
-        with:
-          channel: 'stable'
-          flutter-version-file: pubspec.yaml
-          architecture: x64
-      - run: |
-          sudo apt-get update -y
-          sudo apt-get install -y ninja-build libgtk-3-dev webkit2gtk-4.1
-          dart pub global activate flutter_to_debian
-      - run: python3 debian/build.py
-      - run: dart run flutter_to_arch
-      - run: |
-          sudo rm -rf build/linux/arch/app.tar.gz
-          sudo rm -rf build/linux/arch/pkg
-          sudo rm -rf build/linux/arch/src
-          sudo rm -rf build/linux/arch/PKGBUILD
-      - uses: actions/upload-artifact@v4
-        with:
-          name: deb_build
-          path: build/linux/x64/release/debian
-      - uses: actions/upload-artifact@v4
-        with:
-          name: arch_build
-          path: build/linux/arch/

.github/workflows/main.yml

@@ -1,10 +1,13 @@
-name: Build IOS
-run-name: Build IOS
+name: Build ALL
+run-name: Build ALL
 on:
   workflow_dispatch: {}
+  release:
+    types: [published]
+
 jobs:
   Build_MacOS:
-    runs-on: macos-13
+    runs-on: macos-15
     steps:
       - uses: actions/checkout@v3
       - uses: subosito/flutter-action@v2
@@ -12,7 +15,7 @@ jobs:
           channel: "stable"
           flutter-version-file: pubspec.yaml
           architecture: x64
-      - run: sudo xcode-select --switch /Applications/Xcode_14.3.1.app
+      - run: sudo xcode-select --switch /Applications/Xcode_16.0.app
       - run: flutter pub get
         # Step 1: Decode and install the certificate
       - name: Decode and install certificate
@@ -27,23 +30,23 @@ jobs:
       - name: Build Flutter macOS App
         run: flutter build macos --release
 
-
-      # Step 4: Create the DMG file
+      # Step 3: Create the DMG file
       - name: Create DMG
         run: |
           mkdir -p dist
-          hdiutil create -volname "venera" -srcfolder build/macos/Build/Products/Release/venera.app -ov -format UDZO "dist/venera.dmg"
+          mkdir -p dist/dmg_contents
+          cp -R build/macos/Build/Products/Release/venera.app dist/dmg_contents/
+          ln -s /Applications dist/dmg_contents/Applications
+          hdiutil create -volname "venera" -srcfolder dist/dmg_contents -ov -format UDZO "dist/venera.dmg"
 
-
-
-      # Step 8: Attach and upload artifacts (optional)
+      # Step 4: Attach and upload artifacts (optional)
       - name: Upload DMG
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: venera.dmg
           path: dist/venera.dmg
   Build_IOS:
-    runs-on: macos-13
+    runs-on: macos-15
     steps:
       - uses: actions/checkout@v3
       - uses: subosito/flutter-action@v2
@@ -51,7 +54,7 @@ jobs:
           channel: "stable"
           flutter-version-file: pubspec.yaml
           architecture: x64
-      - run: sudo xcode-select --switch /Applications/Xcode_14.3.1.app
+      - run: sudo xcode-select --switch /Applications/Xcode_16.0.app
       - run: flutter pub get
       - run: flutter build ios --release --no-codesign
       - run: |
@@ -63,3 +66,121 @@ jobs:
         with:
           name: app-ios.ipa
           path: /Users/runner/work/venera/venera/build/ios/iphoneos/venera-ios.ipa
+  Build_Android:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: "stable"
+          flutter-version-file: pubspec.yaml
+          architecture: x64
+      - name: Decode and install certificate
+        env:
+          STORE_FILE: ${{ secrets.ANDROID_KEYSTORE }}
+          PROPERTY_FILE: ${{ secrets.ANDROID_KEY_PROPERTIES }}
+        run: |
+            echo "$STORE_FILE" | base64 --decode > android/keystore.jks
+            echo "$PROPERTY_FILE" > android/key.properties
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'oracle'
+          java-version: '17'
+      - run: flutter pub get
+      - run: flutter build apk --release
+      - uses: actions/upload-artifact@v4
+        with:
+          name: apks
+          path: build/app/outputs/apk/release
+  Build_Windows:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: install dependencies
+        run: | 
+          choco install yq -y
+          pip install httpx
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: "stable"
+          flutter-version-file: pubspec.yaml
+          architecture: x64
+      - name: build
+        run: |
+          flutter pub get
+          python windows/build.py
+      - uses: actions/upload-artifact@v4
+        with:
+          name: windows_build
+          path: build/windows/Venera-*
+  Build_Linux:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+          flutter-version-file: pubspec.yaml
+          architecture: x64
+      - run: |
+          sudo apt-get update -y
+          sudo apt-get install -y ninja-build libgtk-3-dev webkit2gtk-4.1
+          dart pub global activate flutter_to_debian
+      - run: python3 debian/build.py
+      - run: dart run flutter_to_arch
+      - run: |
+          sudo rm -rf build/linux/arch/app.tar.gz
+          sudo rm -rf build/linux/arch/pkg
+          sudo rm -rf build/linux/arch/src
+          sudo rm -rf build/linux/arch/PKGBUILD
+      - uses: actions/upload-artifact@v4
+        with:
+          name: deb_build
+          path: build/linux/x64/release/debian
+      - uses: actions/upload-artifact@v4
+        with:
+          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 }}

.gitignore

@@ -41,3 +41,8 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+add_translation.py
+
+*/*/generated_*
+*/*/Generated*

README.md

@@ -4,14 +4,26 @@
 [![License](https://img.shields.io/github/license/venera-app/venera)](https://github.com/venera-app/venera/blob/master/LICENSE)
 [![Download](https://img.shields.io/github/v/release/venera-app/venera)](https://github.com/venera-app/venera/releases)
 [![stars](https://img.shields.io/github/stars/venera-app/venera)](https://github.com/venera-app/venera/stargazers)
+[![Telegram](https://img.shields.io/badge/Telegram-2CA5E0?style=flat&logo=telegram&logoColor=white)](https://t.me/+Ws-IpmUutzkxMjhl)
 
 A comic reader that support reading local and network comics.
 
-## Current Status
+## Features
 
-The project is still under development, and the current version is not stable.
+- Read local comics
+- Use javascript to create comic sources
+- Read comics from network sources
+- Manage favorite comics
+- Download comics
+- View comments, tags, and other information of comics if the source supports
+- Login to comment, rate, and other operations if the source supports
 
-Use the project at your own risk.
+## Build from source
+
+1. Clone the repository
+2. Install flutter, see [flutter.dev](https://flutter.dev/docs/get-started/install)
+3. Install rust, see [rustup.rs](https://rustup.rs/)
+4. Build for your platform: e.g. `flutter build apk`
 
 ## Create a new comic source
 

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
         }
@@ -75,6 +77,9 @@ android {
 
     buildTypes {
         release {
+            ndk {
+                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+            }
             signingConfig signingConfigs.release
             applicationVariants.all { variant ->
                 variant.outputs.all { output ->

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.USE_BIOMETRIC"/>
     <application
         android:label="venera"
         android:name="${applicationName}"

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

@@ -1,49 +1,69 @@
 package com.github.wgh136.venera
 
+import android.Manifest
 import android.app.Activity
 import android.content.ContentResolver
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.net.Uri
+import android.os.Build
+import android.os.Environment
+import android.provider.Settings
+import android.util.Log
 import android.view.KeyEvent
+import androidx.activity.result.ActivityResultCallback
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContract
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
 import androidx.documentfile.provider.DocumentFile
-import io.flutter.embedding.android.FlutterActivity
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.LifecycleOwner
+import dev.flutter.packages.file_selector_android.FileUtils
+import io.flutter.embedding.android.FlutterFragmentActivity
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.EventChannel
 import io.flutter.plugin.common.MethodChannel
 import io.flutter.plugins.GeneratedPluginRegistrant
 import java.io.File
 import java.io.FileOutputStream
-import java.lang.Exception
+import java.util.concurrent.atomic.AtomicInteger
 
-class MainActivity : FlutterActivity() {
+class MainActivity : FlutterFragmentActivity() {
     var volumeListen = VolumeListen()
     var listening = false
 
-    private val pickDirectoryCode = 1
+    private val storageRequestCode = 0x10
+    private var storagePermissionRequest: ((Boolean) -> Unit)? = null
 
-    private lateinit var result: MethodChannel.Result
+    private val nextLocalRequestCode = AtomicInteger()
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        if (requestCode == pickDirectoryCode) {
-            if(resultCode != Activity.RESULT_OK) {
-                result.success(null)
-                return
-            }
-            val pickedDirectoryUri = data?.data
-            if (pickedDirectoryUri == null) {
-                result.success(null)
-                return
-            }
-            Thread {
-                try {
-                    result.success(onPickedDirectory(pickedDirectoryUri))
+    private fun <I, O> startContractForResult(
+        contract: ActivityResultContract<I, O>,
+        input: I,
+        callback: ActivityResultCallback<O>
+    ) {
+        val key = "activity_rq_for_result#${nextLocalRequestCode.getAndIncrement()}"
+        val registry = activityResultRegistry
+        var launcher: ActivityResultLauncher<I>? = null
+        val observer = object : LifecycleEventObserver {
+            override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
+                if (Lifecycle.Event.ON_DESTROY == event) {
+                    launcher?.unregister()
+                    lifecycle.removeObserver(this)
                 }
-                catch (e: Exception) {
-                    result.error("Failed to Copy Files", e.toString(), null)
-                }
-            }.start()
+            }
         }
+        lifecycle.addObserver(observer)
+        val newCallback = ActivityResultCallback<O> {
+            launcher?.unregister()
+            lifecycle.removeObserver(observer)
+            callback.onActivityResult(it)
+        }
+        launcher = registry.register(key, contract, newCallback)
+        launcher.launch(input)
     }
 
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
@@ -63,12 +83,23 @@ class MainActivity : FlutterActivity() {
                     }
                     res.success(null)
                 }
+
                 "getDirectoryPath" -> {
-                    this.result = res
                     val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
                     intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION or Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
-                    startActivityForResult(intent, pickDirectoryCode)
+                    startContractForResult(ActivityResultContracts.StartActivityForResult(), intent) { activityResult ->
+                        if (activityResult.resultCode != Activity.RESULT_OK) {
+                            res.success(null)
+                            return@startContractForResult
+                        }
+                        val pickedDirectoryUri = activityResult.data?.data
+                        if (pickedDirectoryUri == null)
+                            res.success(null)
+                        else
+                            onPickedDirectory(pickedDirectoryUri, res)
+                    }
                 }
+
                 else -> res.notImplemented()
             }
         }
@@ -85,10 +116,24 @@ class MainActivity : FlutterActivity() {
                         events.success(2)
                     }
                 }
+
                 override fun onCancel(arguments: Any?) {
                     listening = false
                 }
             })
+
+        val storageChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "venera/storage")
+        storageChannel.setMethodCallHandler { _, res ->
+            requestStoragePermission { result ->
+                res.success(result)
+            }
+        }
+
+        val selectFileChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "venera/select_file")
+        selectFileChannel.setMethodCallHandler { req, res ->
+            val mimeType = req.arguments<String>()
+            openFile(res, mimeType!!)
+        }
     }
 
     private fun getProxy(): String {
@@ -102,12 +147,13 @@ class MainActivity : FlutterActivity() {
     }
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
-        if(listening){
+        if (listening) {
             when (keyCode) {
                 KeyEvent.KEYCODE_VOLUME_DOWN -> {
                     volumeListen.down()
                     return true
                 }
+
                 KeyEvent.KEYCODE_VOLUME_UP -> {
                     volumeListen.up()
                     return true
@@ -117,43 +163,199 @@ class MainActivity : FlutterActivity() {
         return super.onKeyDown(keyCode, event)
     }
 
-    /// copy the directory to tmp directory, return copied directory
-    private fun onPickedDirectory(uri: Uri): String {
-        val contentResolver = context.contentResolver
-        var tmp = context.cacheDir
-        tmp = File(tmp, "getDirectoryPathTemp")
+    /// 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()
-        copyDirectory(contentResolver, uri, tmp)
+        Thread {
+            try {
+                copyDirectory(contentResolver, uri, tmp)
+                result.success(tmp.absolutePath)
+            }
+            catch (e: Exception) {
+                result.error("copy error", e.message, null)
+            }
+        }.start()
 
-        return tmp.absolutePath
     }
 
     private fun copyDirectory(resolver: ContentResolver, srcUri: Uri, destDir: File) {
-        val src = DocumentFile.fromTreeUri(context, srcUri) ?: return
+        val src = DocumentFile.fromTreeUri(this, srcUri) ?: return
         for (file in src.listFiles()) {
-            if(file.isDirectory) {
+            if (file.isDirectory) {
                 val newDir = File(destDir, file.name!!)
                 newDir.mkdir()
                 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()
+                    }
+                }
             }
         }
     }
+
+    private fun hasStoragePermission(): Boolean {
+        return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
+            ContextCompat.checkSelfPermission(
+                this,
+                Manifest.permission.READ_EXTERNAL_STORAGE
+            ) == PackageManager.PERMISSION_GRANTED && ContextCompat.checkSelfPermission(
+                this,
+                Manifest.permission.WRITE_EXTERNAL_STORAGE
+            ) == PackageManager.PERMISSION_GRANTED
+        } else {
+            Environment.isExternalStorageManager()
+        }
+    }
+
+    private fun requestStoragePermission(result: (Boolean) -> Unit) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
+            val readPermission = ContextCompat.checkSelfPermission(
+                this,
+                Manifest.permission.READ_EXTERNAL_STORAGE
+            ) == PackageManager.PERMISSION_GRANTED
+
+            val writePermission = ContextCompat.checkSelfPermission(
+                this,
+                Manifest.permission.WRITE_EXTERNAL_STORAGE
+            ) == PackageManager.PERMISSION_GRANTED
+
+            if (!readPermission || !writePermission) {
+                storagePermissionRequest = result
+                ActivityCompat.requestPermissions(
+                    this,
+                    arrayOf(
+                        Manifest.permission.READ_EXTERNAL_STORAGE,
+                        Manifest.permission.WRITE_EXTERNAL_STORAGE
+                    ),
+                    storageRequestCode
+                )
+            } else {
+                result(true)
+            }
+        } else {
+            if (!Environment.isExternalStorageManager()) {
+                try {
+                    val intent = Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION)
+                    intent.addCategory("android.intent.category.DEFAULT")
+                    intent.data = Uri.parse("package:$packageName")
+                    startContractForResult(ActivityResultContracts.StartActivityForResult(), intent){ _ ->
+                        result(Environment.isExternalStorageManager())
+                    }
+                } catch (e: Exception) {
+                    result(false)
+                }
+            } else {
+                result(true)
+            }
+        }
+    }
+
+    override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<out String>,
+        grantResults: IntArray
+    ) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        if (requestCode == storageRequestCode) {
+            storagePermissionRequest?.invoke(grantResults.all {
+                it == PackageManager.PERMISSION_GRANTED
+            })
+            storagePermissionRequest = null
+        }
+    }
+
+    private fun openFile(result: MethodChannel.Result, mimeType: String) {
+        val intent = Intent(Intent.ACTION_OPEN_DOCUMENT)
+        intent.addCategory(Intent.CATEGORY_OPENABLE)
+        intent.type = mimeType
+        startContractForResult(ActivityResultContracts.StartActivityForResult(), intent){ activityResult ->
+            if (activityResult.resultCode != Activity.RESULT_OK) {
+                result.success(null)
+                return@startContractForResult
+            }
+            val uri = activityResult.data?.data
+            if (uri == null) {
+                result.success(null)
+                return@startContractForResult
+            }
+            val contentResolver = contentResolver
+            val file = DocumentFile.fromSingleUri(this, uri)
+            if (file == null) {
+                result.success(null)
+                return@startContractForResult
+            }
+            val fileName = file.name
+            if (fileName == null) {
+                result.success(null)
+                return@startContractForResult
+            }
+            if(hasStoragePermission()) {
+                try {
+                    val filePath = FileUtils.getPathFromUri(this, uri)
+                    result.success(filePath)
+                    return@startContractForResult
+                }
+                catch (e: Exception) {
+                    // ignore
+                }
+            }
+            // use copy method
+            val tmp = File(cacheDir, fileName)
+            if(tmp.exists()) {
+                tmp.delete()
+            }
+            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()
+        }
+    }
 }
 
-class VolumeListen{
+class VolumeListen {
     var onUp = fun() {}
     var onDown = fun() {}
-    fun up(){
+    fun up() {
         onUp()
     }
-    fun down(){
+
+    fun down() {
         onDown()
     }
 }

assets/init.js

@@ -224,7 +224,25 @@ let Convert = {
             key: key,
             isEncode: false
         });
-    }
+    },
+    /** Encode bytes to hex string
+     * @param bytes {ArrayBuffer}
+     * @return {string}
+     */
+    hexEncode: (bytes) => {
+        const hexDigits = '0123456789abcdef';
+        const view = new Uint8Array(bytes);
+        let charCodes = new Uint8Array(view.length * 2);
+        let j = 0;
+
+        for (let i = 0; i < view.length; i++) {
+            let byte = view[i];
+            charCodes[j++] = hexDigits.charCodeAt((byte >> 4) & 0xF);
+            charCodes[j++] = hexDigits.charCodeAt(byte & 0xF);
+        }
+
+        return String.fromCharCode(...charCodes);
+    },
 }
 
 /**
@@ -681,7 +699,7 @@ class HtmlElement {
             doc: this.doc,
         })
         if(k == null) return null;
-        return new HtmlElement(k);
+        return new HtmlElement(k, this.doc);
     }
 
     /**
@@ -832,6 +850,7 @@ let console = {
  * @param id {string}
  * @param title {string}
  * @param subtitle {string}
+ * @param subTitle {string} - equal to subtitle
  * @param cover {string}
  * @param tags {string[]}
  * @param description {string}
@@ -841,10 +860,11 @@ let console = {
  * @param stars {number?} - 0-5, double
  * @constructor
  */
-function Comic({id, title, subtitle, cover, tags, description, maxPage, language, favoriteId, stars}) {
+function Comic({id, title, subtitle, subTitle, cover, tags, description, maxPage, language, favoriteId, stars}) {
     this.id = id;
     this.title = title;
     this.subtitle = subtitle;
+    this.subTitle = subTitle;
     this.cover = cover;
     this.tags = tags;
     this.description = description;
@@ -857,11 +877,13 @@ function Comic({id, title, subtitle, cover, tags, description, maxPage, language
 /**
  * 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
@@ -874,10 +896,12 @@ function Comic({id, title, subtitle, cover, tags, description, maxPage, language
  * @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;
@@ -895,6 +919,7 @@ function ComicDetails({title, cover, description, tags, chapters, isFavorite, su
     this.url = url;
     this.stars = stars;
     this.maxPage = maxPage;
+    this.comments = comments;
 }
 
 /**
@@ -922,6 +947,33 @@ function Comment({userName, avatar, content, time, replyCount, id, isLiked, scor
     this.voteStatus = voteStatus;
 }
 
+/**
+ * Create image loading config
+ * @param url {string?}
+ * @param method {string?} - http method, uppercase
+ * @param data {any} - request data, may be null
+ * @param headers {Object?} - request headers
+ * @param onResponse {((ArrayBuffer) => ArrayBuffer)?} - modify response data
+ * @param modifyImage {string?}
+ *  A js script string.
+ *  The script will be executed in a new Isolate.
+ *  A function named `modifyImage` should be defined in the script, which receives an [Image] as the only argument, and returns an [Image]..
+ * @param onLoadFailed {(() => ImageLoadingConfig)?} - called when the image loading failed
+ * @constructor
+ * @since 1.0.5
+ *
+ * To keep the compatibility with the old version, do not use the constructor. Consider creating a new object with the properties directly.
+ */
+function ImageLoadingConfig({url, method, data, headers, onResponse, modifyImage, onLoadFailed}) {
+    this.url = url;
+    this.method = method;
+    this.data = data;
+    this.headers = headers;
+    this.onResponse = onResponse;
+    this.modifyImage = modifyImage;
+    this.onLoadFailed = onLoadFailed;
+}
+
 class ComicSource {
     name = ""
 
@@ -999,4 +1051,118 @@ class ComicSource {
     init() { }
 
     static sources = {}
-}
+}
+
+/// A reference to dart object.
+/// The api can only be used in the comic.onImageLoad.modifyImage function
+class Image {
+    key = 0;
+
+    constructor(key) {
+        this.key = key;
+    }
+
+    /**
+     * Copy the specified range of the image
+     * @param x
+     * @param y
+     * @param width
+     * @param height
+     * @returns {Image|null}
+     */
+    copyRange(x, y, width, height) {
+        let key = sendMessage({
+            method: "image",
+            function: "copyRange",
+            key: this.key,
+            x: x,
+            y: y,
+            width: width,
+            height: height
+        })
+        if(key == null) return null;
+        return new Image(key);
+    }
+
+    /**
+     * Copy the image and rotate 90 degrees
+     * @returns {Image|null}
+     */
+    copyAndRotate90() {
+        let key = sendMessage({
+            method: "image",
+            function: "copyAndRotate90",
+            key: this.key
+        })
+        if(key == null) return null;
+        return new Image(key);
+    }
+
+    /**
+     * fill [image] to this image at (x, y)
+     * @param x
+     * @param y
+     * @param image
+     */
+    fillImageAt(x, y, image) {
+        sendMessage({
+            method: "image",
+            function: "fillImageAt",
+            key: this.key,
+            x: x,
+            y: y,
+            image: image.key
+        })
+    }
+
+    /**
+     * fill [image] with range(srcX, srcY, width, height) to this image at (x, y)
+     * @param x
+     * @param y
+     * @param image
+     * @param srcX
+     * @param srcY
+     * @param width
+     * @param height
+     */
+    fillImageRangeAt(x, y, image, srcX, srcY, width, height) {
+        sendMessage({
+            method: "image",
+            function: "fillImageRangeAt",
+            key: this.key,
+            x: x,
+            y: y,
+            image: image.key,
+            srcX: srcX,
+            srcY: srcY,
+            width: width,
+            height: height
+        })
+    }
+
+    get width() {
+        return sendMessage({
+            method: "image",
+            function: "getWidth",
+            key: this.key
+        })
+    }
+
+    get height() {
+        return sendMessage({
+            method: "image",
+            function: "getHeight",
+            key: this.key
+        })
+    }
+
+    static empty(width, height) {
+        let key = sendMessage({
+            method: "image",
+            function: "emptyImage",
+            width: width,
+            height: height
+        })
+        return new Image(key);
+    }
+}

assets/translation.json

@@ -17,9 +17,10 @@
     "Multiple Comics": "多个漫画",
     "help": "帮助",
     "Select": "选择",
+    "Selected @a comics": "已选择 @a 部漫画",
     "Imported @a comics": "已导入 @a 部漫画",
     "Downloading": "下载中",
-    "Back": "返回",
+    "Back": "后退",
     "Delete": "删除",
     "Full Screen": "全屏",
     "Auto Page Turning": "自动翻页",
@@ -40,11 +41,18 @@
     "Select a folder": "选择一个文件夹",
     "Folder": "文件夹",
     "Confirm": "确认",
-    "Are you sure you want to delete this comic?": "您确定要删除这部漫画吗？",
-    "Add comic source": "添加漫画来源",
+    "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": "打开帮助",
+    "Open in Browser": "打开网页",
     "Check updates": "检查更新",
     "Edit": "编辑",
     "Update": "更新",
@@ -97,10 +105,11 @@
     "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": "明亮",
-    "Dark": "黑暗",
+    "Light": "浅色",
+    "Dark": "深色",
     "Theme Color": "主题颜色",
     "Red": "红色",
     "Pink": "粉色",
@@ -129,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": "缓存限制",
@@ -141,12 +151,107 @@
     "1. The directory only contains image files." : "1. 目录只包含图片文件。",
     "2. The directory contains directories which contain image files. Each directory is considered as a chapter." : "2. 目录包含多个包含图片文件的目录。每个目录被视为一个章节。",
     "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." : "目录名称将被用作漫画标题。章节目录的名称将被用作章节标题。",
+    "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": "退出"
+    "Exit": "退出",
+    "View more": "查看更多",
+    "Sort": "排序",
+    "Name": "名称",
+    "Date": "日期",
+    "Date Desc": "日期降序",
+    "Start": "开始",
+    "Export App Data": "导出应用数据",
+    "Import App Data": "导入应用数据",
+    "Export": "导出",
+    "Download Threads": "下载线程数",
+    "Update Time": "更新时间",
+    "Copy ID": "复制ID",
+    "Copy URL": "复制URL",
+    "Create": "创建",
+    "Folder Name": "文件夹名称",
+    "Ranking": "排行",
+    "Download Selected": "下载选中",
+    "Download All": "下载全部",
+    "Order": "顺序",
+    "minAppVersion @version is required": "需要最低App版本 @version",
+    "Remove": "移除",
+    "Long press to zoom": "长按缩放",
+    "Updates Available": "更新可用",
+    "Unselected": "未选择",
+    "Long press and drag to reorder.": "长按并拖动以重新排序。",
+    "Limit image width": "限制图片宽度",
+    "When using Continuous(Top to Bottom) mode": "当使用连续（从上到下）模式",
+    "Open link": "打开链接",
+    "Open comic": "打开漫画",
+    "Move To First": "移动到最前",
+    "Cancel": "取消",
+    "Paused": "已暂停",
+    "Pause": "暂停",
+    "Operation": "操作",
+    "Upload": "上传",
+    "Saved": "已保存",
+    "Sync Data": "同步数据",
+    "Syncing Data": "正在同步数据",
+    "Data Sync": "数据同步",
+    "Quick Favorite": "快速收藏",
+    "Long press on the favorite button to quickly add to this folder": "长按收藏按钮快速添加到这个文件夹",
+    "Added": "已添加",
+    "Turn page by volume keys": "使用音量键翻页",
+    "Display time & battery info in reader":"在阅读器中显示时间和电量信息",
+    "EhViewer downloads":"EhViewer下载",
+    "Select an EhViewer database and a download folder.":"选择EhViewer的下载数据（导出的db文件）与存放下载内容的目录",
+    "(EhViewer)Default": "(EhViewer)默认",
+    "If you import an EhViewer's database, program will automatically create folders according to the download label in that database.": "若通过EhViewer数据库导入漫画，程序将会按其中的下载标签自动创建收藏文件夹。",
+    "Multi-Select": "进入多选模式",
+    "Exit Multi-Select": "退出多选模式",
+    "Selected @c comics": "已选择 @c 本漫画",
+    "Select All": "全选",
+    "Deselect": "取消选择",
+    "Invert Selection": "反选",
+    "Select in range": "区间选择",
+    "Finished": "已完成",
+    "Updating": "更新中",
+    "Update Comics Info": "更新漫画信息",
+    "Create Folder": "新建文件夹",
+    "Select an image on screen": "选择屏幕上的图片",
+    "Added @count comics to download queue.": "已添加 @count 本漫画到下载队列",
+    "Ignore Certificate Errors": "忽略证书错误",
+    "Authorization Required": "需要身份验证",
+    "Sync": "同步",
+    "The folder is Linked to @source": "文件夹已关联到 @source",
+    "Source Folder": "源文件夹",
+    "Use a config file": "使用配置文件",
+    "Comic Source list": "漫画源列表",
+    "View": "查看",
+    "Copy": "复制",
+    "Copied": "已复制",
+    "Search History": "搜索历史",
+    "Clear Search History": "清除搜索历史",
+    "Search in": "搜索于",
+    "Clear History": "清除历史",
+    "Are you sure you want to clear your history?": "确定要清除您的历史记录吗？",
+    "No Explore Pages": "没有探索页面",
+    "Add a comic source in home page": "在主页添加一个漫画源",
+    "Please check your settings": "请检查您的设置",
+    "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": "首頁",
@@ -167,9 +272,10 @@
     "Multiple Comics": "多部漫畫",
     "help": "幫助",
     "Select": "選擇",
+    "Selected @a comics": "已選擇 @a 部漫畫",
     "Imported @a comics": "已匯入 @a 部漫畫",
     "Downloading": "下載中",
-    "Back": "返回",
+    "Back": "後退",
     "Delete": "刪除",
     "Full Screen": "全螢幕",
     "Auto Page Turning": "自動翻頁",
@@ -191,11 +297,18 @@
     "Select a folder": "選擇一個文件夾",
     "Folder": "文件夾",
     "Confirm": "確認",
-    "Are you sure you want to delete this comic?": "您確定要刪除這部漫畫嗎？",
-    "Add comic source": "添加漫畫來源",
+    "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": "打開幫助",
+    "Open in Browser": "打開網頁",
     "Check updates": "檢查更新",
     "Edit": "編輯",
     "Update": "更新",
@@ -246,10 +359,11 @@
     "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": "明亮",
-    "Dark": "黑暗",
+    "Light": "浅色",
+    "Dark": "深色",
     "Theme Color": "主題顏色",
     "Red": "紅色",
     "Pink": "粉色",
@@ -278,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": "緩存限制",
@@ -290,11 +405,106 @@
     "1. The directory only contains image files." : "1. 目錄只包含圖片文件。",
     "2. The directory contains directories which contain image files. Each directory is considered as a chapter." : "2. 目錄包含多個包含圖片文件的目錄。每個目錄被視為一個章節。",
     "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." : "目錄名稱將被用作漫畫標題。章節目錄的名稱將被用作章節標題。",
+    "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": "退出"
+    "Exit": "退出",
+    "View more": "查看更多",
+    "Sort": "排序",
+    "Name": "名稱",
+    "Date": "日期",
+    "Date Desc": "日期降序",
+    "Start": "開始",
+    "Export App Data": "匯出應用數據",
+    "Import App Data": "匯入應用數據",
+    "Export": "匯出",
+    "Download Threads": "下載線程數",
+    "Update Time": "更新時間",
+    "Copy ID": "複製ID",
+    "Copy URL": "複製URL",
+    "Create": "創建",
+    "Folder Name": "文件夾名稱",
+    "Ranking": "排行",
+    "Download Selected": "下載選中",
+    "Download All": "下載全部",
+    "Order": "順序",
+    "minAppVersion @version is required": "需要最低App版本 @version",
+    "Remove": "移除",
+    "Long press to zoom": "長按縮放",
+    "Updates Available": "更新可用",
+    "Unselected": "未選擇",
+    "Long press and drag to reorder.": "長按並拖動以重新排序。",
+    "Limit image width": "限制圖片寬度",
+    "When using Continuous(Top to Bottom) mode": "當使用連續（從上到下）模式",
+    "Open link": "打開鏈接",
+    "Open comic": "打開漫畫",
+    "Move To First": "移動到最前",
+    "Cancel": "取消",
+    "Paused": "已暫停",
+    "Pause": "暫停",
+    "Operation": "操作",
+    "Upload": "上傳",
+    "Saved": "已保存",
+    "Sync Data": "同步數據",
+    "Syncing Data": "正在同步數據",
+    "Data Sync": "數據同步",
+    "Quick Favorite": "快速收藏",
+    "Long press on the favorite button to quickly add to this folder": "長按收藏按鈕快速添加到這個文件夾",
+    "Added": "已添加",
+    "Turn page by volume keys": "使用音量鍵翻頁",
+    "Display time & battery info in reader": "在閱讀器中顯示時間和電量信息",
+    "EhViewer downloads": "EhViewer下載",
+    "Select an EhViewer database and a download folder.": "選擇EhViewer的下載資料（匯出的db檔案）與存放下載內容的目錄",
+    "(EhViewer)Default": "(EhViewer)預設",
+    "If you import an EhViewer's database, program will automatically create folders according to the download label in that database.": "若透過EhViewer資料庫匯入漫畫，程式將會按其中的下載標籤自動建立收藏資料夾。",
+    "Multi-Select": "進入多選模式",
+    "Exit Multi-Select": "退出多選模式",
+    "Selected @c comics": "已選擇 @c 本漫畫",
+    "Select All": "全選",
+    "Deselect": "取消選擇",
+    "Invert Selection": "反選",
+    "Select in range": "區間選擇",
+    "Finished": "已完成",
+    "Updating": "更新中",
+    "Update Comics Info": "更新漫畫信息",
+    "Create Folder": "新建文件夾",
+    "Select an image on screen": "選擇屏幕上的圖片",
+    "Added @count comics to download queue.": "已添加 @count 本漫畫到下載隊列",
+    "Ignore Certificate Errors": "忽略證書錯誤",
+    "Authorization Required": "需要身份驗證",
+    "Sync": "同步",
+    "The folder is Linked to @source": "文件夾已關聯到 @source",
+    "Source Folder": "源文件夾",
+    "Use a config file": "使用配置文件",
+    "Comic Source list": "漫畫源列表",
+    "View": "查看",
+    "Copy": "複製",
+    "Copied": "已複製",
+    "Search History": "搜索歷史",
+    "Clear Search History": "清除搜索歷史",
+    "Search in": "搜索於",
+    "Clear History": "清除歷史",
+    "Are you sure you want to clear your history?": "確定要清除您的歷史記錄嗎？",
+    "No Explore Pages": "沒有探索頁面",
+    "Add a comic source in home page": "在主頁添加一個漫畫源",
+    "Please check your settings": "請檢查您的設定",
+    "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": "下載已開始"
   }
 }

ios/Runner.xcodeproj/project.pbxproj

@@ -15,6 +15,7 @@
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+		C0086D072CDEFE6E004596D9 /* DirectoryPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0086D062CDEFE64004596D9 /* DirectoryPicker.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -59,6 +60,7 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		C0086D062CDEFE64004596D9 /* DirectoryPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DirectoryPicker.swift; sourceTree = "<group>"; };
 		C22B8A9F3177D4A68EB8F66B /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -133,6 +135,7 @@
 				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
 				74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
 				74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */,
+				C0086D062CDEFE64004596D9 /* DirectoryPicker.swift */,
 			);
 			path = Runner;
 			sourceTree = "<group>";
@@ -144,7 +147,6 @@
 				730F73FE38E23FCF3E461640 /* Pods-Runner.release.xcconfig */,
 				29B89F848F26E839605E1D88 /* Pods-Runner.profile.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -336,6 +338,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				C0086D072CDEFE6E004596D9 /* DirectoryPicker.swift in Sources */,
 				74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
 				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
 			);

ios/Runner/AppDelegate.swift

@@ -1,12 +1,16 @@
 import Flutter
 import UIKit
 import UniformTypeIdentifiers
+import Foundation // 添加此行
 
 @main
 @objc class AppDelegate: FlutterAppDelegate, UIDocumentPickerDelegate {
   var flutterResult: FlutterResult?
   var directoryPath: URL!
 
+  // 定义插件通道名称
+  private var directoryPicker: DirectoryPicker?
+
   override func application(
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
@@ -42,6 +46,9 @@ import UniformTypeIdentifiers
         self.directoryPath?.stopAccessingSecurityScopedResource()
         self.directoryPath = nil
         result(nil)
+      } else if call.method == "selectDirectory" {
+        self.directoryPicker = DirectoryPicker()
+        self.directoryPicker?.selectDirectory(result: result)
       } else {
         result(FlutterMethodNotImplemented)
       }

ios/Runner/DirectoryPicker.swift

@@ -0,0 +1,36 @@
+import UIKit
+import Flutter
+
+class DirectoryPicker: NSObject, UIDocumentPickerDelegate {
+    private var result: FlutterResult?
+
+    // 初始化选择目录方法
+    func selectDirectory(result: @escaping FlutterResult) {
+        self.result = result
+
+        // 配置 UIDocumentPicker 为目录选择模式
+        let documentPicker = UIDocumentPickerViewController(forOpeningContentTypes: [.folder])
+        documentPicker.delegate = self
+        documentPicker.allowsMultipleSelection = false
+
+        // 获取根视图控制器并显示选择器
+        if let rootViewController = UIApplication.shared.keyWindow?.rootViewController {
+            rootViewController.present(documentPicker, animated: true, completion: nil)
+        }
+    }
+
+    // 处理选择完成后的结果
+    func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) {
+        // 获取选中的路径
+        if let url = urls.first {
+            result?(url.path)
+        } else {
+            result?(nil)
+        }
+    }
+
+    // 处理取消选择情况
+    func documentPickerWasCancelled(_ controller: UIDocumentPickerViewController) {
+        result?(nil)
+    }
+}

ios/Runner/Info.plist

@@ -46,6 +46,12 @@
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
 	<key>NSPhotoLibraryUsageDescription</key>
-  <string>Choose images</string>
+  	<string>Choose images</string>
+	<key>UIFileSharingEnabled</key>
+	<true/>
+	<key>LSSupportsOpeningDocumentsInPlace</key>
+	<true/>
+	<key>NSFaceIDUsageDescription</key>
+    <string>Ensure that the operation is being performed by the user themselves.</string>
 </dict>
 </plist>

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) {
@@ -369,10 +408,14 @@ class _FilledTabBarState extends State<FilledTabBar> {
     final double tabWidth = tabRight - tabLeft;
     final double tabCenter = tabLeft + tabWidth / 2;
     final double tabBarWidth = tabBarBox.size.width;
-    final double scrollOffset = tabCenter - tabBarWidth / 2;
+    double scrollOffset = tabCenter - tabBarWidth / 2;
     if (scrollOffset == scrollController.offset) {
       return;
     }
+    scrollOffset = scrollOffset.clamp(
+      0.0,
+      scrollController.position.maxScrollExtent,
+    );
     scrollController.animateTo(
       scrollOffset,
       duration: const Duration(milliseconds: 200),
@@ -394,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,
@@ -691,6 +734,7 @@ class _SliverSearchBarDelegate extends SliverPersistentHeaderDelegate {
                       icon: const Icon(Icons.clear),
                       onPressed: () {
                         editingController.clear();
+                        onChanged?.call("");
                       },
                     );
             },

lib/components/button.dart

@@ -156,7 +156,7 @@ class _ButtonState extends State<Button> {
   @override
   Widget build(BuildContext context) {
     var padding = widget.padding ??
-        const EdgeInsets.symmetric(horizontal: 16, vertical: 6);
+        const EdgeInsets.symmetric(horizontal: 16);
     var width = widget.width;
     if (width != null) {
       width = width - padding.horizontal;
@@ -172,7 +172,7 @@ class _ButtonState extends State<Button> {
       child: DefaultTextStyle(
         style: TextStyle(
           color: textColor,
-          fontSize: 16,
+          fontSize: 14,
         ),
         child: isLoading
             ? CircularProgressIndicator(
@@ -206,15 +206,16 @@ class _ButtonState extends State<Button> {
           padding: padding,
           constraints: const BoxConstraints(
             minWidth: 76,
+            minHeight: 32,
           ),
           decoration: BoxDecoration(
             color: buttonColor,
             borderRadius: BorderRadius.circular(16),
-            boxShadow: (isHover && !isLoading && widget.type == ButtonType.filled)
+            boxShadow: (isHover && !isLoading && (widget.type == ButtonType.filled || widget.type == ButtonType.normal))
                 ? [
                     BoxShadow(
-                      color: Colors.black.withOpacity(0.1),
-                      blurRadius: 4,
+                      color: Colors.black.toOpacity(0.1),
+                      blurRadius: 2,
                       offset: const Offset(0, 1),
                     )
                   ]
@@ -247,13 +248,21 @@ 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;
+      }
+    }
+    if (widget.type == ButtonType.normal) {
+      var color = widget.color ?? context.colorScheme.surfaceContainer;
+      if (isHover) {
+        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;
   }
@@ -336,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,14 +163,21 @@ 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);
-      image = FileImage(localComic!.coverFile);
+      if (localComic == null) {
+        return const SizedBox();
+      }
+      image = FileImage(localComic.coverFile);
     } else {
-      image = CachedImageProvider(comic.cover, sourceKey: comic.sourceKey);
+      image = CachedImageProvider(
+        comic.cover,
+        sourceKey: comic.sourceKey,
+        cid: comic.id,
+      );
     }
     return AnimatedImage(
       image: image,
@@ -176,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),
@@ -219,75 +236,137 @@ class ComicTile extends StatelessWidget {
 
   Widget _buildBriefMode(BuildContext context) {
     return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 8),
-      child: Material(
-        color: Colors.transparent,
-        borderRadius: BorderRadius.circular(8),
-        elevation: 1,
-        child: Stack(
-          children: [
-            Positioned.fill(
-              child: Container(
-                decoration: BoxDecoration(
-                  color: Theme.of(context).colorScheme.secondaryContainer,
-                  borderRadius: BorderRadius.circular(8),
-                ),
-                clipBehavior: Clip.antiAlias,
-                child: buildImage(context),
-              ),
-            ),
-            Positioned(
-                bottom: 0,
-                left: 0,
-                right: 0,
-                child: Container(
-                  width: double.infinity,
-                  decoration: BoxDecoration(
-                    gradient: LinearGradient(
-                        begin: Alignment.topCenter,
-                        end: Alignment.bottomCenter,
-                        colors: [
-                          Colors.transparent,
-                          Colors.black.withOpacity(0.3),
-                          Colors.black.withOpacity(0.5),
-                        ]),
-                    borderRadius: const BorderRadius.only(
-                      bottomLeft: Radius.circular(8),
-                      bottomRight: Radius.circular(8),
+        padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 8),
+        child: LayoutBuilder(
+          builder: (context, constraints) {
+            return InkWell(
+              borderRadius: BorderRadius.circular(8),
+              onTap: _onTap,
+              onLongPress:
+                  enableLongPressed ? () => _onLongPressed(context) : null,
+              onSecondaryTapDown: (detail) => onSecondaryTap(detail, context),
+              child: Column(
+                children: [
+                  Expanded(
+                    child: SizedBox(
+                      child: Stack(
+                        children: [
+                          Positioned.fill(
+                            child: Container(
+                              decoration: BoxDecoration(
+                                color: Theme.of(context)
+                                    .colorScheme
+                                    .secondaryContainer,
+                                borderRadius: BorderRadius.circular(8),
+                              ),
+                              clipBehavior: Clip.antiAlias,
+                              child: buildImage(context),
+                            ),
+                          ),
+                          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: 2, vertical: 2),
+                                child: ClipRRect(
+                                  borderRadius: const BorderRadius.all(
+                                    Radius.circular(10.0),
+                                  ),
+                                  child: Container(
+                                    color: Colors.black.toOpacity(0.5),
+                                    child: Padding(
+                                      padding:
+                                          const EdgeInsets.fromLTRB(8, 6, 8, 6),
+                                      child: ConstrainedBox(
+                                        constraints: BoxConstraints(
+                                          maxWidth: constraints.maxWidth,
+                                        ),
+                                        child: Text(
+                                          text,
+                                          style: TextStyle(
+                                            fontWeight: FontWeight.w500,
+                                            fontSize: fortSize,
+                                            color: Colors.white,
+                                          ),
+                                          textAlign: TextAlign.right,
+                                          maxLines: 2,
+                                          overflow: TextOverflow.ellipsis,
+                                        ),
+                                      ),
+                                    ),
+                                  ),
+                                ),
+                              );
+                            })(),
+                          ),
+                        ],
+                      ),
                     ),
                   ),
-                  child: Padding(
-                    padding: const EdgeInsets.fromLTRB(8, 4, 8, 4),
+                  Padding(
+                    padding: const EdgeInsets.fromLTRB(8, 4, 8, 0),
                     child: Text(
-                      comic.title.replaceAll("\n", ""),
+                      comic.title.replaceAll('\n', ''),
                       style: const TextStyle(
                         fontWeight: FontWeight.w500,
-                        fontSize: 14.0,
-                        color: Colors.white,
                       ),
-                      maxLines: 2,
+                      maxLines: 1,
                       overflow: TextOverflow.ellipsis,
                     ),
                   ),
-                )),
-            Positioned.fill(
-              child: Material(
-                color: Colors.transparent,
-                child: InkWell(
-                  onTap: _onTap,
-                  onLongPress:
-                      enableLongPressed ? () => onLongPress(context) : null,
-                  onSecondaryTapDown: (detail) =>
-                      onSecondaryTap(detail, context),
-                  borderRadius: BorderRadius.circular(8),
-                  child: const SizedBox.expand(),
-                ),
+                ],
               ),
-            )
-          ],
-        ),
-      ),
-    );
+            );
+          },
+        ));
+  }
+
+  List<String> _splitText(String text) {
+    // split text by space, comma. text in brackets will be kept together.
+    var words = <String>[];
+    var buffer = StringBuffer();
+    var inBracket = false;
+    for (var i = 0; i < text.length; i++) {
+      var c = text[i];
+      if (c == '[' || c == '(') {
+        inBracket = true;
+      } else if (c == ']' || c == ')') {
+        inBracket = false;
+      } else if (c == ' ' || c == ',') {
+        if (inBracket) {
+          buffer.write(c);
+        } else {
+          words.add(buffer.toString());
+          buffer.clear();
+        }
+      } else {
+        buffer.write(c);
+      }
+    }
+    if (buffer.isNotEmpty) {
+      words.add(buffer.toString());
+    }
+    return words;
   }
 
   void block(BuildContext comicTileContext) {
@@ -296,7 +375,7 @@ class ComicTile extends StatelessWidget {
       builder: (context) {
         var words = <String>[];
         var all = <String>[];
-        all.addAll(comic.title.split(' ').where((element) => element != ''));
+        all.addAll(_splitText(comic.title));
         if (comic.subtitle != null && comic.subtitle != "") {
           all.add(comic.subtitle!);
         }
@@ -396,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,
@@ -454,7 +533,9 @@ class _ComicDescription extends StatelessWidget {
                 ),
               ).toAlign(Alignment.topCenter);
             }),
-          ),
+          )
+        else
+          const Spacer(),
         Row(
           crossAxisAlignment: CrossAxisAlignment.end,
           children: [
@@ -474,18 +555,17 @@ class _ComicDescription extends StatelessWidget {
             ),
             if (badge != null)
               Container(
-                padding: const EdgeInsets.fromLTRB(6, 4, 6, 4),
-                decoration: BoxDecoration(
-                  color: Theme.of(context).colorScheme.tertiaryContainer,
-                  borderRadius: const BorderRadius.all(Radius.circular(8)),
-                ),
-                child: Center(
-                  child:Text(
-                    "${badge![0].toUpperCase()}${badge!.substring(1).toLowerCase()}",
-                    style: const TextStyle(fontSize: 12),
+                  padding: const EdgeInsets.fromLTRB(6, 4, 6, 4),
+                  decoration: BoxDecoration(
+                    color: Theme.of(context).colorScheme.tertiaryContainer,
+                    borderRadius: const BorderRadius.all(Radius.circular(8)),
                   ),
-                )
-              ),
+                  child: Center(
+                    child: Text(
+                      "${badge![0].toUpperCase()}${badge!.substring(1).toLowerCase()}",
+                      style: const TextStyle(fontSize: 12),
+                    ),
+                  )),
           ],
         )
       ],
@@ -569,17 +649,20 @@ class _ReadingHistoryPainter extends CustomPainter {
 }
 
 class SliverGridComics extends StatefulWidget {
-  const SliverGridComics({
-    super.key,
-    required this.comics,
-    this.onLastItemBuild,
-    this.badgeBuilder,
-    this.menuBuilder,
-    this.onTap,
-  });
+  const SliverGridComics(
+      {super.key,
+      required this.comics,
+      this.onLastItemBuild,
+      this.badgeBuilder,
+      this.menuBuilder,
+      this.onTap,
+      this.onLongPressed,
+      this.selections});
 
   final List<Comic> comics;
 
+  final Map<Comic, bool>? selections;
+
   final void Function()? onLastItemBuild;
 
   final String? Function(Comic)? badgeBuilder;
@@ -588,6 +671,8 @@ class SliverGridComics extends StatefulWidget {
 
   final void Function(Comic)? onTap;
 
+  final void Function(Comic)? onLongPressed;
+
   @override
   State<SliverGridComics> createState() => _SliverGridComicsState();
 }
@@ -633,10 +718,12 @@ class _SliverGridComicsState extends State<SliverGridComics> {
   Widget build(BuildContext context) {
     return _SliverGridComics(
       comics: comics,
+      selection: widget.selections,
       onLastItemBuild: widget.onLastItemBuild,
       badgeBuilder: widget.badgeBuilder,
       menuBuilder: widget.menuBuilder,
       onTap: widget.onTap,
+      onLongPressed: widget.onLongPressed,
     );
   }
 }
@@ -648,10 +735,14 @@ class _SliverGridComics extends StatelessWidget {
     this.badgeBuilder,
     this.menuBuilder,
     this.onTap,
+    this.onLongPressed,
+    this.selection,
   });
 
   final List<Comic> comics;
 
+  final Map<Comic, bool>? selection;
+
   final void Function()? onLastItemBuild;
 
   final String? Function(Comic)? badgeBuilder;
@@ -660,6 +751,8 @@ class _SliverGridComics extends StatelessWidget {
 
   final void Function(Comic)? onTap;
 
+  final void Function(Comic)? onLongPressed;
+
   @override
   Widget build(BuildContext context) {
     return SliverGrid(
@@ -669,11 +762,30 @@ class _SliverGridComics extends StatelessWidget {
             onLastItemBuild?.call();
           }
           var badge = badgeBuilder?.call(comics[index]);
-          return ComicTile(
+          var isSelected =
+              selection == null ? false : selection![comics[index]] ?? false;
+          var comic = ComicTile(
             comic: comics[index],
             badge: badge,
             menuOptions: menuBuilder?.call(comics[index]),
             onTap: onTap != null ? () => onTap!(comics[index]) : null,
+            onLongPressed: onLongPressed != null
+                ? () => onLongPressed!(comics[index])
+                : null,
+          );
+          if (selection == null) {
+            return comic;
+          }
+          return AnimatedContainer(
+            duration: const Duration(milliseconds: 150),
+            decoration: BoxDecoration(
+              color: isSelected
+                  ? Theme.of(context).colorScheme.secondaryContainer.toOpacity(0.72)
+                  : null,
+              borderRadius: BorderRadius.circular(12),
+            ),
+            margin: const EdgeInsets.all(4),
+            child: comic,
           );
         },
         childCount: comics.length,
@@ -719,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;
@@ -733,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();
 }
@@ -750,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) {
@@ -872,6 +1035,7 @@ class ComicListState extends State<ComicList> {
     try {
       if (widget.loadPage != null) {
         var res = await widget.loadPage!(page);
+        if (!mounted) return;
         if (res.success) {
           if (res.data.isEmpty) {
             _data[page] = const [];
@@ -896,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();
     }
   }
 
@@ -953,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

@@ -0,0 +1,225 @@
+import 'package:flutter/material.dart';
+import 'package:venera/foundation/app.dart';
+
+/// patched slider.dart with RtL support
+class _SliderDefaultsM3 extends SliderThemeData {
+  _SliderDefaultsM3(this.context)
+      : super(trackHeight: 4.0);
+
+  final BuildContext context;
+  late final ColorScheme _colors = Theme.of(context).colorScheme;
+
+  @override
+  Color? get activeTrackColor => _colors.primary;
+
+  @override
+  Color? get inactiveTrackColor => _colors.surfaceContainerHighest;
+
+  @override
+  Color? get secondaryActiveTrackColor => _colors.primary.toOpacity(0.54);
+
+  @override
+  Color? get disabledActiveTrackColor => _colors.onSurface.toOpacity(0.38);
+
+  @override
+  Color? get disabledInactiveTrackColor => _colors.onSurface.toOpacity(0.12);
+
+  @override
+  Color? get disabledSecondaryActiveTrackColor => _colors.onSurface.toOpacity(0.12);
+
+  @override
+  Color? get activeTickMarkColor => _colors.onPrimary.toOpacity(0.38);
+
+  @override
+  Color? get inactiveTickMarkColor => _colors.onSurfaceVariant.toOpacity(0.38);
+
+  @override
+  Color? get disabledActiveTickMarkColor => _colors.onSurface.toOpacity(0.38);
+
+  @override
+  Color? get disabledInactiveTickMarkColor => _colors.onSurface.toOpacity(0.38);
+
+  @override
+  Color? get thumbColor => _colors.primary;
+
+  @override
+  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.toOpacity(0.1);
+    }
+    if (states.contains(WidgetState.hovered)) {
+      return _colors.primary.toOpacity(0.08);
+    }
+    if (states.contains(WidgetState.focused)) {
+      return _colors.primary.toOpacity(0.1);
+    }
+
+    return Colors.transparent;
+  });
+
+  @override
+  TextStyle? get valueIndicatorTextStyle => Theme.of(context).textTheme.labelMedium!.copyWith(
+    color: _colors.onPrimary,
+  );
+
+  @override
+  SliderComponentShape? get valueIndicatorShape => const DropSliderValueIndicatorShape();
+}
+
+class CustomSlider extends StatefulWidget {
+  const CustomSlider({required this.min, required this.max, required this.value, required this.divisions, required this.onChanged, required this.focusNode, this.reversed = false, super.key});
+
+  final double min;
+
+  final double max;
+
+  final double value;
+
+  final int divisions;
+
+  final void Function(double) onChanged;
+
+  final FocusNode? focusNode;
+
+  final bool reversed;
+
+  @override
+  State<CustomSlider> createState() => _CustomSliderState();
+}
+
+class _CustomSliderState extends State<CustomSlider> {
+  late double value;
+
+  @override
+  void initState() {
+    super.initState();
+    value = widget.value;
+  }
+
+  @override
+  void didUpdateWidget(CustomSlider oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (widget.value != oldWidget.value) {
+      setState(() {
+        value = widget.value;
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    final theme = _SliderDefaultsM3(context);
+    return Padding(
+      padding: const EdgeInsets.fromLTRB(24, 12, 24, 12),
+      child: widget.max - widget.min > 0 ? LayoutBuilder(
+        builder: (context, constraints) => MouseRegion(
+          cursor: SystemMouseCursors.click,
+          child: GestureDetector(
+            behavior: HitTestBehavior.translucent,
+            onTapDown: (details){
+              var dx = details.localPosition.dx;
+              if(widget.reversed){
+                dx = constraints.maxWidth - dx;
+              }
+              var gap = constraints.maxWidth / widget.divisions;
+              var gapValue = (widget.max - widget.min)  / widget.divisions;
+              widget.onChanged.call((dx / gap).round() * gapValue + widget.min);
+            },
+            onVerticalDragUpdate: (details){
+              var dx = details.localPosition.dx;
+              if(dx > constraints.maxWidth || dx < 0)  return;
+              if(widget.reversed){
+                dx = constraints.maxWidth - dx;
+              }
+              var gap = constraints.maxWidth / widget.divisions;
+              var gapValue = (widget.max - widget.min)  / widget.divisions;
+              widget.onChanged.call((dx / gap).round() * gapValue + widget.min);
+            },
+            child: SizedBox(
+              height: 24,
+              child: Center(
+                child: SizedBox(
+                  height: 24,
+                  child: Stack(
+                    clipBehavior: Clip.none,
+                    children: [
+                      Positioned.fill(
+                        child: Center(
+                          child: Container(
+                            width: double.infinity,
+                            height: 6,
+                            decoration: BoxDecoration(
+                                color: theme.inactiveTrackColor,
+                                borderRadius: const BorderRadius.all(Radius.circular(10))
+                            ),
+                          ),
+                        ),
+                      ),
+                      if(constraints.maxWidth / widget.divisions > 10)
+                        Positioned.fill(
+                          child: Row(
+                            children: (){
+                              var res = <Widget>[];
+                              for(int i = 0; i<widget.divisions-1; i++){
+                                res.add(const Spacer());
+                                res.add(Container(
+                                  width: 4,
+                                  height: 4,
+                                  decoration: BoxDecoration(
+                                    color: colorScheme.surface.withRed(10),
+                                    shape: BoxShape.circle,
+                                  ),
+                                ));
+                              }
+                              res.add(const Spacer());
+                              return res;
+                            }.call(),
+                          ),
+                        ),
+                        Positioned(
+                          top: 0,
+                          bottom: 0,
+                          left: widget.reversed ? null : 0,
+                          right: widget.reversed ? 0 : null,
+                          child: Center(
+                            child: Container(
+                              width: constraints.maxWidth * ((value - widget.min) / (widget.max - widget.min)),
+                              height: 8,
+                              decoration: BoxDecoration(
+                                  color: theme.activeTrackColor,
+                                  borderRadius: const BorderRadius.all(Radius.circular(10))
+                              ),
+                            ),
+                          )
+                        ),
+                      Positioned(
+                        top: 0,
+                        bottom: 0,
+                        left: widget.reversed ? null : constraints.maxWidth * ((value - widget.min) / (widget.max - widget.min))-11,
+                        right: !widget.reversed ? null : constraints.maxWidth * ((value - widget.min) / (widget.max - widget.min))-11,
+                        child: Center(
+                          child: Container(
+                            width: 22,
+                            height: 22,
+                            decoration: BoxDecoration(
+                              color: theme.activeTrackColor,
+                              shape: BoxShape.circle,
+                            ),
+                          ),
+                        ),
+                      )
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ),
+      ) : null,
+    );
+  }
+}

lib/components/flyout.dart

@@ -51,6 +51,10 @@ class Flyout extends StatefulWidget {
 
   @override
   State<Flyout> createState() => FlyoutState();
+
+  static FlyoutState of(BuildContext context) {
+    return context.findAncestorStateOfType<FlyoutState>()!;
+  }
 }
 
 class FlyoutState extends State<Flyout> {
@@ -137,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),
                       );
                     },
                   ),
@@ -181,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,
@@ -211,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/layout.dart

@@ -2,10 +2,7 @@ part of 'components.dart';
 
 class SliverGridViewWithFixedItemHeight extends StatelessWidget {
   const SliverGridViewWithFixedItemHeight(
-      {required this.delegate,
-      required this.maxCrossAxisExtent,
-      required this.itemHeight,
-      super.key});
+      {required this.delegate, required this.maxCrossAxisExtent, required this.itemHeight, super.key});
 
   final SliverChildDelegate delegate;
 
@@ -65,8 +62,7 @@ class SliverGridDelegateWithFixedHeight extends SliverGridDelegate {
   @override
   bool shouldRelayout(covariant SliverGridDelegate oldDelegate) {
     if (oldDelegate is! SliverGridDelegateWithFixedHeight) return true;
-    if (oldDelegate.maxCrossAxisExtent != maxCrossAxisExtent ||
-        oldDelegate.itemHeight != itemHeight) {
+    if (oldDelegate.maxCrossAxisExtent != maxCrossAxisExtent || oldDelegate.itemHeight != itemHeight) {
       return true;
     }
     return false;
@@ -95,8 +91,7 @@ class SliverGridDelegateWithComics extends SliverGridDelegate {
     }
   }
 
-  SliverGridLayout getDetailedModeLayout(
-      SliverConstraints constraints, double scale) {
+  SliverGridLayout getDetailedModeLayout(SliverConstraints constraints, double scale) {
     const minCrossAxisExtent = 360;
     final itemHeight = 152 * scale;
     final width = constraints.crossAxisExtent;
@@ -111,14 +106,11 @@ class SliverGridDelegateWithComics extends SliverGridDelegate {
         reverseCrossAxis: false);
   }
 
-  SliverGridLayout getBriefModeLayout(
-      SliverConstraints constraints, double scale) {
+  SliverGridLayout getBriefModeLayout(SliverConstraints constraints, double scale) {
     final maxCrossAxisExtent = 192.0 * scale;
-    const childAspectRatio = 0.72;
+    const childAspectRatio = 0.68;
     const crossAxisSpacing = 0.0;
-    int crossAxisCount =
-        (constraints.crossAxisExtent / (maxCrossAxisExtent + crossAxisSpacing))
-            .ceil();
+    int crossAxisCount = (constraints.crossAxisExtent / (maxCrossAxisExtent + crossAxisSpacing)).ceil();
     // Ensure a minimum count of 1, can be zero and result in an infinite extent
     // below when the window size is 0.
     crossAxisCount = math.max(1, crossAxisCount);

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)
+                  ],
+                ),
               ),
             ),
           ),
@@ -129,13 +136,15 @@ void showDialogMessage(BuildContext context, String title, String message) {
   );
 }
 
-void showConfirmDialog({
+Future<void> showConfirmDialog({
   required BuildContext context,
   required String title,
   required String content,
   required void Function() onConfirm,
+  String confirmText = "Confirm",
+  Color? btnColor,
 }) {
-  showDialog(
+  return showDialog(
     context: context,
     builder: (context) => ContentDialog(
       title: title,
@@ -146,7 +155,10 @@ void showConfirmDialog({
             context.pop();
             onConfirm();
           },
-          child: Text("Confirm".tl),
+          style: FilledButton.styleFrom(
+            backgroundColor: btnColor,
+          ),
+          child: Text(confirmText.tl),
         ),
       ],
     ),
@@ -215,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.onPageChange,
-    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;
 
@@ -38,7 +39,7 @@ class NaviPane extends StatefulWidget {
 
   final Widget Function(int page) pageBuilder;
 
-  final void Function(int index)? onPageChange;
+  final void Function(int index)? onPageChanged;
 
   final int initialPage;
 
@@ -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;
 
@@ -59,35 +66,48 @@ class _NaviPaneState extends State<NaviPane>
   set currentPage(int value) {
     if (value == _currentPage) return;
     _currentPage = value;
-    widget.onPageChange?.call(value);
+    widget.onPageChanged?.call(value);
   }
 
   void Function()? mainViewUpdateHandler;
 
   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

@@ -31,8 +31,9 @@ class Select extends StatelessWidget {
           var size = renderBox.size;
           showMenu(
             elevation: 3,
-            color: context.colorScheme.surface,
-            surfaceTintColor: Colors.transparent,
+            color: context.brightness == Brightness.light
+                ? const Color(0xFFF6F6F6)
+                : const Color(0xFF1E1E1E),
             context: context,
             useRootNavigator: true,
             constraints: BoxConstraints(
@@ -41,8 +42,8 @@ class Select extends StatelessWidget {
             ),
             position: RelativeRect.fromLTRB(
               offset.dx,
-              offset.dy + size.height,
-              offset.dx + size.height,
+              offset.dy + size.height + 2,
+              offset.dx + size.height + 2,
               offset.dy,
             ),
             items: values
@@ -266,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

@@ -485,8 +485,15 @@ class WindowPlacement {
     }
   }
 
+  static Rect? lastValidRect;
+
   static Future<WindowPlacement> get current async {
     var rect = await windowManager.getBounds();
+    if(validate(rect)) {
+      lastValidRect = rect;
+    } else {
+      rect = lastValidRect ?? defaultPlacement.rect;
+    }
     var isMaximized = await windowManager.isMaximized();
     return WindowPlacement(rect, isMaximized);
   }
@@ -501,9 +508,6 @@ class WindowPlacement {
   static void loop() async {
     timer ??= Timer.periodic(const Duration(milliseconds: 100), (timer) async {
       var placement = await WindowPlacement.current;
-      if (!validate(placement.rect)) {
-        return;
-      }
       if (placement.rect != cache.rect ||
           placement.isMaximized != cache.isMaximized) {
         cache = placement;
@@ -559,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.0";
+  final version = "1.1.0";
 
   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

@@ -1,5 +1,6 @@
 import 'dart:convert';
 
+import 'package:flutter/foundation.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:venera/foundation/app.dart';
 import 'package:venera/utils/io.dart';
@@ -85,13 +86,13 @@ class _Appdata {
 
 final appdata = _Appdata();
 
-class _Settings {
+class _Settings with ChangeNotifier {
   _Settings();
 
   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
@@ -105,10 +106,22 @@ class _Settings {
     '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
     'cacheSize': 2048, // in MB
+    'downloadThreads': 5,
+    'enableLongPressToZoom': true,
+    'checkUpdateOnStart': true,
+    'limitImageWidth': true,
+    'webdav': [], // empty means not configured
+    'dataVersion': 0,
+    'quickFavorite': null,
+    'enableTurnPageByVolumeKey': true,
+    'enableClockAndBatteryInfoInReader': true,
+    'ignoreCertificateErrors': false,
+    'authorizationRequired': false,
   };
 
   operator [](String key) {
@@ -117,6 +130,7 @@ class _Settings {
 
   operator []=(String key, dynamic value) {
     _data[key] = value;
+    notifyListeners();
   }
 
   @override

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';
@@ -10,8 +10,10 @@ import 'package:venera/foundation/app.dart';
 import 'package:venera/foundation/comic_type.dart';
 import 'package:venera/foundation/history.dart';
 import 'package:venera/foundation/res.dart';
+import 'package:venera/utils/data_sync.dart';
 import 'package:venera/utils/ext.dart';
 import 'package:venera/utils/io.dart';
+import 'package:venera/utils/translations.dart';
 
 import '../js_engine.dart';
 import '../log.dart';
@@ -134,6 +136,8 @@ class ComicSource {
     notifyListeners();
   }
 
+  static bool get isEmpty => _sources.isEmpty;
+
   /// Name of this source.
   final String name;
 
@@ -211,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()) {
@@ -235,6 +241,7 @@ class ComicSource {
     }
     await file.writeAsString(jsonEncode(data));
     _isSaving = false;
+    DataSync().uploadData();
   }
 
   Future<bool> reLogin() async {
@@ -279,6 +286,7 @@ class ComicSource {
     this.enableTagsSuggestions,
     this.enableTagsTranslate,
     this.starRatingFunc,
+    this.archiveDownloader,
   );
 }
 
@@ -460,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

@@ -92,7 +92,7 @@ class Comic {
 
   Comic.fromJson(Map<String, dynamic> json, this.sourceKey)
       : title = json["title"],
-        subtitle = json["subTitle"] ?? "",
+        subtitle = json["subtitle"] ?? json["subTitle"] ?? "",
         cover = json["cover"],
         id = json["id"],
         tags = List<String>.from(json["tags"] ?? []),
@@ -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") ??
@@ -106,7 +105,9 @@ class ComicSourceParser {
     if (minAppVersion != null) {
       if (compareSemVer(minAppVersion, App.version.split('-').first)) {
         throw ComicSourceParseException(
-            "minAppVersion $minAppVersion is required");
+          "minAppVersion @version is required"
+              .tlParams({"version": minAppVersion}),
+        );
       }
     }
     for (var source in ComicSource.all()) {
@@ -151,13 +152,16 @@ class ComicSourceParser {
       _getValue("search.enableTagsSuggestions") ?? false,
       _getValue("comic.enableTagsTranslate") ?? false,
       _parseStarRatingFunc(),
+      _parseArchiveDownloader(),
     );
 
     await source.loadData();
 
-    Future.delayed(const Duration(milliseconds: 50), () {
-      JsEngine().runCode("ComicSource.sources.$_key.init()");
-    });
+    if (_checkExists("init")) {
+      Future.delayed(const Duration(milliseconds: 50), () {
+        JsEngine().runCode("ComicSource.sources.$_key.init()");
+      });
+    }
 
     return source;
   }
@@ -728,7 +732,7 @@ class ComicSourceParser {
 
         return retryZone(func);
       };
-      if(_checkExists("favorites.addFolder")) {
+      if (_checkExists("favorites.addFolder")) {
         addFolder = (name) async {
           try {
             await JsEngine().runCode("""
@@ -741,7 +745,7 @@ class ComicSourceParser {
           }
         };
       }
-      if(_checkExists("favorites.deleteFolder")) {
+      if (_checkExists("favorites.deleteFolder")) {
         deleteFolder = (key) async {
           try {
             await JsEngine().runCode("""
@@ -984,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

@@ -1,20 +1,20 @@
 import 'dart:convert';
 
+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';
 import 'comic_source/comic_source.dart';
 import 'comic_type.dart';
 
-String _getCurTime() {
-  return DateTime.now()
-      .toIso8601String()
-      .replaceFirst("T", " ")
-      .substring(0, 19);
+String _getTimeString(DateTime time) {
+  return time.toIso8601String().replaceFirst("T", " ").substring(0, 19);
 }
 
 class FavoriteItem implements Comic {
@@ -26,16 +26,19 @@ class FavoriteItem implements Comic {
   @override
   String id;
   String coverPath;
-  String time = _getCurTime();
+  late String time;
 
-  FavoriteItem({
-    required this.id,
-    required this.name,
-    required this.coverPath,
-    required this.author,
-    required this.type,
-    required this.tags,
-  });
+  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);
+  }
 
   FavoriteItem.fromRow(Row row)
       : name = row["name"],
@@ -70,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
@@ -83,7 +88,9 @@ class FavoriteItem implements Comic {
   int? get maxPage => null;
 
   @override
-  String get sourceKey => type == ComicType.local ? 'local' : type.comicSource?.key ?? "Unknown:${type.value}";
+  String get sourceKey => type == ComicType.local
+      ? 'local'
+      : type.comicSource?.key ?? "Unknown:${type.value}";
 
   @override
   double? get stars => null;
@@ -108,17 +115,17 @@ class FavoriteItem implements Comic {
 
   static FavoriteItem fromJson(Map<String, dynamic> json) {
     var type = json["type"] as int;
-    if(type == 0 && json['coverPath'].toString().startsWith('http')) {
+    if (type == 0 && json['coverPath'].toString().startsWith('http')) {
       type = 'picacg'.hashCode;
-    } else if(type == 1) {
+    } else if (type == 1) {
       type = 'ehentai'.hashCode;
-    } else if(type == 2) {
+    } else if (type == 2) {
       type = 'jm'.hashCode;
-    } else if(type == 3) {
+    } else if (type == 3) {
       type = 'hitomi'.hashCode;
-    } else if(type == 4) {
+    } else if (type == 4) {
       type = 'wnacg'.hashCode;
-    } else if(type == 6) {
+    } else if (type == 6) {
       type = 'nhentai'.hashCode;
     }
     return FavoriteItem(
@@ -132,24 +139,21 @@ class FavoriteItem implements Comic {
   }
 }
 
-class FavoriteItemWithFolderInfo {
-  FavoriteItem comic;
+class FavoriteItemWithFolderInfo extends FavoriteItem {
   String folder;
 
-  FavoriteItemWithFolderInfo(this.comic, this.folder);
-
-  @override
-  bool operator ==(Object other) {
-    return other is FavoriteItemWithFolderInfo &&
-        other.comic == comic &&
-        other.folder == folder;
-  }
-
-  @override
-  int get hashCode => comic.hashCode ^ folder.hashCode;
+  FavoriteItemWithFolderInfo(FavoriteItem item, this.folder)
+      : super(
+          id: item.id,
+          name: item.name,
+          coverPath: item.coverPath,
+          author: item.author,
+          type: item.type,
+          tags: item.tags,
+        );
 }
 
-class LocalFavoritesManager {
+class LocalFavoritesManager with ChangeNotifier {
   factory LocalFavoritesManager() =>
       cache ?? (cache = LocalFavoritesManager._create());
 
@@ -167,6 +171,35 @@ class LocalFavoritesManager {
         order_value int
       );
     """);
+    _db.execute("""
+      create table if not exists folder_sync (
+        folder_name text primary key,
+        source_key text,
+        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) {
@@ -227,13 +260,14 @@ class LocalFavoritesManager {
     return folders;
   }
 
-  void updateOrder(Map<String, int> order) {
-    for (var folder in order.keys) {
+  void updateOrder(List<String> folders) {
+    for (int i = 0; i < folders.length; i++) {
       _db.execute("""
         insert or replace into folder_order (folder_name, order_value)
         values (?, ?);
-      """, [folder, order[folder]]);
+      """, [folders[i], i]);
     }
+    notifyListeners();
   }
 
   int count(String folderName) {
@@ -273,6 +307,7 @@ class LocalFavoritesManager {
       set tags = '$tag,' || tags
       where id == ?
     """, [id]);
+    notifyListeners();
   }
 
   List<FavoriteItemWithFolderInfo> allComics() {
@@ -287,12 +322,16 @@ class LocalFavoritesManager {
     return res;
   }
 
+  bool existsFolder(String name) {
+    return folderNames.contains(name);
+  }
+
   /// create a folder
   String createFolder(String name, [bool renameWhenInvalidName = false]) {
     if (name.isEmpty) {
       if (renameWhenInvalidName) {
         int i = 0;
-        while (folderNames.contains(i.toString())) {
+        while (existsFolder(i.toString())) {
           i++;
         }
         name = i.toString();
@@ -300,11 +339,11 @@ class LocalFavoritesManager {
         throw "name is empty!";
       }
     }
-    if (folderNames.contains(name)) {
+    if (existsFolder(name)) {
       if (renameWhenInvalidName) {
         var prevName = name;
         int i = 0;
-        while (folderNames.contains(i.toString())) {
+        while (existsFolder(i.toString())) {
           i++;
         }
         name = prevName + i.toString();
@@ -322,12 +361,41 @@ class LocalFavoritesManager {
         cover_path TEXT,
         time TEXT,
         display_order int,
+        translated_tags TEXT,
         primary key (id, type)
       );
     """);
+    notifyListeners();
     return name;
   }
 
+  void linkFolderToNetwork(String folder, String source, String networkFolder) {
+    _db.execute("""
+      insert or replace into folder_sync (folder_name, source_key, source_folder)
+      values (?, ?, ?);
+    """, [folder, source, 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 == ?;
+    """, [folder, source, networkFolder]);
+    return res.isNotEmpty;
+  }
+
+  (String?, String?) findLinked(String folder) {
+    var res = _db.select("""
+      select * from folder_sync
+      where folder_name == ?;
+    """, [folder]);
+    if (res.isEmpty) {
+      return (null, null);
+    }
+    return (res.first["source_key"], res.first["source_folder"]);
+  }
+
   bool comicExists(String folder, String id, ComicType type) {
     var res = _db.select("""
       select * from "$folder"
@@ -347,21 +415,32 @@ class LocalFavoritesManager {
     return FavoriteItem.fromRow(res.first);
   }
 
-  /// add comic to a folder
-  ///
-  /// This method will download cover to local, to avoid problems like changing url
-  void addComic(String folder, FavoriteItem comic, [int? order]) async {
+  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]) {
     _modifiedAfterLastCache = true;
-    if (!folderNames.contains(folder)) {
+    if (!existsFolder(folder)) {
       throw Exception("Folder does not exists");
     }
     var res = _db.select("""
       select * from "$folder"
-      where id == '${comic.id}';
-    """);
+      where id == ? and type == ?;
+    """, [comic.id, comic.type.value]);
     if (res.isNotEmpty) {
-      return;
+      return false;
     }
+    var translatedTags = _translateTags(comic.tags);
     final params = [
       comic.id,
       comic.name,
@@ -369,24 +448,62 @@ class LocalFavoritesManager {
       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
@@ -395,6 +512,11 @@ class LocalFavoritesManager {
     _db.execute("""
       drop table "$name";
     """);
+    _db.execute("""
+      delete from folder_order
+      where folder_name == ?;
+    """, [name]);
+    notifyListeners();
   }
 
   void deleteComic(String folder, FavoriteItem comic) {
@@ -409,6 +531,24 @@ class LocalFavoritesManager {
       delete from "$folder"
       where id == ? and type == ?;
     """, [id, type.value]);
+    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 {
@@ -418,7 +558,7 @@ class LocalFavoritesManager {
   }
 
   void reorder(List<FavoriteItem> newFolder, String folder) async {
-    if (!folderNames.contains(folder)) {
+    if (!existsFolder(folder)) {
       throw Exception("Failed to reorder: folder not found");
     }
     deleteFolder(folder);
@@ -426,10 +566,11 @@ class LocalFavoritesManager {
     for (int i = 0; i < newFolder.length; i++) {
       addComic(folder, newFolder[i], i);
     }
+    notifyListeners();
   }
 
   void rename(String before, String after) {
-    if (folderNames.contains(after)) {
+    if (existsFolder(after)) {
       throw "Name already exists!";
     }
     if (after.contains('"')) {
@@ -439,6 +580,17 @@ class LocalFavoritesManager {
       ALTER TABLE "$before"
       RENAME TO "$after";
     """);
+    _db.execute("""
+      update folder_order
+      set folder_name = ?
+      where folder_name == ?;
+    """, [after, before]);
+    _db.execute("""
+      update folder_sync
+      set folder_name = ?
+      where folder_name == ?;
+    """, [after, before]);
+    notifyListeners();
   }
 
   void onReadEnd(String id, ComicType type) async {
@@ -476,6 +628,34 @@ class LocalFavoritesManager {
           """, [newTime, id]);
       }
     }
+    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) {
@@ -486,8 +666,8 @@ class LocalFavoritesManager {
       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));
@@ -498,11 +678,11 @@ class LocalFavoritesManager {
     }
 
     bool test(FavoriteItemWithFolderInfo comic, String keyword) {
-      if (comic.comic.name.contains(keyword)) {
+      if (comic.name.contains(keyword)) {
         return true;
-      } else if (comic.comic.author.contains(keyword)) {
+      } else if (comic.author.contains(keyword)) {
         return true;
-      } else if (comic.comic.tags.any((element) => element.contains(keyword))) {
+      } else if (comic.tags.any((element) => element.contains(keyword))) {
         return true;
       }
       return false;
@@ -522,6 +702,7 @@ class LocalFavoritesManager {
         set tags = ?
         where id == ?;
       """, [tags.join(","), id]);
+    notifyListeners();
   }
 
   final _cachedFavoritedIds = <String, bool>{};
@@ -561,6 +742,7 @@ class LocalFavoritesManager {
       comic.id,
       comic.type.value
     ]);
+    notifyListeners();
   }
 
   String folderToJson(String folder) {
@@ -577,12 +759,12 @@ class LocalFavoritesManager {
   void fromJson(String json) {
     var data = jsonDecode(json);
     var folder = data["name"];
-    if(folder == null || folder is! String) {
+    if (folder == null || folder is! String) {
       throw "Invalid data";
     }
-    if (folderNames.contains(folder)) {
+    if (existsFolder(folder)) {
       int i = 0;
-      while (folderNames.contains("$folder($i)")) {
+      while (existsFolder("$folder($i)")) {
         i++;
       }
       folder = "$folder($i)";
@@ -591,10 +773,13 @@ class LocalFavoritesManager {
     for (var comic in data["comics"]) {
       try {
         addComic(folder, FavoriteItem.fromJson(comic));
-      }
-      catch(e) {
+      } catch (e) {
         Log.error("Import Data", e.toString());
       }
     }
   }
+
+  void close() {
+    _db.dispose();
+  }
 }

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 {
@@ -172,6 +220,8 @@ class HistoryManager with ChangeNotifier {
           max_page int
         );
       """);
+
+    notifyListeners();
   }
 
   /// add history. if exists, update time.
@@ -275,4 +325,8 @@ class HistoryManager with ChangeNotifier {
     """);
     return res.first[0] as int;
   }
+
+  void close() {
+    _db.dispose();
+  }
 }

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,30 +100,30 @@ 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);
-        Object error = e;
         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);
-            error = Exception("Expected image data, but got text: $text");
+            var text =
+                const Utf8Codec(allowMalformed: false).decoder.convert(data);
+            throw Exception("Expected image data, but got text: $text");
           } catch (e) {
             // ignore
           }
         }
-        throw error;
+        rethrow;
       }
     } catch (e) {
       scheduleMicrotask(() {
@@ -109,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,13 +2,16 @@ 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.
-  const CachedImageProvider(this.url, {this.headers, this.sourceKey});
+  ///
+  /// [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;
 
@@ -16,18 +19,37 @@ class CachedImageProvider
 
   final String? sourceKey;
 
+  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)) {
-      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
@@ -36,5 +58,5 @@ class CachedImageProvider
   }
 
   @override
-  String get key => url;
+  String get key => url + (sourceKey ?? "") + (cid ?? "");
 }

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

@@ -1,8 +1,8 @@
 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;
@@ -20,6 +20,7 @@ import 'package:pointycastle/block/modes/cfb.dart';
 import 'package:pointycastle/block/modes/ecb.dart';
 import 'package:pointycastle/block/modes/ofb.dart';
 import 'package:uuid/uuid.dart';
+import 'package:venera/foundation/app.dart';
 import 'package:venera/network/app_dio.dart';
 import 'package:venera/network/cookie_jar.dart';
 
@@ -71,6 +72,7 @@ class JsEngine with _JSEngineApi {
       var setGlobalFunc =
           _engine!.evaluate("(key, value) => { this[key] = value; }");
       (setGlobalFunc as JSInvokable)(["sendMessage", _messageReceiver]);
+      setGlobalFunc(["appVersion", App.version]);
       setGlobalFunc.free();
       var jsInit = await rootBundle.load("assets/init.js");
       _engine!
@@ -183,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'],
@@ -238,7 +256,7 @@ mixin class _JSEngineApi {
           Log.warning(
             "JS Engine",
             "Too many documents, deleting the oldest: $shouldDelete\n"
-            "Current documents: ${_documents.keys}",
+                "Current documents: ${_documents.keys}",
           );
           _documents.remove(shouldDelete);
         }
@@ -350,9 +368,6 @@ mixin class _JSEngineApi {
         case "utf8":
           return isEncode ? utf8.encode(value) : utf8.decode(value);
         case "base64":
-          if (value is String) {
-            value = utf8.encode(value);
-          }
           return isEncode ? base64Encode(value) : base64Decode(value);
         case "md5":
           return Uint8List.fromList(md5.convert(value).bytes);
@@ -383,8 +398,21 @@ mixin class _JSEngineApi {
           if (!isEncode) {
             var key = data["key"];
             var cipher = ECBBlockCipher(AESEngine());
-            cipher.init(false, KeyParameter(key));
-            return cipher.process(value);
+            cipher.init(
+              false,
+              KeyParameter(key),
+            );
+            var offset = 0;
+            var result = Uint8List(value.length);
+            while (offset < value.length) {
+              offset += cipher.processBlock(
+                value,
+                offset,
+                result,
+                offset,
+              );
+            }
+            return result;
           }
           return null;
         case "aes-cbc":
@@ -393,7 +421,17 @@ mixin class _JSEngineApi {
             var iv = data["iv"];
             var cipher = CBCBlockCipher(AESEngine());
             cipher.init(false, ParametersWithIV(KeyParameter(key), iv));
-            return cipher.process(value);
+            var offset = 0;
+            var result = Uint8List(value.length);
+            while (offset < value.length) {
+              offset += cipher.processBlock(
+                value,
+                offset,
+                result,
+                offset,
+              );
+            }
+            return result;
           }
           return null;
         case "aes-cfb":
@@ -402,7 +440,17 @@ mixin class _JSEngineApi {
             var blockSize = data["blockSize"];
             var cipher = CFBBlockCipher(AESEngine(), blockSize);
             cipher.init(false, KeyParameter(key));
-            return cipher.process(value);
+            var offset = 0;
+            var result = Uint8List(value.length);
+            while (offset < value.length) {
+              offset += cipher.processBlock(
+                value,
+                offset,
+                result,
+                offset,
+              );
+            }
+            return result;
           }
           return null;
         case "aes-ofb":
@@ -411,7 +459,17 @@ mixin class _JSEngineApi {
             var blockSize = data["blockSize"];
             var cipher = OFBBlockCipher(AESEngine(), blockSize);
             cipher.init(false, KeyParameter(key));
-            return cipher.process(value);
+            var offset = 0;
+            var result = Uint8List(value.length);
+            while (offset < value.length) {
+              offset += cipher.processBlock(
+                value,
+                offset,
+                result,
+                offset,
+              );
+            }
+            return result;
           }
           return null;
         case "rsa":
@@ -426,8 +484,8 @@ mixin class _JSEngineApi {
         default:
           return value;
       }
-    } catch (e) {
-      Log.error("JS Engine", "Failed to convert $type: $e");
+    } catch (e, s) {
+      Log.error("JS Engine", "Failed to convert $type: $e", s);
       return null;
     }
   }

lib/foundation/local.dart

@@ -5,6 +5,8 @@ import 'package:path_provider/path_provider.dart';
 import 'package:sqlite3/sqlite3.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/log.dart';
 import 'package:venera/network/download.dart';
 import 'package:venera/pages/reader/reader.dart';
 import 'package:venera/utils/ext.dart';
@@ -70,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 => "";
 
@@ -148,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);
@@ -158,19 +163,41 @@ class LocalManager with ChangeNotifier {
       return "Directory is not empty";
     }
     try {
-      await copyDirectory(
-        Directory(path),
+      await copyDirectoryIsolate(
+        directory,
         newDir,
       );
-      await File(FilePath.join(App.dataPath, 'local_path')).writeAsString(path);
-    } catch (e) {
+      await File(FilePath.join(App.dataPath, 'local_path')).writeAsString(newPath);
+    } catch (e, s) {
+      Log.error("IO", e, s);
       return e.toString();
     }
-    await Directory(path).deleteIgnoreError();
+    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',
@@ -192,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();
   }
@@ -261,8 +287,14 @@ class LocalManager with ChangeNotifier {
     notifyListeners();
   }
 
-  List<LocalComic> getComics() {
-    final res = _db.select('SELECT * FROM comics;');
+  List<LocalComic> getComics(LocalSortType sortType) {
+    var res = _db.select('''
+      SELECT * FROM comics
+      ORDER BY 
+        ${sortType.value == 'name' ? 'title' : 'created_at'} 
+        ${sortType.value == 'time_asc' ? 'ASC' : 'DESC'}
+      ;
+    ''');
     return res.map((row) => LocalComic.fromRow(row)).toList();
   }
 
@@ -310,12 +342,21 @@ class LocalManager with ChangeNotifier {
     return LocalComic.fromRow(res.first);
   }
 
+  List<LocalComic> search(String keyword) {
+    final res = _db.select('''
+      SELECT * FROM comics
+      WHERE title LIKE ? OR tags LIKE ? OR subtitle LIKE ?
+      ORDER BY created_at DESC;
+    ''', ['%$keyword%', '%$keyword%', '%$keyword%']);
+    return res.map((row) => LocalComic.fromRow(row)).toList();
+  }
+
   Future<List<String>> getImages(String id, ComicType type, Object ep) async {
     if(ep is! String && ep is! int) {
       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)
@@ -325,8 +366,13 @@ 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
+        if(entity.name.startsWith('.')) {
           continue;
         }
         files.add(entity);
@@ -343,10 +389,10 @@ 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) return true;
+    if (comic.chapters == null || ep == null) return true;
     return comic.downloadedChapters
         .contains(comic.chapters!.keys.elementAt(ep-1));
   }
@@ -422,10 +468,39 @@ class LocalManager with ChangeNotifier {
     downloadingTasks.first.resume();
   }
 
-  void deleteComic(LocalComic c) {
-    var dir = Directory(FilePath.join(path, c.directory));
-    dir.deleteIgnoreError(recursive: true);
+  void deleteComic(LocalComic c, [bool removeFileOnDisk = true]) {
+    if(removeFileOnDisk) {
+      var dir = Directory(FilePath.join(path, c.directory));
+      dir.deleteIgnoreError(recursive: true);
+    }
+    //Deleting a local comic means that it's nolonger available, thus both favorite and history should be deleted.
+    if(HistoryManager().findSync(c.id, c.comicType) != null) {
+      HistoryManager().remove(c.id, c.comicType);
+    }
+    var folders = LocalFavoritesManager().find(c.id, c.comicType);
+    for (var f in folders) {
+      LocalFavoritesManager().deleteComicWithId(f, c.id, c.comicType);
+    }
     remove(c.id, c.comicType);
     notifyListeners();
   }
 }
+
+enum LocalSortType {
+  name("name"),
+  timeAsc("time_asc"),
+  timeDesc("time_desc");
+
+  final String value;
+
+  const LocalSortType(this.value);
+
+  static LocalSortType fromString(String value) {
+    for (var type in values) {
+      if (type.value == value) {
+        return type;
+      }
+    }
+    return name;
+  }
+}

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);
@@ -82,11 +82,12 @@ class Log {
     addLog(LogLevel.warning, title, content);
   }
 
-  static error(String title, String content, [Object? stackTrace]) {
+  static error(String title, Object content, [Object? stackTrace]) {
+    var info = content.toString();
     if(stackTrace != null) {
-      content += "\n${stackTrace.toString()}";
+      info += "\n${stackTrace.toString()}";
     }
-    addLog(LogLevel.error, title, content);
+    addLog(LogLevel.error, title, info);
   }
 
   static void clear() => _logs.clear();

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,11 +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/main_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';
@@ -17,39 +21,42 @@ void main(List<String> args) {
   if (runWebViewTitleBarWidget(args)) {
     return;
   }
-  runZonedGuarded(() async {
-    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");
+    });
   });
 }
 
@@ -60,14 +67,58 @@ class MyApp extends StatefulWidget {
   State<MyApp> createState() => _MyAppState();
 }
 
-class _MyAppState extends State<MyApp> {
+class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
   @override
   void initState() {
     App.registerForceRebuild(forceRebuild);
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+    WidgetsBinding.instance.addObserver(this);
     super.initState();
   }
 
+  bool isAuthPageActive = false;
+
+  OverlayEntry? hideContentOverlay;
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    if (!App.isMobile || !appdata.settings['authorizationRequired']) {
+      return;
+    }
+    if (state == AppLifecycleState.inactive && hideContentOverlay == null) {
+      hideContentOverlay = OverlayEntry(
+        builder: (context) {
+          return Positioned.fill(
+            child: Container(
+              width: double.infinity,
+              height: double.infinity,
+              color: App.rootContext.colorScheme.surface,
+            ),
+          );
+        },
+      );
+      Overlay.of(App.rootContext).insert(hideContentOverlay!);
+    } else if (hideContentOverlay != null &&
+        state == AppLifecycleState.resumed) {
+      hideContentOverlay!.remove();
+      hideContentOverlay = null;
+    }
+    if (state == AppLifecycleState.hidden &&
+        !isAuthPageActive &&
+        !IO.isSelectingFiles) {
+      isAuthPageActive = true;
+      App.rootContext.to(
+        () => AuthPage(
+          onSuccessfulAuth: () {
+            App.rootContext.pop();
+            isAuthPageActive = false;
+          },
+        ),
+      );
+    }
+    super.didChangeAppLifecycleState(state);
+  }
+
   void forceRebuild() {
     void rebuild(Element el) {
       el.markNeedsBuild();
@@ -78,90 +129,119 @@ class _MyAppState extends State<MyApp> {
     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) {
-    return MaterialApp(
-      home: const MainPage(),
-      debugShowCheckedModeBanner: false,
-      theme: ThemeData(
-        colorScheme: ColorScheme.fromSeed(
-          seedColor: App.mainColor,
-          surface: Colors.white,
-          primary: App.mainColor.shade600,
-          background: Colors.white,
-        ),
-        fontFamily: App.isWindows ? "Microsoft YaHei" : null,
-      ),
-      navigatorKey: App.rootNavigatorKey,
-      darkTheme: ThemeData(
-        colorScheme: ColorScheme.fromSeed(
-          seedColor: App.mainColor,
+    Widget home;
+    if (appdata.settings['authorizationRequired']) {
+      home = AuthPage(
+        onSuccessfulAuth: () {
+          App.rootContext.toReplacement(() => const MainPage());
+        },
+      );
+    } else {
+      home = const MainPage();
+    }
+    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,
-          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');
-      },
-    );
+          throw ('widget is null');
+        },
+      );
+    });
   }
 }
 

lib/network/app_dio.dart

@@ -1,9 +1,9 @@
+import 'dart:async';
 import 'dart:convert';
-import 'dart:io';
 
 import 'package:dio/dio.dart';
-import 'package:dio/io.dart';
 import 'package:flutter/services.dart';
+import 'package:rhttp/rhttp.dart' as rhttp;
 import 'package:venera/foundation/appdata.dart';
 import 'package:venera/foundation/log.dart';
 import 'package:venera/network/cache.dart';
@@ -96,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);
@@ -105,39 +108,30 @@ class MyLogInterceptor implements Interceptor {
 
 class AppDio with DioMixin {
   String? _proxy = proxy;
+  static bool get ignoreCertificateErrors => appdata.settings['ignoreCertificateErrors'] == true;
 
   AppDio([BaseOptions? options]) {
     this.options = options ?? BaseOptions();
-    interceptors.add(MyLogInterceptor());
-    httpClientAdapter = IOHttpClientAdapter(createHttpClient: createHttpClient);
+    httpClientAdapter = RHttpAdapter(rhttp.ClientSettings(
+      proxySettings: proxy == null
+          ? const rhttp.ProxySettings.noProxy()
+          : rhttp.ProxySettings.proxy(proxy!),
+      tlsSettings: rhttp.TlsSettings(
+        verifyCertificates: !ignoreCertificateErrors,
+      ),
+    ));
     interceptors.add(CookieManagerSql(SingleInstanceCookieJar.instance!));
     interceptors.add(NetworkCacheManager());
     interceptors.add(CloudflareInterceptor());
-  }
-
-  static HttpClient createHttpClient() {
-    final client = HttpClient();
-    client.connectionTimeout = const Duration(seconds: 5);
-    client.findProxy = (uri) => proxy == null ? "DIRECT" : "PROXY $proxy";
-    client.idleTimeout = const Duration(seconds: 100);
-    client.badCertificateCallback =
-        (X509Certificate cert, String host, int port) {
-      if (host.contains("cdn")) return true;
-      final ipv4RegExp = RegExp(
-          r'^((25[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3})$');
-      if (ipv4RegExp.hasMatch(host)) {
-        return true;
-      }
-      return false;
-    };
-    return client;
+    interceptors.add(MyLogInterceptor());
   }
 
   static String? proxy;
 
   static Future<String?> getProxy() async {
-    if ((appdata.settings['proxy'] as String).removeAllBlank == "direct")
+    if ((appdata.settings['proxy'] as String).removeAllBlank == "direct") {
       return null;
+    }
     if (appdata.settings['proxy'] != "system") return appdata.settings['proxy'];
 
     String res;
@@ -175,6 +169,8 @@ class AppDio with DioMixin {
     return res;
   }
 
+  static final Map<String, bool> _requests = {};
+
   @override
   Future<Response<T>> request<T>(
     String path, {
@@ -185,27 +181,111 @@ class AppDio with DioMixin {
     ProgressCallback? onSendProgress,
     ProgressCallback? onReceiveProgress,
   }) async {
+    if (options?.headers?['prevent-parallel'] == 'true') {
+      while (_requests.containsKey(path)) {
+        await Future.delayed(const Duration(milliseconds: 20));
+      }
+      _requests[path] = true;
+      options!.headers!.remove('prevent-parallel');
+    }
     proxy = await getProxy();
     if (_proxy != proxy) {
+      Log.info("Network", "Proxy changed to $proxy");
       _proxy = proxy;
-      (httpClientAdapter as IOHttpClientAdapter).close();
-      httpClientAdapter =
-          IOHttpClientAdapter(createHttpClient: createHttpClient);
+      httpClientAdapter = RHttpAdapter(rhttp.ClientSettings(
+        proxySettings: proxy == null
+            ? const rhttp.ProxySettings.noProxy()
+            : rhttp.ProxySettings.proxy(proxy!),
+        tlsSettings: rhttp.TlsSettings(
+          verifyCertificates: !ignoreCertificateErrors,
+        ),
+      ));
     }
-    Log.info(
-      "Network",
-      "${options?.method ?? 'GET'} $path\n"
-          "Headers: ${options?.headers}\n"
-          "Data: $data\n",
+    try {
+      return super.request<T>(
+        path,
+        data: data,
+        queryParameters: queryParameters,
+        cancelToken: cancelToken,
+        options: options,
+        onSendProgress: onSendProgress,
+        onReceiveProgress: onReceiveProgress,
+      );
+    } finally {
+      if (_requests.containsKey(path)) {
+        _requests.remove(path);
+      }
+    }
+  }
+}
+
+class RHttpAdapter implements HttpClientAdapter {
+  rhttp.ClientSettings settings;
+
+  RHttpAdapter([this.settings = const rhttp.ClientSettings()]) {
+    settings = settings.copyWith(
+      redirectSettings: const rhttp.RedirectSettings.limited(5),
+      timeoutSettings: const rhttp.TimeoutSettings(
+        connectTimeout: Duration(seconds: 15),
+        keepAliveTimeout: Duration(seconds: 60),
+        keepAlivePing: Duration(seconds: 30),
+      ),
+      throwOnStatusCode: false,
+      tlsSettings: rhttp.TlsSettings(
+        verifyCertificates: !AppDio.ignoreCertificateErrors,
+      ),
     );
-    return super.request(
-      path,
-      data: data,
-      queryParameters: queryParameters,
-      cancelToken: cancelToken,
-      options: options,
-      onSendProgress: onSendProgress,
-      onReceiveProgress: onReceiveProgress,
+  }
+
+  @override
+  void close({bool force = false}) {}
+
+  @override
+  Future<ResponseBody> fetch(
+    RequestOptions options,
+    Stream<Uint8List>? requestStream,
+    Future<void>? cancelFuture,
+  ) async {
+    var res = await rhttp.Rhttp.request(
+      method: switch (options.method) {
+        'GET' => rhttp.HttpMethod.get,
+        'POST' => rhttp.HttpMethod.post,
+        'PUT' => rhttp.HttpMethod.put,
+        'PATCH' => rhttp.HttpMethod.patch,
+        'DELETE' => rhttp.HttpMethod.delete,
+        'HEAD' => rhttp.HttpMethod.head,
+        'OPTIONS' => rhttp.HttpMethod.options,
+        'TRACE' => rhttp.HttpMethod.trace,
+        'CONNECT' => rhttp.HttpMethod.connect,
+        _ => throw ArgumentError('Unsupported method: ${options.method}'),
+      },
+      url: options.uri.toString(),
+      settings: settings,
+      expectBody: rhttp.HttpExpectBody.stream,
+      body: requestStream == null ? null : rhttp.HttpBody.stream(requestStream),
+      headers: rhttp.HttpHeaders.rawMap(
+        Map.fromEntries(
+          options.headers.entries.map(
+            (e) => MapEntry(e.key, e.value.toString().trim()),
+          ),
+        ),
+      ),
+    );
+    if (res is! rhttp.HttpStreamResponse) {
+      throw Exception("Invalid response type: ${res.runtimeType}");
+    }
+    var headers = <String, List<String>>{};
+    for (var entry in res.headers) {
+      var key = entry.$1.toLowerCase();
+      headers[key] ??= [];
+      headers[key]!.add(entry.$2);
+    }
+    return ResponseBody(
+      res.body,
+      res.statusCode,
+      statusMessage: null,
+      isRedirect: false,
+      headers: headers,
     );
   }
 }

lib/network/cache.dart

@@ -1,5 +1,4 @@
-import 'dart:async';
-
+import 'dart:typed_data';
 import 'package:dio/dio.dart';
 
 class NetworkCache {
@@ -43,7 +42,7 @@ class NetworkCacheManager implements Interceptor {
   static const _maxCacheSize = 10 * 1024 * 1024;
 
   void setCache(NetworkCache cache) {
-    while(size > _maxCacheSize){
+    while (size > _maxCacheSize) {
       size -= _cache.values.first.size;
       _cache.remove(_cache.keys.first);
     }
@@ -53,7 +52,7 @@ class NetworkCacheManager implements Interceptor {
 
   void removeCache(Uri uri) {
     var cache = _cache[uri];
-    if(cache != null){
+    if (cache != null) {
       size -= cache.size;
     }
     _cache.remove(uri);
@@ -64,41 +63,29 @@ class NetworkCacheManager implements Interceptor {
     size = 0;
   }
 
-  var preventParallel = <Uri, Completer>{};
-
   @override
   void onError(DioException err, ErrorInterceptorHandler handler) {
-    if(err.requestOptions.method != "GET"){
+    if (err.requestOptions.method != "GET") {
       return handler.next(err);
     }
-    if(preventParallel[err.requestOptions.uri] != null){
-      preventParallel[err.requestOptions.uri]!.complete();
-      preventParallel.remove(err.requestOptions.uri);
-    }
     return handler.next(err);
   }
 
   @override
   void onRequest(
       RequestOptions options, RequestInterceptorHandler handler) async {
-    if(options.method != "GET"){
+    if (options.method != "GET") {
       return handler.next(options);
     }
-    if(preventParallel[options.uri] != null){
-      await preventParallel[options.uri]!.future;
-    }
     var cache = getCache(options.uri);
-    if (cache == null || !compareHeaders(options.headers, cache.requestHeaders)) {
-      if(options.headers['cache-time'] != null){
+    if (cache == null ||
+        !compareHeaders(options.headers, cache.requestHeaders)) {
+      if (options.headers['cache-time'] != null) {
         options.headers.remove('cache-time');
       }
-      if(options.headers['prevent-parallel'] != null){
-        options.headers.remove('prevent-parallel');
-        preventParallel[options.uri] = Completer();
-      }
       return handler.next(options);
     } else {
-      if(options.headers['cache-time'] == 'no'){
+      if (options.headers['cache-time'] == 'no') {
         options.headers.remove('cache-time');
         removeCache(options.uri);
         return handler.next(options);
@@ -106,20 +93,21 @@ class NetworkCacheManager implements Interceptor {
     }
     var time = DateTime.now();
     var diff = time.difference(cache.time);
-    if (options.headers['cache-time'] == 'long'
-        && diff < const Duration(hours: 2)) {
+    if (options.headers['cache-time'] == 'long' &&
+        diff < const Duration(hours: 2)) {
       return handler.resolve(Response(
         requestOptions: options,
         data: cache.data,
-        headers: Headers.fromMap(cache.responseHeaders),
+        headers: Headers.fromMap(cache.responseHeaders)
+          ..set('venera-cache', 'true'),
         statusCode: 200,
       ));
-    }
-    else if (diff < const Duration(seconds: 5)) {
+    } else if (diff < const Duration(seconds: 5)) {
       return handler.resolve(Response(
         requestOptions: options,
         data: cache.data,
-        headers: Headers.fromMap(cache.responseHeaders),
+        headers: Headers.fromMap(cache.responseHeaders)
+          ..set('venera-cache', 'true'),
         statusCode: 200,
       ));
     } else if (diff < const Duration(hours: 1)) {
@@ -133,7 +121,8 @@ class NetworkCacheManager implements Interceptor {
         return handler.resolve(Response(
           requestOptions: options,
           data: cache.data,
-          headers: Headers.fromMap(cache.responseHeaders),
+          headers: Headers.fromMap(cache.responseHeaders)
+            ..set('venera-cache', 'true'),
           statusCode: 200,
         ));
       }
@@ -143,6 +132,10 @@ class NetworkCacheManager implements Interceptor {
   }
 
   static bool compareHeaders(Map<String, dynamic> a, Map<String, dynamic> b) {
+    a.remove('cache-time');
+    a.remove('prevent-parallel');
+    b.remove('cache-time');
+    b.remove('prevent-parallel');
     if (a.length != b.length) {
       return false;
     }
@@ -160,11 +153,11 @@ class NetworkCacheManager implements Interceptor {
     if (response.requestOptions.method != "GET") {
       return handler.next(response);
     }
-    if(response.statusCode != null && response.statusCode! >= 400){
+    if (response.statusCode != null && response.statusCode! >= 400) {
       return handler.next(response);
     }
     var size = _calculateSize(response.data);
-    if(size != null && size < 1024 * 1024 && size > 0) {
+    if (size != null && size < 1024 * 1024 && size > 0) {
       var cache = NetworkCache(
         uri: response.requestOptions.uri,
         requestHeaders: response.requestOptions.headers,
@@ -175,30 +168,29 @@ class NetworkCacheManager implements Interceptor {
       );
       setCache(cache);
     }
-    if(preventParallel[response.requestOptions.uri] != null){
-      preventParallel[response.requestOptions.uri]!.complete();
-      preventParallel.remove(response.requestOptions.uri);
-    }
     handler.next(response);
   }
 
-  static int? _calculateSize(Object? data){
-    if(data == null){
+  static int? _calculateSize(Object? data) {
+    if (data == null) {
       return 0;
     }
-    if(data is List<int>) {
+    if (data is List<int>) {
       return data.length;
     }
-    if(data is String) {
-      if(data.trim().isEmpty){
+    if (data is Uint8List) {
+      return data.length;
+    }
+    if (data is String) {
+      if (data.trim().isEmpty) {
         return 0;
       }
-      if(data.length < 512 && data.contains("IP address")){
+      if (data.length < 512 && data.contains("IP address")) {
         return 0;
       }
       return data.length * 4;
     }
-    if(data is Map) {
+    if (data is Map) {
       return data.toString().length * 4;
     }
     return null;

lib/network/cloudflare.dart

@@ -1,7 +1,6 @@
 import 'dart:io' as io;
 
 import 'package:dio/dio.dart';
-import 'package:flutter_qjs/flutter_qjs.dart';
 import 'package:venera/foundation/app.dart';
 import 'package:venera/foundation/appdata.dart';
 import 'package:venera/foundation/consts.dart';

lib/network/download.dart

@@ -1,6 +1,8 @@
 import 'dart:async';
+import 'dart:isolate';
 
 import 'package:flutter/widgets.dart' show ChangeNotifier;
+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/local.dart';
@@ -10,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;
@@ -75,11 +78,14 @@ class ImagesDownloadTask extends DownloadTask with _TransferSpeedMixin {
   @override
   ComicType get comicType => ComicType(source.key.hashCode);
 
+  String? comicTitle;
+
   ImagesDownloadTask({
     required this.source,
     required this.comicId,
     this.comic,
     this.chapters,
+    this.comicTitle,
   });
 
   @override
@@ -89,7 +95,7 @@ class ImagesDownloadTask extends DownloadTask with _TransferSpeedMixin {
     var local = LocalManager().find(id, comicType);
     if (path != null) {
       if (local == null) {
-        Directory(path!).deleteIgnoreError();
+        Directory(path!).deleteIgnoreError(recursive: true);
       } else if (chapters != null) {
         for (var c in chapters!) {
           var dir = Directory(FilePath.join(path!, c));
@@ -102,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;
@@ -155,7 +158,8 @@ class ImagesDownloadTask extends DownloadTask with _TransferSpeedMixin {
 
   var tasks = <int, _ImageDownloadWrapper>{};
 
-  int get _maxConcurrentTasks => 5;
+  int get _maxConcurrentTasks =>
+      (appdata.settings["downloadThreads"] as num).toInt();
 
   void _scheduleTasks() {
     var images = _images![_images!.keys.elementAt(_chapter)]!;
@@ -197,6 +201,7 @@ class ImagesDownloadTask extends DownloadTask with _TransferSpeedMixin {
           _scheduleTasks();
         }
       });
+      downloading++;
     }
   }
 
@@ -230,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
@@ -261,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 {
@@ -289,6 +297,7 @@ class ImagesDownloadTask extends DownloadTask with _TransferSpeedMixin {
           return;
         }
         if (res.error) {
+          Log.error("Download", res.errorMessage!);
           _setError("Error: ${res.errorMessage}");
           return;
         } else {
@@ -318,6 +327,7 @@ class ImagesDownloadTask extends DownloadTask with _TransferSpeedMixin {
             return;
           }
           if (res.error) {
+            Log.error("Download", res.errorMessage!);
             _setError("Error: ${res.errorMessage}");
             return;
           } else {
@@ -342,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;
         }
@@ -355,6 +366,7 @@ class ImagesDownloadTask extends DownloadTask with _TransferSpeedMixin {
     }
 
     LocalManager().completeTask(this);
+    stopRecorder();
   }
 
   @override
@@ -369,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 ?? "Loading...";
+  String get title => comic?.title ?? comicTitle ?? "Loading...";
 
   @override
   Map<String, dynamic> toJson() {
@@ -442,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(),
@@ -532,6 +544,9 @@ class _ImageDownloadWrapper {
         }
       }
     } catch (e, s) {
+      if (isCancelled) {
+        return;
+      }
       Log.error("Download", e.toString(), s);
       retry--;
       if (retry > 0) {
@@ -568,7 +583,7 @@ abstract mixin class _TransferSpeedMixin {
 
   void onData(int length) {
     if (timer == null) return;
-    if(length < 0) {
+    if (length < 0) {
       return;
     }
     _bytesSinceLastSecond += length;
@@ -590,5 +605,220 @@ abstract mixin class _TransferSpeedMixin {
   void stopRecorder() {
     timer?.cancel();
     timer = null;
+    _currentSpeed = 0;
+    _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/network/images.dart

@@ -1,15 +1,18 @@
 import 'dart:typed_data';
 
+import 'package:flutter_qjs/flutter_qjs.dart';
 import 'package:venera/foundation/cache_manager.dart';
 import 'package:venera/foundation/comic_source/comic_source.dart';
 import 'package:venera/foundation/consts.dart';
+import 'package:venera/utils/image.dart';
 
 import 'app_dio.dart';
 
 class ImageDownloader {
   static Stream<ImageDownloadProgress> loadThumbnail(
-      String url, String? sourceKey) async* {
-    final cacheKey = "$url@$sourceKey";
+      String url, String? sourceKey,
+      [String? cid]) async* {
+    final cacheKey = "$url@$sourceKey${cid != null ? '@$cid' : ''}";
     final cache = await CacheManager().findCache(cacheKey);
 
     if (cache != null) {
@@ -27,11 +30,21 @@ class ImageDownloader {
       configs = comicSource?.getThumbnailLoadingConfig?.call(url) ?? {};
     }
     configs['headers'] ??= {};
-    if(configs['headers']['user-agent'] == null
-        && configs['headers']['User-Agent'] == null) {
+    if (configs['headers']['user-agent'] == null &&
+        configs['headers']['User-Agent'] == null) {
       configs['headers']['user-agent'] = webUA;
     }
 
+    if (((configs['url'] as String?) ?? url).startsWith('cover.') &&
+        sourceKey != null) {
+      var comicSource = ComicSource.find(sourceKey);
+      if(comicSource != null) {
+        var comicInfo = await comicSource.loadComicInfo!(cid!);
+        yield* loadThumbnail(comicInfo.data.cover, sourceKey);
+        return;
+      }
+    }
+
     var dio = AppDio(BaseOptions(
       headers: Map<String, dynamic>.from(configs['headers']),
       method: configs['method'] ?? 'GET',
@@ -56,8 +69,9 @@ class ImageDownloader {
       }
     }
 
-    if (configs['onResponse'] != null) {
-      buffer = configs['onResponse'](buffer);
+    if (configs['onResponse'] is JSInvokable) {
+      buffer = (configs['onResponse'] as JSInvokable)([buffer]);
+      (configs['onResponse'] as JSInvokable).free();
     }
 
     await CacheManager().writeCache(cacheKey, buffer);
@@ -82,50 +96,98 @@ class ImageDownloader {
       );
     }
 
+    Future<Map<String, dynamic>?> Function()? onLoadFailed;
+
     var configs = <String, dynamic>{};
     if (sourceKey != null) {
       var comicSource = ComicSource.find(sourceKey);
       configs = (await comicSource!.getImageLoadingConfig
-              ?.call(imageKey, cid, eid)) ?? {};
+              ?.call(imageKey, cid, eid)) ??
+          {};
     }
-    configs['headers'] ??= {
-      'user-agent': webUA,
-    };
+    var retryLimit = 5;
+    while (true) {
+      try {
+        configs['headers'] ??= {
+          'user-agent': webUA,
+        };
 
-    var dio = AppDio(BaseOptions(
-      headers: configs['headers'],
-      method: configs['method'] ?? 'GET',
-      responseType: ResponseType.stream,
-    ));
+        if (configs['onLoadFailed'] is JSInvokable) {
+          onLoadFailed = () async {
+            dynamic result = (configs['onLoadFailed'] as JSInvokable)([]);
+            if (result is Future) {
+              result = await result;
+            }
+            if (result is! Map<String, dynamic>) return null;
+            return result;
+          };
+        }
 
-    var req = await dio.request<ResponseBody>(configs['url'] ?? imageKey,
-        data: configs['data']);
-    var stream = req.data?.stream ?? (throw "Error: Empty response body.");
-    int? expectedBytes = req.data!.contentLength;
-    if (expectedBytes == -1) {
-      expectedBytes = null;
-    }
-    var buffer = <int>[];
-    await for (var data in stream) {
-      buffer.addAll(data);
-      if (expectedBytes != null) {
+        var dio = AppDio(BaseOptions(
+          headers: configs['headers'],
+          method: configs['method'] ?? 'GET',
+          responseType: ResponseType.stream,
+        ));
+
+        var req = await dio.request<ResponseBody>(configs['url'] ?? imageKey,
+            data: configs['data']);
+        var stream = req.data?.stream ?? (throw "Error: Empty response body.");
+        int? expectedBytes = req.data!.contentLength;
+        if (expectedBytes == -1) {
+          expectedBytes = null;
+        }
+        var buffer = <int>[];
+        await for (var data in stream) {
+          buffer.addAll(data);
+          if (expectedBytes != null) {
+            yield ImageDownloadProgress(
+              currentBytes: buffer.length,
+              totalBytes: expectedBytes,
+            );
+          }
+        }
+
+        if (configs['onResponse'] is JSInvokable) {
+          buffer = (configs['onResponse'] as JSInvokable)([buffer]);
+          (configs['onResponse'] as JSInvokable).free();
+        }
+
+        var data = Uint8List.fromList(buffer);
+        buffer.clear();
+
+        if (configs['modifyImage'] != null) {
+          var newData = await modifyImageWithScript(
+            data,
+            configs['modifyImage'],
+          );
+          data = newData;
+        }
+
+        await CacheManager().writeCache(cacheKey, data);
         yield ImageDownloadProgress(
-          currentBytes: buffer.length,
-          totalBytes: expectedBytes,
+          currentBytes: data.length,
+          totalBytes: data.length,
+          imageBytes: data,
         );
+        return;
+      } catch (e) {
+        if (retryLimit < 0 || onLoadFailed == null) {
+          rethrow;
+        }
+        var newConfig = await onLoadFailed();
+        (configs['onLoadFailed'] as JSInvokable).free();
+        onLoadFailed = null;
+        if (newConfig == null) {
+          rethrow;
+        }
+        configs = newConfig;
+        retryLimit--;
+      } finally {
+        if (onLoadFailed != null) {
+          (configs['onLoadFailed'] as JSInvokable).free();
+        }
       }
     }
-
-    if (configs['onResponse'] != null) {
-      buffer = configs['onResponse'](buffer);
-    }
-
-    await CacheManager().writeCache(cacheKey, buffer);
-    yield ImageDownloadProgress(
-      currentBytes: buffer.length,
-      totalBytes: buffer.length,
-      imageBytes: Uint8List.fromList(buffer),
-    );
   }
 }
 

lib/pages/accounts_page.dart

@@ -70,6 +70,7 @@ class AccountsPage extends StatelessWidget {
               ),
             );
             element.saveData();
+            ComicSource.notifyListeners();
             logic.update();
           },
         );
@@ -124,6 +125,7 @@ class AccountsPage extends StatelessWidget {
             element.data["account"] = null;
             element.account?.logout();
             element.saveData();
+            ComicSource.notifyListeners();
             logic.update();
           },
           trailing: const Icon(Icons.logout),
@@ -171,84 +173,88 @@ class _LoginPageState extends State<_LoginPage> {
         child: Container(
           padding: const EdgeInsets.all(16),
           constraints: const BoxConstraints(maxWidth: 400),
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              Text("Login".tl, style: const TextStyle(fontSize: 24)),
-              const SizedBox(height: 32),
-              if (widget.config.cookieFields == null)
-                TextField(
-                  decoration: InputDecoration(
-                    labelText: "Username".tl,
-                    border: const OutlineInputBorder(),
-                  ),
-                  enabled: widget.config.login != null,
-                  onChanged: (s) {
-                    username = s;
-                  },
-                ).paddingBottom(16),
-              if (widget.config.cookieFields == null)
-                TextField(
-                  decoration: InputDecoration(
-                    labelText: "Password".tl,
-                    border: const OutlineInputBorder(),
-                  ),
-                  obscureText: true,
-                  enabled: widget.config.login != null,
-                  onChanged: (s) {
-                    password = s;
-                  },
-                  onSubmitted: (s) => login(),
-                ).paddingBottom(16),
-              for (var field in widget.config.cookieFields ?? <String>[])
-                TextField(
-                  decoration: InputDecoration(
-                    labelText: field,
-                    border: const OutlineInputBorder(),
-                  ),
-                  obscureText: true,
-                  enabled: widget.config.validateCookies != null,
-                  onChanged: (s) {
-                    _cookies[field] = s;
-                  },
-                ).paddingBottom(16),
-              if (widget.config.login == null &&
-                  widget.config.cookieFields == null)
-                Row(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    const Icon(Icons.error_outline),
-                    const SizedBox(width: 8),
-                    Text("Login with password is disabled".tl),
-                  ],
-                )
-              else
-                Button.filled(
-                  isLoading: loading,
-                  onPressed: login,
-                  child: Text("Continue".tl),
-                ),
-              const SizedBox(height: 24),
-              if (widget.config.loginWebsite != null)
-                TextButton(
-                  onPressed: loginWithWebview,
-                  child: Text("Login with webview".tl),
-                ),
-              const SizedBox(height: 8),
-              if (widget.config.registerWebsite != null)
-                TextButton(
-                  onPressed: () =>
-                      launchUrlString(widget.config.registerWebsite!),
-                  child: Row(
+          child: AutofillGroup(
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Text("Login".tl, style: const TextStyle(fontSize: 24)),
+                const SizedBox(height: 32),
+                if (widget.config.cookieFields == null)
+                  TextField(
+                    decoration: InputDecoration(
+                      labelText: "Username".tl,
+                      border: const OutlineInputBorder(),
+                    ),
+                    enabled: widget.config.login != null,
+                    onChanged: (s) {
+                      username = s;
+                    },
+                    autofillHints: const [AutofillHints.username],
+                  ).paddingBottom(16),
+                if (widget.config.cookieFields == null)
+                  TextField(
+                    decoration: InputDecoration(
+                      labelText: "Password".tl,
+                      border: const OutlineInputBorder(),
+                    ),
+                    obscureText: true,
+                    enabled: widget.config.login != null,
+                    onChanged: (s) {
+                      password = s;
+                    },
+                    onSubmitted: (s) => login(),
+                    autofillHints: const [AutofillHints.password],
+                  ).paddingBottom(16),
+                for (var field in widget.config.cookieFields ?? <String>[])
+                  TextField(
+                    decoration: InputDecoration(
+                      labelText: field,
+                      border: const OutlineInputBorder(),
+                    ),
+                    obscureText: true,
+                    enabled: widget.config.validateCookies != null,
+                    onChanged: (s) {
+                      _cookies[field] = s;
+                    },
+                  ).paddingBottom(16),
+                if (widget.config.login == null &&
+                    widget.config.cookieFields == null)
+                  Row(
                     mainAxisSize: MainAxisSize.min,
                     children: [
-                      const Icon(Icons.link),
+                      const Icon(Icons.error_outline),
                       const SizedBox(width: 8),
-                      Text("Create Account".tl),
+                      Text("Login with password is disabled".tl),
                     ],
+                  )
+                else
+                  Button.filled(
+                    isLoading: loading,
+                    onPressed: login,
+                    child: Text("Continue".tl),
                   ),
-                ),
-            ],
+                const SizedBox(height: 24),
+                if (widget.config.loginWebsite != null)
+                  TextButton(
+                    onPressed: loginWithWebview,
+                    child: Text("Login with webview".tl),
+                  ),
+                const SizedBox(height: 8),
+                if (widget.config.registerWebsite != null)
+                  TextButton(
+                    onPressed: () =>
+                        launchUrlString(widget.config.registerWebsite!),
+                    child: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        const Icon(Icons.link),
+                        const SizedBox(width: 8),
+                        Text("Create Account".tl),
+                      ],
+                    ),
+                  ),
+              ],
+            ),
           ),
         ),
       ),

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

@@ -0,0 +1,71 @@
+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';
+
+class AuthPage extends StatefulWidget {
+  const AuthPage({super.key, this.onSuccessfulAuth});
+
+  final void Function()? onSuccessfulAuth;
+
+  @override
+  State<AuthPage> createState() => _AuthPageState();
+}
+
+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(
+      canPop: false,
+      onPopInvokedWithResult: (didPop, result) {
+        if (!didPop) {
+          SystemNavigator.pop();
+        }
+      },
+      child: Material(
+        child: Center(
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              const Icon(Icons.security, size: 36),
+              const SizedBox(height: 16),
+              Text("Authentication Required".tl),
+              const SizedBox(height: 16),
+              FilledButton(
+                onPressed: auth,
+                child: Text("Continue".tl),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  void auth() async {
+    var localAuth = LocalAuthentication();
+    var canCheckBiometrics = await localAuth.canCheckBiometrics;
+    if (!canCheckBiometrics && !await localAuth.isDeviceSupported()) {
+      widget.onSuccessfulAuth?.call();
+      return;
+    }
+    var isAuthorized = await localAuth.authenticate(
+      localizedReason: "Please authenticate to continue".tl,
+    );
+    if (isAuthorized) {
+      widget.onSuccessfulAuth?.call();
+    }
+  }
+}

lib/pages/categories_page.dart

@@ -30,8 +30,15 @@ class CategoriesPage extends StatelessWidget {
             .toList();
 
         if(categories.isEmpty) {
+          var msg = "No Category Pages".tl;
+          msg += '\n';
+          if(ComicSource.isEmpty) {
+            msg += "Add a comic source in home page".tl;
+          } else {
+            msg += "Please check your settings".tl;
+          }
           return NetworkError(
-            message: "No Category Pages".tl,
+            message: msg,
             retry: () {
               controller.update();
             },
@@ -46,6 +53,7 @@ class CategoriesPage extends StatelessWidget {
             child: Column(
               children: [
                 FilledTabBar(
+                  key: PageStorageKey(categories.toString()),
                   tabs: categories.map((e) {
                     String title = e;
                     try {
@@ -248,36 +256,19 @@ class _CategoryPage extends StatelessWidget {
 
   Widget buildTag(String tag, ClickTagCallback onClick,
       [String? namespace, String? param]) {
-    String translateTag(String tag) {
-      /*
-      // TODO: Implement translation
-      if (enableTranslation) {
-        if (namespace != null) {
-          tag = TagsTranslation.translationTagWithNamespace(tag, namespace);
-        } else {
-          tag = tag.translateTagsToCN;
-        }
-      }
-
-       */
-      return tag;
-    }
-
     return Padding(
       padding: const EdgeInsets.fromLTRB(8, 6, 8, 6),
       child: Builder(
         builder: (context) {
           return Material(
-            elevation: 0.6,
-            borderRadius: const BorderRadius.all(Radius.circular(4)),
-            color: context.colorScheme.surfaceContainerLow,
-            surfaceTintColor: Colors.transparent,
+            borderRadius: const BorderRadius.all(Radius.circular(8)),
+            color: context.colorScheme.primaryContainer.toOpacity(0.72),
             child: InkWell(
-              borderRadius: const BorderRadius.all(Radius.circular(4)),
+              borderRadius: const BorderRadius.all(Radius.circular(8)),
               onTap: () => onClick(tag, param),
               child: Padding(
                 padding: const EdgeInsets.fromLTRB(16, 8, 16, 8),
-                child: Text(translateTag(tag)),
+                child: Text(tag),
               ),
             ),
           );

lib/pages/comic_page.dart

@@ -1,8 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:sliver_tools/sliver_tools.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 import 'package:venera/components/components.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/consts.dart';
@@ -42,12 +44,41 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
 
   bool isDownloaded = false;
 
+  void updateHistory() async {
+    var newHistory = await HistoryManager()
+        .find(widget.id, ComicType(widget.sourceKey.hashCode));
+    if (newHistory?.ep != history?.ep || newHistory?.page != history?.page) {
+      history = newHistory;
+      update();
+    }
+  }
+
+  @override
+  Widget buildLoading() {
+    return Column(
+      children: [
+        const Appbar(title: Text("")),
+        Expanded(
+          child: super.buildLoading(),
+        ),
+      ],
+    );
+  }
+
   @override
   void initState() {
     scrollController.addListener(onScroll);
+    HistoryManager().addListener(updateHistory);
     super.initState();
   }
 
+  @override
+  void dispose() {
+    scrollController.removeListener(onScroll);
+    HistoryManager().removeListener(updateHistory);
+    super.dispose();
+  }
+
   @override
   void update() {
     setState(() {});
@@ -84,6 +115,7 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
         buildDescription(),
         buildInfo(),
         buildChapters(),
+        buildComments(),
         buildThumbnails(),
         buildRecommend(),
         SliverPadding(padding: EdgeInsets.only(bottom: context.padding.bottom)),
@@ -191,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,
@@ -205,6 +238,7 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
 
   Widget buildActions() {
     bool isMobile = context.width < changePoint;
+    bool hasHistory = history != null && (history!.ep > 1 || history!.page > 1);
     return SliverToBoxAdapter(
       child: Column(
         children: [
@@ -212,17 +246,17 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
             scrollDirection: Axis.horizontal,
             padding: const EdgeInsets.symmetric(horizontal: 8),
             children: [
-              if (history != null && (history!.ep > 1 || history!.page > 1))
+              if (hasHistory && !isMobile)
                 _ActionButton(
                   icon: const Icon(Icons.menu_book),
                   text: 'Continue'.tl,
                   onPressed: continueRead,
                   iconColor: context.useTextColor(Colors.yellow),
                 ),
-              if (!isMobile)
+              if (!isMobile || hasHistory)
                 _ActionButton(
                   icon: const Icon(Icons.play_circle_outline),
-                  text: 'Read'.tl,
+                  text: 'Start'.tl,
                   onPressed: read,
                   iconColor: context.useTextColor(Colors.orange),
                 ),
@@ -238,7 +272,9 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
                   icon: const Icon(Icons.favorite_border),
                   activeIcon: const Icon(Icons.favorite),
                   isActive: isLiked,
-                  text: (data!.likesCount ?? (isLiked ? 'Liked'.tl : 'Like'.tl))
+                  text: ((data!.likesCount != null)
+                          ? (data!.likesCount! + (isLiked ? 1 : 0))
+                          : (isLiked ? 'Liked'.tl : 'Like'.tl))
                       .toString(),
                   isLoading: isLiking,
                   onPressed: likeOrUnlike,
@@ -250,6 +286,7 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
                 isActive: isFavorite || isAddToLocalFav,
                 text: 'Favorite'.tl,
                 onPressed: openFavPanel,
+                onLongPressed: quickFavorite,
                 iconColor: context.useTextColor(Colors.purple),
               ),
               if (comicSource.commentsLoader != null)
@@ -278,7 +315,10 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
                 ),
                 const SizedBox(width: 16),
                 Expanded(
-                  child: FilledButton(onPressed: read, child: Text("Read".tl)),
+                  child: hasHistory
+                      ? FilledButton(
+                          onPressed: continueRead, child: Text("Continue".tl))
+                      : FilledButton(onPressed: read, child: Text("Read".tl)),
                 )
               ],
             ).paddingHorizontal(16).paddingVertical(8),
@@ -289,7 +329,7 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
   }
 
   Widget buildDescription() {
-    if (comic.description == null) {
+    if (comic.description == null || comic.description!.trim().isEmpty) {
       return const SliverPadding(padding: EdgeInsets.zero);
     }
     return SliverToBoxAdapter(
@@ -354,6 +394,27 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
           child: InkWell(
             borderRadius: borderRadius,
             onTap: onTap,
+            onLongPress: () {
+              Clipboard.setData(ClipboardData(text: text));
+              context.showMessage(message: "Copied".tl);
+            },
+            onSecondaryTapDown: (details) {
+              showMenuX(context, details.globalPosition, [
+                MenuEntry(
+                  icon: Icons.remove_red_eye,
+                  text: "View".tl,
+                  onClick: onTap,
+                ),
+                MenuEntry(
+                  icon: Icons.copy,
+                  text: "Copy".tl,
+                  onClick: () {
+                    Clipboard.setData(ClipboardData(text: text));
+                    context.showMessage(message: "Copied".tl);
+                  },
+                ),
+              ]);
+            },
             child: Text(text).padding(padding),
           ),
         );
@@ -368,6 +429,26 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
       }
     }
 
+    String formatTime(String time) {
+      if (int.tryParse(time) != null) {
+        var t = int.tryParse(time);
+        if (t! > 1000000000000) {
+          return DateTime.fromMillisecondsSinceEpoch(t)
+              .toString()
+              .substring(0, 19);
+        } else {
+          return DateTime.fromMillisecondsSinceEpoch(t * 1000)
+              .toString()
+              .substring(0, 19);
+        }
+      }
+      if (time.contains('T') || time.contains('Z')) {
+        var t = DateTime.parse(time);
+        return t.toString().substring(0, 19);
+      }
+      return time;
+    }
+
     Widget buildWrap({required List<Widget> children}) {
       return Wrap(
         runSpacing: 8,
@@ -398,23 +479,23 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
                 Text(comic.stars!.toStringAsFixed(2)),
               ],
             ).paddingLeft(16).paddingVertical(8),
-            for (var e in comic.tags.entries)
-              buildWrap(
-                children: [
-                  if(e.value.isNotEmpty)
+          for (var e in comic.tags.entries)
+            buildWrap(
+              children: [
+                if (e.value.isNotEmpty)
                   buildTag(text: e.key.ts(comicSource.key), isTitle: true),
-                  for (var tag in e.value)
-                    buildTag(
-                      text: enableTranslation
-                          ? TagsTranslation.translationTagWithNamespace(
-                              tag,
-                              e.key.toLowerCase(),
-                            )
-                          : tag,
-                      onTap: () => onTapTag(tag, e.key),
-                    ),
-                ],
-              ),
+                for (var tag in e.value)
+                  buildTag(
+                    text: enableTranslation
+                        ? TagsTranslation.translationTagWithNamespace(
+                            tag,
+                            e.key.toLowerCase(),
+                          )
+                        : tag,
+                    onTap: () => onTapTag(tag, e.key),
+                  ),
+              ],
+            ),
           if (comic.uploader != null)
             buildWrap(
               children: [
@@ -426,14 +507,14 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
             buildWrap(
               children: [
                 buildTag(text: 'Upload Time'.tl, isTitle: true),
-                buildTag(text: comic.uploadTime!),
+                buildTag(text: formatTime(comic.uploadTime!)),
               ],
             ),
           if (comic.updateTime != null)
             buildWrap(
               children: [
                 buildTag(text: 'Update Time'.tl, isTitle: true),
-                buildTag(text: comic.updateTime!),
+                buildTag(text: formatTime(comic.updateTime!)),
               ],
             ),
           const SizedBox(height: 12),
@@ -458,7 +539,7 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
   }
 
   Widget buildRecommend() {
-    if (comic.recommend == null||comic.recommend!.isEmpty) {
+    if (comic.recommend == null || comic.recommend!.isEmpty) {
       return const SliverPadding(padding: EdgeInsets.zero);
     }
     return SliverMainAxisGroup(slivers: [
@@ -470,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 {
@@ -503,12 +594,22 @@ abstract mixin class _ComicPageActions {
 
   bool isFavorite = false;
 
-  void openFavPanel() {
+  FavoriteItem _toFavoriteItem() {
     var tags = <String>[];
     for (var e in comic.tags.entries) {
       tags.addAll(e.value.map((tag) => '${e.key}:$tag'));
     }
+    return FavoriteItem(
+      id: comic.id,
+      name: comic.title,
+      coverPath: comic.cover,
+      author: comic.subTitle ?? comic.uploader ?? '',
+      type: comic.comicType,
+      tags: tags,
+    );
+  }
 
+  void openFavPanel() {
     showSideBar(
       App.rootContext,
       _FavoritePanel(
@@ -520,18 +621,25 @@ abstract mixin class _ComicPageActions {
           isAddToLocalFav = local ?? isAddToLocalFav;
           update();
         },
-        favoriteItem: FavoriteItem(
-          id: comic.id,
-          name: comic.title,
-          coverPath: comic.cover,
-          author: comic.subTitle ?? comic.uploader ?? '',
-          type: comic.comicType,
-          tags: tags,
-        ),
+        favoriteItem: _toFavoriteItem(),
       ),
     );
   }
 
+  void quickFavorite() {
+    var folder = appdata.settings['quickFavorite'];
+    if (folder is! String) {
+      return;
+    }
+    LocalFavoritesManager().addComic(
+      folder,
+      _toFavoriteItem(),
+    );
+    isAddToLocalFav = true;
+    update();
+    App.rootContext.showMessage(message: "Added".tl);
+  }
+
   void share() {
     var text = comic.title;
     if (comic.url != null) {
@@ -575,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,
@@ -765,11 +989,13 @@ class _ActionButton extends StatelessWidget {
     required this.icon,
     required this.text,
     required this.onPressed,
+    this.onLongPressed,
     this.activeIcon,
     this.isActive,
     this.isLoading,
     this.iconColor,
   });
+
   final Widget icon;
 
   final Widget? activeIcon;
@@ -783,6 +1009,9 @@ class _ActionButton extends StatelessWidget {
   final bool? isLoading;
 
   final Color? iconColor;
+
+  final void Function()? onLongPressed;
+
   @override
   Widget build(BuildContext context) {
     return Container(
@@ -800,6 +1029,7 @@ class _ActionButton extends StatelessWidget {
             onPressed();
           }
         },
+        onLongPress: onLongPressed,
         borderRadius: BorderRadius.circular(18),
         child: IconTheme.merge(
           data: IconThemeData(size: 20, color: iconColor),
@@ -886,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),
@@ -904,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(
@@ -961,6 +1188,8 @@ class _ComicThumbnailsState extends State<_ComicThumbnails> {
 
   String? error;
 
+  bool isLoading = false;
+
   @override
   void didChangeDependencies() {
     state = context.findAncestorStateOfType<_ComicPageState>()!;
@@ -974,6 +1203,12 @@ class _ComicThumbnailsState extends State<_ComicThumbnails> {
     if (!isInitialLoading && next == null) {
       return;
     }
+    if (isLoading) return;
+    Future.microtask(() {
+      setState(() {
+        isLoading = true;
+      });
+    });
     var res = await state.comicSource.loadComicThumbnail!(state.comic.id, next);
     if (res.success) {
       thumbnails.addAll(res.data);
@@ -982,13 +1217,15 @@ class _ComicThumbnailsState extends State<_ComicThumbnails> {
     } else {
       error = res.errorMessage;
     }
-    setState(() {});
+    setState(() {
+      isLoading = false;
+    });
   }
 
   @override
   Widget build(BuildContext context) {
-    return SliverMainAxisGroup(
-      slivers: [
+    return MultiSliver(
+      children: [
         SliverToBoxAdapter(
           child: ListTile(
             title: Text("Preview".tl),
@@ -1088,10 +1325,8 @@ class _ComicThumbnailsState extends State<_ComicThumbnails> {
               ],
             ),
           )
-        else if (next != null || isInitialLoading)
-          const SliverToBoxAdapter(
-            child: ListLoadingIndicator(),
-          ),
+        else if (isLoading)
+          const SliverListLoadingIndicator(),
         const SliverToBoxAdapter(
           child: Divider(),
         ),
@@ -1539,10 +1774,12 @@ class _SelectDownloadChapterState extends State<_SelectDownloadChapter> {
                 const SizedBox(width: 16),
                 Expanded(
                   child: FilledButton(
-                    onPressed: () {
-                      widget.finishSelect(selected);
-                      context.pop();
-                    },
+                    onPressed: selected.isEmpty
+                        ? null
+                        : () {
+                            widget.finishSelect(selected);
+                            context.pop();
+                          },
                     child: Text("Download Selected".tl),
                   ),
                 ),
@@ -1550,7 +1787,156 @@ class _SelectDownloadChapterState extends State<_SelectDownloadChapter> {
               ],
             ),
           ),
-          SizedBox(height: MediaQuery.of(context).padding.bottom + 4),
+          SizedBox(height: MediaQuery.of(context).padding.bottom),
+        ],
+      ),
+    );
+  }
+}
+
+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

@@ -14,11 +14,11 @@ import 'package:venera/utils/translations.dart';
 class ComicSourcePage extends StatefulWidget {
   const ComicSourcePage({super.key});
 
-  static void checkComicSourceUpdate([bool showLoading = false]) async {
+  static Future<void> checkComicSourceUpdate([bool implicit = false]) async {
     if (ComicSource.all().isEmpty) {
       return;
     }
-    var controller = showLoading ? showLoadingDialog(App.rootContext) : null;
+    var controller = implicit ? null : showLoadingDialog(App.rootContext);
     var dio = AppDio();
     var res = await dio.get<String>(
         "https://raw.githubusercontent.com/venera-app/venera-configs/master/index.json");
@@ -40,6 +40,9 @@ class ComicSourcePage extends StatefulWidget {
     }
     controller?.close();
     if (shouldUpdate.isEmpty) {
+      if (!implicit) {
+        App.rootContext.showMessage(message: "No Update Available".tl);
+      }
       return;
     }
     var msg = "";
@@ -47,14 +50,15 @@ class ComicSourcePage extends StatefulWidget {
       msg += "${ComicSource.find(key)?.name}: v${versions[key]}\n";
     }
     msg = msg.trim();
-    showConfirmDialog(
+    await showConfirmDialog(
       context: App.rootContext,
       title: "Updates Available".tl,
       content: msg,
-      onConfirm: () {
+      confirmText: "Update",
+      onConfirm: () async {
         for (var key in shouldUpdate) {
           var source = ComicSource.find(key);
-          _BodyState.update(source!);
+          await _BodyState.update(source!);
         }
       },
     );
@@ -91,24 +95,12 @@ class _BodyState extends State<_Body> {
     return SmoothCustomScrollView(
       slivers: [
         buildCard(context),
-        buildSettings(),
         for (var source in ComicSource.all()) buildSource(context, source),
         SliverPadding(padding: EdgeInsets.only(bottom: context.padding.bottom)),
       ],
     );
   }
 
-  Widget buildSettings() {
-    return SliverToBoxAdapter(
-      child: ListTile(
-        leading: const Icon(Icons.update_outlined),
-        title: Text("Check updates".tl),
-        onTap: () => ComicSourcePage.checkComicSourceUpdate(true),
-        trailing: const Icon(Icons.arrow_right),
-      ),
-    );
-  }
-
   Widget buildSource(BuildContext context, ComicSource source) {
     return SliverToBoxAdapter(
       child: Column(
@@ -160,71 +152,77 @@ class _BodyState extends State<_Body> {
     for (var item in source.settings!.entries) {
       var key = item.key;
       String type = item.value['type'];
-      if (type == "select") {
-        var current = source.data['settings'][key];
-        if (current == null) {
-          var d = item.value['default'];
-          for (var option in item.value['options']) {
-            if (option['value'] == d) {
-              current = option['text'] ?? option['value'];
-              break;
+      try {
+        if (type == "select") {
+          var current = source.data['settings'][key];
+          if (current == null) {
+            var d = item.value['default'];
+            for (var option in item.value['options']) {
+              if (option['value'] == d) {
+                current = option['text'] ?? option['value'];
+                break;
+              }
             }
           }
+          yield ListTile(
+            title: Text((item.value['title'] as String).ts(source.key)),
+            trailing: Select(
+              current: (current as String).ts(source.key),
+              values: (item.value['options'] as List)
+                  .map<String>((e) =>
+                      ((e['text'] ?? e['value']) as String).ts(source.key))
+                  .toList(),
+              onTap: (i) {
+                source.data['settings'][key] =
+                    item.value['options'][i]['value'];
+                source.saveData();
+                setState(() {});
+              },
+            ),
+          );
+        } else if (type == "switch") {
+          var current = source.data['settings'][key] ?? item.value['default'];
+          yield ListTile(
+            title: Text((item.value['title'] as String).ts(source.key)),
+            trailing: Switch(
+              value: current,
+              onChanged: (v) {
+                source.data['settings'][key] = v;
+                source.saveData();
+                setState(() {});
+              },
+            ),
+          );
+        } else if (type == "input") {
+          var current =
+              source.data['settings'][key] ?? item.value['default'] ?? '';
+          yield ListTile(
+            title: Text((item.value['title'] as String).ts(source.key)),
+            subtitle:
+                Text(current, maxLines: 1, overflow: TextOverflow.ellipsis),
+            trailing: IconButton(
+              icon: const Icon(Icons.edit),
+              onPressed: () {
+                showInputDialog(
+                  context: context,
+                  title: (item.value['title'] as String).ts(source.key),
+                  initialValue: current,
+                  inputValidator: item.value['validator'] == null
+                      ? null
+                      : RegExp(item.value['validator']),
+                  onConfirm: (value) {
+                    source.data['settings'][key] = value;
+                    source.saveData();
+                    setState(() {});
+                    return null;
+                  },
+                );
+              },
+            ),
+          );
         }
-        yield ListTile(
-          title: Text((item.value['title'] as String).ts(source.key)),
-          trailing: Select(
-            current: (current as String).ts(source.key),
-            values: (item.value['options'] as List)
-                .map<String>(
-                    (e) => ((e['text'] ?? e['value']) as String).ts(source.key))
-                .toList(),
-            onTap: (i) {
-              source.data['settings'][key] = item.value['options'][i]['value'];
-              source.saveData();
-              setState(() {});
-            },
-          ),
-        );
-      } else if (type == "switch") {
-        var current = source.data['settings'][key] ?? item.value['default'];
-        yield ListTile(
-          title: Text((item.value['title'] as String).ts(source.key)),
-          trailing: Switch(
-            value: current,
-            onChanged: (v) {
-              source.data['settings'][key] = v;
-              source.saveData();
-              setState(() {});
-            },
-          ),
-        );
-      } else if (type == "input") {
-        var current =
-            source.data['settings'][key] ?? item.value['default'] ?? '';
-        yield ListTile(
-          title: Text((item.value['title'] as String).ts(source.key)),
-          subtitle: Text(current, maxLines: 1, overflow: TextOverflow.ellipsis),
-          trailing: IconButton(
-            icon: const Icon(Icons.edit),
-            onPressed: () {
-              showInputDialog(
-                context: context,
-                title: (item.value['title'] as String).ts(source.key),
-                initialValue: current,
-                inputValidator: item.value['validator'] == null
-                    ? null
-                    : RegExp(item.value['validator']),
-                onConfirm: (value) {
-                  source.data['settings'][key] = value;
-                  source.saveData();
-                  setState(() {});
-                  return null;
-                },
-              );
-            },
-          ),
-        );
+      } catch (e, s) {
+        Log.error("ComicSourcePage", "Failed to build a setting\n$e\n$s");
       }
     }
   }
@@ -233,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();
@@ -268,7 +269,7 @@ class _BodyState extends State<_Body> {
     }
   }
 
-  static void update(ComicSource source) async {
+  static Future<void> update(ComicSource source) async {
     if (!source.url.isURL) {
       App.rootContext.showMessage(message: "Invalid url config");
       return;
@@ -296,55 +297,73 @@ class _BodyState extends State<_Body> {
   }
 
   Widget buildCard(BuildContext context) {
+    Widget buildButton({required Widget child, required VoidCallback onPressed}) {
+      return Button.normal(
+        onPressed: onPressed,
+        child: child,
+      ).fixHeight(32);
+    }
     return SliverToBoxAdapter(
-      child: Card.outlined(
-        child: SizedBox(
-          width: double.infinity,
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              ListTile(
-                title: Text("Add comic source".tl),
-                leading: const Icon(Icons.dashboard_customize),
+      child: SizedBox(
+        width: double.infinity,
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            ListTile(
+              title: Text("Add comic source".tl),
+              leading: const Icon(Icons.dashboard_customize),
+            ),
+            TextField(
+              decoration: InputDecoration(
+                  hintText: "URL",
+                  border: const UnderlineInputBorder(),
+                  contentPadding: const EdgeInsets.symmetric(horizontal: 12),
+                  suffix: IconButton(
+                      onPressed: () => handleAddSource(url),
+                      icon: const Icon(Icons.check))),
+              onChanged: (value) {
+                url = value;
+              },
+              onSubmitted: handleAddSource,
+            ).paddingHorizontal(16).paddingBottom(8),
+            ListTile(
+              title: Text("Comic Source list".tl),
+              trailing: buildButton(
+                child: Text("View".tl),
+                onPressed: () {
+                  showPopUpWidget(
+                    App.rootContext,
+                    _ComicSourceList(handleAddSource),
+                  );
+                },
               ),
-              TextField(
-                      decoration: InputDecoration(
-                          hintText: "URL",
-                          border: const UnderlineInputBorder(),
-                          contentPadding:
-                              const EdgeInsets.symmetric(horizontal: 12),
-                          suffix: IconButton(
-                              onPressed: () => handleAddSource(url),
-                              icon: const Icon(Icons.check))),
-                      onChanged: (value) {
-                        url = value;
-                      },
-                      onSubmitted: handleAddSource)
-                  .paddingHorizontal(16)
-                  .paddingBottom(32),
-              Row(
-                children: [
-                  TextButton(
-                          onPressed: _selectFile, child: Text("Select file".tl))
-                      .paddingLeft(8),
-                  const Spacer(),
-                  TextButton(
-                      onPressed: () {
-                        showPopUpWidget(
-                            App.rootContext, _ComicSourceList(handleAddSource));
-                      },
-                      child: Text("View list".tl)),
-                  const Spacer(),
-                  TextButton(onPressed: help, child: Text("Open help".tl))
-                      .paddingRight(8),
-                ],
+            ),
+            ListTile(
+              title: Text("Use a config file".tl),
+              trailing: buildButton(
+                onPressed: _selectFile,
+                child: Text("Select".tl),
               ),
-              const SizedBox(height: 8),
-            ],
-          ),
+            ),
+            ListTile(
+              title: Text("Help".tl),
+              trailing: buildButton(
+                onPressed: help,
+                child: Text("Open".tl),
+              ),
+            ),
+            ListTile(
+              title: Text("Check updates".tl),
+              trailing: buildButton(
+                onPressed: () => ComicSourcePage.checkComicSourceUpdate(false),
+                child: Text("Check".tl),
+              ),
+            ),
+            const SizedBox(height: 8),
+          ],
         ),
-      ).paddingHorizontal(12),
+      ),
     );
   }
 
@@ -363,8 +382,7 @@ class _BodyState extends State<_Body> {
   }
 
   void help() {
-    launchUrlString(
-        "https://github.com/venera-app/venera/blob/master/doc/comic_source.md");
+    launchUrlString("https://github.com/venera-app/venera-configs");
   }
 
   Future<void> handleAddSource(String url) async {
@@ -445,10 +463,11 @@ class _ComicSourceListState extends State<_ComicSourceList> {
         itemBuilder: (context, index) {
           var key = json![index]["key"];
           var action = currentKey.contains(key)
-              ? const Icon(Icons.check)
+              ? const Icon(Icons.check, size: 20).paddingRight(8)
               : Tooltip(
                   message: "Add",
-                  child: IconButton(
+                  child: Button.icon(
+                    color: context.colorScheme.primary,
                     icon: const Icon(Icons.add),
                     onPressed: () async {
                       await widget.onAdd(

lib/pages/comments_page.dart

@@ -1,8 +1,14 @@
+import 'dart:collection';
+
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
+import 'package:url_launcher/url_launcher_string.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/utils/app_links.dart';
+import 'package:venera/utils/ext.dart';
 import 'package:venera/utils/translations.dart';
 
 class CommentsPage extends StatefulWidget {
@@ -268,7 +274,10 @@ class _CommentTileState extends State<_CommentTile> {
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                Text(widget.comment.userName, style: ts.bold,),
+                Text(
+                  widget.comment.userName,
+                  style: ts.bold,
+                ),
                 if (widget.comment.time != null)
                   Text(widget.comment.time!, style: ts.s12),
                 const SizedBox(height: 4),
@@ -426,7 +435,7 @@ class _CommentTileState extends State<_CommentTile> {
       isCancel,
     );
     if (res.success) {
-      if(isCancel) {
+      if (isCancel) {
         voteStatus = 0;
       } else {
         if (isUp) {
@@ -498,6 +507,289 @@ class _CommentContent extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return SelectableText(text);
+    if (!text.contains('<') && !text.contains('http')) {
+      return SelectableText(text);
+    } else {
+      return RichCommentContent(text: text);
+    }
+  }
+}
+
+class _Tag {
+  final String name;
+  final Map<String, String> attributes;
+
+  const _Tag(this.name, this.attributes);
+
+  TextSpan merge(TextSpan s, BuildContext context) {
+    var style = s.style ?? ts;
+    style = switch (name) {
+      'b' => style.bold,
+      'i' => style.italic,
+      'u' => style.underline,
+      's' => style.lineThrough,
+      'a' => style.withColor(context.colorScheme.primary),
+      'span' => () {
+          if (attributes.containsKey('style')) {
+            var s = attributes['style']!;
+            var css = s.split(';');
+            for (var c in css) {
+              var kv = c.split(':');
+              if (kv.length == 2) {
+                var key = kv[0].trim();
+                var value = kv[1].trim();
+                switch (key) {
+                  case 'color':
+                    // Color is not supported, we should make text display well in light and dark mode.
+                    break;
+                  case 'font-weight':
+                    if (value == 'bold') {
+                      style = style.bold;
+                    } else if (value == 'lighter') {
+                      style = style.light;
+                    }
+                    break;
+                  case 'font-style':
+                    if (value == 'italic') {
+                      style = style.italic;
+                    }
+                    break;
+                  case 'text-decoration':
+                    if (value == 'underline') {
+                      style = style.underline;
+                    } else if (value == 'line-through') {
+                      style = style.lineThrough;
+                    }
+                    break;
+                  case 'font-size':
+                    // Font size is not supported.
+                    break;
+                }
+              }
+            }
+          }
+          return style;
+        }(),
+      _ => style,
+    };
+    if (style.color != null) {
+      style = style.copyWith(decorationColor: style.color);
+    }
+    var recognizer = s.recognizer;
+    if (name == 'a') {
+      var link = attributes['href'];
+      if (link != null && link.isURL) {
+        recognizer = TapGestureRecognizer()
+          ..onTap = () {
+            handleLink(link);
+          };
+      }
+    }
+    return TextSpan(
+      text: s.text,
+      style: style,
+      recognizer: recognizer,
+    );
+  }
+
+  static void handleLink(String link) async {
+    if (link.isURL) {
+      if (await handleAppLink(Uri.parse(link))) {
+        Navigator.of(App.rootContext).maybePop();
+      } else {
+        launchUrlString(link);
+      }
+    }
+  }
+}
+
+class _CommentImage {
+  final String url;
+  final String? link;
+
+  const _CommentImage(this.url, this.link);
+}
+
+class RichCommentContent extends StatefulWidget {
+  const RichCommentContent({super.key, required this.text});
+
+  final String text;
+
+  @override
+  State<RichCommentContent> createState() => _RichCommentContentState();
+}
+
+class _RichCommentContentState extends State<RichCommentContent> {
+  var textSpan = <InlineSpan>[];
+  var images = <_CommentImage>[];
+
+  @override
+  void didChangeDependencies() {
+    render();
+    super.didChangeDependencies();
+  }
+
+  bool isValidUrlChar(String char) {
+    return RegExp(r'[a-zA-Z0-9%:/.@\-_?&=#*!+;]').hasMatch(char);
+  }
+
+  void render() {
+    var s = Queue<_Tag>();
+
+    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;
+      var span = TextSpan(text: buffer.toString());
+      for (var tag in s) {
+        span = tag.merge(span, context);
+      }
+      textSpan.add(span);
+      buffer.clear();
+    }
+
+    while (i < text.length) {
+      if (text[i] == '<' && i != text.length - 1) {
+        if (text[i + 1] != '/') {
+          // start tag
+          var j = text.indexOf('>', i);
+          if (j != -1) {
+            var tagContent = text.substring(i + 1, j);
+            var splits = tagContent.split(' ');
+            splits.removeWhere((element) => element.isEmpty);
+            var tagName = splits[0];
+            var attributes = <String, String>{};
+            for (var k = 1; k < splits.length; k++) {
+              var attr = splits[k];
+              var attrSplits = attr.split('=');
+              if (attrSplits.length == 2) {
+                attributes[attrSplits[0]] = attrSplits[1].replaceAll('"', '');
+              }
+            }
+            const acceptedTags = ['img', 'a', 'b', 'i', 'u', 's', 'br', 'span'];
+            if (acceptedTags.contains(tagName)) {
+              writeBuffer();
+              if (tagName == 'img') {
+                var url = attributes['src'];
+                String? link;
+                for (var tag in s) {
+                  if (tag.name == 'a') {
+                    link = tag.attributes['href'];
+                    break;
+                  }
+                }
+                if (url != null) {
+                  images.add(_CommentImage(url, link));
+                }
+              } else if (tagName == 'br') {
+                buffer.write('\n');
+              } else {
+                s.add(_Tag(tagName, attributes));
+              }
+              i = j + 1;
+              continue;
+            }
+          }
+        } else {
+          // end tag
+          var j = text.indexOf('>', i);
+          if (j != -1) {
+            var tagContent = text.substring(i + 2, j);
+            var splits = tagContent.split(' ');
+            splits.removeWhere((element) => element.isEmpty);
+            var tagName = splits[0];
+            if (s.isNotEmpty && s.last.name == tagName) {
+              writeBuffer();
+              s.removeLast();
+              i = j + 1;
+              continue;
+            }
+            if (tagName == 'br') {
+              i = j + 1;
+              buffer.write('\n');
+              continue;
+            }
+          }
+        }
+      } else if (text.length - i > 8 &&
+          text.substring(i, i + 4) == 'http' &&
+          !s.any((e) => e.name == 'a')) {
+        // auto link
+        int j = i;
+        for (; j < text.length; j++) {
+          if (!isValidUrlChar(text[j])) {
+            break;
+          }
+        }
+        var url = text.substring(i, j);
+        if (url.isURL) {
+          writeBuffer();
+          textSpan.add(TextSpan(
+            text: url,
+            style: ts.withColor(context.colorScheme.primary),
+            recognizer: TapGestureRecognizer()
+              ..onTap = () {
+                _Tag.handleLink(url);
+              },
+          ));
+          i = j;
+          continue;
+        }
+      }
+      buffer.write(text[i]);
+      i++;
+    }
+    writeBuffer();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    Widget content = SelectableText.rich(
+      TextSpan(
+        style: DefaultTextStyle.of(context).style,
+        children: textSpan,
+      ),
+    );
+    if (images.isNotEmpty) {
+      content = Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          content,
+          Wrap(
+            runSpacing: 4,
+            spacing: 4,
+            children: images.map((e) {
+              Widget image = Container(
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(8),
+                  color: Theme.of(context).colorScheme.surfaceContainerLow,
+                ),
+                width: 100,
+                height: 100,
+                child: Image(
+                  width: 100,
+                  height: 100,
+                  image: CachedImageProvider(e.url),
+                ),
+              );
+              if (e.link != null) {
+                image = InkWell(
+                  onTap: () {
+                    _Tag.handleLink(e.link!);
+                  },
+                  child: image,
+                );
+              }
+              return image;
+            }).toList(),
+          )
+        ],
+      );
+    }
+    return content;
   }
 }

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';
@@ -27,7 +28,9 @@ class _DownloadingPageState extends State<DownloadingPage> {
   }
 
   void update() {
-    setState(() {});
+    if(mounted) {
+      setState(() {});
+    }
   }
 
   @override
@@ -159,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,
                   ),
@@ -204,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

@@ -5,8 +5,12 @@ import 'package:venera/foundation/appdata.dart';
 import 'package:venera/foundation/comic_source/comic_source.dart';
 import 'package:venera/foundation/res.dart';
 import 'package:venera/foundation/state_controller.dart';
+import 'package:venera/pages/search_result_page.dart';
+import 'package:venera/utils/ext.dart';
 import 'package:venera/utils/translations.dart';
 
+import 'category_comics_page.dart';
+
 class ExplorePage extends StatefulWidget {
   const ExplorePage({super.key});
 
@@ -15,7 +19,7 @@ class ExplorePage extends StatefulWidget {
 }
 
 class _ExplorePageState extends State<ExplorePage>
-    with TickerProviderStateMixin {
+    with TickerProviderStateMixin, AutomaticKeepAliveClientMixin<ExplorePage> {
   late TabController controller;
 
   bool showFB = true;
@@ -24,6 +28,36 @@ class _ExplorePageState extends State<ExplorePage>
 
   late List<String> pages;
 
+  void onSettingsChanged() {
+    var explorePages = List<String>.from(appdata.settings["explore_pages"]);
+    var all = ComicSource.all()
+        .map((e) => e.explorePages)
+        .expand((e) => e.map((e) => e.title))
+        .toList();
+    explorePages = explorePages.where((e) => all.contains(e)).toList();
+    if (!pages.isEqualsTo(explorePages)) {
+      setState(() {
+        pages = explorePages;
+        controller = TabController(
+          length: pages.length,
+          vsync: this,
+        );
+      });
+    }
+  }
+
+  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"]);
@@ -36,9 +70,25 @@ class _ExplorePageState extends State<ExplorePage>
       length: pages.length,
       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();
+  }
+
   void refresh() {
     int page = controller.index;
     String currentPageId = pages[page];
@@ -60,11 +110,20 @@ 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) {
+      msg += "Add a comic source in home page".tl;
+    } else {
+      msg += "Please check your settings".tl;
+    }
     return NetworkError(
-      message: "No Explore Pages".tl,
+      message: msg,
       retry: () {
         setState(() {
           pages = ComicSource.all()
@@ -83,12 +142,14 @@ class _ExplorePageState extends State<ExplorePage>
 
   @override
   Widget build(BuildContext context) {
+    super.build(context);
     if (pages.isEmpty) {
       return buildEmpty();
     }
 
     Widget tabBar = Material(
       child: FilledTabBar(
+        key: PageStorageKey(pages.toString()),
         tabs: pages.map((e) => buildTab(e)).toList(),
         controller: controller,
       ),
@@ -97,48 +158,52 @@ class _ExplorePageState extends State<ExplorePage>
     return Stack(
       children: [
         Positioned.fill(
-            child: Column(
-          children: [
-            tabBar,
-            Expanded(
-              child: NotificationListener<ScrollNotification>(
-                onNotification: (notifications) {
-                  if (notifications.metrics.axis == Axis.horizontal) {
-                    if (!showFB) {
+          child: Column(
+            children: [
+              tabBar,
+              Expanded(
+                child: NotificationListener<ScrollNotification>(
+                  onNotification: (notifications) {
+                    if (notifications.metrics.axis == Axis.horizontal) {
+                      if (!showFB) {
+                        setState(() {
+                          showFB = true;
+                        });
+                      }
+                      return true;
+                    }
+
+                    var current = notifications.metrics.pixels;
+                    var overflow = notifications.metrics.outOfRange;
+                    if (current > location && current != 0 && showFB) {
+                      setState(() {
+                        showFB = false;
+                      });
+                    } else if ((current < location - 50 || current == 0) &&
+                        !showFB) {
                       setState(() {
                         showFB = true;
                       });
                     }
-                    return true;
-                  }
-
-                  var current = notifications.metrics.pixels;
-
-                  if ((current > location && current != 0) && showFB) {
-                    setState(() {
-                      showFB = false;
-                    });
-                  } else if ((current < location || current == 0) && !showFB) {
-                    setState(() {
-                      showFB = true;
-                    });
-                  }
-
-                  location = current;
-                  return false;
-                },
-                child: MediaQuery.removePadding(
-                  context: context,
-                  removeTop: true,
-                  child: TabBarView(
-                    controller: controller,
-                    children: pages.map((e) => buildBody(e)).toList(),
+                    if ((current > location || current < location - 50) &&
+                        !overflow) {
+                      location = current;
+                    }
+                    return false;
+                  },
+                  child: MediaQuery.removePadding(
+                    context: context,
+                    removeTop: true,
+                    child: TabBarView(
+                      controller: controller,
+                      children: pages.map((e) => buildBody(e)).toList(),
+                    ),
                   ),
                 ),
-              ),
-            )
-          ],
-        )),
+              )
+            ],
+          ),
+        ),
         Positioned(
           right: 16,
           bottom: 16,
@@ -159,6 +224,9 @@ class _ExplorePageState extends State<ExplorePage>
       ],
     );
   }
+
+  @override
+  bool get wantKeepAlive => true;
 }
 
 class _SingleExplorePage extends StatefulWidget {
@@ -170,18 +238,25 @@ class _SingleExplorePage extends StatefulWidget {
   State<_SingleExplorePage> createState() => _SingleExplorePageState();
 }
 
-class _SingleExplorePageState extends StateWithController<_SingleExplorePage> {
+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)) {
+      _wantKeepAlive = false;
+      updateKeepAlive();
+    }
+  }
 
   @override
   void initState() {
@@ -195,20 +270,48 @@ class _SingleExplorePageState extends StateWithController<_SingleExplorePage> {
         }
       }
     }
+    appdata.settings.addListener(onSettingsChanged);
     throw "Explore Page ${widget.title} Not Found!";
   }
 
+  @override
+  void dispose() {
+    appdata.settings.removeListener(onSettingsChanged);
+    super.dispose();
+  }
+
   @override
   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(
@@ -217,88 +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) {
@@ -326,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(),
       ],
     );
   }
@@ -367,13 +442,12 @@ Iterable<Widget> _buildExplorePagePart(
               if (part.viewMore != null)
                 TextButton(
                   onPressed: () {
-                    // TODO: view more
-                    /*
                     var context = App.mainNavigatorKey!.currentContext!;
                     if (part.viewMore!.startsWith("search:")) {
                       context.to(
-                            () => SearchResultPage(
-                          keyword: part.viewMore!.replaceFirst("search:", ""),
+                        () => SearchResultPage(
+                          text: part.viewMore!.replaceFirst("search:", ""),
+                          options: const [],
                           sourceKey: sourceKey,
                         ),
                       );
@@ -385,16 +459,16 @@ Iterable<Widget> _buildExplorePagePart(
                         p = null;
                       }
                       context.to(
-                            () => CategoryComicsPage(
+                        () => CategoryComicsPage(
                           category: c,
                           categoryKey:
-                          ComicSource.find(sourceKey)!.categoryData!.key,
+                              ComicSource.find(sourceKey)!.categoryData!.key,
                           param: p,
                         ),
                       );
-                    }*/
+                    }
                   },
-                  child: Text("查看更多".tl),
+                  child: Text("View more".tl),
                 )
             ],
           ),
@@ -410,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

@@ -6,7 +6,6 @@ Future<void> newFolder() async {
       context: App.rootContext,
       builder: (context) {
         var controller = TextEditingController();
-        var folders = LocalFavoritesManager().folderNames;
         String? error;
 
         return StatefulBuilder(builder: (context, setState) {
@@ -35,12 +34,11 @@ Future<void> newFolder() async {
                 child: Text("Import from file".tl),
                 onPressed: () async {
                   var file = await selectFile(ext: ['json']);
-                  if(file == null) return;
+                  if (file == null) return;
                   var data = await file.readAsBytes();
                   try {
                     LocalFavoritesManager().fromJson(utf8.decode(data));
-                  }
-                  catch(e) {
+                  } catch (e) {
                     context.showMessage(message: "Failed to import".tl);
                     return;
                   }
@@ -85,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(
@@ -114,7 +112,9 @@ void addFavorite(Comic comic) {
                       name: comic.title,
                       coverPath: comic.cover,
                       author: comic.subtitle ?? '',
-                      type: ComicType((comic.sourceKey == 'local' ? 0 : comic.sourceKey.hashCode)),
+                      type: ComicType((comic.sourceKey == 'local'
+                          ? 0
+                          : comic.sourceKey.hashCode)),
                       tags: comic.tags ?? [],
                     ),
                   );
@@ -129,3 +129,337 @@ void addFavorite(Comic comic) {
     },
   );
 }
+
+Future<List<FavoriteItem>> updateComicsInfo(String folder) async {
+  var comics = LocalFavoritesManager().getAllComics(folder);
+
+  Future<void> updateSingleComic(int index) async {
+    int retry = 3;
+
+    while (true) {
+      try {
+        var c = comics[index];
+        var comicSource = c.type.comicSource;
+        if (comicSource == null) return;
+
+        var newInfo = (await comicSource.loadComicInfo!(c.id)).data;
+
+        comics[index] = FavoriteItem(
+          id: c.id,
+          name: newInfo.title,
+          coverPath: newInfo.cover,
+          author: newInfo.subTitle ??
+              newInfo.tags['author']?.firstOrNull ??
+              c.author,
+          type: c.type,
+          tags: c.tags,
+        );
+
+        LocalFavoritesManager().updateInfo(folder, comics[index]);
+        return;
+      } catch (e) {
+        retry--;
+        if (retry == 0) {
+          rethrow;
+        }
+        continue;
+      }
+    }
+  }
+
+  var finished = ValueNotifier(0);
+
+  var errors = 0;
+
+  var index = 0;
+
+  bool isCanceled = false;
+
+  showDialog(
+    context: App.rootContext,
+    builder: (context) {
+      return ValueListenableBuilder(
+        valueListenable: finished,
+        builder: (context, value, child) {
+          var isFinished = value == comics.length;
+          return ContentDialog(
+            title: isFinished ? "Finished".tl : "Updating".tl,
+            content: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const SizedBox(height: 4),
+                LinearProgressIndicator(
+                  value: value / comics.length,
+                ),
+                const SizedBox(height: 4),
+                Text("$value/${comics.length}"),
+                const SizedBox(height: 4),
+                if (errors > 0) Text("Errors: $errors"),
+              ],
+            ).paddingHorizontal(16),
+            actions: [
+              Button.filled(
+                color: isFinished ? null : context.colorScheme.error,
+                onPressed: () {
+                  isCanceled = true;
+                  context.pop();
+                },
+                child: isFinished ? Text("OK".tl) : Text("Cancel".tl),
+              ),
+            ],
+          );
+        },
+      );
+    },
+  ).then((_) {
+    isCanceled = true;
+  });
+
+  while (index < comics.length) {
+    var futures = <Future>[];
+    const maxConcurrency = 4;
+
+    if (isCanceled) {
+      return comics;
+    }
+
+    for (var i = 0; i < maxConcurrency; i++) {
+      if (index + i >= comics.length) break;
+      futures.add(updateSingleComic(index + i).then((v) {
+        finished.value++;
+      }, onError: (_) {
+        errors++;
+        finished.value++;
+      }));
+    }
+
+    await Future.wait(futures);
+    index += maxConcurrency;
+  }
+
+  return comics;
+}
+
+Future<void> sortFolders() async {
+  var folders = LocalFavoritesManager().folderNames;
+
+  await showPopUpWidget(
+    App.rootContext,
+    StatefulBuilder(builder: (context, setState) {
+      return PopUpWidgetScaffold(
+        title: "Sort".tl,
+        tailing: [
+          Tooltip(
+            message: "Help".tl,
+            child: IconButton(
+              icon: const Icon(Icons.help_outline),
+              onPressed: () {
+                showInfoDialog(
+                  context: context,
+                  title: "Reorder".tl,
+                  content: "Long press and drag to reorder.".tl,
+                );
+              },
+            ),
+          )
+        ],
+        body: ReorderableListView.builder(
+          onReorder: (oldIndex, newIndex) {
+            if (oldIndex < newIndex) {
+              newIndex--;
+            }
+            setState(() {
+              var item = folders.removeAt(oldIndex);
+              folders.insert(newIndex, item);
+            });
+          },
+          itemCount: folders.length,
+          itemBuilder: (context, index) {
+            return ListTile(
+              key: ValueKey(folders[index]),
+              title: Text(folders[index]),
+            );
+          },
+        ),
+      );
+    }),
+  );
+
+  LocalFavoritesManager().updateOrder(folders);
+}
+
+Future<void> importNetworkFolder(
+  String source,
+  String? folder,
+  String? folderID,
+) async {
+  var comicSource = ComicSource.find(source);
+  if (comicSource == null) {
+    return;
+  }
+  if(folder != null && folder.isEmpty) {
+    folder = null;
+  }
+  var resultName = folder ?? comicSource.name;
+  var exists = LocalFavoritesManager().existsFolder(resultName);
+  if (exists) {
+    if (!LocalFavoritesManager()
+        .isLinkedToNetworkFolder(resultName, source, folderID ?? "")) {
+      App.rootContext.showMessage(message: "Folder already exists".tl);
+      return;
+    }
+  }
+  if(!exists) {
+    LocalFavoritesManager().createFolder(resultName);
+    LocalFavoritesManager().linkFolderToNetwork(
+      resultName,
+      source,
+      folderID ?? "",
+    );
+  }
+
+  var current = 0;
+  var isFinished = false;
+  String? next;
+
+  Future<void> fetchNext() async {
+    var retry = 3;
+
+    while (true) {
+      try {
+        if (comicSource.favoriteData?.loadComic != null) {
+          next ??= '1';
+          var page = int.parse(next!);
+          var res = await comicSource.favoriteData!.loadComic!(page, folderID);
+          var count = 0;
+          for (var c in res.data) {
+            var result = LocalFavoritesManager().addComic(
+              resultName,
+              FavoriteItem(
+                id: c.id,
+                name: c.title,
+                coverPath: c.cover,
+                type: ComicType(source.hashCode),
+                author: c.subtitle ?? '',
+                tags: c.tags ?? [],
+              ),
+            );
+            if (result) {
+              count++;
+            }
+          }
+          current += count;
+          if (res.data.isEmpty || res.subData == page) {
+            isFinished = true;
+            next = null;
+          } else {
+            next = (page + 1).toString();
+          }
+        } else if (comicSource.favoriteData?.loadNext != null) {
+          var res = await comicSource.favoriteData!.loadNext!(next, folderID);
+          var count = 0;
+          for (var c in res.data) {
+            var result = LocalFavoritesManager().addComic(
+              resultName,
+              FavoriteItem(
+                id: c.id,
+                name: c.title,
+                coverPath: c.cover,
+                type: ComicType(source.hashCode),
+                author: c.subtitle ?? '',
+                tags: c.tags ?? [],
+              ),
+            );
+            if (result) {
+              count++;
+            }
+          }
+          current += count;
+          if (res.data.isEmpty || res.subData == null) {
+            isFinished = true;
+            next = null;
+          } else {
+            next = res.subData;
+          }
+        } else {
+          throw "Unsupported source";
+        }
+        return;
+      } catch (e) {
+        retry--;
+        if (retry == 0) {
+          rethrow;
+        }
+        continue;
+      }
+    }
+  }
+
+  bool isCanceled = false;
+  String? errorMsg;
+  bool isErrored() => errorMsg != null;
+
+  void Function()? updateDialog;
+
+  showDialog(
+    context: App.rootContext,
+    builder: (context) {
+      return StatefulBuilder(
+        builder: (context, setState) {
+          updateDialog = () => setState(() {});
+          return ContentDialog(
+            title: isFinished
+                ? "Finished".tl
+                : isErrored()
+                    ? "Error".tl
+                    : "Importing".tl,
+            content: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const SizedBox(height: 4),
+                LinearProgressIndicator(
+                  value: isFinished ? 1 : null,
+                ),
+                const SizedBox(height: 4),
+                Text("Imported @c comics".tlParams({
+                  "c": current,
+                })),
+                const SizedBox(height: 4),
+                if (isErrored()) Text("Error: $errorMsg"),
+              ],
+            ).paddingHorizontal(16),
+            actions: [
+              Button.filled(
+                color: (isFinished || isErrored())
+                    ? null
+                    : context.colorScheme.error,
+                onPressed: () {
+                  isCanceled = true;
+                  context.pop();
+                },
+                child: (isFinished || isErrored())
+                    ? Text("OK".tl)
+                    : Text("Cancel".tl),
+              ),
+            ],
+          );
+        },
+      );
+    },
+  ).then((_) {
+    isCanceled = true;
+  });
+
+  while (!isFinished && !isCanceled) {
+    try {
+      await fetchNext();
+      updateDialog?.call();
+    } catch (e) {
+      errorMsg = e.toString();
+      updateDialog?.call();
+      break;
+    }
+  }
+}

lib/pages/favorites/favorites_page.dart

@@ -8,8 +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';
 
@@ -17,6 +21,7 @@ part 'favorite_actions.dart';
 part 'side_bar.dart';
 part 'local_favorites_page.dart';
 part 'network_favorites_page.dart';
+part 'local_search_page.dart';
 
 const _kLeftBarWidth = 256.0;
 
@@ -89,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,
@@ -147,13 +152,14 @@ class _FavoritesPageState extends State<FavoritesPage>  {
       );
     }
     if (!isNetwork) {
-      return _LocalFavoritesPage(folder: folder!, key: Key(folder!));
+      return _LocalFavoritesPage(folder: folder!, key: PageStorageKey(folder!));
     } else {
       var favoriteData = getFavoriteDataOrNull(folder!);
       if (favoriteData == null) {
-        return const Center(child: Text("Unknown source"));
+        folder = null;
+        return buildBody();
       } else {
-        return NetworkFavoritePage(favoriteData, key: Key(folder!));
+        return NetworkFavoritePage(favoriteData, key: PageStorageKey(folder!));
       }
     }
   }

lib/pages/favorites/local_favorites_page.dart

@@ -14,147 +14,616 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
 
   late List<FavoriteItem> comics;
 
+  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() {
-    print(comics.length);
-    setState(() {
-      comics = LocalFavoritesManager().getAllComics(widget.folder);
-      print(comics.length);
-    });
+    if (keyword.isEmpty) {
+      setState(() {
+        comics = LocalFavoritesManager().getAllComics(widget.folder);
+      });
+    } else {
+      setState(() {
+        comics = LocalFavoritesManager().searchInFolder(widget.folder, keyword);
+      });
+    }
   }
 
   @override
   void initState() {
     favPage = context.findAncestorStateOfType<_FavoritesPageState>()!;
     comics = LocalFavoritesManager().getAllComics(widget.folder);
+    var (a, b) = LocalFavoritesManager().findLinked(widget.folder);
+    networkSource = a;
+    networkFolder = b;
     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: [
-            MenuButton(
-              entries: [
+    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: "Search".tl,
+                child: IconButton(
+                  icon: const Icon(Icons.search),
+                  onPressed: () {
+                    setState(() {
+                      searchMode = true;
+                    });
+                  },
+                ),
+              ),
+              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,
+                              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.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();
+                          },
+                        );
+                      }),
+                ],
+              ),
+            ],
+          )
+        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) {
-                          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",
-                      );
-                    }),
-              ],
+                  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();
   }
 }
 
@@ -176,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
@@ -194,19 +670,24 @@ 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;
         return ComicTile(
           key: Key(e.hashCode.toString()),
+          enableLongPressed: false,
           comic: Comic(
             e.name,
             e.coverPath,
             e.id,
             e.author,
             e.tags,
-            "${e.time} | ${comicSource?.name ?? "Unknown"}",
-            comicSource?.key ?? "Unknown",
+            type == 'detailed'
+                ? "${e.time} | ${comicSource?.name ?? "Unknown"}"
+                : "${e.type.comicSource?.name ?? "Unknown"} | ${e.time}",
+            comicSource?.key ??
+                (e.type == ComicType.local ? "local" : "Unknown"),
             null,
             null,
           ),
@@ -229,7 +710,7 @@ class _ReorderComicsPageState extends State<_ReorderComicsPage> {
           ),
         ],
       ),
-      body: ReorderableBuilder(
+      body: ReorderableBuilder<FavoriteItem>(
         key: reorderWidgetKey,
         scrollController: _scrollController,
         longPressDelay: App.isDesktop
@@ -238,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/local_search_page.dart

@@ -0,0 +1,41 @@
+part of 'favorites_page.dart';
+
+class LocalSearchPage extends StatefulWidget {
+  const LocalSearchPage({super.key});
+
+  @override
+  State<LocalSearchPage> createState() => _LocalSearchPageState();
+}
+
+class _LocalSearchPageState extends State<LocalSearchPage> {
+  String keyword = '';
+
+  var comics = <FavoriteItemWithFolderInfo>[];
+
+  late final SearchBarController controller;
+
+  @override
+  void initState() {
+    super.initState();
+    controller = SearchBarController(onSearch: (text) {
+      keyword = text;
+      comics = LocalFavoritesManager().search(keyword);
+      setState(() {});
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: SmoothCustomScrollView(slivers: [
+        SliverSearchBar(controller: controller),
+        SliverGridComics(
+          comics: comics,
+          badgeBuilder: (c) {
+            return (c as FavoriteItemWithFolderInfo).folder;
+          },
+        ),
+      ]),
+    );
+  }
+}

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
@@ -108,6 +111,17 @@ class _NormalFavoritePageState extends State<_NormalFavoritePage> {
           onTap: context.width < _kTwoPanelChangeWidth ? showFolders : null,
           child: Text(widget.data.title),
         ),
+        actions: [
+          MenuButton(entries: [
+            MenuEntry(
+              icon: Icons.sync,
+              text: "Convert to local".tl,
+              onClick: () {
+                importNetworkFolder(widget.data.key, null, null);
+              },
+            )
+          ]),
+        ],
       ),
       errorLeading: Appbar(
         leading: Tooltip(
@@ -200,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
@@ -413,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(
@@ -533,6 +550,17 @@ class _FavoriteFolder extends StatelessWidget {
       key: comicListKey,
       leadingSliver: SliverAppbar(
         title: Text(title),
+        actions: [
+          MenuButton(entries: [
+            MenuEntry(
+              icon: Icons.sync,
+              text: "Convert to local".tl,
+              onClick: () {
+                importNetworkFolder(data.key, title, folderID);
+              },
+            )
+          ]),
+        ],
       ),
       errorLeading: Appbar(
         title: Text(title),

lib/pages/favorites/side_bar.dart

@@ -80,7 +80,6 @@ class _LeftBarState extends State<_LeftBar> implements FolderList {
                     padding: const EdgeInsets.symmetric(vertical: 8),
                     child: Row(
                       children: [
-                        const SizedBox(width: 16),
                         Icon(
                           Icons.local_activity,
                           color: context.colorScheme.secondary,
@@ -88,20 +87,41 @@ class _LeftBarState extends State<_LeftBar> implements FolderList {
                         const SizedBox(width: 12),
                         Text("Local".tl),
                         const Spacer(),
-                        IconButton(
-                          icon: const Icon(Icons.add),
-                          color: context.colorScheme.primary,
-                          onPressed: () {
-                            newFolder().then((value) {
-                              setState(() {
-                                folders = LocalFavoritesManager().folderNames;
-                              });
-                            });
-                          },
+                        MenuButton(
+                          entries: [
+                            MenuEntry(
+                              icon: Icons.search,
+                              text: 'Search'.tl,
+                              onClick: () {
+                                context.to(() => const LocalSearchPage());
+                              },
+                            ),
+                            MenuEntry(
+                              icon: Icons.add,
+                              text: 'Create Folder'.tl,
+                              onClick: () {
+                                newFolder().then((value) {
+                                  setState(() {
+                                    folders = LocalFavoritesManager().folderNames;
+                                  });
+                                });
+                              },
+                            ),
+                            MenuEntry(
+                              icon: Icons.reorder,
+                              text: 'Sort'.tl,
+                              onClick: () {
+                                sortFolders().then((value) {
+                                  setState(() {
+                                    folders = LocalFavoritesManager().folderNames;
+                                  });
+                                });
+                              },
+                            ),
+                          ],
                         ),
-                        const SizedBox(width: 16),
                       ],
-                    ),
+                    ).paddingHorizontal(16),
                   );
                 }
                 index--;
@@ -112,6 +132,7 @@ class _LeftBarState extends State<_LeftBar> implements FolderList {
                 if (index == 0) {
                   return Container(
                     padding: const EdgeInsets.symmetric(vertical: 12),
+                    margin: const EdgeInsets.only(top: 8),
                     decoration: BoxDecoration(
                       border: Border(
                         top: BorderSide(
@@ -158,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(
@@ -193,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(
@@ -211,13 +232,13 @@ class _LeftBarState extends State<_LeftBar> implements FolderList {
 
   @override
   void update() {
-    if(!mounted) return;
+    if (!mounted) return;
     setState(() {});
   }
 
   @override
   void updateFolders() {
-    if(!mounted) return;
+    if (!mounted) return;
     setState(() {
       folders = LocalFavoritesManager().folderNames;
       networkFolders = ComicSource.all()

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,24 +1,22 @@
-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/ext.dart';
-import 'package:venera/utils/io.dart';
+import 'package:venera/utils/data_sync.dart';
+import 'package:venera/utils/import_comic.dart';
 import 'package:venera/utils/translations.dart';
 
 import 'local_comics_page.dart';
@@ -32,6 +30,7 @@ class HomePage extends StatelessWidget {
       slivers: [
         SliverPadding(padding: EdgeInsets.only(top: context.padding.top)),
         const _SearchBar(),
+        const _SyncDataWidget(),
         const _History(),
         const _Local(),
         const _ComicSourceWidget(),
@@ -54,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),
@@ -77,6 +76,113 @@ class _SearchBar extends StatelessWidget {
   }
 }
 
+class _SyncDataWidget extends StatefulWidget {
+  const _SyncDataWidget();
+
+  @override
+  State<_SyncDataWidget> createState() => _SyncDataWidgetState();
+}
+
+class _SyncDataWidgetState extends State<_SyncDataWidget> with WidgetsBindingObserver {
+  @override
+  void initState() {
+    super.initState();
+    DataSync().addListener(update);
+    WidgetsBinding.instance.addObserver(this);
+    lastCheck = DateTime.now();
+  }
+
+  void update() {
+    if(mounted) {
+      setState(() {});
+    }
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+    DataSync().removeListener(update);
+    WidgetsBinding.instance.removeObserver(this);
+  }
+
+  late DateTime lastCheck;
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    super.didChangeAppLifecycleState(state);
+    if(state == AppLifecycleState.resumed) {
+      if(DateTime.now().difference(lastCheck) > const Duration(minutes: 10)) {
+        lastCheck = DateTime.now();
+        DataSync().downloadData();
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    Widget child;
+    if(!DataSync().isEnabled) {
+      child = const SliverPadding(padding: EdgeInsets.zero);
+    } else if (DataSync().isUploading || DataSync().isDownloading) {
+      child = SliverToBoxAdapter(
+        child: Container(
+          margin: const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
+          decoration: BoxDecoration(
+            border: Border.all(
+              color: Theme.of(context).colorScheme.primary,
+            ),
+            borderRadius: BorderRadius.circular(8),
+          ),
+          child: ListTile(
+            leading: const Icon(Icons.sync),
+            title: Text('Syncing Data'.tl),
+            trailing: const CircularProgressIndicator(strokeWidth: 2)
+                .fixWidth(18)
+                .fixHeight(18),
+          ),
+        ),
+      );
+    } else {
+      child = SliverToBoxAdapter(
+        child: Container(
+          margin: const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
+          decoration: BoxDecoration(
+            border: Border.all(
+              color: Theme.of(context).colorScheme.outlineVariant,
+            ),
+            borderRadius: BorderRadius.circular(8),
+          ),
+          child: ListTile(
+            leading: const Icon(Icons.sync),
+            title: Text('Sync Data'.tl),
+            trailing: Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                IconButton(
+                  icon: const Icon(Icons.cloud_upload_outlined),
+                  onPressed: () async {
+                    DataSync().uploadData();
+                  }
+                ),
+                IconButton(
+                  icon: const Icon(Icons.cloud_download_outlined),
+                  onPressed: () async {
+                    DataSync().downloadData();
+                  }
+                ),
+              ],
+            ),
+          ),
+        ),
+      );
+    }
+    return SliverAnimatedPaintExtent(
+      duration: const Duration(milliseconds: 200),
+      child: child,
+    );
+  }
+}
+
 class _History extends StatefulWidget {
   const _History();
 
@@ -158,20 +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,
-                      );
-                      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(
@@ -194,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,
@@ -311,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,
@@ -389,6 +481,10 @@ class _ImportComicsWidgetState extends State<_ImportComicsWidget> {
 
   String? selectedFolder;
 
+  bool copyToLocalFolder = true;
+
+  bool cancelled = false;
+
   @override
   void dispose() {
     loading = false;
@@ -400,8 +496,15 @@ 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 = [
+      "Single Comic".tl,
+      "Multiple Comics".tl,
+      "A cbz file".tl,
+      "EhViewer downloads".tl
+    ];
 
     return ContentDialog(
       dismissible: !loading,
@@ -415,40 +518,23 @@ class _ImportComicsWidgetState extends State<_ImportComicsWidget> {
               ),
             )
           : Column(
-              key: key,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                const SizedBox(width: 600),
-                RadioListTile(
-                  title: Text("Single Comic".tl),
-                  value: 0,
+            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;
                     });
                   },
-                ),
-                RadioListTile(
-                  title: Text("Multiple Comics".tl),
-                  value: 1,
-                  groupValue: type,
-                  onChanged: (value) {
-                    setState(() {
-                      type = value as int;
-                    });
-                  },
-                ),
-                RadioListTile(
-                  title: Text("A cbz file".tl),
-                  value: 2,
-                  groupValue: type,
-                  onChanged: (value) {
-                    setState(() {
-                      type = value as int;
-                    });
-                  },
-                ),
+                );
+              }),
+              if(type != 3)
                 ListTile(
                   title: Text("Add to favorites".tl),
                   trailing: Select(
@@ -462,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(
@@ -482,7 +578,7 @@ class _ImportComicsWidgetState extends State<_ImportComicsWidget> {
           onPressed: () {
             showDialog(
               context: context,
-              barrierColor: Colors.transparent,
+              barrierColor: Colors.black.toOpacity(0.2),
               builder: (context) {
                 var help = '';
                 help +=
@@ -493,8 +589,9 @@ class _ImportComicsWidgetState extends State<_ImportComicsWidget> {
                 help +=
                     '${"If the directory contains a file named 'cover.*', it will be used as the cover image. Otherwise the first image will be used.".tl}\n\n';
                 help +=
-                    "The directory name will be used as the comic title. And the name of chapter directories will be used as the chapter titles."
+                    "The directory name will be used as the comic title. And the name of chapter directories will be used as the chapter titles.\n"
                         .tl;
+                help +="If you import an EhViewer's database, program will automatically create folders according to the download label in that database.".tl;
                 return ContentDialog(
                   title: "Help".tl,
                   content: Text(help).paddingHorizontal(16),
@@ -521,190 +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;
-    }
     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(),
-    );
   }
 }
 
@@ -820,6 +755,7 @@ class _AccountsWidgetState extends State<_AccountsWidget> {
 
   void onComicSourceChange() {
     setState(() {
+      accounts.clear();
       for (var c in ComicSource.all()) {
         if (c.isLogged) {
           accounts.add(c.name);

lib/pages/local_comics_page.dart

@@ -1,10 +1,15 @@
 import 'package:flutter/material.dart';
 import 'package:venera/components/components.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/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 {
@@ -17,15 +22,33 @@ class LocalComicsPage extends StatefulWidget {
 class _LocalComicsPageState extends State<LocalComicsPage> {
   late List<LocalComic> comics;
 
+  late LocalSortType sortType;
+
+  String keyword = "";
+
+  bool searchMode = false;
+
+  bool multiSelectMode = false;
+
+  Map<Comic, bool> selectedComics = {};
+
   void update() {
-    setState(() {
-      comics = LocalManager().getComics();
-    });
+    if (keyword.isEmpty) {
+      setState(() {
+        comics = LocalManager().getComics(sortType);
+      });
+    } else {
+      setState(() {
+        comics = LocalManager().search(keyword);
+      });
+    }
   }
 
   @override
   void initState() {
-    comics = LocalManager().getComics();
+    var sort = appdata.implicitData["local_sort"] ?? "name";
+    sortType = LocalSortType.fromString(sort);
+    comics = LocalManager().getComics(sortType);
     LocalManager().addListener(update);
     super.initState();
   }
@@ -36,37 +59,281 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
     super.dispose();
   }
 
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: SmoothCustomScrollView(
-        slivers: [
-          SliverAppbar(
-            title: Text("Local".tl),
-            actions: [
-              Tooltip(
-                message: "Downloading".tl,
-                child: IconButton(
-                  icon: const Icon(Icons.download),
-                  onPressed: () {
-                    showPopUpWidget(context, const DownloadingPage());
+  void sort() {
+    showDialog(
+      context: context,
+      builder: (context) {
+        return StatefulBuilder(builder: (context, setState) {
+          return ContentDialog(
+            title: "Sort".tl,
+            content: Column(
+              children: [
+                RadioListTile<LocalSortType>(
+                  title: Text("Name".tl),
+                  value: LocalSortType.name,
+                  groupValue: sortType,
+                  onChanged: (v) {
+                    setState(() {
+                      sortType = v!;
+                    });
                   },
                 ),
-              )
+                RadioListTile<LocalSortType>(
+                  title: Text("Date".tl),
+                  value: LocalSortType.timeAsc,
+                  groupValue: sortType,
+                  onChanged: (v) {
+                    setState(() {
+                      sortType = v!;
+                    });
+                  },
+                ),
+                RadioListTile<LocalSortType>(
+                  title: Text("Date Desc".tl),
+                  value: LocalSortType.timeDesc,
+                  groupValue: sortType,
+                  onChanged: (v) {
+                    setState(() {
+                      sortType = v!;
+                    });
+                  },
+                ),
+              ],
+            ),
+            actions: [
+              FilledButton(
+                onPressed: () {
+                  appdata.implicitData["local_sort"] = sortType.value;
+                  appdata.writeImplicitData();
+                  Navigator.pop(context);
+                  update();
+                },
+                child: Text("Confirm".tl),
+              ),
             ],
-          ),
+          );
+        });
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    void selectAll() {
+      setState(() {
+        selectedComics = comics.asMap().map((k, v) => MapEntry(v, true));
+      });
+    }
+
+    void deSelect() {
+      setState(() {
+        selectedComics.clear();
+      });
+    }
+
+    void invertSelection() {
+      setState(() {
+        comics.asMap().forEach((k, v) {
+          selectedComics[v] = !selectedComics.putIfAbsent(v, () => false);
+        });
+        selectedComics.removeWhere((k, v) => !v);
+      });
+    }
+
+    void selectRange() {
+      setState(() {
+        List<int> l = [];
+        selectedComics.forEach((k, v) {
+          l.add(comics.indexOf(k as LocalComic));
+        });
+        if (l.isEmpty) {
+          return;
+        }
+        l.sort();
+        int start = l.first;
+        int end = l.last;
+        selectedComics.clear();
+        selectedComics.addEntries(List.generate(end - start + 1, (i) {
+          return MapEntry(comics[start + i], true);
+        }));
+      });
+    }
+
+    List<Widget> selectActions = [
+      IconButton(
+          icon: const Icon(Icons.select_all),
+          tooltip: "Select All".tl,
+          onPressed: selectAll),
+      IconButton(
+          icon: const Icon(Icons.deselect),
+          tooltip: "Deselect".tl,
+          onPressed: deSelect),
+      IconButton(
+          icon: const Icon(Icons.flip),
+          tooltip: "Invert Selection".tl,
+          onPressed: invertSelection),
+      IconButton(
+          icon: const Icon(Icons.border_horizontal_outlined),
+          tooltip: "Select in range".tl,
+          onPressed: selectRange),
+    ];
+
+    var body = Scaffold(
+      body: SmoothCustomScrollView(
+        slivers: [
+          if (!searchMode && !multiSelectMode)
+            SliverAppbar(
+              title: Text("Local".tl),
+              actions: [
+                Tooltip(
+                  message: "Search".tl,
+                  child: IconButton(
+                    icon: const Icon(Icons.search),
+                    onPressed: () {
+                      setState(() {
+                        searchMode = true;
+                      });
+                    },
+                  ),
+                ),
+                Tooltip(
+                  message: "Sort".tl,
+                  child: IconButton(
+                    icon: const Icon(Icons.sort),
+                    onPressed: sort,
+                  ),
+                ),
+                Tooltip(
+                  message: "Downloading".tl,
+                  child: IconButton(
+                    icon: const Icon(Icons.download),
+                    onPressed: () {
+                      showPopUpWidget(context, const DownloadingPage());
+                    },
+                  ),
+                ),
+                Tooltip(
+                  message: multiSelectMode
+                      ? "Exit Multi-Select".tl
+                      : "Multi-Select".tl,
+                  child: IconButton(
+                    icon: const Icon(Icons.checklist),
+                    onPressed: () {
+                      setState(() {
+                        multiSelectMode = !multiSelectMode;
+                      });
+                    },
+                  ),
+                ),
+              ],
+            )
+          else if (multiSelectMode)
+            SliverAppbar(
+              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: selectActions,
+            )
+          else if (searchMode)
+            SliverAppbar(
+              leading: Tooltip(
+                message: "Cancel".tl,
+                child: IconButton(
+                  icon: const Icon(Icons.close),
+                  onPressed: () {
+                    setState(() {
+                      searchMode = false;
+                      keyword = "";
+                      update();
+                    });
+                  },
+                ),
+              ),
+              title: TextField(
+                autofocus: true,
+                decoration: InputDecoration(
+                  hintText: "Search".tl,
+                  border: InputBorder.none,
+                ),
+                onChanged: (v) {
+                  keyword = v;
+                  update();
+                },
+              ),
+            ),
           SliverGridComics(
             comics: comics,
-            onTap: (c) {
-              (c as LocalComic).read();
-            },
+            selections: selectedComics,
+            onTap: multiSelectMode
+                ? (c) {
+                    setState(() {
+                      if (selectedComics.containsKey(c as LocalComic)) {
+                        selectedComics.remove(c);
+                      } else {
+                        selectedComics[c] = true;
+                      }
+                    });
+                  }
+                : (c) {
+                    (c as LocalComic).read();
+                  },
             menuBuilder: (c) {
               return [
                 MenuEntry(
                     icon: Icons.delete,
                     text: "Delete".tl,
                     onClick: () {
-                      LocalManager().deleteComic(c as LocalComic);
+                      showDialog(
+                          context: context,
+                          builder: (context) {
+                            bool removeComicFile = true;
+                            return StatefulBuilder(builder: (context, state) {
+                              return ContentDialog(
+                                title: "Delete".tl,
+                                content: CheckboxListTile(
+                                  title: Text("Also remove files on disk".tl),
+                                  value: removeComicFile,
+                                  onChanged: (v) {
+                                    state(() {
+                                      removeComicFile = !removeComicFile;
+                                    });
+                                  },
+                                ),
+                                actions: [
+                                  FilledButton(
+                                    onPressed: () {
+                                      context.pop();
+                                      if (multiSelectMode) {
+                                        for (var comic in selectedComics.keys) {
+                                          LocalManager().deleteComic(
+                                              comic as LocalComic,
+                                              removeComicFile);
+                                        }
+                                        setState(() {
+                                          selectedComics.clear();
+                                        });
+                                      } else {
+                                        LocalManager().deleteComic(
+                                            c as LocalComic, removeComicFile);
+                                      }
+                                    },
+                                    child: Text("Confirm".tl),
+                                  ),
+                                ],
+                              );
+                            });
+                          });
                     }),
                 MenuEntry(
                     icon: Icons.outbox_outlined,
@@ -77,20 +344,104 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
                         allowCancel: false,
                       );
                       try {
-                        var file = await CBZ.export(c as LocalComic);
-                        await saveFile(filename: file.name, file: file);
-                        await file.delete();
-                      }
-                      catch (e) {
+                        if (multiSelectMode) {
+                          for (var comic in selectedComics.keys) {
+                            var file = await CBZ.export(comic as LocalComic);
+                            await saveFile(filename: file.name, file: file);
+                            await file.delete();
+                          }
+                          setState(() {
+                            selectedComics.clear();
+                          });
+                        } else {
+                          var file = await CBZ.export(c as LocalComic);
+                          await saveFile(filename: file.name, file: file);
+                          await file.delete();
+                        }
+                      } catch (e) {
                         context.showMessage(message: e.toString());
                       }
                       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();
+                      }
+                    },
+                  )
               ];
             },
           ),
         ],
       ),
     );
+
+    return PopScope(
+      canPop: !multiSelectMode && !searchMode,
+      onPopInvokedWithResult: (didPop, result) {
+        if (multiSelectMode) {
+          setState(() {
+            multiSelectMode = false;
+            selectedComics.clear();
+          });
+        } else if (searchMode) {
+          setState(() {
+            searchMode = false;
+            keyword = "";
+            update();
+          });
+        }
+      },
+      child: body,
+    );
   }
 }

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;
@@ -78,20 +105,25 @@ class _MainPageState extends State<MainPage> {
           activeIcon: Icons.category,
         ),
       ],
+      onPageChanged: (i) {
+        setState(() {
+          index = i;
+        });
+      },
       paneActions: [
         if(index != 0)
           PaneActionEntry(
             icon: Icons.search,
             label: "Search".tl,
             onTap: () {
-              to(() => const SearchPage());
+              to(() => const SearchPage(), preventDuplicate: true);
             },
           ),
         PaneActionEntry(
           icon: Icons.settings,
           label: "Settings".tl,
           onTap: () {
-            to(() => const SettingsPage());
+            to(() => const SettingsPage(), preventDuplicate: true);
           },
         )
       ],

lib/pages/reader/gesture.dart

@@ -22,6 +22,8 @@ class _ReaderGestureDetectorState extends State<_ReaderGestureDetector> {
 
   _DragListener? dragListener;
 
+  int fingers = 0;
+
   @override
   void initState() {
     _tapGestureRecognizer = TapGestureRecognizer()
@@ -38,6 +40,7 @@ class _ReaderGestureDetectorState extends State<_ReaderGestureDetector> {
     return Listener(
       behavior: HitTestBehavior.translucent,
       onPointerDown: (event) {
+        fingers++;
         _lastTapPointer = event.pointer;
         _lastTapMoveDistance = Offset.zero;
         _tapGestureRecognizer.addPointer(event);
@@ -46,7 +49,7 @@ class _ReaderGestureDetectorState extends State<_ReaderGestureDetector> {
           _dragInProgress = false;
         }
         Future.delayed(_kLongPressMinTime, () {
-          if (_lastTapPointer == event.pointer) {
+          if (_lastTapPointer == event.pointer && fingers == 1) {
             if(_lastTapMoveDistance!.distanceSquared < 20.0 * 20.0) {
               onLongPressedDown(event.position);
               _longPressInProgress = true;
@@ -67,6 +70,19 @@ class _ReaderGestureDetectorState extends State<_ReaderGestureDetector> {
         }
       },
       onPointerUp: (event) {
+        fingers--;
+        if (_longPressInProgress) {
+          onLongPressedUp(event.position);
+        }
+        if(_dragInProgress) {
+          dragListener?.onEnd?.call();
+          _dragInProgress = false;
+        }
+        _lastTapPointer = null;
+        _lastTapMoveDistance = null;
+      },
+      onPointerCancel: (event) {
+        fingers--;
         if (_longPressInProgress) {
           onLongPressedUp(event.position);
         }
@@ -87,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()) {
@@ -249,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,6 +269,9 @@ class _GalleryModeState extends State<_GalleryMode>
 
   @override
   void handleLongPressDown(Offset location) {
+    if (!appdata.settings['enableLongPressToZoom']) {
+      return;
+    }
     var photoViewController = photoViewControllers[reader.page]!;
     double target = photoViewController.getInitialScale!.call()! * 1.75;
     var size = MediaQuery.of(context).size;
@@ -234,6 +283,9 @@ class _GalleryModeState extends State<_GalleryMode>
 
   @override
   void handleLongPressUp(Offset location) {
+    if (!appdata.settings['enableLongPressToZoom']) {
+      return;
+    }
     var photoViewController = photoViewControllers[reader.page]!;
     double target = photoViewController.getInitialScale!.call()!;
     photoViewController.animateScale?.call(target);
@@ -465,18 +517,26 @@ class _ContinuousModeState extends State<_ContinuousMode>
       },
       child: widget,
     );
+    var width = MediaQuery.of(context).size.width;
+    var height = MediaQuery.of(context).size.height;
+    if (appdata.settings['limitImageWidth'] &&
+        width / height > 0.7 &&
+        reader.mode == ReaderMode.continuousTopToBottom) {
+      width = height * 0.7;
+    }
 
     return PhotoView.customChild(
       backgroundDecoration: BoxDecoration(
         color: context.colorScheme.surface,
       ),
+      childSize: Size(width, height),
       minScale: 1.0,
       maxScale: 2.5,
       strictScale: true,
       controller: photoViewController,
       child: SizedBox(
-        width: MediaQuery.of(context).size.width,
-        height: MediaQuery.of(context).size.height,
+        width: width,
+        height: height,
         child: widget,
       ),
     );
@@ -509,6 +569,9 @@ class _ContinuousModeState extends State<_ContinuousMode>
 
   @override
   void handleLongPressDown(Offset location) {
+    if (!appdata.settings['enableLongPressToZoom']) {
+      return;
+    }
     double target = photoViewController.getInitialScale!.call()! * 1.75;
     var size = MediaQuery.of(context).size;
     photoViewController.animateScale?.call(
@@ -519,6 +582,9 @@ class _ContinuousModeState extends State<_ContinuousMode>
 
   @override
   void handleLongPressUp(Offset location) {
+    if (!appdata.settings['enableLongPressToZoom']) {
+      return;
+    }
     double target = photoViewController.getInitialScale!.call()!;
     photoViewController.animateScale?.call(target);
   }
@@ -580,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,10 +9,12 @@ 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';
 import 'package:venera/components/components.dart';
+import 'package:venera/components/custom_slider.dart';
 import 'package:venera/foundation/app.dart';
 import 'package:venera/foundation/appdata.dart';
 import 'package:venera/foundation/cache_manager.dart';
@@ -19,11 +22,15 @@ 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';
 import 'package:venera/utils/io.dart';
 import 'package:venera/utils/translations.dart';
+import 'package:venera/utils/volume.dart';
 import 'package:window_manager/window_manager.dart';
+import 'package:battery_plus/battery_plus.dart';
 
 part 'scaffold.dart';
 part 'images.dart';
@@ -55,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;
 
@@ -78,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;
 
@@ -90,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
@@ -97,6 +129,8 @@ class _ReaderState extends State<Reader> with _ReaderLocation, _ReaderWindow {
 
   var focusNode = FocusNode();
 
+  VolumeListener? volumeListener;
+
   @override
   void initState() {
     page = widget.initialPage ?? 1;
@@ -107,19 +141,46 @@ class _ReaderState extends State<Reader> with _ReaderLocation, _ReaderWindow {
       updateHistory();
     });
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
+    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();
     focusNode.dispose();
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+    stopVolumeEvent();
+    Future.microtask(() {
+      DataSync().onDataChanged();
+    });
+    PaintingBinding.instance.imageCache.maximumSizeBytes = 100 << 20;
     super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
+    _checkImagesPerPageChange();
     return KeyboardListener(
       focusNode: focusNode,
       autofocus: true,
@@ -152,6 +213,31 @@ class _ReaderState extends State<Reader> with _ReaderLocation, _ReaderWindow {
       HistoryManager().addHistory(history!);
     }
   }
+
+  void handleVolumeEvent() {
+    if(!App.isAndroid) {
+      // Currently only support Android
+      return;
+    }
+    if(volumeListener != null) {
+      volumeListener?.cancel();
+    }
+    volumeListener = VolumeListener(
+      onDown: () {
+        toNextPage();
+      },
+      onUp: () {
+        toPrevPage();
+      },
+    )..listen();
+  }
+
+  void stopVolumeEvent() {
+    if(volumeListener != null) {
+      volumeListener?.cancel();
+      volumeListener = null;
+    }
+  }
 }
 
 abstract mixin class _ReaderLocation {
@@ -207,7 +293,9 @@ abstract mixin class _ReaderLocation {
   bool toPage(int page) {
     if (_validatePage(page)) {
       if (page == this.page) {
-        return false;
+        if(!(chapter == 1 && page == 1) && !(chapter == maxChapter && page == maxPage)) {
+          return false;
+        }
       }
       this.page = page;
       update();
@@ -287,6 +375,8 @@ enum ReaderMode {
 
   bool get isGallery => key.startsWith('gallery');
 
+  bool get isContinuous => key.startsWith('continuous');
+
   const ReaderMode(this.key);
 
   static ReaderMode fromKey(String key) {

lib/pages/reader/scaffold.dart

@@ -18,6 +18,9 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
 
   bool get isOpen => _isOpen;
 
+  bool get isReversed => context.reader.mode == ReaderMode.galleryRightToLeft ||
+                       context.reader.mode == ReaderMode.continuousRightToLeft;
+
   int showFloatingButtonValue = 0;
 
   var lastValue = 0;
@@ -107,7 +110,7 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
   }
 
   void openOrClose() {
-    if(!_isOpen) {
+    if (!_isOpen) {
       SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
     } else {
       SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
@@ -131,10 +134,11 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
           child: widget.child,
         ),
         buildPageInfoText(),
+        buildStatusInfo(),
         AnimatedPositioned(
           duration: const Duration(milliseconds: 180),
           right: 16,
-          bottom: showFloatingButtonValue == 0 ? -58 : 16,
+          bottom: showFloatingButtonValue == 0 ? -58 : 36,
           child: buildEpChangeButton(),
         ),
         AnimatedPositioned(
@@ -147,7 +151,9 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
         ),
         AnimatedPositioned(
           duration: const Duration(milliseconds: 180),
-          bottom: _isOpen ? 0 : -kBottomBarHeight,
+          bottom: _isOpen
+              ? 0
+              : -(kBottomBarHeight + MediaQuery.of(context).padding.bottom),
           left: 0,
           right: 0,
           child: buildBottom(),
@@ -161,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,
             ),
           ),
@@ -214,34 +220,26 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
             children: [
               const SizedBox(width: 8),
               IconButton.filledTonal(
-                onPressed: () {
-                  if (!context.reader.toPrevChapter()) {
-                    context.reader.toPage(1);
-                  } else {
-                    if(showFloatingButtonValue != 0) {
-                      setState(() {
-                        showFloatingButtonValue = 0;
-                      });
-                    }
-                  }
-                },
+                onPressed: () => !isReversed
+                    ? context.reader.chapter > 1
+                        ? context.reader.toPrevChapter()
+                        : context.reader.toPage(1)
+                    : context.reader.chapter < context.reader.maxChapter
+                        ? context.reader.toNextChapter()
+                        : context.reader.toPage(context.reader.maxPage),
                 icon: const Icon(Icons.first_page),
               ),
               Expanded(
                 child: buildSlider(),
               ),
               IconButton.filledTonal(
-                  onPressed: () {
-                    if (!context.reader.toNextChapter()) {
-                      context.reader.toPage(context.reader.maxPage);
-                    } else {
-                      if(showFloatingButtonValue != 0) {
-                        setState(() {
-                          showFloatingButtonValue = 0;
-                        });
-                      }
-                    }
-                  },
+                onPressed: () => !isReversed
+                    ? context.reader.chapter < context.reader.maxChapter
+                        ? context.reader.toNextChapter()
+                        : context.reader.toPage(context.reader.maxPage)
+                  : context.reader.chapter > 1
+                        ? context.reader.toPrevChapter()
+                        : context.reader.toPage(1),
                   icon: const Icon(Icons.last_page)),
               const SizedBox(
                 width: 8,
@@ -260,7 +258,9 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
                   color: Theme.of(context).colorScheme.tertiaryContainer,
                   borderRadius: BorderRadius.circular(8),
                 ),
-                child: Text(text),
+                child: Center(
+                  child: Text(text),
+                ),
               ),
               const Spacer(),
               if (App.isWindows)
@@ -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,
             ),
           ),
@@ -374,12 +374,13 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
   var sliderFocus = FocusNode();
 
   Widget buildSlider() {
-    return Slider(
+    return CustomSlider(
       focusNode: sliderFocus,
       value: context.reader.page.toDouble(),
       min: 1,
       max:
           context.reader.maxPage.clamp(context.reader.page, 1 << 16).toDouble(),
+      reversed: isReversed,
       divisions: (context.reader.maxPage - 1).clamp(2, 1 << 16),
       onChanged: (i) {
         context.reader.toPage(i.toInt());
@@ -389,7 +390,7 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
 
   Widget buildPageInfoText() {
     var epName = context.reader.widget.chapters?.values
-            .elementAt(context.reader.chapter - 1) ??
+            .elementAtOrNull(context.reader.chapter - 1) ??
         "E${context.reader.chapter}";
     if (epName.length > 8) {
       epName = "${epName.substring(0, 8)}...";
@@ -420,6 +421,24 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
     );
   }
 
+  Widget buildStatusInfo() {
+    if (appdata.settings['enableClockAndBatteryInfoInReader']) {
+      return Positioned(
+        bottom: 13,
+        right: 25,
+        child: Row(
+          children: [
+            _ClockWidget(),
+            const SizedBox(width: 10),
+            _BatteryWidget(),
+          ],
+        ),
+      );
+    } else {
+      return const SizedBox.shrink();
+    }
+  }
+
   void openChapterDrawer() {
     showSideBar(
       context,
@@ -428,8 +447,73 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
     );
   }
 
-  Future<Uint8List> _getCurrentImageData() async {
+  Future<Uint8List?> _getCurrentImageData() async {
     var imageKey = context.reader.images![context.reader.page - 1];
+    var reader = context.reader;
+    if (context.reader.mode.isContinuous) {
+      var continuesState =
+          context.reader._imageViewController as _ContinuousModeState;
+      var imagesOnScreen =
+          continuesState.itemPositionsListener.itemPositions.value;
+      var images = imagesOnScreen
+          .map((e) => context.reader.images![e.index - 1])
+          .toList();
+      String? selected;
+      await showPopUpWidget(
+        context,
+        PopUpWidgetScaffold(
+          title: "Select an image on screen".tl,
+          body: GridView.builder(
+            itemCount: images.length,
+            itemBuilder: (context, index) {
+              ImageProvider image;
+              var imageKey = images[index];
+              if (imageKey.startsWith('file://')) {
+                image = FileImage(File(imageKey.replaceFirst("file://", '')));
+              } else {
+                image = ReaderImageProvider(
+                  imageKey,
+                  reader.type.comicSource!.key,
+                  reader.cid,
+                  reader.eid,
+                );
+              }
+              return InkWell(
+                borderRadius: const BorderRadius.all(Radius.circular(16)),
+                onTap: () {
+                  selected = images[index];
+                  App.rootContext.pop();
+                },
+                child: Container(
+                  decoration: BoxDecoration(
+                    borderRadius: const BorderRadius.all(Radius.circular(16)),
+                    border: Border.all(
+                      color: Theme.of(context).colorScheme.outline,
+                    ),
+                  ),
+                  width: double.infinity,
+                  height: double.infinity,
+                  child: Image(
+                    width: double.infinity,
+                    height: double.infinity,
+                    image: image,
+                  ),
+                ),
+              ).padding(const EdgeInsets.all(8));
+            },
+            gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
+              maxCrossAxisExtent: 200,
+              childAspectRatio: 0.7,
+            ),
+          ),
+        ),
+      );
+      if (selected == null) {
+        return null;
+      } else {
+        imageKey = selected!;
+      }
+    }
     if (imageKey.startsWith("file://")) {
       return await File(imageKey.substring(7)).readAsBytes();
     } else {
@@ -441,6 +525,9 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
 
   void saveCurrentImage() async {
     var data = await _getCurrentImageData();
+    if (data == null) {
+      return;
+    }
     var fileType = detectFileType(data);
     var filename = "${context.reader.page}${fileType.ext}";
     saveFile(data: data, filename: filename);
@@ -448,6 +535,9 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
 
   void share() async {
     var data = await _getCurrentImageData();
+    if (data == null) {
+      return;
+    }
     var fileType = detectFileType(data);
     var filename = "${context.reader.page}${fileType.ext}";
     Share.shareFile(
@@ -466,6 +556,13 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
             context.reader.mode = ReaderMode.fromKey(appdata.settings[key]);
             App.rootContext.pop();
           }
+          if (key == "enableTurnPageByVolumeKey") {
+            if (appdata.settings[key]) {
+              context.reader.handleVolumeEvent();
+            } else {
+              context.reader.stopVolumeEvent();
+            }
+          }
           context.reader.update();
         },
       ),
@@ -513,12 +610,12 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
                       color: Colors.transparent,
                       child: InkWell(
                         onTap: () {
-                          setFloatingButton(0);
                           if (showFloatingButtonValue == 1) {
                             context.reader.toNextChapter();
-                          } else {
+                          } else if (showFloatingButtonValue == -1) {
                             context.reader.toPrevChapter();
                           }
+                          setFloatingButton(0);
                         },
                         borderRadius: BorderRadius.circular(16),
                         child: Center(
@@ -539,12 +636,12 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
                     bottom: 0,
                     left: 0,
                     right: 0,
-                    height: value.clamp(0, 58*3) / 3,
+                    height: value.clamp(0, 58 * 3) / 3,
                     child: ColoredBox(
                       color: Theme.of(context)
                           .colorScheme
                           .surfaceTint
-                          .withOpacity(0.2),
+                          .toOpacity(0.2),
                       child: const SizedBox.expand(),
                     ),
                   ),
@@ -558,6 +655,188 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
   }
 }
 
+class _BatteryWidget extends StatefulWidget {
+  @override
+  _BatteryWidgetState createState() => _BatteryWidgetState();
+}
+
+class _BatteryWidgetState extends State<_BatteryWidget> {
+  late Battery _battery;
+  late int _batteryLevel = 100;
+  Timer? _timer;
+  bool _hasBattery = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _battery = Battery();
+    _checkBatteryAvailability();
+  }
+
+  void _checkBatteryAvailability() async {
+    try {
+      _batteryLevel = await _battery.batteryLevel;
+      if (_batteryLevel != -1) {
+        setState(() {
+          _hasBattery = true;
+          _timer = Timer.periodic(const Duration(seconds: 1), (timer) {
+            _battery.batteryLevel.then((level) => {
+                  if (_batteryLevel != level)
+                    {
+                      setState(() {
+                        _batteryLevel = level;
+                      })
+                    }
+                });
+          });
+        });
+      } else {
+        setState(() {
+          _hasBattery = false;
+        });
+      }
+    } catch (e) {
+      setState(() {
+        _hasBattery = false;
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (!_hasBattery) {
+      return const SizedBox.shrink(); //Empty Widget
+    }
+    return _batteryInfo(_batteryLevel);
+  }
+
+  @override
+  void dispose() {
+    _timer?.cancel();
+    super.dispose();
+  }
+
+  Widget _batteryInfo(int batteryLevel) {
+    IconData batteryIcon;
+    Color batteryColor = context.colorScheme.onSurface;
+
+    if (batteryLevel >= 96) {
+      batteryIcon = Icons.battery_full_sharp;
+    } else if (batteryLevel >= 84) {
+      batteryIcon = Icons.battery_6_bar_sharp;
+    } else if (batteryLevel >= 72) {
+      batteryIcon = Icons.battery_5_bar_sharp;
+    } else if (batteryLevel >= 60) {
+      batteryIcon = Icons.battery_4_bar_sharp;
+    } else if (batteryLevel >= 48) {
+      batteryIcon = Icons.battery_3_bar_sharp;
+    } else if (batteryLevel >= 36) {
+      batteryIcon = Icons.battery_2_bar_sharp;
+    } else if (batteryLevel >= 24) {
+      batteryIcon = Icons.battery_1_bar_sharp;
+    } else if (batteryLevel >= 12) {
+      batteryIcon = Icons.battery_0_bar_sharp;
+    } else {
+      batteryIcon = Icons.battery_alert_sharp;
+      batteryColor = Colors.red;
+    }
+
+    return Row(
+      children: [
+        Icon(
+          batteryIcon,
+          size: 16,
+          color: batteryColor,
+          // Stroke
+          shadows: List.generate(
+            9,
+            (index) {
+              if (index == 4) {
+                return null;
+              }
+              double offsetX = (index % 3 - 1) * 0.8;
+              double offsetY = ((index / 3).floor() - 1) * 0.8;
+              return Shadow(
+                color: context.colorScheme.onInverseSurface,
+                offset: Offset(offsetX, offsetY),
+              );
+            },
+          ).whereType<Shadow>().toList(),
+        ),
+        Stack(
+          children: [
+            Text(
+              '$batteryLevel%',
+              style: TextStyle(
+                fontSize: 14,
+                foreground: Paint()
+                  ..style = PaintingStyle.stroke
+                  ..strokeWidth = 1.4
+                  ..color = context.colorScheme.onInverseSurface,
+              ),
+            ),
+            Text('$batteryLevel%'),
+          ],
+        ),
+      ],
+    );
+  }
+}
+
+class _ClockWidget extends StatefulWidget {
+  @override
+  _ClockWidgetState createState() => _ClockWidgetState();
+}
+
+class _ClockWidgetState extends State<_ClockWidget> {
+  late String _currentTime;
+  late Timer _timer;
+
+  @override
+  void initState() {
+    super.initState();
+    _currentTime = _getCurrentTime();
+    _timer = Timer.periodic(const Duration(seconds: 1), (timer) {
+      final time = _getCurrentTime();
+      if (_currentTime != time) {
+        setState(() {
+          _currentTime = time;
+        });
+      }
+    });
+  }
+
+  String _getCurrentTime() {
+    final now = DateTime.now();
+    return "${now.hour.toString().padLeft(2, '0')}:${now.minute.toString().padLeft(2, '0')}";
+  }
+
+  @override
+  void dispose() {
+    _timer.cancel();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Stack(
+      children: [
+        Text(
+          _currentTime,
+          style: TextStyle(
+            fontSize: 14,
+            foreground: Paint()
+              ..style = PaintingStyle.stroke
+              ..strokeWidth = 1.4
+              ..color = context.colorScheme.onInverseSurface,
+          ),
+        ),
+        Text(_currentTime),
+      ],
+    );
+  }
+}
+
 class _ChaptersView extends StatefulWidget {
   const _ChaptersView(this.reader);
 

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(
@@ -305,13 +332,24 @@ class _SearchPageState extends State<SearchPage> {
               ),
             );
           }
-          return ListTile(
-            contentPadding: const EdgeInsets.symmetric(horizontal: 12),
-            title: Text(appdata.searchHistory[index - 2]),
+          return InkWell(
             onTap: () {
               search(appdata.searchHistory[index - 2]);
             },
-          );
+            child: Container(
+              decoration: BoxDecoration(
+                // color: context.colorScheme.surfaceContainer,
+                border: Border(
+                  left: BorderSide(
+                    color: context.colorScheme.outlineVariant,
+                    width: 2,
+                  ),
+                ),
+              ),
+              padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+              child: Text(appdata.searchHistory[index - 2], style: ts.s14),
+            ),
+          ).paddingBottom(8).paddingHorizontal(4);
         },
         childCount: 2 + appdata.searchHistory.length,
       ),
@@ -369,6 +407,9 @@ class _SearchPageState extends State<SearchPage> {
           ),
           trailing: const Icon(Icons.arrow_right),
           onTap: () {
+            setState(() {
+              suggestions.clear();
+            });
             handleAppLink(Uri.parse(controller.text));
           },
         );
@@ -487,7 +528,7 @@ class SearchOptionWidget extends StatelessWidget {
           contentPadding: EdgeInsets.zero,
           title: Text(option.label.ts(sourceKey)),
         ),
-        if(option.type == 'select')
+        if (option.type == 'select')
           Wrap(
             runSpacing: 8,
             spacing: 8,
@@ -501,7 +542,7 @@ class SearchOptionWidget extends StatelessWidget {
               );
             }).toList(),
           ),
-        if(option.type == 'multi-select')
+        if (option.type == 'multi-select')
           Wrap(
             runSpacing: 8,
             spacing: 8,
@@ -511,7 +552,7 @@ class SearchOptionWidget extends StatelessWidget {
                 isSelected: (jsonDecode(value) as List).contains(e.key),
                 onTap: () {
                   var list = jsonDecode(value) as List;
-                  if(list.contains(e.key)) {
+                  if (list.contains(e.key)) {
                     list.remove(e.key);
                   } else {
                     list.add(e.key);
@@ -521,7 +562,7 @@ class SearchOptionWidget extends StatelessWidget {
               );
             }).toList(),
           ),
-        if(option.type == 'dropdown')
+        if (option.type == 'dropdown')
           Select(
             current: option.options[value],
             values: option.options.values.toList(),

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();
@@ -42,7 +42,7 @@ class _SearchResultPageState extends State<SearchResultPage> {
 
   void search([String? text]) {
     if (text != null) {
-      if(suggestionsController.entry != null) {
+      if (suggestionsController.entry != null) {
         suggestionsController.remove();
       }
       setState(() {
@@ -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);
@@ -135,20 +135,24 @@ class _SearchResultPageState extends State<SearchResultPage> {
         onChanged: onChanged,
         action: buildAction(),
       ),
-      loadPage: source!.searchPageData!.loadPage == null ? null : (i) {
-        return source.searchPageData!.loadPage!(
-          text,
-          i,
-          options,
-        );
-      },
-      loadNext: source.searchPageData!.loadNext == null ? null : (i) {
-        return source.searchPageData!.loadNext!(
-          text,
-          i,
-          options,
-        );
-      },
+      loadPage: source!.searchPageData!.loadPage == null
+          ? null
+          : (i) {
+              return source.searchPageData!.loadPage!(
+                text,
+                i,
+                options,
+              );
+            },
+      loadNext: source.searchPageData!.loadNext == null
+          ? null
+          : (i) {
+              return source.searchPageData!.loadNext!(
+                text,
+                i,
+                options,
+              );
+            },
     );
   }
 
@@ -424,6 +428,11 @@ class _SearchSettingsDialogState extends State<_SearchSettingsDialog> {
                   setState(() {
                     searchTarget = e.key;
                     options.clear();
+                    final searchOptions = ComicSource.find(searchTarget)!
+                            .searchPageData!
+                            .searchOptions ??
+                        <SearchOptions>[];
+                    options = searchOptions.map((e) => e.defaultValue).toList();
                     onChanged();
                   });
                 },

lib/pages/settings/about.dart

@@ -16,12 +16,12 @@ class _AboutSettingsState extends State<AboutSettings> {
       slivers: [
         SliverAppbar(title: Text("About".tl)),
         SizedBox(
-          height: 136,
+          height: 112,
           width: double.infinity,
           child: Center(
             child: Container(
-              width: 136,
-              height: 136,
+              width: 112,
+              height: 112,
               decoration: BoxDecoration(
                 borderRadius: BorderRadius.circular(136),
               ),
@@ -53,30 +53,7 @@ class _AboutSettingsState extends State<AboutSettings> {
               setState(() {
                 isCheckingUpdate = true;
               });
-              checkUpdate().then((value) {
-                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 {
-                  context.showMessage(message: "No new version available".tl);
-                }
+              checkUpdateUi().then((value) {
                 setState(() {
                   isCheckingUpdate = false;
                 });
@@ -91,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(),
       ],
     );
   }
@@ -108,6 +92,37 @@ Future<bool> checkUpdate() async {
   return false;
 }
 
+Future<void> checkUpdateUi([bool showMessageIfNoUpdate = true]) async {
+  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);
+  }
+}
+
 /// return true if version1 > version2
 bool _compareVersion(String version1, String version2) {
   var v1 = version1.split(".");

lib/pages/settings/app.dart

@@ -20,16 +20,27 @@ class _AppSettingsState extends State<AppSettings> {
         ListTile(
           title: Text("Storage Path for local comics".tl),
           subtitle: Text(LocalManager().path, softWrap: false),
+          trailing: IconButton(
+            icon: const Icon(Icons.copy),
+            onPressed: () {
+              Clipboard.setData(ClipboardData(text: LocalManager().path));
+              context.showMessage(message: "Path copied to clipboard".tl);
+            },
+          ),
         ).toSliver(),
         _CallbackSetting(
           title: "Set New Storage Path".tl,
           actionTitle: "Set".tl,
           callback: () async {
-            if (App.isMobile) {
-              context.showMessage(message: "Not supported".tl);
-              return;
+            String? result;
+            if (App.isAndroid) {
+              var picker = DirectoryPicker();
+              result = (await picker.pickDirectory())?.path;
+            } else if (App.isIOS) {
+              result = await selectDirectoryIOS();
+            } else {
+              result = await selectDirectory();
             }
-            var result = await selectDirectory();
             if (result == null) return;
             var loadingDialog = showLoadingDialog(
               App.rootContext,
@@ -78,14 +89,56 @@ class _AppSettingsState extends State<AppSettings> {
                 appdata.settings['cacheSize'] = int.parse(value);
                 appdata.saveData();
                 setState(() {});
-                CacheManager()
-                    .setLimitSize(appdata.settings['cacheSize']);
+                CacheManager().setLimitSize(appdata.settings['cacheSize']);
                 return null;
               },
             );
           },
           actionTitle: 'Set'.tl,
         ).toSliver(),
+        _CallbackSetting(
+          title: "Export App Data".tl,
+          callback: () async {
+            var controller = showLoadingDialog(context);
+            var file = await exportAppData();
+            await saveFile(filename: "data.venera", file: file);
+            controller.close();
+          },
+          actionTitle: 'Export'.tl,
+        ).toSliver(),
+        _CallbackSetting(
+          title: "Import App Data".tl,
+          callback: () async {
+            var controller = showLoadingDialog(context);
+            var file = await selectFile(ext: ['venera', 'picadata']);
+            if (file != null) {
+              var cacheFile = File(FilePath.join(App.cachePath, "import_data_temp"));
+              await file.saveTo(cacheFile.path);
+              try {
+                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();
+          },
+          actionTitle: 'Import'.tl,
+        ).toSliver(),
+        _CallbackSetting(
+          title: "Data Sync".tl,
+          callback: () async {
+            showPopUpWidget(context, const _WebdavSetting());
+          },
+          actionTitle: 'Set'.tl,
+        ).toSliver(),
         _SettingPartTitle(
           title: "Log".tl,
           icon: Icons.error_outline,
@@ -114,6 +167,29 @@ class _AppSettingsState extends State<AppSettings> {
             App.forceRebuild();
           },
         ).toSliver(),
+        if (!App.isLinux)
+          _SwitchSetting(
+            title: "Authorization Required".tl,
+            settingKey: "authorizationRequired",
+            onChanged: () async {
+              var current = appdata.settings['authorizationRequired'];
+              if (current) {
+                final auth = LocalAuthentication();
+                final bool canAuthenticateWithBiometrics =
+                    await auth.canCheckBiometrics;
+                final bool canAuthenticate = canAuthenticateWithBiometrics ||
+                    await auth.isDeviceSupported();
+                if (!canAuthenticate) {
+                  context.showMessage(message: "Biometrics not supported".tl);
+                  setState(() {
+                    appdata.settings['authorizationRequired'] = false;
+                  });
+                  appdata.saveData();
+                  return;
+                }
+              }
+            },
+          ).toSliver(),
       ],
     );
   }
@@ -241,3 +317,129 @@ class _LogsPageState extends State<LogsPage> {
     saveFile(data: utf8.encode(log), filename: 'log.txt');
   }
 }
+
+class _WebdavSetting extends StatefulWidget {
+  const _WebdavSetting();
+
+  @override
+  State<_WebdavSetting> createState() => _WebdavSettingState();
+}
+
+class _WebdavSettingState extends State<_WebdavSetting> {
+  String url = "";
+  String user = "";
+  String pass = "";
+
+  bool isTesting = false;
+
+  bool upload = true;
+
+  @override
+  void initState() {
+    super.initState();
+    if (appdata.settings['webdav'] is! List) {
+      appdata.settings['webdav'] = [];
+    }
+    var configs = appdata.settings['webdav'] as List;
+    if (configs.whereType<String>().length != 3) {
+      return;
+    }
+    url = configs[0];
+    user = configs[1];
+    pass = configs[2];
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return PopUpWidgetScaffold(
+      title: "Webdav",
+      body: SingleChildScrollView(
+        child: Column(
+          children: [
+            const SizedBox(height: 12),
+            TextField(
+              decoration: const InputDecoration(
+                labelText: "URL",
+                border: OutlineInputBorder(),
+              ),
+              controller: TextEditingController(text: url),
+              onChanged: (value) => url = value,
+            ),
+            const SizedBox(height: 12),
+            TextField(
+              decoration: InputDecoration(
+                labelText: "Username".tl,
+                border: const OutlineInputBorder(),
+              ),
+              controller: TextEditingController(text: user),
+              onChanged: (value) => user = value,
+            ),
+            const SizedBox(height: 12),
+            TextField(
+              decoration: InputDecoration(
+                labelText: "Password".tl,
+                border: const OutlineInputBorder(),
+              ),
+              controller: TextEditingController(text: pass),
+              onChanged: (value) => pass = value,
+            ),
+            const SizedBox(height: 12),
+            Row(
+              children: [
+                Text("Operation".tl),
+                Radio<bool>(
+                  groupValue: upload,
+                  value: true,
+                  onChanged: (value) {
+                    setState(() {
+                      upload = value!;
+                    });
+                  },
+                ),
+                Text("Upload".tl),
+                Radio<bool>(
+                  groupValue: upload,
+                  value: false,
+                  onChanged: (value) {
+                    setState(() {
+                      upload = value!;
+                    });
+                  },
+                ),
+                Text("Download".tl),
+              ],
+            ),
+            const SizedBox(height: 16),
+            Center(
+              child: Button.filled(
+                isLoading: isTesting,
+                onPressed: () async {
+                  var oldConfig = appdata.settings['webdav'];
+                  appdata.settings['webdav'] = [url, user, pass];
+                  setState(() {
+                    isTesting = true;
+                  });
+                  var testResult = upload
+                      ? await DataSync().uploadData()
+                      : await DataSync().downloadData();
+                  if (testResult.error) {
+                    setState(() {
+                      isTesting = false;
+                    });
+                    appdata.settings['webdav'] = oldConfig;
+                    context.showMessage(message: testResult.errorMessage!);
+                    return;
+                  }
+                  appdata.saveData();
+                  context.showMessage(message: "Saved".tl);
+                  App.rootPop();
+                },
+                child: Text("Continue".tl),
+              ),
+            )
+          ],
+        ).paddingHorizontal(16),
+      ),
+    );
+  }
+}

lib/pages/settings/appearance.dart

@@ -21,11 +21,15 @@ class _AppearanceSettingsState extends State<AppearanceSettings> {
             "light": "Light".tl,
             "dark": "Dark".tl,
           },
+          onChanged: () async {
+            App.forceRebuild();
+          },
         ).toSliver(),
         SelectSetting(
           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

@@ -24,12 +24,30 @@ class _LocalFavoritesSettingsState extends State<LocalFavoritesSettings> {
         SelectSetting(
           title: "Move favorite after reading".tl,
           settingKey: "moveFavoriteAfterRead",
-          optionTranslation: {
+          optionTranslation: const {
             "none": "None",
             "end": "End",
             "start": "Start",
           },
         ).toSliver(),
+        SelectSetting(
+          title: "Quick Favorite".tl,
+          settingKey: "quickFavorite",
+          help: "Long press on the favorite button to quickly add to this folder".tl,
+          optionTranslation: {
+            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/network.dart

@@ -17,6 +17,13 @@ class _NetworkSettingsState extends State<NetworkSettings> {
           title: "Proxy".tl,
           builder: () => const _ProxySettingView(),
         ).toSliver(),
+        _SliderSetting(
+          title: "Download Threads".tl,
+          settingsIndex: 'downloadThreads',
+          interval: 1,
+          min: 1,
+          max: 16,
+        ).toSliver(),
       ],
     );
   }
@@ -31,61 +38,58 @@ class _ProxySettingView extends StatefulWidget {
 
 class _ProxySettingViewState extends State<_ProxySettingView> {
   String type = '';
-
   String host = '';
-
   String port = '';
-
   String username = '';
-
   String password = '';
+  bool ignoreCertificateErrors = false;
 
   // USERNAME:PASSWORD@HOST:PORT
   String toProxyStr() {
-    if(type == 'direct') {
+    if (type == 'direct') {
       return 'direct';
-    } else if(type == 'system') {
+    } else if (type == 'system') {
       return 'system';
     }
     var res = '';
-    if(username.isNotEmpty) {
+    if (username.isNotEmpty) {
       res += username;
-      if(password.isNotEmpty) {
+      if (password.isNotEmpty) {
         res += ':$password';
       }
       res += '@';
     }
     res += host;
-    if(port.isNotEmpty) {
+    if (port.isNotEmpty) {
       res += ':$port';
     }
     return res;
   }
 
   void parseProxyString(String proxy) {
-    if(proxy == 'direct') {
+    if (proxy == 'direct') {
       type = 'direct';
       return;
-    } else if(proxy == 'system') {
+    } else if (proxy == 'system') {
       type = 'system';
       return;
     }
     type = 'manual';
     var parts = proxy.split('@');
-    if(parts.length == 2) {
+    if (parts.length == 2) {
       var auth = parts[0].split(':');
-      if(auth.length == 2) {
+      if (auth.length == 2) {
         username = auth[0];
         password = auth[1];
       }
       parts = parts[1].split(':');
-      if(parts.length == 2) {
+      if (parts.length == 2) {
         host = parts[0];
         port = parts[1];
       }
     } else {
       parts = proxy.split(':');
-      if(parts.length == 2) {
+      if (parts.length == 2) {
         host = parts[0];
         port = parts[1];
       }
@@ -96,6 +100,7 @@ class _ProxySettingViewState extends State<_ProxySettingView> {
   void initState() {
     var proxy = appdata.settings['proxy'];
     parseProxyString(proxy);
+    ignoreCertificateErrors = appdata.settings['ignoreCertificateErrors'] ?? false;
     super.initState();
   }
 
@@ -140,7 +145,18 @@ class _ProxySettingViewState extends State<_ProxySettingView> {
                 });
               },
             ),
-            if(type == 'manual') buildManualProxy(),
+            if (type == 'manual') buildManualProxy(),
+            SwitchListTile(
+              title: Text("Ignore Certificate Errors".tl),
+              value: ignoreCertificateErrors,
+              onChanged: (v) {
+                setState(() {
+                  ignoreCertificateErrors = v;
+                });
+                appdata.settings['ignoreCertificateErrors'] = ignoreCertificateErrors;
+                appdata.saveData();
+              },
+            ),
           ],
         ),
       ),
@@ -164,7 +180,7 @@ class _ProxySettingViewState extends State<_ProxySettingView> {
               host = v;
             },
             validator: (v) {
-              if(v?.isEmpty ?? false) {
+              if (v?.isEmpty ?? false) {
                 return "Host cannot be empty".tl;
               }
               return null;
@@ -181,10 +197,10 @@ class _ProxySettingViewState extends State<_ProxySettingView> {
               port = v;
             },
             validator: (v) {
-              if(v?.isEmpty ?? true) {
+              if (v?.isEmpty ?? true) {
                 return null;
               }
-              if(int.tryParse(v!) == null) {
+              if (int.tryParse(v!) == null) {
                 return "Port must be a number".tl;
               }
               return null;
@@ -201,7 +217,7 @@ class _ProxySettingViewState extends State<_ProxySettingView> {
               username = v;
             },
             validator: (v) {
-              if((v?.isEmpty ?? false) && password.isNotEmpty) {
+              if ((v?.isEmpty ?? false) && password.isNotEmpty) {
                 return "Username cannot be empty".tl;
               }
               return null;
@@ -221,7 +237,7 @@ class _ProxySettingViewState extends State<_ProxySettingView> {
           const SizedBox(height: 16),
           FilledButton(
             onPressed: () {
-              if(formKey.currentState?.validate() ?? false) {
+              if (formKey.currentState?.validate() ?? false) {
                 appdata.settings['proxy'] = toProxyStr();
                 appdata.saveData();
                 App.rootContext.pop();

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,55 @@ 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',
+          onChanged: () {
+            widget.onChanged?.call('enableLongPressToZoom');
+          },
+        ).toSliver(),
+        _SwitchSetting(
+          title: 'Limit image width'.tl,
+          subtitle: 'When using Continuous(Top to Bottom) mode'.tl,
+          settingKey: 'limitImageWidth',
+          onChanged: () {
+            widget.onChanged?.call('limitImageWidth');
+          },
+        ).toSliver(),
+        if(App.isAndroid)
+          _SwitchSetting(
+            title: 'Turn page by volume keys'.tl,
+            settingKey: 'enableTurnPageByVolumeKey',
+            onChanged: () {
+              widget.onChanged?.call('enableTurnPageByVolumeKey');
+            },
+          ).toSliver(),
+        _SwitchSetting(
+          title: "Display time & battery info in reader".tl,
+          settingKey: "enableClockAndBatteryInfoInReader",
+          onChanged: () {
+            widget.onChanged?.call("enableClockAndBatteryInfoInReader");
+          },
+        ).toSliver(),
       ],
     );
   }

lib/pages/settings/setting_components.dart

@@ -5,6 +5,7 @@ class _SwitchSetting extends StatefulWidget {
     required this.title,
     required this.settingKey,
     this.onChanged,
+    this.subtitle,
   });
 
   final String title;
@@ -13,6 +14,8 @@ class _SwitchSetting extends StatefulWidget {
 
   final VoidCallback? onChanged;
 
+  final String? subtitle;
+
   @override
   State<_SwitchSetting> createState() => _SwitchSettingState();
 }
@@ -24,14 +27,16 @@ class _SwitchSettingState extends State<_SwitchSetting> {
 
     return ListTile(
       title: Text(widget.title),
+      subtitle: widget.subtitle == null ? null : Text(widget.subtitle!),
       trailing: Switch(
         value: appdata.settings[widget.settingKey],
         onChanged: (value) {
           setState(() {
             appdata.settings[widget.settingKey] = value;
-            appdata.saveData();
           });
-          widget.onChanged?.call();
+          appdata.saveData().then((_) {
+            widget.onChanged?.call();
+          });
         },
       ),
     );
@@ -45,6 +50,7 @@ class SelectSetting extends StatelessWidget {
     required this.settingKey,
     required this.optionTranslation,
     this.onChanged,
+    this.help,
   });
 
   final String title;
@@ -55,6 +61,8 @@ class SelectSetting extends StatelessWidget {
 
   final VoidCallback? onChanged;
 
+  final String? help;
+
   @override
   Widget build(BuildContext context) {
     return SizedBox(
@@ -67,6 +75,7 @@ class SelectSetting extends StatelessWidget {
               settingKey: settingKey,
               optionTranslation: optionTranslation,
               onChanged: onChanged,
+              help: help,
             );
           } else {
             return _EndSelectorSelectSetting(
@@ -74,6 +83,7 @@ class SelectSetting extends StatelessWidget {
               settingKey: settingKey,
               optionTranslation: optionTranslation,
               onChanged: onChanged,
+              help: help,
             );
           }
         },
@@ -88,6 +98,7 @@ class _DoubleLineSelectSettings extends StatefulWidget {
     required this.settingKey,
     required this.optionTranslation,
     this.onChanged,
+    this.help,
   });
 
   final String title;
@@ -98,6 +109,8 @@ class _DoubleLineSelectSettings extends StatefulWidget {
 
   final VoidCallback? onChanged;
 
+  final String? help;
+
   @override
   State<_DoubleLineSelectSettings> createState() =>
       _DoubleLineSelectSettingsState();
@@ -107,9 +120,39 @@ class _DoubleLineSelectSettingsState extends State<_DoubleLineSelectSettings> {
   @override
   Widget build(BuildContext context) {
     return ListTile(
-      title: Text(widget.title),
-      subtitle:
-          Text(widget.optionTranslation[appdata.settings[widget.settingKey]]!),
+      title: Row(
+        children: [
+          Text(widget.title),
+          const SizedBox(width: 4),
+          if (widget.help != null)
+            Button.icon(
+              size: 18,
+              icon: const Icon(Icons.help_outline),
+              onPressed: () {
+                showDialog(
+                  context: context,
+                  builder: (context) {
+                    return ContentDialog(
+                      title: "Help".tl,
+                      content: Text(widget.help!)
+                          .paddingHorizontal(16)
+                          .fixWidth(double.infinity),
+                      actions: [
+                        Button.filled(
+                          onPressed: context.pop,
+                          child: Text("OK".tl),
+                        ),
+                      ],
+                    );
+                  },
+                );
+              },
+            ),
+        ],
+      ),
+      subtitle: Text(
+          widget.optionTranslation[appdata.settings[widget.settingKey]] ??
+              "None"),
       trailing: const Icon(Icons.arrow_drop_down),
       onTap: () {
         var renderBox = context.findRenderObject() as RenderBox;
@@ -118,8 +161,9 @@ class _DoubleLineSelectSettingsState extends State<_DoubleLineSelectSettings> {
         var rect = offset & size;
         showMenu(
           elevation: 3,
-          color: context.colorScheme.surface,
-          surfaceTintColor: Colors.transparent,
+          color: context.brightness == Brightness.light
+              ? const Color(0xFFF6F6F6)
+              : const Color(0xFF1E1E1E),
           context: context,
           position: RelativeRect.fromRect(
             rect,
@@ -152,6 +196,7 @@ class _EndSelectorSelectSetting extends StatefulWidget {
     required this.settingKey,
     required this.optionTranslation,
     this.onChanged,
+    this.help,
   });
 
   final String title;
@@ -162,6 +207,8 @@ class _EndSelectorSelectSetting extends StatefulWidget {
 
   final VoidCallback? onChanged;
 
+  final String? help;
+
   @override
   State<_EndSelectorSelectSetting> createState() =>
       _EndSelectorSelectSettingState();
@@ -172,10 +219,40 @@ class _EndSelectorSelectSettingState extends State<_EndSelectorSelectSetting> {
   Widget build(BuildContext context) {
     var options = widget.optionTranslation;
     return ListTile(
-      title: Text(widget.title),
+      title: Row(
+        children: [
+          Text(widget.title),
+          const SizedBox(width: 4),
+          if (widget.help != null)
+            Button.icon(
+              size: 18,
+              icon: const Icon(Icons.help_outline),
+              onPressed: () {
+                showDialog(
+                  context: context,
+                  builder: (context) {
+                    return ContentDialog(
+                      title: "Help".tl,
+                      content: Text(widget.help!)
+                          .paddingHorizontal(16)
+                          .fixWidth(double.infinity),
+                      actions: [
+                        Button.filled(
+                          onPressed: context.pop,
+                          child: Text("OK".tl),
+                        ),
+                      ],
+                    );
+                  },
+                );
+              },
+            ),
+        ],
+      ),
       trailing: Select(
-        current: options[appdata.settings[widget.settingKey]]!,
+        current: options[appdata.settings[widget.settingKey]],
         values: options.values.toList(),
+        minWidth: 64,
         onTap: (index) {
           setState(() {
             appdata.settings[widget.settingKey] = options.keys.elementAt(index);
@@ -307,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
@@ -387,24 +464,31 @@ class _MultiPagesFilterState extends State<_MultiPagesFilter> {
       }
     });
     showDialog(
-        context: context,
-        builder: (context) {
-          return SimpleDialog(
-            title: const Text("Add"),
+      context: context,
+      builder: (context) {
+        return ContentDialog(
+          title: "Add".tl,
+          content: Column(
+            mainAxisSize: MainAxisSize.min,
             children: canAdd.entries
-                .map((e) => InkWell(
-                      child: ListTile(title: Text(e.value), key: Key(e.key)),
-                      onTap: () {
-                        context.pop();
-                        setState(() {
-                          keys.add(e.key);
-                        });
-                        updateSetting();
-                      },
-                    ))
+                .map(
+                  (e) => ListTile(
+                    title: Text(e.value),
+                    key: Key(e.key),
+                    onTap: () {
+                      context.pop();
+                      setState(() {
+                        keys.add(e.key);
+                      });
+                      updateSetting();
+                    },
+                  ),
+                )
                 .toList(),
-          );
-        });
+          ),
+        );
+      },
+    );
   }
 
   void updateSetting() {
@@ -434,7 +518,7 @@ class _CallbackSetting extends StatelessWidget {
     return ListTile(
       title: Text(title),
       subtitle: subtitle == null ? null : Text(subtitle!),
-      trailing: FilledButton(
+      trailing: Button.normal(
         onPressed: callback,
         child: Text(actionTitle),
       ).fixHeight(28),
@@ -458,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

@@ -4,16 +4,19 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_reorderable_grid_view/widgets/reorderable_builder.dart';
+import 'package:local_auth/local_auth.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 import 'package:venera/components/components.dart';
 import 'package:venera/foundation/app.dart';
 import 'package:venera/foundation/appdata.dart';
 import 'package:venera/foundation/cache_manager.dart';
 import 'package:venera/foundation/comic_source/comic_source.dart';
-import 'package:venera/foundation/consts.dart';
+import 'package:venera/foundation/favorites.dart';
 import 'package:venera/foundation/local.dart';
 import 'package:venera/foundation/log.dart';
 import 'package:venera/network/app_dio.dart';
+import 'package:venera/utils/data.dart';
+import 'package:venera/utils/data_sync.dart';
 import 'package:venera/utils/io.dart';
 import 'package:venera/utils/translations.dart';
 import 'package:yaml/yaml.dart';
@@ -41,7 +44,7 @@ class _SettingsPageState extends State<SettingsPage> implements PopEntry {
 
   ColorScheme get colors => Theme.of(context).colorScheme;
 
-  bool get enableTwoViews => context.width > changePoint;
+  bool get enableTwoViews => context.width > 720;
 
   final categories = <String>[
     "Explore",
@@ -175,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(
@@ -263,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

@@ -18,11 +18,11 @@ export 'package:flutter_inappwebview/flutter_inappwebview.dart'
 
 extension WebviewExtension on InAppWebViewController {
   Future<List<io.Cookie>?> getCookies(String url) async {
-    if(url.contains("https://")){
+    if (url.contains("https://")) {
       url.replaceAll("https://", "");
     }
-    if(url[url.length-1] == '/'){
-      url = url.substring(0, url.length-1);
+    if (url[url.length - 1] == '/') {
+      url = url.substring(0, url.length - 1);
     }
     CookieManager cookieManager = CookieManager.instance();
     final cookies = await cookieManager.getCookies(url: WebUri(url));
@@ -70,6 +70,8 @@ class AppWebview extends StatefulWidget {
 
   final bool singlePage;
 
+  static WebViewEnvironment? webViewEnvironment;
+
   @override
   State<AppWebview> createState() => _AppWebviewState();
 }
@@ -89,35 +91,78 @@ class _AppWebviewState extends State<AppWebview> {
         child: IconButton(
           icon: const Icon(Icons.more_horiz),
           onPressed: () {
-            showMenu(
-                context: context,
-                position: RelativeRect.fromLTRB(
-                    MediaQuery.of(context).size.width,
-                    0,
-                    MediaQuery.of(context).size.width,
-                    0),
-                items: [
-                  PopupMenuItem(
-                    child: Text("Open in browser".tl),
-                    onTap: () async =>
-                        launchUrlString((await controller?.getUrl())!.path),
-                  ),
-                  PopupMenuItem(
-                    child: Text("Copy link".tl),
-                    onTap: () async => Clipboard.setData(ClipboardData(
-                        text: (await controller?.getUrl())!.path)),
-                  ),
-                  PopupMenuItem(
-                    child: Text("Reload".tl),
-                    onTap: () => controller?.reload(),
-                  ),
-                ]);
+            showMenuX(
+              context,
+              Offset(context.width, context.padding.top),
+              [
+                MenuEntry(
+                  icon: Icons.open_in_browser,
+                  text: "Open in browser".tl,
+                  onClick: () async =>
+                      launchUrlString((await controller?.getUrl())!.toString()),
+                ),
+                MenuEntry(
+                  icon: Icons.copy,
+                  text: "Copy link".tl,
+                  onClick: () async => Clipboard.setData(ClipboardData(
+                      text: (await controller?.getUrl())!.toString())),
+                ),
+                MenuEntry(
+                  icon: Icons.refresh,
+                  text: "Reload".tl,
+                  onClick: () => controller?.reload(),
+                ),
+              ],
+            );
           },
         ),
       )
     ];
 
-    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/app_links.dart

@@ -10,7 +10,7 @@ void handleLinks() {
   });
 }
 
-void handleAppLink(Uri uri) async {
+Future<bool> handleAppLink(Uri uri) async {
   for(var source in ComicSource.all()) {
     if(source.linkHandler != null) {
       if(source.linkHandler!.domains.contains(uri.host)) {
@@ -22,9 +22,11 @@ void handleAppLink(Uri uri) async {
           App.mainNavigatorKey!.currentContext?.to(() {
             return ComicPage(id: id, sourceKey: source.key);
           });
+          return true;
         }
-        return;
+        return false;
       }
     }
   }
+  return false;
 }

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

@@ -0,0 +1,210 @@
+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';
+
+import 'io.dart';
+
+Future<File> exportAppData() async {
+  var time = DateTime.now().millisecondsSinceEpoch ~/ 1000;
+  var cacheFilePath = FilePath.join(App.cachePath, '$time.venera');
+  var cacheFile = File(cacheFilePath);
+  var dataPath = App.dataPath;
+  if (await cacheFile.exists()) {
+    await cacheFile.delete();
+  }
+  await Isolate.run(() {
+    var zipFile = ZipFile.open(cacheFilePath);
+    var historyFile = FilePath.join(dataPath, "history.db");
+    var localFavoriteFile = FilePath.join(dataPath, "local_favorite.db");
+    var appdata = FilePath.join(dataPath, "appdata.json");
+    var cookies = FilePath.join(dataPath, "cookie.db");
+    zipFile.addFile("history.db", historyFile);
+    zipFile.addFile("local_favorite.db", localFavoriteFile);
+    zipFile.addFile("appdata.json", appdata);
+    zipFile.addFile("cookie.db", cookies);
+    for (var file
+        in Directory(FilePath.join(dataPath, "comic_source")).listSync()) {
+      if (file is File) {
+        zipFile.addFile("comic_source/${file.name}", file.path);
+      }
+    }
+    zipFile.close();
+  });
+  return cacheFile;
+}
+
+Future<void> importAppData(File file, [bool checkVersion = false]) 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 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 (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/data_sync.dart

@@ -0,0 +1,204 @@
+import 'package:dio/io.dart';
+import 'package:flutter/foundation.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/favorites.dart';
+import 'package:venera/foundation/log.dart';
+import 'package:venera/foundation/res.dart';
+import 'package:venera/network/app_dio.dart';
+import 'package:venera/utils/data.dart';
+import 'package:venera/utils/ext.dart';
+import 'package:webdav_client/webdav_client.dart' hide File;
+
+import 'io.dart';
+
+class DataSync with ChangeNotifier {
+  DataSync._() {
+    if (isEnabled) {
+      downloadData();
+    }
+    LocalFavoritesManager().addListener(onDataChanged);
+    ComicSource.addListener(onDataChanged);
+  }
+
+  void onDataChanged() {
+    if (isEnabled) {
+      uploadData();
+    }
+  }
+
+  static DataSync? instance;
+
+  factory DataSync() => instance ?? (instance = DataSync._());
+
+  bool isDownloading = false;
+
+  bool isUploading = false;
+
+  bool haveWaitingTask = false;
+
+  bool get isEnabled {
+    var config = appdata.settings['webdav'];
+    return config is List && config.isNotEmpty;
+  }
+
+  List<String>? _validateConfig() {
+    var config = appdata.settings['webdav'];
+    if (config is! List || (config.isNotEmpty && config.length != 3)) {
+      return null;
+    }
+    if (config.whereType<String>().length != 3) {
+      return null;
+    }
+    return List.from(config);
+  }
+
+  Future<Res<bool>> uploadData() async {
+    if(isDownloading) return const Res(true);
+    if (haveWaitingTask) return const Res(true);
+    while (isUploading) {
+      haveWaitingTask = true;
+      await Future.delayed(const Duration(milliseconds: 100));
+    }
+    haveWaitingTask = false;
+    isUploading = true;
+    notifyListeners();
+    try {
+      var config = _validateConfig();
+      if (config == null) {
+        return const Res.error('Invalid WebDAV configuration');
+      }
+      if (config.isEmpty) {
+        return const Res(true);
+      }
+      String url = config[0];
+      String user = config[1];
+      String pass = config[2];
+
+      var proxy = await AppDio.getProxy();
+
+      var client = newClient(
+        url,
+        user: user,
+        password: pass,
+        adapter: IOHttpClientAdapter(
+          createHttpClient: () {
+            return HttpClient()
+              ..findProxy = (uri) => proxy == null ? "DIRECT" : "PROXY $proxy";
+          },
+        ),
+      );
+
+      try {
+        await client.ping();
+      } catch (e) {
+        Log.error("Upload Data", 'Failed to connect to WebDAV server');
+        return const Res.error('Failed to connect to WebDAV server');
+      }
+
+      try {
+        appdata.settings['dataVersion']++;
+        await appdata.saveData();
+        var data = await exportAppData();
+        var time =
+            (DateTime.now().millisecondsSinceEpoch ~/ 86400000).toString();
+        var filename = time;
+        filename += '-';
+        filename += appdata.settings['dataVersion'].toString();
+        filename += '.venera';
+        var files = await client.readDir('/');
+        files = files.where((e) => e.name!.endsWith('.venera')).toList();
+        var old = files.firstWhereOrNull( (e) => e.name!.startsWith("$time-"));
+        if (old != null) {
+          await client.remove(old.name!);
+        }
+        if (files.length >= 10) {
+          files.sort((a, b) => a.name!.compareTo(b.name!));
+          await client.remove(files.first.name!);
+        }
+        await client.write(filename, await data.readAsBytes());
+        Log.info("Upload Data", "Data uploaded successfully");
+        return const Res(true);
+      } catch (e, s) {
+        Log.error("Upload Data", e, s);
+        return Res.error(e.toString());
+      }
+    } finally {
+      isUploading = false;
+      notifyListeners();
+    }
+  }
+
+  Future<Res<bool>> downloadData() async {
+    if (haveWaitingTask) return const Res(true);
+    while (isDownloading || isUploading) {
+      haveWaitingTask = true;
+      await Future.delayed(const Duration(milliseconds: 100));
+    }
+    haveWaitingTask = false;
+    isDownloading = true;
+    notifyListeners();
+    try {
+      var config = _validateConfig();
+      if (config == null) {
+        return const Res.error('Invalid WebDAV configuration');
+      }
+      if (config.isEmpty) {
+        return const Res(true);
+      }
+      String url = config[0];
+      String user = config[1];
+      String pass = config[2];
+
+      var proxy = await AppDio.getProxy();
+
+      var client = newClient(
+        url,
+        user: user,
+        password: pass,
+        adapter: IOHttpClientAdapter(
+          createHttpClient: () {
+            return HttpClient()
+              ..findProxy = (uri) => proxy == null ? "DIRECT" : "PROXY $proxy";
+          },
+        ),
+      );
+
+      try {
+        await client.ping();
+      } catch (e) {
+        Log.error("Data Sync", 'Failed to connect to WebDAV server');
+        return const Res.error('Failed to connect to WebDAV server');
+      }
+
+      try {
+        var files = await client.readDir('/');
+        files.sort((a, b) => b.name!.compareTo(a.name!));
+        var file = files.firstWhereOrNull((e) => e.name!.endsWith('.venera'));
+        var version =
+            file!.name!.split('-').elementAtOrNull(1)?.split('.').first;
+        if (version != null && int.tryParse(version) != null) {
+          var currentVersion = appdata.settings['dataVersion'];
+          if (currentVersion != null && int.parse(version) <= currentVersion) {
+            Log.info("Data Sync", 'No new data to download');
+            return const Res(true);
+          }
+        }
+        Log.info("Data Sync", "Downloading data from WebDAV server");
+        var localFile = File(FilePath.join(App.cachePath, file.name!));
+        await client.read2File(file.name!, localFile.path);
+        await importAppData(localFile, true);
+        await localFile.delete();
+        Log.info("Data Sync", "Data downloaded successfully");
+        return const Res(true);
+      } catch (e, s) {
+        Log.error("Data Sync", e, s);
+        return Res.error(e.toString());
+      }
+    } finally {
+      isDownloading = false;
+      notifyListeners();
+    }
+  }
+}

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/ext.dart

@@ -24,6 +24,18 @@ extension ListExt<T> on List<T>{
       add(value);
     }
   }
+
+  bool isEqualsTo(List<T> list){
+    if(length != list.length){
+      return false;
+    }
+    for(int i=0; i<length; i++){
+      if(this[i] != list[i]){
+        return false;
+      }
+    }
+    return true;
+  }
 }
 
 extension StringExt on String{

lib/utils/file_type.dart

@@ -1,5 +1,3 @@
-import 'dart:typed_data';
-
 import 'package:mime/mime.dart';
 
 class FileType {
@@ -7,6 +5,20 @@ class FileType {
   final String mime;
 
   const FileType(this.ext, this.mime);
+
+  static FileType fromExtension(String ext) {
+    if(ext.startsWith('.')) {
+      ext = ext.substring(1);
+    }
+    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);
+  }
 }
 
 FileType detectFileType(List<int> data) {

lib/utils/image.dart

@@ -0,0 +1,316 @@
+import 'dart:ffi';
+import 'dart:isolate';
+import 'dart:typed_data';
+import 'dart:ui' as ui;
+import 'package:flutter/services.dart';
+import 'package:flutter_qjs/flutter_qjs.dart';
+import 'package:lodepng_flutter/lodepng_flutter.dart' as lodepng;
+
+class Image {
+  final Uint32List _data;
+
+  final int width;
+
+  final int height;
+
+  Image(this._data, this.width, this.height) {
+    if (_data.length != width * height) {
+      throw ArgumentError(
+          'Invalid argument: data length must be equal to width * height.');
+    }
+  }
+
+  Image.empty(this.width, this.height) : _data = Uint32List(width * height);
+
+  static Future<Image> decodeImage(Uint8List data) async {
+    var codec = await ui.instantiateImageCodec(data);
+    var frame = await codec.getNextFrame();
+    codec.dispose();
+    var info = await frame.image.toByteData();
+    if (info == null) {
+      throw Exception('Failed to decode image');
+    }
+    var image = Image(
+      info.buffer.asUint32List(),
+      frame.image.width,
+      frame.image.height,
+    );
+    frame.image.dispose();
+    return image;
+  }
+
+  Image copyRange(int x, int y, int width, int height) {
+    if (width + x > this.width) {
+      throw ArgumentError('''
+        Invalid argument: x + width must be less than or equal to the image width.
+        x: $x, width: $width, image width: ${this.width}
+      '''
+          .trim());
+    }
+    if (height + y > this.height) {
+      throw ArgumentError('''
+        Invalid argument: y + height must be less than or equal to the image height.
+        y: $y, height: $height, image height: ${this.height}
+      '''
+          .trim());
+    }
+    var data = Uint32List(width * height);
+    for (var j = 0; j < height; j++) {
+      for (var i = 0; i < width; i++) {
+        data[j * width + i] = _data[(j + y) * this.width + i + x];
+      }
+    }
+    return Image(data, width, height);
+  }
+
+  void fillImageAt(int x, int y, Image image) {
+    if (x + image.width > width) {
+      throw ArgumentError('''
+        Invalid argument: x + image width must be less than or equal to the image width.
+        x: $x, image width: ${image.width}, image width: $width
+      '''
+          .trim());
+    }
+    if (y + image.height > height) {
+      throw ArgumentError('''
+        Invalid argument: y + image height must be less than or equal to the image height.
+        y: $y, image height: ${image.height}, image height: $height
+      '''
+          .trim());
+    }
+    for (var j = 0; j < image.height && (j + y) < height; j++) {
+      for (var i = 0; i < image.width && (i + x) < width; i++) {
+        _data[(j + y) * width + i + x] = image._data[j * image.width + i];
+      }
+    }
+  }
+
+  void fillImageRangeAt(
+      int x, int y, Image image, int srcX, int srcY, int width, int height) {
+    if (x + width > this.width) {
+      throw ArgumentError('''
+        Invalid argument: x + width must be less than or equal to the image width.
+        x: $x, width: $width, image width: ${this.width}
+      '''
+          .trim());
+    }
+    if (y + height > this.height) {
+      throw ArgumentError('''
+        Invalid argument: y + height must be less than or equal to the image height.
+        y: $y, height: $height, image height: ${this.height}
+      '''
+          .trim());
+    }
+    if (srcX + width > image.width) {
+      throw ArgumentError('''
+        Invalid argument: srcX + width must be less than or equal to the image width.
+        srcX: $srcX, width: $width, image width: ${image.width}
+      '''
+          .trim());
+    }
+    if (srcY + height > image.height) {
+      throw ArgumentError('''
+        Invalid argument: srcY + height must be less than or equal to the image height.
+        srcY: $srcY, height: $height, image height: ${image.height}
+      '''
+          .trim());
+    }
+    for (var j = 0; j < height; j++) {
+      for (var i = 0; i < width; i++) {
+        _data[(j + y) * this.width + i + x] =
+            image._data[(j + srcY) * image.width + i + srcX];
+      }
+    }
+  }
+
+  Image copyAndRotate90() {
+    var data = Uint32List(width * height);
+    for (var j = 0; j < height; j++) {
+      for (var i = 0; i < width; i++) {
+        data[i * height + height - j - 1] = _data[j * width + i];
+      }
+    }
+    return Image(data, height, width);
+  }
+
+  Color getPixel(int x, int y) {
+    if (x < 0 || x >= width) {
+      throw ArgumentError(
+          'Invalid argument: x must be in the range of [0, $width).');
+    }
+    if (y < 0 || y >= height) {
+      throw ArgumentError(
+          'Invalid argument: y must be in the range of [0, $height).');
+    }
+    return Color.fromValue(_data[y * width + x]);
+  }
+
+  void setPixel(int x, int y, Color color) {
+    if (x < 0 || x >= width) {
+      throw ArgumentError(
+          'Invalid argument: x must be in the range of [0, $width).');
+    }
+    if (y < 0 || y >= height) {
+      throw ArgumentError(
+          'Invalid argument: y must be in the range of [0, $height).');
+    }
+    _data[y * width + x] = color.value;
+  }
+
+  Uint8List encodePng() {
+    var data = lodepng.encodePngToPointer(lodepng.Image(
+      _data.buffer.asUint8List(),
+      width,
+      height,
+    ));
+    return Pointer<Uint8>.fromAddress(data.address).asTypedList(data.length,
+        finalizer: lodepng.ByteBuffer.finalizer);
+  }
+}
+
+class Color {
+  final int value;
+
+  Color(int r, int g, int b, [int a = 255])
+      : value = (a << 24) | (r << 16) | (g << 8) | b;
+
+  Color.fromValue(this.value);
+
+  int get r => (value >> 16) & 0xFF;
+
+  int get g => (value >> 8) & 0xFF;
+
+  int get b => value & 0xFF;
+
+  int get a => (value >> 24) & 0xFF;
+}
+
+class JsEngine {
+  static final JsEngine _instance = JsEngine._();
+
+  factory JsEngine() => _instance;
+
+  JsEngine._() {
+    _engine = FlutterQjs();
+    _engine!.dispatch();
+    var setGlobalFunc =
+        _engine!.evaluate("(key, value) => { this[key] = value; }");
+    (setGlobalFunc as JSInvokable)(["sendMessage", _messageReceiver]);
+    setGlobalFunc.free();
+  }
+
+  FlutterQjs? _engine;
+
+  dynamic runCode(String js, [String? name]) {
+    return _engine!.evaluate(js, name: name);
+  }
+
+  var images = <int, Image>{};
+
+  int _key = 0;
+
+  int setImage(Image image) {
+    var key = _key++;
+    images[key] = image;
+    return key;
+  }
+
+  Object? _messageReceiver(dynamic message) {
+    if (message is! Map) return null;
+    var method = message['method'];
+    if (method == 'image') {
+      switch (message['function']) {
+        case 'copyRange':
+          var key = message['key'];
+          var image = images[key];
+          if (image == null) return null;
+          var x = message['x'];
+          var y = message['y'];
+          var width = message['width'];
+          var height = message['height'];
+          var newImage = image.copyRange(x, y, width, height);
+          return setImage(newImage);
+        case 'copyAndRotate90':
+          var key = message['key'];
+          var image = images[key];
+          if (image == null) return null;
+          var newImage = image.copyAndRotate90();
+          return setImage(newImage);
+        case 'fillImageAt':
+          var key = message['key'];
+          var image = images[key];
+          if (image == null) return null;
+          var x = message['x'];
+          var y = message['y'];
+          var key2 = message['image'];
+          var image2 = images[key2];
+          if (image2 == null) return null;
+          image.fillImageAt(x, y, image2);
+          return null;
+        case 'fillImageRangeAt':
+          var key = message['key'];
+          var image = images[key];
+          if (image == null) return null;
+          var x = message['x'];
+          var y = message['y'];
+          var key2 = message['image'];
+          var image2 = images[key2];
+          if (image2 == null) return null;
+          var srcX = message['srcX'];
+          var srcY = message['srcY'];
+          var width = message['width'];
+          var height = message['height'];
+          image.fillImageRangeAt(x, y, image2, srcX, srcY, width, height);
+          return null;
+        case 'getWidth':
+          var key = message['key'];
+          var image = images[key];
+          if (image == null) return null;
+          return image.width;
+        case 'getHeight':
+          var key = message['key'];
+          var image = images[key];
+          if (image == null) return null;
+          return image.height;
+        case 'emptyImage':
+          var width = message['width'];
+          var height = message['height'];
+          var newImage = Image.empty(width, height);
+          return setImage(newImage);
+      }
+    }
+    return null;
+  }
+}
+
+var _tasksCount = 0;
+
+Future<Uint8List> modifyImageWithScript(Uint8List data, String script) async {
+  while (_tasksCount > 3) {
+    await Future.delayed(const Duration(milliseconds: 200));
+  }
+  _tasksCount++;
+  try {
+    var image = await Image.decodeImage(data);
+    var initJs = await rootBundle.loadString('assets/init.js');
+    return await Isolate.run(() {
+      var jsEngine = JsEngine();
+      jsEngine.runCode(initJs, '<init>');
+      jsEngine.runCode(script);
+      var key = jsEngine.setImage(image);
+      var res = jsEngine.runCode('''
+        let func = () => {
+          let image = new Image($key);
+          let result = modifyImage(image);
+          return result.key;
+        }
+        func();
+      ''');
+      var newImage = jsEngine.images[res];
+      var data = newImage!.encodePng();
+      return Uint8List.fromList(data);
+    });
+  } finally {
+    _tasksCount--;
+  }
+}

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

@@ -1,17 +1,30 @@
 import 'dart:convert';
 import 'dart:io';
+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;
 import 'package:share_plus/share_plus.dart' as s;
 import 'package:file_selector/file_selector.dart' as file_selector;
+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._();
 
@@ -44,10 +57,31 @@ extension FileSystemEntityExt on FileSystemEntity {
       // ignore
     }
   }
+
+  Future<void> deleteIfExists({bool recursive = false}) async {
+    if (existsSync()) {
+      await delete(recursive: recursive);
+    }
+  }
+
+  void deleteIfExistsSync({bool recursive = false}) {
+    if (existsSync()) {
+      deleteSync(recursive: recursive);
+    }
+  }
 }
 
 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 {
@@ -70,10 +104,24 @@ 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) {
-  if(fileName.endsWith('.')) {
+  if (fileName.endsWith('.')) {
     fileName = fileName.substring(0, fileName.length - 1);
   }
   const maxLength = 255;
@@ -99,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();
@@ -113,6 +162,11 @@ Future<void> copyDirectory(Directory source, Directory destination) async {
   }
 }
 
+Future<void> copyDirectoryIsolate(
+    Directory source, Directory destination) async {
+  await Isolate.run(() => overrideIO(() => copyDirectory(source, destination)));
+}
+
 String findValidDirectoryName(String path, String directory) {
   var name = sanitizeFileName(directory);
   var dir = Directory("$path/$name");
@@ -126,58 +180,126 @@ 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;
+      });
     }
   }
 }
 
-Future<file_selector.XFile?> selectFile({required List<String> ext}) async {
-  file_selector.XTypeGroup typeGroup = file_selector.XTypeGroup(
-    label: 'files',
-    extensions: App.isMacOS || App.isIOS ? null : ext,
-  );
-  final file_selector.XFile? file = await file_selector.openFile(
-    acceptedTypeGroups: <file_selector.XTypeGroup>[typeGroup],
-  );
-  if (file == null) return null;
-  if (!ext.contains(file?.path.split(".").last)) {
-    return null;
+class IOSDirectoryPicker {
+  static const MethodChannel _channel = MethodChannel("venera/method_channel");
+
+  // 调用 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<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,
+    );
+    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;
+    });
   }
-  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
+Future<String?> selectDirectoryIOS() async {
+  return IOSDirectoryPicker.selectDirectory();
 }
 
 Future<void> saveFile(
@@ -185,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 {
@@ -242,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;
+}