From 6b0adbc3e154d53c46e017000af8f2bd8be9dce2 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 5 Aug 2023 21:32:23 +0800 Subject: [PATCH] fix: Unexpected Ink Splash with Material3 when navigating --- lib/common/widgets/video_card_v.dart | 1 - lib/main.dart | 7 +++++++ lib/pages/history/widgets/item.dart | 1 - lib/pages/live/widgets/live_item.dart | 1 - 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/common/widgets/video_card_v.dart b/lib/common/widgets/video_card_v.dart index bee99344..b4fa449d 100644 --- a/lib/common/widgets/video_card_v.dart +++ b/lib/common/widgets/video_card_v.dart @@ -45,7 +45,6 @@ class VideoCardV extends StatelessWidget { }, child: InkWell( onTap: () async { - await Future.delayed(const Duration(milliseconds: 200)); String bvid = videoItem.bvid ?? IdUtils.av2bv(videoItem.aid); Get.toNamed('/video?bvid=$bvid&cid=${videoItem.cid}', arguments: {'videoItem': videoItem, 'heroTag': heroTag}); diff --git a/lib/main.dart b/lib/main.dart index 303c5b19..50d686c2 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -47,6 +47,13 @@ class MyApp extends StatelessWidget { brightness: Brightness.light, ), useMaterial3: true, + pageTransitionsTheme: const PageTransitionsTheme( + builders: { + TargetPlatform.android: ZoomPageTransitionsBuilder( + allowEnterRouteSnapshotting: false, + ), + }, + ), ), darkTheme: ThemeData( fontFamily: 'HarmonyOS', diff --git a/lib/pages/history/widgets/item.dart b/lib/pages/history/widgets/item.dart index 886acb3e..2bf06c3b 100644 --- a/lib/pages/history/widgets/item.dart +++ b/lib/pages/history/widgets/item.dart @@ -24,7 +24,6 @@ class HistoryItem extends StatelessWidget { String heroTag = Utils.makeHeroTag(aid); return InkWell( onTap: () async { - await Future.delayed(const Duration(milliseconds: 200)); if (videoItem.history.business.contains('article')) { int cid = videoItem.history.cid ?? // videoItem.history.oid ?? diff --git a/lib/pages/live/widgets/live_item.dart b/lib/pages/live/widgets/live_item.dart index 853a2672..692aa039 100644 --- a/lib/pages/live/widgets/live_item.dart +++ b/lib/pages/live/widgets/live_item.dart @@ -42,7 +42,6 @@ class LiveCardV extends StatelessWidget { }, child: InkWell( onTap: () async { - await Future.delayed(const Duration(milliseconds: 200)); Get.toNamed('/liveRoom?roomid=${liveItem.roomId}', arguments: {'liveItem': liveItem, 'heroTag': heroTag}); },