From 53431cb5af17453c91585d3ab06a859e068c2522 Mon Sep 17 00:00:00 2001
From: Thomas BOY <thomas.boy@geneanet.org>
Date: Mon, 1 Dec 2014 13:05:35 +0100
Subject: [PATCH 1/3] =?UTF-8?q?Refonte=20des=20layout=20(plus=20simple)=20?=
 =?UTF-8?q?et=20modifications=20en=20cons=C3=A9quence=20dans=20le=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/layout/activity_camera_view.xml       | 137 ++++++++----------
 .../geneanet/customcamera/CameraActivity.java |  23 ++-
 2 files changed, 79 insertions(+), 81 deletions(-)

diff --git a/src/android/customCamera/res/layout/activity_camera_view.xml b/src/android/customCamera/res/layout/activity_camera_view.xml
index 5a41113..4a8791b 100644
--- a/src/android/customCamera/res/layout/activity_camera_view.xml
+++ b/src/android/customCamera/res/layout/activity_camera_view.xml
@@ -13,7 +13,9 @@
 
     <FrameLayout
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent" >
+        android:layout_height="fill_parent"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true" >
 
         <ImageView
             android:id="@+id/normal"
@@ -24,86 +26,71 @@
             android:src="@drawable/normal" />
     </FrameLayout>
 
-    <GridLayout
+    <LinearLayout
+        android:id="@+id/linearLayout1"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:columnCount="4" >
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:gravity="bottom" >
 
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="match_parent"
-            android:orientation="horizontal" >
-
-            <RelativeLayout
-                android:id="@+id/miniature_layout"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent" >
-
-                <Button
-                    android:id="@+id/miniature"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_gravity="bottom"
-                    android:onClick="showMiniature"
-                    android:text="@string/miniature" />
-
-            </RelativeLayout>
-
-            <Button
-                android:id="@+id/capture"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:layout_weight="0.74"
-                android:text="@string/capture"
-                android:onClick="takePhoto" />
-
-            <org.geneanet.customcamera.VerticalSeekBar
-                android:id="@+id/switchOpacity"
-                android:layout_width="wrap_content"
-                android:layout_height="300dp"
-                android:layout_gravity="center_vertical|right"
-                android:layout_weight="0"
-                android:alpha="0.6"
-                android:max="7"
-                android:maxHeight="13dp"
-                android:minHeight="0dp"
-                android:progress="0"
-                android:progressDrawable="@drawable/custom_opacity_bar"
-                android:secondaryProgress="7"
-                android:thumb="@drawable/thumb" />
-        </LinearLayout>
-    </GridLayout>
-
-    <GridLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:columnCount="2" >
-
-        <LinearLayout
-            android:id="@+id/keepPhoto"
-            android:layout_width="fill_parent"
+        <Button
+            android:id="@+id/miniature"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
+            android:layout_weight="0.2"
+            android:onClick="showMiniature"
+            android:text="@string/miniature" />
+
+        <Button
+            android:id="@+id/capture"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:onClick="takePhoto"
+            android:text="@string/capture" />
+
+        <org.geneanet.customcamera.VerticalSeekBar
+            android:id="@+id/switchOpacity"
+            android:layout_width="wrap_content"
+            android:layout_height="300dp"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="0"
             android:alpha="0.6"
-            android:background="@color/black"
-            android:visibility="invisible" >
+            android:max="7"
+            android:maxHeight="13dp"
+            android:minHeight="0dp"
+            android:progress="0"
+            android:progressDrawable="@drawable/custom_opacity_bar"
+            android:secondaryProgress="7"
+            android:thumb="@drawable/thumb"
+            android:thumbOffset="-0.9px" />
+    </LinearLayout>
 
-            <Button
-                android:id="@+id/accept"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/acceptePicture" />
+    <LinearLayout
+        android:id="@+id/keepPhoto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:alpha="0.6"
+        android:background="@color/black"
+        android:gravity="bottom"
+        android:visibility="invisible" >
 
-            <Button
-                android:id="@+id/decline"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/declinePicture" />
-        </LinearLayout>
-    </GridLayout>
+        <Button
+            android:id="@+id/accept"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/acceptePicture" />
+
+        <Button
+            android:id="@+id/decline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/declinePicture" />
+    </LinearLayout>
 
 </RelativeLayout>
diff --git a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
index c7f9e41..391a150 100644
--- a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
+++ b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
@@ -11,6 +11,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.hardware.Camera;
+import android.hardware.Camera.Parameters;
 import android.hardware.Camera.PictureCallback;
 import android.hardware.Camera.ShutterCallback;
 import android.os.Bundle;
