♻️ More migrations (#258)

Author: AlexV525

example/lib/pages/multi_assets_page.dart

@@ -83,8 +83,8 @@ class _MultiAssetsPageState extends State<MultiAssetsPage>
               maxAssets: maxAssetsCount,
               selectedAssets: assets,
               requestType: RequestType.image,
-              previewThumbSize: const <int>[150, 150],
-              gridThumbSize: 80,
+              gridThumbnailSize: const ThumbnailSize.square(80),
+              previewThumbnailSize: const ThumbnailSize.square(150),
             ),
           );
         },

lib/src/constants/config.dart

@@ -16,11 +16,11 @@ class AssetPickerConfig {
     this.selectedAssets,
     this.maxAssets = 9,
     this.pageSize = 80,
-    this.gridThumbSize = defaultAssetGridPreviewSize,
-    this.previewThumbSize,
+    this.gridThumbnailSize = defaultAssetGridPreviewSize,
+    this.pathThumbnailSize = defaultPathThumbnailSize,
+    this.previewThumbnailSize,
     this.specialPickerType,
     this.keepScrollOffset = false,
-    this.pathThumbSize = 80,
     this.requestType = RequestType.common,
     this.sortPathDelegate,
     this.filterOptions,
@@ -82,7 +82,11 @@ class AssetPickerConfig {
   /// This cannot be `null` or a large value since you shouldn't use the
   /// original data for the grid.
   /// 该值不能为空或者非常大，因为在网格中使用原数据不是一个好的决定。
-  final int gridThumbSize;
+  final ThumbnailSize gridThumbnailSize;
+
+  /// Thumbnail size for path selector.
+  /// 路径选择器中缩略图的大小
+  final ThumbnailSize pathThumbnailSize;
 
   /// Preview thumbnail size in the viewer.
   /// 预览时图片的缩略图大小
@@ -94,7 +98,7 @@ class AssetPickerConfig {
   ///
   /// Default is `null`, which will request the origin data.
   /// 默认为空，即读取原图。
-  final List<int>? previewThumbSize;
+  final ThumbnailSize? previewThumbnailSize;
 
   /// The current special picker type for the picker.
   /// 当前特殊选择类型
@@ -114,10 +118,6 @@ class AssetPickerConfig {
   /// 选择器是否可以从同样的位置开始选择
   final bool keepScrollOffset;
 
-  /// Thumb size for path selector.
-  /// 路径选择器中缩略图的大小
-  final int pathThumbSize;
-
   /// Request assets type.
   /// 请求的资源类型
   final RequestType requestType;

lib/src/constants/constants.dart

@@ -3,8 +3,10 @@
 /// [Date] 2020/3/31 16:02
 ///
 import 'package:flutter/painting.dart';
+import 'package:photo_manager/photo_manager.dart';
 
 /// Default theme color from WeChat.
 const Color defaultThemeColorWeChat = Color(0xff00bc56);
 
-const int defaultAssetGridPreviewSize = 200;
+const ThumbnailSize defaultAssetGridPreviewSize = ThumbnailSize.square(200);
+const ThumbnailSize defaultPathThumbnailSize = ThumbnailSize.square(80);

lib/src/delegates/asset_picker_builder_delegate.dart

@@ -673,8 +673,8 @@ class DefaultAssetPickerBuilderDelegate
     bool allowSpecialItemWhenEmpty = false,
     AssetSelectPredicate<AssetEntity>? selectPredicate,
     bool? shouldRevertGrid,
-    this.gridThumbSize = defaultAssetGridPreviewSize,
-    this.previewThumbSize,
+    this.gridThumbnailSize = defaultAssetGridPreviewSize,
+    this.previewThumbnailSize,
     this.specialPickerType,
     this.keepScrollOffset = false,
     Color? themeColor,
@@ -719,7 +719,7 @@ class DefaultAssetPickerBuilderDelegate
   /// This cannot be `null` or a large value since you shouldn't use the
   /// original data for the grid.
   /// 该值不能为空或者非常大，因为在网格中使用原数据不是一个好的决定。
-  final int gridThumbSize;
+  final ThumbnailSize gridThumbnailSize;
 
   /// Preview thumbnail size in the viewer.
   /// 预览时图片的缩略图大小
@@ -731,7 +731,7 @@ class DefaultAssetPickerBuilderDelegate
   ///
   /// Default is `null`, which will request the origin data.
   /// 默认为空，即读取原图。
-  final List<int>? previewThumbSize;
+  final ThumbnailSize? previewThumbnailSize;
 
   /// The current special picker type for the picker.
   /// 当前特殊选择类型
@@ -880,7 +880,7 @@ class DefaultAssetPickerBuilderDelegate
       currentIndex: _index,
       previewAssets: _current,
       themeData: theme,
-      previewThumbSize: previewThumbSize,
+      previewThumbnailSize: previewThumbnailSize,
       selectedAssets: _selected,
       selectorProvider: provider,
       specialPickerType: specialPickerType,
@@ -1506,7 +1506,7 @@ class DefaultAssetPickerBuilderDelegate
     final AssetEntityImageProvider imageProvider = AssetEntityImageProvider(
       asset,
       isOriginal: false,
-      thumbSize: <int>[gridThumbSize, gridThumbSize],
+      thumbnailSize: gridThumbnailSize,
     );
     SpecialImageType? type;
     if (imageProvider.imageFileType == ImageFileType.gif) {
@@ -1892,7 +1892,7 @@ class DefaultAssetPickerBuilderDelegate
         context,
         currentIndex: 0,
         previewAssets: _selected,
-        previewThumbSize: previewThumbSize,
+        previewThumbnailSize: previewThumbnailSize,
         selectedAssets: _selected,
         selectorProvider: provider,
         themeData: theme,

lib/src/delegates/asset_picker_viewer_builder_delegate.dart

@@ -27,7 +27,6 @@ import '../widget/builder/fade_image_builder.dart';
 import '../widget/builder/image_page_builder.dart';
 import '../widget/builder/value_listenable_builder_2.dart';
 import '../widget/builder/video_page_builder.dart';
-import '../widget/custom_checkbox.dart';
 import '../widget/scale_text.dart';
 
 abstract class AssetPickerViewerBuilderDelegate<Asset, Path> {
@@ -365,7 +364,7 @@ class DefaultAssetPickerViewerBuilderDelegate
     required ThemeData themeData,
     AssetPickerViewerProvider<AssetEntity>? provider,
     List<AssetEntity>? selectedAssets,
-    this.previewThumbSize,
+    this.previewThumbnailSize,
     this.specialPickerType,
     int? maxAssets,
     bool shouldReversePreview = false,
@@ -384,7 +383,7 @@ class DefaultAssetPickerViewerBuilderDelegate
 
   /// Thumb size for the preview of images in the viewer.
   /// 预览时图片的缩略图大小
-  final List<int>? previewThumbSize;
+  final ThumbnailSize? previewThumbnailSize;
 
   /// The current special picker type for the viewer.
   /// 当前特殊选择类型
@@ -417,7 +416,7 @@ class DefaultAssetPickerViewerBuilderDelegate
         _builder = ImagePageBuilder(
           asset: asset,
           delegate: this,
-          previewThumbSize: previewThumbSize,
+          previewThumbnailSize: previewThumbnailSize,
         );
         break;
       case AssetType.video:
@@ -917,7 +916,7 @@ class DefaultAssetPickerViewerBuilderDelegate
     bool isSelected,
     AssetEntity asset,
   ) {
-    return CustomCheckbox(
+    return Checkbox(
       value: isSelected,
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.circular(999999),

lib/src/provider/asset_picker_provider.dart

@@ -8,19 +8,21 @@ import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:photo_manager/photo_manager.dart';
 
+import '../constants/constants.dart';
 import '../delegates/sort_path_delegate.dart';
 import '../internal/singleton.dart';
 
 /// [ChangeNotifier] for assets picker.
 ///
 /// The provider maintain all methods that control assets and paths.
 /// By extending it you can customize how you can get all assets or paths,
-/// how to fetch the next page of assets, how to get the thumb data of a path.
+/// how to fetch the next page of assets,
+/// and how to get the thumbnail data of a path.
 abstract class AssetPickerProvider<Asset, Path> extends ChangeNotifier {
   AssetPickerProvider({
     this.maxAssets = 9,
     this.pageSize = 320,
-    this.pathThumbSize = 80,
+    this.pathThumbnailSize = defaultPathThumbnailSize,
     List<Asset>? selectedAssets,
   }) {
     if (selectedAssets?.isNotEmpty == true) {
@@ -38,9 +40,9 @@ abstract class AssetPickerProvider<Asset, Path> extends ChangeNotifier {
   /// Use `null` to display all assets into a single grid.
   final int pageSize;
 
-  /// Thumb size for path selector.
+  /// Thumbnail size for path selector.
   /// 路径选择器中缩略图的大小
-  final int pathThumbSize;
+  final ThumbnailSize pathThumbnailSize;
 
   /// Clear all fields when dispose.
   /// 销毁时重置所有内容
@@ -125,8 +127,9 @@ abstract class AssetPickerProvider<Asset, Path> extends ChangeNotifier {
   /// Map for all path entity.
   /// 所有包含资源的路径里列表
   ///
-  /// Using [Map] in order to save the thumb data for the first asset under the path.
-  /// 使用[Map]来保存路径下第一个资源的缩略图数据
+  /// Using [Map] in order to save the thumbnail data
+  /// for the first asset under the path.
+  /// 使用 [Map] 来保存路径下第一个资源的缩略图数据
   Map<Path, Uint8List?> get pathsList => _pathsList;
   final Map<Path, Uint8List?> _pathsList = <Path, Uint8List?>{};
 
@@ -231,11 +234,11 @@ class DefaultAssetPickerProvider
     this.filterOptions,
     int maxAssets = 9,
     int pageSize = 80,
-    int pathThumbSize = 80,
+    ThumbnailSize pathThumbnailSize = const ThumbnailSize.square(80),
   }) : super(
           maxAssets: maxAssets,
           pageSize: pageSize,
-          pathThumbSize: pathThumbSize,
+          pathThumbnailSize: pathThumbnailSize,
           selectedAssets: selectedAssets,
         ) {
     Singleton.sortPathDelegate = sortPathDelegate ?? SortPathDelegate.common;
@@ -383,9 +386,8 @@ class DefaultAssetPickerProvider
     );
     final AssetEntity asset =
         (await path.getAssetListRange(start: 0, end: 1)).single;
-    final Uint8List? assetData = await asset.thumbDataWithSize(
-      pathThumbSize,
-      pathThumbSize,
+    final Uint8List? assetData = await asset.thumbnailDataWithSize(
+      pathThumbnailSize,
     );
     return assetData;
   }

lib/src/widget/asset_picker.dart

@@ -40,7 +40,7 @@ class AssetPicker<Asset, Path> extends StatefulWidget {
     final DefaultAssetPickerProvider provider = DefaultAssetPickerProvider(
       maxAssets: pickerConfig.maxAssets,
       pageSize: pickerConfig.pageSize,
-      pathThumbSize: pickerConfig.pathThumbSize,
+      pathThumbnailSize: pickerConfig.pathThumbnailSize,
       selectedAssets: pickerConfig.selectedAssets,
       requestType: pickerConfig.requestType,
       sortPathDelegate: pickerConfig.sortPathDelegate,
@@ -53,8 +53,8 @@ class AssetPicker<Asset, Path> extends StatefulWidget {
         initialPermission: _ps,
         gridCount: pickerConfig.gridCount,
         pickerTheme: pickerConfig.pickerTheme,
-        gridThumbSize: pickerConfig.gridThumbSize,
-        previewThumbSize: pickerConfig.previewThumbSize,
+        gridThumbnailSize: pickerConfig.gridThumbnailSize,
+        previewThumbnailSize: pickerConfig.previewThumbnailSize,
         specialPickerType: pickerConfig.specialPickerType,
         specialItemPosition: pickerConfig.specialItemPosition,
         specialItemBuilder: pickerConfig.specialItemBuilder,

lib/src/widget/asset_picker_viewer.dart

@@ -34,7 +34,7 @@ class AssetPickerViewer<Asset, Path> extends StatefulWidget {
     required List<AssetEntity> previewAssets,
     required ThemeData themeData,
     DefaultAssetPickerProvider? selectorProvider,
-    List<int>? previewThumbSize,
+    ThumbnailSize? previewThumbnailSize,
     List<AssetEntity>? selectedAssets,
     SpecialPickerType? specialPickerType,
     int? maxAssets,
@@ -50,7 +50,7 @@ class AssetPickerViewer<Asset, Path> extends StatefulWidget {
             ? AssetPickerViewerProvider<AssetEntity>(selectedAssets)
             : null,
         themeData: themeData,
-        previewThumbSize: previewThumbSize,
+        previewThumbnailSize: previewThumbnailSize,
         specialPickerType: specialPickerType,
         selectedAssets: selectedAssets,
         selectorProvider: selectorProvider,

lib/src/widget/builder/asset_entity_grid_item_builder.dart

@@ -49,7 +49,7 @@ class AssetEntityGridItemWidgetState extends State<AssetEntityGridItemBuilder> {
     );
   }
 
-  /// Item widgets when the thumb data load failed.
+  /// Item widgets when the thumbnail data load failed.
   /// 资源缩略数据加载失败时使用的部件
   Widget failedItemBuilder(BuildContext context) {
     return Center(

lib/src/widget/builder/image_page_builder.dart

@@ -16,7 +16,7 @@ class ImagePageBuilder extends StatefulWidget {
     Key? key,
     required this.asset,
     required this.delegate,
-    this.previewThumbSize,
+    this.previewThumbnailSize,
   }) : super(key: key);
 
   /// Asset currently displayed.
@@ -25,7 +25,7 @@ class ImagePageBuilder extends StatefulWidget {
 
   final AssetPickerViewerBuilderDelegate<AssetEntity, AssetPathEntity> delegate;
 
-  final List<int>? previewThumbSize;
+  final ThumbnailSize? previewThumbnailSize;
 
   @override
   _ImagePageBuilderState createState() => _ImagePageBuilderState();
@@ -80,8 +80,8 @@ class _ImagePageBuilderState extends State<ImagePageBuilder> {
     return ExtendedImage(
       image: AssetEntityImageProvider(
         asset,
-        isOriginal: widget.previewThumbSize == null,
-        thumbSize: widget.previewThumbSize,
+        isOriginal: widget.previewThumbnailSize == null,
+        thumbnailSize: widget.previewThumbnailSize,
       ),
       fit: BoxFit.contain,
       mode: ExtendedImageMode.gesture,
@@ -111,7 +111,7 @@ class _ImagePageBuilderState extends State<ImagePageBuilder> {
   Widget build(BuildContext context) {
     return LocallyAvailableBuilder(
       asset: widget.asset,
-      isOriginal: widget.previewThumbSize == null,
+      isOriginal: widget.previewThumbnailSize == null,
       builder: (BuildContext context, AssetEntity asset) {
         // Initialize the video controller when the asset is a Live photo
         // and available for further use.