RMET-4099 :: added chooseFromGallery feature

README.md

@@ -103,14 +103,17 @@ const takePicture = async () => {
 <docgen-index>
 
 * [`getPhoto(...)`](#getphoto)
-* [`takePhoto(...)`](#takephoto)
 * [`pickImages(...)`](#pickimages)
 * [`pickLimitedLibraryPhotos()`](#picklimitedlibraryphotos)
 * [`getLimitedLibraryPhotos()`](#getlimitedlibraryphotos)
 * [`checkPermissions()`](#checkpermissions)
 * [`requestPermissions(...)`](#requestpermissions)
+* [`takePhoto(...)`](#takephoto)
 * [`recordVideo(...)`](#recordvideo)
 * [`playVideo(...)`](#playvideo)
+* [`chooseFromGallery(...)`](#choosefromgallery)
+* [`editPhoto(...)`](#editphoto)
+* [`editURIPhoto(...)`](#edituriphoto)
 * [Interfaces](#interfaces)
 * [Type Aliases](#type-aliases)
 * [Enums](#enums)
@@ -140,26 +143,6 @@ with the camera.
 --------------------
 
 
-### takePhoto(...)
-
-```typescript
-takePhoto(options: ImageOptions) => Promise<Photo>
-```
-
-Prompt the user to pick a photo from an album, or take a new photo
-with the camera.
-
-| Param         | Type                                                  |
-| ------------- | ----------------------------------------------------- |
-| **`options`** | <code><a href="#imageoptions">ImageOptions</a></code> |
-
-**Returns:** <code>Promise&lt;<a href="#photo">Photo</a>&gt;</code>
-
-**Since:** 1.0.0
-
---------------------
-
-
 ### pickImages(...)
 
 ```typescript
@@ -245,6 +228,25 @@ Request camera and photo album permissions
 --------------------
 
 
+### takePhoto(...)
+
+```typescript
+takePhoto(options: ImageOptions) => Promise<MediaResult>
+```
+
+Prompt the user to take a photo with the camera.
+
+| Param         | Type                                                  |
+| ------------- | ----------------------------------------------------- |
+| **`options`** | <code><a href="#imageoptions">ImageOptions</a></code> |
+
+**Returns:** <code>Promise&lt;<a href="#mediaresult">MediaResult</a>&gt;</code>
+
+**Since:** 2.0.0
+
+--------------------
+
+
 ### recordVideo(...)
 
 ```typescript
@@ -263,12 +265,69 @@ recordVideo(options: RecordVideoOptions) => Promise<MediaResult>
 ### playVideo(...)
 
 ```typescript
-playVideo(options: { videoURI: string; }) => Promise<void>
+playVideo(options: PlayVideoOptions) => Promise<void>
+```
+
+| Param         | Type                                                          |
+| ------------- | ------------------------------------------------------------- |
+| **`options`** | <code><a href="#playvideooptions">PlayVideoOptions</a></code> |
+
+--------------------
+
+
+### chooseFromGallery(...)
+
+```typescript
+chooseFromGallery(options: GalleryOptions) => Promise<MediaResults>
+```
+
+Allows the user to pick multiple pictures from the photo gallery.
+
+| Param         | Type                                                      |
+| ------------- | --------------------------------------------------------- |
+| **`options`** | <code><a href="#galleryoptions">GalleryOptions</a></code> |
+
+**Returns:** <code>Promise&lt;<a href="#mediaresults">MediaResults</a>&gt;</code>
+
+**Since:** 1.2.0
+
+--------------------
+
+
+### editPhoto(...)
+
+```typescript
+editPhoto(options: EditPhotoOptions) => Promise<EditPhotoResult>
 ```
 
-| Param         | Type                               |
-| ------------- | ---------------------------------- |
-| **`options`** | <code>{ videoURI: string; }</code> |
+Returns a string (base64) representing the photo that was edited
+
+| Param         | Type                                                          |
+| ------------- | ------------------------------------------------------------- |
+| **`options`** | <code><a href="#editphotooptions">EditPhotoOptions</a></code> |
+
+**Returns:** <code>Promise&lt;<a href="#editphotoresult">EditPhotoResult</a>&gt;</code>
+
+**Since:** 2.0.0
+
+--------------------
+
+
+### editURIPhoto(...)
+
+```typescript
+editURIPhoto(options: EditURIPhotoOptions) => Promise<MediaResult>
+```
+
+Returns a <a href="#mediaresult">MediaResult</a> object with info about the photo that was edited
+
+| Param         | Type                                                                |
+| ------------- | ------------------------------------------------------------------- |
+| **`options`** | <code><a href="#edituriphotooptions">EditURIPhotoOptions</a></code> |
+
+**Returns:** <code>Promise&lt;<a href="#mediaresult">MediaResult</a>&gt;</code>
+
+**Since:** 2.0.0
 
 --------------------
 
@@ -360,6 +419,7 @@ playVideo(options: { videoURI: string; }) => Promise<void>
 | -------------- | -------------------- |
 | **`path`**     | <code>string</code>  |
 | **`webPath`**  | <code>string</code>  |
+| **`exif`**     | <code>any</code>     |
 | **`duration`** | <code>number</code>  |
 | **`size`**     | <code>number</code>  |
 | **`format`**   | <code>string</code>  |
@@ -374,6 +434,61 @@ playVideo(options: { videoURI: string; }) => Promise<void>
 | **`includeMetadata`** | <code>boolean</code> |
 
 
+#### PlayVideoOptions
+
+| Prop           | Type                |
+| -------------- | ------------------- |
+| **`videoURI`** | <code>string</code> |
+
+
+#### MediaResults
+
+| Prop         | Type                       |
+| ------------ | -------------------------- |
+| **`photos`** | <code>MediaResult[]</code> |
+
+
+#### GalleryOptions
+
+| Prop                         | Type                                            |
+| ---------------------------- | ----------------------------------------------- |
+| **`mediaType`**              | <code><a href="#mediatype">MediaType</a></code> |
+| **`allowMultipleSelection`** | <code>boolean</code>                            |
+| **`limit`**                  | <code>number</code>                             |
+| **`includeMetadata`**        | <code>boolean</code>                            |
+| **`allowEdit`**              | <code>boolean</code>                            |
+| **`editInApp`**              | <code>boolean</code>                            |
+| **`presentationStyle`**      | <code>'fullscreen' \| 'popover'</code>          |
+| **`quality`**                | <code>number</code>                             |
+| **`width`**                  | <code>number</code>                             |
+| **`height`**                 | <code>number</code>                             |
+| **`correctOrientation`**     | <code>boolean</code>                            |
+
+
+#### EditPhotoResult
+
+| Prop               | Type                |
+| ------------------ | ------------------- |
+| **`format`**       | <code>string</code> |
+| **`base64String`** | <code>string</code> |
+
+
+#### EditPhotoOptions
+
+| Prop         | Type                |
+| ------------ | ------------------- |
+| **`base64`** | <code>string</code> |
+
+
+#### EditURIPhotoOptions
+
+| Prop                  | Type                 |
+| --------------------- | -------------------- |
+| **`uri`**             | <code>string</code>  |
+| **`saveToGallery`**   | <code>boolean</code> |
+| **`includeMetadata`** | <code>boolean</code> |
+
+
 ### Type Aliases
 
 
@@ -420,4 +535,13 @@ playVideo(options: { videoURI: string; }) => Promise<void>
 | **`Rear`**  | <code>'REAR'</code>  |
 | **`Front`** | <code>'FRONT'</code> |
 
+
+#### MediaType
+
+| Members       | Value          |
+| ------------- | -------------- |
+| **`picture`** | <code>0</code> |
+| **`video`**   | <code>1</code> |
+| **`all`**     | <code>2</code> |
+
 </docgen-api>

android/build.gradle

@@ -9,6 +9,7 @@ ext {
 }
 
 buildscript {
+    ext.kotlin_version = project.hasProperty("kotlin_version") ? rootProject.ext.kotlin_version : '2.2.20'
     repositories {
         google()
         mavenCentral()
@@ -18,14 +19,15 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:8.13.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         if (System.getenv("CAP_PLUGIN_PUBLISH") == "true") {
             classpath 'io.github.gradle-nexus:publish-plugin:1.3.0'
         }
     }
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'org.jetbrains.kotlin.android'
+apply plugin: 'kotlin-android'
 if (System.getenv("CAP_PLUGIN_PUBLISH") == "true") {
     apply plugin: 'io.github.gradle-nexus.publish-plugin'
     apply from: file('../../scripts/android/publish-root.gradle')
@@ -58,9 +60,10 @@ android {
     publishing {
         singleVariant("release")
     }
-    kotlinOptions {
-        jvmTarget = '21'
-    }
+}
+
+kotlin {
+    jvmToolchain(21)
 }
 
 repositories {
@@ -87,4 +90,4 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation project(':gradle-project-test')
-}
+}

android/src/main/java/com/capacitorjs/plugins/camera/CameraPlugin.kt

@@ -19,7 +19,7 @@ import com.getcapacitor.annotation.CapacitorPlugin
 import com.getcapacitor.annotation.Permission
 import com.getcapacitor.annotation.PermissionCallback
 import org.json.JSONException
-
+import io.ionic.libs.ioncameralib.model.IONCAMRMediaType
 /**
  * The Camera plugin makes it easy to take a photo or have the user select a photo
  * from their albums.
@@ -61,7 +61,8 @@ class CameraPlugin : Plugin() {
 
     private lateinit var legacyFlow: LegacyCameraFlow
     private lateinit var ionFlow: IonCameraFlow
-
+    private var videoSettings = VideoSettings()
+    private var gallerySettings = GallerySettings()
 
     override fun load() {
         super.load()
@@ -78,19 +79,37 @@ class CameraPlugin : Plugin() {
 
     @PluginMethod
     fun takePhoto(call: PluginCall) {
-        ionFlow.takePhoto(call)
+        val settings = getSettings(call)
+        ionFlow.takePhoto(call, settings)
     }
 
     @PluginMethod
     fun recordVideo(call: PluginCall) {
-        ionFlow.recordVideo(call)
+        videoSettings = getVideoSettings(call)
+        ionFlow.recordVideo(call, videoSettings)
     }
 
     @PluginMethod
     fun playVideo(call: PluginCall) {
         ionFlow.playVideo(call)
     }
 
+    @PluginMethod
+    fun chooseFromGallery(call: PluginCall) {
+        gallerySettings = getGallerySettings(call)
+        ionFlow.chooseFromGallery(call, gallerySettings)
+    }
+
+    @PluginMethod
+    fun editPhoto(call: PluginCall) {
+        ionFlow.editPhoto(call)
+    }
+
+    @PluginMethod
+    fun editURIPhoto(call: PluginCall) {
+        ionFlow.editURIPhoto(call)
+    }
+
     @PluginMethod
     fun pickImages(call: PluginCall) {
         legacyFlow.pickImages(call)
@@ -231,11 +250,22 @@ class CameraPlugin : Plugin() {
         return settings
     }
 
-     fun getVideoSettings(call: PluginCall): VideoSettings {
-         val settings = VideoSettings()
-         settings.saveToGallery = call.getBoolean("saveToGallery") ?: false
-         settings.includeMetadata = call.getBoolean("includeMetadata") ?: false
-         return settings
+    fun getVideoSettings(call: PluginCall): VideoSettings {
+        return VideoSettings(
+            saveToGallery = call.getBoolean("saveToGallery") ?: false,
+            includeMetadata = call.getBoolean("includeMetadata") ?: false
+        )
+    }
+
+    fun getGallerySettings(call: PluginCall): GallerySettings {
+        return GallerySettings(
+            mediaType = IONCAMRMediaType.fromValue((call.getInt("mediaType") ?: 0)),
+            allowMultipleSelection = call.getBoolean("allowMultipleSelection") ?: false,
+            includeMetadata = call.getBoolean("includeMetadata") ?: false,
+            allowEdit = call.getBoolean("allowEdit") ?: false,
+            limit = call.getInt("limit") ?: 0,
+            editInApp = call.getBoolean("editInApp") ?: true
+        )
     }
 
     private fun getResultType(resultType: String?): CameraResultType? {

android/src/main/java/com/capacitorjs/plugins/camera/GallerySettings.kt

@@ -0,0 +1,12 @@
+package com.capacitorjs.plugins.camera
+
+import io.ionic.libs.ioncameralib.model.IONCAMRMediaType
+
+data class GallerySettings(
+    val mediaType: IONCAMRMediaType = IONCAMRMediaType.ALL,
+    val allowMultipleSelection: Boolean = false,
+    val limit: Int = 0,
+    val includeMetadata: Boolean = false,
+    val allowEdit: Boolean = false,
+    val editInApp: Boolean = true
+)