Merged changes from MDC codelab 104.

shrine/lib/app.dart

@@ -15,10 +15,10 @@
 import 'package:flutter/material.dart';
 
 import 'backdrop.dart';
-import 'category_menu_page.dart';
 import 'colors.dart';
 import 'home.dart';
 import 'login.dart';
+import 'category_menu_page.dart';
 import 'model/product.dart';
 import 'supplemental/cut_corners_border.dart';
 
@@ -59,15 +59,15 @@ class _ShrineAppState extends State<ShrineApp> {
 }
 
 Route<dynamic> _getRoute(RouteSettings settings) {
-  if (settings.name == '/login') {
+  if (settings.name != '/login') {
-    return MaterialPageRoute<void>(
+    return null;
-      settings: settings,
-      builder: (BuildContext context) => LoginPage(),
-      fullscreenDialog: true,
-    );
   }
 
-  return null;
+  return MaterialPageRoute<void>(
+    settings: settings,
+    builder: (BuildContext context) => LoginPage(),
+    fullscreenDialog: true,
+  );
 }
 
 final ThemeData _kShrineTheme = _buildShrineTheme();

shrine/lib/backdrop.dart

@@ -19,7 +19,7 @@ import 'login.dart';
 import 'model/product.dart';
 import 'shopping_cart.dart';
 
-const double _kFlingVelocity = 2.0;
+double _kFlingVelocity = 2.0;
 
 class _FrontLayer extends StatelessWidget {
   const _FrontLayer({

shrine/lib/category_menu_page.dart

@@ -49,7 +49,7 @@ class CategoryMenuPage extends StatelessWidget {
                 Container(
                   width: 70.0,
                   height: 2.0,
-                  color: Color(0xFFEAA4A4),
+                  color: kShrinePink400,
                 ),
               ],
             )

shrine/lib/colors.dart

@@ -17,6 +17,7 @@ import 'package:flutter/material.dart';
 const kShrinePink50 = const Color(0xFFFEEAE6);
 const kShrinePink100 = const Color(0xFFFEDBD0);
 const kShrinePink300 = const Color(0xFFFBB8AC);
+const kShrinePink400 = const Color(0xFFEAA4A4);
 
 const kShrineBrown900 = const Color(0xFF442B2D);
 const kShrineBrown600 = const Color(0xFF7D4F52);

shrine/pubspec.yaml

@@ -1,5 +1,5 @@
-name: shrine
+name: Shrine
-description: A simple shopping app with Material and scoped_model
+description: Take your design up a notch and learn to use our advanced component backdrop menu.
 
 dependencies:
   flutter:
@@ -57,7 +57,6 @@ flutter:
     - packages/shrine_images/35-0.jpg
     - packages/shrine_images/36-0.jpg
     - packages/shrine_images/37-0.jpg
-
   fonts:
     - family: Rubik
       fonts: