Fix duplicate hero tag.

lib/components/comic.dart

@@ -23,14 +23,16 @@ ImageProvider? _findImageProvider(Comic comic) {
 }
 
 class ComicTile extends StatelessWidget {
-  const ComicTile(
+  const ComicTile({
-      {super.key,
+    super.key,
     required this.comic,
     this.enableLongPressed = true,
     this.badge,
     this.menuOptions,
     this.onTap,
-      this.onLongPressed});
+    this.onLongPressed,
+    this.heroID,
+  });
 
   final Comic comic;
 
@@ -44,6 +46,8 @@ class ComicTile extends StatelessWidget {
 
   final VoidCallback? onLongPressed;
 
+  final int? heroID;
+
   void _onTap() {
     if (onTap != null) {
       onTap!();
@@ -55,6 +59,7 @@ class ComicTile extends StatelessWidget {
         sourceKey: comic.sourceKey,
         cover: comic.cover,
         title: comic.title,
+        heroID: heroID,
       ),
     );
   }
@@ -137,8 +142,7 @@ class ComicTile extends StatelessWidget {
             .isExist(comic.id, ComicType(comic.sourceKey.hashCode))
         : false;
     var history = appdata.settings['showHistoryStatusOnTile']
-        ? HistoryManager()
+        ? HistoryManager().find(comic.id, ComicType(comic.sourceKey.hashCode))
-            .find(comic.id, ComicType(comic.sourceKey.hashCode))
         : null;
     if (history?.page == 0) {
       history!.page = 1;
@@ -210,18 +214,8 @@ class ComicTile extends StatelessWidget {
   Widget _buildDetailedMode(BuildContext context) {
     return LayoutBuilder(builder: (context, constrains) {
       final height = constrains.maxHeight - 16;
-      return InkWell(
+
-          borderRadius: BorderRadius.circular(12),
+      Widget image = Container(
-          onTap: _onTap,
-          onLongPress: enableLongPressed ? () => _onLongPressed(context) : null,
-          onSecondaryTapDown: (detail) => onSecondaryTap(detail, context),
-          child: Padding(
-            padding: const EdgeInsets.fromLTRB(16, 8, 24, 8),
-            child: Row(
-              children: [
-                Hero(
-                  tag: "cover${comic.id}${comic.sourceKey}",
-                  child: Container(
         width: height * 0.68,
         height: double.infinity,
         decoration: BoxDecoration(
@@ -237,8 +231,25 @@ class ComicTile extends StatelessWidget {
         ),
         clipBehavior: Clip.antiAlias,
         child: buildImage(context),
-                  ),
+      );
-                ),
+
+      if (heroID != null) {
+        image = Hero(
+          tag: "cover$heroID",
+          child: image,
+        );
+      }
+
+      return InkWell(
+        borderRadius: BorderRadius.circular(12),
+        onTap: _onTap,
+        onLongPress: enableLongPressed ? () => _onLongPressed(context) : null,
+        onSecondaryTapDown: (detail) => onSecondaryTap(detail, context),
+        child: Padding(
+          padding: const EdgeInsets.fromLTRB(16, 8, 24, 8),
+          child: Row(
+            children: [
+              image,
               SizedBox.fromSize(
                 size: const Size(16, 5),
               ),
@@ -252,35 +263,23 @@ class ComicTile extends StatelessWidget {
                   badge: badge ?? comic.language,
                   tags: comic.tags,
                   maxLines: 2,
-                    enableTranslate: ComicSource.find(comic.sourceKey)
+                  enableTranslate:
-                            ?.enableTagsTranslate ??
+                      ComicSource.find(comic.sourceKey)?.enableTagsTranslate ??
                           false,
                   rating: comic.stars,
                 ),
               ),
             ],
           ),
-          ));
+        ),
+      );
     });
   }
 
   Widget _buildBriefMode(BuildContext context) {
     return LayoutBuilder(
       builder: (context, constraints) {
-        return InkWell(
+        Widget image = Container(
-          borderRadius: BorderRadius.circular(8),
-          onTap: _onTap,
-          onLongPress: enableLongPressed ? () => _onLongPressed(context) : null,
-          onSecondaryTapDown: (detail) => onSecondaryTap(detail, context),
-          child: Column(
-            children: [
-              Expanded(
-                child: Stack(
-                  children: [
-                    Positioned.fill(
-                      child: Hero(
-                        tag: "cover${comic.id}${comic.sourceKey}",
-                        child: Container(
           decoration: BoxDecoration(
             color: context.colorScheme.secondaryContainer,
             borderRadius: BorderRadius.circular(8),
@@ -294,8 +293,27 @@ class ComicTile extends StatelessWidget {
           ),
           clipBehavior: Clip.antiAlias,
           child: buildImage(context),
-                        ),
+        );
-                      ),
+
+        if (heroID != null) {
+          image = Hero(
+            tag: "cover$heroID",
+            child: image,
+          );
+        }
+
+        return InkWell(
+          borderRadius: BorderRadius.circular(8),
+          onTap: _onTap,
+          onLongPress: enableLongPressed ? () => _onLongPressed(context) : null,
+          onSecondaryTapDown: (detail) => onSecondaryTap(detail, context),
+          child: Column(
+            children: [
+              Expanded(
+                child: Stack(
+                  children: [
+                    Positioned.fill(
+                      child: image,
                     ),
                     Align(
                       alignment: Alignment.bottomRight,
@@ -739,6 +757,16 @@ class SliverGridComics extends StatefulWidget {
 
 class _SliverGridComicsState extends State<SliverGridComics> {
   List<Comic> comics = [];
+  List<int> heroIDs = [];
+
+  static int _nextHeroID = 0;
+
+  void generateHeroID() {
+    heroIDs.clear();
+    for (var i = 0; i < comics.length; i++) {
+      heroIDs.add(_nextHeroID++);
+    }
+  }
 
   @override
   void didUpdateWidget(covariant SliverGridComics oldWidget) {
@@ -749,6 +777,7 @@ class _SliverGridComicsState extends State<SliverGridComics> {
           comics.add(comic);
         }
       }
+      generateHeroID();
     }
     super.didUpdateWidget(oldWidget);
   }
@@ -760,6 +789,7 @@ class _SliverGridComicsState extends State<SliverGridComics> {
         comics.add(comic);
       }
     }
+    generateHeroID();
     HistoryManager().addListener(update);
     super.initState();
   }
@@ -785,6 +815,7 @@ class _SliverGridComicsState extends State<SliverGridComics> {
   Widget build(BuildContext context) {
     return _SliverGridComics(
       comics: comics,
+      heroIDs: heroIDs,
       selection: widget.selections,
       onLastItemBuild: widget.onLastItemBuild,
       badgeBuilder: widget.badgeBuilder,
@@ -798,6 +829,7 @@ class _SliverGridComicsState extends State<SliverGridComics> {
 class _SliverGridComics extends StatelessWidget {
   const _SliverGridComics({
     required this.comics,
+    required this.heroIDs,
     this.onLastItemBuild,
     this.badgeBuilder,
     this.menuBuilder,
@@ -808,6 +840,8 @@ class _SliverGridComics extends StatelessWidget {
 
   final List<Comic> comics;
 
+  final List<int> heroIDs;
+
   final Map<Comic, bool>? selection;
 
   final void Function()? onLastItemBuild;
@@ -839,6 +873,7 @@ class _SliverGridComics extends StatelessWidget {
             onLongPressed: onLongPressed != null
                 ? () => onLongPressed!(comics[index])
                 : null,
+            heroID: heroIDs[index],
           );
           if (selection == null) {
             return comic;

lib/pages/comic_details_page/comic_page.dart

@@ -47,6 +47,7 @@ class ComicPage extends StatefulWidget {
     required this.sourceKey,
     this.cover,
     this.title,
+    this.heroID,
   });
 
   final String id;
@@ -57,6 +58,8 @@ class ComicPage extends StatefulWidget {
 
   final String? title;
 
+  final int? heroID;
+
   @override
   State<ComicPage> createState() => _ComicPageState();
 }
@@ -86,6 +89,7 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
       title: widget.title,
       sourceKey: widget.sourceKey,
       cid: widget.id,
+      heroID: widget.heroID,
     );
   }
 
@@ -225,7 +229,7 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
         children: [
           const SizedBox(width: 16),
           Hero(
-            tag: "cover${comic.id}${comic.sourceKey}",
+            tag: "cover${widget.heroID}",
             child: Container(
               decoration: BoxDecoration(
                 color: context.colorScheme.primaryContainer,
@@ -776,6 +780,7 @@ class _ComicPageLoadingPlaceHolder extends StatelessWidget {
     this.title,
     required this.sourceKey,
     required this.cid,
+    this.heroID,
   });
 
   final String? cover;
@@ -786,6 +791,8 @@ class _ComicPageLoadingPlaceHolder extends StatelessWidget {
 
   final String cid;
 
+  final int? heroID;
+
   @override
   Widget build(BuildContext context) {
     Widget buildContainer(double? width, double? height,
@@ -870,7 +877,7 @@ class _ComicPageLoadingPlaceHolder extends StatelessWidget {
     }
 
     return Hero(
-      tag: "cover$cid$sourceKey",
+      tag: "cover$heroID",
       child: Container(
         decoration: BoxDecoration(
           color: context.colorScheme.primaryContainer,