Add mouse scroll speed setting. Close #471

* Add a feature to allow saving custom reader settings for each  comic.

* Comic-specific settings disabled by default

assets/translation.json

@@ -406,7 +406,12 @@
     "Disable Length Limitation": "禁用长度限制",
     "Only valid for this run": "仅对本次运行有效",
     "Logs": "日志",
-    "Export logs": "导出日志"
+    "Export logs": "导出日志",
+    "Clear specific reader settings for all comics": "清除所有漫画的特殊阅读设置",
+    "Clear specific reader settings for this comic": "清除该漫画的特殊阅读设置",
+    "Enable comic specific settings": "启用此漫画特定设置",
+    "Ignore Certificate Errors": "忽略证书错误",
+    "Mouse scroll speed": "鼠标滚动速度"
   },
   "zh_TW": {
     "Home": "首頁",
@@ -815,6 +820,11 @@
     "Disable Length Limitation": "禁用長度限制",
     "Only valid for this run": "僅對本次運行有效",
     "Logs": "日誌",
-    "Export logs": "匯出日誌"
+    "Export logs": "匯出日誌",
+    "Clear specific reader settings for all comics": "清除所有漫畫的特殊閱讀設定",
+    "Clear specific reader settings for this comic": "清除該漫畫的特殊閱讀設定",
+    "Enable comic specific settings": "啟用此漫畫特定設定",
+    "Ignore Certificate Errors": "忽略證書錯誤",
+    "Mouse scroll speed": "滑鼠滾動速度"
   }
 }

lib/components/scroll.dart

