diff --git a/shrine/lib/app.dart b/shrine/lib/app.dart index d6987f2c3..c9932b550 100644 --- a/shrine/lib/app.dart +++ b/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 { } Route _getRoute(RouteSettings settings) { - if (settings.name == '/login') { - return MaterialPageRoute( - settings: settings, - builder: (BuildContext context) => LoginPage(), - fullscreenDialog: true, - ); + if (settings.name != '/login') { + return null; } - return null; + return MaterialPageRoute( + settings: settings, + builder: (BuildContext context) => LoginPage(), + fullscreenDialog: true, + ); } final ThemeData _kShrineTheme = _buildShrineTheme(); diff --git a/shrine/lib/backdrop.dart b/shrine/lib/backdrop.dart index fc3bbbe8c..8eabfe291 100644 --- a/shrine/lib/backdrop.dart +++ b/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({ diff --git a/shrine/lib/category_menu_page.dart b/shrine/lib/category_menu_page.dart index aaed26a6f..453071a38 100644 --- a/shrine/lib/category_menu_page.dart +++ b/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, ), ], ) diff --git a/shrine/lib/colors.dart b/shrine/lib/colors.dart index 07018344b..04298a0bc 100644 --- a/shrine/lib/colors.dart +++ b/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); diff --git a/shrine/pubspec.yaml b/shrine/pubspec.yaml index e901b7cd8..b5129de5f 100644 --- a/shrine/pubspec.yaml +++ b/shrine/pubspec.yaml @@ -1,5 +1,5 @@ -name: shrine -description: A simple shopping app with Material and scoped_model +name: Shrine +description: Take your design up a notch and learn to use our advanced component backdrop menu. dependencies: flutter: @@ -57,10 +57,9 @@ flutter: - packages/shrine_images/35-0.jpg - packages/shrine_images/36-0.jpg - packages/shrine_images/37-0.jpg - fonts: - family: Rubik fonts: - asset: fonts/Rubik-Regular.ttf - asset: fonts/Rubik-Medium.ttf - weight: 500 \ No newline at end of file + weight: 500