提交 df271162 编写于 作者: E Eric Seidel

Add Cards and Fitness demos, remove sector.

The launch cards still need to be made nicer.

R=abarth@chromium.org, abarth@google.com

Review URL: https://codereview.chromium.org/1232103006 .
上级 30cdf999
...@@ -90,27 +90,33 @@ List<SkyDemo> demos = [ ...@@ -90,27 +90,33 @@ List<SkyDemo> demos = [
) )
), ),
new SkyDemo( new SkyDemo(
name: 'Interactive Flex', name: 'Fitness',
href: '../../rendering/interactive_flex.dart', href: '../../fitness/lib/main.dart',
bundle: 'interactive_flex.skyx', bundle: 'fitness.skyx',
description: 'Swipe to adjust the layout of the app', description: 'Collin should write a nice description',
textTheme: typography.white, textTheme: typography.white,
decoration: new BoxDecoration( decoration: new BoxDecoration(
backgroundColor: const Color(0xFF0081C6) backgroundColor: const Color(0xFF0081C6)
) )
), ),
new SkyDemo( new SkyDemo(
name: 'Sector', name: 'Cards',
href: '../../widgets/sector.dart', href: '../../widgets/card_collection.dart',
bundle: 'sector.skyx', bundle: 'cards.skyx',
description: 'Demo of alternative layouts', description: 'Demo of interactive Cards',
textTheme: typography.black, textTheme: typography.white,
decoration: new BoxDecoration( decoration: new BoxDecoration(
backgroundColor: colors.black, backgroundColor: const Color(0xFF0081C6)
backgroundImage: new BackgroundImage( )
image: _bundle.loadImage('assets/sector_thumbnail.png'), ),
fit: BackgroundFit.cover new SkyDemo(
) name: 'Interactive Text',
href: '../../rendering/interactive_flex.dart',
bundle: 'interactive_flex.skyx',
description: 'Swipe to reflow the app',
textTheme: typography.white,
decoration: new BoxDecoration(
backgroundColor: const Color(0xFF0081C6)
) )
), ),
// new SkyDemo( // new SkyDemo(
...@@ -178,7 +184,7 @@ class SkyHome extends App { ...@@ -178,7 +184,7 @@ class SkyHome extends App {
Widget build() { Widget build() {
return new Theme( return new Theme(
data: new ThemeData( data: new ThemeData(
brightness: ThemeBrightness.dark, brightness: ThemeBrightness.light,
primarySwatch: colors.Teal primarySwatch: colors.Teal
), ),
child: new TaskDescription( child: new TaskDescription(
......
...@@ -7,6 +7,7 @@ import 'package:sky/widgets/basic.dart'; ...@@ -7,6 +7,7 @@ import 'package:sky/widgets/basic.dart';
import 'package:sky/widgets/navigator.dart'; import 'package:sky/widgets/navigator.dart';
import 'package:sky/widgets/theme.dart'; import 'package:sky/widgets/theme.dart';
import 'package:sky/widgets/widget.dart'; import 'package:sky/widgets/widget.dart';
import 'package:sky/widgets/task_description.dart';
import 'measurement.dart'; import 'measurement.dart';
import 'home.dart'; import 'home.dart';
...@@ -20,7 +21,7 @@ class FitnessApp extends App { ...@@ -20,7 +21,7 @@ class FitnessApp extends App {
void initState() { void initState() {
_navigationState = new NavigationState([ _navigationState = new NavigationState([
new Route( new Route(
name: '/', name: '/',
builder: (navigator, route) => new HomeFragment(navigator, _userData) builder: (navigator, route) => new HomeFragment(navigator, _userData)
), ),
new Route( new Route(
...@@ -61,7 +62,10 @@ class FitnessApp extends App { ...@@ -61,7 +62,10 @@ class FitnessApp extends App {
primarySwatch: colors.Indigo, primarySwatch: colors.Indigo,
accentColor: colors.PinkAccent[200] accentColor: colors.PinkAccent[200]
), ),
child: new Navigator(_navigationState) child: new TaskDescription(
label: 'Fitness',
child: new Navigator(_navigationState)
)
); );
} }
} }
......
...@@ -12,11 +12,16 @@ skyx("piano") { ...@@ -12,11 +12,16 @@ skyx("piano") {
main_dart = "piano.dart" main_dart = "piano.dart"
} }
skyx("cards") {
main_dart = "card_collection.dart"
}
group("widgets") { group("widgets") {
testonly = true testonly = true
deps = [ deps = [
":sector", ":cards",
":piano", ":piano",
":sector",
] ]
} }
...@@ -13,6 +13,8 @@ import 'package:sky/widgets/variable_height_scrollable.dart'; ...@@ -13,6 +13,8 @@ import 'package:sky/widgets/variable_height_scrollable.dart';
import 'package:sky/widgets/theme.dart'; import 'package:sky/widgets/theme.dart';
import 'package:sky/widgets/tool_bar.dart'; import 'package:sky/widgets/tool_bar.dart';
import 'package:sky/widgets/widget.dart'; import 'package:sky/widgets/widget.dart';
import 'package:sky/theme/colors.dart' as colors;
import 'package:sky/widgets/task_description.dart';
class CardCollectionApp extends App { class CardCollectionApp extends App {
...@@ -71,9 +73,19 @@ class CardCollectionApp extends App { ...@@ -71,9 +73,19 @@ class CardCollectionApp extends App {
) )
); );
return new Scaffold( return new Theme(
toolbar: new ToolBar(center: new Text('Swipe Away')), data: new ThemeData(
body: cardCollection brightness: ThemeBrightness.light,
primarySwatch: colors.Blue,
accentColor: colors.RedAccent[200]
),
child: new TaskDescription(
label: 'Cards',
child: new Scaffold(
toolbar: new ToolBar(center: new Text('Swipe Away')),
body: cardCollection
)
)
); );
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册