From b49e0974ab6452de6aeda900a2a764764610fe5f Mon Sep 17 00:00:00 2001
From: nyne <me@nyne.dev>
Date: Tue, 17 Dec 2024 12:10:57 +0800
Subject: [PATCH 01/18] improve zip

---
 lib/utils/cbz.dart |  7 +++----
 pubspec.lock       | 11 +++++------
 pubspec.yaml       |  4 +---
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/lib/utils/cbz.dart b/lib/utils/cbz.dart
index f6c3b67..4116217 100644
--- a/lib/utils/cbz.dart
+++ b/lib/utils/cbz.dart
@@ -1,5 +1,4 @@
 import 'dart:convert';
-import 'dart:isolate';
 
 import 'package:venera/foundation/app.dart';
 import 'package:venera/foundation/comic_type.dart';
@@ -63,7 +62,7 @@ abstract class CBZ {
     var cache = Directory(FilePath.join(App.cachePath, 'cbz_import'));
     if (cache.existsSync()) cache.deleteSync(recursive: true);
     cache.createSync();
-    await Isolate.run(() => ZipFile.openAndExtract(file.path, cache.path));
+    await ZipFile.openAndExtractAsync(file.path, cache.path, 4);
     var metaDataFile = File(FilePath.join(cache.path, 'metadata.json'));
     ComicMetaData? metaData;
     if (metaDataFile.existsSync()) {
@@ -208,13 +207,13 @@ abstract class CBZ {
         ).toJson(),
       ),
     );
-    var cbz = File(FilePath.join(App.cachePath, '${comic.title}.cbz'));
+    var cbz = File(FilePath.join(App.cachePath, sanitizeFileName('${comic.title}.cbz')));
     await _compress(cache.path, cbz.path);
     cache.deleteSync(recursive: true);
     return cbz;
   }
 
   static _compress(String src, String dst) async {
-    await Isolate.run(() => ZipFile.compressFolder(src, dst));
+    await ZipFile.compressFolderAsync(src, dst, 4);
   }
 }
diff --git a/pubspec.lock b/pubspec.lock
index a254914..401089e 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1125,12 +1125,11 @@ packages:
   zip_flutter:
     dependency: "direct main"
     description:
-      path: "."
-      ref: HEAD
-      resolved-ref: d5721f1fd8179ee4a5db59f932ae7c89d94e12a0
-      url: "https://github.com/wgh136/zip_flutter"
-    source: git
-    version: "0.0.1"
+      name: zip_flutter
+      sha256: "72b85f84dc5737e1c1dd7ed97ed0242f397872acc8d03044a5789b466dbf42b2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.0.2"
 sdks:
   dart: ">=3.6.0 <4.0.0"
   flutter: ">=3.27.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 3aa2b77..b2c8950 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -51,9 +51,7 @@ dependencies:
   sliver_tools: ^0.2.12
   flutter_file_dialog: ^3.0.2
   file_selector: ^1.0.3
-  zip_flutter:
-    git:
-      url: https://github.com/wgh136/zip_flutter
+  zip_flutter: ^0.0.2
   lodepng_flutter:
     git:
       url: https://github.com/venera-app/lodepng_flutter

From ab3953292bf6b2d55e3cdf6726c2c656a153f87c Mon Sep 17 00:00:00 2001
From: nyne <me@nyne.dev>
Date: Tue, 17 Dec 2024 13:01:44 +0800
Subject: [PATCH 02/18] fix
 https://github.com/venera-app/venera-configs/issues/28

---
 .../image_provider/base_image_provider.dart         | 13 ++++++++-----
 lib/foundation/image_provider/reader_image.dart     |  3 +++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/foundation/image_provider/base_image_provider.dart b/lib/foundation/image_provider/base_image_provider.dart