@@ -318,7 +319,6 @@ public class CameraActivity extends Activity {
              */
             public void onPictureTaken(final byte[] data, Camera camera) {
                 // Show buttons to accept or decline the picture.
-
                 final LinearLayout keepPhoto = (LinearLayout) findViewById(R.id.keepPhoto);
                 keepPhoto.setVisibility(View.VISIBLE);
                 Button accept = (Button)findViewById(R.id.accept);
@@ -330,10 +330,22 @@ public class CameraActivity extends Activity {
 
                 // Put button miniature at the top of the page
                 final Button miniature = (Button)findViewById(R.id.miniature);
-                final LayoutParams params = (RelativeLayout.LayoutParams)miniature.getLayoutParams();
-                ((RelativeLayout.LayoutParams) params).addRule(RelativeLayout.ALIGN_PARENT_BOTTOM, 0);
-                ((RelativeLayout.LayoutParams) params).addRule(RelativeLayout.ALIGN_PARENT_TOP, RelativeLayout.TRUE);
+                final LayoutParams params = (LinearLayout.LayoutParams)miniature.getLayoutParams();
+                ((LinearLayout.LayoutParams) params).gravity = Gravity.TOP;
                 miniature.setLayoutParams(params);
+                
+                try {
+                    Camera.Parameters test = mCamera.getParameters();             
+                    test.setWhiteBalance(Parameters.WHITE_BALANCE_AUTO);
+                    test.setSceneMode(Parameters.SCENE_MODE_AUTO);
+                     int index = test.getExposureCompensation ();
+                     // to set maximum Exposure
+                     test.setExposureCompensation(test.getMaxExposureCompensation());
+
+                     mCamera.setParameters(test);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
   
                 photoTaken = true;
                 
@@ -375,8 +387,7 @@ public class CameraActivity extends Activity {
                     @Override
                     public void onClick(View v) {
                     	photoTaken = false;
-                    	((RelativeLayout.LayoutParams) params).addRule(RelativeLayout.ALIGN_PARENT_BOTTOM, RelativeLayout.TRUE);
-                    	((RelativeLayout.LayoutParams) params).addRule(RelativeLayout.ALIGN_PARENT_TOP, 0);
+                        ((LinearLayout.LayoutParams) params).gravity = Gravity.BOTTOM;
                     	miniature.setLayoutParams(params);
                     	
                     	// If mode miniature and photo is declined, the miniature goes back to the bottom

From c0c9726b60b01210b260f83d7deb6e5cbdde0fbd Mon Sep 17 00:00:00 2001
From: Thomas BOY <thomas.boy@geneanet.org>
Date: Mon, 1 Dec 2014 15:39:29 +0100
Subject: [PATCH 2/3] Meilleur layout + correction d'un bug sur l'autofocus

---
 .../res/layout/activity_camera_view.xml       | 47 ++++++++++---------
 .../geneanet/customcamera/CameraActivity.java | 35 +++++---------
 2 files changed, 36 insertions(+), 46 deletions(-)

diff --git a/src/android/customCamera/res/layout/activity_camera_view.xml b/src/android/customCamera/res/layout/activity_camera_view.xml
index 4a8791b..c95228e 100644
--- a/src/android/customCamera/res/layout/activity_camera_view.xml
+++ b/src/android/customCamera/res/layout/activity_camera_view.xml
@@ -67,30 +67,33 @@
             android:thumbOffset="-0.9px" />
     </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/keepPhoto"
+    <FrameLayout
+        android:id="@+id/FrameLayout1"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:alpha="0.6"
-        android:background="@color/black"
-        android:gravity="bottom"
-        android:visibility="invisible" >
+        android:layout_height="match_parent" >
 
-        <Button
-            android:id="@+id/accept"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:id="@+id/keepPhoto"
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/acceptePicture" />
-
-        <Button
-            android:id="@+id/decline"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/declinePicture" />
-    </LinearLayout>
+            android:layout_gravity="bottom"
+            android:alpha="0.8"
+            android:background="@color/black"
+            android:visibility="invisible" >
 
+            <Button
+                android:id="@+id/accept"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/acceptePicture" />
+            
+            <Button
+                android:id="@+id/decline"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/declinePicture" />
+        </LinearLayout>
+    </FrameLayout>
 </RelativeLayout>
diff --git a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
index 391a150..a751869 100644
--- a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
+++ b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
@@ -11,7 +11,6 @@ import android.app.Activity;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.hardware.Camera;
-import android.hardware.Camera.Parameters;
 import android.hardware.Camera.PictureCallback;
 import android.hardware.Camera.ShutterCallback;
 import android.os.Bundle;
@@ -28,7 +27,6 @@ import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
 import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
 
@@ -191,7 +189,7 @@ public class CameraActivity extends Activity {
             //zoom out
             if (zoom > 0)
                 zoom-=2;
-            }
+        }
         distanceBetweenFingers = newDist;
         params.setZoom(zoom);
         mCamera.setParameters(params);
@@ -204,12 +202,16 @@ public class CameraActivity extends Activity {
      * @param Parameters  params Camera's parameter.
      */
     public void handleFocus(MotionEvent event, Camera.Parameters params) {
-        List<String> supportedFocusModes = params.getSupportedFocusModes();
-        if (supportedFocusModes != null && supportedFocusModes.contains(Camera.Parameters.FOCUS_MODE_AUTO)) {
-            mCamera.autoFocus(new Camera.AutoFocusCallback() {
-                @Override
-                public void onAutoFocus(boolean b, Camera camera) {}
-            });
+        try {
+	        List<String> supportedFocusModes = params.getSupportedFocusModes();
+	        if (supportedFocusModes != null && supportedFocusModes.contains(Camera.Parameters.FOCUS_MODE_AUTO)) {
+	            mCamera.autoFocus(new Camera.AutoFocusCallback() {
+	                @Override
+	                public void onAutoFocus(boolean b, Camera camera) {}
+	            });
+	        }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 
@@ -254,8 +256,6 @@ public class CameraActivity extends Activity {
                     paramsReagrandissement.width = -1;
                     paramsReagrandissement.height = -1;
                     imageView.setLayoutParams(paramsReagrandissement);
-
-                    // imageView.setAlpha(imageView.getAlpha());
                     miniature.setVisibility(View.VISIBLE);
                 }
             });
@@ -333,19 +333,6 @@ public class CameraActivity extends Activity {
                 final LayoutParams params = (LinearLayout.LayoutParams)miniature.getLayoutParams();
                 ((LinearLayout.LayoutParams) params).gravity = Gravity.TOP;
                 miniature.setLayoutParams(params);
-                
-                try {
-                    Camera.Parameters test = mCamera.getParameters();             
-                    test.setWhiteBalance(Parameters.WHITE_BALANCE_AUTO);
-                    test.setSceneMode(Parameters.SCENE_MODE_AUTO);
-                     int index = test.getExposureCompensation ();
-                     // to set maximum Exposure
-                     test.setExposureCompensation(test.getMaxExposureCompensation());
-
-                     mCamera.setParameters(test);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
   
                 photoTaken = true;
                 

From f27b9d277af1c85615001fbd2290faa99618b832 Mon Sep 17 00:00:00 2001
From: Thomas BOY <thomas.boy@geneanet.org>
Date: Mon, 1 Dec 2014 17:10:27 +0100
Subject: [PATCH 3/3] =?UTF-8?q?Modifications=20mineures=20apr=C3=A8s=20pre?=
 =?UTF-8?q?mier=20pull=20request?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customCamera/res/layout/activity_camera_view.xml   |  4 ++--
 .../src/org/geneanet/customcamera/CameraActivity.java  | 10 +++++-----
 2 files changed, 7 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 c95228e..861c8cf 100644
--- a/src/android/customCamera/res/layout/activity_camera_view.xml
+++ b/src/android/customCamera/res/layout/activity_camera_view.xml
@@ -27,7 +27,7 @@
     </FrameLayout>
 
     <LinearLayout
-        android:id="@+id/linearLayout1"
+        android:id="@+id/beforePhoto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_alignParentLeft="true"
@@ -68,7 +68,7 @@
     </LinearLayout>
 
     <FrameLayout
-        android:id="@+id/FrameLayout1"
+        android:id="@+id/afterPhoto"
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
 
diff --git a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
index a751869..e3bb7d8 100644
--- a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
+++ b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
@@ -183,12 +183,14 @@ public class CameraActivity extends Activity {
         
         if (newDist > distanceBetweenFingers) {
             //zoom in
-            if (zoom < maxZoom/2)
+            if (zoom < maxZoom/2) {
                 zoom+=2;
+            }
         } else if (newDist < distanceBetweenFingers) {
             //zoom out
-            if (zoom > 0)
+            if (zoom > 0) {
                 zoom-=2;
+            }
         }
         distanceBetweenFingers = newDist;
         params.setZoom(zoom);
@@ -202,7 +204,7 @@ public class CameraActivity extends Activity {
      * @param Parameters  params Camera's parameter.
      */
     public void handleFocus(MotionEvent event, Camera.Parameters params) {
-        try {
+        if (photoTaken == false) {
 	        List<String> supportedFocusModes = params.getSupportedFocusModes();
 	        if (supportedFocusModes != null && supportedFocusModes.contains(Camera.Parameters.FOCUS_MODE_AUTO)) {
 	            mCamera.autoFocus(new Camera.AutoFocusCallback() {
@@ -210,8 +212,6 @@ public class CameraActivity extends Activity {
 	                public void onAutoFocus(boolean b, Camera camera) {}
 	            });
 	        }
-        } catch (Exception e) {
-            e.printStackTrace();
         }
     }