Skip to content

DON'T MERGE: Fixed camera not opening from modal on iOS #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
surdu wants to merge 2 commits into
base: master
Choose a base branch
from
+11 −6
Open

DON'T MERGE: Fixed camera not opening from modal on iOS #46

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85b8acc
Fixed camera not opening from modal on iOS
surdu Sep 17, 2018
1e3138d
Merge branch 'master' into modal-works
surdu Apr 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions src/camera-plus.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ export class MySwifty extends SwiftyCamViewController {
}

public closePicker() {
rootVC().dismissViewControllerAnimatedCompletion(true, () => {
this.getParentViewController().dismissViewControllerAnimatedCompletion(true, () => {
this.pickerDelegate = null;
});
}
Expand Down Expand Up @@ -572,6 +572,15 @@ export class MySwifty extends SwiftyCamViewController {
return UIImagePickerController.isSourceTypeAvailable(UIImagePickerControllerSourceType.Camera);
}

public getParentViewController() {
var responder: UIResponder = this.view;
do {
responder = responder.nextResponder;
} while (responder && !(NSStringFromClass(responder.class()) === 'UIViewControllerImpl'));

return <UIViewController>responder;
}

public chooseFromLibrary(options?: IChooseOptions): Promise<any> {
return new Promise((resolve, reject) => {
this._pickerDelegate = null;
Expand Down Expand Up @@ -636,7 +645,7 @@ export class MySwifty extends SwiftyCamViewController {

imagePickerController.mediaType = mediaType;

rootVC().presentViewControllerAnimatedCompletion(imagePickerController, true, null);
this.getParentViewController().presentViewControllerAnimatedCompletion(imagePickerController, true, null);
});
}

Expand Down Expand Up @@ -932,10 +941,6 @@ export class CameraPlus extends CameraPlusBase {
}
}

const rootVC = function() {
const appWindow = UIApplication.sharedApplication.keyWindow;
return appWindow.rootViewController;
};

const createButton = function(
target: any,
Expand Down