index 15f41ab..788456a 100644
--- a/lib/foundation/image_provider/base_image_provider.dart
+++ b/lib/foundation/image_provider/base_image_provider.dart
@@ -27,10 +27,8 @@ abstract class BaseImageProvider<T extends BaseImageProvider<T>>
             screen.size.height * _normalComicImageRatio,
           );
         } else {
-          _effectiveScreenWidth = max(
-            _effectiveScreenWidth ?? 0,
-            screen.size.width
-          );
+          _effectiveScreenWidth =
+              max(_effectiveScreenWidth ?? 0, screen.size.width);
         }
       }
       if (_effectiveScreenWidth! < _minComicImageWidth) {
@@ -110,7 +108,10 @@ abstract class BaseImageProvider<T extends BaseImageProvider<T>>
 
       try {
         final buffer = await ImmutableBuffer.fromUint8List(data);
-        return await decode(buffer, getTargetSize: _getTargetSize);
+        return await decode(
+          buffer,
+          getTargetSize: enableResize ? _getTargetSize : null,
+        );
       } catch (e) {
         await CacheManager().delete(this.key);
         if (data.length < 2 * 1024) {
@@ -151,6 +152,8 @@ abstract class BaseImageProvider<T extends BaseImageProvider<T>>
   String toString() {
     return "$runtimeType($key)";
   }
+
+  bool get enableResize => false;
 }
 
 typedef FileDecoderCallback = Future<ui.Codec> Function(Uint8List);
diff --git a/lib/foundation/image_provider/reader_image.dart b/lib/foundation/image_provider/reader_image.dart
index 1686040..b92b524 100644
--- a/lib/foundation/image_provider/reader_image.dart
+++ b/lib/foundation/image_provider/reader_image.dart
@@ -49,4 +49,7 @@ class ReaderImageProvider
 
   @override
   String get key => "$imageKey@$sourceKey@$cid@$eid";
+
+  @override
+  bool get enableResize => true;
 }

From a55e4eff673ae979fd3ba84fd1e90351d3edc3d2 Mon Sep 17 00:00:00 2001
From: nyne <me@nyne.dev>
Date: Tue, 17 Dec 2024 17:21:10 +0800
Subject: [PATCH 03/18] Update to flutter 3.27.1 & Fix android build

---
 android/app/src/main/AndroidManifest.xml | 1 -
 pubspec.lock                             | 4 ++--
 pubspec.yaml                             | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index f21ec14..2d833ce 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -53,7 +53,6 @@
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
-        <meta-data android:name="io.flutter.embedding.android.EnableImpeller" android:value="false"/>
     </application>
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility and
diff --git a/pubspec.lock b/pubspec.lock
index 401089e..fa252d6 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1126,10 +1126,10 @@ packages:
     dependency: "direct main"
     description:
       name: zip_flutter
-      sha256: "72b85f84dc5737e1c1dd7ed97ed0242f397872acc8d03044a5789b466dbf42b2"
+      sha256: "71373aad51bf4ab287f75a33d0ff3b45828482c3364f5f799f80019d2a284d8e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.0.2"
+    version: "0.0.3"
 sdks:
   dart: ">=3.6.0 <4.0.0"
   flutter: ">=3.27.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index b2c8950..ae9b3a9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -6,7 +6,7 @@ version: 1.1.1+111
 
 environment:
   sdk: '>=3.6.0 <4.0.0'
-  flutter: 3.27.0
+  flutter: 3.27.1
 
 dependencies:
   flutter:
@@ -51,7 +51,7 @@ dependencies:
   sliver_tools: ^0.2.12
   flutter_file_dialog: ^3.0.2
   file_selector: ^1.0.3
-  zip_flutter: ^0.0.2
+  zip_flutter: ^0.0.3
   lodepng_flutter:
     git:
       url: https://github.com/venera-app/lodepng_flutter

From d08383e14b9bfb3351d6d1a741cbf3113dfe5d18 Mon Sep 17 00:00:00 2001
From: nyne <me@nyne.dev>
Date: Tue, 17 Dec 2024 20:11:18 +0800
Subject: [PATCH 04/18] disable Impeller

---
 android/app/src/main/AndroidManifest.xml | 2 ++
 pubspec.lock                             | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 2d833ce..f6483fe 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -53,6 +53,8 @@
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
+        <!-- [flutter 3.27.1] Impeller is still worse than skia, disable it -->
+        <meta-data android:name="io.flutter.embedding.android.EnableImpeller" android:value="false"/>
     </application>
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility and
diff --git a/pubspec.lock b/pubspec.lock
index fa252d6..ced5c8c 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1132,4 +1132,4 @@ packages:
     version: "0.0.3"
 sdks:
   dart: ">=3.6.0 <4.0.0"
-  flutter: ">=3.27.0"
+  flutter: ">=3.27.1"

From 7e608be70f844107005c211acaf1d20fc1749772 Mon Sep 17 00:00:00 2001
From: nyne <me@nyne.dev>
Date: Wed, 18 Dec 2024 14:15:08 +0800
Subject: [PATCH 05/18] test zip_flutter

---
 pubspec.lock | 9 +++++----
 pubspec.yaml | 5 ++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index ced5c8c..f0419c3 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1125,10 +1125,11 @@ packages:
   zip_flutter:
     dependency: "direct main"
     description:
-      name: zip_flutter
-      sha256: "71373aad51bf4ab287f75a33d0ff3b45828482c3364f5f799f80019d2a284d8e"
-      url: "https://pub.dev"
-    source: hosted
+      path: "."
+      ref: "6d0c09e"
+      resolved-ref: "6d0c09e90b245166d41a66da2bc649d1c56e64d3"
+      url: "https://github.com/wgh136/zip_flutter"
+    source: git
     version: "0.0.3"
 sdks:
   dart: ">=3.6.0 <4.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index ae9b3a9..cb6c1b4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -51,7 +51,10 @@ dependencies:
   sliver_tools: ^0.2.12
   flutter_file_dialog: ^3.0.2
   file_selector: ^1.0.3
-  zip_flutter: ^0.0.3
+  zip_flutter:
+    git:
+      url: https://github.com/wgh136/zip_flutter
+      ref: 6d0c09e
   lodepng_flutter:
     git:
       url: https://github.com/venera-app/lodepng_flutter

From 4763b9c7b4bd4882c83a4edf1d3be67e6ac8033b Mon Sep 17 00:00:00 2001
From: nyne <me@nyne.dev>
Date: Wed, 18 Dec 2024 15:14:27 +0800
Subject: [PATCH 06/18] test zip_flutter

---
 pubspec.lock | 4 ++--
 pubspec.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index f0419c3..af3d58c 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1126,8 +1126,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "6d0c09e"
-      resolved-ref: "6d0c09e90b245166d41a66da2bc649d1c56e64d3"
+      ref: "51007a0"
+      resolved-ref: "51007a0c1f34ee7865ef3bdededf40e5f5df85bd"
       url: "https://github.com/wgh136/zip_flutter"
     source: git
     version: "0.0.3"
diff --git a/pubspec.yaml b/pubspec.yaml
index cb6c1b4..f50c1a7 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -54,7 +54,7 @@ dependencies:
   zip_flutter:
     git:
       url: https://github.com/wgh136/zip_flutter
-      ref: 6d0c09e
+      ref: 51007a0
   lodepng_flutter:
     git:
       url: https://github.com/venera-app/lodepng_flutter

From be45a069813f3e584fecc7176381daee421dc763 Mon Sep 17 00:00:00 2001
From: deltamaya <deltamaya553@gmail.com>
Date: Wed, 18 Dec 2024 15:25:32 +0800
Subject: [PATCH 07/18] update minimum support platform version

---
 ios/Podfile   |  2 +-
 macos/Podfile | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 macos/Podfile

diff --git a/ios/Podfile b/ios/Podfile
index 3da15a0..f2c33c6 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '14.0'
+platform :ios, '15.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/macos/Podfile b/macos/Podfile
new file mode 100644
index 0000000..b15254e
--- /dev/null
+++ b/macos/Podfile
@@ -0,0 +1,43 @@
+platform :osx, '12.0'
+
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+project 'Runner', {
+  'Debug' => :debug,
+  'Profile' => :release,
+  'Release' => :release,
+}
+
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first"
+  end
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
+  end
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\""
+end
+
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_macos_podfile_setup
+
+target 'Runner' do
+  use_frameworks!
+  use_modular_headers!
+
+  flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
+  target 'RunnerTests' do
+    inherit! :search_paths
+  end
+end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    flutter_additional_macos_build_settings(target)
+  end
+end

From 06a6e5156a0fd540a2eab97b2d8c8f0626e423c4 Mon Sep 17 00:00:00 2001
From: nyne <me@nyne.dev>
Date: Wed, 18 Dec 2024 15:48:35 +0800
Subject: [PATCH 08/18] Fix minimum support platform version

---
 macos/Runner.xcodeproj/project.pbxproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj
index f51708e..d457ba3 100644
--- a/macos/Runner.xcodeproj/project.pbxproj
+++ b/macos/Runner.xcodeproj/project.pbxproj
@@ -557,7 +557,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -639,7 +639,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -689,7 +689,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;

From f9c42aef4b41b32b78ddcebaaf89b45b98569c42 Mon Sep 17 00:00:00 2001
From: nyne <me@nyne.dev>
Date: Wed, 18 Dec 2024 16:51:57 +0800
Subject: [PATCH 09/18] fix #98

---
 assets/translation.json                       |  12 ++-
 lib/foundation/appdata.dart                   |   1 +
 lib/foundation/comic_type.dart                |   8 ++
 lib/pages/favorites/favorites_page.dart       |   1 +
 lib/pages/favorites/local_favorites_page.dart |  37 ++++---
 lib/pages/reader/loading.dart                 | 101 ++++++++++++++++++
 lib/pages/reader/reader.dart                  |   3 +
 lib/pages/settings/local_favorites.dart       |  22 ++--
 pubspec.lock                                  |  20 ++--
 pubspec.yaml                                  |   8 +-
 10 files changed, 172 insertions(+), 41 deletions(-)
 create mode 100644 lib/pages/reader/loading.dart

diff --git a/assets/translation.json b/assets/translation.json
index 974be32..bd5a745 100644
--- a/assets/translation.json
+++ b/assets/translation.json
@@ -251,7 +251,11 @@
     "Aggregated Search": "聚合搜索",
     "No search results found": "未找到搜索结果",
     "Added @c comics to download queue." : "已添加 @c 本漫画到下载队列",
-    "Download started": "下载已开始"
+    "Download started": "下载已开始",
+    "Click favorite": "点击收藏",
+    "End": "末尾",
+    "None": "无",
+    "View Detail": "查看详情"
   },
   "zh_TW": {
     "Home": "首頁",
@@ -505,6 +509,10 @@
     "Aggregated Search": "聚合搜索",
     "No search results found": "未找到搜索結果",
     "Added @c comics to download queue." : "已添加 @c 本漫畫到下載隊列",
-    "Download started": "下載已開始"
+    "Download started": "下載已開始",
+    "Click favorite": "點擊收藏",
+    "End": "末尾",
+    "None": "無",
+    "View Detail": "查看詳情"
   }
 }
