Skip to content
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

Jump to bottom

feat(camera): make prompt strings localizable #2631

Merged
merged 2 commits into from
Apr 30, 2020
Merged

feat(camera): make prompt strings localizable #2631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0976f31
feat(camera): change label to be able set
rdlabo Mar 25, 2020
07a778b
Update ios/Capacitor/Capacitor/Plugins/Camera.swift
jcesarmobile Apr 30, 2020
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
7 changes: 5 additions & 2 deletions android/capacitor/src/main/java/com/getcapacitor/plugin/Camera.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,13 @@ private void doShow(PluginCall call) {

private void showPrompt(final PluginCall call) {
// We have all necessary permissions, open the camera
String promptLabelPhoto = call.getString("promptLabelPhoto", "From Photos");
String promptLabelPicture = call.getString("promptLabelPicture", "Take Picture");

JSObject fromPhotos = new JSObject();
fromPhotos.put("title", "From Photos");
fromPhotos.put("title", promptLabelPhoto);
JSObject takePicture = new JSObject();
takePicture.put("title", "Take Picture");
takePicture.put("title", promptLabelPicture);
Object[] options = new Object[] {
fromPhotos,
takePicture
Expand Down
13 changes: 13 additions & 0 deletions core/src/core-plugin-definitions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,19 @@ export interface CameraOptions {
* iOS only: The presentation style of the Camera. Defaults to fullscreen.
*/
presentationStyle?: 'fullscreen' | 'popover';

/**
* If use CameraSource.Prompt only, can change Prompt label.
* default:
* promptLabelHeader : 'Photo' // iOS only
* promptLabelCancel : 'Cancel' // iOS only
* promptLabelPhoto : 'From Photos'
* promptLabelPicture : 'Take Picture'
*/
promptLabelHeader?: string;
promptLabelCancel?: string;
promptLabelPhoto?: string;
promptLabelPicture?: string;
}

export enum CameraSource {
Expand Down
13 changes: 9 additions & 4 deletions ios/Capacitor/Capacitor/Plugins/Camera.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,16 +101,21 @@ public class CAPCameraPlugin : CAPPlugin, UIImagePickerControllerDelegate, UINav

func showPrompt(_ call: CAPPluginCall) {
// Build the action sheet
let alert = UIAlertController(title: "Photo", message: nil, preferredStyle: UIAlertController.Style.actionSheet)
alert.addAction(UIAlertAction(title: "From Photos", style: .default, handler: { (action: UIAlertAction) in
let promptLabelHeader = call.getString("promptLabelHeader") ?? "Photo"
let promptLabelPhoto = call.getString("promptLabelPhoto") ?? "From Photos"
let promptLabelPicture = call.getString("promptLabelPicture") ?? "Take Picture"
let promptLabelCancel = call.getString("promptLabelCancel") ?? "Cancel"

let alert = UIAlertController(title: promptLabelHeader, message: nil, preferredStyle: UIAlertController.Style.actionSheet)
alert.addAction(UIAlertAction(title: promptLabelPhoto, style: .default, handler: { (action: UIAlertAction) in
self.showPhotos(call)
}))

alert.addAction(UIAlertAction(title: "Take Picture", style: .default, handler: { (action: UIAlertAction) in
alert.addAction(UIAlertAction(title: promptLabelPicture, style: .default, handler: { (action: UIAlertAction) in
self.showCamera(call)
}))

alert.addAction(UIAlertAction(title: "Cancel", style: .cancel, handler: { (action: UIAlertAction) in
alert.addAction(UIAlertAction(title: promptLabelCancel, style: .cancel, handler: { (action: UIAlertAction) in
self.call?.error("User cancelled photos app")
}))

Expand Down