From b917463e8ba2144bc53c3ef20aca3a2f052d2cf9 Mon Sep 17 00:00:00 2001
From: Thomas Boy <thomas.boy@geneanet.org>
Date: Wed, 19 Nov 2014 10:00:22 +0100
Subject: [PATCH] Optimisation de la barre d'optimisation

---
 .../res/layout/activity_camera_view.xml       |  3 +-
 .../org/geneanet/customcamera/CameraView.java | 30 ++-----------------
 2 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/src/android/customCamera/res/layout/activity_camera_view.xml b/src/android/customCamera/res/layout/activity_camera_view.xml
index 82a4614..26e0442 100644
--- a/src/android/customCamera/res/layout/activity_camera_view.xml
+++ b/src/android/customCamera/res/layout/activity_camera_view.xml
@@ -120,7 +120,8 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:alpha="0.6"
-        android:background="@color/black" >
+        android:background="@color/black"
+        android:gravity="bottom" >
 
         <Button
             android:id="@+id/refuser"
diff --git a/src/android/customCamera/src/org/geneanet/customcamera/CameraView.java b/src/android/customCamera/src/org/geneanet/customcamera/CameraView.java
index af9af16..70a1a31 100644
--- a/src/android/customCamera/src/org/geneanet/customcamera/CameraView.java
+++ b/src/android/customCamera/src/org/geneanet/customcamera/CameraView.java
@@ -1,12 +1,10 @@
 package org.geneanet.customcamera;
 
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.List;
 
 import android.app.Activity;
-import android.content.Context;
 import android.content.res.Configuration;
 import android.hardware.Camera;
 import android.hardware.Camera.PictureCallback;
@@ -117,32 +115,8 @@ public class CameraView extends Activity {
         		public void onProgressChanged(SeekBar seekBar, int progresValue, boolean fromUser) {
         			progress = progresValue;
         			ImageView imageView = (ImageView) findViewById(R.id.normal);
-        			switch(progress){
-        			case 0 : 
-        				imageView.setAlpha((float)0.2);
-        				break;
-        			case 1 :
-        				imageView.setAlpha((float)0.3);
-        				break;
-        			case 2 :
-        				imageView.setAlpha((float)0.4);
-        				break;
-        			case 3 :
-        				imageView.setAlpha((float)0.5);
-        				break;
-        			case 4 :
-        				imageView.setAlpha((float)0.6);
-        				break;
-        			case 5 :
-        				imageView.setAlpha((float)0.7);
-        				break;
-        			case 6 :
-        				imageView.setAlpha((float)0.8);
-        				break;
-        			case 7 :
-        				imageView.setAlpha((float)0.9);
-        				break;
-        			}
+        			float newOpacity = (float) (0.2+progress*0.1);
+        			imageView.setAlpha(newOpacity);
         		}
 
         		@Override