Adding Video Capability to image_picker

.gitignore

@@ -12,4 +12,6 @@ GeneratedPluginRegistrant.m
 
 GeneratedPluginRegistrant.java
 
-.dart_tool
+.dart_tool
+packages/image_picker/.vscode/launch.json
+packages/image_picker/.vscode/settings.json

packages/image_picker/CHANGELOG.md

@@ -1,7 +1,7 @@
 ## 0.4.2
 
-* Added Video Capability with `pickVideo`. 
-* Updated Example for Preview of Video Captured
+* Added support for picking videos.
+* Updated example app to show video preview.
 
 ## 0.4.1
 

packages/image_picker/android/.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

packages/image_picker/android/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>image_picker</name>
+	<comment>Project image_picker created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>

packages/image_picker/android/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,2 @@
+#Thu May 24 08:04:53 EDT 2018
+connection.project.dir=../example/android

packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java

@@ -180,8 +180,6 @@ public void onScanCompleted(String path, Uri uri) {
     this.fileUtils = fileUtils;
   }
 
-  // -- Video --
-  // Choose Video From Gallery
   public void chooseVideoFromGallery(MethodCall methodCall, MethodChannel.Result result) {
     if (!setPendingMethodCallAndResult(methodCall, result)) {
       finishWithAlreadyActiveError();
@@ -204,7 +202,6 @@ private void launchPickVideoFromGalleryIntent() {
     activity.startActivityForResult(pickImageIntent, REQUEST_CODE_CHOOSE_FROM_GALLERY);
   }
 
-  // Take a New Video
   public void takeVideoWithCamera(MethodCall methodCall, MethodChannel.Result result) {
     if (!setPendingMethodCallAndResult(methodCall, result)) {
       finishWithAlreadyActiveError();
@@ -238,8 +235,6 @@ private void launchTakeVideoWithCameraIntent() {
     activity.startActivityForResult(intent, REQUEST_CODE_TAKE_WITH_CAMERA);
   }
 
-  // -- Photo --
-  // Choose Photo from Gallery
   public void chooseImageFromGallery(MethodCall methodCall, MethodChannel.Result result) {
     if (!setPendingMethodCallAndResult(methodCall, result)) {
       finishWithAlreadyActiveError();
@@ -262,7 +257,6 @@ private void launchPickImageFromGalleryIntent() {
     activity.startActivityForResult(pickImageIntent, REQUEST_CODE_CHOOSE_FROM_GALLERY);
   }
 
-  // Take New Photo
   public void takeImageWithCamera(MethodCall methodCall, MethodChannel.Result result) {
     if (!setPendingMethodCallAndResult(methodCall, result)) {
       finishWithAlreadyActiveError();

packages/image_picker/example/android/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>android</name>
+	<comment>Project android created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>

packages/image_picker/example/android/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,2 @@
+#Thu May 24 08:04:52 EDT 2018
+connection.project.dir=

packages/image_picker/example/android/app/.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

packages/image_picker/example/android/app/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>app</name>
+	<comment>Project app created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>

packages/image_picker/example/android/app/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,2 @@
+#Thu May 24 08:04:52 EDT 2018
+connection.project.dir=..

packages/image_picker/example/ios/Runner.xcodeproj/project.pbxproj

@@ -438,7 +438,6 @@
 			buildSettings = {
 				ARCHS = arm64;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = 9FK3425VTA;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -461,7 +460,6 @@
 			buildSettings = {
 				ARCHS = arm64;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = 9FK3425VTA;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

packages/image_picker/example/lib/main.dart

@@ -33,7 +33,7 @@ class MyHomePage extends StatefulWidget {
 }
 
 class _MyHomePageState extends State<MyHomePage> {
-  Future<File> _mediaFile;
+  Future<File> _imageFile;
   bool isVideo = false;
   VideoPlayerController _controller;
   VoidCallback listener;
@@ -45,17 +45,19 @@ class _MyHomePageState extends State<MyHomePage> {
         _controller.removeListener(listener);
       }
       if (isVideo) {
-        _mediaFile = ImagePicker.pickVideo(source: source).then((File _file) {
-          _controller = VideoPlayerController.file(_file)
-            ..addListener(listener)
-            ..setVolume(1.0)
-            ..initialize()
-            ..setLooping(true)
-            ..play();
-          setState(() {});
+        ImagePicker.pickVideo(source: source).then((File file) {
+          if (file != null) {
+            _controller = VideoPlayerController.file(file)
+              ..addListener(listener)
+              ..setVolume(1.0)
+              ..initialize()
+              ..setLooping(true)
+              ..play();
+            setState(() {});
+          }
         });
       } else {
-        _mediaFile = ImagePicker.pickImage(source: source);
+        _imageFile = ImagePicker.pickImage(source: source);
       }
     });
   }
@@ -106,7 +108,7 @@ class _MyHomePageState extends State<MyHomePage> {
 
   Widget _previewImage() {
     return FutureBuilder<File>(
-        future: _mediaFile,
+        future: _imageFile,
         builder: (BuildContext context, AsyncSnapshot<File> snapshot) {
           if (snapshot.connectionState == ConnectionState.done &&
               snapshot.data != null) {

packages/image_picker/ios/Classes/ImagePickerPlugin.m

@@ -1,4 +1,3 @@
-
 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
@@ -130,17 +129,6 @@ - (void)imagePickerController:(UIImagePickerController *)picker
   NSURL *videoURL = [info objectForKey:UIImagePickerControllerMediaURL];
   UIImage *image = [info objectForKey:UIImagePickerControllerEditedImage];
   [_imagePickerController dismissViewControllerAnimated:YES completion:nil];
-  if (image == nil) {
-    image = [info objectForKey:UIImagePickerControllerOriginalImage];
-  }
-  image = [self normalizedImage:image];
-
-  NSNumber *maxWidth = [_arguments objectForKey:@"maxWidth"];
-  NSNumber *maxHeight = [_arguments objectForKey:@"maxHeight"];
-
-  if (maxWidth != (id)[NSNull null] || maxHeight != (id)[NSNull null]) {
-    image = [self scaledImage:image maxWidth:maxWidth maxHeight:maxHeight];
-  }
 
   if (videoURL != nil) {
     NSData *data = [NSData dataWithContentsOfURL:videoURL];
@@ -157,6 +145,18 @@ - (void)imagePickerController:(UIImagePickerController *)picker
                                   details:nil]);
     }
   } else {
+    if (image == nil) {
+      image = [info objectForKey:UIImagePickerControllerOriginalImage];
+    }
+    image = [self normalizedImage:image];
+
+    NSNumber *maxWidth = [_arguments objectForKey:@"maxWidth"];
+    NSNumber *maxHeight = [_arguments objectForKey:@"maxHeight"];
+
+    if (maxWidth != (id)[NSNull null] || maxHeight != (id)[NSNull null]) {
+      image = [self scaledImage:image maxWidth:maxWidth maxHeight:maxHeight];
+    }
+
     NSData *data = UIImageJPEGRepresentation(image, 1.0);
     NSString *guid = [[NSProcessInfo processInfo] globallyUniqueString];
     NSString *tmpFile = [NSString stringWithFormat:@"image_picker_%@.jpg", guid];

packages/image_picker/lib/image_picker.dart

@@ -37,11 +37,11 @@ class ImagePicker {
     assert(source != null);
 
     if (maxWidth != null && maxWidth < 0) {
-      throw new ArgumentError.value(maxWidth, 'maxWidth can\'t be negative');
+      throw new ArgumentError.value(maxWidth, 'maxWidth cannot be negative');
     }
 
     if (maxHeight != null && maxHeight < 0) {
-      throw new ArgumentError.value(maxHeight, 'maxHeight can\'t be negative');
+      throw new ArgumentError.value(maxHeight, 'maxHeight cannot be negative');
     }
 
     final String path = await _channel.invokeMethod(
@@ -53,32 +53,20 @@ class ImagePicker {
       },
     );
 
-    return path != null ? new File(path) : null;
+    return path == null ? null : new File(path);
   }
 
   static Future<File> pickVideo({
     @required ImageSource source,
-    double maxWidth,
-    double maxHeight,
   }) async {
     assert(source != null);
 
-    if (maxWidth != null && maxWidth < 0) {
-      throw new ArgumentError.value(maxWidth, 'maxWidth can\'t be negative');
-    }
-
-    if (maxHeight != null && maxHeight < 0) {
-      throw new ArgumentError.value(maxHeight, 'maxHeight can\'t be negative');
-    }
-
     final String path = await _channel.invokeMethod(
       'pickVideo',
       <String, dynamic>{
         'source': source.index,
-        'maxWidth': maxWidth,
-        'maxHeight': maxHeight,
       },
     );
-    return path != null ? new File(path) : null;
+    return path == null ? null : new File(path);
   }
 }