Merge branch 'main' into misc/dev-dependency-cleanup

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`
 

lib/logic/common/retry_image.dart

@@ -49,9 +49,10 @@ class RetryImage extends ImageProvider<Object> {
     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<Object> {
         }
         Future<void>.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<Object> {
     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) {

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().

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) {

pubspec.lock

@@ -61,10 +61,10 @@ packages:
     dependency: "direct main"
     description:
       name: collection
-      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.2"
+    version: "1.18.0"
   cross_file:
     dependency: transitive
     description:
@@ -89,6 +89,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"
   dependency_validator:
     dependency: "direct dev"
     description:
@@ -243,12 +251,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:
@@ -394,7 +401,7 @@ packages:
     source: hosted
     version: "1.0.0+1"
   intl:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: intl
       sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"

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
@@ -38,7 +35,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 +48,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:
   icons_launcher: ^2.1.3