Merge pull request #17 from Tudutu/master

Null safety

lib/photo_gallery.dart

@@ -2,6 +2,7 @@ library photogallery;
 
 import 'dart:async';
 import 'dart:io';
+import 'dart:typed_data';
 import 'dart:ui' as ui;
 
 import 'package:flutter/foundation.dart';
@@ -23,9 +24,8 @@ class PhotoGallery {
 
   /// List all available gallery albums and counts number of items of [MediumType].
   static Future<List<Album>> listAlbums({
-    @required MediumType mediumType,
+    required MediumType mediumType,
   }) async {
-    assert(mediumType != null);
     final json = await _channel.invokeMethod('listAlbums', {
       'mediumType': mediumTypeToJson(mediumType),
     });
@@ -34,12 +34,11 @@ class PhotoGallery {
 
   /// List all available media in a specific album, support pagination of media
   static Future<MediaPage> _listMedia({
-    @required Album album,
-    @required int total,
-    int skip,
-    int take,
+    required Album album,
+    required int total,
+    int? skip,
+    int? take,
   }) async {
-    assert(album.id != null);
     final json = await _channel.invokeMethod('listMedia', {
       'albumId': album.id,
       'mediumType': mediumTypeToJson(album.mediumType),
@@ -52,10 +51,9 @@ class PhotoGallery {
 
   /// Get medium metadata by medium id
   static Future<Medium> getMedium({
-    @required String mediumId,
-    MediumType mediumType,
+    required String mediumId,
+    MediumType? mediumType,
   }) async {
-    assert(mediumId != null);
     final json = await _channel.invokeMethod('getMedium', {
       'mediumId': mediumId,
       'mediumType': mediumTypeToJson(mediumType),
@@ -64,14 +62,13 @@ class PhotoGallery {
   }
 
   /// Get medium thumbnail by medium id
-  static Future<List<dynamic>> getThumbnail({
-    @required String mediumId,
-    MediumType mediumType,
-    int width,
-    int height,
-    bool highQuality,
+  static Future<List<int>> getThumbnail({
+    required String mediumId,
+    MediumType? mediumType,
+    int? width,
+    int? height,
+    bool? highQuality,
   }) async {
-    assert(mediumId != null);
     final bytes = await _channel.invokeMethod('getThumbnail', {
       'mediumId': mediumId,
       'mediumType': mediumTypeToJson(mediumType),
@@ -83,14 +80,13 @@ class PhotoGallery {
   }
 
   /// Get album thumbnail by album id
-  static Future<List<dynamic>> getAlbumThumbnail({
-    @required String albumId,
-    MediumType mediumType,
-    int width,
-    int height,
-    bool highQuality,
+  static Future<List<int>> getAlbumThumbnail({
+    required String albumId,
+    MediumType? mediumType,
+    int? width,
+    int? height,
+    bool? highQuality,
   }) async {
-    assert(albumId != null);
     final bytes = await _channel.invokeMethod('getAlbumThumbnail', {
       'albumId': albumId,
       'mediumType': mediumTypeToJson(mediumType),
@@ -103,10 +99,9 @@ class PhotoGallery {
 
   /// get medium file by medium id
   static Future<File> getFile({
-    @required String mediumId,
-    MediumType mediumType,
+    required String mediumId,
+    MediumType? mediumType,
   }) async {
-    assert(mediumId != null);
     final path = await _channel.invokeMethod('getFile', {
       'mediumId': mediumId,
       'mediumType': mediumTypeToJson(mediumType),

lib/src/common/medium_type.dart

@@ -6,7 +6,7 @@ enum MediumType {
   video,
 }
 
-String mediumTypeToJson(MediumType value) {
+String? mediumTypeToJson(MediumType? value) {
   switch (value) {
     case MediumType.image:
       return 'image';
@@ -17,7 +17,7 @@ String mediumTypeToJson(MediumType value) {
   }
 }
 
-MediumType jsonToMediumType(String value) {
+MediumType? jsonToMediumType(String? value) {
   switch (value) {
     case 'image':
       return MediumType.image;

lib/src/image_providers/album_thumbnail_provider.dart

@@ -3,18 +3,18 @@ part of photogallery;
 /// Fetches the given album thumbnail from the gallery.
 class AlbumThumbnailProvider extends ImageProvider<AlbumThumbnailProvider> {
   const AlbumThumbnailProvider({
-    @required this.albumId,
+    required this.albumId,
     this.mediumType,
     this.height,
     this.width,
     this.highQuality = false,
-  }) : assert(albumId != null);
+  });
 
   final String albumId;
-  final MediumType mediumType;
-  final int height;
-  final int width;
-  final bool highQuality;
+  final MediumType? mediumType;
+  final int? height;
+  final int? width;
+  final bool? highQuality;
 
   @override
   ImageStreamCompleter load(key, decode) {
@@ -37,9 +37,7 @@ class AlbumThumbnailProvider extends ImageProvider<AlbumThumbnailProvider> {
       width: width,
       highQuality: highQuality,
     );
-    if (bytes == null || bytes.length == 0) return null;
-
-    return await decode(bytes);
+    return await decode(Uint8List.fromList(bytes));
   }
 
   @override
@@ -55,7 +53,7 @@ class AlbumThumbnailProvider extends ImageProvider<AlbumThumbnailProvider> {
   }
 
   @override
-  int get hashCode => albumId?.hashCode ?? 0;
+  int get hashCode => albumId.hashCode;
 
   @override
   String toString() => '$runtimeType("$albumId")';

lib/src/image_providers/photo_provider.dart

@@ -3,8 +3,8 @@ part of photogallery;
 /// Fetches the given image from the gallery.
 class PhotoProvider extends ImageProvider<PhotoProvider> {
   PhotoProvider({
-    @required this.mediumId,
-  }) : assert(mediumId != null);
+    required this.mediumId,
+  });
 
   final String mediumId;
 
@@ -23,10 +23,8 @@ class PhotoProvider extends ImageProvider<PhotoProvider> {
     assert(key == this);
     final file = await PhotoGallery.getFile(
         mediumId: mediumId, mediumType: MediumType.image);
-    if (file == null) return null;
 
     final bytes = await file.readAsBytes();
-    if (bytes.lengthInBytes == 0) return null;
 
     return await decode(bytes);
   }
@@ -44,7 +42,7 @@ class PhotoProvider extends ImageProvider<PhotoProvider> {
   }
 
   @override
-  int get hashCode => mediumId?.hashCode ?? 0;
+  int get hashCode => mediumId.hashCode;
 
   @override
   String toString() => '$runtimeType("$mediumId")';

lib/src/image_providers/thumbnail_provider.dart

@@ -3,18 +3,18 @@ part of photogallery;
 /// Fetches the given medium thumbnail from the gallery.
 class ThumbnailProvider extends ImageProvider<ThumbnailProvider> {
   const ThumbnailProvider({
-    @required this.mediumId,
+    required this.mediumId,
     this.mediumType,
     this.height,
     this.width,
     this.highQuality,
-  }) : assert(mediumId != null);
+  });
 
   final String mediumId;
-  final MediumType mediumType;
-  final int height;
-  final int width;
-  final bool highQuality;
+  final MediumType? mediumType;
+  final int? height;
+  final int? width;
+  final bool? highQuality;
 
   @override
   ImageStreamCompleter load(key, decode) {
@@ -37,9 +37,7 @@ class ThumbnailProvider extends ImageProvider<ThumbnailProvider> {
       width: width,
       highQuality: highQuality,
     );
-    if (bytes.length == 0) return null;
-
-    return await decode(bytes);
+    return await decode(Uint8List.fromList(bytes));
   }
 
   @override
@@ -55,7 +53,7 @@ class ThumbnailProvider extends ImageProvider<ThumbnailProvider> {
   }
 
   @override
-  int get hashCode => mediumId?.hashCode ?? 0;
+  int get hashCode => mediumId.hashCode;
 
   @override
   String toString() => '$runtimeType("$mediumId")';

lib/src/models/album.dart

@@ -7,7 +7,7 @@ class Album {
   final String id;
 
   /// The [MediumType] of the album.
-  final MediumType mediumType;
+  final MediumType? mediumType;
 
   /// The name of the album.
   final String name;
@@ -30,8 +30,8 @@ class Album {
   /// Pagination can be controlled out of [skip] (defaults to `0`) and
   /// [take] (defaults to `<total>`).
   Future<MediaPage> listMedia({
-    int skip,
-    int take,
+    int? skip,
+    int? take,
   }) {
     return PhotoGallery._listMedia(
       album: this,
@@ -45,9 +45,9 @@ class Album {
   ///
   /// It will display the lastly taken medium thumbnail.
   Future<List<int>> getThumbnail({
-    int width,
-    int height,
-    bool highQuality = false,
+    int? width,
+    int? height,
+    bool? highQuality = false,
   }) {
     return PhotoGallery.getAlbumThumbnail(
       albumId: id,

lib/src/models/medium.dart

@@ -9,33 +9,33 @@ class Medium {
   final String id;
 
   /// The medium type.
-  final MediumType mediumType;
+  final MediumType? mediumType;
 
   /// The medium width.
-  final int width;
+  final int? width;
 
   /// The medium height.
-  final int height;
+  final int? height;
 
   /// The medium mimeType.
-  final String mimeType;
+  final String? mimeType;
 
   /// The duration of video
   final int duration;
 
   /// The date at which the photo or video was taken.
-  final DateTime creationDate;
+  final DateTime? creationDate;
 
   /// The date at which the photo or video was modified.
-  final DateTime modifiedDate;
+  final DateTime? modifiedDate;
 
   Medium({
-    this.id,
+    required this.id,
     this.mediumType,
     this.width,
     this.height,
     this.mimeType,
-    this.duration,
+    this.duration = 0,
     this.creationDate,
     this.modifiedDate,
   });
@@ -81,9 +81,9 @@ class Medium {
 
   /// Get a JPEG thumbnail's data for this medium.
   Future<List<int>> getThumbnail({
-    int width,
-    int height,
-    bool highQuality = false,
+    int? width,
+    int? height,
+    bool? highQuality = false,
   }) {
     return PhotoGallery.getThumbnail(
       mediumId: id,

pubspec.yaml

@@ -1,10 +1,10 @@
 name: photo_gallery
 description: A Flutter plugin that retrieves images and videos from mobile native gallery.
-version: 0.4.0
+version: 0.4.0-nullsafety.0
 repository: https://github.com/Firelands128/photo_gallery
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0 <3.0.0"
   flutter: ">=1.10.0"
 
 dependencies:

test/utils/generator.dart

@@ -3,8 +3,7 @@ import 'dart:io';
 import 'package:photo_gallery/photo_gallery.dart';
 
 class Generator {
-  static dynamic generateAlbumsJson({MediumType mediumType}) {
-    mediumType = mediumType ?? MediumType.image;
+  static dynamic generateAlbumsJson({MediumType mediumType = MediumType.image}) {
     return [
       {
         "id": "__ALL__",
@@ -21,18 +20,18 @@ class Generator {
     ];
   }
 
-  static List<Album> generateAlbums({MediumType mediumType}) {
+  static List<Album> generateAlbums({required MediumType mediumType}) {
     return Generator.generateAlbumsJson(mediumType: mediumType)
         .map<Album>((x) => Album.fromJson(x))
         .toList();
   }
 
   static dynamic generateMediaPageJson({
-    String albumId,
-    MediumType mediumType,
-    int total,
-    int skip,
-    int take,
+    required String albumId,
+    required MediumType mediumType,
+    required int total,
+    int? skip,
+    int? take,
   }) {
     skip = skip ?? 0;
     take = take ?? (total - skip);
@@ -53,8 +52,8 @@ class Generator {
   }
 
   static dynamic generateMediaJson({
-    String mediumId,
-    MediumType mediumType,
+    required String mediumId,
+    required MediumType mediumType,
   }) {
     return {
       "id": mediumId,
@@ -69,10 +68,10 @@ class Generator {
   }
 
   static MediaPage generateMediaPage({
-    Album album,
-    MediumType mediumType,
-    int skip,
-    int take,
+    required Album album,
+    required MediumType mediumType,
+    int? skip,
+    int? take,
   }) {
     dynamic json = generateMediaPageJson(
       albumId: album.id,
@@ -85,8 +84,8 @@ class Generator {
   }
 
   static Medium generateMedia({
-    String mediumId,
-    MediumType mediumType,
+    required String mediumId,
+    required MediumType mediumType,
   }) {
     return Medium.fromJson(
       generateMediaJson(mediumId: mediumId, mediumType: mediumType),
@@ -94,28 +93,28 @@ class Generator {
   }
 
   static List<int> generateMockThumbnail({
-    String mediumId,
-    MediumType mediumType,
+    required String mediumId,
+    required MediumType mediumType,
   }) {
     return [1, 2, 3, 4, 5, 6, 7, 8, 9];
   }
 
   static List<int> generateMockAlbumThumbnail({
-    String albumId,
+    required String albumId,
   }) {
     return [1, 2, 3, 4, 5, 6, 7, 8, 9];
   }
 
   static String generateFilePath({
-    String mediumId,
-    MediumType mediumType,
+    required String mediumId,
+    required MediumType mediumType,
   }) {
     return "/path/to/file";
   }
 
   static File generateFile({
-    String mediumId,
-    MediumType mediumType,
+    required String mediumId,
+    required MediumType mediumType,
   }) {
     return File(generateFilePath(mediumId: mediumId, mediumType: mediumType));
   }

test/utils/mock_handler.dart

@@ -11,7 +11,7 @@ Future<dynamic> mockMethodCallHandler(MethodCall call) async {
     return albums;
   } else if (call.method == "listMedia") {
     String albumId = call.arguments['albumId'];
-    MediumType mediumType = jsonToMediumType(call.arguments['mediumType']);
+    MediumType? mediumType = jsonToMediumType(call.arguments['mediumType']);
     int total = call.arguments['total'];
     int skip = call.arguments['skip'];
     int take = call.arguments['take'];