Merge branch 'feature/Cordova-8.0.0'

example/.npmignore

@@ -0,0 +1,2 @@
+# OS X
+.DS_Store

example/LICENSE_ANDROID

@@ -1 +1 @@
-{"owner":"Malte Baumann","version":"2.0","enterprise_license":false,"available_actions":["magic","filter","transform","sticker","text","adjustments","brush","focus","frames","camera"],"platform":"Android","app_identifiers":["com.photoeditorsdk.react.native.demo","com.photoeditorsdk.cordova.demo","com.photoeditorsdk.ionic.demo"],"api_token":"HREIVpEC4g3E-49AKOjisw","domains":["https://api.photoeditorsdk.com"],"issued_at":1496928303,"expires_at":null,"signature":"k1PiZKcWLKZk/6UVgx9YtDmFCg0yFX4+/K18bO7pQzMEfto60dkyXo2Q7Q+g\nMbHuw7ntWp8cpTB49IbiwTxKClPshAYBmVdI6QHO6DZcxLOAPzvag6gvsFyY\natqOymvPUWWk/fSLJjL4IqOUxjjT4hxXEFLLnGH+/3hBCesmsLn9nOxQsKUu\nJWtox35ubGpYtcBFDzCnrIisGJHh5AO52cmmGP/arBLDJlhy2xwWL10c5Ahg\nqGsxARj/CeMRHieZr14tGe7COe2CiTilqN23dreperaiwl4kXRWuvi9youZg\nMuTTy9FXZe+TLGu63M3b7QtedIwUN4HTfTr6u8WdOLWXsl8HryN4xKGDVTJ4\nf2UTdg7HVVcQavU1UlIG6Ie83Gaar+8ZOw9VZZUBhQZLf8y5Pbg1MpxKzQEx\nFzcaGX5/1ri5CjR8+PtY4zb4JqOFjhOO9IwweTgAsPvtWrhJLGdlsjmnaBFX\nLbM28ZRTl7ggr7djSNZkLDZO0DylKEGMM7CwmldSYe9AVrcaA13+JSGFszkC\nHZTwSxd+on9XdorAxCmB7xfNqP648HAADQRCbuOr9mHTMMYNDnYZoIvzo7nq\nSfao6vib6rGGLvsdpdAUpfT1V1wJmarcMInPx98NCxdQwv44rudlj1aUvsmY\nJ5RR5KTlE2Wj1uDPP7QNJvs=\n"}
+{"owner":"Malte Baumann","version":"2.1","enterprise_license":false,"available_actions":["magic","filter","transform","sticker","text","adjustments","brush","focus","frames","camera"],"features":["adjustment","filter","focus","overlay","transform","text","sticker","frame","brush","camera","library","export"],"platform":"Android","app_identifiers":["com.photoeditorsdk.react_native.demo","com.photoeditorsdk.cordova.demo","com.photoeditorsdk.ionic.demo","ly.img.pesdk_instagram_ui.app"],"api_token":"HREIVpEC4g3E-49AKOjisw","domains":["https://api.photoeditorsdk.com"],"issued_at":1521556728,"expires_at":null,"signature":"J9Lcc6RbC9fZU/ng7qj1Y+GTdhJswTW4NieUrtgAspuYBGhGcpP3Z9ZnUx59+CnK1MdFyB64ASdmXR4wkSz2BEbRtP83NGFAqDEB3qZM9JXg/j9l64m2RIl1+gYeUjrhfOpeX0cY1XFBY7W942Re36iX0WUypw/PvfJaMy8n66In7135ugnTR0jfphpODfd3QwD4rEwSpi+aQp13yWUcwlEYl/hxh59ACmKaiBC9ZwPLr3obROl2Hmfr+4LNmsTXhlABo07yo2pmLbRy5UQx/sWuu5YAz1kWWT11d6bnmTIlFX0fiNf6f1Rga46iKA8Wnt58jlnSgLt3NF4MfaMIOTyCwCpBAD7g2xLaNjjNe3ssRXXsYN9KYqlLKM6vDFdAnPQyO4XEBfBNvHWJgWlWs3DmJBY/gyTtOgJ0S9IV054DkbbBAkODwqlwhvMLd0oBfiUV9RNLfFXqd8AMJNap/mpdoSqYNwU4hbwhozr2eNAI2cab1cAcWmmxkvftnBSMR7Me/c0Nm1hNyoFavaNZS1KUo79QZXVmQRYsiwXZ4EacfN6XB//CREyPDsd+pjOKLVUQloAUCuwWHmy7KsjC2Oozt8gRXNSaII+34FXFlJSrP9Yx06008qJlxrV1D88+NprgbIzhgoJ1pLjojDMYPNEXfapECWucrwVZ3PJ8b64="}

