Mise à jour des pictos en hdpi + ajout de padding sur la barre d'action

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

@@ -17,14 +17,16 @@
         android:layout_gravity="top"
         android:alpha="0.6"
         android:background="@color/black"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:padding="@dimen/default_padding" >
 
         <ImageButton
             android:id="@+id/back"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="left"
-            android:src="@drawable/switch_camera" />
+            android:background="@android:color/transparent"
+            android:src="@drawable/back" />
         
         <View
             android:layout_width="0dp"
@@ -36,25 +38,31 @@
 	        android:layout_width="wrap_content"
 	        android:layout_height="wrap_content"
 	        android:layout_gravity="right"
+	        android:layout_marginLeft="@dimen/activity_vertical_margin"
+	        android:background="@android:color/transparent"
 	        android:onClick="switchCamera"
-	        android:src="@drawable/switch_camera" />   
+	        android:src="@drawable/switch_camera" />
 
 	    <ImageButton
 	        android:id="@+id/miniature"
 	        android:layout_width="wrap_content"
 	        android:layout_height="wrap_content"
 	        android:layout_gravity="right"
+	        android:layout_marginLeft="@dimen/activity_vertical_margin"
+	        android:background="@android:color/transparent"
 	        android:onClick="buttonMiniature"
-	        android:src="@drawable/switch_camera" />
+	        android:src="@drawable/minimise" />
 	    
 	    <ImageButton
 	        android:id="@+id/flash"
 	        android:layout_width="wrap_content"
 	        android:layout_height="wrap_content"
 	        android:layout_gravity="right"
+	        android:layout_marginLeft="@dimen/activity_vertical_margin"
 	        android:background="@android:color/transparent"
 	        android:onClick="switchFlash"
 	        android:src="@drawable/flash" />
+
     </LinearLayout>
 
     <ImageView
@@ -69,38 +77,6 @@
         android:alpha="0.2"
         android:scaleType="fitXY" />
 
-    <LinearLayout
-        android:id="@+id/beforePhoto"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:gravity="bottom">
-             
-        <ImageButton
-            android:id="@+id/capture"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/round_button"
-            android:src="@drawable/capture" />
-
-        <org.geneanet.customcamera.VerticalSeekBar
-            android:id="@+id/switchOpacity"
-            android:layout_width="wrap_content"
-            android:layout_height="300dp"
-            android:layout_gravity="center_vertical"
-            android:layout_weight="0"
-            android:alpha="0.6"
-            android:max="10"
-            android:maxHeight="13dp"
-            android:minHeight="0dp"
-            android:progress="5"
-            android:progressDrawable="@drawable/custom_opacity_bar"
-            android:secondaryProgress="10"
-            android:thumb="@drawable/thumb"
-            android:thumbOffset="-0.9px" />
-    </LinearLayout>
-
     <FrameLayout
         android:id="@+id/afterPhoto"
         android:layout_width="match_parent"
@@ -137,14 +113,45 @@
 
     </FrameLayout>
 
-    <SeekBar
-        android:id="@+id/zoomLevel"
-        android:layout_width="match_parent"
+    <LinearLayout
+        android:id="@+id/beforePhoto"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:layout_below="@+id/actionBar"
-        android:layout_marginTop="165dp"
-        android:layout_weight="1"
-        android:visibility="visible" />
+        android:orientation="vertical" >
+
+        <SeekBar
+            android:id="@+id/zoomLevel"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:visibility="visible" />
+
+        <ImageButton
+            android:id="@+id/capture"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="@drawable/round_button"
+            android:src="@drawable/capture" />
+    </LinearLayout>
+
+    <org.geneanet.customcamera.VerticalSeekBar
+        android:id="@+id/switchOpacity"
+        android:layout_width="wrap_content"
+        android:layout_height="300dp"
+        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"
+        android:progress="5"
+        android:progressDrawable="@drawable/custom_opacity_bar"
+        android:secondaryProgress="10"
+        android:thumb="@drawable/thumb"
+        android:thumbOffset="-0.9px" />
 
 </RelativeLayout>

src/android/customCamera/res/values/dimens.xml

@@ -3,5 +3,6 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="default_padding">10dp</dimen>
 
 </resources>