Visitar URL original
Update flutter_image for the decoder callback added to the image prov… · stuartmorgan-g/packages@0217612 · GitHub
Skip to content

Commit 0217612

Browse files
Update flutter_image for the decoder callback added to the image provider API (flutter#16)
1 parent 7ef8c6c commit 0217612

5 files changed

Lines changed: 16 additions & 11 deletions

File tree

‎packages/flutter_image/.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ addons:
1212
- fonts-droid-fallback
1313

1414
before_script:
15-
- git clone https://github.com/flutter/flutter.git -b beta --depth 1
15+
- git clone https://github.com/flutter/flutter.git -b master
1616
- export PATH=$PATH:$(pwd)/flutter/bin
1717
- export FLUTTER_HOME=$(pwd)/flutter
1818
- flutter doctor

‎packages/flutter_image/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## 3.0.0
4+
5+
* **Breaking change**. Updates for Flutter 1.10.15.
6+
37
## 2.0.1
48

59
- Update Flutter SDK version constraint.

‎packages/flutter_image/lib/network.dart‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ class NetworkImageWithRetry extends ImageProvider<NetworkImageWithRetry> {
7070
}
7171

7272
@override
73-
ImageStreamCompleter load(NetworkImageWithRetry key) {
73+
ImageStreamCompleter load(NetworkImageWithRetry key, DecoderCallback decode) {
7474
return OneFrameImageStreamCompleter(
75-
_loadWithRetry(key),
75+
_loadWithRetry(key, decode),
7676
informationCollector: () sync* {
7777
yield ErrorDescription('Image provider: $this');
7878
yield ErrorDescription('Image key: $key');
@@ -101,7 +101,7 @@ class NetworkImageWithRetry extends ImageProvider<NetworkImageWithRetry> {
101101
}());
102102
}
103103

104-
Future<ImageInfo> _loadWithRetry(NetworkImageWithRetry key) async {
104+
Future<ImageInfo> _loadWithRetry(NetworkImageWithRetry key, DecoderCallback decode) async {
105105
assert(key == this);
106106

107107
final Stopwatch stopwatch = Stopwatch()..start();
@@ -136,7 +136,8 @@ class NetworkImageWithRetry extends ImageProvider<NetworkImageWithRetry> {
136136
if (bytes.lengthInBytes == 0)
137137
return null;
138138

139-
final ui.Image image = await decodeImageFromList(bytes);
139+
final ui.Codec codec = await decode(bytes);
140+
final ui.Image image = (await codec.getNextFrame()).image;
140141
if (image == null)
141142
return null;
142143

‎packages/flutter_image/pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: flutter_image
2-
version: 2.0.1
2+
version: 3.0.0
33
description: >
44
Image utilities for Flutter: providers, effects, etc
55
author: Flutter Team <flutter-dev@googlegroups.com>
@@ -17,4 +17,4 @@ dev_dependencies:
1717

1818
environment:
1919
sdk: ">=2.0.0-dev.28.0 <3.0.0"
20-
flutter: ">=1.5.9-pre.94 <1.10.15-pre.144"
20+
flutter: ">=1.10.15-pre.144 <2.0.0"

‎packages/flutter_image/test/network_test.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ void main() {
3434
_imageUrl('immediate_success.png'),
3535
);
3636

37-
subject.load(subject).addListener(
37+
subject.load(subject, PaintingBinding.instance.instantiateImageCodec).addListener(
3838
ImageStreamListener(expectAsync2((ImageInfo image, bool synchronousCall) {
3939
expect(image.image.height, 1);
4040
expect(image.image.width, 1);
@@ -70,7 +70,7 @@ void main() {
7070
},
7171
);
7272

73-
subject.load(subject).addListener(
73+
subject.load(subject, PaintingBinding.instance.instantiateImageCodec).addListener(
7474
ImageStreamListener(expectAsync2((ImageInfo image, bool synchronousCall) {
7575
expect(errorLog.single.exception, isInstanceOf<FetchFailure>());
7676
expect(image, null);
@@ -102,7 +102,7 @@ void main() {
102102
},
103103
);
104104

105-
subject.load(subject).addListener(
105+
subject.load(subject, PaintingBinding.instance.instantiateImageCodec).addListener(
106106
ImageStreamListener(expectAsync2((ImageInfo image, bool synchronousCall) {
107107
expect(errorLog.single.exception, isInstanceOf<FetchFailure>());
108108
expect(image, null);
@@ -129,7 +129,7 @@ void main() {
129129
},
130130
);
131131

132-
subject.load(subject).addListener(
132+
subject.load(subject, PaintingBinding.instance.instantiateImageCodec).addListener(
133133
ImageStreamListener(expectAsync2((ImageInfo image, bool synchronousCall) {
134134
expect(image.image.height, 1);
135135
expect(image.image.width, 1);

0 commit comments

Comments
 (0)