From 472fdd4cedeadbc88b4fdcb1ffbb92a85caf47c2 Mon Sep 17 00:00:00 2001 From: Parker Lougheed Date: Sun, 27 Aug 2023 22:10:54 -0500 Subject: [PATCH 1/5] Replace deprecated ImageProvider load methods --- lib/logic/common/retry_image.dart | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/lib/logic/common/retry_image.dart b/lib/logic/common/retry_image.dart index 5f5f0cae..11309527 100644 --- a/lib/logic/common/retry_image.dart +++ b/lib/logic/common/retry_image.dart @@ -49,9 +49,10 @@ class RetryImage extends ImageProvider { return completer.future; } - ImageStreamCompleter _commonLoad(ImageStreamCompleter Function() loader) { + @override + ImageStreamCompleter loadImage(Object key, ImageDecoderCallback decode) { final _DelegatingImageStreamCompleter completer = _DelegatingImageStreamCompleter(); - ImageStreamCompleter completerToWrap = loader(); + ImageStreamCompleter completerToWrap = imageProvider.loadImage(key, decode); late ImageStreamListener listener; Duration duration = const Duration(milliseconds: 250); @@ -69,7 +70,7 @@ class RetryImage extends ImageProvider { } Future.delayed(duration).then((void v) { duration *= 2; - completerToWrap = loader(); + completerToWrap = imageProvider.loadImage(key, decode); count += 1; completerToWrap.addListener(listener); }); @@ -84,18 +85,6 @@ class RetryImage extends ImageProvider { return completer; } - @override - // ignore: deprecated_member_use - ImageStreamCompleter load(Object key, DecoderCallback decode) { - // ignore: deprecated_member_use - return _commonLoad(() => imageProvider.load(key, decode)); - } - - @override - ImageStreamCompleter loadBuffer(Object key, DecoderBufferCallback decode) { - return _commonLoad(() => imageProvider.loadBuffer(key, decode)); - } - @override bool operator ==(Object other) { if (other.runtimeType != runtimeType) { From bb580d5d78137917b4d963e655895685baeebad2 Mon Sep 17 00:00:00 2001 From: Shawn Date: Tue, 29 Aug 2023 10:23:34 -0600 Subject: [PATCH 2/5] Update README to indicate the app can now run on stable branch --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d815bcc5..63b1020d 100644 --- a/README.md +++ b/README.md @@ -23,11 +23,11 @@ To try the app you can download it from your favorite app store: If you're new to Flutter the first thing you'll need is to follow the [setup instructions](https://flutter.dev/docs/get-started/install). -Once Flutter is setup, you can use the latest `master` channel: - * `flutter channel master` +Once Flutter is setup, you can use the latest `stable` channel: + * `flutter channel stable` * `flutter upgrade` - Once on `master` you're ready to run the app on your local device or simulator: + Once on `stable` you're ready to run the app on your local device or simulator: * `flutter run -d ios` * `flutter run -d android` From 43a1e801b89e6b27d111f37ebc4729921af6cb08 Mon Sep 17 00:00:00 2001 From: Shawn Date: Tue, 29 Aug 2023 10:23:57 -0600 Subject: [PATCH 3/5] Remove intl pkg imports, they are no longer needed on stable branch --- pubspec.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index bcc7f4c6..6cb433c5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -38,7 +38,6 @@ dependencies: image_fade: ^0.6.2 image_gallery_saver: ^1.7.1 internet_connection_checker: ^1.0.0+1 - intl: ^0.18.1 package_info_plus: ^3.0.3 particle_field: ^0.0.1 path_provider: ^2.0.12 @@ -52,9 +51,7 @@ dependencies: unsplash_client: ^2.1.0+3 webview_flutter: ^4.0.2 youtube_player_iframe: ^4.0.4 - -dependency_overrides: - intl: ^0.18.1 + cupertino_icons: ^1.0.5 dev_dependencies: build_runner: ^2.2.0 From aad94222e8bf64f957f33c404995e5fea885df5a Mon Sep 17 00:00:00 2001 From: Shawn Date: Tue, 29 Aug 2023 10:24:58 -0600 Subject: [PATCH 4/5] Tweak img paths to avoid cross-domain origin issues on web platform (WIP) --- lib/logic/data/unsplash_photo_data.dart | 2 +- lib/ui/screens/editorial/widgets/_scrolling_content.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/logic/data/unsplash_photo_data.dart b/lib/logic/data/unsplash_photo_data.dart index b5390e2e..175a5e91 100644 --- a/lib/logic/data/unsplash_photo_data.dart +++ b/lib/logic/data/unsplash_photo_data.dart @@ -29,7 +29,7 @@ class UnsplashPhotoData { if (PlatformInfo.pixelRatio >= 1.5 || PlatformInfo.isDesktop) { size *= 2; } - return 'https://wonderous.info/unsplash/$id-$size.jpg'; + return 'https://www.wonderous.info/unsplash/$id-$size.jpg'; } /// List of image ids by collection. This can be generated with the [UnsplashDownloadService].generateUnsplashCollectionsClass(). diff --git a/lib/ui/screens/editorial/widgets/_scrolling_content.dart b/lib/ui/screens/editorial/widgets/_scrolling_content.dart index dd0d4052..199a505a 100644 --- a/lib/ui/screens/editorial/widgets/_scrolling_content.dart +++ b/lib/ui/screens/editorial/widgets/_scrolling_content.dart @@ -170,7 +170,7 @@ class _YouTubeThumbnail extends StatelessWidget { final String id; final String caption; - String get imageUrl => 'http://img.youtube.com/vi/$id/hqdefault.jpg'; + String get imageUrl => 'https://img.youtube.com/vi/$id/hqdefault.jpg'; @override Widget build(BuildContext context) { From 5c79438bf2ccba33756c5d6c3fe3f994b3050f14 Mon Sep 17 00:00:00 2001 From: Shawn Date: Tue, 29 Aug 2023 10:26:57 -0600 Subject: [PATCH 5/5] Remove forked version of `gap` pkg, no longer needed as of 3.0.1 --- pubspec.lock | 21 ++++++++++++++------- pubspec.yaml | 5 +---- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 889bd19a..8dfdc199 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -209,6 +209,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.17.2" + cupertino_icons: + dependency: "direct main" + description: + name: cupertino_icons + sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be + url: "https://pub.dev" + source: hosted + version: "1.0.5" dart_code_metrics: dependency: "direct dev" description: @@ -395,12 +403,11 @@ packages: gap: dependency: "direct main" description: - path: "." - ref: dc980bf - resolved-ref: dc980bf4482ec5b8378aeb4c72e4face105c5d72 - url: "https://github.com/esDotDev/gap.git" - source: git - version: "3.0.1+1" + name: gap + sha256: f19387d4e32f849394758b91377f9153a1b41d79513ef7668c088c77dbc6955d + url: "https://pub.dev" + source: hosted + version: "3.0.1" get_it: dependency: "direct main" description: @@ -562,7 +569,7 @@ packages: source: hosted version: "1.0.0+1" intl: - dependency: "direct main" + dependency: transitive description: name: intl sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" diff --git a/pubspec.yaml b/pubspec.yaml index 6cb433c5..d1cdf563 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -25,10 +25,7 @@ dependencies: flutter_native_splash: ^2.2.17 flutter_staggered_grid_view: ^0.6.2 flutter_svg: ^2.0.1 - gap: - git: - url: https://github.com/esDotDev/gap.git - ref: dc980bf + gap: ^3.0.1 get_it: ^7.2.0 get_it_mixin: ^3.1.4 google_maps_flutter: ^2.2.3