firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated fitness and weather manual tests, new asset locations (#4351)

Browse Source
This commit is contained in:
Hans Muller 2016-06-03 10:38:03 -07:00
parent daa0e7fa52
commit 0b7e975e2c
6 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/benchmarks/complex_layout/pubspec.yaml
View File

@ -6,7 +6,7 @@ dependencies:
path: ../../../packages/flutter
flutter_driver:
path: ../../../packages/flutter_driver
flutter_gallery_assets: '0.0.18'
flutter_gallery_assets: '0.0.20'
dev_dependencies:
flutter_test:

6
dev/manual_tests/fitness_demo.dart
View File

@ -39,11 +39,11 @@ class _FitnessDemoContentsState extends State<_FitnessDemoContents> {
Future<Null> _loadAssets(AssetBundle bundle) async {
_images = new ImageMap(bundle);
await _images.load(<String>[
'packages/flutter_gallery_assets/jumpingjack.png',
'packages/flutter_gallery_assets/fitness_demo/jumpingjack.png',
]);
String json = await DefaultAssetBundle.of(context).loadString('packages/flutter_gallery_assets/jumpingjack.json');
_sprites = new SpriteSheet(_images['packages/flutter_gallery_assets/jumpingjack.png'], json);
String json = await DefaultAssetBundle.of(context).loadString('packages/flutter_gallery_assets/fitness_demo/jumpingjack.json');
_sprites = new SpriteSheet(_images['packages/flutter_gallery_assets/fitness_demo/jumpingjack.png'], json);
}
@override

24
dev/manual_tests/flutter.yaml
View File

@ -1,14 +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
- packages/flutter_gallery_assets/weather_demo/sun.png
- packages/flutter_gallery_assets/weather_demo/clouds-0.png
- packages/flutter_gallery_assets/weather_demo/clouds-1.png
- packages/flutter_gallery_assets/weather_demo/ray.png
- packages/flutter_gallery_assets/weather_demo/sun.png
- packages/flutter_gallery_assets/weather_demo/weathersprites.json
- packages/flutter_gallery_assets/weather_demo/weathersprites.png
- packages/flutter_gallery_assets/weather_demo/icon-sun.png
- packages/flutter_gallery_assets/weather_demo/icon-rain.png
- packages/flutter_gallery_assets/weather_demo/icon-snow.png
- packages/flutter_gallery_assets/fitness_demo/jumpingjack.json
- packages/flutter_gallery_assets/fitness_demo/jumpingjack.png

2
dev/manual_tests/pubspec.yaml
View File

@ -4,7 +4,7 @@ dependencies:
path: ../../packages/flutter
flutter_sprites:
path: ../../packages/flutter_sprites
flutter_gallery_assets: '0.0.18'
flutter_gallery_assets: '0.0.20'
dev_dependencies:
test: any # flutter_test provides the version constraints

36
dev/manual_tests/weather_demo.dart
View File

@ -31,18 +31,18 @@ class _WeatherDemoState extends State<WeatherDemo> {
Future<Null> _loadAssets(AssetBundle bundle) async {
_images = new ImageMap(bundle);
await _images.load(<String>[
'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.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/weather_demo/clouds-0.png',
'packages/flutter_gallery_assets/weather_demo/clouds-1.png',
'packages/flutter_gallery_assets/weather_demo/ray.png',
'packages/flutter_gallery_assets/weather_demo/sun.png',
'packages/flutter_gallery_assets/weather_demo/weathersprites.png',
'packages/flutter_gallery_assets/weather_demo/icon-sun.png',
'packages/flutter_gallery_assets/weather_demo/icon-rain.png',
'packages/flutter_gallery_assets/weather_demo/icon-snow.png'
]);
String json = await bundle.loadString('packages/flutter_gallery_assets/weathersprites.json');
_sprites = new SpriteSheet(_images['packages/flutter_gallery_assets/weathersprites.png'], json);
String json = await bundle.loadString('packages/flutter_gallery_assets/weather_demo/weathersprites.json');
_sprites = new SpriteSheet(_images['packages/flutter_gallery_assets/weather_demo/weathersprites.png'], json);
}
@override
@ -97,7 +97,7 @@ class _WeatherDemoState extends State<WeatherDemo> {
});
},
selected: weatherWorld.weatherType == WeatherType.sun,
icon: "packages/flutter_gallery_assets/icon-sun.png"
icon: "packages/flutter_gallery_assets/weather_demo/icon-sun.png"
),
new WeatherButton(
onPressed: () {
@ -106,7 +106,7 @@ class _WeatherDemoState extends State<WeatherDemo> {
});
},
selected: weatherWorld.weatherType == WeatherType.rain,
icon: "packages/flutter_gallery_assets/icon-rain.png"
icon: "packages/flutter_gallery_assets/weather_demo/icon-rain.png"
),
new WeatherButton(
onPressed: () {
@ -115,7 +115,7 @@ class _WeatherDemoState extends State<WeatherDemo> {
});
},
selected: weatherWorld.weatherType == WeatherType.snow,
icon: "packages/flutter_gallery_assets/icon-snow.png"
icon: "packages/flutter_gallery_assets/weather_demo/icon-snow.png"
)
]
)
@ -192,7 +192,7 @@ class WeatherWorld extends NodeWithSize {
addChild(_background);
_cloudsSharp = new CloudLayer(
image: _images['packages/flutter_gallery_assets/clouds-0.png'],
image: _images['packages/flutter_gallery_assets/weather_demo/clouds-0.png'],
rotated: false,
dark: false,
loopTime: 20.0
@ -200,7 +200,7 @@ class WeatherWorld extends NodeWithSize {
addChild(_cloudsSharp);
_cloudsDark = new CloudLayer(
image: _images['packages/flutter_gallery_assets/clouds-1.png'],
image: _images['packages/flutter_gallery_assets/weather_demo/clouds-1.png'],
rotated: true,
dark: true,
loopTime: 40.0
@ -208,7 +208,7 @@ class WeatherWorld extends NodeWithSize {
addChild(_cloudsDark);
_cloudsSoft = new CloudLayer(
image: _images['packages/flutter_gallery_assets/clouds-1.png'],
image: _images['packages/flutter_gallery_assets/weather_demo/clouds-1.png'],
rotated: false,
dark: false,
loopTime: 60.0
@ -352,7 +352,7 @@ const double _kNumSunRays = 50.0;
class Sun extends Node {
Sun() {
_sun = new Sprite.fromImage(_images['packages/flutter_gallery_assets/sun.png']);
_sun = new Sprite.fromImage(_images['packages/flutter_gallery_assets/weather_demo/sun.png']);
_sun.scale = 4.0;
_sun.transferMode = TransferMode.plus;
addChild(_sun);
@ -413,7 +413,7 @@ class Ray extends Sprite {
double _rotationSpeed;
double maxOpacity;
Ray() : super.fromImage(_images['packages/flutter_gallery_assets/ray.png']) {
Ray() : super.fromImage(_images['packages/flutter_gallery_assets/weather_demo/ray.png']) {
pivot = const Point(0.0, 0.5);
transferMode = TransferMode.plus;
rotation = randomDouble() * 360.0;

2
examples/flutter_gallery/pubspec.yaml
View File

@ -8,7 +8,7 @@ dependencies:
path: ../../packages/flutter
flutter_markdown:
path: ../../packages/flutter_markdown
flutter_gallery_assets: '0.0.18'
flutter_gallery_assets: '0.0.20'
dev_dependencies:
test: any # flutter_test provides the version constraints