Skip to content

Commit

Permalink
[104 Completed code.
Browse files Browse the repository at this point in the history
[101] Making AppBar something you add in 102.

[Model] Adding model from the start.

[103] Adding fonts.

[103] Supplemental files.

[101] Correcting supplemental files.

[101] Copy correction.

[101] Minor renaming.

[101] Update for Dart 2.

[101] Missing dependency.

[101] Dart 2.

[101] Dart 2.

[101] Dart 2.

[101] Dart 2.

[101] Correcting model.

[Meta] README file.

[Meta] Clarification.

[101] Copy correction.

[104] Updating data.

[101] Correcting widget class. (#23)

Add link to actual codelab in the README

[Meta] README correction.

[101] README specificity.

Add the slanted_menu.png to assets for 101 branch so its ready when needed. (#44)

[101] TODOs for starter code (#50)

[101] Added future TODOs to 101 starter

[101] Included lines to ignore .iml files and files in idea/ (#67)

[101] Remove 104 comments

[All] Icons for Android and iOS. (#69)

[101] Add .vscode/ to gitignore, stop tracking ignored files (#71)

Removes files that should not be tracked because they've been ignored by gitignore rules (but have yet to be removed from the repository itself). Also adds the .vscode folder to gitignore, for users who might use VSCode as their development environment.

[101] Removed legacy 'new' and 'const' from 101 starter codelab (#72)

[101] Restore legacy to data.dart and product.dart (#75)

[101] Update import for app.dart to stop type errors in future codelabs (#83)

Replace data.dart (#99)

[All] Adding back in filter functionality. (#112)

[106] Update TODO from "PrimaryColorOverride" to "AccentColorOverride" (#115)

* [106] Update TODO from "PrimaryColorOverride" to "AccentColorOverride"

* [106] Update TODO from "PrimaryColorOverride" to "AccentColorOverride"

[101] Completed code.

[102] Completed code.

[103] Completed code.

[104] Completed code.

Bump shrine_images to 1.1.1 (#138)

[103] Correcting cut corners border file.

[103-4] Button theme.
  • Loading branch information
willlarche authored and rami-a committed Apr 8, 2019
1 parent c834bd6 commit fb9a8d1
Show file tree
Hide file tree
Showing 7 changed files with 462 additions and 104 deletions.
62 changes: 42 additions & 20 deletions mdc_100_series/lib/app.dart
Expand Up @@ -14,50 +14,73 @@

import 'package:flutter/material.dart';

import 'backdrop.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';

// TODO: Convert ShrineApp to stateful widget (104)
class ShrineApp extends StatelessWidget {
class ShrineApp extends StatefulWidget {
@override
_ShrineAppState createState() => _ShrineAppState();
}

class _ShrineAppState extends State<ShrineApp> {
Category _currentCategory = Category.all;

@override
Widget build(BuildContext context) {
return MaterialApp(
title: 'Shrine',
// TODO: Change home: to a Backdrop with a HomePage frontLayer (104)
home: HomePage(),
// TODO: Make currentCategory field take _currentCategory (104)
// TODO: Pass _currentCategory for frontLayer (104)
// TODO: Change backLayer field value to CategoryMenuPage (104)
home: Backdrop(
currentCategory: _currentCategory,
frontLayer: HomePage(category: _currentCategory),
backLayer: CategoryMenuPage(
currentCategory: _currentCategory,
onCategoryTap: _onCategoryTap,
),
frontTitle: Text('SHRINE'),
backTitle: Text('MENU'),
),
initialRoute: '/login',
onGenerateRoute: _getRoute,
theme: _kShrineTheme,
);
}

Route<dynamic> _getRoute(RouteSettings settings) {
if (settings.name != '/login') {
return null;
}
/// Function to call when a [Category] is tapped.
void _onCategoryTap(Category category) {
setState(() {
_currentCategory = category;
});
}
}

return MaterialPageRoute<void>(
settings: settings,
builder: (BuildContext context) => LoginPage(),
fullscreenDialog: true,
);
Route<dynamic> _getRoute(RouteSettings settings) {
if (settings.name != '/login') {
return null;
}

return MaterialPageRoute<void>(
settings: settings,
builder: (BuildContext context) => LoginPage(),
fullscreenDialog: true,
);
}

final ThemeData _kShrineTheme = _buildShrineTheme();

IconThemeData _customIconTheme(IconThemeData original) {
return original.copyWith(color: kShrineBrown900);
}

ThemeData _buildShrineTheme() {
final ThemeData base = ThemeData.light();
return base.copyWith(
accentColor: kShrineBrown900,
primaryColor: kShrinePink100,
buttonColor: kShrinePink100,
scaffoldBackgroundColor: kShrineBackgroundWhite,
cardColor: kShrineBackgroundWhite,
textSelectionColor: kShrinePink100,
Expand All @@ -66,15 +89,14 @@ ThemeData _buildShrineTheme() {
buttonColor: kShrinePink100,
textTheme: ButtonTextTheme.normal,
),
primaryIconTheme: base.iconTheme.copyWith(
color: kShrineBrown900
),
primaryIconTheme: base.iconTheme.copyWith(color: kShrineBrown900),
inputDecorationTheme: InputDecorationTheme(
border: CutCornersBorder(),
),
textTheme: _buildShrineTextTheme(base.textTheme),
primaryTextTheme: _buildShrineTextTheme(base.primaryTextTheme),
accentTextTheme: _buildShrineTextTheme(base.accentTextTheme),
iconTheme: _customIconTheme(base.iconTheme),
);
}

Expand Down

0 comments on commit fb9a8d1

Please sign in to comment.