remove kHomeRouteName

use Navigator.defaultRouteName as home route's name
herry88 · Jan 13, 2019 · 2b875c6 · 2b875c6
1 parent 5530048
commit 2b875c6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -5,9 +5,8 @@ void main() => runApp(
       MaterialApp(
         title: 'Flutter Catalog',
         theme: ThemeData(primarySwatch: Colors.blue),
-        initialRoute: my_app_meta.kHomeRouteName,
-        // No need to set `home` because `routes` is set, in which initialRoute
-        // and Navigator.defaultRouteName has an entry.
+        // No need to set `home` because `routes` is set to a routing table, and
+        // Navigator.defaultRouteName ('/') has an entry in it.
         routes: my_app_meta.kRoutingTable,
       ),
     );
diff --git a/lib/my_app_meta.dart b/lib/my_app_meta.dart
@@ -67,7 +67,6 @@ const GOOGLEPLAY_URL =
 const GITHUB_URL = 'https://github.com/X-Wei/flutter_catalog';
 const AUTHOR_SITE = 'http://x-wei.github.io';
 
-const kHomeRouteName = '/Home';
 const kHomeRoute = MyHomeRoute();
 const kAboutRoute = MyAboutRoute();
 
@@ -247,7 +246,6 @@ final kRoutenameToRouteMap = Map<String, MyRoute>.fromIterable(
     {
       // By default go to home screen. (Navigator.defaultRouteName is just '/')
       Navigator.defaultRouteName: kHomeRoute,
-      kHomeRouteName: kHomeRoute,
       kAboutRoute.routeName: kAboutRoute,
     },
   );

diff --git a/lib/my_route.dart b/lib/my_route.dart
@@ -118,7 +118,7 @@ class _MyRouteState extends State<MyRoute> with SingleTickerProviderStateMixin {
         );
       }),
       // Only home route has drawer:
-      drawer: this.widget.routeName == my_app_meta.kHomeRouteName
+      drawer: this.widget.routeName == Navigator.defaultRouteName
           ? Drawer(
               child: my_app_meta.getNavDrawerItems(this, context),
             )
@@ -142,7 +142,7 @@ class _MyRouteState extends State<MyRoute> with SingleTickerProviderStateMixin {
   List<Widget> _getAppbarActions() {
     // final state = MyRouteState.of(context);
     final appbarActions = <Widget>[];
-    if (this.widget.routeName != my_app_meta.kHomeRouteName) {
+    if (this.widget.routeName != Navigator.defaultRouteName) {
       appbarActions.add(starStatusOfRoute(this.widget));
     }
     if (this.widget.links.isNotEmpty) {

diff --git a/lib/routes/home.dart b/lib/routes/home.dart
@@ -5,7 +5,6 @@ import '../my_app_meta.dart'
     show
         BookmarkManager,
         kAboutRoute,
-        kHomeRouteName,
         kMyAppRoutesStructure,
         kRoutenameToRouteMap,
         kSharedPreferences,
@@ -19,7 +18,7 @@ class MyHomeRoute extends MyRoute {
   get title => 'Flutter Catalog';
 
   @override
-  get routeName => kHomeRouteName;
+  get routeName => Navigator.defaultRouteName;
 
   @override
   Widget buildMyRouteContent(BuildContext context) {