change: 添加页面转跳动画

lib/blog/view/home_page.dart

@@ -21,9 +21,14 @@ class BlogHomePage extends Page {
 
   @override
   Route createRoute(BuildContext context) {
-    return MaterialPageRoute(
+    return PageRouteBuilder(
       settings: this,
-      builder: (context) => const BlogHomeScreen(),
+      pageBuilder: (BuildContext context, Animation<double> animation,
+              Animation<double> secondaryAnimation) =>
+          FadeTransition(
+        opacity: animation,
+        child: BlogHomeScreen(),
+      ),
     );
   }
 }

lib/board/view/home_page.dart

@@ -21,9 +21,14 @@ class BoardHomePage extends Page {
   @override
   Route createRoute(BuildContext context) {
     BlocProvider.of<BoardHomeBloc>(context).add(const BoardHomeFetched());
-    return MaterialPageRoute(
+    return PageRouteBuilder(
       settings: this,
-      builder: (context) => const BoardHomeScreen(),
+      pageBuilder: (BuildContext context, Animation<double> animation,
+              Animation<double> secondaryAnimation) =>
+          FadeTransition(
+        opacity: animation,
+        child: BoardHomeScreen(),
+      ),
     );
   }
 }

lib/board/view/topic_detail_page.dart

@@ -25,10 +25,15 @@ class TopicDetailPage extends Page {
 
   @override
   Route createRoute(BuildContext context) {
-    return MaterialPageRoute(
+    return PageRouteBuilder(
       settings: this,
-      builder: (context) => TopicDetailScreen(
-        topicId: topicId,
+      pageBuilder: (BuildContext context, Animation<double> animation,
+              Animation<double> secondaryAnimation) =>
+          FadeTransition(
+        opacity: animation,
+        child: TopicDetailScreen(
+          topicId: topicId,
+        ),
       ),
     );
   }
@@ -50,12 +55,12 @@ class TopicDetailScreen extends StatelessWidget {
       providers: [
         BlocProvider<TopicDetailBloc>(
           create: (context) => TopicDetailBloc(
-            boardRepository: RepositoryProvider.of<BoardRepository>(context),
+            boardRepository: context.read<BoardRepository>(),
           )..add(TopicDetailFetched(topicId: topicId, descending: descending)),
         ),
         BlocProvider<TopicEditBloc>(
           create: (context) => TopicEditBloc(
-            boardRepository: RepositoryProvider.of<BoardRepository>(context),
+            boardRepository: context.read<BoardRepository>(),
           ),
         )
       ],
@@ -82,10 +87,10 @@ class _DetailScreen extends StatelessWidget {
             appBar: AppBar(),
             body: ErrorMessageButton(
               onPressed: () {
-                BlocProvider.of<TopicDetailBloc>(context).add(
-                  TopicDetailFetched(
-                      topicId: state.topicId, descending: descending),
-                );
+                context.read<TopicDetailBloc>().add(
+                      TopicDetailFetched(
+                          topicId: state.topicId, descending: descending),
+                    );
               },
               message: state.message,
             ),
@@ -94,7 +99,7 @@ class _DetailScreen extends StatelessWidget {
         if (state is TopicDetailSuccess) {
           return BlocProvider(
             create: (context) => CommentEditBloc(
-              boardRepository: RepositoryProvider.of<BoardRepository>(context),
+              boardRepository: context.read<BoardRepository>(),
             ),
             child: MultiBlocListener(
               listeners: [
@@ -124,11 +129,10 @@ class _DetailScreen extends StatelessWidget {
                 BlocListener<CommentEditBloc, CommentEditState>(
                   listener: (context, state) {
                     if (state is CommentDeleteSuccess) {
-                      BlocProvider.of<TopicDetailBloc>(context)
-                          .add(TopicDetailFetched(
-                        descending: descending,
-                        cache: false,
-                      ));
+                      context.read<TopicDetailBloc>().add(TopicDetailFetched(
+                            descending: descending,
+                            cache: false,
+                          ));
                       showInfoSnackBar('评论删除成功');
                     }
                     if (state is CommentFailure) {
@@ -142,11 +146,10 @@ class _DetailScreen extends StatelessWidget {
                   appBar: _buildAppBar(context, state, descending, loginUser),
                   body: RefreshIndicator(
                     onRefresh: () async {
-                      BlocProvider.of<TopicDetailBloc>(context)
-                          .add(TopicDetailFetched(
-                        descending: descending,
-                        cache: false,
-                      ));
+                      context.read<TopicDetailBloc>().add(TopicDetailFetched(
+                            descending: descending,
+                            cache: false,
+                          ));
                     },
                     child: InfiniteList<Comment>(
                       items: state.comments,
@@ -218,19 +221,18 @@ class _DetailScreen extends StatelessWidget {
                 MaterialPageRoute(
                   builder: (_) => BlocProvider(
                     create: (context) => TopicEditBloc(
-                        boardRepository:
-                            RepositoryProvider.of<BoardRepository>(context)),
+                        boardRepository: context.read<BoardRepository>()),
                     child: TopicEditPage(
                       isEditing: true,
                       topic: state.topic,
                     ),
                   ),
                 ),
               );
-              BlocProvider.of<TopicDetailBloc>(context).add(TopicDetailFetched(
-                descending: descending,
-                cache: false,
-              ));
+              context.read<TopicDetailBloc>().add(TopicDetailFetched(
+                    descending: descending,
+                    cache: false,
+                  ));
             }
             if (value == TopicDetailMenu.delete) {
               await showDialog(
@@ -248,7 +250,8 @@ class _DetailScreen extends StatelessWidget {
                     TextButton(
                       onPressed: () {
                         showInfoSnackBar('正在删除...', duration: 1);
-                        BlocProvider.of<TopicEditBloc>(context)
+                        context
+                            .read<TopicEditBloc>()
                             .add(TopicDeleted(topic: state.topic));
                         Navigator.pop(context);
                       },
@@ -274,7 +277,8 @@ class _DetailScreen extends StatelessWidget {
                     TextButton(
                       onPressed: () {
                         showInfoSnackBar('正在置顶...', duration: 1);
-                        BlocProvider.of<TopicEditBloc>(context)
+                        context
+                            .read<TopicEditBloc>()
                             .add(TopicPinned(topic: state.topic));
                         Navigator.pop(context);
                       },
@@ -300,7 +304,8 @@ class _DetailScreen extends StatelessWidget {
                     TextButton(
                       onPressed: () {
                         showInfoSnackBar('正在取消...', duration: 1);
-                        BlocProvider.of<TopicEditBloc>(context)
+                        context
+                            .read<TopicEditBloc>()
                             .add(TopicUnpinned(topic: state.topic));
                         Navigator.pop(context);
                       },
@@ -326,7 +331,8 @@ class _DetailScreen extends StatelessWidget {
                     TextButton(
                       onPressed: () {
                         showInfoSnackBar('正在关闭...', duration: 1);
-                        BlocProvider.of<TopicEditBloc>(context)
+                        context
+                            .read<TopicEditBloc>()
                             .add(TopicClosed(topic: state.topic));
                         Navigator.pop(context);
                       },
@@ -352,7 +358,8 @@ class _DetailScreen extends StatelessWidget {
                     TextButton(
                       onPressed: () {
                         showInfoSnackBar('正在开启...', duration: 1);
-                        BlocProvider.of<TopicEditBloc>(context)
+                        context
+                            .read<TopicEditBloc>()
                             .add(TopicReopened(topic: state.topic));
                         Navigator.pop(context);
                       },
@@ -424,14 +431,23 @@ class CommentOrder extends StatelessWidget {
           const Spacer(),
           PopupMenuButton(
             tooltip: '评论排序',
-            icon: Icon(
-              descending ? Icons.arrow_downward : Icons.arrow_upward,
+            child: Padding(
+              padding: const EdgeInsets.all(8.0),
+              child: Row(
+                children: [
+                  Icon(Icons.sort),
+                  SizedBox(width: 4),
+                  Text(descending ? '倒序' : '正序'),
+                ],
+              ),
             ),
             onSelected: (dynamic value) {
-              BlocProvider.of<AppPreferencesBloc>(context)
-                  .add(CommentDescendingChanged(descending: value));
-              BlocProvider.of<TopicDetailBloc>(context)
-                  .add(TopicDetailFetched(topicId: topicId, descending: value));
+              context.read<AppPreferencesBloc>().add(
+                    CommentDescendingChanged(descending: value),
+                  );
+              context.read<TopicDetailBloc>().add(
+                    TopicDetailFetched(topicId: topicId, descending: value),
+                  );
             },
             itemBuilder: (context) => <PopupMenuItem<bool>>[
               const PopupMenuItem(

lib/core/view/splash_page.dart

@@ -23,10 +23,8 @@ class SplashScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return const Scaffold(
-      body: Center(
-        child: CircularProgressIndicator(),
-      ),
+    return Scaffold(
+      body: Container(),
     );
   }
 }

lib/iot/view/home_page.dart

@@ -22,9 +22,14 @@ class IotHomePage extends Page {
 
   @override
   Route createRoute(BuildContext context) {
-    return MaterialPageRoute(
+    return PageRouteBuilder(
       settings: this,
-      builder: (context) => const IotHomeScreen(),
+      pageBuilder: (BuildContext context, Animation<double> animation,
+              Animation<double> secondaryAnimation) =>
+          FadeTransition(
+        opacity: animation,
+        child: IotHomeScreen(),
+      ),
     );
   }
 }

lib/routers/delegate.dart

@@ -14,7 +14,6 @@ import 'package:smarthome/core/core.dart';
 import 'package:smarthome/iot/iot.dart';
 import 'package:smarthome/routers/information_parser.dart';
 import 'package:smarthome/routers/route_path.dart';
-import 'package:smarthome/routers/transition_delegate.dart';
 import 'package:smarthome/storage/storage.dart';
 import 'package:smarthome/utils/launch_url.dart';
 
@@ -84,11 +83,12 @@ class MyRouterDelegate extends RouterDelegate<RoutePath>
   /// 添加一组位置
   void addStorageGroup({Storage? storage}) {
     storageGroup += 1;
-    _pages.add(StorageDetailPage(
-      storageName: storage?.name ?? '',
-      storageId: storage?.id,
-      group: storageGroup,
-    ));
+    _pages.add(
+      StorageDetailPage(
+        storageId: storage?.id ?? '',
+        group: storageGroup,
+      ),
+    );
     notifyListeners();
   }
 
@@ -102,22 +102,24 @@ class MyRouterDelegate extends RouterDelegate<RoutePath>
       _pages.removeLast();
     }
     // 再重新添加
-    _pages.add(StorageDetailPage(storageName: '', group: storageGroup));
+    _pages.add(StorageDetailPage(storageId: '', group: storageGroup));
     if (storage != null) {
       if (storage.ancestors != null) {
         for (var storage in storage.ancestors!) {
-          _pages.add(StorageDetailPage(
-            storageName: storage.name,
-            storageId: storage.id,
-            group: storageGroup,
-          ));
+          _pages.add(
+            StorageDetailPage(
+              storageId: storage.id,
+              group: storageGroup,
+            ),
+          );
         }
       }
-      _pages.add(StorageDetailPage(
-        storageName: storage.name,
-        storageId: storage.id,
-        group: storageGroup,
-      ));
+      _pages.add(
+        StorageDetailPage(
+          storageId: storage.id,
+          group: storageGroup,
+        ),
+      );
     }
     notifyListeners();
   }
@@ -127,11 +129,12 @@ class MyRouterDelegate extends RouterDelegate<RoutePath>
   /// 添加一个物品详情页面
   void addItemPage({required Item item}) {
     itemCount += 1;
-    _pages.add(ItemDetailPage(
-      itemName: item.name,
-      itemId: item.id,
-      group: itemCount,
-    ));
+    _pages.add(
+      ItemDetailPage(
+        itemId: item.id,
+        group: itemCount,
+      ),
+    );
     notifyListeners();
   }
 
@@ -176,9 +179,9 @@ class MyRouterDelegate extends RouterDelegate<RoutePath>
           appTab: EnumToString.fromString(AppTab.values, uri.pathSegments[0]),
         );
       } else if (pages.last is StorageDetailPage) {
-        return StorageRoutePath(storageName: uri.pathSegments[2]);
+        return StorageRoutePath(storageId: uri.pathSegments[2]);
       } else if (pages.last is ItemDetailPage) {
-        return ItemRoutePath(itemName: uri.pathSegments[1]);
+        return ItemRoutePath(itemId: uri.pathSegments[1]);
       } else if (pages.last is TopicDetailPage) {
         return TopicRoutePath(topicId: uri.pathSegments[1]);
       } else if (pages.last is LoginPage) {
@@ -219,7 +222,6 @@ class MyRouterDelegate extends RouterDelegate<RoutePath>
       _pages = [
         const StorageHomePage(),
         ItemDetailPage(
-          itemName: configuration.itemName,
           itemId: configuration.itemId,
           group: 1,
         ),
@@ -230,7 +232,6 @@ class MyRouterDelegate extends RouterDelegate<RoutePath>
       _pages = [
         const StorageHomePage(),
         StorageDetailPage(
-          storageName: configuration.storageName,
           storageId: configuration.storageId,
           group: 1,
         ),
@@ -282,13 +283,11 @@ class MyRouterDelegate extends RouterDelegate<RoutePath>
     }
   }
 
-  TransitionDelegate transitionDelegate = MyTransitionDelegate();
+  // TransitionDelegate transitionDelegate = MyTransitionDelegate();
 
   @override
   Widget build(BuildContext context) {
-    _log
-      ..fine('Router rebuilded')
-      ..fine('pages $pages');
+    _log..fine('Router rebuilded')..fine('pages $pages');
     final graphQLApiClient = RepositoryProvider.of<GraphQLApiClient>(context);
     final config = AppConfig.of(context);
     return MultiBlocListener(
@@ -418,7 +417,7 @@ class MyRouterDelegate extends RouterDelegate<RoutePath>
         key: navigatorKey,
         pages: pages,
         onPopPage: _handlePopPage,
-        transitionDelegate: transitionDelegate,
+        // transitionDelegate: transitionDelegate,
       ),
     );
   }