From dd27a489facb464d28fddfd2e2c5663f51e5c21f Mon Sep 17 00:00:00 2001 From: Hans Muller Date: Thu, 2 Jun 2016 16:12:54 -0700 Subject: [PATCH] Update gallery demo list (#4335) --- .../lib/demo => dev/manual_tests}/fitness_demo.dart | 7 +++++++ dev/manual_tests/flutter.yaml | 13 +++++++++++++ dev/manual_tests/pubspec.yaml | 4 ++++ .../lib/demo => dev/manual_tests}/weather_demo.dart | 7 +++++++ examples/flutter_gallery/flutter.yaml | 12 ------------ examples/flutter_gallery/lib/demo/all.dart | 2 -- examples/flutter_gallery/lib/gallery/app.dart | 2 -- examples/flutter_gallery/lib/gallery/home.dart | 2 -- examples/flutter_gallery/pubspec.yaml | 2 -- .../test_driver/transitions_perf_test.dart | 3 --- 10 files changed, 31 insertions(+), 23 deletions(-) rename {examples/flutter_gallery/lib/demo => dev/manual_tests}/fitness_demo.dart (99%) rename {examples/flutter_gallery/lib/demo => dev/manual_tests}/weather_demo.dart (99%) diff --git a/examples/flutter_gallery/lib/demo/fitness_demo.dart b/dev/manual_tests/fitness_demo.dart similarity index 99% rename from examples/flutter_gallery/lib/demo/fitness_demo.dart rename to dev/manual_tests/fitness_demo.dart index 45cc3bac1f..827433e356 100644 --- a/examples/flutter_gallery/lib/demo/fitness_demo.dart +++ b/dev/manual_tests/fitness_demo.dart @@ -587,3 +587,10 @@ class _FireworksNode extends NodeWithSize { addChild(system); } } + +void main() { + runApp(new MaterialApp( + title: 'Fitness', + home: new FitnessDemo() + )); +} diff --git a/dev/manual_tests/flutter.yaml b/dev/manual_tests/flutter.yaml index 2cdeaa40b7..65bab1b89b 100644 --- a/dev/manual_tests/flutter.yaml +++ b/dev/manual_tests/flutter.yaml @@ -1 +1,14 @@ uses-material-design: true +assets: + - packages/flutter_gallery_assets/sun.png + - packages/flutter_gallery_assets/clouds-0.png + - packages/flutter_gallery_assets/clouds-1.png + - packages/flutter_gallery_assets/ray.png + - packages/flutter_gallery_assets/sun.png + - packages/flutter_gallery_assets/weathersprites.json + - packages/flutter_gallery_assets/weathersprites.png + - packages/flutter_gallery_assets/icon-sun.png + - packages/flutter_gallery_assets/icon-rain.png + - packages/flutter_gallery_assets/icon-snow.png + - packages/flutter_gallery_assets/jumpingjack.json + - packages/flutter_gallery_assets/jumpingjack.png diff --git a/dev/manual_tests/pubspec.yaml b/dev/manual_tests/pubspec.yaml index ab13b22646..24e636cc33 100644 --- a/dev/manual_tests/pubspec.yaml +++ b/dev/manual_tests/pubspec.yaml @@ -2,6 +2,10 @@ name: flutter_manual_tests dependencies: flutter: path: ../../packages/flutter + flutter_sprites: + path: ../../packages/flutter_sprites + flutter_gallery_assets: '0.0.18' + dev_dependencies: test: any # flutter_test provides the version constraints flutter_test: diff --git a/examples/flutter_gallery/lib/demo/weather_demo.dart b/dev/manual_tests/weather_demo.dart similarity index 99% rename from examples/flutter_gallery/lib/demo/weather_demo.dart rename to dev/manual_tests/weather_demo.dart index dc630aabb6..4bd7ec30ea 100644 --- a/examples/flutter_gallery/lib/demo/weather_demo.dart +++ b/dev/manual_tests/weather_demo.dart @@ -557,3 +557,10 @@ class Snow extends Node { } } } + +void main() { + runApp(new MaterialApp( + title: 'Weather', + home: new WeatherDemo() + )); +} diff --git a/examples/flutter_gallery/flutter.yaml b/examples/flutter_gallery/flutter.yaml index 3f1a057d12..da28187616 100644 --- a/examples/flutter_gallery/flutter.yaml +++ b/examples/flutter_gallery/flutter.yaml @@ -9,20 +9,8 @@ assets: - assets/section_patterns.png - assets/section_usability.png - packages/flutter_gallery_assets/ali_connors.png - - packages/flutter_gallery_assets/sun.png - - packages/flutter_gallery_assets/clouds-0.png - - packages/flutter_gallery_assets/clouds-1.png - - packages/flutter_gallery_assets/ray.png - - packages/flutter_gallery_assets/sun.png - - packages/flutter_gallery_assets/weathersprites.json - - packages/flutter_gallery_assets/weathersprites.png - - packages/flutter_gallery_assets/icon-sun.png - - packages/flutter_gallery_assets/icon-rain.png - - packages/flutter_gallery_assets/icon-snow.png - packages/flutter_gallery_assets/kangaroo_valley_safari.png - packages/flutter_gallery_assets/top_10_australian_beaches.png - - packages/flutter_gallery_assets/jumpingjack.json - - packages/flutter_gallery_assets/jumpingjack.png - packages/flutter_gallery_assets/grain.png - packages/flutter_gallery_assets/fancylines.png - packages/flutter_gallery_assets/landscape_0.jpg diff --git a/examples/flutter_gallery/lib/demo/all.dart b/examples/flutter_gallery/lib/demo/all.dart index 60217b2edb..39a792d8a8 100644 --- a/examples/flutter_gallery/lib/demo/all.dart +++ b/examples/flutter_gallery/lib/demo/all.dart @@ -11,7 +11,6 @@ export 'data_table_demo.dart'; export 'date_picker_demo.dart'; export 'dialog_demo.dart'; export 'drop_down_demo.dart'; -export 'fitness_demo.dart'; export 'flexible_space_demo.dart'; export 'grid_list_demo.dart'; export 'icons_demo.dart'; @@ -35,4 +34,3 @@ export 'time_picker_demo.dart'; export 'tooltip_demo.dart'; export 'two_level_list_demo.dart'; export 'typography_demo.dart'; -export 'weather_demo.dart'; diff --git a/examples/flutter_gallery/lib/gallery/app.dart b/examples/flutter_gallery/lib/gallery/app.dart index deaee4be84..20d7b14159 100644 --- a/examples/flutter_gallery/lib/gallery/app.dart +++ b/examples/flutter_gallery/lib/gallery/app.dart @@ -10,8 +10,6 @@ import 'home.dart'; final Map kRoutes = { ShrineDemo.routeName: (BuildContext context) => new ShrineDemo(), - WeatherDemo.routeName: (BuildContext context) => new WeatherDemo(), - FitnessDemo.routeName: (BuildContext context) => new FitnessDemo(), Calculator.routeName: (BuildContext context) => new Calculator(), FlexibleSpaceDemo.routeName: (BuildContext context) => new FlexibleSpaceDemo(), TabsFabDemo.routeName: (BuildContext context) => new TabsFabDemo(), diff --git a/examples/flutter_gallery/lib/gallery/home.dart b/examples/flutter_gallery/lib/gallery/home.dart index 9f14308f69..daf6ec1f25 100644 --- a/examples/flutter_gallery/lib/gallery/home.dart +++ b/examples/flutter_gallery/lib/gallery/home.dart @@ -72,8 +72,6 @@ class GalleryHomeState extends State { title: new Text('Demos'), children: [ new GalleryItem(title: 'Shrine', routeName: ShrineDemo.routeName), - new GalleryItem(title: 'Weather', routeName: WeatherDemo.routeName), - new GalleryItem(title: 'Fitness', routeName: FitnessDemo.routeName), new GalleryItem(title: 'Calculator', routeName: Calculator.routeName), new GalleryItem(title: 'Flexible space toolbar', routeName: FlexibleSpaceDemo.routeName), new GalleryItem(title: 'Floating action button', routeName: TabsFabDemo.routeName), diff --git a/examples/flutter_gallery/pubspec.yaml b/examples/flutter_gallery/pubspec.yaml index 5497ee8cec..9cf5de9812 100644 --- a/examples/flutter_gallery/pubspec.yaml +++ b/examples/flutter_gallery/pubspec.yaml @@ -6,8 +6,6 @@ dependencies: flutter: path: ../../packages/flutter - flutter_sprites: - path: ../../packages/flutter_sprites flutter_markdown: path: ../../packages/flutter_markdown flutter_gallery_assets: '0.0.18' diff --git a/examples/flutter_gallery/test_driver/transitions_perf_test.dart b/examples/flutter_gallery/test_driver/transitions_perf_test.dart index 381dd76426..9bcc1bd224 100644 --- a/examples/flutter_gallery/test_driver/transitions_perf_test.dart +++ b/examples/flutter_gallery/test_driver/transitions_perf_test.dart @@ -15,9 +15,6 @@ import 'package:test/test.dart'; const List demoCategories = const ['Demos', 'Components', 'Style']; const List demoNames = const [ - 'Weather', - 'Fitness', - 'Fancy lines', 'Flexible space toolbar', 'Floating action button', 'Buttons',