Skip to content

Commit 962edd7

Browse files
committed
🚀 Migrate to the latest PM
1 parent 71a92f5 commit 962edd7

10 files changed

+14
-220
lines changed

example/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies:
1515

1616
wechat_assets_picker:
1717
path: ../
18-
wechat_camera_picker: ^2.6.2
18+
wechat_camera_picker: ^3.0.0-dev.1
1919

2020
extended_image: ^6.0.1
2121
package_info_plus: ^1.3.0

lib/src/delegates/asset_picker_builder_delegate.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import '../constants/constants.dart';
2020
import '../constants/enums.dart';
2121
import '../constants/extensions.dart';
2222
import '../delegates/assets_picker_text_delegate.dart';
23-
import '../provider/asset_entity_image_provider.dart';
2423
import '../provider/asset_picker_provider.dart';
2524
import '../widget/asset_picker.dart';
2625
import '../widget/asset_picker_viewer.dart';

lib/src/delegates/asset_picker_viewer_builder_delegate.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import '../constants/custom_scroll_physics.dart';
1717
import '../constants/enums.dart';
1818
import '../constants/extensions.dart';
1919
import '../delegates/asset_picker_builder_delegate.dart';
20-
import '../provider/asset_entity_image_provider.dart';
2120
import '../provider/asset_picker_provider.dart';
2221
import '../provider/asset_picker_viewer_provider.dart';
2322
import '../widget/asset_picker_viewer.dart';

lib/src/provider/asset_entity_image_provider.dart

Lines changed: 0 additions & 201 deletions
This file was deleted.

lib/src/provider/asset_picker_provider.dart

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -341,23 +341,22 @@ class DefaultAssetPickerProvider
341341

342342
@override
343343
Future<void> getAssetsFromEntity(int page, AssetPathEntity pathEntity) async {
344-
_currentAssets = (await pathEntity.getAssetListPaged(
345-
page,
346-
pageSize,
347-
))
348-
.toList();
344+
final List<AssetEntity> list = await pathEntity.getAssetListPaged(
345+
page: page,
346+
size: pageSize,
347+
);
348+
_currentAssets = List<AssetEntity>.of(list);
349349
_hasAssetsToDisplay = currentAssets.isNotEmpty;
350350
notifyListeners();
351351
}
352352

353353
@override
354354
Future<void> loadMoreAssets() async {
355-
final List<AssetEntity> assets =
356-
(await currentPathEntity!.getAssetListPaged(
357-
currentAssetsListPage,
358-
pageSize,
359-
))
360-
.toList();
355+
final List<AssetEntity> list = await currentPathEntity!.getAssetListPaged(
356+
page: currentAssetsListPage,
357+
size: pageSize,
358+
);
359+
final List<AssetEntity> assets = List<AssetEntity>.of(list);
361360
if (assets.isNotEmpty && currentAssets.contains(assets[0])) {
362361
return;
363362
}

lib/src/widget/builder/asset_entity_grid_item_builder.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
///
55
import 'package:extended_image/extended_image.dart';
66
import 'package:flutter/material.dart';
7+
import 'package:photo_manager/photo_manager.dart';
78

89
import '../../constants/constants.dart';
9-
import '../../provider/asset_entity_image_provider.dart';
1010
import '../../widget/scale_text.dart';
1111

1212
class AssetEntityGridItemBuilder extends StatefulWidget {

lib/src/widget/builder/image_page_builder.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import 'package:flutter/material.dart';
77
import 'package:photo_manager/photo_manager.dart';
88

99
import '../../delegates/asset_picker_viewer_builder_delegate.dart';
10-
import '../../provider/asset_entity_image_provider.dart';
1110
import 'locally_available_builder.dart';
1211

1312
class ImagePageBuilder extends StatefulWidget {

lib/src/widget/builder/locally_available_builder.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class _LocallyAvailableBuilderState extends State<LocallyAvailableBuilder> {
6767
Widget _indicator(BuildContext context) {
6868
return StreamBuilder<PMProgressState>(
6969
stream: _progressHandler!.stream,
70-
initialData: PMProgressState(0, PMRequestState.prepare),
70+
initialData: const PMProgressState(0, PMRequestState.prepare),
7171
builder: (BuildContext c, AsyncSnapshot<PMProgressState> s) {
7272
if (s.hasData) {
7373
final double progress = s.data!.progress;

lib/wechat_assets_picker.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ export 'src/delegates/asset_picker_builder_delegate.dart';
77
export 'src/delegates/asset_picker_viewer_builder_delegate.dart';
88
export 'src/delegates/assets_picker_text_delegate.dart';
99
export 'src/delegates/sort_path_delegate.dart';
10-
export 'src/provider/asset_entity_image_provider.dart';
1110
export 'src/provider/asset_picker_provider.dart';
1211
export 'src/provider/asset_picker_viewer_provider.dart';
1312
export 'src/widget/asset_picker.dart';

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ dependencies:
1212
sdk: flutter
1313

1414
extended_image: ^6.0.1
15-
photo_manager: ^1.3.10
15+
photo_manager: ^2.0.0-dev.2
1616
provider: ^6.0.1
1717
video_player: ^2.2.7

0 commit comments

Comments
 (0)