@@ -117,16 +117,25 @@ class _SmoothScrollProviderState extends State<SmoothScrollProvider> {
           _futurePosition ??= currentLocation;
           double k = (_futurePosition! - currentLocation).abs() / 1600 + 1;
           _futurePosition = _futurePosition! + pointerSignal.scrollDelta.dy * k;
+          var beforeOffset = (_futurePosition! - currentLocation).abs();
           _futurePosition = _futurePosition!.clamp(
             _controller.position.minScrollExtent,
             _controller.position.maxScrollExtent,
           );
+          var afterOffset = (_futurePosition! - currentLocation).abs();
           if (_futurePosition == old) return;
           var target = _futurePosition!;
+          var duration = _fastAnimationDuration;
+          if (afterOffset < beforeOffset) {
+            duration = duration * (afterOffset / beforeOffset);
+            if (duration < Duration(milliseconds: 10)) {
+              duration = Duration(milliseconds: 10);
+            }
+          }
           _controller
               .animateTo(
             _futurePosition!,
-            duration: _fastAnimationDuration,
+            duration: duration,
             curve: Curves.linear,
           )
               .then((_) {

lib/foundation/appdata.dart

@@ -26,8 +26,7 @@ class Appdata with Init {
       var data = jsonEncode(toJson());
       var file = File(FilePath.join(App.dataPath, 'appdata.json'));
       await file.writeAsString(data);
-    }
+    } finally {
-    finally {
       _isSavingData = false;
     }
     if (sync) {
@@ -57,10 +56,7 @@ class Appdata with Init {
   }
 
   Map<String, dynamic> toJson() {
-    return {
+    return {'settings': settings._data, 'searchHistory': searchHistory};
-      'settings': settings._data,
-      'searchHistory': searchHistory,
-    };
   }
 
   /// Following fields are related to device-specific data and should not be synced.
@@ -95,8 +91,7 @@ class Appdata with Init {
     try {
       var file = File(FilePath.join(App.dataPath, 'implicitData.json'));
       await file.writeAsString(jsonEncode(implicitData));
-    }
+    } finally {
-    finally {
       _isSavingData = false;
     }
   }
@@ -104,10 +99,7 @@ class Appdata with Init {
   @override
   Future<void> doInit() async {
     var dataPath = (await getApplicationSupportDirectory()).path;
-    var file = File(FilePath.join(
+    var file = File(FilePath.join(dataPath, 'appdata.json'));
-      dataPath,
-      'appdata.json',
-    ));
     if (!await file.exists()) {
       return;
     }
@@ -119,8 +111,7 @@ class Appdata with Init {
         }
       }
       searchHistory = List.from(json['searchHistory']);
-    }
+    } catch (e) {
-    catch(e) {
       Log.error("Appdata", "Failed to load appdata", e);
       Log.info("Appdata", "Resetting appdata");
       file.deleteIgnoreError();
@@ -130,8 +121,7 @@ class Appdata with Init {
       if (await implicitDataFile.exists()) {
         implicitData = jsonDecode(await implicitDataFile.readAsString());
       }
-    }
+    } catch (e) {
-    catch (e) {
       Log.error("Appdata", "Failed to load implicit data", e);
       Log.info("Appdata", "Resetting implicit data");
       var implicitDataFile = File(FilePath.join(dataPath, 'implicitData.json'));
@@ -199,6 +189,9 @@ class Settings with ChangeNotifier {
     'enableDoubleTapToZoom': true,
     'reverseChapterOrder': false,
     'showSystemStatusBar': false,
+    'comicSpecificSettings': <String, Map<String, dynamic>>{},
+    'ignoreBadCertificate': false,
+    'readerScrollSpeed': 1.0, // 0.5 - 3.0
   };
 
   operator [](String key) {
@@ -212,6 +205,43 @@ class Settings with ChangeNotifier {
     }
   }
 
+  void setEnabledComicSpecificSettings(String comicId, String sourceKey, bool enabled) {
+    setReaderSetting(comicId, sourceKey, "enabled", enabled);
+  }
+
+  bool isComicSpecificSettingsEnabled(String? comicId, String? sourceKey) {
+    if (comicId == null || sourceKey == null) {
+      return false;
+    }
+    return _data['comicSpecificSettings']["$comicId@$sourceKey"]?["enabled"] == true;
+  }
+
+  dynamic getReaderSetting(String comicId, String sourceKey, String key) {
+    if (!isComicSpecificSettingsEnabled(comicId, sourceKey)) {
+      return _data[key];
+    }
+    return _data['comicSpecificSettings']["$comicId@$sourceKey"]?[key] ??
+        _data[key];
+  }
+
+  void setReaderSetting(
+    String comicId,
+    String sourceKey,
+    String key,
+    dynamic value,
+  ) {
+    (_data['comicSpecificSettings'] as Map<String, dynamic>).putIfAbsent(
+      "$comicId@$sourceKey",
+      () => <String, dynamic>{},
+    )[key] = value;
+    notifyListeners();
+  }
+
+  void resetComicReaderSettings(String key) {
+    (_data['comicSpecificSettings'] as Map).remove(key);
+    notifyListeners();
+  }
+
   @override
   String toString() {
     return _data.toString();
@@ -236,4 +266,5 @@ function processImage(image, cid, eid, page, sourceKey) {
 }
 ''';
 
-const _defaultSourceListUrl = "https://git.nyne.dev/nyne/venera-configs/raw/branch/main/index.json";
+const _defaultSourceListUrl =
+    "https://git.nyne.dev/nyne/venera-configs/raw/branch/main/index.json";

lib/main.dart

@@ -237,6 +237,27 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
             );
           };
           if (widget != null) {
+            /// 如果无法检测到状态栏高度设定指定高度
+            /// https://github.com/flutter/flutter/issues/161086
+            var isPaddingCheckError =
+                MediaQuery.of(context).viewPadding.top <= 0 ||
+                MediaQuery.of(context).viewPadding.top > 50;
+
+            if (isPaddingCheckError) {
+              widget = MediaQuery(
+                  data: MediaQuery.of(context).copyWith(
+                    viewPadding: const EdgeInsets.only(
+                      top: 15,
+                      bottom: 15,
+                    ),
+                    padding: const EdgeInsets.only(
+                      top: 15,
+                      bottom: 15,
+                    ),
+                  ),
+                  child: widget);
+            }
+
             widget = OverlayWidget(widget);
             if (App.isDesktop) {
               widget = Shortcuts(

lib/network/app_dio.dart

@@ -173,6 +173,7 @@ class RHttpAdapter implements HttpClientAdapter {
       dnsSettings: rhttp.DnsSettings.static(overrides: _getOverrides()),
       tlsSettings: rhttp.TlsSettings(
         sni: appdata.settings['sni'] != false,
+        verifyCertificates: appdata.settings['ignoreBadCertificate'] != true,
       ),
     );
   }

lib/pages/reader/gesture.dart

@@ -152,7 +152,8 @@ class _ReaderGestureDetectorState extends AutomaticGlobalState<_ReaderGestureDet
 
   bool _dragInProgress = false;
 
-  bool get _enableDoubleTapToZoom => appdata.settings["enableDoubleTapToZoom"];
+  bool get _enableDoubleTapToZoom =>
+      appdata.settings.getReaderSetting(reader.cid, reader.type.sourceKey, 'enableDoubleTapToZoom');
 
   void onTapUp(TapUpDetails event) {
     if (_longPressInProgress) {
@@ -190,7 +191,8 @@ class _ReaderGestureDetectorState extends AutomaticGlobalState<_ReaderGestureDet
     } else if (context.readerScaffold.isOpen) {
       context.readerScaffold.openOrClose();
     } else {
-      if (appdata.settings['enableTapToTurnPages']) {
+      if (appdata.settings.getReaderSetting(
+          reader.cid, reader.type.sourceKey, 'enableTapToTurnPages')) {
         bool isLeft = false, isRight = false, isTop = false, isBottom = false;
         final width = context.width;
         final height = context.height;
@@ -207,11 +209,12 @@ class _ReaderGestureDetectorState extends AutomaticGlobalState<_ReaderGestureDet
           isBottom = true;
         }
         bool isCenter = false;
-        var prev = context.reader.toPrevPage;
+        var prev = () => context.reader.toPrevPage();
-        var next = context.reader.toNextPage;
+        var next = () => context.reader.toNextPage();
-        if (appdata.settings['reverseTapToTurnPages']) {
+        if (appdata.settings.getReaderSetting(
-          prev = context.reader.toNextPage;
+            reader.cid, reader.type.sourceKey, 'reverseTapToTurnPages')) {
-          next = context.reader.toPrevPage;
+          prev = () => context.reader.toNextPage();
+          next = () => context.reader.toPrevPage();
         }
         switch (context.reader.mode) {
           case ReaderMode.galleryLeftToRight:

lib/pages/reader/images.dart

@@ -32,10 +32,17 @@ class _ReaderImagesState extends State<_ReaderImages> {
     inProgress = true;
     if (reader.type == ComicType.local ||
         (LocalManager().isDownloaded(
-            reader.cid, reader.type, reader.chapter, reader.widget.chapters))) {
+          reader.cid,
+          reader.type,
+          reader.chapter,
+          reader.widget.chapters,
+        ))) {
       try {
-        var images = await LocalManager()
+        var images = await LocalManager().getImages(
-            .getImages(reader.cid, reader.type, reader.chapter);
+          reader.cid,
+          reader.type,
+          reader.chapter,
+        );
         setState(() {
           reader.images = images;
           reader.isLoading = false;
@@ -81,9 +88,7 @@ class _ReaderImagesState extends State<_ReaderImages> {
   Widget build(BuildContext context) {
     if (reader.isLoading) {
       load();
-      return const Center(
+      return const Center(child: CircularProgressIndicator());
-        child: CircularProgressIndicator(),
-      );
     } else if (error != null) {
       return GestureDetector(
         onTap: () {
@@ -104,7 +109,8 @@ class _ReaderImagesState extends State<_ReaderImages> {
     } else {
       if (reader.mode.isGallery) {
         return _GalleryMode(
-            key: Key('${reader.mode.key}_${reader.imagesPerPage}'));
+          key: Key('${reader.mode.key}_${reader.imagesPerPage}'),
+        );
       } else {
         return _ContinuousMode(key: Key(reader.mode.key));
       }
@@ -132,11 +138,15 @@ class _GalleryModeState extends State<_GalleryMode>
   /// [totalPages] is the total number of pages in the current chapter.
   /// More than one images can be displayed on one page.
   int get totalPages {
-    if (!reader.showSingleImageOnFirstPage) {
+    if (!reader.showSingleImageOnFirstPage()) {
-      return (reader.images!.length / reader.imagesPerPage).ceil();
+      return (reader.images!.length /
+              reader.imagesPerPage())
+          .ceil();
     } else {
       return 1 +
-          ((reader.images!.length - 1) / reader.imagesPerPage).ceil();
+          ((reader.images!.length - 1) /
+                  reader.imagesPerPage())
+              .ceil();
     }
   }
 
@@ -159,19 +169,24 @@ class _GalleryModeState extends State<_GalleryMode>
 
   /// Get the range of images for the given page. [page] is 1-based.
   (int start, int end) getPageImagesRange(int page) {
-    if (reader.showSingleImageOnFirstPage) {
+    var imagesPerPage = reader.imagesPerPage();
+    if (reader.showSingleImageOnFirstPage()) {
       if (page == 1) {
         return (0, 1);
       } else {
-        int startIndex = (page - 2) * reader.imagesPerPage + 1;
+        int startIndex = (page - 2) * imagesPerPage + 1;
         int endIndex = math.min(
-            startIndex + reader.imagesPerPage, reader.images!.length);
+          startIndex + imagesPerPage,
+          reader.images!.length,
+        );
         return (startIndex, endIndex);
       }
     } else {
-      int startIndex = (page - 1) * reader.imagesPerPage;
+      int startIndex = (page - 1) * imagesPerPage;
       int endIndex = math.min(
-          startIndex + reader.imagesPerPage, reader.images!.length);
+        startIndex + imagesPerPage,
+        reader.images!.length,
+      );
       return (startIndex, endIndex);
     }
   }
@@ -193,9 +208,9 @@ class _GalleryModeState extends State<_GalleryMode>
     var (startIndex, endIndex) = getPageImagesRange(page);
     for (int i = startIndex; i < endIndex; i++) {
       if (shouldPreCache) {
-        _precacheImage(i+1, context);
+        _precacheImage(i + 1, context);
       } else {
-        _preDownloadImage(i+1, context);
+        _preDownloadImage(i + 1, context);
       }
     }
   }
@@ -217,16 +232,12 @@ class _GalleryModeState extends State<_GalleryMode>
           var controller = photoViewControllers[reader.page]!;
           Offset value = event.delta;
           if (isLongPressing) {
-            controller.updateMultiple(
+            controller.updateMultiple(position: controller.position + value);
-              position: controller.position + value,
-            );
           }
         }
       },
       child: PhotoViewGallery.builder(
-        backgroundDecoration: BoxDecoration(
+        backgroundDecoration: BoxDecoration(color: context.colorScheme.surface),
-          color: context.colorScheme.surface,
-        ),
         reverse: reader.mode == ReaderMode.galleryRightToLeft,
         scrollDirection: reader.mode == ReaderMode.galleryTopToBottom
             ? Axis.vertical
@@ -239,14 +250,17 @@ class _GalleryModeState extends State<_GalleryMode>
             );
           } else {
             var (startIndex, endIndex) = getPageImagesRange(index);
-            List<String> pageImages =
+            List<String> pageImages = reader.images!.sublist(
-                reader.images!.sublist(startIndex, endIndex);
+              startIndex,
+              endIndex,
+            );
 
             cache(index);
 
             photoViewControllers[index] ??= PhotoViewController();
 
-            if (reader.imagesPerPage == 1 || pageImages.length == 1) {
+            if (reader.imagesPerPage() == 1 ||
+                pageImages.length == 1) {
               return PhotoViewGalleryPageOptions(
                 filterQuality: FilterQuality.medium,
                 controller: photoViewControllers[index],
@@ -356,13 +370,16 @@ class _GalleryModeState extends State<_GalleryMode>
             onInit: (state) => imageStates.add(state),
             onDispose: (state) => imageStates.remove(state),
           ),
-        )
+        ),
       ];
     } else {
       imageWidgets = images.map((imageKey) {
         startIndex++;
-        ImageProvider imageProvider =
+        ImageProvider imageProvider = _createImageProviderFromKey(
-            _createImageProviderFromKey(imageKey, context, startIndex);
+          imageKey,
+          context,
+          startIndex,
+        );
         return Expanded(
           child: ComicImage(
             image: imageProvider,
@@ -423,10 +440,7 @@ class _GalleryModeState extends State<_GalleryMode>
     } else {
       zoomPosition = Offset(0, 0);
     }
-    photoViewController.animateScale?.call(
+    photoViewController.animateScale?.call(target, zoomPosition);
-      target,
-      zoomPosition,
-    );
     isLongPressing = true;
   }
 
@@ -471,14 +485,14 @@ class _GalleryModeState extends State<_GalleryMode>
         keyRepeatTimer = null;
       }
       if (forward == true) {
-        reader.toPage(reader.page+1);
+        reader.toPage(reader.page + 1);
       } else if (forward == false) {
-        reader.toPage(reader.page-1);
+        reader.toPage(reader.page - 1);
       }
     }
     if (event is KeyRepeatEvent && keyRepeatTimer == null) {
       keyRepeatTimer = Timer.periodic(
-        reader.enablePageAnimation
+        reader.enablePageAnimation(reader.cid, reader.type)
             ? const Duration(milliseconds: 200)
             : const Duration(milliseconds: 50),
         (timer) {
@@ -486,9 +500,9 @@ class _GalleryModeState extends State<_GalleryMode>
             timer.cancel();
             return;
           } else if (forward == true) {
-            reader.toPage(reader.page+1);
+            reader.toPage(reader.page + 1);
           } else if (forward == false) {
-            reader.toPage(reader.page-1);
+            reader.toPage(reader.page - 1);
           }
         },
       );
@@ -512,15 +526,15 @@ class _GalleryModeState extends State<_GalleryMode>
       return await File(imageKey.substring(7)).readAsBytes();
     } else {
       return (await CacheManager().findCache(
-              "$imageKey@${context.reader.type.sourceKey}@${context.reader.cid}@${context.reader.eid}"))!
+        "$imageKey@${context.reader.type.sourceKey}@${context.reader.cid}@${context.reader.eid}",
-          .readAsBytes();
+      ))!.readAsBytes();
     }
   }
 
   @override
   String? getImageKeyByOffset(Offset offset) {
     String? imageKey;
-    if (reader.imagesPerPage == 1) {
+    if (reader.imagesPerPage() == 1) {
       imageKey = reader.images![reader.page - 1];
     } else {
       for (var imageState in imageStates) {
@@ -538,7 +552,7 @@ const Set<PointerDeviceKind> _kTouchLikeDeviceTypes = <PointerDeviceKind>{
   PointerDeviceKind.mouse,
   PointerDeviceKind.stylus,
   PointerDeviceKind.invertedStylus,
-  PointerDeviceKind.unknown
+  PointerDeviceKind.unknown,
 };
 
 const double _kChangeChapterOffset = 160;
@@ -624,27 +638,52 @@ class _ContinuousModeState extends State<_ContinuousMode>
     cacheImages(page);
   }
 
-  double? futurePosition;
+  double? _futurePosition;
 
   void smoothTo(double offset) {
-    futurePosition ??= scrollController.offset;
+    if (HardwareKeyboard.instance.isShiftPressed) {
-    if (futurePosition! > scrollController.position.maxScrollExtent &&
-        offset > 0) {
-      return;
-    } else if (futurePosition! < scrollController.position.minScrollExtent &&
-        offset < 0) {
       return;
     }
-    futurePosition = futurePosition! + offset * 1.2;
+    var currentLocation = scrollController.position.pixels;
-    futurePosition = futurePosition!.clamp(
+    var old = _futurePosition;
+    _futurePosition ??= currentLocation;
+    double k = (_futurePosition! - currentLocation).abs() / 1600 + 1;
+    final customSpeed = appdata.settings.getReaderSetting(
+      context.reader.cid,
+      context.reader.type.sourceKey,
+      "readerScrollSpeed",
+    );
+    if (customSpeed is num) {
+      k *= customSpeed;
+    }
+    _futurePosition = _futurePosition! + offset * k;
+    var beforeOffset = (_futurePosition! - currentLocation).abs();
+    _futurePosition = _futurePosition!.clamp(
       scrollController.position.minScrollExtent,
       scrollController.position.maxScrollExtent,
     );
-    scrollController.animateTo(
+    var afterOffset = (_futurePosition! - currentLocation).abs();
-      futurePosition!,
+    if (_futurePosition == old) return;
-      duration: const Duration(milliseconds: 200),
+    var target = _futurePosition!;
+    var duration = const Duration(milliseconds: 160);
+    if (afterOffset < beforeOffset) {
+      duration = duration * (afterOffset / beforeOffset);
+      if (duration < Duration(milliseconds: 10)) {
+        duration = Duration(milliseconds: 10);
+      }
+    }
+    scrollController
+        .animateTo(
+      _futurePosition!,
+      duration: duration,
       curve: Curves.linear,
-    );
+    )
+        .then((_) {
+      var current = scrollController.position.pixels;
+      if (current == target && current == _futurePosition) {
+        _futurePosition = null;
+      }
+    });
   }
 
   void onPointerSignal(PointerSignalEvent event) {
@@ -673,10 +712,12 @@ class _ContinuousModeState extends State<_ContinuousMode>
   void onScroll() {
     if (prepareToPrevChapter) {
       jumpToNextChapter = false;
-      jumpToPrevChapter = scrollController.offset <
+      jumpToPrevChapter =
+          scrollController.offset <
           scrollController.position.minScrollExtent - _kChangeChapterOffset;
     } else if (prepareToNextChapter) {
-      jumpToNextChapter = scrollController.offset >
+      jumpToNextChapter =
+          scrollController.offset >
           scrollController.position.maxScrollExtent + _kChangeChapterOffset;
       jumpToPrevChapter = false;
     }
@@ -721,8 +762,8 @@ class _ContinuousModeState extends State<_ContinuousMode>
       physics: isCTRLPressed || _isMouseScrolling || disableScroll
           ? const NeverScrollableScrollPhysics()
           : isZoomedIn
-              ? const ClampingScrollPhysics()
+          ? const ClampingScrollPhysics()
-              : const BouncingScrollPhysics(),
+          : const BouncingScrollPhysics(),
       itemBuilder: (context, index) {
         if (index == 0 || index == reader.maxPage + 1) {
           return const SizedBox();
@@ -750,8 +791,10 @@ class _ContinuousModeState extends State<_ContinuousMode>
           ),
         );
       },
-      scrollBehavior: const MaterialScrollBehavior()
+      scrollBehavior: const MaterialScrollBehavior().copyWith(
-          .copyWith(scrollbars: false, dragDevices: _kTouchLikeDeviceTypes),
+        scrollbars: false,
+        dragDevices: _kTouchLikeDeviceTypes,
+      ),
     );
 
     widget = Stack(
@@ -769,7 +812,7 @@ class _ContinuousModeState extends State<_ContinuousMode>
             disableScroll = true;
           });
         }
-        futurePosition = null;
+        _futurePosition = null;
         if (_isMouseScrolling) {
           setState(() {
             _isMouseScrolling = false;
@@ -895,20 +938,14 @@ class _ContinuousModeState extends State<_ContinuousMode>
     }
 
     return PhotoView.customChild(
-      backgroundDecoration: BoxDecoration(
+      backgroundDecoration: BoxDecoration(color: context.colorScheme.surface),
-        color: context.colorScheme.surface,
-      ),
       childSize: Size(width, height),
       minScale: 1.0,
       maxScale: 2.5,
       strictScale: true,
       controller: photoViewController,
       onScaleUpdate: onScaleUpdate,
-      child: SizedBox(
+      child: SizedBox(width: width, height: height, child: widget),
-        width: width,
-        height: height,
-        child: widget,
-      ),
     );
   }
 
@@ -978,10 +1015,7 @@ class _ContinuousModeState extends State<_ContinuousMode>
     } else {
       zoomPosition = Offset(0, 0);
     }
-    photoViewController.animateScale?.call(
+    photoViewController.animateScale?.call(target, zoomPosition);
-      target,
-      zoomPosition,
-    );
     onScaleUpdate(target);
     isLongPressing = true;
   }
@@ -1000,7 +1034,7 @@ class _ContinuousModeState extends State<_ContinuousMode>
   @override
   void toPage(int page) {
     itemScrollController.jumpTo(index: page);
-    futurePosition = null;
+    _futurePosition = null;
   }
 
   @override
@@ -1069,8 +1103,8 @@ class _ContinuousModeState extends State<_ContinuousMode>
       return await File(imageKey.substring(7)).readAsBytes();
     } else {
       return (await CacheManager().findCache(
-              "$imageKey@${context.reader.type.sourceKey}@${context.reader.cid}@${context.reader.eid}"))!
+        "$imageKey@${context.reader.type.sourceKey}@${context.reader.cid}@${context.reader.eid}",
-          .readAsBytes();
+      ))!.readAsBytes();
     }
   }
 
@@ -1114,10 +1148,7 @@ void _precacheImage(int page, BuildContext context) {
   if (page <= 0 || page > context.reader.images!.length) {
     return;
   }
-  precacheImage(
+  precacheImage(_createImageProvider(page, context), context);
-    _createImageProvider(page, context),
-    context,
-  );
 }
 
 /// [_preDownloadImage] is used to download the image for the given page.
@@ -1138,10 +1169,7 @@ void _preDownloadImage(int page, BuildContext context) {
 }
 
 class _SwipeChangeChapterProgress extends StatefulWidget {
-  const _SwipeChangeChapterProgress({
+  const _SwipeChangeChapterProgress({this.controller, required this.isPrev});
-    this.controller,
-    required this.isPrev,
-  });
 
   final ScrollController? controller;
 
@@ -1258,7 +1286,12 @@ class _ProgressPainter extends CustomPainter {
     paint.color = color;
     canvas.drawRRect(
       RRect.fromLTRBR(
-          0, 0, size.width * value, size.height, Radius.circular(16)),
+        0,
+        0,
+        size.width * value,
+        size.height,
+        Radius.circular(16),
+      ),
       paint,
     );
   }

lib/pages/reader/reader.dart

@@ -115,15 +115,17 @@ class _ReaderState extends State<Reader>
     if (images == null) {
       return 1;
     }
-    if (!showSingleImageOnFirstPage) {
+    if (!showSingleImageOnFirstPage()) {
-      return (images!.length / imagesPerPage).ceil();
+      return (images!.length / imagesPerPage()).ceil();
     } else {
-      return 1 + ((images!.length - 1) / imagesPerPage).ceil();
+      return 1 + ((images!.length - 1) / imagesPerPage()).ceil();
     }
   }
 
+  @override
   ComicType get type => widget.type;
 
+  @override
   String get cid => widget.cid;
 
   String get eid => widget.chapters?.ids.elementAtOrNull(chapter - 1) ?? '0';
@@ -162,12 +164,13 @@ class _ReaderState extends State<Reader>
     if (widget.initialPage != null) {
       page = widget.initialPage!;
     }
-    mode = ReaderMode.fromKey(appdata.settings['readerMode']);
+    // mode = ReaderMode.fromKey(appdata.settings['readerMode']);
+    mode = ReaderMode.fromKey(appdata.settings.getReaderSetting(cid, type.sourceKey, 'readerMode'));
     history = widget.history;
-    if (!appdata.settings['showSystemStatusBar']) {
+    if (!appdata.settings.getReaderSetting(cid, type.sourceKey, 'showSystemStatusBar')) {
       SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
     }
-    if (appdata.settings['enableTurnPageByVolumeKey']) {
+    if (appdata.settings.getReaderSetting(cid, type.sourceKey, 'enableTurnPageByVolumeKey')) {
       handleVolumeEvent();
     }
     setImageCacheSize();
@@ -274,13 +277,13 @@ class _ReaderState extends State<Reader>
         history!.page = images?.length ?? 1;
       } else {
         /// Record the first image of the page
-        if (!showSingleImageOnFirstPage || imagesPerPage == 1) {
+        if (!showSingleImageOnFirstPage() || imagesPerPage() == 1) {
-          history!.page = (page - 1) * imagesPerPage + 1;
+          history!.page = (page - 1) * imagesPerPage() + 1;
         } else {
           if (page == 1) {
             history!.page = 1;
           } else {
-            history!.page = (page - 2) * imagesPerPage + 2;
+            history!.page = (page - 2) * imagesPerPage() + 2;
           }
         }
       }
@@ -363,49 +366,51 @@ abstract mixin class _ImagePerPageHandler {
 
   ReaderMode get mode;
 
+  String get cid;
+
+  ComicType get type;
+
   void initImagesPerPage(int initialPage) {
-    _lastImagesPerPage = imagesPerPage;
+    _lastImagesPerPage = imagesPerPage();
     _lastOrientation = isPortrait;
-    if (imagesPerPage != 1) {
+    if (imagesPerPage() != 1) {
-      if (showSingleImageOnFirstPage) {
+      if (showSingleImageOnFirstPage()) {
-        page = ((initialPage - 1) / imagesPerPage).ceil() + 1;
+        page = ((initialPage - 1) / imagesPerPage()).ceil() + 1;
       } else {
-        page = (initialPage / imagesPerPage).ceil();
+        page = (initialPage / imagesPerPage()).ceil();
       }
     }
   }
 
-  bool get showSingleImageOnFirstPage =>
+  bool showSingleImageOnFirstPage() =>
-      appdata.settings["showSingleImageOnFirstPage"];
+      appdata.settings.getReaderSetting(cid, type.sourceKey, 'showSingleImageOnFirstPage');
 
   /// The number of images displayed on one screen
-  int get imagesPerPage {
+  int imagesPerPage() {
     if (mode.isContinuous) return 1;
     if (isPortrait) {
-      return appdata.settings['readerScreenPicNumberForPortrait'] ?? 1;
+      return appdata.settings.getReaderSetting(cid, type.sourceKey, 'readerScreenPicNumberForPortrait') ?? 1;
     } else {
-      return appdata.settings['readerScreenPicNumberForLandscape'] ?? 1;
+      return appdata.settings.getReaderSetting(cid, type.sourceKey, 'readerScreenPicNumberForLandscape') ?? 1;
     }
   }
 
   /// Check if the number of images per page has changed
   void _checkImagesPerPageChange() {
-    int currentImagesPerPage = imagesPerPage;
+    int currentImagesPerPage = imagesPerPage();
     bool currentOrientation = isPortrait;
 
     if (_lastImagesPerPage != currentImagesPerPage || _lastOrientation != currentOrientation) {
-      _adjustPageForImagesPerPageChange(
+      _adjustPageForImagesPerPageChange(_lastImagesPerPage, currentImagesPerPage);
-          _lastImagesPerPage, currentImagesPerPage);
       _lastImagesPerPage = currentImagesPerPage;
       _lastOrientation = currentOrientation;
     }
   }
 
   /// Adjust the page number when the number of images per page changes
-  void _adjustPageForImagesPerPageChange(
+  void _adjustPageForImagesPerPageChange(int oldImagesPerPage, int newImagesPerPage) {
-      int oldImagesPerPage, int newImagesPerPage) {
     int previousImageIndex = 1;
-    if (!showSingleImageOnFirstPage || oldImagesPerPage == 1) {
+    if (!showSingleImageOnFirstPage() || oldImagesPerPage == 1) {
       previousImageIndex = (page - 1) * oldImagesPerPage + 1;
     } else {
       if (page == 1) {
@@ -417,7 +422,7 @@ abstract mixin class _ImagePerPageHandler {
 
     int newPage;
     if (newImagesPerPage != 1) {
-      if (showSingleImageOnFirstPage) {
+      if (showSingleImageOnFirstPage()) {
         newPage = ((previousImageIndex - 1) / newImagesPerPage).ceil() + 1;
       } else {
         newPage = (previousImageIndex / newImagesPerPage).ceil();
@@ -493,9 +498,13 @@ abstract mixin class _ReaderLocation {
 
   bool get isLoading;
 
+  String get cid;
+
+  ComicType get type;
+
   void update();
 
-  bool get enablePageAnimation => appdata.settings['enablePageAnimation'];
+  bool enablePageAnimation(String cid, ComicType type) => appdata.settings.getReaderSetting(cid, type.sourceKey, 'enablePageAnimation');
 
   _ImageViewController? _imageViewController;
 
@@ -532,7 +541,7 @@ abstract mixin class _ReaderLocation {
       }
       this.page = page;
       update();
-      if (enablePageAnimation) {
+      if (enablePageAnimation(cid, type)) {
         _animationCount++;
         _imageViewController!.animateToPage(page).then((_) {
           _animationCount--;
@@ -571,12 +580,12 @@ abstract mixin class _ReaderLocation {
 
   Timer? autoPageTurningTimer;
 
-  void autoPageTurning() {
+  void autoPageTurning(String cid, ComicType type) {
     if (autoPageTurningTimer != null) {
       autoPageTurningTimer!.cancel();
       autoPageTurningTimer = null;
     } else {
-      int interval = appdata.settings['autoPageTurningInterval'];
+      int interval = appdata.settings.getReaderSetting(cid, type.sourceKey, 'autoPageTurningInterval');
       autoPageTurningTimer = Timer.periodic(Duration(seconds: interval), (_) {
         if (page == maxPage) {
           autoPageTurningTimer!.cancel();

lib/pages/reader/scaffold.dart

@@ -128,9 +128,7 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
   Widget build(BuildContext context) {
     return Stack(
       children: [
-        Positioned.fill(
+        Positioned.fill(child: widget.child),
-          child: widget.child,
-        ),
         if (appdata.settings['showPageNumberInReader'] == true)
           buildPageInfoText(),
         buildStatusInfo(),
@@ -168,10 +166,7 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
         decoration: BoxDecoration(
           color: context.colorScheme.surface.toOpacity(0.92),
           border: Border(
-            bottom: BorderSide(
+            bottom: BorderSide(color: Colors.grey.toOpacity(0.5), width: 0.5),
-              color: Colors.grey.toOpacity(0.5),
-              width: 0.5,
-            ),
           ),
         ),
         child: Row(
@@ -216,8 +211,9 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
     try {
       if (context.reader.images![0].contains('file://')) {
         showToast(
-            message: "Local comic collection is not supported at present".tl,
+          message: "Local comic collection is not supported at present".tl,
-            context: context);
+          context: context,
+        );
         return;
       }
       String id = context.reader.cid;
@@ -234,8 +230,10 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
       List<String> tags = context.reader.widget.tags;
       String author = context.reader.widget.author;
 
-      var epName = context.reader.widget.chapters?.titles
+      var epName =
-              .elementAtOrNull(context.reader.chapter - 1) ??
+          context.reader.widget.chapters?.titles.elementAtOrNull(
+            context.reader.chapter - 1,
+          ) ??
           "E${context.reader.chapter}";
       var translatedTags = tags.map((e) => e.translateTagsToCN).toList();
 
@@ -248,7 +246,7 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
           return;
         }
         ImageFavoriteManager().deleteImageFavorite([
-          ImageFavorite(page, imageKey, null, eid, id, ep, sourceKey, epName)
+          ImageFavorite(page, imageKey, null, eid, id, ep, sourceKey, epName),
         ]);
         showToast(
           message: "Uncollected the image".tl,
@@ -256,7 +254,8 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
           seconds: 1,
         );
       } else {
-        var imageFavoritesComic = ImageFavoriteManager().find(id, sourceKey) ??
+        var imageFavoritesComic =
+            ImageFavoriteManager().find(id, sourceKey) ??
             ImageFavoritesComic(
               id,
               [],
@@ -270,12 +269,21 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
               subTitle,
               maxPage,
             );
-        ImageFavorite imageFavorite =
+        ImageFavorite imageFavorite = ImageFavorite(
-            ImageFavorite(page, imageKey, null, eid, id, ep, sourceKey, epName);
+          page,
-        ImageFavoritesEp? imageFavoritesEp =
+          imageKey,
-            imageFavoritesComic.imageFavoritesEp.firstWhereOrNull((e) {
+          null,
-          return e.ep == ep;
+          eid,
-        });
+          id,
+          ep,
+          sourceKey,
+          epName,
+        );
+        ImageFavoritesEp? imageFavoritesEp = imageFavoritesComic
+            .imageFavoritesEp
+            .firstWhereOrNull((e) {
+              return e.ep == ep;
+            });
         if (imageFavoritesEp == null) {
           if (page != firstPage) {
             var copy = imageFavorite.copyWith(
@@ -285,10 +293,20 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
             );
             // 不是第一页的话, 自动塞一个封面进去
             imageFavoritesEp = ImageFavoritesEp(
-                eid, ep, [copy, imageFavorite], epName, maxPage);
+              eid,
+              ep,
+              [copy, imageFavorite],
+              epName,
+              maxPage,
+            );
           } else {
-            imageFavoritesEp =
+            imageFavoritesEp = ImageFavoritesEp(
-                ImageFavoritesEp(eid, ep, [imageFavorite], epName, maxPage);
+              eid,
+              ep,
+              [imageFavorite],
+              epName,
+              maxPage,
+            );
           }
           imageFavoritesComic.imageFavoritesEp.add(imageFavoritesEp);
         } else {
@@ -312,7 +330,10 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
 
         ImageFavoriteManager().addOrUpdateOrDelete(imageFavoritesComic);
         showToast(
-            message: "Successfully collected".tl, context: context, seconds: 1);
+          message: "Successfully collected".tl,
+          context: context,
+          seconds: 1,
+        );
       }
       update();
     } catch (e, stackTrace) {
@@ -327,155 +348,152 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
       text = "P${context.reader.page}";
     }
 
+    final buttons = [
+      Tooltip(
+        message: "Collect the image".tl,
+        child: IconButton(
+          icon: Icon(isLiked() ? Icons.favorite : Icons.favorite_border),
+          onPressed: addImageFavorite,
+        ),
+      ),
+      if (App.isDesktop)
+        Tooltip(
+          message: "${"Full Screen".tl}(F12)",
+          child: IconButton(
+            icon: const Icon(Icons.fullscreen),
+            onPressed: () {
+              context.reader.fullscreen();
+            },
+          ),
+        ),
+      if (App.isAndroid)
+        Tooltip(
+          message: "Screen Rotation".tl,
+          child: IconButton(
+            icon: () {
+              if (rotation == null) {
+                return const Icon(Icons.screen_rotation);
+              } else if (rotation == false) {
+                return const Icon(Icons.screen_lock_portrait);
+              } else {
+                return const Icon(Icons.screen_lock_landscape);
+              }
+            }.call(),
+            onPressed: () {
+              if (rotation == null) {
+                setState(() {
+                  rotation = false;
+                });
+                SystemChrome.setPreferredOrientations([
+                  DeviceOrientation.portraitUp,
+                  DeviceOrientation.portraitDown,
+                ]);
+              } else if (rotation == false) {
+                setState(() {
+                  rotation = true;
+                });
+                SystemChrome.setPreferredOrientations([
+                  DeviceOrientation.landscapeLeft,
+                  DeviceOrientation.landscapeRight,
+                ]);
+              } else {
+                setState(() {
+                  rotation = null;
+                });
+                SystemChrome.setPreferredOrientations(DeviceOrientation.values);
+              }
+            },
+          ),
+        ),
+      Tooltip(
+        message: "Auto Page Turning".tl,
+        child: IconButton(
+          icon: context.reader.autoPageTurningTimer != null
+              ? const Icon(Icons.timer)
+              : const Icon(Icons.timer_sharp),
+          onPressed: () {
+            context.reader.autoPageTurning(
+              context.reader.cid,
+              context.reader.type,
+            );
+            update();
+          },
+        ),
+      ),
+      if (context.reader.widget.chapters != null)
+        Tooltip(
+          message: "Chapters".tl,
+          child: IconButton(
+            icon: const Icon(Icons.library_books),
+            onPressed: openChapterDrawer,
+          ),
+        ),
+      Tooltip(
+        message: "Save Image".tl,
+        child: IconButton(
+          icon: const Icon(Icons.download),
+          onPressed: saveCurrentImage,
+        ),
+      ),
+      Tooltip(
+        message: "Share".tl,
+        child: IconButton(icon: const Icon(Icons.share), onPressed: share),
+      ),
+    ];
+
     Widget child = SizedBox(
       height: kBottomBarHeight,
       child: Column(
         children: [
-          const SizedBox(
+          const SizedBox(height: 8),
-            height: 8,
-          ),
           Row(
             children: [
               const SizedBox(width: 8),
               IconButton.filledTonal(
                 onPressed: () => !isReversed
                     ? context.reader.chapter > 1
-                        ? context.reader.toPrevChapter()
+                          ? context.reader.toPrevChapter()
-                        : context.reader.toPage(1)
+                          : context.reader.toPage(1)
                     : context.reader.chapter < context.reader.maxChapter
-                        ? context.reader.toNextChapter()
+                    ? context.reader.toNextChapter()
-                        : context.reader.toPage(context.reader.maxPage),
+                    : context.reader.toPage(context.reader.maxPage),
                 icon: const Icon(Icons.first_page),
               ),
-              Expanded(
+              Expanded(child: buildSlider()),
-                child: buildSlider(),
-              ),
               IconButton.filledTonal(
-                  onPressed: () => !isReversed
+                onPressed: () => !isReversed
-                      ? context.reader.chapter < context.reader.maxChapter
+                    ? context.reader.chapter < context.reader.maxChapter
                           ? context.reader.toNextChapter()
                           : context.reader.toPage(context.reader.maxPage)
-                      : context.reader.chapter > 1
+                    : context.reader.chapter > 1
-                          ? context.reader.toPrevChapter()
+                    ? context.reader.toPrevChapter()
-                          : context.reader.toPage(1),
+                    : context.reader.toPage(1),
-                  icon: const Icon(Icons.last_page)),
+                icon: const Icon(Icons.last_page),
-              const SizedBox(
-                width: 8,
               ),
+              const SizedBox(width: 8),
             ],
           ),
-          Row(
+          LayoutBuilder(
-            children: [
+            builder: (context, constrains) {
-              const SizedBox(
+              return Row(
-                width: 16,
+                children: [
-              ),
+                  if ((constrains.maxWidth - buttons.length * 42) > 80)
-              Container(
+                    Container(
-                height: 24,
+                      height: 24,
-                padding: const EdgeInsets.fromLTRB(6, 2, 6, 0),
+                      padding: const EdgeInsets.fromLTRB(6, 2, 6, 0),
-                decoration: BoxDecoration(
+                      decoration: BoxDecoration(
-                  color: Theme.of(context).colorScheme.tertiaryContainer,
+                        color: Theme.of(context).colorScheme.tertiaryContainer,
-                  borderRadius: BorderRadius.circular(8),
+                        borderRadius: BorderRadius.circular(8),
-                ),
+                      ),
-                child: Center(
+                      child: Center(child: Text(text)),
-                  child: Text(text),
+                    ).paddingLeft(16),
-                ),
+                  const Spacer(),
-              ),
+                  ...buttons,
-              const Spacer(),
+                  const SizedBox(width: 4),
-              Tooltip(
+                ],
-                message: "Collect the image".tl,
+              );
-                child: IconButton(
+            },
-                  icon:
+          ),
-                      Icon(isLiked() ? Icons.favorite : Icons.favorite_border),
-                  onPressed: addImageFavorite,
-                ),
-              ),
-              if (App.isDesktop)
-                Tooltip(
-                  message: "${"Full Screen".tl}(F12)",
-                  child: IconButton(
-                    icon: const Icon(Icons.fullscreen),
-                    onPressed: () {
-                      context.reader.fullscreen();
-                    },
-                  ),
-                ),
-              if (App.isAndroid)
-                Tooltip(
-                  message: "Screen Rotation".tl,
-                  child: IconButton(
-                    icon: () {
-                      if (rotation == null) {
-                        return const Icon(Icons.screen_rotation);
-                      } else if (rotation == false) {
-                        return const Icon(Icons.screen_lock_portrait);
-                      } else {
-                        return const Icon(Icons.screen_lock_landscape);
-                      }
-                    }.call(),
-                    onPressed: () {
-                      if (rotation == null) {
-                        setState(() {
-                          rotation = false;
-                        });
-                        SystemChrome.setPreferredOrientations([
-                          DeviceOrientation.portraitUp,
-                          DeviceOrientation.portraitDown,
-                        ]);
-                      } else if (rotation == false) {
-                        setState(() {
-                          rotation = true;
-                        });
-                        SystemChrome.setPreferredOrientations([
-                          DeviceOrientation.landscapeLeft,
-                          DeviceOrientation.landscapeRight
-                        ]);
-                      } else {
-                        setState(() {
-                          rotation = null;
-                        });
-                        SystemChrome.setPreferredOrientations(
-                            DeviceOrientation.values);
-                      }
-                    },
-                  ),
-                ),
-              Tooltip(
-                message: "Auto Page Turning".tl,
-                child: IconButton(
-                  icon: context.reader.autoPageTurningTimer != null
-                      ? const Icon(Icons.timer)
-                      : const Icon(Icons.timer_sharp),
-                  onPressed: () {
-                    context.reader.autoPageTurning();
-                    update();
-                  },
-                ),
-              ),
-              if (context.reader.widget.chapters != null)
-                Tooltip(
-                  message: "Chapters".tl,
-                  child: IconButton(
-                    icon: const Icon(Icons.library_books),
-                    onPressed: openChapterDrawer,
-                  ),
-                ),
-              Tooltip(
-                message: "Save Image".tl,
-                child: IconButton(
-                  icon: const Icon(Icons.download),
-                  onPressed: saveCurrentImage,
-                ),
-              ),
-              Tooltip(
-                message: "Share".tl,
-                child: IconButton(
-                  icon: const Icon(Icons.share),
-                  onPressed: share,
-                ),
-              ),
-              const SizedBox(width: 4)
-            ],
-          )
         ],
       ),
     );
@@ -506,8 +524,9 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
       focusNode: sliderFocus,
       value: context.reader.page.toDouble(),
       min: 1,
-      max:
+      max: context.reader.maxPage
-          context.reader.maxPage.clamp(context.reader.page, 1 << 16).toDouble(),
+          .clamp(context.reader.page, 1 << 16)
+          .toDouble(),
       reversed: isReversed,
       divisions: (context.reader.maxPage - 1).clamp(2, 1 << 16),
       onChanged: (i) {
@@ -517,8 +536,10 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
   }
 
   Widget buildPageInfoText() {
-    var epName = context.reader.widget.chapters?.titles
+    var epName =
-            .elementAtOrNull(context.reader.chapter - 1) ??
+        context.reader.widget.chapters?.titles.elementAtOrNull(
+          context.reader.chapter - 1,
+        ) ??
         "E${context.reader.chapter}";
     if (epName.length > 8) {
       epName = "${epName.substring(0, 8)}...";
@@ -594,23 +615,31 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
     }
     var fileType = detectFileType(data);
     var filename = "${context.reader.page}${fileType.ext}";
-    Share.shareFile(
+    Share.shareFile(data: data, filename: filename, mime: fileType.mime);
-      data: data,
-      filename: filename,
-      mime: fileType.mime,
-    );
   }
 
   void openSetting() {
     showSideBar(
       context,
       ReaderSettings(
+        comicId: context.reader.cid,
+        comicSource: context.reader.type.sourceKey,
         onChanged: (key) {
           if (key == "readerMode") {
-            context.reader.mode = ReaderMode.fromKey(appdata.settings[key]);
+            context.reader.mode = ReaderMode.fromKey(
+              appdata.settings.getReaderSetting(
+                context.reader.cid,
+                context.reader.type.sourceKey,
+                key,
+              ),
+            );
           }
           if (key == "enableTurnPageByVolumeKey") {
-            if (appdata.settings[key]) {
+            if (appdata.settings.getReaderSetting(
+              context.reader.cid,
+              context.reader.type.sourceKey,
+              key,
+            )) {
               context.reader.handleVolumeEvent();
             } else {
               context.reader.stopVolumeEvent();
@@ -716,8 +745,8 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
       return await File(imageKey.substring(7)).readAsBytes();
     } else {
       return (await CacheManager().findCache(
-              "$imageKey@${context.reader.type.sourceKey}@${context.reader.cid}@${context.reader.eid}"))!
+        "$imageKey@${context.reader.type.sourceKey}@${context.reader.cid}@${context.reader.eid}",
-          .readAsBytes();
+      ))!.readAsBytes();
     }
   }
 
@@ -733,14 +762,17 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
     entry = OverlayEntry(
       builder: (context) {
         return Positioned.fill(
-          child: _SelectImageOverlayContent(onTap: (offset) {
+          child: _SelectImageOverlayContent(
-            completer.complete(offset);
+            onTap: (offset) {
-            entry!.remove();
+              completer.complete(offset);
-          }, onDispose: () {
+              entry!.remove();
-            if (!completer.isCompleted) {
+            },
-              completer.complete(null);
+            onDispose: () {
-            }
+              if (!completer.isCompleted) {
-          }),
+                completer.complete(null);
+              }
+            },
+          ),
         );
       },
     );
@@ -840,20 +872,17 @@ class _BatteryWidgetState extends State<_BatteryWidget> {
           size: 16,
           color: batteryColor,
           // Stroke
-          shadows: List.generate(
+          shadows: List.generate(9, (index) {
-            9,
+            if (index == 4) {
-            (index) {
+              return null;
-              if (index == 4) {
+            }
-                return null;
+            double offsetX = (index % 3 - 1) * 0.8;
-              }
+            double offsetY = ((index / 3).floor() - 1) * 0.8;
-              double offsetX = (index % 3 - 1) * 0.8;
+            return Shadow(
-              double offsetY = ((index / 3).floor() - 1) * 0.8;
+              color: context.colorScheme.onInverseSurface,
-              return Shadow(
+              offset: Offset(offsetX, offsetY),
-                color: context.colorScheme.onInverseSurface,
+            );
-                offset: Offset(offsetX, offsetY),
+          }).whereType<Shadow>().toList(),
-              );
-            },
-          ).whereType<Shadow>().toList(),
         ),
         Stack(
           children: [
@@ -940,10 +969,12 @@ class _SelectImageOverlayContent extends StatefulWidget {
   final void Function() onDispose;
 
   @override
-  State<_SelectImageOverlayContent> createState() => _SelectImageOverlayContentState();
+  State<_SelectImageOverlayContent> createState() =>
+      _SelectImageOverlayContentState();
 }
 
-class _SelectImageOverlayContentState extends State<_SelectImageOverlayContent> {
+class _SelectImageOverlayContentState
+    extends State<_SelectImageOverlayContent> {
   @override
   void dispose() {
     widget.onDispose();
@@ -960,19 +991,14 @@ class _SelectImageOverlayContentState extends State<_SelectImageOverlayContent>
       child: Container(
         color: Colors.black.withAlpha(50),
         child: Align(
-          alignment: Alignment(
+          alignment: Alignment(0, -0.8),
-            0,
-            -0.8,
-          ),
           child: Container(
             width: 232,
             height: 42,
             decoration: BoxDecoration(
               color: context.colorScheme.surface,
               borderRadius: BorderRadius.circular(8),
-              border: Border.all(
+              border: Border.all(color: context.colorScheme.outlineVariant),
-                color: context.colorScheme.outlineVariant,
-              ),
             ),
             child: Row(
               children: [

lib/pages/settings/debug.dart

@@ -31,6 +31,10 @@ class DebugPageState extends State<DebugPage> {
           },
           actionTitle: 'Open'.tl,
         ).toSliver(),
+        _SwitchSetting(
+          title: "Ignore Certificate Errors".tl,
+          settingKey: "ignoreBadCertificate",
+        ).toSliver(),
         SliverToBoxAdapter(
           child: Column(
             children: [

lib/pages/settings/reader.dart

@@ -1,9 +1,16 @@
 part of 'settings_page.dart';
 
 class ReaderSettings extends StatefulWidget {
-  const ReaderSettings({super.key, this.onChanged});
+  const ReaderSettings({
+    super.key,
+    this.onChanged,
+    this.comicId,
+    this.comicSource,
+  });
 
   final void Function(String key)? onChanged;
+  final String? comicId;
+  final String? comicSource;
 
   @override
   State<ReaderSettings> createState() => _ReaderSettingsState();
@@ -12,15 +19,57 @@ class ReaderSettings extends StatefulWidget {
 class _ReaderSettingsState extends State<ReaderSettings> {
   @override
   Widget build(BuildContext context) {
+    final comicId = widget.comicId;
+    final sourceKey = widget.comicSource;
+    final key = "$comicId@$sourceKey";
+
+    bool isEnabledSpecificSettings =
+        comicId != null &&
+        appdata.settings.isComicSpecificSettingsEnabled(comicId, sourceKey);
+
     return SmoothCustomScrollView(
       slivers: [
         SliverAppbar(title: Text("Reading".tl)),
+        if (comicId != null && sourceKey != null)
+          SliverMainAxisGroup(
+            slivers: [
+              SwitchListTile(
+                title: Text("Enable comic specific settings".tl),
+                value: isEnabledSpecificSettings,
+                onChanged: (b) {
+                  setState(() {
+                    appdata.settings.setEnabledComicSpecificSettings(
+                      comicId,
+                      sourceKey,
+                      b,
+                    );
+                  });
+                },
+              ).toSliver(),
+              if (isEnabledSpecificSettings)
+                Center(
+                  child: TextButton(
+                    onPressed: () {
+                      setState(() {
+                        appdata.settings.resetComicReaderSettings(key);
+                      });
+                    },
+                    child: Text(
+                      "Clear specific reader settings for this comic".tl,
+                    ),
+                  ),
+                ).toSliver(),
+              Divider().toSliver(),
+            ],
+          ),
         _SwitchSetting(
           title: "Tap to turn Pages".tl,
           settingKey: "enableTapToTurnPages",
           onChanged: () {
             widget.onChanged?.call("enableTapToTurnPages");
           },
+          comicId: isEnabledSpecificSettings ? widget.comicId : null,
+          comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
         ).toSliver(),
         _SwitchSetting(
           title: "Reverse tap to turn Pages".tl,
@@ -28,6 +77,8 @@ class _ReaderSettingsState extends State<ReaderSettings> {
           onChanged: () {
             widget.onChanged?.call("reverseTapToTurnPages");
           },
+          comicId: isEnabledSpecificSettings ? widget.comicId : null,
+          comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
         ).toSliver(),
         _SwitchSetting(
           title: "Page animation".tl,
@@ -35,6 +86,8 @@ class _ReaderSettingsState extends State<ReaderSettings> {
           onChanged: () {
             widget.onChanged?.call("enablePageAnimation");
           },
+          comicId: isEnabledSpecificSettings ? widget.comicId : null,
+          comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
         ).toSliver(),
         SelectSetting(
           title: "Reading mode".tl,
@@ -58,6 +111,8 @@ class _ReaderSettingsState extends State<ReaderSettings> {
             }
             widget.onChanged?.call("readerMode");
           },
+          comicId: isEnabledSpecificSettings ? widget.comicId : null,
+          comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
         ).toSliver(),
         _SliderSetting(
           title: "Auto page turning interval".tl,
@@ -69,6 +124,8 @@ class _ReaderSettingsState extends State<ReaderSettings> {
             setState(() {});
             widget.onChanged?.call("autoPageTurningInterval");
           },
+          comicId: isEnabledSpecificSettings ? widget.comicId : null,
+          comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
         ).toSliver(),
         SliverAnimatedVisibility(
           visible: appdata.settings['readerMode']!.startsWith('gallery'),
@@ -84,6 +141,8 @@ class _ReaderSettingsState extends State<ReaderSettings> {
               setState(() {});
               widget.onChanged?.call("readerScreenPicNumberForLandscape");
             },
+            comicId: isEnabledSpecificSettings ? widget.comicId : null,
+            comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
           ),
         ),
         SliverAnimatedVisibility(
@@ -99,10 +158,13 @@ class _ReaderSettingsState extends State<ReaderSettings> {
             onChanged: () {
               widget.onChanged?.call("readerScreenPicNumberForPortrait");
             },
+            comicId: isEnabledSpecificSettings ? widget.comicId : null,
+            comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
           ),
         ),
         SliverAnimatedVisibility(
-          visible: appdata.settings['readerMode']!.startsWith('gallery') &&
+          visible:
+              appdata.settings['readerMode']!.startsWith('gallery') &&
               (appdata.settings['readerScreenPicNumberForLandscape'] > 1 ||
                   appdata.settings['readerScreenPicNumberForPortrait'] > 1),
           child: _SwitchSetting(
@@ -111,6 +173,23 @@ class _ReaderSettingsState extends State<ReaderSettings> {
             onChanged: () {
               widget.onChanged?.call("showSingleImageOnFirstPage");
             },
+            comicId: isEnabledSpecificSettings ? widget.comicId : null,
+            comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
+          ),
+        ),
+        SliverAnimatedVisibility(
+          visible: appdata.settings['readerMode']!.startsWith('continuous'),
+          child: _SliderSetting(
+            title: "Mouse scroll speed".tl,
+            settingsIndex: "readerScrollSpeed",
+            interval: 0.1,
+            min: 0.5,
+            max: 3,
+            onChanged: () {
+              widget.onChanged?.call("readerScrollSpeed");
+            },
+            comicId: isEnabledSpecificSettings ? widget.comicId : null,
+            comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
           ),
         ),
         _SwitchSetting(
@@ -120,6 +199,8 @@ class _ReaderSettingsState extends State<ReaderSettings> {
             setState(() {});
             widget.onChanged?.call('enableDoubleTapToZoom');
           },
+          comicId: isEnabledSpecificSettings ? widget.comicId : null,
+          comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
         ).toSliver(),
         _SwitchSetting(
           title: 'Long press to zoom'.tl,
@@ -128,6 +209,8 @@ class _ReaderSettingsState extends State<ReaderSettings> {
             setState(() {});
             widget.onChanged?.call('enableLongPressToZoom');
           },
+          comicId: isEnabledSpecificSettings ? widget.comicId : null,
+          comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
         ).toSliver(),
         SliverAnimatedVisibility(
           visible: appdata.settings['enableLongPressToZoom'] == true,
@@ -138,6 +221,8 @@ class _ReaderSettingsState extends State<ReaderSettings> {
               "press": "Press position".tl,
               "center": "Screen center".tl,
             },
+            comicId: isEnabledSpecificSettings ? widget.comicId : null,
+            comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
           ),
         ),
         _SwitchSetting(
@@ -147,6 +232,8 @@ class _ReaderSettingsState extends State<ReaderSettings> {
           onChanged: () {
             widget.onChanged?.call('limitImageWidth');
           },
+          comicId: isEnabledSpecificSettings ? widget.comicId : null,
+          comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
         ).toSliver(),
         if (App.isAndroid)
           _SwitchSetting(
@@ -155,6 +242,8 @@ class _ReaderSettingsState extends State<ReaderSettings> {
             onChanged: () {
               widget.onChanged?.call('enableTurnPageByVolumeKey');
             },
+            comicId: isEnabledSpecificSettings ? widget.comicId : null,
+            comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
           ).toSliver(),
         _SwitchSetting(
           title: "Display time & battery info in reader".tl,
@@ -162,6 +251,8 @@ class _ReaderSettingsState extends State<ReaderSettings> {
           onChanged: () {
             widget.onChanged?.call("enableClockAndBatteryInfoInReader");
           },
+          comicId: isEnabledSpecificSettings ? widget.comicId : null,
+          comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
         ).toSliver(),
         _SwitchSetting(
           title: "Show system status bar".tl,
@@ -169,6 +260,8 @@ class _ReaderSettingsState extends State<ReaderSettings> {
           onChanged: () {
             widget.onChanged?.call("showSystemStatusBar");
           },
+          comicId: isEnabledSpecificSettings ? widget.comicId : null,
+          comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
         ).toSliver(),
         SelectSetting(
           title: "Quick collect image".tl,
@@ -184,6 +277,8 @@ class _ReaderSettingsState extends State<ReaderSettings> {
           help:
               "On the image browsing page, you can quickly collect images by sliding horizontally or vertically according to your reading mode"
                   .tl,
+          comicId: isEnabledSpecificSettings ? widget.comicId : null,
+          comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
         ).toSliver(),
         _CallbackSetting(
           title: "Custom Image Processing".tl,
@@ -196,6 +291,8 @@ class _ReaderSettingsState extends State<ReaderSettings> {
           interval: 1,
           min: 1,
           max: 16,
+          comicId: isEnabledSpecificSettings ? widget.comicId : null,
+          comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
         ).toSliver(),
         _SwitchSetting(
           title: "Show Page Number".tl,
@@ -203,6 +300,8 @@ class _ReaderSettingsState extends State<ReaderSettings> {
           onChanged: () {
             widget.onChanged?.call("showPageNumberInReader");
           },
+          comicId: isEnabledSpecificSettings ? widget.comicId : null,
+          comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
         ).toSliver(),
       ],
     );
@@ -248,7 +347,7 @@ class __CustomImageProcessingState extends State<_CustomImageProcessing> {
               setState(() {});
             },
             child: Text("Reset".tl),
-          )
+          ),
         ],
       ),
       body: Column(
@@ -274,7 +373,7 @@ class __CustomImageProcessingState extends State<_CustomImageProcessing> {
                 ),
               ),
             ),
-          )
+          ),
         ],
       ),
     );

lib/pages/settings/setting_components.dart

@@ -6,6 +6,8 @@ class _SwitchSetting extends StatefulWidget {
     required this.settingKey,
     this.onChanged,
     this.subtitle,
+    this.comicId,
+    this.comicSource,
   });
 
   final String title;
@@ -16,6 +18,10 @@ class _SwitchSetting extends StatefulWidget {
 
   final String? subtitle;
 
+  final String? comicId;
+
+  final String? comicSource;
+
   @override
   State<_SwitchSetting> createState() => _SwitchSettingState();
 }
@@ -23,16 +29,33 @@ class _SwitchSetting extends StatefulWidget {
 class _SwitchSettingState extends State<_SwitchSetting> {
   @override
   Widget build(BuildContext context) {
-    assert(appdata.settings[widget.settingKey] is bool);
+    var value = widget.comicId == null
+        ? appdata.settings[widget.settingKey]
+        : appdata.settings.getReaderSetting(
+            widget.comicId!,
+            widget.comicSource!,
+            widget.settingKey,
+          );
+
+    assert(value is bool);
 
     return ListTile(
       title: Text(widget.title),
       subtitle: widget.subtitle == null ? null : Text(widget.subtitle!),
       trailing: Switch(
-        value: appdata.settings[widget.settingKey],
+        value: value,
         onChanged: (value) {
           setState(() {
-            appdata.settings[widget.settingKey] = value;
+            if (widget.comicId == null) {
+              appdata.settings[widget.settingKey] = value;
+            } else {
+              appdata.settings.setReaderSetting(
+                widget.comicId!,
+                widget.comicSource!,
+                widget.settingKey,
+                value,
+              );
+            }
           });
           appdata.saveData().then((_) {
             widget.onChanged?.call();
@@ -51,6 +74,8 @@ class SelectSetting extends StatelessWidget {
     required this.optionTranslation,
     this.onChanged,
     this.help,
+    this.comicId,
+    this.comicSource,
   });
 
   final String title;
@@ -63,6 +88,10 @@ class SelectSetting extends StatelessWidget {
 
   final String? help;
 
+  final String? comicId;
+
+  final String? comicSource;
+
   @override
   Widget build(BuildContext context) {
     return SizedBox(
@@ -76,6 +105,8 @@ class SelectSetting extends StatelessWidget {
               optionTranslation: optionTranslation,
               onChanged: onChanged,
               help: help,
+              comicId: comicId,
+              comicSource: comicSource,
             );
           } else {
             return _EndSelectorSelectSetting(
@@ -84,6 +115,8 @@ class SelectSetting extends StatelessWidget {
               optionTranslation: optionTranslation,
               onChanged: onChanged,
               help: help,
+              comicId: comicId,
+              comicSource: comicSource,
             );
           }
         },
@@ -99,6 +132,8 @@ class _DoubleLineSelectSettings extends StatefulWidget {
     required this.optionTranslation,
     this.onChanged,
     this.help,
+    this.comicId,
+    this.comicSource,
   });
 
   final String title;
@@ -111,6 +146,10 @@ class _DoubleLineSelectSettings extends StatefulWidget {
 
   final String? help;
 
+  final String? comicId;
+
+  final String? comicSource;
+
   @override
   State<_DoubleLineSelectSettings> createState() =>
       _DoubleLineSelectSettingsState();
@@ -119,6 +158,14 @@ class _DoubleLineSelectSettings extends StatefulWidget {
 class _DoubleLineSelectSettingsState extends State<_DoubleLineSelectSettings> {
   @override
   Widget build(BuildContext context) {
+    var value = widget.comicId == null
+        ? appdata.settings[widget.settingKey]
+        : appdata.settings.getReaderSetting(
+            widget.comicId!,
+            widget.comicSource!,
+            widget.settingKey,
+          );
+
     return ListTile(
       title: Row(
         children: [
@@ -134,9 +181,9 @@ class _DoubleLineSelectSettingsState extends State<_DoubleLineSelectSettings> {
                   builder: (context) {
                     return ContentDialog(
                       title: "Help".tl,
-                      content: Text(widget.help!)
+                      content: Text(
-                          .paddingHorizontal(16)
+                        widget.help!,
-                          .fixWidth(double.infinity),
+                      ).paddingHorizontal(16).fixWidth(double.infinity),
                       actions: [
                         Button.filled(
                           onPressed: context.pop,
@@ -150,9 +197,7 @@ class _DoubleLineSelectSettingsState extends State<_DoubleLineSelectSettings> {
             ),
         ],
       ),
-      subtitle: Text(
+      subtitle: Text(widget.optionTranslation[value] ?? "None"),
-          widget.optionTranslation[appdata.settings[widget.settingKey]] ??
-              "None"),
       trailing: const Icon(Icons.arrow_drop_down),
       onTap: () {
         var renderBox = context.findRenderObject() as RenderBox;
@@ -170,16 +215,27 @@ class _DoubleLineSelectSettingsState extends State<_DoubleLineSelectSettings> {
             Offset.zero & MediaQuery.of(context).size,
           ),
           items: widget.optionTranslation.keys
-              .map((key) => PopupMenuItem(
+              .map(
-                    value: key,
+                (key) => PopupMenuItem(
-                    height: App.isMobile ? 46 : 40,
+                  value: key,
-                    child: Text(widget.optionTranslation[key]!),
+                  height: App.isMobile ? 46 : 40,
-                  ))
+                  child: Text(widget.optionTranslation[key]!),
+                ),
+              )
               .toList(),
         ).then((value) {
           if (value != null) {
             setState(() {
-              appdata.settings[widget.settingKey] = value;
+              if (widget.comicId == null) {
+                appdata.settings[widget.settingKey] = value;
+              } else {
+                appdata.settings.setReaderSetting(
+                  widget.comicId!,
+                  widget.comicSource!,
+                  widget.settingKey,
+                  value,
+                );
+              }
             });
             appdata.saveData();
             widget.onChanged?.call();
@@ -197,6 +253,8 @@ class _EndSelectorSelectSetting extends StatefulWidget {
     required this.optionTranslation,
     this.onChanged,
     this.help,
+    this.comicId,
+    this.comicSource,
   });
 
   final String title;
@@ -209,6 +267,10 @@ class _EndSelectorSelectSetting extends StatefulWidget {
 
   final String? help;
 
+  final String? comicId;
+
+  final String? comicSource;
+
   @override
   State<_EndSelectorSelectSetting> createState() =>
       _EndSelectorSelectSettingState();
@@ -218,6 +280,13 @@ class _EndSelectorSelectSettingState extends State<_EndSelectorSelectSetting> {
   @override
   Widget build(BuildContext context) {
     var options = widget.optionTranslation;
+    var value = widget.comicId == null
+        ? appdata.settings[widget.settingKey]
+        : appdata.settings.getReaderSetting(
+            widget.comicId!,
+            widget.comicSource!,
+            widget.settingKey,
+          );
     return ListTile(
       title: Row(
         children: [
@@ -233,9 +302,9 @@ class _EndSelectorSelectSettingState extends State<_EndSelectorSelectSetting> {
                   builder: (context) {
                     return ContentDialog(
                       title: "Help".tl,
-                      content: Text(widget.help!)
+                      content: Text(
-                          .paddingHorizontal(16)
+                        widget.help!,
-                          .fixWidth(double.infinity),
+                      ).paddingHorizontal(16).fixWidth(double.infinity),
                       actions: [
                         Button.filled(
                           onPressed: context.pop,
@@ -250,12 +319,22 @@ class _EndSelectorSelectSettingState extends State<_EndSelectorSelectSetting> {
         ],
       ),
       trailing: Select(
-        current: options[appdata.settings[widget.settingKey]],
+        current: options[value],
         values: options.values.toList(),
         minWidth: 64,
         onTap: (index) {
           setState(() {
-            appdata.settings[widget.settingKey] = options.keys.elementAt(index);
+            var value = options.keys.elementAt(index);
+            if (widget.comicId == null) {
+              appdata.settings[widget.settingKey] = value;
+            } else {
+              appdata.settings.setReaderSetting(
+                widget.comicId!,
+                widget.comicSource!,
+                widget.settingKey,
+                value,
+              );
+            }
           });
           appdata.saveData();
           widget.onChanged?.call();
@@ -273,6 +352,8 @@ class _SliderSetting extends StatefulWidget {
     required this.min,
     required this.max,
     this.onChanged,
+    this.comicId,
+    this.comicSource,
   });
 
   final String title;
@@ -287,6 +368,10 @@ class _SliderSetting extends StatefulWidget {
 
   final VoidCallback? onChanged;
 
+  final String? comicId;
+
+  final String? comicSource;
+
   @override
   State<_SliderSetting> createState() => _SliderSettingState();
 }
@@ -294,28 +379,52 @@ class _SliderSetting extends StatefulWidget {
 class _SliderSettingState extends State<_SliderSetting> {
   @override
   Widget build(BuildContext context) {
+    var value =
+        (widget.comicId == null
+                ? appdata.settings[widget.settingsIndex]
+                : appdata.settings.getReaderSetting(
+                    widget.comicId!,
+                    widget.comicSource!,
+                    widget.settingsIndex,
+                  ))
+            .toDouble();
     return ListTile(
       title: Row(
         children: [
           Text(widget.title),
           const Spacer(),
-          Text(
+          Text(value.toString(), style: ts.s12),
-            appdata.settings[widget.settingsIndex].toString(),
-            style: ts.s12,
-          ),
         ],
       ),
       subtitle: Slider(
-        value: appdata.settings[widget.settingsIndex].toDouble(),
+        value: value,
         onChanged: (value) {
           if (value.toInt() == value) {
             setState(() {
-              appdata.settings[widget.settingsIndex] = value.toInt();
+              if (widget.comicId == null) {
+                appdata.settings[widget.settingsIndex] = value.toInt();
+              } else {
+                appdata.settings.setReaderSetting(
+                  widget.comicId!,
+                  widget.comicSource!,
+                  widget.settingsIndex,
+                  value.toInt(),
+                );
+              }
               appdata.saveData();
             });
           } else {
             setState(() {
-              appdata.settings[widget.settingsIndex] = value;
+              if (widget.comicId == null) {
+                appdata.settings[widget.settingsIndex] = value;
+              } else {
+                appdata.settings.setReaderSetting(
+                  widget.comicId!,
+                  widget.comicSource!,
+                  widget.settingsIndex,
+                  value,
+                );
+              }
               appdata.saveData();
             });
           }
@@ -402,10 +511,11 @@ class _MultiPagesFilterState extends State<_MultiPagesFilter> {
         color: Theme.of(context).colorScheme.surfaceContainer,
         boxShadow: const [
           BoxShadow(
-              color: Colors.black12,
+            color: Colors.black12,
-              blurRadius: 5,
+            blurRadius: 5,
-              offset: Offset(0, 2),
+            offset: Offset(0, 2),
-              spreadRadius: 2)
+            spreadRadius: 2,
+          ),
         ],
       ),
       onReorder: (reorderFunc) {
@@ -435,7 +545,7 @@ class _MultiPagesFilterState extends State<_MultiPagesFilter> {
             label: Text("Add".tl),
             icon: const Icon(Icons.add),
             onPressed: showAddDialog,
-          )
+          ),
       ],
       body: view,
     );
@@ -445,12 +555,13 @@ class _MultiPagesFilterState extends State<_MultiPagesFilter> {
     Widget removeButton = Padding(
       padding: const EdgeInsets.only(right: 8),
       child: IconButton(
-          onPressed: () {
+        onPressed: () {
-            setState(() {
+          setState(() {
-              keys.remove(key);
+            keys.remove(key);
-            });
+          });
-          },
+        },
-          icon: const Icon(Icons.delete_outline)),
+        icon: const Icon(Icons.delete_outline),
+      ),
     );
 
     return ListTile(
@@ -458,10 +569,7 @@ class _MultiPagesFilterState extends State<_MultiPagesFilter> {
       key: Key(key),
       trailing: Row(
         mainAxisSize: MainAxisSize.min,
-        children: [
+        children: [removeButton, const Icon(Icons.drag_handle)],
-          removeButton,
-          const Icon(Icons.drag_handle),
-        ],
       ),
     );
   }
@@ -477,64 +585,66 @@ class _MultiPagesFilterState extends State<_MultiPagesFilter> {
     showDialog(
       context: context,
       builder: (context) {
-        return StatefulBuilder(builder: (context, setState) {
+        return StatefulBuilder(
-          return ContentDialog(
+          builder: (context, setState) {
-            title: "Add".tl,
+            return ContentDialog(
-            content: Column(
+              title: "Add".tl,
-              mainAxisSize: MainAxisSize.min,
+              content: Column(
-              children: canAdd.entries
+                mainAxisSize: MainAxisSize.min,
-                  .map(
+                children: canAdd.entries
-                    (e) => CheckboxListTile(
+                    .map(
-                      value: selected.contains(e.key),
+                      (e) => CheckboxListTile(
-                      title: Text(e.value),
+                        value: selected.contains(e.key),
-                      key: Key(e.key),
+                        title: Text(e.value),
-                      onChanged: (value) {
+                        key: Key(e.key),
-                        setState(() {
+                        onChanged: (value) {
-                          if (value!) {
+                          setState(() {
-                            selected.add(e.key);
+                            if (value!) {
-                          } else {
+                              selected.add(e.key);
-                            selected.remove(e.key);
+                            } else {
-                          }
+                              selected.remove(e.key);
-                        });
+                            }
-                      },
+                          });
-                    ),
+                        },
-                  )
+                      ),
-                  .toList(),
+                    )
-            ),
+                    .toList(),
-            actions: [
-              if (selected.length < canAdd.length)
-                TextButton(
-                  child: Text("Select All".tl),
-                  onPressed: () {
-                    setState(() {
-                      selected = canAdd.keys.toList();
-                    });
-                  },
-                )
-              else
-                TextButton(
-                  child: Text("Deselect All".tl),
-                  onPressed: () {
-                    setState(() {
-                      selected.clear();
-                    });
-                  },
-                ),
-              const SizedBox(width: 8),
-              FilledButton(
-                onPressed: selected.isNotEmpty
-                    ? () {
-                        this.setState(() {
-                          keys.addAll(selected);
-                        });
-                        Navigator.pop(context);
-                      }
-                    : null,
-                child: Text("Add".tl),
               ),
-            ],
+              actions: [
-          );
+                if (selected.length < canAdd.length)
-        });
+                  TextButton(
+                    child: Text("Select All".tl),
+                    onPressed: () {
+                      setState(() {
+                        selected = canAdd.keys.toList();
+                      });
+                    },
+                  )
+                else
+                  TextButton(
+                    child: Text("Deselect All".tl),
+                    onPressed: () {
+                      setState(() {
+                        selected.clear();
+                      });
+                    },
+                  ),
+                const SizedBox(width: 8),
+                FilledButton(
+                  onPressed: selected.isNotEmpty
+                      ? () {
+                          this.setState(() {
+                            keys.addAll(selected);
+                          });
+                          Navigator.pop(context);
+                        }
+                      : null,
+                  child: Text("Add".tl),
+                ),
+              ],
+            );
+          },
+        );
       },
     );
   }

lib/utils/file_type.dart

@@ -28,6 +28,8 @@ final _resolver = MimeTypeResolver()
   ..addMagicNumber([0x37, 0x7A, 0xBC, 0xAF, 0x27, 0x1C], 'application/x-7z-compressed')
   // rar
   ..addMagicNumber([0x52, 0x61, 0x72, 0x21, 0x1A, 0x07], 'application/vnd.rar')
+  // avif
+  ..addMagicNumber([0x00, 0x00, 0x00, 0x18, 0x66, 0x74, 0x79, 0x70, 0x61, 0x76, 0x69, 0x66], 'image/avif')
 ;
 
 FileType detectFileType(List<int> data) {