\ No newline at end of file
diff --git a/lib/foundation/appdata.dart b/lib/foundation/appdata.dart
index 128d0bf..dc49623 100644
--- a/lib/foundation/appdata.dart
+++ b/lib/foundation/appdata.dart
@@ -122,6 +122,7 @@ class _Settings with ChangeNotifier {
     'enableClockAndBatteryInfoInReader': true,
     'ignoreCertificateErrors': false,
     'authorizationRequired': false,
+    'onClickFavorite': 'viewDetail', // viewDetail, read
   };
 
   operator [](String key) {
diff --git a/lib/foundation/comic_type.dart b/lib/foundation/comic_type.dart
index 36c8ad6..6fa31ef 100644
--- a/lib/foundation/comic_type.dart
+++ b/lib/foundation/comic_type.dart
@@ -28,4 +28,12 @@ class ComicType {
   }
 
   static const local = ComicType(0);
+
+  factory ComicType.fromKey(String key) {
+    if(key == "local") {
+      return local;
+    } else {
+      return ComicType(key.hashCode);
+    }
+  }
 }
\ No newline at end of file
diff --git a/lib/pages/favorites/favorites_page.dart b/lib/pages/favorites/favorites_page.dart
index 335b40c..47b868f 100644
--- a/lib/pages/favorites/favorites_page.dart
+++ b/lib/pages/favorites/favorites_page.dart
@@ -14,6 +14,7 @@ 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/pages/reader/reader.dart';
 import 'package:venera/utils/io.dart';
 import 'package:venera/utils/translations.dart';
 
diff --git a/lib/pages/favorites/local_favorites_page.dart b/lib/pages/favorites/local_favorites_page.dart
index 44049d3..256d763 100644
--- a/lib/pages/favorites/local_favorites_page.dart
+++ b/lib/pages/favorites/local_favorites_page.dart
@@ -389,22 +389,29 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
               ),
             ];
           },
