Set high refresh rate on Android.

assets/translation.json

@@ -234,10 +234,8 @@
     "Please add some sources": "请添加一些源",
     "Please check your settings": "请检查您的设置",
     "No Category Pages": "没有分类页面",
-    "Group @group": "第 @group 组",
     "Chapter @ep": "第 @ep 章",
     "Page @page": "第 @page 页",
-    "Remove local favorite and history": "删除本地收藏和历史记录",
     "Also remove files on disk": "同时删除磁盘上的文件",
     "Copy to app local path": "将漫画复制到本地存储目录中",
     "Delete all unavailable local favorite items": "删除所有无效的本地收藏",
@@ -390,21 +388,13 @@
     "Suggestions": "建议",
     "Do not report any issues related to sources to App repo.": "请不要向App仓库报告任何与源相关的问题",
     "Show single image on first page": "在首页显示单张图片",
-    "Show system status bar": "显示系统状态栏",
     "Click to select an image": "点击选择一张图片",
     "Repo URL": "仓库地址",
     "The URL should point to a 'index.json' file": "该URL应指向一个'index.json'文件",
     "Double tap to zoom": "双击缩放",
     "Clear Unfavorited": "清除未收藏",
     "Reverse": "反转",
-    "Delete Chapters": "删除章节",
+    "Delete Chapters": "删除章节"
-    "Path copied to clipboard": "路径已复制到剪贴板",
-    "Reverse default chapter order": "反转默认章节顺序",
-    "Reload Configs": "重新加载配置文件",
-    "Reload": "重载",
-    "Disable Length Limitation": "禁用长度限制",
-    "Only valid for this run": "仅对本次运行有效",
-    "Logs": "日志"
   },
   "zh_TW": {
     "Home": "首頁",
@@ -641,10 +631,8 @@
     "Please add some sources": "請添加一些源",
     "Please check your settings": "請檢查您的設定",
     "No Category Pages": "沒有分類頁面",
-    "Group @group": "第 @group 組",
     "Chapter @ep": "第 @ep 章",
     "Page @page": "第 @page 頁",
-    "Remove local favorite and history": "刪除本機收藏和歷史記錄",
     "Also remove files on disk": "同時刪除磁碟上的文件",
     "Copy to app local path": "將漫畫複製到本機儲存目錄中",
     "Delete all unavailable local favorite items": "刪除所有無效的本機收藏",
@@ -797,20 +785,12 @@
     "Suggestions": "建議",
     "Do not report any issues related to sources to App repo.": "請不要向App倉庫報告任何與源相關的問題",
     "Show single image on first page": "在首頁顯示單張圖片",
-    "Show system status bar": "顯示系統狀態欄",
     "Click to select an image": "點擊選擇一張圖片",
     "Repo URL": "倉庫地址",
     "The URL should point to a 'index.json' file": "該URL應指向一個'index.json'文件",
     "Double tap to zoom": "雙擊縮放",
     "Clear Unfavorited": "清除未收藏",
     "Reverse": "反轉",
-    "Delete Chapters": "刪除章節",
+    "Delete Chapters": "刪除章節"
-    "Path copied to clipboard": "路徑已複製到剪貼簿",
-    "Reverse default chapter order": "反轉預設章節順序",
-    "Reload Configs": "重新載入設定檔",
-    "Reload": "重載",
-    "Disable Length Limitation": "禁用長度限制",
-    "Only valid for this run": "僅對本次運行有效",
-    "Logs": "日誌"
   }
 }

lib/foundation/appdata.dart

