Merge pull request #454 from venera-app/v1.4.6-dev

V1.4.6

lib/pages/comic_source_page.dart

@@ -191,13 +191,6 @@ class _BodyState extends State<_Body> {
   }
 
   Widget buildCard(BuildContext context) {
-    Widget buildButton({
-      required Widget child,
-      required VoidCallback onPressed,
-    }) {
-      return Button.normal(onPressed: onPressed, child: child).fixHeight(32);
-    }
-
     return SliverToBoxAdapter(
       child: SizedBox(
         width: double.infinity,
@@ -224,33 +217,33 @@ class _BodyState extends State<_Body> {
               },
               onSubmitted: handleAddSource,
             ).paddingHorizontal(16).paddingBottom(8),
-            ListTile(
-              title: Text("Comic Source list".tl),
-              trailing: buildButton(
-                child: Text("View".tl),
-                onPressed: () {
-                  showPopUpWidget(
-                    App.rootContext,
-                    _ComicSourceList(handleAddSource),
-                  );
-                },
-              ),
-            ),
-            ListTile(
-              title: Text("Use a config file".tl),
-              trailing: buildButton(
-                onPressed: _selectFile,
-                child: Text("Select".tl),
-              ),
-            ),
-            ListTile(
-              title: Text("Help".tl),
-              trailing: buildButton(onPressed: help, child: Text("Open".tl)),
-            ),
-            ListTile(
-              title: Text("Check updates".tl),
-              trailing: _CheckUpdatesButton(),
-            ),
+            Wrap(
+              spacing: 8,
+              runSpacing: 8,
+              children: [
+                FilledButton.tonalIcon(
+                  icon: Icon(Icons.article_outlined),
+                  label: Text("Comic Source list".tl),
+                  onPressed: () {
+                    showPopUpWidget(
+                      App.rootContext,
+                      _ComicSourceList(handleAddSource),
+                    );
+                  },
+                ),
+                FilledButton.tonalIcon(
+                  icon: Icon(Icons.file_open_outlined),
+                  label: Text("Use a config file".tl),
+                  onPressed: _selectFile,
+                ),
+                FilledButton.tonalIcon(
+                  icon: Icon(Icons.help_outline),
+                  label: Text("Help".tl),
+                  onPressed: help,
+                ),
+                _CheckUpdatesButton(),
+              ],
+            ).paddingHorizontal(12).paddingVertical(8),
             const SizedBox(height: 8),
           ],
         ),
@@ -699,11 +692,15 @@ class _CheckUpdatesButtonState extends State<_CheckUpdatesButton> {
 
   @override
   Widget build(BuildContext context) {
-    return Button.normal(
+    return FilledButton.tonalIcon(
+      icon: isLoading ? SizedBox(
+        width: 18,
+        height: 18,
+        child: CircularProgressIndicator(strokeWidth: 2),
+      ) : Icon(Icons.update),
+      label: Text("Check updates".tl),
       onPressed: check,
-      isLoading: isLoading,
-      child: Text("Check".tl),
-    ).fixHeight(32);
+    );
   }
 }
 

lib/pages/favorites/favorites_page.dart

@@ -20,6 +20,7 @@ import 'package:venera/pages/reader/reader.dart';
 import 'package:venera/pages/settings/settings_page.dart';
 import 'package:venera/utils/ext.dart';
 import 'package:venera/utils/io.dart';
+import 'package:venera/utils/opencc.dart';
 import 'package:venera/utils/tags_translation.dart';
 import 'package:venera/utils/translations.dart';
 

lib/pages/favorites/local_favorites_page.dart

@@ -52,7 +52,9 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
       } else {
         searchResults = [];
         for (var comic in comics) {
-          if (matchKeyword(keyword, comic)) {
+          if (matchKeyword(keyword, comic) ||
+              matchKeywordT(keyword, comic) ||
+              matchKeywordS(keyword, comic)) {
             searchResults.add(comic);
           }
         }
@@ -130,6 +132,24 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
     return true;
   }
 
+  // Convert keyword to traditional Chinese to match comics
+  bool matchKeywordT(String keyword, FavoriteItem comic) {
+    if (!OpenCC.hasChineseSimplified(keyword)) {
+      return false;
+    }
+    keyword = OpenCC.simplifiedToTraditional(keyword);
+    return matchKeyword(keyword, comic);
+  }
+
+  // Convert keyword to simplified Chinese to match comics
+  bool matchKeywordS(String keyword, FavoriteItem comic) {
+    if (!OpenCC.hasChineseTraditional(keyword)) {
+      return false;
+    }
+    keyword = OpenCC.traditionalToSimplified(keyword);
+    return matchKeyword(keyword, comic);
+  }
+
   @override
   void initState() {
     favPage = context.findAncestorStateOfType<_FavoritesPageState>()!;

lib/pages/reader/images.dart

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

lib/pages/reader/reader.dart

@@ -177,10 +177,18 @@ class _ReaderState extends State<Reader>
     super.initState();
   }
 
+  bool _isInitialized = false;
+
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    initImagesPerPage(widget.initialPage ?? 1);
+    if (!_isInitialized) {
+      initImagesPerPage(widget.initialPage ?? 1);
+      _isInitialized = true;
+    } else {
+      // For orientation changed
+      _checkImagesPerPageChange();
+    }
     initReaderWindow();
   }
 
