From 609035de493e627c6904d7eac39f5b78abe36a00 Mon Sep 17 00:00:00 2001
From: Christophe BOUCAUT <christophe.boucaut@geneanet.org>
Date: Wed, 3 Jun 2015 12:49:19 +0200
Subject: [PATCH] Fix bug where texts  "-" and "+"  aren't hidden after that we
 took a picture.

---
 .../res/layout/activity_camera_view.xml       |  4 ++--
 .../geneanet/customcamera/CameraActivity.java | 24 +++++++++++++++----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/android/customCamera/res/layout/activity_camera_view.xml b/src/android/customCamera/res/layout/activity_camera_view.xml
index 586f7b1..d7ab97f 100644
--- a/src/android/customCamera/res/layout/activity_camera_view.xml
+++ b/src/android/customCamera/res/layout/activity_camera_view.xml
@@ -91,7 +91,7 @@
             android:orientation="horizontal" >
 
             <TextView
-                android:id="@+id/textView1"
+                android:id="@+id/textZoomMin"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="0.2"
@@ -108,7 +108,7 @@
                 android:visibility="visible" />
 
             <TextView
-                android:id="@+id/textView2"
+                android:id="@+id/textZoomMax"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="0.2"
diff --git a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
index cecc726..97646a7 100644
--- a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
+++ b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
@@ -34,6 +34,7 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
+import android.widget.TextView;
 
 import org.geneanet.customcamera.CameraPreview;
 import org.geneanet.customcamera.ManagerCamera;
@@ -132,9 +133,9 @@ public class CameraActivity extends Activity {
       
       zoomLevel.setMax(maxZoom);
       zoomLevel.setProgress(zoom);
-      zoomLevel.setVisibility(View.VISIBLE);
+      displayZoomLevel(View.VISIBLE);
     } else {
-      zoomLevel.setVisibility(View.GONE);
+      displayZoomLevel(View.GONE);
     }
     
     updateStateFlash(stateFlash);
@@ -406,7 +407,7 @@ public class CameraActivity extends Activity {
     SeekBar zoomLevel = (SeekBar) findViewById(R.id.zoomLevel);
     zoomLevel.setMax(maxZoom);
     zoomLevel.setProgress(zoom * 2);
-    zoomLevel.setVisibility(View.VISIBLE);
+    displayZoomLevel(View.VISIBLE);
   }
 
   /** To set background in the view. */
@@ -495,6 +496,19 @@ public class CameraActivity extends Activity {
     });
   }
   
+  /**
+   * To manage the display of the zoom bar.
+   * @param displayStatus
+   */
+  public void displayZoomLevel(int displayStatus) {
+	  TextView textZoomMin = (TextView) findViewById(R.id.textZoomMin);
+	  TextView textZoomMax = (TextView) findViewById(R.id.textZoomMax);
+	  SeekBar zoomLevel = (SeekBar) findViewById(R.id.zoomLevel);
+	  textZoomMin.setVisibility(displayStatus);
+	  textZoomMax.setVisibility(displayStatus);
+	  zoomLevel.setVisibility(displayStatus);
+  }
+  
   /**
    * Set the size and the gravity of the miniature function of photo is taken or not.
    * @param imageView Reference to the background image.
@@ -558,7 +572,7 @@ public class CameraActivity extends Activity {
       // Show/hide elements when a photo is taken 
       keepPhoto.setVisibility(View.VISIBLE);  
       photo.setVisibility(View.GONE);   
-      zoomLevel.setVisibility(View.GONE);
+      displayZoomLevel(View.GONE);
       flash.setVisibility(View.GONE);
       switchCamera.setVisibility(View.GONE);
       
@@ -574,7 +588,7 @@ public class CameraActivity extends Activity {
       keepPhoto.setVisibility(View.GONE);
       photo.setVisibility(View.VISIBLE);
       if (paramsCamera.isZoomSupported()) {
-        zoomLevel.setVisibility(View.VISIBLE);
+        displayZoomLevel(View.VISIBLE);
       }
       
       if (this.getIntent().getBooleanExtra("switchFlash", true) && hasFlash()) {