Skip to content

Commit e0749c9

Browse files
committed
Revert "✨ Integrate PermissionRequestOption for callers (#517)"
This reverts commit b702fd6
1 parent 6292580 commit e0749c9

File tree

8 files changed

+14
-115
lines changed

8 files changed

+14
-115
lines changed

example/lib/customs/pickers/insta_asset_picker.dart

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,8 @@ class _InstaAssetPickerState extends State<InstaAssetPicker> {
5959
}
6060

6161
Future<void> callPicker(BuildContext context) async {
62-
final PermissionState ps = await AssetPicker.permissionCheck(
63-
requestOption: PermissionRequestOption(
64-
androidPermission: AndroidPermission(
65-
type: provider.requestType,
66-
mediaLocation: false,
67-
),
68-
),
69-
);
62+
final PermissionState ps = await AssetPicker.permissionCheck();
63+
7064
final InstaAssetPickerBuilder builder = InstaAssetPickerBuilder(
7165
provider: provider,
7266
initialPermission: ps,

example/lib/customs/pickers/multi_tabs_assets_picker.dart

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,7 @@ class _MultiTabAssetPickerState extends State<MultiTabAssetPicker> {
3030
bool isDisplayingDetail = true;
3131

3232
Future<void> callPicker(BuildContext context) async {
33-
final PermissionState ps = await AssetPicker.permissionCheck(
34-
requestOption: const PermissionRequestOption(
35-
androidPermission: AndroidPermission(
36-
type: RequestType.all,
37-
mediaLocation: false,
38-
),
39-
),
40-
);
33+
final PermissionState ps = await AssetPicker.permissionCheck();
4134

4235
final DefaultAssetPickerProvider provider = DefaultAssetPickerProvider(
4336
selectedAssets: entities,

example/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: wechat_assets_picker_demo
22
description: The demo project for the wechat_assets_picker package.
3-
version: 9.0.0+48
3+
version: 8.8.1+48
44
publish_to: none
55

66
environment:

guides/migration_guide.md

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ This document gathered all breaking changes and migrations requirement between m
88

99
## Major versions
1010

11-
- [9.0.0](#900)
1211
- [8.6.0](#860)
1312
- [8.3.0](#830)
1413
- [8.2.0](#820)
@@ -17,65 +16,6 @@ This document gathered all breaking changes and migrations requirement between m
1716
- [6.0.0](#600)
1817
- [5.0.0](#500)
1918

20-
## 9.0.0
21-
22-
### Summary
23-
24-
`PermissionRequestOption` has been added to
25-
`AssetPickerDelegate.permissionCheck` and
26-
`AssetPickerDelegate.pickAssetsWithDelegate` as an argument.
27-
Classes that extend `AssetPickerDelegate` and override these methods must migrate,
28-
Delegates that use `AssetPicker.permissionCheck`
29-
should choose whether to pass the request option.
30-
31-
### Details
32-
33-
Before:
34-
35-
1. ```dart
36-
AssetPicker.permissionCheck();
37-
```
38-
39-
2. ```dart
40-
Future<PermissionState> permissionCheck();
41-
```
42-
43-
3. ```dart
44-
Future<List<Asset>?> pickAssetsWithDelegate<Asset, Path,
45-
PickerProvider extends AssetPickerProvider<Asset, Path>>(
46-
BuildContext context, {
47-
required AssetPickerBuilderDelegate<Asset, Path> delegate,
48-
Key? key,
49-
bool useRootNavigator = true,
50-
AssetPickerPageRouteBuilder<List<Asset>>? pageRouteBuilder,
51-
})
52-
```
53-
54-
After:
55-
56-
1. ```dart
57-
AssetPicker.permissionCheck(requestOption: ...);
58-
```
59-
60-
2. ```dart
61-
Future<PermissionState> permissionCheck({
62-
PermissionRequestOption requestOption = const PermissionRequestOption,
63-
});
64-
```
65-
66-
3. ```dart
67-
Future<List<Asset>?> pickAssetsWithDelegate<Asset, Path,
68-
PickerProvider extends AssetPickerProvider<Asset, Path>>(
69-
BuildContext context, {
70-
required AssetPickerBuilderDelegate<Asset, Path> delegate,
71-
PermissionRequestOption requestOption =
72-
const PermissionRequestOption,
73-
Key? key,
74-
bool useRootNavigator = true,
75-
AssetPickerPageRouteBuilder<List<Asset>>? pageRouteBuilder,
76-
})
77-
```
78-
7919
## 8.6.0
8020

8121
### Summary

lib/src/delegates/asset_picker_delegate.dart

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,8 @@ class AssetPickerDelegate {
2929
/// See also:
3030
/// * [PermissionState] which defined all states of required permissions.
3131
/// {@endtemplate}
32-
Future<PermissionState> permissionCheck({
33-
PermissionRequestOption requestOption = const PermissionRequestOption(),
34-
}) async {
35-
final PermissionState ps = await PhotoManager.requestPermissionExtend(
36-
requestOption: requestOption,
37-
);
32+
Future<PermissionState> permissionCheck() async {
33+
final PermissionState ps = await PhotoManager.requestPermissionExtend();
3834
if (ps != PermissionState.authorized && ps != PermissionState.limited) {
3935
throw StateError('Permission state error with $ps.');
4036
}
@@ -68,14 +64,7 @@ class AssetPickerDelegate {
6864
bool useRootNavigator = true,
6965
AssetPickerPageRouteBuilder<List<AssetEntity>>? pageRouteBuilder,
7066
}) async {
71-
final PermissionState ps = await permissionCheck(
72-
requestOption: PermissionRequestOption(
73-
androidPermission: AndroidPermission(
74-
type: pickerConfig.requestType,
75-
mediaLocation: false,
76-
),
77-
),
78-
);
67+
final PermissionState ps = await permissionCheck();
7968
final AssetPickerPageRoute<List<AssetEntity>> route =
8069
pageRouteBuilder?.call(const SizedBox.shrink()) ??
8170
AssetPickerPageRoute<List<AssetEntity>>(
@@ -145,13 +134,11 @@ class AssetPickerDelegate {
145134
PickerProvider extends AssetPickerProvider<Asset, Path>>(
146135
BuildContext context, {
147136
required AssetPickerBuilderDelegate<Asset, Path> delegate,
148-
PermissionRequestOption permissionRequestOption =
149-
const PermissionRequestOption(),
150137
Key? key,
151138
bool useRootNavigator = true,
152139
AssetPickerPageRouteBuilder<List<Asset>>? pageRouteBuilder,
153140
}) async {
154-
await permissionCheck(requestOption: permissionRequestOption);
141+
await permissionCheck();
155142
final Widget picker = AssetPicker<Asset, Path>(
156143
key: key,
157144
builder: delegate,

lib/src/widget/asset_picker.dart

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,8 @@ class AssetPicker<Asset, Path> extends StatefulWidget {
3131
}
3232

3333
/// {@macro wechat_assets_picker.delegates.AssetPickerDelegate.permissionCheck}
34-
static Future<PermissionState> permissionCheck({
35-
PermissionRequestOption requestOption = const PermissionRequestOption(),
36-
}) {
37-
return _pickerDelegate.permissionCheck(requestOption: requestOption);
34+
static Future<PermissionState> permissionCheck() {
35+
return _pickerDelegate.permissionCheck();
3836
}
3937

4038
/// {@macro wechat_assets_picker.delegates.AssetPickerDelegate.pickAssets}

lib/src/widget/asset_picker_viewer.dart

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,8 @@ class AssetPickerViewer<Asset, Path> extends StatefulWidget {
4141
int? maxAssets,
4242
bool shouldReversePreview = false,
4343
AssetSelectPredicate<AssetEntity>? selectPredicate,
44-
PermissionRequestOption permissionRequestOption =
45-
const PermissionRequestOption(),
4644
}) async {
47-
await AssetPicker.permissionCheck(requestOption: permissionRequestOption);
45+
await AssetPicker.permissionCheck();
4846
final Widget viewer = AssetPickerViewer<AssetEntity, AssetPathEntity>(
4947
builder: DefaultAssetPickerViewerBuilderDelegate(
5048
currentIndex: currentIndex,
@@ -84,10 +82,8 @@ class AssetPickerViewer<Asset, Path> extends StatefulWidget {
8482
static Future<List<A>?> pushToViewerWithDelegate<A, P>(
8583
BuildContext context, {
8684
required AssetPickerViewerBuilderDelegate<A, P> delegate,
87-
PermissionRequestOption permissionRequestOption =
88-
const PermissionRequestOption(),
8985
}) async {
90-
await AssetPicker.permissionCheck(requestOption: permissionRequestOption);
86+
await AssetPicker.permissionCheck();
9187
final Widget viewer = AssetPickerViewer<A, P>(builder: delegate);
9288
final PageRouteBuilder<List<A>> pageRoute = PageRouteBuilder<List<A>>(
9389
pageBuilder: (_, __, ___) => viewer,

test/test_utils.dart

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ class TestPhotoManagerPlugin extends PhotoManagerPlugin {
7373

7474
class TestAssetPickerDelegate extends AssetPickerDelegate {
7575
@override
76-
Future<PermissionState> permissionCheck({
77-
PermissionRequestOption requestOption = const PermissionRequestOption(),
78-
}) async {
76+
Future<PermissionState> permissionCheck() async {
7977
return SynchronousFuture<PermissionState>(PermissionState.authorized);
8078
}
8179

@@ -87,14 +85,7 @@ class TestAssetPickerDelegate extends AssetPickerDelegate {
8785
bool useRootNavigator = true,
8886
AssetPickerPageRouteBuilder<List<AssetEntity>>? pageRouteBuilder,
8987
}) async {
90-
final PermissionState ps = await permissionCheck(
91-
requestOption: PermissionRequestOption(
92-
androidPermission: AndroidPermission(
93-
type: pickerConfig.requestType,
94-
mediaLocation: false,
95-
),
96-
),
97-
);
88+
final PermissionState ps = await permissionCheck();
9889
final AssetPathEntity pathEntity = AssetPathEntity(
9990
id: 'test',
10091
name: 'pathEntity',

0 commit comments

Comments
 (0)