Skip to content

Commit 3de8c60

Browse files
committed
Replace Stream<ui.Codec> with Future<ui.Codec>
1 parent 1df55ab commit 3de8c60

File tree

5 files changed

+5
-246
lines changed

5 files changed

+5
-246
lines changed

cached_network_image/lib/cached_network_image.dart

-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@ export 'package:flutter_cache_manager/flutter_cache_manager.dart'
77

88
export 'src/cached_image_widget.dart';
99
export 'src/image_provider/cached_network_image_provider.dart';
10-
export 'src/image_provider/multi_image_stream_completer.dart';

cached_network_image/lib/src/image_provider/_image_loader.dart

-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ class ImageLoader implements platform.ImageLoader {
108108
headers: headers,
109109
key: cacheKey,
110110
);
111-
112111
await for (final result in stream) {
113112
if (result is DownloadProgress) {
114113
chunkEvents.add(

cached_network_image/lib/src/image_provider/cached_network_image_provider.dart

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'dart:async' show Future, StreamController;
22
import 'dart:ui' as ui show Codec;
33

4-
import 'package:cached_network_image/src/image_provider/multi_image_stream_completer.dart';
54
import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
65
show ErrorListener, ImageRenderMethodForWeb;
76
import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
@@ -74,8 +73,8 @@ class CachedNetworkImageProvider
7473
DecoderBufferCallback decode,
7574
) {
7675
final chunkEvents = StreamController<ImageChunkEvent>();
77-
final imageStreamCompleter = MultiImageStreamCompleter(
78-
codec: _loadBufferAsync(key, chunkEvents, decode),
76+
final imageStreamCompleter = MultiFrameImageStreamCompleter(
77+
codec: _loadBufferAsync(key, chunkEvents, decode).first,
7978
chunkEvents: chunkEvents.stream,
8079
scale: key.scale,
8180
informationCollector: () sync* {
@@ -128,8 +127,8 @@ class CachedNetworkImageProvider
128127
ImageDecoderCallback decode,
129128
) {
130129
final chunkEvents = StreamController<ImageChunkEvent>();
131-
final imageStreamCompleter = MultiImageStreamCompleter(
132-
codec: _loadImageAsync(key, chunkEvents, decode),
130+
final imageStreamCompleter = MultiFrameImageStreamCompleter(
131+
codec: _loadImageAsync(key, chunkEvents, decode).first,
133132
chunkEvents: chunkEvents.stream,
134133
scale: key.scale,
135134
informationCollector: () sync* {

cached_network_image/lib/src/image_provider/multi_image_stream_completer.dart

-238
This file was deleted.

cached_network_image/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies:
1616
cached_network_image_web: ^1.1.1
1717
flutter:
1818
sdk: flutter
19-
flutter_cache_manager: ^3.3.1
19+
flutter_cache_manager: ^3.3.2
2020
octo_image: ^2.0.0
2121

2222
dev_dependencies:

0 commit comments

Comments
 (0)