Merge pull request #31 from ChristopheBoucaut/issue#3

Issue#3

src/android/customCamera/res/layout/activity_camera_view.xml

@@ -11,6 +11,11 @@
         android:layout_alignParentTop="true" >
     </FrameLayout>
 
+    <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"
@@ -28,21 +33,30 @@
         android:layout_alignParentTop="true"
         android:gravity="bottom" >
 
-        <Button
-            android:id="@+id/miniature"
+        <LinearLayout
+            android:id="@+id/buttonMiniatureAndPhoto"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_weight="0.2"
-            android:onClick="showMiniature"
-            android:text="@string/miniature" />
+            android:gravity="bottom" >
 
-        <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" />
+            <Button
+                android:id="@+id/miniature"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                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" />
+
+        </LinearLayout>
 
         <org.geneanet.customcamera.VerticalSeekBar
             android:id="@+id/switchOpacity"
@@ -93,7 +107,7 @@
     </FrameLayout>
 
     <SeekBar
-        android:id="@+id/niveauZoom"
+        android:id="@+id/zoomLevel"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="visible" />