@@ -197,8 +197,6 @@ class Settings with ChangeNotifier {
     'showPageNumberInReader': true,
     'showSingleImageOnFirstPage': false,
     'enableDoubleTapToZoom': true,
-    'reverseChapterOrder': false,
-    'showSystemStatusBar': false,
   };
 
   operator [](String key) {

lib/foundation/history.dart

@@ -133,11 +133,6 @@ class History implements Comic {
   @override
   String get description {
     var res = "";
-    if (group != null){
-      res += "${"Group @group".tlParams({
-        "group": group!,
-      })} - ";
-    }
     if (ep >= 1) {
       res += "Chapter @ep".tlParams({
         "ep": ep,

lib/foundation/local.dart

@@ -611,7 +611,7 @@ class LocalManager with ChangeNotifier {
     notifyListeners();
   }
 
-  void batchDeleteComics(List<LocalComic> comics, [bool removeFileOnDisk = true, bool removeFavoriteAndHistory = true]) {
+  void batchDeleteComics(List<LocalComic> comics, [bool removeFileOnDisk = true]) {
     if (comics.isEmpty) {
       return;
     }
@@ -640,11 +640,8 @@ class LocalManager with ChangeNotifier {
     _db.execute('COMMIT;');
 
     var comicIDs = comics.map((e) => ComicID(e.comicType, e.id)).toList();
-
+    LocalFavoritesManager().batchDeleteComicsInAllFolders(comicIDs);
-    if (removeFavoriteAndHistory) {
+    HistoryManager().batchDeleteHistories(comicIDs);
-      LocalFavoritesManager().batchDeleteComicsInAllFolders(comicIDs);
-      HistoryManager().batchDeleteHistories(comicIDs);
-    }
 
     notifyListeners();
 

lib/pages/comic_details_page/chapters.dart

@@ -27,7 +27,7 @@ class _NormalComicChapters extends StatefulWidget {
 class _NormalComicChaptersState extends State<_NormalComicChapters> {
   late _ComicPageState state;
 
-  late bool reverse;
+  bool reverse = false;
 
   bool showAll = false;
 
@@ -38,7 +38,6 @@ class _NormalComicChaptersState extends State<_NormalComicChapters> {
   @override
   void initState() {
     super.initState();
-    reverse = appdata.settings["reverseChapterOrder"] ?? false;
     history = widget.history;
   }
 
@@ -177,7 +176,7 @@ class _GroupedComicChaptersState extends State<_GroupedComicChapters>
     with SingleTickerProviderStateMixin {
   late _ComicPageState state;
 
-  late bool reverse;
+  bool reverse = false;
 
   bool showAll = false;
 
@@ -192,7 +191,6 @@ class _GroupedComicChaptersState extends State<_GroupedComicChapters>
   @override
   void initState() {
     super.initState();
-    reverse = appdata.settings["reverseChapterOrder"] ?? false;
     history = widget.history;
     if (history?.group != null) {
       index = history!.group! - 1;

lib/pages/comic_details_page/comic_page.dart

@@ -410,26 +410,20 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
                       String text;
                       if (haveChapter) {
                         var epName = "E$ep";
-                        String? groupName;
                         try {
-                          if (group == null){
+                          epName = group == null
-                            epName = comic.chapters!.titles.elementAt(
+                              ? comic.chapters!.titles.elementAt(
-                              math.min(ep - 1, comic.chapters!.length - 1),
+                            math.min(ep - 1, comic.chapters!.length - 1),
-                            );
+                          )
-                          } else {
+                              : comic.chapters!
-                            groupName = comic.chapters!.groups.elementAt(group - 1);
+                              .getGroupByIndex(group - 1)
-                            epName = comic.chapters!
+                              .values
-                                .getGroupByIndex(group - 1)
+                              .elementAt(ep - 1);
-                                .values
-                                .elementAt(ep - 1);
-                          }
                         }
                         catch(e) {
                           // ignore
                         }
-                        text = groupName == null
+                        text = "${"Last Reading".tl}: $epName P$page";
-                            ? "${"Last Reading".tl}: $epName P$page"
-                            : "${"Last Reading".tl}: $groupName $epName P$page";
                       } else {
                         text = "${"Last Reading".tl}: P$page";
                       }

lib/pages/local_comics_page.dart

@@ -361,31 +361,17 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
       context: App.rootContext,
       builder: (context) {
         bool removeComicFile = true;
-        bool removeFavoriteAndHistory = true;
         return StatefulBuilder(builder: (context, state) {
           return ContentDialog(
             title: "Delete".tl,
-            content: Column(
+            content: CheckboxListTile(
-              children: [
+              title: Text("Also remove files on disk".tl),
-                CheckboxListTile(
+              value: removeComicFile,
-                  title: Text("Remove local favorite and history".tl),
+              onChanged: (v) {
-                  value: removeFavoriteAndHistory,
+                state(() {
-                  onChanged: (v) {
+                  removeComicFile = !removeComicFile;
-                    state(() {
+                });
-                      removeFavoriteAndHistory = !removeFavoriteAndHistory;
+              },
-                    });
-                  },
-                ),
-                CheckboxListTile(
-                  title: Text("Also remove files on disk".tl),
-                  value: removeComicFile,
-                  onChanged: (v) {
-                    state(() {
-                      removeComicFile = !removeComicFile;
-                    });
-                  },
-                )
-              ],
             ),
             actions: [
               if (comics.length == 1 && comics.first.hasChapters)
@@ -402,7 +388,6 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
                   LocalManager().batchDeleteComics(
                     comics,
                     removeComicFile,
-                    removeFavoriteAndHistory,
                   );
                   isDeleted = true;
                 },

lib/pages/reader/images.dart

@@ -85,21 +85,14 @@ class _ReaderImagesState extends State<_ReaderImages> {
         child: CircularProgressIndicator(),
       );
     } else if (error != null) {
-      return GestureDetector(
+      return NetworkError(
-        onTap: () {
+        message: error!,
-          context.readerScaffold.openOrClose();
+        retry: () {
+          setState(() {
+            reader.isLoading = true;
+            error = null;
+          });
         },
-        child: SizedBox.expand(
-          child: NetworkError(
-            message: error!,
-            retry: () {
-              setState(() {
-                reader.isLoading = true;
-                error = null;
-              });
-            },
-          ),
-        ),
       );
     } else {
       if (reader.mode.isGallery) {

lib/pages/reader/reader.dart

@@ -164,9 +164,7 @@ class _ReaderState extends State<Reader>
     }
     mode = ReaderMode.fromKey(appdata.settings['readerMode']);
     history = widget.history;
-    if (!appdata.settings['showSystemStatusBar']) {
+    SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
-      SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
-    }
     if (appdata.settings['enableTurnPageByVolumeKey']) {
       handleVolumeEvent();
     }
@@ -177,18 +175,10 @@ class _ReaderState extends State<Reader>
     super.initState();
   }
 
-  bool _isInitialized = false;
-
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    if (!_isInitialized) {
+    initImagesPerPage(widget.initialPage ?? 1);
-      initImagesPerPage(widget.initialPage ?? 1);
-      _isInitialized = true;
-    } else {
-      // For orientation changed
-      _checkImagesPerPageChange();
-    }
     initReaderWindow();
   }
 
@@ -353,8 +343,6 @@ class _ReaderState extends State<Reader>
 abstract mixin class _ImagePerPageHandler {
   late int _lastImagesPerPage;
 
-  late bool _lastOrientation;
-
   bool get isPortrait;
 
   int get page;
@@ -365,7 +353,6 @@ abstract mixin class _ImagePerPageHandler {
 
   void initImagesPerPage(int initialPage) {
     _lastImagesPerPage = imagesPerPage;
-    _lastOrientation = isPortrait;
     if (imagesPerPage != 1) {
       if (showSingleImageOnFirstPage) {
         page = ((initialPage - 1) / imagesPerPage).ceil() + 1;
@@ -391,42 +378,19 @@ abstract mixin class _ImagePerPageHandler {
   /// Check if the number of images per page has changed
   void _checkImagesPerPageChange() {
     int currentImagesPerPage = imagesPerPage;
-    bool currentOrientation = isPortrait;
+    if (_lastImagesPerPage != currentImagesPerPage) {
-
-    if (_lastImagesPerPage != currentImagesPerPage || _lastOrientation != currentOrientation) {
       _adjustPageForImagesPerPageChange(
           _lastImagesPerPage, currentImagesPerPage);
       _lastImagesPerPage = currentImagesPerPage;
-      _lastOrientation = currentOrientation;
     }
   }
 
   /// Adjust the page number when the number of images per page changes
   void _adjustPageForImagesPerPageChange(
       int oldImagesPerPage, int newImagesPerPage) {
-    int previousImageIndex = 1;
+    int previousImageIndex = (page - 1) * oldImagesPerPage;
-    if (!showSingleImageOnFirstPage || oldImagesPerPage == 1) {
+    int newPage = (previousImageIndex ~/ newImagesPerPage) + 1;
-      previousImageIndex = (page - 1) * oldImagesPerPage + 1;
+    page = newPage;
-    } else {
-      if (page == 1) {
-        previousImageIndex = 1;
-      } else {
-        previousImageIndex = (page - 2) * oldImagesPerPage + 2;
-      }
-    }
-
-    int newPage;
-    if (newImagesPerPage != 1) {
-      if (showSingleImageOnFirstPage) {
-        newPage = ((previousImageIndex - 1) / newImagesPerPage).ceil() + 1;
-      } else {
-        newPage = (previousImageIndex / newImagesPerPage).ceil();
-      }
-    } else {
-      newPage = previousImageIndex;
-    }
-
-    page = newPage>0 ? newPage : 1;
   }
 }
 

lib/pages/reader/scaffold.dart

@@ -107,11 +107,7 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
     if (!_isOpen) {
       SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
     } else {
-      if (!appdata.settings['showSystemStatusBar']) {
+      SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
-        SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
-      } else {
-        SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
-      }
     }
     setState(() {
       _isOpen = !_isOpen;

lib/pages/settings/app.dart

@@ -193,46 +193,12 @@ class LogsPage extends StatefulWidget {
 }
 
 class _LogsPageState extends State<LogsPage> {
-  String logLevelToShow = "all";
-
   @override
   Widget build(BuildContext context) {
-    var logToShow = logLevelToShow == "all"
-        ? Log.logs
-        : Log.logs.where((log) => log.level.name == logLevelToShow).toList();
     return Scaffold(
       appBar: Appbar(
-        title: Text("Logs".tl),
+        title: const Text("Logs"),
         actions: [
-          IconButton(
-              onPressed: () => setState(() {
-                    final RelativeRect position = RelativeRect.fromLTRB(
-                      MediaQuery.of(context).size.width,
-                      MediaQuery.of(context).padding.top + kToolbarHeight,
-                      0.0,
-                      0.0,
-                    );
-                    showMenu(context: context, position: position, items: [
-                      PopupMenuItem(
-                          child: Text("all"),
-                          onTap: () => setState(() => logLevelToShow = "all")
-                      ),
-                      PopupMenuItem(
-                          child: Text("info"),
-                          onTap: () => setState(() => logLevelToShow = "info")
-                      ),
-                      PopupMenuItem(
-                          child: Text("warning"),
-                          onTap: () => setState(() => logLevelToShow = "warning")
-                      ),
-                      PopupMenuItem(
-                          child: Text("error"),
-                          onTap: () => setState(() => logLevelToShow = "error")
-                      ),
-                    ]);
-              }),
-              icon: const Icon(Icons.filter_list_outlined)
-          ),
           IconButton(
               onPressed: () => setState(() {
                     final RelativeRect position = RelativeRect.fromLTRB(
@@ -251,7 +217,7 @@ class _LogsPageState extends State<LogsPage> {
                         onTap: () {
                           Log.ignoreLimitation = true;
                           context.showMessage(
-                              message: "Only valid for this run".tl);
+                              message: "Only valid for this run");
                         },
                       ),
                       PopupMenuItem(
@@ -266,9 +232,9 @@ class _LogsPageState extends State<LogsPage> {
       body: ListView.builder(
         reverse: true,
         controller: ScrollController(),
-        itemCount: logToShow.length,
+        itemCount: Log.logs.length,
         itemBuilder: (context, index) {
-          index = logToShow.length - index - 1;
+          index = Log.logs.length - index - 1;
           return Padding(
             padding: const EdgeInsets.fromLTRB(16, 0, 16, 8),
             child: SelectionArea(
@@ -287,7 +253,7 @@ class _LogsPageState extends State<LogsPage> {
                         ),
                         child: Padding(
                           padding: const EdgeInsets.fromLTRB(5, 0, 5, 1),
-                          child: Text(logToShow[index].title),
+                          child: Text(Log.logs[index].title),
                         ),
                       ),
                       const SizedBox(
@@ -299,16 +265,16 @@ class _LogsPageState extends State<LogsPage> {
                             Theme.of(context).colorScheme.error,
                             Theme.of(context).colorScheme.errorContainer,
                             Theme.of(context).colorScheme.primaryContainer
-                          ][logToShow[index].level.index],
+                          ][Log.logs[index].level.index],
                           borderRadius:
                               const BorderRadius.all(Radius.circular(16)),
                         ),
                         child: Padding(
                           padding: const EdgeInsets.fromLTRB(5, 0, 5, 1),
                           child: Text(
-                            logToShow[index].level.name,
+                            Log.logs[index].level.name,
                             style: TextStyle(
-                                color: logToShow[index].level.index == 0
+                                color: Log.logs[index].level.index == 0
                                     ? Colors.white
                                     : Colors.black),
                           ),
@@ -316,14 +282,14 @@ class _LogsPageState extends State<LogsPage> {
                       ),
                     ],
                   ),
-                  Text(logToShow[index].content),
+                  Text(Log.logs[index].content),
-                  Text(logToShow[index].time
+                  Text(Log.logs[index].time
                       .toString()
                       .replaceAll(RegExp(r"\.\w+"), "")),
                   TextButton(
                     onPressed: () {
                       Clipboard.setData(
-                          ClipboardData(text: logToShow[index].content));
+                          ClipboardData(text: Log.logs[index].content));
                     },
                     child: Text("Copy".tl),
                   ),

lib/pages/settings/debug.dart

@@ -18,8 +18,8 @@ class DebugPageState extends State<DebugPage> {
       slivers: [
         SliverAppbar(title: Text("Debug".tl)),
         _CallbackSetting(
-          title: "Reload Configs".tl,
+          title: "Reload Configs",
-          actionTitle: "Reload".tl,
+          actionTitle: "Reload",
           callback: () {
             ComicSourceManager().reload();
           },

lib/pages/settings/explore_settings.dart

@@ -52,10 +52,6 @@ class _ExploreSettingsState extends State<ExploreSettings> {
           title: "Show history on comic tile".tl,
           settingKey: "showHistoryStatusOnTile",
         ).toSliver(),
-        _SwitchSetting(
-          title: "Reverse default chapter order".tl,
-          settingKey: "reverseChapterOrder",
-        ).toSliver(),
         _PopupWindowSetting(
           title: "Keyword blocking".tl,
           builder: () => const _ManageBlockingWordView(),

lib/pages/settings/reader.dart

@@ -163,13 +163,6 @@ class _ReaderSettingsState extends State<ReaderSettings> {
             widget.onChanged?.call("enableClockAndBatteryInfoInReader");
           },
         ).toSliver(),
-        _SwitchSetting(
-          title: "Show system status bar".tl,
-          settingKey: "showSystemStatusBar",
-          onChanged: () {
-            widget.onChanged?.call("showSystemStatusBar");
-          },
-        ).toSliver(),
         SelectSetting(
           title: "Quick collect image".tl,
           settingKey: "quickCollectImage",