feat: fix hero animation

Author: MuZhou233

lib/route.dart

@@ -5,7 +5,6 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
-import 'package:local_hero/local_hero.dart';
 import 'package:tuihub_protos/librarian/sephirah/v1/gebura.pb.dart';
 import 'package:tuihub_protos/librarian/sephirah/v1/tiphereth.pb.dart';
 import 'package:tuihub_protos/librarian/v1/common.pb.dart';
@@ -366,13 +365,6 @@ class GeburaRoute extends StatefulShellBranchData {
   const GeburaRoute();
 
   static final GlobalKey<NavigatorState> $navigatorKey = _geburaNavigateKey;
-
-  static Widget rootWidget({required Widget child}) {
-    return LocalHeroScope(
-      curve: Curves.easeInOut,
-      child: child,
-    );
-  }
 }
 
 class GeburaRootRoute extends GoRouteData {
@@ -389,14 +381,12 @@ class GeburaStoreRoute extends GoRouteData {
 
   @override
   Page<void> buildPage(BuildContext context, GoRouterState state) {
-    return NoTransitionPage(
-      child: GeburaRoute.rootWidget(
-        child: const ModuleFramePage(
-          leftPart: GeburaNav(
-            function: GeburaFunctions.store,
-          ),
-          middlePart: GeburaStorePage(),
+    return const NoTransitionPage(
+      child: ModuleFramePage(
+        leftPart: GeburaNav(
+          function: GeburaFunctions.store,
         ),
+        middlePart: GeburaStorePage(),
       ),
     );
   }
@@ -407,14 +397,12 @@ class GeburaLibraryRoute extends GoRouteData {
 
   @override
   Page<void> buildPage(BuildContext context, GoRouterState state) {
-    return NoTransitionPage(
-      child: GeburaRoute.rootWidget(
-        child: const ModuleFramePage(
-          leftPart: GeburaNav(
-            function: GeburaFunctions.library,
-          ),
-          middlePart: GeburaLibraryOverview(),
+    return const NoTransitionPage(
+      child: ModuleFramePage(
+        leftPart: GeburaNav(
+          function: GeburaFunctions.library,
         ),
+        middlePart: GeburaLibraryOverview(),
       ),
     );
   }
@@ -438,14 +426,12 @@ class GeburaLibrarySettingsRoute extends GoRouteData {
       ),
     };
     return NoTransitionPage(
-      child: GeburaRoute.rootWidget(
-        child: ModuleFramePage(
-          leftPart: const GeburaNav(
-            function: GeburaFunctions.librarySettings,
-          ),
-          middlePart: const GeburaLibrarySettingsPage(),
-          rightPart: actions[action] ?? Container(),
+      child: ModuleFramePage(
+        leftPart: const GeburaNav(
+          function: GeburaFunctions.librarySettings,
         ),
+        middlePart: const GeburaLibrarySettingsPage(),
+        rightPart: actions[action] ?? Container(),
       ),
     );
   }
@@ -493,17 +479,19 @@ class GeburaLibraryDetailRoute extends GoRouteData {
             : null,
       ),
     };
-    return NoTransitionPage(
-      child: GeburaRoute.rootWidget(
-        child: ModuleFramePage(
-          leftPart: GeburaNav(
-            function: GeburaFunctions.library,
-            selectedItem: uuid,
-          ),
-          middlePart: GeburaLibraryDetailPage(uuid: uuid),
-          rightPart: actions[action] ?? Container(),
+    return CustomTransitionPage(
+      child: ModuleFramePage(
+        leftPart: GeburaNav(
+          function: GeburaFunctions.library,
+          selectedItem: uuid,
         ),
+        middlePart: GeburaLibraryDetailPage(uuid: uuid),
+        rightPart: actions[action] ?? Container(),
       ),
+      transitionsBuilder: (BuildContext context, Animation<double> animation,
+          Animation<double> secondaryAnimation, Widget child) {
+        return child;
+      },
     );
   }
 }

lib/view/pages/gebura/gebura_library_detail.dart

@@ -10,7 +10,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_widget_from_html/flutter_widget_from_html.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:local_hero/local_hero.dart';
 import 'package:smooth_scroll_multiplatform/smooth_scroll_multiplatform.dart';
 import 'package:universal_io/io.dart';
 import 'package:universal_ui/universal_ui.dart';
@@ -164,12 +163,10 @@ class GeburaLibraryDetailPage extends StatelessWidget {
                               md: 3,
                               child: Padding(
                                 padding: const EdgeInsets.fromLTRB(8, 16, 8, 8),
-                                child: LocalHero(
-                                  key: ValueKey(item.uuid),
+                                child: Hero(
                                   tag: item.uuid,
                                   child: GeburaAppCoverImage(
                                     path: item.coverImagePath,
-                                    url: item.coverImageUrl,
                                   ),
                                 ),
                               ),

lib/view/pages/gebura/gebura_library_overview.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:local_hero/local_hero.dart';
 import 'package:smooth_scroll_multiplatform/smooth_scroll_multiplatform.dart';
 import 'package:universal_ui/universal_ui.dart';
 
@@ -177,7 +176,7 @@ class _GeburaLibraryOverviewItemState
               ),
             ),
             Center(
-              child: LocalHero(
+              child: Hero(
                 tag: widget.item.uuid,
                 child: GeburaAppCoverImage(path: widget.item.coverImagePath),
               ),

packages/universal_ui/lib/src/page.dart

@@ -15,7 +15,6 @@ class UniversalPageRoute<T> extends PageRoute<T> {
     assert(opaque);
   }
 
-  /// Builds the primary contents of the route.
   final WidgetBuilder builder;
 
   @override
@@ -30,17 +29,24 @@ class UniversalPageRoute<T> extends PageRoute<T> {
   @override
   Widget buildPage(BuildContext context, Animation<double> animation,
       Animation<double> secondaryAnimation) {
+    return builder(context);
+  }
+
+  @override
+  Widget buildTransitions(BuildContext context, Animation<double> animation,
+      Animation<double> secondaryAnimation, Widget child) {
     final design = UniversalUI.of(context).design;
+
     switch (design) {
       case UIDesign.material:
         final material.PageTransitionsTheme theme =
             material.Theme.of(context).pageTransitionsTheme;
         return theme.buildTransitions<T>(
-            this, context, animation, secondaryAnimation, builder(context));
+            this, context, animation, secondaryAnimation, child);
       case UIDesign.fluent:
         return fluent.DrillInPageTransition(
           animation: animation,
-          child: builder(context),
+          child: child,
         );
     }
   }

pubspec.yaml

@@ -92,7 +92,6 @@ dependencies:
   extended_image: ^9.0.3
   font_awesome_flutter: ^10.7.0
   buttons_tabbar: ^1.3.10
-  local_hero: ^0.3.0
   auto_size_text: ^3.0.0
   flip_card: ^0.7.0
   flutter_multi_select_items: ^0.4.3