@@ -345,6 +353,8 @@ class _ReaderState extends State<Reader>
 abstract mixin class _ImagePerPageHandler {
   late int _lastImagesPerPage;
 
+  late bool _lastOrientation;
+
   bool get isPortrait;
 
   int get page;
@@ -355,6 +365,7 @@ abstract mixin class _ImagePerPageHandler {
 
   void initImagesPerPage(int initialPage) {
     _lastImagesPerPage = imagesPerPage;
+    _lastOrientation = isPortrait;
     if (imagesPerPage != 1) {
       if (showSingleImageOnFirstPage) {
         page = ((initialPage - 1) / imagesPerPage).ceil() + 1;
@@ -380,19 +391,42 @@ abstract mixin class _ImagePerPageHandler {
   /// Check if the number of images per page has changed
   void _checkImagesPerPageChange() {
     int currentImagesPerPage = imagesPerPage;
-    if (_lastImagesPerPage != currentImagesPerPage) {
+    bool currentOrientation = isPortrait;
+
+    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 = (page - 1) * oldImagesPerPage;
-    int newPage = (previousImageIndex ~/ newImagesPerPage) + 1;
-    page = newPage;
+    int previousImageIndex = 1;
+    if (!showSingleImageOnFirstPage || oldImagesPerPage == 1) {
+      previousImageIndex = (page - 1) * oldImagesPerPage + 1;
+    } 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/settings/app.dart

@@ -193,12 +193,46 @@ 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: const Text("Logs"),
+        title: Text("Logs".tl),
         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(
@@ -217,7 +251,7 @@ class _LogsPageState extends State<LogsPage> {
                         onTap: () {
                           Log.ignoreLimitation = true;
                           context.showMessage(
-                              message: "Only valid for this run");
+                              message: "Only valid for this run".tl);
                         },
                       ),
                       PopupMenuItem(
@@ -232,9 +266,9 @@ class _LogsPageState extends State<LogsPage> {
       body: ListView.builder(
         reverse: true,
         controller: ScrollController(),
-        itemCount: Log.logs.length,
+        itemCount: logToShow.length,
         itemBuilder: (context, index) {
-          index = Log.logs.length - index - 1;
+          index = logToShow.length - index - 1;
           return Padding(
             padding: const EdgeInsets.fromLTRB(16, 0, 16, 8),
             child: SelectionArea(
@@ -253,7 +287,7 @@ class _LogsPageState extends State<LogsPage> {
                         ),
                         child: Padding(
                           padding: const EdgeInsets.fromLTRB(5, 0, 5, 1),
-                          child: Text(Log.logs[index].title),
+                          child: Text(logToShow[index].title),
                         ),
                       ),
                       const SizedBox(
@@ -265,16 +299,16 @@ class _LogsPageState extends State<LogsPage> {
                             Theme.of(context).colorScheme.error,
                             Theme.of(context).colorScheme.errorContainer,
                             Theme.of(context).colorScheme.primaryContainer
-                          ][Log.logs[index].level.index],
+                          ][logToShow[index].level.index],
                           borderRadius:
                               const BorderRadius.all(Radius.circular(16)),
                         ),
                         child: Padding(
                           padding: const EdgeInsets.fromLTRB(5, 0, 5, 1),
                           child: Text(
-                            Log.logs[index].level.name,
+                            logToShow[index].level.name,
                             style: TextStyle(
-                                color: Log.logs[index].level.index == 0
+                                color: logToShow[index].level.index == 0
                                     ? Colors.white
                                     : Colors.black),
                           ),
@@ -282,14 +316,14 @@ class _LogsPageState extends State<LogsPage> {
                       ),
                     ],
                   ),
-                  Text(Log.logs[index].content),
-                  Text(Log.logs[index].time
+                  Text(logToShow[index].content),
+                  Text(logToShow[index].time
                       .toString()
                       .replaceAll(RegExp(r"\.\w+"), "")),
                   TextButton(
                     onPressed: () {
                       Clipboard.setData(
-                          ClipboardData(text: Log.logs[index].content));
+                          ClipboardData(text: logToShow[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",
-          actionTitle: "Reload",
+          title: "Reload Configs".tl,
+          actionTitle: "Reload".tl,
           callback: () {
             ComicSourceManager().reload();
           },