diff --git a/hooks/before_build/generateActivity.js b/hooks/before_build/generateActivity.js index de5f0dc..d43d251 100644 --- a/hooks/before_build/generateActivity.js +++ b/hooks/before_build/generateActivity.js @@ -166,7 +166,7 @@ var updateConfig = function() { var contentResAndroidPlugin = fs.readdirSync(pathResAndroidPlugin); for (var i = contentResAndroidPlugin.length - 1; i >= 0; i--) { var nameDirDrawable = contentResAndroidPlugin[i]; - if (nameDirDrawable.match(/^drawable-.*$/) || nameDirDrawable.match(/^values-?.*$/)) { + if (nameDirDrawable.match(/^drawable-?.*$/) || nameDirDrawable.match(/^values-?.*$/)) { var contentDrawableDir = fs.readdirSync(pathResAndroidPlugin+nameDirDrawable); for (var j = contentDrawableDir.length - 1; j >= 0; j--) { var nameFileInDrawable = contentDrawableDir[j]; diff --git a/plugin.xml b/plugin.xml index dccb0a6..2d57c06 100644 --- a/plugin.xml +++ b/plugin.xml @@ -5,12 +5,12 @@ id="org.geneanet.customCamera" version="0.0.1" > - customCamera + GeneanetCustomCamera customCamera by Geneanet undefined custom,camera,geneanet - - + + diff --git a/src/android/CameraLauncher.java b/src/android/CameraLauncher.java index f995f9d..5db8d89 100644 --- a/src/android/CameraLauncher.java +++ b/src/android/CameraLauncher.java @@ -52,6 +52,8 @@ public class CameraLauncher extends CordovaPlugin { } intent.putExtra("miniature", args.getBoolean(1)); + intent.putExtra("cameraBackgroundColor", args.getString(2)); + intent.putExtra("cameraBackgroundColorPressed", args.getString(3)); cordova.startActivityForResult((CordovaPlugin) this, intent, CameraLauncher.REQUEST_CODE); diff --git a/src/android/customCamera/res/drawable-hdpi/accept.png b/src/android/customCamera/res/drawable-hdpi/accept.png new file mode 100644 index 0000000..2132a9b Binary files /dev/null and b/src/android/customCamera/res/drawable-hdpi/accept.png differ diff --git a/src/android/customCamera/res/drawable-hdpi/capture.png b/src/android/customCamera/res/drawable-hdpi/capture.png new file mode 100644 index 0000000..f79bed6 Binary files /dev/null and b/src/android/customCamera/res/drawable-hdpi/capture.png differ diff --git a/src/android/customCamera/res/drawable-hdpi/colorise.jpg b/src/android/customCamera/res/drawable-hdpi/colorise.jpg deleted file mode 100644 index 6002eaf..0000000 Binary files a/src/android/customCamera/res/drawable-hdpi/colorise.jpg and /dev/null differ diff --git a/src/android/customCamera/res/drawable-hdpi/couthenans.jpg b/src/android/customCamera/res/drawable-hdpi/couthenans.jpg deleted file mode 100644 index 6f297aa..0000000 Binary files a/src/android/customCamera/res/drawable-hdpi/couthenans.jpg and /dev/null differ diff --git a/src/android/customCamera/res/drawable-hdpi/delete.png b/src/android/customCamera/res/drawable-hdpi/delete.png new file mode 100644 index 0000000..cea182e Binary files /dev/null and b/src/android/customCamera/res/drawable-hdpi/delete.png differ diff --git a/src/android/customCamera/res/drawable-hdpi/hericourt.jpg b/src/android/customCamera/res/drawable-hdpi/hericourt.jpg deleted file mode 100644 index d8cd591..0000000 Binary files a/src/android/customCamera/res/drawable-hdpi/hericourt.jpg and /dev/null differ diff --git a/src/android/customCamera/res/drawable-hdpi/ic_launcher.png b/src/android/customCamera/res/drawable-hdpi/ic_launcher.png deleted file mode 100644 index 288b665..0000000 Binary files a/src/android/customCamera/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/src/android/customCamera/res/drawable-hdpi/labs.png b/src/android/customCamera/res/drawable-hdpi/labs.png deleted file mode 100644 index e4fada3..0000000 Binary files a/src/android/customCamera/res/drawable-hdpi/labs.png and /dev/null differ diff --git a/src/android/customCamera/res/drawable-hdpi/normal.jpg b/src/android/customCamera/res/drawable-hdpi/normal.jpg deleted file mode 100644 index 8e97385..0000000 Binary files a/src/android/customCamera/res/drawable-hdpi/normal.jpg and /dev/null differ diff --git a/src/android/customCamera/res/drawable-hdpi/paysage.jpg b/src/android/customCamera/res/drawable-hdpi/paysage.jpg deleted file mode 100644 index 1b9ff16..0000000 Binary files a/src/android/customCamera/res/drawable-hdpi/paysage.jpg and /dev/null differ diff --git a/src/android/customCamera/res/drawable-ldpi/capture.png b/src/android/customCamera/res/drawable-ldpi/capture.png new file mode 100644 index 0000000..f489d86 Binary files /dev/null and b/src/android/customCamera/res/drawable-ldpi/capture.png differ diff --git a/src/android/customCamera/res/drawable-ldpi/custom_opacity_bar.xml b/src/android/customCamera/res/drawable-ldpi/custom_opacity_bar.xml deleted file mode 100644 index 6a987fc..0000000 --- a/src/android/customCamera/res/drawable-ldpi/custom_opacity_bar.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/android/customCamera/res/drawable-mdpi/capture.png b/src/android/customCamera/res/drawable-mdpi/capture.png new file mode 100644 index 0000000..5e16088 Binary files /dev/null and b/src/android/customCamera/res/drawable-mdpi/capture.png differ diff --git a/src/android/customCamera/res/drawable-mdpi/colorise.jpg b/src/android/customCamera/res/drawable-mdpi/colorise.jpg deleted file mode 100644 index 6002eaf..0000000 Binary files a/src/android/customCamera/res/drawable-mdpi/colorise.jpg and /dev/null differ diff --git a/src/android/customCamera/res/drawable-mdpi/couthenans.jpg b/src/android/customCamera/res/drawable-mdpi/couthenans.jpg deleted file mode 100644 index 6f297aa..0000000 Binary files a/src/android/customCamera/res/drawable-mdpi/couthenans.jpg and /dev/null differ diff --git a/src/android/customCamera/res/drawable-mdpi/custom_opacity_bar.xml b/src/android/customCamera/res/drawable-mdpi/custom_opacity_bar.xml deleted file mode 100644 index 4a86a09..0000000 --- a/src/android/customCamera/res/drawable-mdpi/custom_opacity_bar.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/android/customCamera/res/drawable-mdpi/hericourt.jpg b/src/android/customCamera/res/drawable-mdpi/hericourt.jpg deleted file mode 100644 index d8cd591..0000000 Binary files a/src/android/customCamera/res/drawable-mdpi/hericourt.jpg and /dev/null differ diff --git a/src/android/customCamera/res/drawable-mdpi/ic_launcher.png b/src/android/customCamera/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index 6ae570b..0000000 Binary files a/src/android/customCamera/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/src/android/customCamera/res/drawable-mdpi/labs.png b/src/android/customCamera/res/drawable-mdpi/labs.png deleted file mode 100644 index e4fada3..0000000 Binary files a/src/android/customCamera/res/drawable-mdpi/labs.png and /dev/null differ diff --git a/src/android/customCamera/res/drawable-mdpi/normal.jpg b/src/android/customCamera/res/drawable-mdpi/normal.jpg deleted file mode 100644 index 8e97385..0000000 Binary files a/src/android/customCamera/res/drawable-mdpi/normal.jpg and /dev/null differ diff --git a/src/android/customCamera/res/drawable-mdpi/paysage.jpg b/src/android/customCamera/res/drawable-mdpi/paysage.jpg deleted file mode 100644 index 1b9ff16..0000000 Binary files a/src/android/customCamera/res/drawable-mdpi/paysage.jpg and /dev/null differ diff --git a/src/android/customCamera/res/drawable-mdpi/thumb.xml b/src/android/customCamera/res/drawable-mdpi/thumb.xml deleted file mode 100644 index 5c01649..0000000 --- a/src/android/customCamera/res/drawable-mdpi/thumb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/android/customCamera/res/drawable-xhdpi/capture.png b/src/android/customCamera/res/drawable-xhdpi/capture.png new file mode 100644 index 0000000..8af281c Binary files /dev/null and b/src/android/customCamera/res/drawable-xhdpi/capture.png differ diff --git a/src/android/customCamera/res/drawable-xhdpi/colorise.jpg b/src/android/customCamera/res/drawable-xhdpi/colorise.jpg deleted file mode 100644 index 6002eaf..0000000 Binary files a/src/android/customCamera/res/drawable-xhdpi/colorise.jpg and /dev/null differ diff --git a/src/android/customCamera/res/drawable-xhdpi/couthenans.jpg b/src/android/customCamera/res/drawable-xhdpi/couthenans.jpg deleted file mode 100644 index 6f297aa..0000000 Binary files a/src/android/customCamera/res/drawable-xhdpi/couthenans.jpg and /dev/null differ diff --git a/src/android/customCamera/res/drawable-xhdpi/custom_opacity_bar.xml b/src/android/customCamera/res/drawable-xhdpi/custom_opacity_bar.xml deleted file mode 100644 index 4a86a09..0000000 --- a/src/android/customCamera/res/drawable-xhdpi/custom_opacity_bar.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/android/customCamera/res/drawable-xhdpi/hericourt.jpg b/src/android/customCamera/res/drawable-xhdpi/hericourt.jpg deleted file mode 100644 index d8cd591..0000000 Binary files a/src/android/customCamera/res/drawable-xhdpi/hericourt.jpg and /dev/null differ diff --git a/src/android/customCamera/res/drawable-xhdpi/ic_launcher.png b/src/android/customCamera/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index d4fb7cd..0000000 Binary files a/src/android/customCamera/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/src/android/customCamera/res/drawable-xhdpi/labs.png b/src/android/customCamera/res/drawable-xhdpi/labs.png deleted file mode 100644 index e4fada3..0000000 Binary files a/src/android/customCamera/res/drawable-xhdpi/labs.png and /dev/null differ diff --git a/src/android/customCamera/res/drawable-xhdpi/normal.jpg b/src/android/customCamera/res/drawable-xhdpi/normal.jpg deleted file mode 100644 index 8e97385..0000000 Binary files a/src/android/customCamera/res/drawable-xhdpi/normal.jpg and /dev/null differ diff --git a/src/android/customCamera/res/drawable-xhdpi/paysage.jpg b/src/android/customCamera/res/drawable-xhdpi/paysage.jpg deleted file mode 100644 index 1b9ff16..0000000 Binary files a/src/android/customCamera/res/drawable-xhdpi/paysage.jpg and /dev/null differ diff --git a/src/android/customCamera/res/drawable-xhdpi/thumb.xml b/src/android/customCamera/res/drawable-xhdpi/thumb.xml deleted file mode 100644 index 5c01649..0000000 --- a/src/android/customCamera/res/drawable-xhdpi/thumb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/android/customCamera/res/drawable-xxhdpi/capture.png b/src/android/customCamera/res/drawable-xxhdpi/capture.png new file mode 100644 index 0000000..7bf527d Binary files /dev/null and b/src/android/customCamera/res/drawable-xxhdpi/capture.png differ diff --git a/src/android/customCamera/res/drawable-xxhdpi/colorise.jpg b/src/android/customCamera/res/drawable-xxhdpi/colorise.jpg deleted file mode 100644 index 6002eaf..0000000 Binary files a/src/android/customCamera/res/drawable-xxhdpi/colorise.jpg and /dev/null differ diff --git a/src/android/customCamera/res/drawable-xxhdpi/couthenans.jpg b/src/android/customCamera/res/drawable-xxhdpi/couthenans.jpg deleted file mode 100644 index 6f297aa..0000000 Binary files a/src/android/customCamera/res/drawable-xxhdpi/couthenans.jpg and /dev/null differ diff --git a/src/android/customCamera/res/drawable-xxhdpi/custom_opacity_bar.xml b/src/android/customCamera/res/drawable-xxhdpi/custom_opacity_bar.xml deleted file mode 100644 index 4a86a09..0000000 --- a/src/android/customCamera/res/drawable-xxhdpi/custom_opacity_bar.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/android/customCamera/res/drawable-xxhdpi/hericourt.jpg b/src/android/customCamera/res/drawable-xxhdpi/hericourt.jpg deleted file mode 100644 index d8cd591..0000000 Binary files a/src/android/customCamera/res/drawable-xxhdpi/hericourt.jpg and /dev/null differ diff --git a/src/android/customCamera/res/drawable-xxhdpi/ic_launcher.png b/src/android/customCamera/res/drawable-xxhdpi/ic_launcher.png deleted file mode 100644 index 85a6081..0000000 Binary files a/src/android/customCamera/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/src/android/customCamera/res/drawable-xxhdpi/labs.png b/src/android/customCamera/res/drawable-xxhdpi/labs.png deleted file mode 100644 index e4fada3..0000000 Binary files a/src/android/customCamera/res/drawable-xxhdpi/labs.png and /dev/null differ diff --git a/src/android/customCamera/res/drawable-xxhdpi/normal.jpg b/src/android/customCamera/res/drawable-xxhdpi/normal.jpg deleted file mode 100644 index 8e97385..0000000 Binary files a/src/android/customCamera/res/drawable-xxhdpi/normal.jpg and /dev/null differ diff --git a/src/android/customCamera/res/drawable-xxhdpi/paysage.jpg b/src/android/customCamera/res/drawable-xxhdpi/paysage.jpg deleted file mode 100644 index 1b9ff16..0000000 Binary files a/src/android/customCamera/res/drawable-xxhdpi/paysage.jpg and /dev/null differ diff --git a/src/android/customCamera/res/drawable-xxhdpi/thumb.xml b/src/android/customCamera/res/drawable-xxhdpi/thumb.xml deleted file mode 100644 index 5c01649..0000000 --- a/src/android/customCamera/res/drawable-xxhdpi/thumb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/android/customCamera/res/drawable-xxxhdpi/capture.png b/src/android/customCamera/res/drawable-xxxhdpi/capture.png new file mode 100644 index 0000000..23cff10 Binary files /dev/null and b/src/android/customCamera/res/drawable-xxxhdpi/capture.png differ diff --git a/src/android/customCamera/res/drawable-hdpi/custom_opacity_bar.xml b/src/android/customCamera/res/drawable/custom_opacity_bar.xml similarity index 100% rename from src/android/customCamera/res/drawable-hdpi/custom_opacity_bar.xml rename to src/android/customCamera/res/drawable/custom_opacity_bar.xml diff --git a/src/android/customCamera/res/drawable/round_button.xml b/src/android/customCamera/res/drawable/round_button.xml new file mode 100644 index 0000000..7b02ec2 --- /dev/null +++ b/src/android/customCamera/res/drawable/round_button.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/src/android/customCamera/res/drawable-hdpi/thumb.xml b/src/android/customCamera/res/drawable/thumb.xml similarity index 100% rename from src/android/customCamera/res/drawable-hdpi/thumb.xml rename to src/android/customCamera/res/drawable/thumb.xml diff --git a/src/android/customCamera/res/layout/activity_camera_view.xml b/src/android/customCamera/res/layout/activity_camera_view.xml index 92cd692..b0b9605 100644 --- a/src/android/customCamera/res/layout/activity_camera_view.xml +++ b/src/android/customCamera/res/layout/activity_camera_view.xml @@ -38,14 +38,13 @@ android:layout_weight="0.2" android:onClick="buttonMiniature" android:text="@string/miniature" /> - -