From ee49612fca98d545996fb884a6686d7804b143d5 Mon Sep 17 00:00:00 2001
From: Nishant Srivastava <nisrulz@gmail.com>
Date: Fri, 19 Jan 2018 04:07:07 +0530
Subject: [PATCH] update: cleanup and refactoring

---
 handling_routes/lib/main.dart                            | 9 ++++-----
 .../lib/{AboutPage.dart => screens/about.dart}           | 2 ++
 handling_routes/lib/{HomePage.dart => screens/home.dart} | 0
 navigation_drawer/lib/nav_drawer.dart                    | 9 ---------
 navigation_drawer/lib/screens/account.dart               | 2 +-
 navigation_drawer/lib/screens/settings.dart              | 2 +-
 6 files changed, 8 insertions(+), 16 deletions(-)
 rename handling_routes/lib/{AboutPage.dart => screens/about.dart} (97%)
 rename handling_routes/lib/{HomePage.dart => screens/home.dart} (100%)
 delete mode 100644 navigation_drawer/lib/nav_drawer.dart

diff --git a/handling_routes/lib/main.dart b/handling_routes/lib/main.dart
index 6e933f1..a92889a 100644
--- a/handling_routes/lib/main.dart
+++ b/handling_routes/lib/main.dart
@@ -1,15 +1,14 @@
 import 'package:flutter/material.dart';
-
-import './AboutPage.dart';
-import './HomePage.dart';
+import 'package:handling_routes/screens/about.dart';
+import 'package:handling_routes/screens/home.dart';
 
 void main() {
   runApp(new MaterialApp(
-    home: new HomePage(),
+    home: new HomePage(), // home has implicit route set at '/'
     // Setup routes
     routes: <String, WidgetBuilder>{
       // Set named routes
-      "/about": (BuildContext context) => new AboutPage(),
+      AboutPage.routeName: (BuildContext context) => new AboutPage(),
     },
   ));
 }
diff --git a/handling_routes/lib/AboutPage.dart b/handling_routes/lib/screens/about.dart
similarity index 97%
rename from handling_routes/lib/AboutPage.dart
rename to handling_routes/lib/screens/about.dart
index def6c9b..8221c12 100644
--- a/handling_routes/lib/AboutPage.dart
+++ b/handling_routes/lib/screens/about.dart
@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 
 class AboutPage extends StatelessWidget {
+  static const String routeName = "/about";
+
   @override
   Widget build(BuildContext context) {
     return new Scaffold(
diff --git a/handling_routes/lib/HomePage.dart b/handling_routes/lib/screens/home.dart
similarity index 100%
rename from handling_routes/lib/HomePage.dart
rename to handling_routes/lib/screens/home.dart
diff --git a/navigation_drawer/lib/nav_drawer.dart b/navigation_drawer/lib/nav_drawer.dart
deleted file mode 100644
index 6cdd800..0000000
--- a/navigation_drawer/lib/nav_drawer.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:navigation_drawer/screens/account.dart';
-import 'package:navigation_drawer/screens/home.dart';
-import 'package:navigation_drawer/screens/settings.dart';
-
-class NavDrawer {
-
-
-}
diff --git a/navigation_drawer/lib/screens/account.dart b/navigation_drawer/lib/screens/account.dart
index 06eaffb..faf7631 100644
--- a/navigation_drawer/lib/screens/account.dart
+++ b/navigation_drawer/lib/screens/account.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
 class AccountScreen extends StatelessWidget {
-  static String routeName = "/account";
+  static const String routeName = "/account";
 
   @override
   Widget build(BuildContext context) {
diff --git a/navigation_drawer/lib/screens/settings.dart b/navigation_drawer/lib/screens/settings.dart
index b986e2b..9c81188 100644
--- a/navigation_drawer/lib/screens/settings.dart
+++ b/navigation_drawer/lib/screens/settings.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
 class SettingsScreen extends StatelessWidget {
-  static String routeName = "/settings";
+  static const String routeName = "/settings";
 
   @override
   Widget build(BuildContext context) {