From 33be9e6b8767b39d13d0c6cb9a7656f19c2f0933 Mon Sep 17 00:00:00 2001
From: Christophe BOUCAUT <christophe.boucaut@geneanet.org>
Date: Thu, 4 Jun 2015 12:16:46 +0200
Subject: [PATCH] Change operation with miniature. Use only the button to
 minimize or maximize the picture.

---
 .../res/layout/activity_camera_view.xml       | 14 ++++-----
 .../geneanet/customcamera/CameraActivity.java | 30 ++++++++-----------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/android/customCamera/res/layout/activity_camera_view.xml b/src/android/customCamera/res/layout/activity_camera_view.xml
index 2d307fc..a879972 100644
--- a/src/android/customCamera/res/layout/activity_camera_view.xml
+++ b/src/android/customCamera/res/layout/activity_camera_view.xml
@@ -15,6 +15,13 @@
         android:layout_width="fill_parent"
         android:layout_height="match_parent" />
     
+    <ImageView
+        android:id="@+id/background"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent" 
+        android:alpha="0.2"
+        android:scaleType="fitXY" />
+    
     <LinearLayout
         android:id="@+id/actionBar"
         android:layout_width="fill_parent"
@@ -69,13 +76,6 @@
 	        android:src="@drawable/flash" />
 
     </LinearLayout>
-    
-    <ImageView
-        android:id="@+id/background"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent" 
-        android:alpha="0.2"
-        android:scaleType="fitXY" />
 
     <LinearLayout
         android:id="@+id/beforePhoto"
diff --git a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
index 5cdd651..60b06e8 100644
--- a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
+++ b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
@@ -519,25 +519,19 @@ public class CameraActivity extends Activity {
    */
   public void buttonMiniature(View view) {
     ImageView background = (ImageView) findViewById(R.id.background);
-    final ImageButton miniature = (ImageButton) view;
+    ImageButton miniature = (ImageButton) view;
 
-    modeMiniature = true;
-    // Set new size for miniature layout.
-    setParamsMiniature(background, true);
-    // Hide the miniature button.
-    miniature.setVisibility(View.GONE);
-      
-    // Add event on click action for the miniature picture.
-    background.setOnClickListener(new View.OnClickListener() {
-      public void onClick(View view) {
-        modeMiniature = false;
-        ImageView background = (ImageView) view;
-        // Resize miniature.
-        background.setClickable(false);
-        setBackground();
-        miniature.setVisibility(View.VISIBLE);
-      }
-    });
+    if (modeMiniature) {
+      modeMiniature = false;
+      miniature.setImageResource(R.drawable.minimise);
+      // Reset the default position and size for the background.
+      setBackground();
+    } else {
+      modeMiniature = true;
+      miniature.setImageResource(R.drawable.maximise);
+      // Set new size for miniature layout.
+      setParamsMiniature(background, true);
+    }
   }
   
   /**