Skip to content

Commit c177af0

Browse files
sachaarbonelsachaarbonel
committed
remove MediaUri from ui kit, upstream from core
1 parent 8f98b69 commit c177af0

File tree

11 files changed

+167
-213
lines changed

11 files changed

+167
-213
lines changed

‎packages/stream_feed_flutter/lib/src/media/fullscreen_media.dart‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class FullscreenMedia extends StatefulWidget {
2020
/// The media to display.
2121
///
2222
/// Can be audio, images, or videos.
23-
final List<Media> media;
23+
final List<MediaUri> media;
2424

2525
/// The first index of the media being shown.
2626
final int startIndex;
@@ -31,7 +31,7 @@ class FullscreenMedia extends StatefulWidget {
3131
@override
3232
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
3333
super.debugFillProperties(properties);
34-
properties.add(IterableProperty<Media>('media', media));
34+
properties.add(IterableProperty<MediaUri>('media', media));
3535
properties.add(IntProperty('startIndex', startIndex));
3636
}
3737
}
@@ -61,9 +61,9 @@ class FullscreenMediaState extends State<FullscreenMedia>
6161
_pageController = PageController(initialPage: widget.startIndex);
6262
_currentPage = widget.startIndex;
6363
for (final media in widget.media) {
64-
if (media.mediaType != MediaType.video) continue;
64+
if (media.type != MediaType.video) continue;
6565
final package = VideoPackage(media, showControls: true);
66-
videoPackages[media.url] = package;
66+
videoPackages[media.uri.toString()] = package;
6767
}
6868
_initializePlayers();
6969
}
@@ -102,9 +102,9 @@ class FullscreenMediaState extends State<FullscreenMedia>
102102
},
103103
itemBuilder: (context, index) {
104104
final media = widget.media[index];
105-
if (media.mediaType == MediaType.image && media.isValidUrl) {
105+
if (media.type == MediaType.image && media.isValidUrl) {
106106
return PhotoView(
107-
imageProvider: NetworkImage(media.url),
107+
imageProvider: NetworkImage(media.uri.toString()),
108108
maxScale: PhotoViewComputedScale.covered,
109109
minScale: PhotoViewComputedScale.contained,
110110
onTapUp: (a, b, c) {
@@ -121,9 +121,9 @@ class FullscreenMediaState extends State<FullscreenMedia>
121121
);
122122
},
123123
);
124-
} else if (media.mediaType == MediaType.video &&
124+
} else if (media.type == MediaType.video &&
125125
media.isValidUrl) {
126-
final controller = videoPackages[media.url];
126+
final controller = videoPackages[media.uri.toString()];
127127
if (controller != null && !controller.initialized) {
128128
return const Center(
129129
child: CircularProgressIndicator(),

‎packages/stream_feed_flutter/lib/src/media/gallery_preview.dart‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import 'package:flutter/foundation.dart';
22
import 'package:flutter/material.dart';
33
import 'package:stream_feed_flutter/src/media/fullscreen_media.dart';
4-
import 'package:stream_feed_flutter/src/media/media.dart';
4+
55
import 'package:stream_feed_flutter/src/media/media_widget.dart';
6+
import 'package:stream_feed_flutter/stream_feed_flutter.dart';
67

78
// ignore_for_file: cascade_invocations
89

@@ -15,7 +16,7 @@ class GalleryPreview extends StatelessWidget {
1516
}) : super(key: key);
1617

1718
/// The list of image urls to display
18-
final List<Media> media;
19+
final List<MediaUri> media;
1920

2021
@override
2122
Widget build(BuildContext context) {
@@ -129,7 +130,7 @@ class GalleryPreview extends StatelessWidget {
129130
@override
130131
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
131132
super.debugFillProperties(properties);
132-
properties.add(IterableProperty<Media>('media', media));
133+
properties.add(IterableProperty<MediaUri>('media', media));
133134
}
134135
}
135136

@@ -154,7 +155,7 @@ class FlexibleImage extends StatelessWidget {
154155
final int index;
155156

156157
/// The media being shown.
157-
final List<Media> media;
158+
final List<MediaUri> media;
158159

159160
@override
160161
Widget build(BuildContext context) {
@@ -181,6 +182,6 @@ class FlexibleImage extends StatelessWidget {
181182
super.debugFillProperties(properties);
182183
properties.add(EnumProperty<FlexFit>('flexFit', flexFit));
183184
properties.add(IntProperty('index', index));
184-
properties.add(IterableProperty<Media>('media', media));
185+
properties.add(IterableProperty<MediaUri>('media', media));
185186
}
186187
}

‎packages/stream_feed_flutter/lib/src/media/media.dart‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎packages/stream_feed_flutter/lib/src/media/media_widget.dart‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ class MediaWidget extends StatefulWidget {
1919
}) : super(key: key);
2020

2121
/// The media to display.
22-
final Media media;
22+
final MediaUri media;
2323

2424
@override
2525
_MediaWidgetState createState() => _MediaWidgetState();
2626

2727
@override
2828
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
2929
super.debugFillProperties(properties);
30-
properties.add(DiagnosticsProperty<Media>('media', media));
30+
properties.add(DiagnosticsProperty<MediaUri>('media', media));
3131
}
3232
}
3333

@@ -38,10 +38,10 @@ class _MediaWidgetState extends State<MediaWidget> {
3838
void didChangeDependencies() {
3939
super.didChangeDependencies();
4040
final mediaQuery = MediaQuery.of(context);
41-
if (widget.media.mediaType == MediaType.video) {
41+
if (widget.media.runtimeType == MediaType.video) {
4242
_getThumbnail = getTemporaryDirectory().then((result) {
4343
return VideoThumbnail.thumbnailFile(
44-
video: widget.media.url,
44+
video: widget.media.uri.toString(),
4545
thumbnailPath: result.path,
4646
maxWidth: mediaQuery.size.width ~/ 2,
4747
quality: 75,
@@ -52,12 +52,12 @@ class _MediaWidgetState extends State<MediaWidget> {
5252

5353
@override
5454
Widget build(BuildContext context) {
55-
if (widget.media.mediaType == MediaType.image) {
55+
if (widget.media.type == MediaType.image) {
5656
return Image.network(
57-
widget.media.url,
57+
widget.media.uri.toString(),
5858
fit: BoxFit.cover,
5959
);
60-
} else if (widget.media.mediaType == MediaType.video) {
60+
} else if (widget.media.type == MediaType.video) {
6161
return FutureBuilder<String?>(
6262
future: _getThumbnail,
6363
builder: (context, snapshot) {

‎packages/stream_feed_flutter/lib/src/media/video_package.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import 'package:video_player/video_player.dart';
99
class VideoPackage {
1010
/// Constructor for creating [VideoPackage]
1111
VideoPackage(
12-
Media media, {
12+
MediaUri media, {
1313
bool showControls = false,
1414
bool autoInitialize = true,
1515
}) : _showControls = showControls,
1616
_autoInitialize = autoInitialize,
17-
_videoPlayerController = VideoPlayerController.network(media.url);
17+
_videoPlayerController = VideoPlayerController.network(media.uri.toString());
1818

1919
final bool _showControls;
2020
final bool _autoInitialize;

‎packages/stream_feed_flutter/lib/stream_feed_flutter.dart‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ export 'package:stream_feed_flutter_core/stream_feed_flutter_core.dart'
66
export 'src/media/fullscreen_media.dart';
77
export 'src/media/gallery_header.dart';
88
export 'src/media/gallery_preview.dart';
9-
export 'src/media/media.dart';
10-
export 'src/media/media_types.dart';
119
export 'src/theme/themes.dart';
1210
export 'src/utils/typedefs.dart';
1311
export 'src/widgets/buttons/child_reaction.dart';

‎packages/stream_feed_flutter/test/media/fullscreen_media_test.dart‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ void main() {
1616
),
1717
home: FullscreenMedia(
1818
media: [
19-
Media(
20-
url:
21-
'https://i.picsum.photos/id/785/200/200.jpg?hmac=vvHnS4TgoGTRqwI2soaIhbOxE7Q-hhoZTTDe75h_fz4',
19+
MediaUri(
20+
uri:
21+
Uri.tryParse('https://i.picsum.photos/id/785/200/200.jpg?hmac=vvHnS4TgoGTRqwI2soaIhbOxE7Q-hhoZTTDe75h_fz4')!,
2222
),
2323
],
2424
),
@@ -37,9 +37,9 @@ void main() {
3737
),
3838
home: FullscreenMedia(
3939
media: [
40-
Media(
41-
url:
42-
'https://i.picsum.photos/id/785/200/200.jpg?hmac=vvHnS4TgoGTRqwI2soaIhbOxE7Q-hhoZTTDe75h_fz4',
40+
MediaUri(
41+
uri:
42+
Uri.tryParse('https://i.picsum.photos/id/785/200/200.jpg?hmac=vvHnS4TgoGTRqwI2soaIhbOxE7Q-hhoZTTDe75h_fz4')!,
4343
),
4444
],
4545
),
@@ -59,8 +59,8 @@ void main() {
5959
),
6060
home: FullscreenMedia(
6161
media: [
62-
Media(
63-
url: 'dsfgsdfgsdfg',
62+
MediaUri(
63+
uri: Uri.tryParse('dsfgsdfgsdfg')!,
6464
),
6565
],
6666
),
@@ -79,17 +79,17 @@ void main() {
7979
),
8080
home: FullscreenMedia(
8181
media: [
82-
Media(
83-
url:
84-
'https://randomwordgenerator.com/img/picture-generator/57e0d6444351a914f1dc8460962e33791c3ad6e04e50744172287ad19245c6_640.jpg',
82+
MediaUri(
83+
uri:
84+
Uri.tryParse('https://randomwordgenerator.com/img/picture-generator/57e0d6444351a914f1dc8460962e33791c3ad6e04e50744172287ad19245c6_640.jpg')!,
8585
),
86-
Media(
87-
url:
88-
'https://randomwordgenerator.com/img/picture-generator/57e0d6444351a914f1dc8460962e33791c3ad6e04e50744172287ad19245c6_640.jpg',
86+
MediaUri(
87+
uri:
88+
Uri.tryParse('https://randomwordgenerator.com/img/picture-generator/57e0d6444351a914f1dc8460962e33791c3ad6e04e50744172287ad19245c6_640.jpg')!,
8989
),
90-
Media(
91-
url:
92-
'https://randomwordgenerator.com/img/picture-generator/52e8dd474e56a814f1dc8460962e33791c3ad6e04e507441722978d6904ec2_640.jpg',
90+
MediaUri(
91+
uri:
92+
Uri.tryParse('https://randomwordgenerator.com/img/picture-generator/52e8dd474e56a814f1dc8460962e33791c3ad6e04e507441722978d6904ec2_640.jpg')!,
9393
),
9494
],
9595
),
@@ -115,17 +115,17 @@ void main() {
115115
),
116116
home: FullscreenMedia(
117117
media: [
118-
Media(
119-
url:
120-
'https://randomwordgenerator.com/img/picture-generator/57e0d6444351a914f1dc8460962e33791c3ad6e04e50744172287ad19245c6_640.jpg',
118+
MediaUri(
119+
uri:
120+
Uri.tryParse('https://randomwordgenerator.com/img/picture-generator/57e0d6444351a914f1dc8460962e33791c3ad6e04e50744172287ad19245c6_640.jpg')!,
121121
),
122-
Media(
123-
url:
124-
'https://randomwordgenerator.com/img/picture-generator/57e0d6444351a914f1dc8460962e33791c3ad6e04e50744172287ad19245c6_640.jpg',
122+
MediaUri(
123+
uri:
124+
Uri.tryParse('https://randomwordgenerator.com/img/picture-generator/57e0d6444351a914f1dc8460962e33791c3ad6e04e50744172287ad19245c6_640.jpg')!,
125125
),
126-
Media(
127-
url:
128-
'https://randomwordgenerator.com/img/picture-generator/52e8dd474e56a814f1dc8460962e33791c3ad6e04e507441722978d6904ec2_640.jpg',
126+
MediaUri(
127+
uri:
128+
Uri.tryParse('https://randomwordgenerator.com/img/picture-generator/52e8dd474e56a814f1dc8460962e33791c3ad6e04e507441722978d6904ec2_640.jpg')!,
129129
),
130130
],
131131
),
@@ -171,17 +171,17 @@ void main() {
171171
),
172172
home: FullscreenMedia(
173173
media: [
174-
Media(
175-
url:
176-
'https://i.picsum.photos/id/485/200/300.jpg?hmac=Kv8DZbgB5jppYcdfZdMVu2LM3XAIt-3fvR8VcmrLYhw',
174+
MediaUri(
175+
uri:
176+
Uri.tryParse('https://i.picsum.photos/id/485/200/300.jpg?hmac=Kv8DZbgB5jppYcdfZdMVu2LM3XAIt-3fvR8VcmrLYhw')!,
177177
),
178-
Media(
179-
url:
180-
'https://i.picsum.photos/id/11/200/300.jpg?hmac=n9AzdbWCOaV1wXkmrRfw5OulrzXJc0PgSFj4st8d6ys',
178+
MediaUri(
179+
uri:
180+
Uri.tryParse('https://i.picsum.photos/id/11/200/300.jpg?hmac=n9AzdbWCOaV1wXkmrRfw5OulrzXJc0PgSFj4st8d6ys')!,
181181
),
182-
Media(
183-
url:
184-
'https://i.picsum.photos/id/373/200/300.jpg?hmac=GXSHLvl-WsHouC5yVXzXVLNnpn21lCdp5rjUE_wyK-8',
182+
MediaUri(
183+
uri:
184+
Uri.tryParse('https://i.picsum.photos/id/373/200/300.jpg?hmac=GXSHLvl-WsHouC5yVXzXVLNnpn21lCdp5rjUE_wyK-8')!,
185185
),
186186
],
187187
),

0 commit comments

Comments
 (0)