Merge pull request #95 from CaiJingLong/picked-asset-list-

Update picked asset list.

CHANGELOG.md

 # CHANGELOG
 
+## 0.4.7
+
+- Rollback photo_manager.
+- Add `pickedAssetList` for `pickAsset`.
+
 ## 0.4.5+1
 
 Fix:

example/ios/Flutter/Flutter.podspec

+#
+# NOTE: This podspec is NOT to be published. It is only used as a local source!
+#
+
+Pod::Spec.new do |s|
+  s.name             = 'Flutter'
+  s.version          = '1.0.0'
+  s.summary          = 'High-performance, high-fidelity mobile apps.'
+  s.description      = <<-DESC
+Flutter provides an easy and productive way to build and deploy high-performance mobile apps for Android and iOS.
+                       DESC
+  s.homepage         = 'https://flutter.io'
+  s.license          = { :type => 'MIT' }
+  s.author           = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' }
+  s.source           = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s }
+  s.ios.deployment_target = '8.0'
+  s.vendored_frameworks = 'Flutter.framework'
+end

example/ios/Runner.xcodeproj/project.pbxproj

 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
-		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		97C146EE1CF9000F007C117D /* photo_example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = photo_example.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		9DAC079CBB3999833A0EAF83 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		B01AC60EFE8E04B0E4D3E1C1 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		CCE4CADAA52D72A2FD3450C5 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		5CA87AA23185EF26B0BDF0EC /* Pods */ = {
 			isa = PBXGroup;
 			children = (
+				CCE4CADAA52D72A2FD3450C5 /* Pods-Runner.debug.xcconfig */,
+				9DAC079CBB3999833A0EAF83 /* Pods-Runner.release.xcconfig */,
 			);
 			name = Pods;
 			sourceTree = "<group>";
 		97C146EF1CF9000F007C117D /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				97C146EE1CF9000F007C117D /* Runner.app */,
+				97C146EE1CF9000F007C117D /* photo_example.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 			);
 			name = Runner;
 			productName = Runner;
-			productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
+			productReference = 97C146EE1CF9000F007C117D /* photo_example.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
 						CreatedOnToolsVersion = 7.3.1;
+						DevelopmentTeam = 344756CAN4;
 					};
 				};
 			};
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
 				"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-			);
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = 344756CAN4;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.example;
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_BUNDLE_IDENTIFIER = top.kikt.photo.manager;
+				PRODUCT_NAME = photo_example;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = 344756CAN4;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.example;
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_BUNDLE_IDENTIFIER = top.kikt.photo.manager;
+				PRODUCT_NAME = photo_example;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;

example/ios/Runner/Info.plist

 	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>App需要您的同意,才能访问相册</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
-
-	<key>NSPhotoLibraryUsageDescription</key>
-    <string>App需要您的同意,才能访问相册</string>
-
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

example/lib/icon_text_button.dart

+import 'package:flutter/material.dart';
+
+class IconTextButton extends StatelessWidget {
+  final IconData icon;
+  final String text;
+  final Function onTap;
+
+  const IconTextButton({Key key, this.icon, this.text, this.onTap})
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return InkWell(
+      onTap: onTap,
+      child: Container(
+        child: ListTile(
+          leading: Icon(icon ?? Icons.device_unknown),
+          title: Text(text ?? ""),
+        ),
+      ),
+    );
+  }
+}

example/lib/main.dart

 import 'package:photo_manager/photo_manager.dart';
 
 import './preview.dart';
+import 'icon_text_button.dart';
+import 'picked_example.dart';
 
 void main() => runApp(MyApp());
 
       child: MaterialApp(
         title: 'Pick Image Demo',
         theme: ThemeData(
-          primarySwatch: Colors.blue,
+          primarySwatch: Colors.lime,
         ),
         home: MyHomePage(title: 'Pick Image Demo'),
       ),
           child: Column(
             children: <Widget>[
               IconTextButton(
-                  icon: Icons.photo,
-                  text: "photo",
-                  onTap: () => _pickAsset(PickType.onlyImage)),
+                icon: Icons.photo,
+                text: "photo",
+                onTap: () => _pickAsset(PickType.onlyImage),
+              ),
+              IconTextButton(
+                icon: Icons.videocam,
+                text: "video",
+                onTap: () => _pickAsset(PickType.onlyVideo),
+              ),
               IconTextButton(
-                  icon: Icons.videocam,
-                  text: "video",
-                  onTap: () => _pickAsset(PickType.onlyVideo)),
+                icon: Icons.album,
+                text: "all",
+                onTap: () => _pickAsset(PickType.all),
+              ),
               IconTextButton(
-                  icon: Icons.album,
-                  text: "all",
-                  onTap: () => _pickAsset(PickType.all)),
-              Text(
-                '$currentSelected',
-                textAlign: TextAlign.center,
+                icon: CupertinoIcons.reply_all,
+                text: "Picked asset example.",
+                onTap: () => routePage(PickedExample()),
               ),
             ],
           ),
     }
     setState(() {});
   }
-}
-
-class IconTextButton extends StatelessWidget {
-  final IconData icon;
-  final String text;
-  final Function onTap;
 
-  const IconTextButton({Key key, this.icon, this.text, this.onTap})
-      : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return InkWell(
-      onTap: onTap,
-      child: Container(
-        child: ListTile(
-          leading: Icon(icon ?? Icons.device_unknown),
-          title: Text(text ?? ""),
-        ),
+  void routePage(Widget widget) {
+    Navigator.push(
+      context,
+      MaterialPageRoute(
+        builder: (BuildContext context) {
+          return widget;
+        },
       ),
     );
   }

example/lib/picked_example.dart

+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:photo/photo.dart';
+
+import 'icon_text_button.dart';
+import 'package:photo_manager/photo_manager.dart';
+
+class PickedExample extends StatefulWidget {
+  @override
+  _PickedExampleState createState() => _PickedExampleState();
+}
+
+class _PickedExampleState extends State<PickedExample> {
+  List<AssetEntity> picked = [];
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text("Cross Picked asset"),
+      ),
+      body: Column(
+        children: <Widget>[
+          IconTextButton(
+            icon: Icons.assignment,
+            text: "Pick asset",
+            onTap: _pickAsset,
+          ),
+          ListTile(
+            title: Text("picked asset count = ${picked.length}"),
+          ),
+        ],
+      ),
+    );
+  }
+
+  void _pickAsset() async {
+    final result = await PhotoPicker.pickAsset(
+      context: context,
+      pickedAssetList: picked,
+    );
+    if (result != null && result.isNotEmpty) {
+      picked.clear();
+      picked.addAll(result);
+      setState(() {});
+    }
+  }
+}

lib/photo.dart

   ///
   ///   [photoPathList] 一旦设置 则 [pickType]参数无效
   ///
+  ///   [pickedAssetList] 已选择的asset
+  ///
   /// 关于参数可以查看readme文档介绍
   ///
   /// if user not grand permission, then return null and show a dialog to help user open setting.
   ///
   ///   when [photoPathList] is not null , [pickType] invalid
   ///
+  ///   [pickedAssetList]: The results of the last selection can be passed in for easy secondary selection.
+  ///
   /// params see readme.md
   static Future<List<AssetEntity>> pickAsset({
     @required BuildContext context,
     PickType pickType = PickType.all,
     BadgeDelegate badgeDelegate = const DefaultBadgeDelegate(),
     List<AssetPathEntity> photoPathList,
+    List<AssetEntity> pickedAssetList,
   }) {
     assert(provider != null, "provider must be not null");
     assert(context != null, "context must be not null");
       options,
       provider,
       photoPathList,
+      pickedAssetList,
     );
   }
 
     Options options,
     I18nProvider provider,
     List<AssetPathEntity> photoList,
+    List<AssetEntity> pickedAssetList,
   ) async {
     var requestPermission = await PhotoManager.requestPermission();
     if (requestPermission != true) {
       return null;
     }
 
-    return _openGalleryContentPage(context, options, provider, photoList);
+    return _openGalleryContentPage(
+      context,
+      options,
+      provider,
+      photoList,
+      pickedAssetList,
+    );
   }
 
   Future<List<AssetEntity>> _openGalleryContentPage(
     Options options,
     I18nProvider provider,
     List<AssetPathEntity> photoList,
+    List<AssetEntity> pickedAssetList,
   ) async {
     return Navigator.of(context, rootNavigator: true).push(
       MaterialPageRoute(
           options: options,
           provider: provider,
           photoList: photoList,
+          pickedAssetList: pickedAssetList,
         ),
       ),
     );

lib/src/provider/config_provider.dart

 import 'package:photo/src/entity/options.dart';
 import 'package:photo/src/provider/asset_provider.dart';
 import 'package:photo/src/provider/i18n_provider.dart';
+import 'package:photo_manager/photo_manager.dart';
 
 class PhotoPickerProvider extends InheritedWidget {
   final Options options;
   final I18nProvider provider;
   final AssetProvider assetProvider = AssetProvider();
-
+  final List<AssetEntity> pickedAssetList;
   PhotoPickerProvider({
     @required this.options,
     @required this.provider,
     @required Widget child,
+    this.pickedAssetList,
     Key key,
   }) : super(key: key, child: child);
 

lib/src/provider/selected_provider.dart

       return notExistsList.contains(e);
     });
   }
+
+  addPickedAsset(List<AssetEntity> list) {
+    for (final entity in list) {
+      addSelectEntity(entity);
+    }
+  }
 }

lib/src/ui/page/photo_main_page.dart

   void didChangeDependencies() {
     super.didChangeDependencies();
     if (!_isInit) {
+      addPickedAsset(PhotoPickerProvider.of(context).pickedAssetList.toList());
       _refreshList();
     }
   }

lib/src/ui/photo_app.dart

   final Options options;
   final I18nProvider provider;
   final List<AssetPathEntity> photoList;
+  final List<AssetEntity> pickedAssetList;
   const PhotoApp({
     Key key,
     this.options,
     this.provider,
     this.photoList,
+    this.pickedAssetList,
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    return PhotoPickerProvider(
+    final pickerProvider = PhotoPickerProvider(
       provider: provider,
       options: options,
+      pickedAssetList: pickedAssetList,
       child: PhotoMainPage(
         onClose: (List<AssetEntity> value) {
           Navigator.pop(context, value);
         photoList: photoList,
       ),
     );
+
+    return pickerProvider;
   }
 }

pubspec.lock

     dependency: transitive
     description:
       name: archive
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.11"
   args:
     dependency: transitive
     description:
       name: args
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.5.2"
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.4.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.5"
   charcode:
     dependency: transitive
     description:
       name: charcode
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.2"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.14.11"
   convert:
     dependency: transitive
     description:
       name: convert
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.1"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.3"
   flutter:
     dependency: transitive
     description:
       name: image
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.4"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.6"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.8"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.6.4"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.0+1"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.4.0"
   photo_manager:
     dependency: "direct main"
     description:
       name: photo_manager
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.5"
+    version: "0.4.7"
   quiver:
     dependency: transitive
     description:
       name: quiver
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.5"
   sky_engine:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.5.5"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.9.3"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.5"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.11"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.6"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.8"
   xml:
     dependency: transitive
     description:
       name: xml
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.5.0"
 sdks:

pubspec.yaml

 name: photo
 description: image picker, multi picker support video/icloud asset, use flutter as ui, if you want to build custom ui, you just use photo_manager.
-version: 0.4.5+1
+version: 0.4.6
 author: caijinglong<cjl_spy@163.com>
 homepage: https://github.com/CaiJingLong/flutter_photo
 
   flutter:
     sdk: flutter
 
-  photo_manager: ^0.4.5
+  photo_manager: ^0.4.7
   # photo_manager:
   #   git:
   #     url: https://github.com/CaiJingLong/flutter_photo_manager.git