From a1b1e91bcf9fcd8df844b9e4b4c4367089ca523c Mon Sep 17 00:00:00 2001
From: Christophe BOUCAUT <christophe.boucaut@geneanet.org>
Date: Wed, 3 Jun 2015 12:25:18 +0200
Subject: [PATCH] Design the take picture bar and zoom + set the position of
 the opacity bar

---
 res/translations.json                         |  4 +-
 .../res/layout/activity_camera_view.xml       | 76 ++++++++++++++-----
 .../customCamera/res/values/strings.xml       |  2 +
 3 files changed, 60 insertions(+), 22 deletions(-)

diff --git a/res/translations.json b/res/translations.json
index 5fd127c..50e892c 100644
--- a/res/translations.json
+++ b/res/translations.json
@@ -3,7 +3,9 @@
         "miniature": "Miniature",
         "capture": "Capture",
         "acceptePicture": "Valid the picture",
-        "declinePicture": "Decline the picture"
+        "declinePicture": "Decline the picture",
+        "zoomMin": "-",
+        "zoomMax": "+"
     },
     "fr": {
         "miniature": "Miniature",
diff --git a/src/android/customCamera/res/layout/activity_camera_view.xml b/src/android/customCamera/res/layout/activity_camera_view.xml
index b1ca073..97c0860 100644
--- a/src/android/customCamera/res/layout/activity_camera_view.xml
+++ b/src/android/customCamera/res/layout/activity_camera_view.xml
@@ -68,6 +68,13 @@
 	        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"
@@ -77,20 +84,56 @@
         android:layout_alignParentLeft="true"
         android:orientation="vertical" >
 
-        <SeekBar
-            android:id="@+id/zoomLevel"
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal" >
+
+            <TextView
+                android:id="@+id/textView1"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.2"
+                android:gravity="right"
+                android:text="@string/zoomMin"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@color/white" />
+
+            <SeekBar
+                android:id="@+id/zoomLevel"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.6"
+                android:visibility="visible" />
+
+            <TextView
+                android:id="@+id/textView2"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.2"
+                android:text="@string/zoomMax"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@color/white" />
+
+        </LinearLayout>
+
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:visibility="visible" />
+            android:background="@color/black"
+            android:gravity="center"
+            android:orientation="vertical" >
 
-        <ImageButton
-            android:id="@+id/capture"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="@drawable/round_button"
-            android:src="@drawable/capture" />
+            <ImageButton
+                android:id="@+id/capture"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/round_button"
+                android:src="@drawable/capture" />
+
+        </LinearLayout>
     </LinearLayout>
     
     <LinearLayout
@@ -123,24 +166,15 @@
             android:padding="@dimen/default_padding" />
 
     </LinearLayout>
-    
-    <ImageView
-        android:id="@+id/background"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent" 
-        android:alpha="0.2"
-        android:scaleType="fitXY" />
 
     <org.geneanet.customcamera.VerticalSeekBar
         android:id="@+id/switchOpacity"
         android:layout_width="wrap_content"
-        android:layout_height="300dp"
-        android:layout_above="@+id/beforePhoto"
+        android:layout_height="250dp"
         android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
         android:layout_weight="0"
         android:max="10"
-        android:maxHeight="13dp"
-        android:minHeight="0dp"
         android:progress="5"
         android:progressDrawable="@drawable/custom_opacity_bar"
         android:secondaryProgress="10"
diff --git a/src/android/customCamera/res/values/strings.xml b/src/android/customCamera/res/values/strings.xml
index c6947f0..c8b4692 100644
--- a/src/android/customCamera/res/values/strings.xml
+++ b/src/android/customCamera/res/values/strings.xml
@@ -13,4 +13,6 @@
 	  <string name="descImage">Il s\'agit de l\'image de fond de l\'appareil photo</string>
 	  <string name="acceptePicture">Accepter Photo</string>
 	  <string name="declinePicture">Refuser Photo</string>
+	  <string name="zoomMin">-</string>
+	  <string name="zoomMax">+</string>
 </resources>