| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 import 'package:sky/theme/colors.dart' as colors; | 5 import 'package:sky/theme/colors.dart' as colors; |
| 6 import 'package:sky/widgets/basic.dart'; | 6 import 'package:sky/widgets/basic.dart'; |
| 7 import 'package:sky/widgets/navigator.dart'; | 7 import 'package:sky/widgets/navigator.dart'; |
| 8 import 'package:sky/widgets/theme.dart'; | 8 import 'package:sky/widgets/theme.dart'; |
| 9 import 'package:sky/widgets/widget.dart'; | 9 import 'package:sky/widgets/widget.dart'; |
| 10 import 'package:sky/widgets/task_description.dart'; |
| 10 | 11 |
| 11 import 'measurement.dart'; | 12 import 'measurement.dart'; |
| 12 import 'home.dart'; | 13 import 'home.dart'; |
| 13 import 'settings.dart'; | 14 import 'settings.dart'; |
| 14 import 'fitness_types.dart'; | 15 import 'fitness_types.dart'; |
| 15 | 16 |
| 16 class FitnessApp extends App { | 17 class FitnessApp extends App { |
| 17 | 18 |
| 18 NavigationState _navigationState; | 19 NavigationState _navigationState; |
| 19 | 20 |
| 20 void initState() { | 21 void initState() { |
| 21 _navigationState = new NavigationState([ | 22 _navigationState = new NavigationState([ |
| 22 new Route( | 23 new Route( |
| 23 name: '/', | 24 name: '/', |
| 24 builder: (navigator, route) => new HomeFragment(navigator, _userData) | 25 builder: (navigator, route) => new HomeFragment(navigator, _userData) |
| 25 ), | 26 ), |
| 26 new Route( | 27 new Route( |
| 27 name: '/settings', | 28 name: '/settings', |
| 28 builder: (navigator, route) => new SettingsFragment(navigator, backupSet
ting, settingsUpdater) | 29 builder: (navigator, route) => new SettingsFragment(navigator, backupSet
ting, settingsUpdater) |
| 29 ), | 30 ), |
| 30 ]); | 31 ]); |
| 31 super.initState(); | 32 super.initState(); |
| 32 } | 33 } |
| 33 | 34 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 54 new Measurement(when: new DateTime.now(), weight: 400.0) | 55 new Measurement(when: new DateTime.now(), weight: 400.0) |
| 55 ]; | 56 ]; |
| 56 | 57 |
| 57 Widget build() { | 58 Widget build() { |
| 58 return new Theme( | 59 return new Theme( |
| 59 data: new ThemeData( | 60 data: new ThemeData( |
| 60 brightness: ThemeBrightness.light, | 61 brightness: ThemeBrightness.light, |
| 61 primarySwatch: colors.Indigo, | 62 primarySwatch: colors.Indigo, |
| 62 accentColor: colors.PinkAccent[200] | 63 accentColor: colors.PinkAccent[200] |
| 63 ), | 64 ), |
| 64 child: new Navigator(_navigationState) | 65 child: new TaskDescription( |
| 66 label: 'Fitness', |
| 67 child: new Navigator(_navigationState) |
| 68 ) |
| 65 ); | 69 ); |
| 66 } | 70 } |
| 67 } | 71 } |
| 68 | 72 |
| 69 void main() { | 73 void main() { |
| 70 runApp(new FitnessApp()); | 74 runApp(new FitnessApp()); |
| 71 } | 75 } |
| OLD | NEW |