[Comic Source] New model PageJumpTarget. All page jump operations now use PageJumpTarget.

2025-09-28 00:07:24 +00:00 · 2025-04-04 22:47:43 +08:00
parent 971fc1da92
commit 463ad5b5bc
12 changed files with 266 additions and 226 deletions
--- a/lib/pages/categories_page.dart
+++ b/lib/pages/categories_page.dart
@@ -4,12 +4,10 @@ import 'package:venera/foundation/app.dart';
 import 'package:venera/foundation/appdata.dart';
 import 'package:venera/foundation/comic_source/comic_source.dart';
 import 'package:venera/pages/ranking_page.dart';
-import 'package:venera/pages/search_result_page.dart';
 import 'package:venera/pages/settings/settings_page.dart';
 import 'package:venera/utils/ext.dart';
 import 'package:venera/utils/translations.dart';

-import 'category_comics_page.dart';
 import 'comic_source_page.dart';

 class CategoriesPage extends StatefulWidget {
@@ -147,43 +145,6 @@ class _CategoryPage extends StatelessWidget {
    return "";
  }

-  void handleClick(
-    String tag,
-    String? param,
-    String type,
-    String namespace,
-    String categoryKey,
-  ) {
-    if (type == 'search') {
-      App.mainNavigatorKey?.currentContext?.to(
-        () => SearchResultPage(
-          text: tag,
-          options: const [],
-          sourceKey: findComicSourceKey(),
-        ),
-      );
-    } else if (type == "search_with_namespace") {
-      if (tag.contains(" ")) {
-        tag = '"$tag"';
-      }
-      App.mainNavigatorKey?.currentContext?.to(
-        () => SearchResultPage(
-          text: "$namespace:$tag",
-          options: const [],
-          sourceKey: findComicSourceKey(),
-        ),
-      );
-    } else if (type == "category") {
-      App.mainNavigatorKey!.currentContext!.to(
-        () => CategoryComicsPage(
-          category: tag,
-          categoryKey: categoryKey,
-          param: param,
-        ),
-      );
-    }
-  }
-
  @override
  Widget build(BuildContext context) {
    var children = <Widget>[];
@@ -194,11 +155,11 @@ class _CategoryPage extends StatelessWidget {
        child: Wrap(
          children: [
            if (data.enableRankingPage)
-              buildTag("Ranking".tl, (p0, p1) {
+              buildTag("Ranking".tl, () {
                context.to(() => RankingPage(categoryKey: data.key));
              }),
            for (var buttonData in data.buttons)
-              buildTag(buttonData.label.tl, (p0, p1) => buttonData.onTap())
+              buildTag(buttonData.label.tl, buttonData.onTap)
          ],
        ),
      ));
@@ -212,36 +173,14 @@ class _CategoryPage extends StatelessWidget {
            crossAxisAlignment: CrossAxisAlignment.start,
            children: [
              buildTitleWithRefresh(part.title, () => updater(() {})),
-              buildTagsWithParams(
-                part.categories,
-                part.categoryParams,
-                part.title,
-                (key, param) => handleClick(
-                  key,
-                  param,
-                  part.categoryType,
-                  part.title,
-                  category,
-                ),
-              )
+              buildTags(part.categories)
            ],
          );
        }));
      } else {
        children.add(buildTitle(part.title));
        children.add(
-          buildTagsWithParams(
-            part.categories,
-            part.categoryParams,
-            part.title,
-            (tag, param) => handleClick(
-              tag,
-              param,
-              part.categoryType,
-              part.title,
-              data.key,
-            ),
-          ),
+          buildTags(part.categories),
        );
      }
    }
@@ -280,30 +219,28 @@ class _CategoryPage extends StatelessWidget {
    );
  }

