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] 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;