From bc0844f1ed9ffa7d1273d3a98eb47f62697c5582 Mon Sep 17 00:00:00 2001 From: Thomas BOY Date: Mon, 9 Feb 2015 16:22:57 +0100 Subject: [PATCH] If we don't have a background image, disable miniature and opacity options since CameraLauncher.java. --- src/android/CameraLauncher.java | 11 +++++++++-- .../src/org/geneanet/customcamera/CameraActivity.java | 5 ----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/android/CameraLauncher.java b/src/android/CameraLauncher.java index faa065c..9e9d208 100644 --- a/src/android/CameraLauncher.java +++ b/src/android/CameraLauncher.java @@ -74,14 +74,21 @@ public class CameraLauncher extends CordovaPlugin { TransferBigData.setImgBackgroundBase64OtherOrientation(imgBackgroundBase64OtherOrientation); } - intent.putExtra("miniature", args.getBoolean(2)); + // If we don't have a background image, disable miniature and opacity options. + if (TransferBigData.getImgBackgroundBase64() == null) { + intent.putExtra("miniature", false); + intent.putExtra("opacity", false); + } else { + intent.putExtra("miniature", args.getBoolean(2)); + intent.putExtra("opacity", args.getBoolean(7)); + } + intent.putExtra("saveInGallery", args.getBoolean(3)); intent.putExtra("cameraBackgroundColor", args.getString(4)); intent.putExtra("cameraBackgroundColorPressed", args.getString(5)); if (args.getInt(6) >= 0 && args.getInt(6) <= 100) { intent.putExtra("quality", args.getInt(6)); } - intent.putExtra("opacity", args.getBoolean(7)); intent.putExtra("startOrientation", this.cordova.getActivity().getResources().getConfiguration().orientation); intent.putExtra("defaultFlash", args.getInt(8)); diff --git a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java index 598eebf..03924c6 100644 --- a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java +++ b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java @@ -460,11 +460,6 @@ public class CameraActivity extends Activity { RelativeLayout.TRUE); background.setLayoutParams(paramsMiniature); - } else { - Button miniature = (Button) findViewById(R.id.miniature); - miniature.setVisibility(View.INVISIBLE); - SeekBar switchOpacity = (SeekBar) findViewById(R.id.switchOpacity); - switchOpacity.setVisibility(View.INVISIBLE); } }