From 1c828f9f9d41dd47911fe2c495725b8442fcd140 Mon Sep 17 00:00:00 2001
From: Christophe BOUCAUT <christophe.boucaut@geneanet.org>
Date: Tue, 2 Jun 2015 17:48:07 +0200
Subject: [PATCH] Remove alpha and add transparence in black color. fix
 position confirme/delete button.

---
 .../res/layout/activity_camera_view.xml       | 93 +++++++++----------
 .../customCamera/res/values/colors.xml        |  2 +-
 2 files changed, 44 insertions(+), 51 deletions(-)

diff --git a/src/android/customCamera/res/layout/activity_camera_view.xml b/src/android/customCamera/res/layout/activity_camera_view.xml
index 65e2efe..b1ca073 100644
--- a/src/android/customCamera/res/layout/activity_camera_view.xml
+++ b/src/android/customCamera/res/layout/activity_camera_view.xml
@@ -10,12 +10,16 @@
         android:layout_height="fill_parent" >
     </FrameLayout>
     
+    <ImageView
+        android:id="@+id/photoResized"
+        android:layout_width="fill_parent"
+        android:layout_height="match_parent" />
+    
     <LinearLayout
         android:id="@+id/actionBar"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
-        android:alpha="0.6"
         android:background="@color/black"
         android:orientation="horizontal"
         android:padding="@dimen/default_padding" >
@@ -65,54 +69,6 @@
 
     </LinearLayout>
 
-    <ImageView
-        android:id="@+id/photoResized"
-        android:layout_width="fill_parent"
-        android:layout_height="match_parent" />
-
-    <ImageView
-        android:id="@+id/background"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent" 
-        android:alpha="0.2"
-        android:scaleType="fitXY" />
-
-    <FrameLayout
-        android:id="@+id/afterPhoto"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" >
-
-        <LinearLayout
-            android:id="@+id/keepPhoto"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:alpha="0.6"
-            android:background="@color/black"
-            android:visibility="invisible" >
-
-            <ImageButton
-                android:id="@+id/accept"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:onClick="acceptPhoto"
-                android:src="@drawable/accept"
-                android:background="@android:color/transparent" />
-            
-            <ImageButton
-                android:id="@+id/decline"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:onClick="declinePhoto"
-                android:src="@drawable/delete"
-                android:background="@android:color/transparent" />
-
-        </LinearLayout>
-
-    </FrameLayout>
-
     <LinearLayout
         android:id="@+id/beforePhoto"
         android:layout_width="fill_parent"
@@ -136,6 +92,44 @@
             android:background="@drawable/round_button"
             android:src="@drawable/capture" />
     </LinearLayout>
+    
+    <LinearLayout
+        android:id="@+id/keepPhoto"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:background="@color/black"
+        android:visibility="gone" >
+            
+        <ImageButton
+            android:id="@+id/decline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:onClick="declinePhoto"
+            android:src="@drawable/delete"
+            android:background="@android:color/transparent"
+            android:padding="@dimen/default_padding" />
+        
+        <ImageButton
+            android:id="@+id/accept"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:onClick="acceptPhoto"
+            android:src="@drawable/accept"
+            android:background="@android:color/transparent"
+            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"
@@ -144,7 +138,6 @@
         android:layout_above="@+id/beforePhoto"
         android:layout_alignParentRight="true"
         android:layout_weight="0"
-        android:alpha="0.6"
         android:max="10"
         android:maxHeight="13dp"
         android:minHeight="0dp"
diff --git a/src/android/customCamera/res/values/colors.xml b/src/android/customCamera/res/values/colors.xml
index d14ba21..d4fdbd3 100644
--- a/src/android/customCamera/res/values/colors.xml
+++ b/src/android/customCamera/res/values/colors.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="black">#000000</color>
+    <color name="black">#99000000</color>
     <color name="white">#ffffff</color>
 </resources>