diff --git a/hooks/after_plugin_install/npminstall.js b/hooks/after_plugin_install/npminstall.js new file mode 100644 index 0000000..0b2a72b --- /dev/null +++ b/hooks/after_plugin_install/npminstall.js @@ -0,0 +1,4 @@ +#!/usr/bin/env node + +var exec = require('child_process').exec; +exec("npm install xml2js@0.4.x"); \ No newline at end of file diff --git a/hooks/before_build/generateActivity.js b/hooks/before_build/generateActivity.js new file mode 100644 index 0000000..50e553a --- /dev/null +++ b/hooks/before_build/generateActivity.js @@ -0,0 +1,181 @@ +#!/usr/bin/env node + +// Define required. +var fs = require("fs"); +var xml2js = require('xml2js'); +var parseString = xml2js.parseString; +var builder = new xml2js.Builder(); + +// Define differents paths. +var pathConfigXml = "config.xml"; +var pathAndroidCordova = "platforms/android/"; +var pathResAndroidCordova = "platforms/android/res/"; +var pathAndroidPlugin = __dirname+"/../../src/android/"; +var pathResPlugin = __dirname+"/../../res/"; + +/** + * Generate a path based on a package name. + * + * @param {string} packageName Package name, eg: com.example. + * + * @return {string} Return path generate. + */ +var generatePathFrompackageName = function(packageName) { + return packageName.split(".").join("/"); +} + +/** + * Create different java classes. + * + * @param {string} packageName Package name of the current application. + */ +var createClasses = function(packageName) { + var pathCameraView = pathAndroidPlugin+"customCamera/src/org/geneanet/customcamera/CameraView.java"; + var pathCameraLauncher = pathAndroidPlugin+"CameraLauncher.java"; + + if (fs.existsSync(pathCameraView) && fs.existsSync(pathCameraLauncher)) { + // Rewrite package of CameraView class. + var contentCameraView = fs.readFileSync(pathCameraView, {encoding: "utf8"}); + contentCameraView = contentCameraView.replace(/^package\s[^;]*/,"package "+packageName); + fs.writeFileSync(pathAndroidCordova+"src/"+generatePathFrompackageName(packageName)+"/CameraView.java", contentCameraView); + + // Rewrite import of CameraLauncher class. + var contentCameraLauncher = fs.readFileSync(pathCameraLauncher, {encoding: "utf8"}); + contentCameraLauncher = contentCameraLauncher.replace("XXX_NAME_CURRENT_PACKAGE_XXX", packageName); + fs.writeFileSync( + pathAndroidCordova+"src/"+generatePathFrompackageName(contentCameraLauncher.match(/package\s([^;]*)/)[1])+"/CameraLauncher.java", + contentCameraLauncher + ); + } else { + console.error("File CameraView.java or/and CameraLauncher.java not found."); + process.exit(1); + } +} + +/** + * Update AndroidManifest.xml of the current application. + * + * @param {string} packageName Package name of the current application. + */ +var updateAndroidManifest = function(packageName) { + var pathAndroidManifestCordova = pathAndroidCordova+"AndroidManifest.xml"; + if (fs.existsSync(pathAndroidManifestCordova)) { + // get content AndroidManifest. + var contentAndroidManifest = fs.readFileSync(pathAndroidManifestCordova, {encoding: "utf8"}); + parseString(contentAndroidManifest, function (err, result) { + contentAndroidManifest = result; + }); + + // add activity if needed. + var needAddActivity = true; + var currentActivities = contentAndroidManifest["manifest"]["application"][0]["activity"]; + for (var i = currentActivities.length - 1; i >= 0; i--) { + if (currentActivities[i]["$"]["android:name"] == "CameraView") { + needAddActivity = false; + } + }; + if (needAddActivity) { + contentAndroidManifest["manifest"]["application"][0]["activity"].push({ + $: { + "android:name": "CameraView", + "android:label": "CameraView", + } + }) + var newXmlAndroidManifest = builder.buildObject(contentAndroidManifest); + fs.writeFileSync( + pathAndroidManifestCordova, + newXmlAndroidManifest + ); + } + } else { + console.error("File AndroidManifest.xml for cordova not found."); + process.exit(1); + } +} + +/** + * Update differents config file (translate, res/layout, etc). + */ +var updateConfig = function() { + var pathLayoutCordova = pathResAndroidCordova+"layout/"; + var pathLayoutPlugin = pathAndroidPlugin+"customCamera/res/layout/"; + var pathLayoutCameraView = pathLayoutPlugin+"activity_camera_view.xml"; + + // create directory layout in cordova if it doesn't exist. + if (!fs.existsSync(pathLayoutCordova)) { + fs.mkdirSync(pathLayoutCordova); + } + + // "copy" layout for camera. + if (fs.existsSync(pathLayoutCameraView)) { + var layoutCameraViewContent = fs.readFileSync(pathLayoutCameraView, {encoding: "utf8"}); + + fs.writeFileSync(pathLayoutCordova+"activity_camera_view.xml", layoutCameraViewContent); + } else { + console.error("File activity_camera_view.xml in plugin not found."); + process.exit(1); + } + + // add translations. + var pathTranslations = pathResPlugin+"translations.json"; + if (fs.existsSync(pathTranslations)) { + // get translations. + var translationsForApplications = fs.readFileSync(pathTranslations, {encoding: "utf8"}); + translationsForApplications = JSON.parse(translationsForApplications); + for (lang in translationsForApplications) { + var pathFileTranslate = pathResAndroidCordova+"values-"+lang+"/"; + + var objToXml; + // already exist, get data. + if (fs.existsSync(pathFileTranslate+"strings.xml")) { + var objToXml = fs.readFileSync(pathFileTranslate+"strings.xml", {encoding: "utf8"}); + parseString(objToXml, function (err, result) { + objToXml = result; + }); + } else { + // generate minimal object. + objToXml = { + resources: { + string: [] + } + }; + } + + // add message. + for (tag in translationsForApplications[lang]) { + objToXml["resources"]["string"].push({ + _: translationsForApplications[lang][tag], + $: { + name: tag + } + }); + } + + var xmlBuild = builder.buildObject(objToXml); + if (!fs.existsSync(pathFileTranslate)) { + fs.mkdirSync(pathFileTranslate); + } + fs.writeFileSync(pathFileTranslate+"strings.xml", xmlBuild); + } + } else { + console.error("File translations.json in plugin not found."); + process.exit(1); + } +} + +// Check if files required exist. +if (fs.existsSync(pathConfigXml)) { + // Get the name package of the current application. + var configContent = fs.readFileSync(pathConfigXml, {encoding: "utf8"}); + parseString(configContent, function (err, result) { + configContent = result; + }); + var packageName = configContent["widget"]["$"]["id"]; + + createClasses(packageName); + updateAndroidManifest(packageName); + updateConfig(); +} else { + console.error("File config.xml for cordova not found."); + process.exit(1); +} \ No newline at end of file diff --git a/plugin.xml b/plugin.xml new file mode 100644 index 0000000..5a64afc --- /dev/null +++ b/plugin.xml @@ -0,0 +1,34 @@ + + + customCamera + customCamera by Geneanet + undefined + custom,camera,geneanet + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/translations.json b/res/translations.json new file mode 100644 index 0000000..4bd9ea8 --- /dev/null +++ b/res/translations.json @@ -0,0 +1,11 @@ +{ + "fr": { + "Miniature": "Miniature", + "PHOTO": "Photo", + + }, + "en": { + "Miniature": "Miniature", + "PHOTO": "Photo", + } +} \ No newline at end of file diff --git a/src/android/CameraLauncher.java b/src/android/CameraLauncher.java new file mode 100644 index 0000000..4fc292c --- /dev/null +++ b/src/android/CameraLauncher.java @@ -0,0 +1,18 @@ +package org.geneanet.customcamera; + +import XXX_NAME_CURRENT_PACKAGE_XXX.CameraView; +import org.apache.cordova.CordovaPlugin; +import org.apache.cordova.CallbackContext; +import org.json.JSONArray; +import org.json.JSONException; + +import android.content.Intent; + +public class CameraLauncher extends CordovaPlugin { + public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException { + Intent intent = new Intent(this.cordova.getActivity(), CameraView.class); + cordova.getActivity().startActivity(intent); + + return true; + } +} diff --git a/src/android/.gitignore b/src/android/customCamera/.gitignore similarity index 100% rename from src/android/.gitignore rename to src/android/customCamera/.gitignore diff --git a/src/android/AndroidManifest.xml b/src/android/customCamera/AndroidManifest.xml similarity index 96% rename from src/android/AndroidManifest.xml rename to src/android/customCamera/AndroidManifest.xml index 55cab20..0e184ba 100644 --- a/src/android/AndroidManifest.xml +++ b/src/android/customCamera/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/src/android/ic_launcher-web.png b/src/android/customCamera/ic_launcher-web.png similarity index 100% rename from src/android/ic_launcher-web.png rename to src/android/customCamera/ic_launcher-web.png diff --git a/src/android/project.properties b/src/android/customCamera/project.properties similarity index 96% rename from src/android/project.properties rename to src/android/customCamera/project.properties index 8937e94..9b84a6b 100644 --- a/src/android/project.properties +++ b/src/android/customCamera/project.properties @@ -11,4 +11,4 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-14 +target=android-16 diff --git a/src/android/res/drawable-hdpi/colorise.jpg b/src/android/customCamera/res/drawable-hdpi/colorise.jpg similarity index 100% rename from src/android/res/drawable-hdpi/colorise.jpg rename to src/android/customCamera/res/drawable-hdpi/colorise.jpg diff --git a/src/android/res/drawable-hdpi/couthenans.jpg b/src/android/customCamera/res/drawable-hdpi/couthenans.jpg similarity index 100% rename from src/android/res/drawable-hdpi/couthenans.jpg rename to src/android/customCamera/res/drawable-hdpi/couthenans.jpg diff --git a/src/android/res/drawable-hdpi/custom_opacity_bar.xml b/src/android/customCamera/res/drawable-hdpi/custom_opacity_bar.xml similarity index 100% rename from src/android/res/drawable-hdpi/custom_opacity_bar.xml rename to src/android/customCamera/res/drawable-hdpi/custom_opacity_bar.xml diff --git a/src/android/res/drawable-hdpi/hericourt.jpg b/src/android/customCamera/res/drawable-hdpi/hericourt.jpg similarity index 100% rename from src/android/res/drawable-hdpi/hericourt.jpg rename to src/android/customCamera/res/drawable-hdpi/hericourt.jpg diff --git a/src/android/res/drawable-hdpi/ic_launcher.png b/src/android/customCamera/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from src/android/res/drawable-hdpi/ic_launcher.png rename to src/android/customCamera/res/drawable-hdpi/ic_launcher.png diff --git a/src/android/res/drawable-hdpi/labs.png b/src/android/customCamera/res/drawable-hdpi/labs.png similarity index 100% rename from src/android/res/drawable-hdpi/labs.png rename to src/android/customCamera/res/drawable-hdpi/labs.png diff --git a/src/android/res/drawable-hdpi/normal.jpg b/src/android/customCamera/res/drawable-hdpi/normal.jpg similarity index 100% rename from src/android/res/drawable-hdpi/normal.jpg rename to src/android/customCamera/res/drawable-hdpi/normal.jpg diff --git a/src/android/res/drawable-hdpi/paysage.jpg b/src/android/customCamera/res/drawable-hdpi/paysage.jpg similarity index 100% rename from src/android/res/drawable-hdpi/paysage.jpg rename to src/android/customCamera/res/drawable-hdpi/paysage.jpg diff --git a/src/android/res/drawable-hdpi/thumb.xml b/src/android/customCamera/res/drawable-hdpi/thumb.xml similarity index 100% rename from src/android/res/drawable-hdpi/thumb.xml rename to src/android/customCamera/res/drawable-hdpi/thumb.xml diff --git a/src/android/res/drawable-ldpi/custom_opacity_bar.xml b/src/android/customCamera/res/drawable-ldpi/custom_opacity_bar.xml similarity index 100% rename from src/android/res/drawable-ldpi/custom_opacity_bar.xml rename to src/android/customCamera/res/drawable-ldpi/custom_opacity_bar.xml diff --git a/src/android/res/drawable-mdpi/colorise.jpg b/src/android/customCamera/res/drawable-mdpi/colorise.jpg similarity index 100% rename from src/android/res/drawable-mdpi/colorise.jpg rename to src/android/customCamera/res/drawable-mdpi/colorise.jpg diff --git a/src/android/res/drawable-mdpi/couthenans.jpg b/src/android/customCamera/res/drawable-mdpi/couthenans.jpg similarity index 100% rename from src/android/res/drawable-mdpi/couthenans.jpg rename to src/android/customCamera/res/drawable-mdpi/couthenans.jpg diff --git a/src/android/res/drawable-mdpi/custom_opacity_bar.xml b/src/android/customCamera/res/drawable-mdpi/custom_opacity_bar.xml similarity index 100% rename from src/android/res/drawable-mdpi/custom_opacity_bar.xml rename to src/android/customCamera/res/drawable-mdpi/custom_opacity_bar.xml diff --git a/src/android/res/drawable-mdpi/hericourt.jpg b/src/android/customCamera/res/drawable-mdpi/hericourt.jpg similarity index 100% rename from src/android/res/drawable-mdpi/hericourt.jpg rename to src/android/customCamera/res/drawable-mdpi/hericourt.jpg diff --git a/src/android/res/drawable-mdpi/ic_launcher.png b/src/android/customCamera/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from src/android/res/drawable-mdpi/ic_launcher.png rename to src/android/customCamera/res/drawable-mdpi/ic_launcher.png diff --git a/src/android/res/drawable-mdpi/labs.png b/src/android/customCamera/res/drawable-mdpi/labs.png similarity index 100% rename from src/android/res/drawable-mdpi/labs.png rename to src/android/customCamera/res/drawable-mdpi/labs.png diff --git a/src/android/res/drawable-mdpi/normal.jpg b/src/android/customCamera/res/drawable-mdpi/normal.jpg similarity index 100% rename from src/android/res/drawable-mdpi/normal.jpg rename to src/android/customCamera/res/drawable-mdpi/normal.jpg diff --git a/src/android/res/drawable-mdpi/paysage.jpg b/src/android/customCamera/res/drawable-mdpi/paysage.jpg similarity index 100% rename from src/android/res/drawable-mdpi/paysage.jpg rename to src/android/customCamera/res/drawable-mdpi/paysage.jpg diff --git a/src/android/res/drawable-mdpi/thumb.xml b/src/android/customCamera/res/drawable-mdpi/thumb.xml similarity index 100% rename from src/android/res/drawable-mdpi/thumb.xml rename to src/android/customCamera/res/drawable-mdpi/thumb.xml diff --git a/src/android/res/drawable-xhdpi/colorise.jpg b/src/android/customCamera/res/drawable-xhdpi/colorise.jpg similarity index 100% rename from src/android/res/drawable-xhdpi/colorise.jpg rename to src/android/customCamera/res/drawable-xhdpi/colorise.jpg diff --git a/src/android/res/drawable-xhdpi/couthenans.jpg b/src/android/customCamera/res/drawable-xhdpi/couthenans.jpg similarity index 100% rename from src/android/res/drawable-xhdpi/couthenans.jpg rename to src/android/customCamera/res/drawable-xhdpi/couthenans.jpg diff --git a/src/android/res/drawable-xhdpi/custom_opacity_bar.xml b/src/android/customCamera/res/drawable-xhdpi/custom_opacity_bar.xml similarity index 100% rename from src/android/res/drawable-xhdpi/custom_opacity_bar.xml rename to src/android/customCamera/res/drawable-xhdpi/custom_opacity_bar.xml diff --git a/src/android/res/drawable-xhdpi/hericourt.jpg b/src/android/customCamera/res/drawable-xhdpi/hericourt.jpg similarity index 100% rename from src/android/res/drawable-xhdpi/hericourt.jpg rename to src/android/customCamera/res/drawable-xhdpi/hericourt.jpg diff --git a/src/android/res/drawable-xhdpi/ic_launcher.png b/src/android/customCamera/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from src/android/res/drawable-xhdpi/ic_launcher.png rename to src/android/customCamera/res/drawable-xhdpi/ic_launcher.png diff --git a/src/android/res/drawable-xhdpi/labs.png b/src/android/customCamera/res/drawable-xhdpi/labs.png similarity index 100% rename from src/android/res/drawable-xhdpi/labs.png rename to src/android/customCamera/res/drawable-xhdpi/labs.png diff --git a/src/android/res/drawable-xhdpi/normal.jpg b/src/android/customCamera/res/drawable-xhdpi/normal.jpg similarity index 100% rename from src/android/res/drawable-xhdpi/normal.jpg rename to src/android/customCamera/res/drawable-xhdpi/normal.jpg diff --git a/src/android/res/drawable-xhdpi/paysage.jpg b/src/android/customCamera/res/drawable-xhdpi/paysage.jpg similarity index 100% rename from src/android/res/drawable-xhdpi/paysage.jpg rename to src/android/customCamera/res/drawable-xhdpi/paysage.jpg diff --git a/src/android/res/drawable-xhdpi/thumb.xml b/src/android/customCamera/res/drawable-xhdpi/thumb.xml similarity index 100% rename from src/android/res/drawable-xhdpi/thumb.xml rename to src/android/customCamera/res/drawable-xhdpi/thumb.xml diff --git a/src/android/res/drawable-xxhdpi/colorise.jpg b/src/android/customCamera/res/drawable-xxhdpi/colorise.jpg similarity index 100% rename from src/android/res/drawable-xxhdpi/colorise.jpg rename to src/android/customCamera/res/drawable-xxhdpi/colorise.jpg diff --git a/src/android/res/drawable-xxhdpi/couthenans.jpg b/src/android/customCamera/res/drawable-xxhdpi/couthenans.jpg similarity index 100% rename from src/android/res/drawable-xxhdpi/couthenans.jpg rename to src/android/customCamera/res/drawable-xxhdpi/couthenans.jpg diff --git a/src/android/res/drawable-xxhdpi/custom_opacity_bar.xml b/src/android/customCamera/res/drawable-xxhdpi/custom_opacity_bar.xml similarity index 100% rename from src/android/res/drawable-xxhdpi/custom_opacity_bar.xml rename to src/android/customCamera/res/drawable-xxhdpi/custom_opacity_bar.xml diff --git a/src/android/res/drawable-xxhdpi/hericourt.jpg b/src/android/customCamera/res/drawable-xxhdpi/hericourt.jpg similarity index 100% rename from src/android/res/drawable-xxhdpi/hericourt.jpg rename to src/android/customCamera/res/drawable-xxhdpi/hericourt.jpg diff --git a/src/android/res/drawable-xxhdpi/ic_launcher.png b/src/android/customCamera/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from src/android/res/drawable-xxhdpi/ic_launcher.png rename to src/android/customCamera/res/drawable-xxhdpi/ic_launcher.png diff --git a/src/android/res/drawable-xxhdpi/labs.png b/src/android/customCamera/res/drawable-xxhdpi/labs.png similarity index 100% rename from src/android/res/drawable-xxhdpi/labs.png rename to src/android/customCamera/res/drawable-xxhdpi/labs.png diff --git a/src/android/res/drawable-xxhdpi/normal.jpg b/src/android/customCamera/res/drawable-xxhdpi/normal.jpg similarity index 100% rename from src/android/res/drawable-xxhdpi/normal.jpg rename to src/android/customCamera/res/drawable-xxhdpi/normal.jpg diff --git a/src/android/res/drawable-xxhdpi/paysage.jpg b/src/android/customCamera/res/drawable-xxhdpi/paysage.jpg similarity index 100% rename from src/android/res/drawable-xxhdpi/paysage.jpg rename to src/android/customCamera/res/drawable-xxhdpi/paysage.jpg diff --git a/src/android/res/drawable-xxhdpi/thumb.xml b/src/android/customCamera/res/drawable-xxhdpi/thumb.xml similarity index 100% rename from src/android/res/drawable-xxhdpi/thumb.xml rename to src/android/customCamera/res/drawable-xxhdpi/thumb.xml diff --git a/src/android/res/layout/activity_camera_view.xml b/src/android/customCamera/res/layout/activity_camera_view.xml similarity index 90% rename from src/android/res/layout/activity_camera_view.xml rename to src/android/customCamera/res/layout/activity_camera_view.xml index 57ba8d2..1fdb7fa 100644 --- a/src/android/res/layout/activity_camera_view.xml +++ b/src/android/customCamera/res/layout/activity_camera_view.xml @@ -27,7 +27,6 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:alpha="0.2" - android:contentDescription="@string/descImage" android:scaleType="fitXY" android:src="@drawable/normal" /> @@ -36,7 +35,6 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:alpha="0" - android:contentDescription="@string/descImage" android:scaleType="fitXY" android:src="@drawable/colorise" /> @@ -45,7 +43,6 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:alpha="0" - android:contentDescription="@string/descImage" android:rotation="90" android:src="@drawable/paysage" /> @@ -54,7 +51,6 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:alpha="0" - android:contentDescription="@string/descImage" android:rotation="90" android:src="@drawable/couthenans" /> @@ -63,7 +59,6 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:alpha="0" - android:contentDescription="@string/descImage" android:rotation="90" android:src="@drawable/hericourt" /> @@ -86,7 +81,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:contentDescription="@string/BoutonMiniature" android:onClick="showMiniature" android:text="@string/Miniature" /> @@ -99,7 +93,7 @@ android:minWidth="0dp" android:text="@string/PHOTO" /> - TestCustomCamera Hello world! Settings - CameraView + CameraViewNative Start Custom Camera Capture TODO diff --git a/src/android/res/values/styles.xml b/src/android/customCamera/res/values/styles.xml similarity index 100% rename from src/android/res/values/styles.xml rename to src/android/customCamera/res/values/styles.xml diff --git a/src/android/src/org/geneanet/customcamera/utils/CameraPreview.java b/src/android/customCamera/src/org/geneanet/customcamera/CameraPreview.java similarity index 98% rename from src/android/src/org/geneanet/customcamera/utils/CameraPreview.java rename to src/android/customCamera/src/org/geneanet/customcamera/CameraPreview.java index 9dea8a3..d96ab09 100644 --- a/src/android/src/org/geneanet/customcamera/utils/CameraPreview.java +++ b/src/android/customCamera/src/org/geneanet/customcamera/CameraPreview.java @@ -1,4 +1,4 @@ -package org.geneanet.customcamera.utils; +package org.geneanet.customcamera; import java.io.IOException; diff --git a/src/android/src/org/geneanet/customcamera/CameraView.java b/src/android/customCamera/src/org/geneanet/customcamera/CameraView.java similarity index 97% rename from src/android/src/org/geneanet/customcamera/CameraView.java rename to src/android/customCamera/src/org/geneanet/customcamera/CameraView.java index 8d36075..0bc86d6 100644 --- a/src/android/src/org/geneanet/customcamera/CameraView.java +++ b/src/android/customCamera/src/org/geneanet/customcamera/CameraView.java @@ -1,22 +1,16 @@ package org.geneanet.customcamera; +import org.geneanet.customcamera.*; + import java.util.List; import java.lang.Math; -import org.geneanet.customcamera.utils.CameraPreview; -import org.geneanet.customcamera.utils.CustomCamera; -import org.geneanet.testcustomcamera.R; - import android.app.Activity; - import android.hardware.Camera; -import android.hardware.Camera.Parameters; import android.os.Bundle; -import android.util.Log; import android.view.Display; import android.view.Gravity; import android.view.MotionEvent; -import android.view.SurfaceHolder; import android.view.View; import android.view.ViewGroup.LayoutParams; import android.view.Window; @@ -50,7 +44,7 @@ public class CameraView extends Activity { /* Remove notification bar */ this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN); - + setContentView(R.layout.activity_camera_view); /* Get informations about the device */ @@ -274,4 +268,4 @@ public class CameraView extends Activity { // mPreview.getHolder().removeCallback(mPreview); System.out.println("onResume -> test "); } -} \ No newline at end of file +} diff --git a/src/android/src/org/geneanet/customcamera/utils/CustomCamera.java b/src/android/customCamera/src/org/geneanet/customcamera/CustomCamera.java similarity index 96% rename from src/android/src/org/geneanet/customcamera/utils/CustomCamera.java rename to src/android/customCamera/src/org/geneanet/customcamera/CustomCamera.java index 85dd2b9..fc661f9 100644 --- a/src/android/src/org/geneanet/customcamera/utils/CustomCamera.java +++ b/src/android/customCamera/src/org/geneanet/customcamera/CustomCamera.java @@ -1,4 +1,4 @@ -package org.geneanet.customcamera.utils; +package org.geneanet.customcamera; import android.hardware.Camera; diff --git a/src/android/src/org/geneanet/customcamera/MainActivity.java b/src/android/customCamera/src/org/geneanet/customcamera/MainActivity.java similarity index 98% rename from src/android/src/org/geneanet/customcamera/MainActivity.java rename to src/android/customCamera/src/org/geneanet/customcamera/MainActivity.java index 0c8e626..5f406e4 100644 --- a/src/android/src/org/geneanet/customcamera/MainActivity.java +++ b/src/android/customCamera/src/org/geneanet/customcamera/MainActivity.java @@ -1,6 +1,6 @@ package org.geneanet.customcamera; -import org.geneanet.testcustomcamera.R; +import org.geneanet.customcamera.R; import android.app.Activity; import android.content.Context; diff --git a/src/android/src/org/geneanet/customcamera/utils/VerticalSeekBar.java b/src/android/customCamera/src/org/geneanet/customcamera/VerticalSeekBar.java similarity index 97% rename from src/android/src/org/geneanet/customcamera/utils/VerticalSeekBar.java rename to src/android/customCamera/src/org/geneanet/customcamera/VerticalSeekBar.java index ff97199..c7609be 100644 --- a/src/android/src/org/geneanet/customcamera/utils/VerticalSeekBar.java +++ b/src/android/customCamera/src/org/geneanet/customcamera/VerticalSeekBar.java @@ -1,4 +1,4 @@ -package org.geneanet.customcamera.utils; +package org.geneanet.customcamera; import android.content.Context; import android.graphics.Canvas; diff --git a/www/customCamera.js b/www/customCamera.js index c96f2f3..40cd64e 100644 --- a/www/customCamera.js +++ b/www/customCamera.js @@ -11,8 +11,24 @@ var customCameraExport = function() { }; // add method. -customCameraExport.prototype.jesaispasquoionverra = function() { - +customCameraExport.prototype.getPicture = function() { + alert("Oh yeah !"); +}; + +customCameraExport.prototype.startCamera = function() { + exec( + function(result) { + console.log("success"); + console.log(result); + }, + function(result) { + console.log("fail"); + console.log(result); + }, + "CustomCamera", + "testAction", + [] + ); }; module.exports = new customCameraExport(); \ No newline at end of file