example/LICENSE_IOS

@@ -1 +1 @@
-{"owner":"Malte Baumann","version":"2.0","enterprise_license":false,"available_actions":["magic","filter","transform","sticker","text","adjustments","brush","focus","frames","camera"],"platform":"iOS","app_identifiers":["com.photoeditorsdk.react.native.demo","com.photoeditorsdk.cordova.demo","com.photoeditorsdk.ionic.demo"],"api_token":"Es4jtA35JvdQY1P7Se5uqQ","domains":["https://api.photoeditorsdk.com"],"issued_at":1496928382,"expires_at":null,"signature":"ILnjwPr2rOLFEtKUuQfe+gtLs1WYg9aCNdhDA0IhfaydTLsGI0hY2fbMagkT\n9CK8mEJ1OoanfwRyKjx4lHtsW0DCqsxu4T9EZYXlx/DADCTd2CtcwnJXTRQL\n0ZvdIROOjwhs1TcvJouTQV2viHnM/e76/iSbbWxuuYSN+eSn/HYt/Q/4U/H+\nGIUef+qsh86AfVBhYlQE6gxBw0fmsZCHWROnxMiQwYWeC/h7yVUN4l2CzsZK\nSAjxckmMI57bM5aONSD5bfnI08G8O3QdNgHNAFWGafE3AwFjtbB9rD+2qJRc\n2LggYlb4MFJyjsW5PNtJl4OH/ivlP7ajUwTOvx+0ndhJilfhHDeNvioyzZZH\nKfeGR+XBSvcQip0fWr5asJzkXzt/mQ+RyIkAwdtSoZrK5LrLg6BDUM5LZioP\nh8MO3J4jZNbP/PMBGtfao1p9q/CxjcAvUUeEdvPWzNA9SSclosOBB6mGu/zL\ntnIWHS2Px0ywfHAw1LMC3xaU4MPCOb1LA/VTsjWP7mLsPuG6Gtci1F1l6mjh\niNH242UXKBniZD0Myj69406SWgO3hKOR/oO/fEtiEzLKkhkpvkZ96FPUCGjn\nCbCjWeg6Lsr9A8xCvovqFFx7x08gFl80PIhtevgizVFGzP6soLPwIOfnWfTO\nZ0tuvJ31sSMZuXsd5YmONto=\n"}
+{"owner":"Malte Baumann","version":"2.1","enterprise_license":false,"available_actions":["magic","filter","transform","sticker","text","adjustments","brush","focus","frames","camera"],"features":["adjustment","filter","focus","overlay","transform","text","sticker","frame","brush","camera","library","export"],"platform":"iOS","app_identifiers":["com.photoeditorsdk.react.native.demo","com.photoeditorsdk.cordova.demo","ly.img.pesdk-instagram-ui","com.photoeditorsdk.ionic.demo"],"api_token":"Es4jtA35JvdQY1P7Se5uqQ","domains":["https://api.photoeditorsdk.com"],"issued_at":1521556726,"expires_at":null,"signature":"LnBGr+84TUXrMxd3DsBJLPrpHyN29f4zIGivXzGckHb4Apldb4zdDMa+geHp7/8UPbcufn3CAKKqGnZQMJjDuJM9BiBupXxOHq1GlQHl5DmhVxf8KjbCg81UNl6hrn04Ds48TBc6jWiG92z3Y5MFijlPC7sCQEMp35yXszeBmi9N7riUzpQ+fAVnq8O13FTQoAwV3j0hka35VsMow/DFgBKiT+Jl8snzgD8SZ/1saeynh9KlWVbQChK94Mkj4VnhdVKbPHnJyl7jV76zCYf4KuqtbdH4s3rjp+v0h8cbHB+4viCFW6XdCSKkr2gY1JEPciS5DdrLBi0nOA0FzZjuQHSEaSQ/UxxDi3NVxxp+7Hez1v13tIAUUlbj8FmMHodKJHF2p/83Cd9sapPuWPy+OIu7A3yyyp4JyvnSlU45LuW2XFrzmkqMNCY4oHp/8QpWQpmigKfzDMI+sjnJcSW0f7bTTHpt7vzQzqSZxK4lzDdHCahByh8Muq92eNf81ZYf+Ak6wa/SzdhGRh85KHJYgNN738SKmWFymBLsoqk5oCoSvccw7GtVrMGKX9JaPIQSJxogTvnTETlKFx9SyQn5Q6UfpvBWPR+K6aXRwSOpHt69wRqft8+CqOvJITRcur7zTFEXf1KcuM5XTibE5No3N11W8sg8Rh7K4RcpMnnT3Tk="}