-  Widget buildTagsWithParams(
-    List<String> tags,
-    List<String>? params,
-    String? namespace,
-    ClickTagCallback onClick,
+  Widget buildTags(
+    List<CategoryItem> categories,
  ) {
    return Padding(
      padding: const EdgeInsets.fromLTRB(10, 0, 10, 16),
      child: Wrap(
        children: List<Widget>.generate(
-          tags.length,
-          (index) => buildTag(
-            tags[index],
-            onClick,
-            namespace,
-            params?.elementAtOrNull(index),
-          ),
+          categories.length,
+          (index) => buildCategory(categories[index]),
        ),
      ),
    );
  }

-  Widget buildTag(String tag, ClickTagCallback onClick,
-      [String? namespace, String? param]) {
+  Widget buildCategory(CategoryItem c) {
+    return buildTag(c.label, () {
+      var context = App.mainNavigatorKey!.currentContext!;
+      c.target.jump(context);
+    });
+  }
+
+  Widget buildTag(String label, VoidCallback onClick) {
    return Padding(
      padding: const EdgeInsets.fromLTRB(8, 6, 8, 6),
      child: Builder(
@@ -313,10 +250,10 @@ class _CategoryPage extends StatelessWidget {
            color: context.colorScheme.primaryContainer.toOpacity(0.72),
            child: InkWell(
              borderRadius: const BorderRadius.all(Radius.circular(8)),
-              onTap: () => onClick(tag, param),
+              onTap: onClick,
              child: Padding(
                padding: const EdgeInsets.fromLTRB(16, 8, 16, 8),
-                child: Text(tag),
+                child: Text(label),
              ),
            ),
          );
--- a/lib/pages/category_comics_page.dart
+++ b/lib/pages/category_comics_page.dart
@@ -9,6 +9,7 @@ class CategoryComicsPage extends StatefulWidget {
    required this.category,
    this.param,
    required this.categoryKey,
+    this.options,
    super.key,
  });

@@ -18,6 +19,8 @@ class CategoryComicsPage extends StatefulWidget {

  final String categoryKey;

+  final List<String>? options;
+
  @override
  State<CategoryComicsPage> createState() => _CategoryComicsPageState();
 }
@@ -40,7 +43,16 @@ class _CategoryComicsPageState extends State<CategoryComicsPage> {
          }
          return true;
        }).toList();
-        optionsValue = options.map((e) => e.options.keys.first).toList();
+        var defaultOptionsValue =
+            options.map((e) => e.options.keys.first).toList();
+        if (optionsValue.length != options.length) {
+          var newOptionsValue = List<String>.filled(options.length, "");
+          for (var i = 0; i < options.length; i++) {
+            newOptionsValue[i] =
+                optionsValue.elementAtOrNull(i) ?? defaultOptionsValue[i];
+          }
+          optionsValue = newOptionsValue;
+        }
        sourceKey = source.key;
        return;
      }
@@ -50,6 +62,11 @@ class _CategoryComicsPageState extends State<CategoryComicsPage> {

  @override
  void initState() {
+    if (widget.options != null) {
+      optionsValue = widget.options!;
+    } else {
+      optionsValue = [];
+    }
    findData();
    super.initState();
  }
--- a/lib/pages/comic_details_page/actions.dart
+++ b/lib/pages/comic_details_page/actions.dart
@@ -300,21 +300,8 @@ abstract mixin class _ComicPageActions {
          'keyword': tag,
        };
    var context = App.mainNavigatorKey!.currentContext!;
-    if (config['action'] == 'search') {
-      context.to(() => SearchResultPage(
-            text: config['keyword'] ?? '',
-            sourceKey: comicSource.key,
-            options: const [],
-          ));
-    } else if (config['action'] == 'category') {
-      context.to(
-        () => CategoryComicsPage(
-          category: config['keyword'] ?? '',
-          categoryKey: comicSource.categoryData!.key,
-          param: config['param'],
-        ),
-      );
-    }
+    var target = PageJumpTarget.parse(comicSource.key, config);
+    target.jump(context);
  }

  void showMoreActions() {
--- a/lib/pages/comic_source_page.dart
+++ b/lib/pages/comic_source_page.dart
@@ -461,6 +461,7 @@ void _addAllPagesWithComicSource(ComicSource source) {
  var explorePages = appdata.settings['explore_pages'];
  var categoryPages = appdata.settings['categories'];
  var networkFavorites = appdata.settings['favorites'];
+  var searchPages = appdata.settings['searchSources'];

  if (source.explorePages.isNotEmpty) {
    for (var page in source.explorePages) {
@@ -477,10 +478,15 @@ void _addAllPagesWithComicSource(ComicSource source) {
      !networkFavorites.contains(source.favoriteData!.key)) {
    networkFavorites.add(source.favoriteData!.key);
  }
+  if (source.searchPageData != null &&
+      !searchPages.contains(source.key)) {
+    searchPages.add(source.key);
+  }

  appdata.settings['explore_pages'] = explorePages.toSet().toList();
  appdata.settings['categories'] = categoryPages.toSet().toList();
  appdata.settings['favorites'] = networkFavorites.toSet().toList();
+  appdata.settings['searchSources'] = searchPages.toSet().toList();

  appdata.saveData();
 }
--- a/lib/pages/explore_page.dart
+++ b/lib/pages/explore_page.dart
@@ -6,13 +6,10 @@ import 'package:venera/foundation/comic_source/comic_source.dart';
 import 'package:venera/foundation/global_state.dart';
 import 'package:venera/foundation/res.dart';
 import 'package:venera/pages/comic_source_page.dart';
-import 'package:venera/pages/search_result_page.dart';
 import 'package:venera/pages/settings/settings_page.dart';
 import 'package:venera/utils/ext.dart';
 import 'package:venera/utils/translations.dart';

-import 'category_comics_page.dart';
-
 class ExplorePage extends StatefulWidget {
  const ExplorePage({super.key});

@@ -445,30 +442,7 @@ Iterable<Widget> _buildExplorePagePart(
                TextButton(
                  onPressed: () {
                    var context = App.mainNavigatorKey!.currentContext!;
-                    if (part.viewMore!.startsWith("search:")) {
-                      context.to(
-                        () => SearchResultPage(
-                          text: part.viewMore!.replaceFirst("search:", ""),
-                          options: const [],
-                          sourceKey: sourceKey,
-                        ),
-                      );
-                    } else if (part.viewMore!.startsWith("category:")) {
-                      var cp = part.viewMore!.replaceFirst("category:", "");
-                      var c = cp.split('@').first;
-                      String? p = cp.split('@').last;
-                      if (p == c) {
-                        p = null;
-                      }
-                      context.to(
-                        () => CategoryComicsPage(
-                          category: c,
-                          categoryKey:
-                              ComicSource.find(sourceKey)!.categoryData!.key,
-                          param: p,
-                        ),
-                      );
-                    }
+                    part.viewMore!.jump(context);
                  },
                  child: Text("View more".tl),
                )