-          onTap: multiSelectMode
-              ? (c) {
-                  setState(() {
-                    if (selectedComics.containsKey(c as FavoriteItem)) {
-                      selectedComics.remove(c);
-                      _checkExitSelectMode();
-                    } else {
-                      selectedComics[c] = true;
-                    }
-                    lastSelectedIndex = comics.indexOf(c);
-                  });
+          onTap: (c) {
+            if (multiSelectMode) {
+              setState(() {
+                if (selectedComics.containsKey(c as FavoriteItem)) {
+                  selectedComics.remove(c);
+                  _checkExitSelectMode();
+                } else {
+                  selectedComics[c] = true;
                 }
-              : (c) {
-                  App.mainNavigatorKey?.currentContext
-                      ?.to(() => ComicPage(id: c.id, sourceKey: c.sourceKey));
-                },
+                lastSelectedIndex = comics.indexOf(c);
+              });
+            } else if (appdata.settings["onClickFavorite"] == "viewDetail") {
+              App.mainNavigatorKey?.currentContext
+                  ?.to(() => ComicPage(id: c.id, sourceKey: c.sourceKey));
+            } else {
+              App.mainNavigatorKey?.currentContext?.to(
+                () => ReaderWithLoading(
+                  id: c.id,
+                  sourceKey: c.sourceKey,
+                ),
+              );
+            }
+          },
           onLongPressed: (c) {
             setState(() {
               if (!multiSelectMode) {
diff --git a/lib/pages/reader/loading.dart b/lib/pages/reader/loading.dart
new file mode 100644
index 0000000..682f457
--- /dev/null
+++ b/lib/pages/reader/loading.dart
@@ -0,0 +1,101 @@
+part of 'reader.dart';
+
+class ReaderWithLoading extends StatefulWidget {
+  const ReaderWithLoading({
+    super.key,
+    required this.id,
+    required this.sourceKey,
+  });
+
+  final String id;
+
+  final String sourceKey;
+
+  @override
+  State<ReaderWithLoading> createState() => _ReaderWithLoadingState();
+}
+
+class _ReaderWithLoadingState
+    extends LoadingState<ReaderWithLoading, ReaderProps> {
+  @override
+  Widget buildContent(BuildContext context, ReaderProps data) {
+    return Reader(
+      type: data.type,
+      cid: data.cid,
+      name: data.name,
+      chapters: data.chapters,
+      history: data.history,
+    );
+  }
+
+  @override
+  Future<Res<ReaderProps>> loadData() async {
+    var comicSource = ComicSource.find(widget.sourceKey);
+    var history = HistoryManager().findSync(
+      widget.id,
+      ComicType.fromKey(widget.sourceKey),
+    );
+    if (comicSource == null) {
+      var localComic = LocalManager().find(
+        widget.id,
+        ComicType.fromKey(widget.sourceKey),
+      );
+      if (localComic == null) {
+        return Res.error("comic not found");
+      }
+      return Res(
+        ReaderProps(
+          type: ComicType.fromKey(widget.sourceKey),
+          cid: widget.id,
+          name: localComic.title,
+          chapters: localComic.chapters,
+          history: history ??
+              History.fromModel(
+                model: localComic,
+                ep: 0,
+                page: 0,
+              ),
+        ),
+      );
+    } else {
+      var comic = await comicSource.loadComicInfo!(widget.id);
+      if (comic.error) {
+        return Res.fromErrorRes(comic);
+      }
+      return Res(
+        ReaderProps(
+          type: ComicType.fromKey(widget.sourceKey),
+          cid: widget.id,
+          name: comic.data.title,
+          chapters: comic.data.chapters,
+          history: history ??
+              History.fromModel(
+                model: comic.data,
+                ep: 0,
+                page: 0,
+              ),
+        ),
+      );
+    }
+  }
+}
+
+class ReaderProps {
+  final ComicType type;
+
+  final String cid;
+
+  final String name;
+
+  final Map<String, String>? chapters;
+
+  final History history;
+
+  const ReaderProps({
+    required this.type,
+    required this.cid,
+    required this.name,
+    required this.chapters,
+    required this.history,
+  });
+}
diff --git a/lib/pages/reader/reader.dart b/lib/pages/reader/reader.dart
index dc03af6..ec04d06 100644
--- a/lib/pages/reader/reader.dart
+++ b/lib/pages/reader/reader.dart
@@ -18,11 +18,13 @@ 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';
+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/image_provider/reader_image.dart';
 import 'package:venera/foundation/local.dart';
 import 'package:venera/foundation/log.dart';
+import 'package:venera/foundation/res.dart';
 import 'package:venera/pages/settings/settings_page.dart';
 import 'package:venera/utils/data_sync.dart';
 import 'package:venera/utils/file_type.dart';
@@ -36,6 +38,7 @@ part 'scaffold.dart';
 part 'images.dart';
 part 'gesture.dart';
 part 'comic_image.dart';
+part 'loading.dart';
 
 extension _ReaderContext on BuildContext {
   _ReaderState get reader => findAncestorStateOfType<_ReaderState>()!;
diff --git a/lib/pages/settings/local_favorites.dart b/lib/pages/settings/local_favorites.dart
index c35f9a3..04511fa 100644
--- a/lib/pages/settings/local_favorites.dart
+++ b/lib/pages/settings/local_favorites.dart
@@ -16,18 +16,18 @@ class _LocalFavoritesSettingsState extends State<LocalFavoritesSettings> {
         SelectSetting(
           title: "Add new favorite to".tl,
           settingKey: "newFavoriteAddTo",
-          optionTranslation: const {
-            "start": "Start",
-            "end": "End",
+          optionTranslation: {
+            "start": "Start".tl,
+            "end": "End".tl,
           },
         ).toSliver(),
         SelectSetting(
           title: "Move favorite after reading".tl,
           settingKey: "moveFavoriteAfterRead",
-          optionTranslation: const {
-            "none": "None",
-            "end": "End",
-            "start": "Start",
+          optionTranslation: {
+            "none": "None".tl,
+            "end": "End".tl,
+            "start": "Start".tl,
           },
         ).toSliver(),
         SelectSetting(
@@ -48,6 +48,14 @@ class _LocalFavoritesSettingsState extends State<LocalFavoritesSettings> {
           },
           actionTitle: 'Delete'.tl,
         ).toSliver(),
+        SelectSetting(
+          title: "Click favorite".tl,
+          settingKey: "onClickFavorite",
+          optionTranslation: {
+            "viewDetail": "View Detail".tl,
+            "read": "Read".tl,
+          },
+        ).toSliver(),
       ],
     );
   }
diff --git a/pubspec.lock b/pubspec.lock
index af3d58c..916f35e 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -446,11 +446,10 @@ packages:
   flutter_to_arch:
     dependency: "direct dev"
     description:
-      path: "."
-      ref: HEAD
-      resolved-ref: "15bfead0380fda79b0256b37c73b886b0882f1bf"
-      url: "https://github.com/wgh136/flutter_to_arch"
-    source: git
+      name: flutter_to_arch
+      sha256: "656cffc182b05af38aa96a1115931620b8865c4b0cfe00813b26fcff0875f2ab"
+      url: "https://pub.dev"
+    source: hosted
     version: "1.0.0"
   flutter_to_debian:
     dependency: "direct dev"
@@ -1125,12 +1124,11 @@ packages:
   zip_flutter:
     dependency: "direct main"
     description:
-      path: "."
-      ref: "51007a0"
-      resolved-ref: "51007a0c1f34ee7865ef3bdededf40e5f5df85bd"
-      url: "https://github.com/wgh136/zip_flutter"
-    source: git
-    version: "0.0.3"
+      name: zip_flutter
+      sha256: "78c9b6053117828581346d24b07943ba6d3032a13f68d15c133bc21df2cf178a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.0.4"
 sdks:
   dart: ">=3.6.0 <4.0.0"
   flutter: ">=3.27.1"
diff --git a/pubspec.yaml b/pubspec.yaml
index f50c1a7..096574d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -51,10 +51,7 @@ dependencies:
   sliver_tools: ^0.2.12
   flutter_file_dialog: ^3.0.2
   file_selector: ^1.0.3
-  zip_flutter:
-    git:
-      url: https://github.com/wgh136/zip_flutter
-      ref: 51007a0
+  zip_flutter: ^0.0.4
   lodepng_flutter:
     git:
       url: https://github.com/venera-app/lodepng_flutter
@@ -79,8 +76,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   flutter_lints: ^5.0.0
-  flutter_to_arch:
-    git: https://github.com/wgh136/flutter_to_arch
+  flutter_to_arch: ^1.0.0
   flutter_to_debian:
 
 flutter:

From 43d724dd276a1dbe990e6d5a41c000f47f6978ed Mon Sep 17 00:00:00 2001
From: nyne <me@nyne.dev>
Date: Wed, 18 Dec 2024 17:08:03 +0800
Subject: [PATCH 10/18] fix #97

---
 lib/foundation/comic_source/models.dart | 6 +++---
 lib/pages/comic_page.dart               | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/foundation/comic_source/models.dart b/lib/foundation/comic_source/models.dart
index 4e98f4c..7a137d6 100644
--- a/lib/foundation/comic_source/models.dart
+++ b/lib/foundation/comic_source/models.dart
@@ -145,7 +145,7 @@ class ComicDetails with HistoryMixin {
 
   final int? likesCount;
 
-  final int? commentsCount;
+  final int? commentCount;
 
   final String? uploader;
 
@@ -189,7 +189,7 @@ class ComicDetails with HistoryMixin {
         subId = json["subId"],
         likesCount = json["likesCount"],
         isLiked = json["isLiked"],
-        commentsCount = json["commentsCount"],
+        commentCount = json["commentCount"],
         uploader = json["uploader"],
         uploadTime = json["uploadTime"],
         updateTime = json["updateTime"],
@@ -216,7 +216,7 @@ class ComicDetails with HistoryMixin {
       "subId": subId,
       "isLiked": isLiked,
       "likesCount": likesCount,
-      "commentsCount": commentsCount,
+      "commentsCount": commentCount,
       "uploader": uploader,
       "uploadTime": uploadTime,
       "updateTime": updateTime,
diff --git a/lib/pages/comic_page.dart b/lib/pages/comic_page.dart
index 58c46f0..5f554ce 100644
--- a/lib/pages/comic_page.dart
+++ b/lib/pages/comic_page.dart
@@ -292,7 +292,7 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
               if (comicSource.commentsLoader != null)
                 _ActionButton(
                   icon: const Icon(Icons.comment),
-                  text: (comic.commentsCount ?? 'Comments'.tl).toString(),
+                  text: (comic.commentCount ?? 'Comments'.tl).toString(),
                   onPressed: showComments,
                   iconColor: context.useTextColor(Colors.green),
                 ),

From 8b9fd0d03d3aadc5f4c01b820fe4c4ec0a026280 Mon Sep 17 00:00:00 2001
From: nyne <me@nyne.dev>
Date: Wed, 18 Dec 2024 17:19:34 +0800
Subject: [PATCH 11/18] improve pop_up_widget and side_bar in dark mode

---
 lib/components/pop_up_widget.dart | 17 ++++++++++++-----
 lib/components/side_bar.dart      | 16 ++++++++++++----
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/lib/components/pop_up_widget.dart b/lib/components/pop_up_widget.dart
index 727b7bb..3436af5 100644
--- a/lib/components/pop_up_widget.dart
+++ b/lib/components/pop_up_widget.dart
@@ -22,8 +22,15 @@ class PopUpWidget<T> extends PopupRoute<T> {
     Widget body = PopupIndicatorWidget(
       child: Container(
         decoration: showPopUp
-            ? const BoxDecoration(
+            ? BoxDecoration(
                 borderRadius: BorderRadius.all(Radius.circular(12)),
+                boxShadow: context.brightness == ui.Brightness.dark ? [
+                  BoxShadow(
+                    color: Colors.white.withAlpha(50),
+                    blurRadius: 10,
+                    offset: Offset(0, 2),
+                  ),
+                ] : null,
               )
             : null,
         clipBehavior: showPopUp ? Clip.antiAlias : Clip.none,
@@ -86,7 +93,8 @@ class PopupIndicatorWidget extends InheritedWidget {
 }
 
 Future<T> showPopUpWidget<T>(BuildContext context, Widget widget) async {
-  return await Navigator.of(context, rootNavigator: true).push(PopUpWidget(widget));
+  return await Navigator.of(context, rootNavigator: true)
+      .push(PopUpWidget(widget));
 }
 
 class PopUpWidgetScaffold extends StatefulWidget {
@@ -127,9 +135,8 @@ class _PopUpWidgetScaffoldState extends State<PopUpWidgetScaffold> {
                   message: "Back".tl,
                   child: IconButton(
                     icon: const Icon(Icons.arrow_back_sharp),
-                    onPressed: () => context.canPop()
-                        ? context.pop()
-                        : App.pop(),
+                    onPressed: () =>
+                        context.canPop() ? context.pop() : App.pop(),
                   ),
                 ),
                 const SizedBox(
diff --git a/lib/components/side_bar.dart b/lib/components/side_bar.dart
index 1afb208..752cae4 100644
--- a/lib/components/side_bar.dart
+++ b/lib/components/side_bar.dart
@@ -57,10 +57,18 @@ class SideBarRoute<T> extends PopupRoute<T> {
 
     body = Container(
       decoration: BoxDecoration(
-          borderRadius: showSideBar
-              ? const BorderRadius.horizontal(left: Radius.circular(16))
-              : null,
-          color: Theme.of(context).colorScheme.surfaceTint),
+        borderRadius: showSideBar
+            ? const BorderRadius.horizontal(left: Radius.circular(16))
+            : null,
+        color: Theme.of(context).colorScheme.surfaceTint,
+        boxShadow: context.brightness == ui.Brightness.dark ? [
+          BoxShadow(
+            color: Colors.white.withAlpha(50),
+            blurRadius: 10,
+            offset: Offset(0, 2),
+          ),
+        ] : null,
+      ),
       clipBehavior: Clip.antiAlias,
       constraints: BoxConstraints(maxWidth: sideBarWidth),
       height: MediaQuery.of(context).size.height,

From abaeaf4f7799d9ca2dc03688b42dab7a8aab0507 Mon Sep 17 00:00:00 2001
From: nyne <me@nyne.dev>
Date: Wed, 18 Dec 2024 17:37:03 +0800
Subject: [PATCH 12/18] improve mouse hover effects on click areas

---
 lib/components/gesture.dart | 22 +++++++++++++++++++---
 lib/pages/home_page.dart    | 14 ++++++--------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/lib/components/gesture.dart b/lib/components/gesture.dart
index 5efc32f..10bc71e 100644
--- a/lib/components/gesture.dart
+++ b/lib/components/gesture.dart
@@ -41,13 +41,29 @@ class AnimatedTapRegion extends StatefulWidget {
 }
 
 class _AnimatedTapRegionState extends State<AnimatedTapRegion> {
+  bool isScaled = false;
+
   bool isHovered = false;
 
   @override
   Widget build(BuildContext context) {
     return MouseRegion(
-      onEnter: (_) => setState(() => isHovered = true),
-      onExit: (_) => setState(() => isHovered = false),
+      onEnter: (_) {
+        isHovered = true;
+        if (!isScaled) {
+          Future.delayed(const Duration(milliseconds: 100), () {
+            if (isHovered) {
+              setState(() => isScaled = true);
+            }
+          });
+        }
+      },
+      onExit: (_) {
+        isHovered = false;
+        if(isScaled) {
+          setState(() => isScaled = false);
+        }
+      },
       child: GestureDetector(
         onTap: widget.onTap,
         child: ClipRRect(
@@ -55,7 +71,7 @@ class _AnimatedTapRegionState extends State<AnimatedTapRegion> {
           clipBehavior: Clip.antiAlias,
           child: AnimatedScale(
             duration: _fastAnimationDuration,
-            scale: isHovered ? 1.1 : 1,
+            scale: isScaled ? 1.1 : 1,
             child: widget.child,
           ),
         ),
diff --git a/lib/pages/home_page.dart b/lib/pages/home_page.dart
index 217df27..d75d89f 100644
--- a/lib/pages/home_page.dart
+++ b/lib/pages/home_page.dart
@@ -264,7 +264,8 @@ class _HistoryState extends State<_History> {
                     scrollDirection: Axis.horizontal,
                     itemCount: history.length,
                     itemBuilder: (context, index) {
-                      return InkWell(
+                      return AnimatedTapRegion(
+                        borderRadius: 8,
                         onTap: () {
                           context.to(
                             () => ComicPage(
@@ -273,11 +274,9 @@ class _HistoryState extends State<_History> {
                             ),
                           );
                         },
-                        borderRadius: BorderRadius.circular(8),
                         child: Container(
                           width: 92,
                           height: 114,
-                          margin: const EdgeInsets.symmetric(horizontal: 8),
                           decoration: BoxDecoration(
                             borderRadius: BorderRadius.circular(8),
                             color: Theme.of(context)
@@ -293,7 +292,7 @@ class _HistoryState extends State<_History> {
                             filterQuality: FilterQuality.medium,
                           ),
                         ),
-                      );
+                      ).paddingHorizontal(8);
                     },
                   ),
                 ).paddingHorizontal(8).paddingBottom(16),
@@ -386,15 +385,14 @@ class _LocalState extends State<_Local> {
                     scrollDirection: Axis.horizontal,
                     itemCount: local.length,
                     itemBuilder: (context, index) {
-                      return InkWell(
+                      return AnimatedTapRegion(
                         onTap: () {
                           local[index].read();
                         },
-                        borderRadius: BorderRadius.circular(8),
+                        borderRadius: 8,
                         child: Container(
                           width: 92,
                           height: 114,
-                          margin: const EdgeInsets.symmetric(horizontal: 8),
                           decoration: BoxDecoration(
                             borderRadius: BorderRadius.circular(8),
                             color: Theme.of(context)
@@ -412,7 +410,7 @@ class _LocalState extends State<_Local> {
                             filterQuality: FilterQuality.medium,
                           ),
                         ),
-                      );
+                      ).paddingHorizontal(8);
                     },
                   ),
                 ).paddingHorizontal(8),

From 929ec88e840619e4caaedf96906d6d4336a1de23 Mon Sep 17 00:00:00 2001
From: nyne <me@nyne.dev>
Date: Wed, 18 Dec 2024 17:58:18 +0800
Subject: [PATCH 13/18] Fixed issue where deleting a download caused favourites
 to be deleted.

---
 lib/foundation/local.dart | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/foundation/local.dart b/lib/foundation/local.dart
index 865849e..b1d0601 100644
--- a/lib/foundation/local.dart
+++ b/lib/foundation/local.dart
@@ -473,13 +473,15 @@ class LocalManager with ChangeNotifier {
       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);
+    // Deleting a local comic means that it's nolonger available, thus both favorite and history should be deleted.
+    if(c.comicType == ComicType.local) {
+      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();

From eb1abfc02ac84546b67a738c86b338a1e4a18978 Mon Sep 17 00:00:00 2001
From: nyne <me@nyne.dev>
Date: Wed, 18 Dec 2024 19:13:35 +0800
Subject: [PATCH 14/18] Fixed the issue where the images of multi-chapter comic
 are downloaded to invalid folder.

---
 lib/network/download.dart | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/network/download.dart b/lib/network/download.dart
index 7657549..cb659d3 100644
--- a/lib/network/download.dart
+++ b/lib/network/download.dart
@@ -146,14 +146,19 @@ class ImagesDownloadTask extends DownloadTask with _TransferSpeedMixin {
 
   String? _cover;
 
+  /// All images to download, key is chapter name
   Map<String, List<String>>? _images;
 
+  /// Downloaded image count
   int _downloadedCount = 0;
 
+  /// Total image count
   int _totalCount = 0;
 
+  /// Current downloading image index
   int _index = 0;
 
+  /// Current downloading chapter, index of [_images]
   int _chapter = 0;
 
   var tasks = <int, _ImageDownloadWrapper>{};
@@ -180,10 +185,10 @@ class ImagesDownloadTask extends DownloadTask with _TransferSpeedMixin {
       if (comic!.chapters != null) {
         saveTo = Directory(FilePath.join(
           path!,
-          comic!.chapters!.keys.elementAt(_chapter),
+          _images!.keys.elementAt(_chapter),
         ));
         if (!saveTo.existsSync()) {
-          saveTo.createSync();
+          saveTo.createSync(recursive: true);
         }
       } else {
         saveTo = Directory(path!);

From ea973a2787ef73215a356ee58110b4e11f2752a0 Mon Sep 17 00:00:00 2001
From: nyne <me@nyne.dev>
Date: Wed, 18 Dec 2024 19:36:54 +0800
Subject: [PATCH 15/18] fix #92

---
 assets/translation.json     | 10 ++++++++--
 lib/pages/home_page.dart    |  5 ++++-
 lib/utils/import_comic.dart | 27 +++++++++++++++++++++++++++
 lib/utils/io.dart           |  1 +
 4 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/assets/translation.json b/assets/translation.json
index bd5a745..61cb8bc 100644
--- a/assets/translation.json
+++ b/assets/translation.json
@@ -255,7 +255,10 @@
     "Click favorite": "点击收藏",
     "End": "末尾",
     "None": "无",
-    "View Detail": "查看详情"
+    "View Detail": "查看详情",
+    "Select a directory which contains multiple cbz/zip files." : "选择一个包含多个cbz/zip文件的目录",
+    "Multiple cbz files" : "多个cbz文件",
+    "No valid comics found" : "未找到有效的漫画"
   },
   "zh_TW": {
     "Home": "首頁",
@@ -513,6 +516,9 @@
     "Click favorite": "點擊收藏",
     "End": "末尾",
     "None": "無",
-    "View Detail": "查看詳情"
+    "View Detail": "查看詳情",
+    "Select a directory which contains multiple cbz/zip files." : "選擇一個包含多個cbz/zip文件的目錄",
+    "Multiple cbz files" : "多個cbz文件",
+    "No valid comics found" : "未找到有效的漫畫"
   }
 }
\ No newline at end of file
diff --git a/lib/pages/home_page.dart b/lib/pages/home_page.dart
index d75d89f..e6cf73b 100644
--- a/lib/pages/home_page.dart
+++ b/lib/pages/home_page.dart
@@ -495,12 +495,14 @@ class _ImportComicsWidgetState extends State<_ImportComicsWidget> {
       "Select a directory which contains the comic files.".tl,
       "Select a directory which contains the comic directories.".tl,
       "Select a cbz/zip file.".tl,
+      "Select a directory which contains multiple cbz/zip files.".tl,
       "Select an EhViewer database and a download folder.".tl
     ][type];
     List<String> importMethods = [
       "Single Comic".tl,
       "Multiple Comics".tl,
       "A cbz file".tl,
+      "Multiple cbz files".tl,
       "EhViewer downloads".tl
     ];
 
@@ -628,7 +630,8 @@ class _ImportComicsWidgetState extends State<_ImportComicsWidget> {
       0 => await importer.directory(true),
       1 => await importer.directory(false),
       2 => await importer.cbz(),
-      3 => await importer.ehViewer(),
+      3 => await importer.multipleCbz(),
+      4 => await importer.ehViewer(),
       int() => true,
     };
     if(result) {
diff --git a/lib/utils/import_comic.dart b/lib/utils/import_comic.dart
index d2db6ff..05ac47a 100644
--- a/lib/utils/import_comic.dart
+++ b/lib/utils/import_comic.dart
@@ -37,6 +37,33 @@ class ImportComic {
     return registerComics(imported, false);
   }
 
+  Future<bool> multipleCbz() async {
+    var picker = DirectoryPicker();
+    var dir = await picker.pickDirectory();
+    if (dir != null) {
+      var files = (await dir.list().toList()).whereType<File>().toList();
+      files.removeWhere((e) => e.extension != 'cbz' && e.extension != 'zip');
+      Map<String?, List<LocalComic>> imported = {};
+      var controller = showLoadingDialog(App.rootContext, allowCancel: false);
+      var comics = <LocalComic>[];
+      for (var file in files) {
+        try {
+          var comic = await CBZ.import(file);
+          comics.add(comic);
+        } catch (e, s) {
+          Log.error("Import Comic", e.toString(), s);
+        }
+      }
+      if (comics.isEmpty) {
+        App.rootContext.showMessage(message: "No valid comics found".tl);
+      }
+      imported[selectedFolder] = comics;
+      controller.close();
+      return registerComics(imported, false);
+    }
+    return false;
+  }
+
   Future<bool> ehViewer() async {
     var dbFile = await selectFile(ext: ['db']);
     final picker = DirectoryPicker();
diff --git a/lib/utils/io.dart b/lib/utils/io.dart
index b577eeb..307e6a5 100644
--- a/lib/utils/io.dart
+++ b/lib/utils/io.dart
@@ -72,6 +72,7 @@ extension FileSystemEntityExt on FileSystemEntity {
 }
 
 extension FileExtension on File {
+  /// Get the file extension, not including the dot.
   String get extension => path.split('.').last;
 
   /// Copy the file to the specified path using memory.

From 24c5a1bb010f5972ef419c15ebfa8075d1ab5d57 Mon Sep 17 00:00:00 2001
From: nyne <me@nyne.dev>
Date: Wed, 18 Dec 2024 20:04:45 +0800
Subject: [PATCH 16/18] Improve local comics page

---
 lib/components/comic.dart                 |   2 +-
 lib/pages/favorites/favorite_actions.dart |  30 +--
 lib/pages/local_comics_page.dart          | 247 +++++++++++-----------
 pubspec.lock                              |   4 +-
 pubspec.yaml                              |   2 +-
 5 files changed, 141 insertions(+), 144 deletions(-)

diff --git a/lib/components/comic.dart b/lib/components/comic.dart
index 41cccab..b131e4d 100644
--- a/lib/components/comic.dart
+++ b/lib/components/comic.dart
@@ -77,7 +77,7 @@ class ComicTile extends StatelessWidget {
           icon: Icons.stars_outlined,
           text: 'Add to favorites'.tl,
           onClick: () {
-            addFavorite(comic);
+            addFavorite([comic]);
           },
         ),
         MenuEntry(
diff --git a/lib/pages/favorites/favorite_actions.dart b/lib/pages/favorites/favorite_actions.dart
index 23f13f0..6c3a822 100644
--- a/lib/pages/favorites/favorite_actions.dart
+++ b/lib/pages/favorites/favorite_actions.dart
@@ -77,7 +77,7 @@ String? validateFolderName(String newFolderName) {
   return null;
 }
 
-void addFavorite(Comic comic) {
+void addFavorite(List<Comic> comics) {
   var folders = LocalFavoritesManager().folderNames;
 
   showDialog(
@@ -105,19 +105,21 @@ void addFavorite(Comic comic) {
             FilledButton(
               onPressed: () {
                 if (selectedFolder != null) {
-                  LocalFavoritesManager().addComic(
-                    selectedFolder!,
-                    FavoriteItem(
-                      id: comic.id,
-                      name: comic.title,
-                      coverPath: comic.cover,
-                      author: comic.subtitle ?? '',
-                      type: ComicType((comic.sourceKey == 'local'
-                          ? 0
-                          : comic.sourceKey.hashCode)),
-                      tags: comic.tags ?? [],
-                    ),
-                  );
+                  for (var comic in comics) {
+                    LocalFavoritesManager().addComic(
+                      selectedFolder!,
+                      FavoriteItem(
+                        id: comic.id,
+                        name: comic.title,
+                        coverPath: comic.cover,
+                        author: comic.subtitle ?? '',
+                        type: ComicType((comic.sourceKey == 'local'
+                            ? 0
+                            : comic.sourceKey.hashCode)),
+                        tags: comic.tags ?? [],
+                      ),
+                    );
+                  }
                   context.pop();
                 }
               },
diff --git a/lib/pages/local_comics_page.dart b/lib/pages/local_comics_page.dart
index cbbc979..05c6dd8 100644
--- a/lib/pages/local_comics_page.dart
+++ b/lib/pages/local_comics_page.dart
@@ -2,10 +2,10 @@ 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/pages/favorites/favorites_page.dart';
 import 'package:venera/utils/cbz.dart';
 import 'package:venera/utils/epub.dart';
 import 'package:venera/utils/io.dart';
@@ -30,7 +30,7 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
 
   bool multiSelectMode = false;
 
-  Map<Comic, bool> selectedComics = {};
+  Map<LocalComic, bool> selectedComics = {};
 
   void update() {
     if (keyword.isEmpty) {
@@ -117,48 +117,55 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
     );
   }
 
+  Widget buildMultiSelectMenu() {
+    return MenuButton(entries: [
+      MenuEntry(
+        icon: Icons.delete_outline,
+        text: "Delete".tl,
+        onClick: () {
+          deleteComics(selectedComics.keys.toList()).then((value) {
+            if (value) {
+              setState(() {
+                multiSelectMode = false;
+                selectedComics.clear();
+              });
+            }
+          });
+        },
+      ),
+      MenuEntry(
+        icon: Icons.favorite_border,
+        text: "Add to favorites".tl,
+        onClick: () {
+          addFavorite(selectedComics.keys.toList());
+        },
+      ),
+    ]);
+  }
+
+  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);
+    });
+  }
+
   @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),
@@ -172,10 +179,7 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
           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),
+      buildMultiSelectMenu(),
     ];
 
     var body = Scaffold(
@@ -212,19 +216,6 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
                     },
                   ),
                 ),
-                Tooltip(
-                  message: multiSelectMode
-                      ? "Exit Multi-Select".tl
-                      : "Multi-Select".tl,
-                  child: IconButton(
-                    icon: const Icon(Icons.checklist),
-                    onPressed: () {
-                      setState(() {
-                        multiSelectMode = !multiSelectMode;
-                      });
-                    },
-                  ),
-                ),
               ],
             )
           else if (multiSelectMode)
@@ -275,65 +266,42 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
           SliverGridComics(
             comics: comics,
             selections: selectedComics,
-            onTap: multiSelectMode
-                ? (c) {
-                    setState(() {
-                      if (selectedComics.containsKey(c as LocalComic)) {
-                        selectedComics.remove(c);
-                      } else {
-                        selectedComics[c] = true;
-                      }
-                    });
+            onLongPressed: (c) {
+              setState(() {
+                multiSelectMode = true;
+                selectedComics[c as LocalComic] = true;
+              });
+            },
+            onTap: (c) {
+              if(multiSelectMode) {
+                setState(() {
+                  if (selectedComics.containsKey(c as LocalComic)) {
+                    selectedComics.remove(c);
+                  } else {
+                    selectedComics[c] = true;
                   }
-                : (c) {
-                    (c as LocalComic).read();
-                  },
+                  if(selectedComics.isEmpty) {
+                    multiSelectMode = false;
+                  }
+                });
+              } else {
+                (c as LocalComic).read();
+              }
+            },
             menuBuilder: (c) {
               return [
                 MenuEntry(
                     icon: Icons.delete,
                     text: "Delete".tl,
                     onClick: () {
-                      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),
-                                  ),
-                                ],
-                              );
-                            });
+                      deleteComics([c as LocalComic]).then((value) {
+                        if (value && multiSelectMode) {
+                          setState(() {
+                            multiSelectMode = false;
+                            selectedComics.clear();
                           });
+                        }
+                      });
                     }),
                 MenuEntry(
                     icon: Icons.outbox_outlined,
@@ -344,26 +312,14 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
                         allowCancel: false,
                       );
                       try {
-                        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();
-                        }
+                        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,
@@ -391,7 +347,6 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
                       }
                     },
                   ),
-                if (!multiSelectMode)
                   MenuEntry(
                     icon: Icons.import_contacts_outlined,
                     text: "Export as epub".tl,
@@ -444,4 +399,44 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
       child: body,
     );
   }
+
+  Future<bool> deleteComics(List<LocalComic> comics) async {
+    bool isDeleted = false;
+    await showDialog(
+      context: App.rootContext,
+      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();
+                  for (var comic in comics) {
+                    LocalManager().deleteComic(
+                      comic,
+                      removeComicFile,
+                    );
+                  }
+                  isDeleted = true;
+                },
+                child: Text("Confirm".tl),
+              ),
+            ],
+          );
+        });
+      },
+    );
+    return isDeleted;
+  }
 }
diff --git a/pubspec.lock b/pubspec.lock
index 916f35e..fb17d47 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1125,10 +1125,10 @@ packages:
     dependency: "direct main"
     description:
       name: zip_flutter
-      sha256: "78c9b6053117828581346d24b07943ba6d3032a13f68d15c133bc21df2cf178a"
+      sha256: "955b53d58709fcd9feefbed3d41b5522bc5273e677603e9fc67017a81e568d24"
       url: "https://pub.dev"
     source: hosted
-    version: "0.0.4"
+    version: "0.0.5"
 sdks:
   dart: ">=3.6.0 <4.0.0"
   flutter: ">=3.27.1"
diff --git a/pubspec.yaml b/pubspec.yaml
index 096574d..2d7ec68 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -51,7 +51,7 @@ dependencies:
   sliver_tools: ^0.2.12
   flutter_file_dialog: ^3.0.2
   file_selector: ^1.0.3
-  zip_flutter: ^0.0.4
+  zip_flutter: ^0.0.5
   lodepng_flutter:
     git:
       url: https://github.com/venera-app/lodepng_flutter

From 0b8ae2d3776dbc8cb192163189665fabddf4f5dd Mon Sep 17 00:00:00 2001
From: nyne <me@nyne.dev>
Date: Wed, 18 Dec 2024 20:05:59 +0800
Subject: [PATCH 17/18] Update version code

---
 lib/foundation/app.dart | 2 +-
 pubspec.yaml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/foundation/app.dart b/lib/foundation/app.dart
index 385919a..523ff9b 100644
--- a/lib/foundation/app.dart
+++ b/lib/foundation/app.dart
@@ -10,7 +10,7 @@ export "widget_utils.dart";
 export "context.dart";
 
 class _App {
-  final version = "1.1.1";
+  final version = "1.1.2";
 
   bool get isAndroid => Platform.isAndroid;
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 2d7ec68..7573de6 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,7 +2,7 @@ name: venera
 description: "A comic app."
 publish_to: 'none'
 
-version: 1.1.1+111
+version: 1.1.2+112
 
 environment:
   sdk: '>=3.6.0 <4.0.0'

From a70b690d3ce6bed3eeff5908a4be9f78fbb9ab11 Mon Sep 17 00:00:00 2001
From: nyne <me@nyne.dev>
Date: Wed, 18 Dec 2024 20:07:35 +0800
Subject: [PATCH 18/18] Run dart fix

---
 lib/pages/comic_page.dart    | 4 ++--
 lib/pages/reader/images.dart | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/pages/comic_page.dart b/lib/pages/comic_page.dart
index 5f554ce..d78c893 100644
--- a/lib/pages/comic_page.dart
+++ b/lib/pages/comic_page.dart
@@ -172,7 +172,7 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
     isLiked = comic.isLiked ?? false;
     isFavorite = comic.isFavorite ?? false;
     if (comic.chapters == null) {
-      isDownloaded = await LocalManager().isDownloaded(
+      isDownloaded = LocalManager().isDownloaded(
         comic.id,
         comic.comicType,
         0,
@@ -679,7 +679,7 @@ abstract mixin class _ComicPageActions {
       return;
     }
     if (comic.chapters == null &&
-        await LocalManager().isDownloaded(comic.id, comic.comicType, 0)) {
+        LocalManager().isDownloaded(comic.id, comic.comicType, 0)) {
       App.rootContext.showMessage(message: "The comic is downloaded".tl);
       return;
     }
diff --git a/lib/pages/reader/images.dart b/lib/pages/reader/images.dart
index 55fba46..38489a5 100644
--- a/lib/pages/reader/images.dart
+++ b/lib/pages/reader/images.dart
@@ -25,7 +25,7 @@ class _ReaderImagesState extends State<_ReaderImages> {
     if (inProgress) return;
     inProgress = true;
     if (reader.type == ComicType.local ||
-        (await LocalManager()
+        (LocalManager()
             .isDownloaded(reader.cid, reader.type, reader.chapter))) {
       try {
         var images = await LocalManager()