example/config.xml

@@ -8,6 +8,7 @@
         Apache Cordova Team
     </author>
     <content src="index.html" />
+    <plugin name="cordova-plugin-whitelist" spec="1" />
     <access origin="*" />
     <allow-intent href="http://*/*" />
     <allow-intent href="https://*/*" />
@@ -22,12 +23,7 @@
         <allow-intent href="itms:*" />
         <allow-intent href="itms-apps:*" />
     </platform>
-    <engine name="android" spec="^6.2.3" />
-    <engine name="ios" spec="^4.4.0" />
-    <plugin name="cordova-image-picker" spec="^2.2.3">
-        <variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value=" " />
-    </plugin>
-    <plugin name="cordova-plugin-console" spec="^1.0.7" />
-    <plugin name="cordova-plugin-pesdk" spec=".." />
-    <plugin name="cordova-plugin-whitelist" spec="1" />
+    <plugin name="cordova-plugin-pesdk" spec="~1.2.0" />
+    <engine name="ios" spec="^4.5.4" />
+    <engine name="android" spec="^7.0.0" />
 </widget>

example/package.json

@@ -1,41 +1,28 @@
 {
-    "version": "0.1.0",
-    "name": "pesdk-demo",
-    "cordova_name": "pesdk-demo",
-    "description": "Cordova/Phonegap demo for the PhotoEditor SDK.",
-    "author": "",
-    "license": "Proprietary",
+    "name": "com.photoeditorsdk.cordova.demo",
+    "displayName": "PESDKDemo",
+    "version": "1.0.0",
+    "description": "A sample Apache Cordova application that responds to the deviceready event.",
+    "main": "index.js",
+    "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1"
+    },
+    "author": "Apache Cordova Team",
+    "license": "Apache-2.0",
+    "dependencies": {
+        "cordova-android": "^7.0.0",
+        "cordova-ios": "^4.5.4",
+        "cordova-plugin-add-swift-support": "^1.7.1",
+        "cordova-plugin-whitelist": "^1.3.3"
+    },
     "cordova": {
-        "id": "pesdk",
-        "platforms": [
-            "android",
-            "ios"
-        ],
         "plugins": {
             "cordova-plugin-whitelist": {},
-            "cordova-plugin-console": {},
-            "cordova-image-picker": {
-                "PHOTO_LIBRARY_USAGE_DESCRIPTION": " "
-            },
             "cordova-plugin-pesdk": {}
-        }
-    },
-    "keywords": [
-        "cordova",
-        "cordova-android",
-        "cordova-ios",
-        "phonegap",
-        "camera"
-    ],
-    "dependencies": {
-        "cordova-android": "^6.2.3",
-        "cordova-image-picker": "^2.2.3",
-        "cordova-ios": "^4.4.0",
-        "cordova-plugin-console": "^1.0.7",
-        "cordova-plugin-pesdk": "..",
-        "cordova-plugin-whitelist": "1",
-        "pesdk": "file:///Users/malte/Developer/9elements/pesdk-cordova-demo",
-        "pesdk-cordova-plugin": "file:///Users/malte/Developer/9elements/pesdk-cordova-demo",
-        "xcode": "https://github.com/alunny/node-xcode.git"
+        },
+        "platforms": [
+            "ios",
+            "android"
+        ]
     }
 }

