cordova-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "ASF GitHub Bot (JIRA)" <j...@apache.org>
Subject [jira] [Commented] (CB-13865) Making CameraPopover for imagePicker bigger on Ipad
Date Sun, 25 Nov 2018 13:00:00 GMT

    [ https://issues.apache.org/jira/browse/CB-13865?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16698161#comment-16698161
] 

ASF GitHub Bot commented on CB-13865:
-------------------------------------

jcesarmobile closed pull request #314: CB-13865: (IOS-Ipad) Making popover Window Size configurable
using popoverOptions - imagePicker
URL: https://github.com/apache/cordova-plugin-camera/pull/314
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/README.md b/README.md
index 44651174..492df768 100644
--- a/README.md
+++ b/README.md
@@ -393,6 +393,8 @@ location.
 | [width] | <code>Number</code> | <code>320</code> | width, in pixels,
of the screen element onto which to anchor the popover. |
 | [height] | <code>Number</code> | <code>480</code> | height, in
pixels, of the screen element onto which to anchor the popover. |
 | [arrowDir] | <code>[PopoverArrowDirection](#module_Camera.PopoverArrowDirection)</code>
| <code>ARROW_ANY</code> | Direction the arrow on the popover should point. |
+| [popoverWidth] | <code>Number</code> | <code>0</code> | width of
the popover (0 or not specified will use apple's default width). |
+| [popoverHeight] | <code>Number</code> | <code>0</code> | height
of the popover (0 or not specified will use apple's default height). |
 
 ---
 
@@ -411,13 +413,13 @@ navigator.camera.getPicture(onSuccess, onFail,
 {
     destinationType: Camera.DestinationType.FILE_URI,
     sourceType: Camera.PictureSourceType.PHOTOLIBRARY,
-    popoverOptions: new CameraPopoverOptions(300, 300, 100, 100, Camera.PopoverArrowDirection.ARROW_ANY)
+    popoverOptions: new CameraPopoverOptions(300, 300, 100, 100, Camera.PopoverArrowDirection.ARROW_ANY,
300, 600)
 });
 
 // Reposition the popover if the orientation changes.
 window.onorientationchange = function() {
     var cameraPopoverHandle = new CameraPopoverHandle();
-    var cameraPopoverOptions = new CameraPopoverOptions(0, 0, 100, 100, Camera.PopoverArrowDirection.ARROW_ANY);
+    var cameraPopoverOptions = new CameraPopoverOptions(0, 0, 100, 100, Camera.PopoverArrowDirection.ARROW_ANY,
400, 500);
     cameraPopoverHandle.setPosition(cameraPopoverOptions);
 }
 ```
diff --git a/src/ios/CDVCamera.m b/src/ios/CDVCamera.m
index c71de054..6e39d231 100644
--- a/src/ios/CDVCamera.m
+++ b/src/ios/CDVCamera.m
@@ -291,6 +291,19 @@ - (void)displayPopover:(NSDictionary*)options
 - (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController
*)viewController animated:(BOOL)animated
 {
     if([navigationController isKindOfClass:[UIImagePickerController class]]){
+        
+        // If popoverWidth and popoverHeight are specified and are greater than 0, then set
popover size, else use apple's default popoverSize
+        NSDictionary* options = self.pickerController.pictureOptions.popoverOptions;
+        if(options) {
+            NSInteger popoverWidth = [self integerValueForKey:options key:@"popoverWidth"
defaultValue:0];
+            NSInteger popoverHeight = [self integerValueForKey:options key:@"popoverHeight"
defaultValue:0];
+            if(popoverWidth > 0 && popoverHeight > 0)
+            {
+                [viewController setPreferredContentSize:CGSizeMake(popoverWidth,popoverHeight)];
+            }
+        }
+        
+        
         UIImagePickerController* cameraPicker = (UIImagePickerController*)navigationController;
 
         if(![cameraPicker.mediaTypes containsObject:(NSString*)kUTTypeImage]){
diff --git a/tests/ios/CDVCameraTest/CDVCameraLibTests/CameraTest.m b/tests/ios/CDVCameraTest/CDVCameraLibTests/CameraTest.m
index b9439d10..d74cdbaa 100644
--- a/tests/ios/CDVCameraTest/CDVCameraLibTests/CameraTest.m
+++ b/tests/ios/CDVCameraTest/CDVCameraLibTests/CameraTest.m
@@ -82,7 +82,7 @@ - (void) testPictureOptionsCreate
     XCTAssertEqual(options.usesGeolocation, NO);
     
     // Set each argument, check whether they are set. different from defaults
-    popoverOptions = @{ @"x" : @1, @"y" : @2, @"width" : @3, @"height" : @4 };
+    popoverOptions = @{ @"x" : @1, @"y" : @2, @"width" : @3, @"height" : @4, @"popoverWidth":
@200, @"popoverHeight": @300 };
     
     args = @[
              @(49),
@@ -127,7 +127,7 @@ - (void) testCameraPickerCreate
     
     // Souce is Camera, and image type
     
-    popoverOptions = @{ @"x" : @1, @"y" : @2, @"width" : @3, @"height" : @4 };
+    popoverOptions = @{ @"x" : @1, @"y" : @2, @"width" : @3, @"height" : @4, @"popoverWidth":
@200, @"popoverHeight": @300 };
     args = @[
              @(49),
              @(DestinationTypeDataUrl),
diff --git a/tests/ios/package.json b/tests/ios/package.json
index 4b9486f4..39053030 100644
--- a/tests/ios/package.json
+++ b/tests/ios/package.json
@@ -8,6 +8,6 @@
         "cordova-ios": "*"
     },
     "scripts": {
-        "test": "xcodebuild -scheme CordovaLib && xcodebuild test -scheme CDVCameraLibTests
-destination 'platform=iOS Simulator,name=iPhone 5'"
+        "test": "xcodebuild -scheme CordovaLib && xcodebuild test -scheme CDVCameraLibTests
-destination 'platform=iOS Simulator,name=iPhone 5s'"
     }
 }
diff --git a/tests/tests.js b/tests/tests.js
index f45b8b66..e4425d40 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -162,7 +162,7 @@ exports.defineManualTests = function (contentEl, createActionButton) {
 
         // Reposition the popover if the orientation changes.
         window.onorientationchange = function () {
-            var newPopoverOptions = new CameraPopoverOptions(0, 0, 100, 100, 0);
+            var newPopoverOptions = new CameraPopoverOptions(0, 0, 100, 100, 0, 300, 400);
             popoverHandle.setPosition(newPopoverOptions);
         };
     }
diff --git a/types/index.d.ts b/types/index.d.ts
index fa50e9ce..6bf45d80 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -136,6 +136,8 @@ interface CameraPopoverOptions {
      *      ARROW_ANY : 15
      */
     arrowDir : number;
+    popoverWidth: number;
+    popoverHeight: number;
 }
 
 declare var Camera: {
diff --git a/www/CameraPopoverOptions.js b/www/CameraPopoverOptions.js
index 14829fd5..95ff43f9 100644
--- a/www/CameraPopoverOptions.js
+++ b/www/CameraPopoverOptions.js
@@ -39,14 +39,18 @@ var Camera = require('./Camera');
  * @param {Number} [width=320] - width, in pixels, of the screen element onto which to anchor
the popover.
  * @param {Number} [height=480] - height, in pixels, of the screen element onto which to
anchor the popover.
  * @param {module:Camera.PopoverArrowDirection} [arrowDir=ARROW_ANY] - Direction the arrow
on the popover should point.
+ * @param {Number} [popoverWidth=0] - width of the popover (0 or not specified will use apple's
default width).
+ * @param {Number} [popoverHeight=0] - height of the popover (0 or not specified will use
apple's default height).
  */
-var CameraPopoverOptions = function (x, y, width, height, arrowDir) {
+var CameraPopoverOptions = function (x, y, width, height, arrowDir, popoverWidth, popoverHeight)
{
     // information of rectangle that popover should be anchored to
     this.x = x || 0;
     this.y = y || 32;
     this.width = width || 320;
     this.height = height || 480;
     this.arrowDir = arrowDir || Camera.PopoverArrowDirection.ARROW_ANY;
+    this.popoverWidth = popoverWidth || 0;
+    this.popoverHeight = popoverHeight || 0;
 };
 
 module.exports = CameraPopoverOptions;
diff --git a/www/ios/CameraPopoverHandle.js b/www/ios/CameraPopoverHandle.js
index 6912a4e4..30728d15 100644
--- a/www/ios/CameraPopoverHandle.js
+++ b/www/ios/CameraPopoverHandle.js
@@ -37,13 +37,13 @@ var exec = require('cordova/exec');
  * {
  *     destinationType: Camera.DestinationType.FILE_URI,
  *     sourceType: Camera.PictureSourceType.PHOTOLIBRARY,
- *     popoverOptions: new CameraPopoverOptions(300, 300, 100, 100, Camera.PopoverArrowDirection.ARROW_ANY)
+ *     popoverOptions: new CameraPopoverOptions(300, 300, 100, 100, Camera.PopoverArrowDirection.ARROW_ANY,
300, 600)
  * });
  *
  * // Reposition the popover if the orientation changes.
  * window.onorientationchange = function() {
  *     var cameraPopoverHandle = new CameraPopoverHandle();
- *     var cameraPopoverOptions = new CameraPopoverOptions(0, 0, 100, 100, Camera.PopoverArrowDirection.ARROW_ANY);
+ *     var cameraPopoverOptions = new CameraPopoverOptions(0, 0, 100, 100, Camera.PopoverArrowDirection.ARROW_ANY,
400, 500);
  *     cameraPopoverHandle.setPosition(cameraPopoverOptions);
  * }
  * @module CameraPopoverHandle


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


> Making CameraPopover for imagePicker bigger on Ipad
> ---------------------------------------------------
>
>                 Key: CB-13865
>                 URL: https://issues.apache.org/jira/browse/CB-13865
>             Project: Apache Cordova
>          Issue Type: Improvement
>          Components: cordova-plugin-camera
>            Reporter: Ams
>            Priority: Major
>             Fix For: Master
>
>
> The popover for imagePicker from gallery is way too small and people complain about not
being able to see images before selecting them.
>  
> The fix is simple:
>  
> Adding this line to willShowViewController method will set it to 960 by 960 or as big
as the screen widht/height
> [viewController setPreferredContentSize:CGSizeMake(960,960)];
> It should be added right in the if statement:
> if([navigationController isKindOfClass:[UIImagePickerController class]]){
>  
> HOW CAN I COMMIT THIS CHANGE?



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@cordova.apache.org
For additional commands, e-mail: issues-help@cordova.apache.org


Mime
View raw message