From 924dc92946e28bde86931d502ce190aa756b8692 Mon Sep 17 00:00:00 2001 From: Wenqi Li Date: Mon, 25 Mar 2024 21:17:22 +0800 Subject: [PATCH] reformat code --- example/lib/main.dart | 14 ++++++++++---- lib/photo_gallery.dart | 4 +++- .../image_providers/album_thumbnail_provider.dart | 9 +++++++-- lib/src/image_providers/photo_provider.dart | 8 ++++++-- lib/src/image_providers/thumbnail_provider.dart | 9 +++++++-- lib/src/models/media_page.dart | 2 +- test/photo_gallery_test.dart | 11 ++++++++--- test/utils/generator.dart | 10 ++++++++-- test/utils/mock_handler.dart | 5 ++++- 9 files changed, 54 insertions(+), 18 deletions(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index 56fcb85..74fd344 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -43,7 +43,8 @@ class _MyAppState extends State { Future _promptPermissionSetting() async { if (Platform.isIOS) { - if (await Permission.photos.request().isGranted || await Permission.storage.request().isGranted) { + if (await Permission.photos.request().isGranted || + await Permission.storage.request().isGranted) { return true; } } @@ -84,7 +85,9 @@ class _MyAppState extends State { ...?_albums?.map( (album) => GestureDetector( onTap: () => Navigator.of(context).push( - MaterialPageRoute(builder: (context) => AlbumPage(album)), + MaterialPageRoute( + builder: (context) => AlbumPage(album), + ), ), child: Column( children: [ @@ -96,7 +99,8 @@ class _MyAppState extends State { width: gridWidth, child: FadeInImage( fit: BoxFit.cover, - placeholder: MemoryImage(kTransparentImage), + placeholder: + MemoryImage(kTransparentImage), image: AlbumThumbnailProvider( album: album, highQuality: true, @@ -308,7 +312,9 @@ class _VideoProviderState extends State { TextButton( onPressed: () { setState(() { - _controller!.value.isPlaying ? _controller!.pause() : _controller!.play(); + _controller!.value.isPlaying + ? _controller!.pause() + : _controller!.play(); }); }, child: Icon( diff --git a/lib/photo_gallery.dart b/lib/photo_gallery.dart index dced3ad..4623539 100644 --- a/lib/photo_gallery.dart +++ b/lib/photo_gallery.dart @@ -33,7 +33,9 @@ class PhotoGallery { 'mediumType': mediumTypeToJson(mediumType), 'hideIfEmpty': hideIfEmpty, }); - return json.map((album) => Album.fromJson(album, mediumType, newest)).toList(); + return json + .map((album) => Album.fromJson(album, mediumType, newest)) + .toList(); } /// List all available media in a specific album, support pagination of media diff --git a/lib/src/image_providers/album_thumbnail_provider.dart b/lib/src/image_providers/album_thumbnail_provider.dart index 7759618..c9d8188 100644 --- a/lib/src/image_providers/album_thumbnail_provider.dart +++ b/lib/src/image_providers/album_thumbnail_provider.dart @@ -33,7 +33,10 @@ class AlbumThumbnailProvider extends ImageProvider { ); } - Future _loadAsync(AlbumThumbnailProvider key, ImageDecoderCallback decode) async { + Future _loadAsync( + AlbumThumbnailProvider key, + ImageDecoderCallback decode, + ) async { assert(key == this); late ui.ImmutableBuffer buffer; try { @@ -47,7 +50,9 @@ class AlbumThumbnailProvider extends ImageProvider { ); buffer = await ui.ImmutableBuffer.fromUint8List(Uint8List.fromList(data)); } catch (e) { - buffer = await ui.ImmutableBuffer.fromAsset("packages/photo_gallery/images/grey.bmp"); + buffer = await ui.ImmutableBuffer.fromAsset( + "packages/photo_gallery/images/grey.bmp", + ); } return decode(buffer); } diff --git a/lib/src/image_providers/photo_provider.dart b/lib/src/image_providers/photo_provider.dart index 8d6913e..6a16842 100644 --- a/lib/src/image_providers/photo_provider.dart +++ b/lib/src/image_providers/photo_provider.dart @@ -25,11 +25,15 @@ class PhotoProvider extends ImageProvider { ); } - Future _loadAsync(PhotoProvider key, ImageDecoderCallback decode) async { + Future _loadAsync( + PhotoProvider key, + ImageDecoderCallback decode, + ) async { assert(key == this); final file = await PhotoGallery.getFile( mediumId: mediumId, mediumType: MediumType.image, mimeType: mimeType); - ui.ImmutableBuffer buffer = await ui.ImmutableBuffer.fromFilePath(file.path); + ui.ImmutableBuffer buffer = + await ui.ImmutableBuffer.fromFilePath(file.path); return decode(buffer); } diff --git a/lib/src/image_providers/thumbnail_provider.dart b/lib/src/image_providers/thumbnail_provider.dart index 52f73ec..b94d36f 100644 --- a/lib/src/image_providers/thumbnail_provider.dart +++ b/lib/src/image_providers/thumbnail_provider.dart @@ -37,7 +37,10 @@ class ThumbnailProvider extends ImageProvider { ); } - Future _loadAsync(ThumbnailProvider key, ImageDecoderCallback decode) async { + Future _loadAsync( + ThumbnailProvider key, + ImageDecoderCallback decode, + ) async { assert(key == this); late ui.ImmutableBuffer buffer; try { @@ -50,7 +53,9 @@ class ThumbnailProvider extends ImageProvider { ); buffer = await ui.ImmutableBuffer.fromUint8List(Uint8List.fromList(data)); } catch (e) { - buffer = await ui.ImmutableBuffer.fromAsset("packages/photo_gallery/images/grey.bmp"); + buffer = await ui.ImmutableBuffer.fromAsset( + "packages/photo_gallery/images/grey.bmp", + ); } return decode(buffer); } diff --git a/lib/src/models/media_page.dart b/lib/src/models/media_page.dart index e19b9ad..cf1fb2b 100644 --- a/lib/src/models/media_page.dart +++ b/lib/src/models/media_page.dart @@ -33,7 +33,7 @@ class MediaPage { album: album, skip: end, take: items.length, - lightWeight: lightWeight + lightWeight: lightWeight, ); } diff --git a/test/photo_gallery_test.dart b/test/photo_gallery_test.dart index 312effd..25e9b5f 100644 --- a/test/photo_gallery_test.dart +++ b/test/photo_gallery_test.dart @@ -13,14 +13,16 @@ void main() { TestWidgetsFlutterBinding.ensureInitialized(); setUp(() { - TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler( + TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger + .setMockMethodCallHandler( channel, mockMethodCallHandler, ); }); tearDown(() { - TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler( + TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger + .setMockMethodCallHandler( channel, null, ); @@ -30,7 +32,10 @@ void main() { MediumType mediumType = MediumType.image; bool newest = true; var result = await PhotoGallery.listAlbums(mediumType: mediumType); - var expected = Generator.generateAlbums(mediumType: mediumType, newest: newest); + var expected = Generator.generateAlbums( + mediumType: mediumType, + newest: newest, + ); expect(result, expected); }); diff --git a/test/utils/generator.dart b/test/utils/generator.dart index 5f7eb91..a3b92c8 100644 --- a/test/utils/generator.dart +++ b/test/utils/generator.dart @@ -25,7 +25,10 @@ class Generator { ]; } - static List generateAlbums({MediumType? mediumType, bool newest = true}) { + static List generateAlbums({ + MediumType? mediumType, + bool newest = true, + }) { return Generator.generateAlbumsJson(mediumType: mediumType, newest: newest) .map((x) => Album.fromJson(x, mediumType, newest)) .toList(); @@ -42,7 +45,10 @@ class Generator { var items = []; int index = skip; while (index < skip + take) { - items.add(generateMediaJson(mediumId: index.toString(), mediumType: mediumType)); + items.add(generateMediaJson( + mediumId: index.toString(), + mediumType: mediumType, + )); index++; } diff --git a/test/utils/mock_handler.dart b/test/utils/mock_handler.dart index f5a1c5b..cf42510 100644 --- a/test/utils/mock_handler.dart +++ b/test/utils/mock_handler.dart @@ -8,7 +8,10 @@ Future mockMethodCallHandler(MethodCall call) async { if (call.method == "listAlbums") { MediumType? mediumType = jsonToMediumType(call.arguments['mediumType']); bool newest = call.arguments['newest']; - dynamic albums = Generator.generateAlbumsJson(mediumType: mediumType, newest: newest); + dynamic albums = Generator.generateAlbumsJson( + mediumType: mediumType, + newest: newest, + ); return albums; } else if (call.method == "listMedia") { String albumId = call.arguments['albumId'];