From 3e98f21c2ee37f78fb370f691d6d4973883ae55f Mon Sep 17 00:00:00 2001
From: Thomas BOY <thomas.boy@geneanet.org>
Date: Fri, 16 Jan 2015 15:45:47 +0100
Subject: [PATCH] Premier jet de la photo taille optimale (marche sur tablette
 mais pas sur telephone

---
 .../res/layout/activity_camera_view.xml       |  6 ++--
 .../geneanet/customcamera/CameraActivity.java | 36 +++++++++++++++++--
 .../geneanet/customcamera/ManagerCamera.java  |  2 +-
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/android/customCamera/res/layout/activity_camera_view.xml b/src/android/customCamera/res/layout/activity_camera_view.xml
index b0b9605..8e63563 100644
--- a/src/android/customCamera/res/layout/activity_camera_view.xml
+++ b/src/android/customCamera/res/layout/activity_camera_view.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/globalLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
     <FrameLayout
         android:id="@+id/camera_preview"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true" >
+        android:layout_height="1067dp"
+        android:gravity="center" >
     </FrameLayout>
 
     <ImageView
diff --git a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
index 4bc2761..e8a2850 100644
--- a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
+++ b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
@@ -198,10 +198,42 @@ public class CameraActivity extends Activity {
 
     customCamera.setDisplayOrientation(orientation);
 
+    DisplayMetrics dm = new DisplayMetrics();
+    getWindowManager().getDefaultDisplay().getMetrics(dm);
+    final int widthScreen = dm.widthPixels;
+    final int heightScreen = dm.heightPixels;
+    
+    FrameLayout cameraPreview = (FrameLayout) findViewById(R.id.camera_preview);
+    LayoutParams paramsCameraPreview = 
+        (LayoutParams) cameraPreview.getLayoutParams();
+    
+    Size camParameters = customCamera.getParameters().getPictureSize();
+    
+    int minSize;
+    int maxSize;
+    if (camParameters.width > camParameters.height) {
+      maxSize = camParameters.width;
+      minSize = camParameters.height;
+    } else {
+      maxSize = camParameters.height;
+      minSize = camParameters.width;
+    }
+
+    float ratio;
+    if (widthScreen > heightScreen) {
+      paramsCameraPreview.height = LayoutParams.FILL_PARENT;  
+      ratio = ( (float)minSize / (float)heightScreen );  
+      paramsCameraPreview.width = (int)(maxSize / ratio);   
+    } else {
+      paramsCameraPreview.width = LayoutParams.FILL_PARENT;
+      ratio = ( (float)minSize / (float)widthScreen ); 
+      paramsCameraPreview.height = (int)(maxSize / ratio);
+    }
+    cameraPreview.setLayoutParams(paramsCameraPreview);
+    
     // Assign the render camera to the view
     CameraPreview myPreview = new CameraPreview(this, customCamera);
-    FrameLayout preview = (FrameLayout) findViewById(R.id.camera_preview);
-    preview.addView(myPreview);
+    cameraPreview.addView(myPreview);
 
     // The zoom bar progress
     final SeekBar zoomLevel = (SeekBar) findViewById(R.id.zoomLevel);
diff --git a/src/android/customCamera/src/org/geneanet/customcamera/ManagerCamera.java b/src/android/customCamera/src/org/geneanet/customcamera/ManagerCamera.java
index cda4e23..b045dcb 100644
--- a/src/android/customCamera/src/org/geneanet/customcamera/ManagerCamera.java
+++ b/src/android/customCamera/src/org/geneanet/customcamera/ManagerCamera.java
@@ -38,7 +38,7 @@ public class ManagerCamera {
 
     return cam; // returns null if camera is unavailable
   }
-
+  
   /**
    * To release the camera.
    */