example/res/README.md

@@ -0,0 +1,29 @@
+<!--
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+-->
+
+Note that these image resources are not copied into a project when a project
+is created with the CLI. Although there are default image resources in a
+newly-created project, those come from the platform-specific project template,
+which can generally be found in the platform's `template` directory. Until
+icon and splashscreen support is added to the CLI, these image resources
+aren't used directly.
+
+See https://issues.apache.org/jira/browse/CB-5145

example/res/screen/tizen/README.md

@@ -0,0 +1,24 @@
+<!--
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+-->
+
+# Tizen Splash Screen
+
+Splash screens are unsupported on the Tizen platform.

example/www/index.html

@@ -38,7 +38,7 @@
     <body>
         <div class="app">
             <div id="deviceready">
-                <button id="js-selectImageBtn"><strong>Select Image</strong></button>
+                <button id="js-selectImageBtn"><strong>Open PhotoEditor SDK</strong></button>
             </div>
         </div>
         <script type="text/javascript" src="cordova.js"></script>

example/www/js/index.js

@@ -29,26 +29,16 @@ var app = {
   onDeviceReady: function() {
     selectImageBtn = document.getElementById('js-selectImageBtn');
     selectImageBtn.addEventListener('click', function() {
-      window.imagePicker.getPictures(
-        function(results) {
-          let imageURI = results[0];
-          PESDK.present(
-            function(result){
-              console.log(result);
-              alert('PESDK result: ' + JSON.stringify(result));
-            },
-            function(error){
-              alert('PESDK error: ' + error);
-            },
-            {
-              sourceType: 1,
-              path: imageURI
-            }
-          );
-        }, function (error) {
-          console.log('Error: ' + error);
-        }, {
-          maximumImagesCount: 1
+      PESDK.present(
+        function(result){
+          console.log(result);
+          alert('PESDK result: ' + JSON.stringify(result));
+        },
+        function(error){
+          alert('PESDK error: ' + error);
+        },
+        {
+          sourceType: 1
         }
       );
     });

plugin.xml

@@ -21,15 +21,14 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:rim="http://www.blackberry.com/ns/widgets"
-    id="cordova-plugin-pesdk" version="1.1.0">
+    id="cordova-plugin-pesdk" version="1.2.0">
     <name>PESDK</name>
     <description>PhotoEditor SDK Cordova Plugin</description>
     <license>Apache 2.0</license>
     <keywords>cordova,camera</keywords>
     <repo>https://github.com/imgly/pesdk-cordova-demo.git</repo>
 
-    <dependency id="cordova-plugin-compat" version="^1.0.0" />
-    <dependency id="cordova-plugin-add-swift-support" version="1.6.0"/>
+    <dependency id="cordova-plugin-add-swift-support" version="1.7.1"/>
 
     <js-module src="src/www/pesdk.js" name="PESDK">
         <clobbers target="PESDK" />

src/android/build.gradle

@@ -32,5 +32,5 @@ android {
 }
 
 dependencies {
-    compile 'ly.img.android:photo-editor-sdk:4.0.1'
+    compile 'ly.img.android:photo-editor-sdk:5.0.20'
 }