Merge pull request #319 from divayprakash/divayprakash/fix

Move magic numbers in layout files to @dims

res/layout-land/account_setup.xml

@@ -55,7 +55,7 @@
 			    android:layout_height="wrap_content"
 			    android:gravity="center"
 			    android:orientation="vertical"
-			    android:padding="8dp" >
+			    android:padding="@dimen/standard_half_padding" >
 
 				<android.support.v7.widget.AppCompatButton
 					android:id="@+id/centeredRefreshButton"
@@ -63,7 +63,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_gravity="center_horizontal"
-					android:layout_marginBottom="10dp"
+					android:layout_marginBottom="@dimen/alternate_margin"
 					android:theme="@style/Button"
 					android:text="@string/auth_check_server"
 					android:visibility="gone"
@@ -76,14 +76,14 @@
 				    android:layout_gravity="fill_horizontal"
 				    android:text="@string/auth_expired_basic_auth_toast" 
 				    android:visibility="gone"
-				    android:layout_marginBottom="10dp"
+				    android:layout_marginBottom="@dimen/alternate_margin"
 					android:textColor="@color/login_text_color"
                     android:contentDescription="@string/auth_expired_basic_auth_toast"/>
 			    <FrameLayout 
 	        		android:id="@+id/hostUrlFrame"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:layout_marginBottom="0dp">
+					android:layout_marginBottom="@dimen/zero">
 
                     <android.support.design.widget.TextInputLayout
                         android:id="@+id/input_layout_hostUrl"
@@ -96,10 +96,10 @@
                             android:layout_height="wrap_content"
                             android:layout_gravity="bottom"
                             android:contentDescription="@string/auth_host_address"
-                            android:drawablePadding="5dp"
+                            android:drawablePadding="@dimen/alternate_half_padding"
                             android:hint="@string/auth_host_url"
                             android:inputType="textUri"
-                            android:paddingRight="55dp"
+                            android:paddingRight="@dimen/alternate_padding_right"
                             android:textColor="@color/login_text_color"
                             android:textColorHint="@color/login_text_hint_color"
                             >
@@ -114,8 +114,8 @@
 					    android:layout_width="wrap_content"
 					    android:layout_height="wrap_content"
 					    android:layout_gravity="center_vertical|right"
-					    android:layout_marginRight="5dp"
-					    android:padding="0dp"
+					    android:layout_marginRight="@dimen/alternate_half_margin"
+					    android:padding="@dimen/zero"
 					    android:scaleType="fitCenter"
 					    android:src="@drawable/ic_action_refresh"
 					    android:visibility="gone"
@@ -128,13 +128,13 @@
 					android:id="@+id/server_status_text"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:layout_marginBottom="10dp"
+					android:layout_marginBottom="@dimen/alternate_half_margin"
 					android:drawableLeft="@android:drawable/stat_notify_sync"
-					android:drawablePadding="5dp"
+					android:drawablePadding="@dimen/alternate_half_padding"
 					android:gravity="center_vertical"
 					android:textColor="@color/login_text_color"
 					android:text="@string/auth_testing_connection"
-					android:minHeight="32dp"
+					android:minHeight="@dimen/display_text_min_height"
                     android:contentDescription="@string/auth_testing_connection"/>
 		             
 				<CheckBox
@@ -218,7 +218,7 @@
                         android:id="@+id/account_password"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:drawablePadding="5dp"
+                        android:drawablePadding="@dimen/alternate_half_padding"
                         android:ems="10"
                         android:hint="@string/auth_password"
                         android:inputType="textPassword"
@@ -234,7 +234,7 @@
 					android:gravity="center_vertical"
 					android:text="@string/auth_unauthorized"
 					android:drawableLeft="@android:drawable/stat_notify_sync"
-					android:drawablePadding="5dip"
+					android:drawablePadding="@dimen/alternate_half_padding"
 					android:textColor="@color/login_text_color"
                     android:contentDescription="@string/auth_unauthorized"
 					/>
@@ -276,7 +276,7 @@
 				android:layout_gravity="center_horizontal"
 				android:background="@android:color/transparent"
 				android:onClick="onRegisterClick"
-				android:paddingTop="5dp"
+				android:paddingTop="@dimen/alternate_half_padding"
 				android:text="@string/auth_register"
 				android:textColor="@color/login_text_hint_color"
 				android:contentDescription="@string/auth_register"/>

res/layout/account_action.xml

@@ -20,7 +20,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="72dp"
+    android:layout_height="@dimen/account_action_layout_height"
     android:orientation="horizontal"
     android:weightSum="1">
 
@@ -34,7 +34,7 @@
 
     <TextView
         android:id="@+id/user_name"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/zero"
         android:layout_height="fill_parent"
         android:layout_marginLeft="@dimen/list_item_avatar_text_margin"
         android:layout_weight="1"

res/layout/account_item.xml

@@ -19,21 +19,21 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="72dp"
+    android:layout_height="@dimen/account_item_layout_height"
     android:orientation="horizontal"
     android:weightSum="1">
 
     <ImageView
         android:id="@+id/user_icon"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+        android:layout_width="@dimen/user_icon_size"
+        android:layout_height="@dimen/user_icon_size"
         android:layout_gravity="center_vertical"
         android:layout_marginLeft="@dimen/standard_margin"
         android:src="@drawable/ic_menu_archive"/>
 
     <TextView
         android:id="@+id/user_name"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/zero"
         android:layout_height="fill_parent"
         android:layout_marginLeft="@dimen/standard_margin"
         android:layout_weight="1"

res/layout/account_setup.xml

@@ -55,7 +55,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_marginBottom="10dp"
+            android:layout_marginBottom="@dimen/alternate_margin"
             android:theme="@style/Button"
             android:text="@string/auth_check_server"
             android:visibility="gone"
@@ -68,7 +68,7 @@
             android:layout_gravity="fill_horizontal"
             android:text="@string/auth_expired_basic_auth_toast"
             android:visibility="gone"
-            android:layout_marginBottom="10dp"
+            android:layout_marginBottom="@dimen/alternate_margin"
             android:textColor="@color/login_text_color"
             android:contentDescription="@string/auth_expired_basic_auth_toast"/>
 
@@ -76,7 +76,7 @@
 	        android:id="@+id/hostUrlFrame"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-            android:layout_marginBottom="0dp">
+            android:layout_marginBottom="@dimen/zero">
 
             <android.support.design.widget.TextInputLayout
                 android:id="@+id/input_layout_hostUrl"
@@ -89,10 +89,10 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="bottom"
                     android:contentDescription="@string/auth_host_address"
-                    android:drawablePadding="5dp"
+                    android:drawablePadding="@dimen/alternate_half_padding"
                     android:hint="@string/auth_host_url"
                     android:inputType="textUri"
-                    android:paddingRight="55dp"
+                    android:paddingRight="@dimen/alternate_padding_right"
                     android:textColor="@color/login_text_color"
                     android:textColorHint="@color/login_text_color">
 
@@ -106,8 +106,8 @@
 			    android:layout_width="wrap_content"
 			    android:layout_height="wrap_content"
 			    android:layout_gravity="center_vertical|right"
-			    android:layout_marginRight="5dp"
-			    android:padding="0dp"
+			    android:layout_marginRight="@dimen/alternate_half_padding"
+			    android:padding="@dimen/zero"
 			    android:scaleType="fitCenter"
 			    android:src="@drawable/ic_action_refresh"
 				android:visibility="gone"
@@ -120,13 +120,13 @@
             android:id="@+id/server_status_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
+            android:layout_marginBottom="@dimen/alternate_margin"
             android:drawableLeft="@android:drawable/stat_notify_sync"
-            android:drawablePadding="5dp"
+            android:drawablePadding="@dimen/alternate_half_padding"
             android:gravity="center_vertical"
             android:textColor="@color/login_text_color"
             android:text="@string/auth_testing_connection"
-            android:minHeight="32dp"
+            android:minHeight="@dimen/display_text_min_height"
             android:contentDescription="@string/auth_testing_connection"/>
 
         <CheckBox
@@ -209,7 +209,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/auth_password"
-                android:drawablePadding="5dp"
+                android:drawablePadding="@dimen/alternate_half_padding"
                 android:ems="10"
                 android:hint="@string/auth_password"
                 android:inputType="textPassword"
@@ -222,9 +222,9 @@
             android:id="@+id/auth_status_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
+            android:layout_marginBottom="@dimen/alternate_margin"
             android:drawableLeft="@android:drawable/stat_notify_sync"
-            android:drawablePadding="5dp"
+            android:drawablePadding="@dimen/alternate_half_padding"
             android:gravity="center_vertical"
             android:text="@string/auth_unauthorized"
             android:textColor="@color/login_text_color"
@@ -253,8 +253,8 @@
                 android:layout_height="wrap_content"
                 android:background="@android:color/transparent"
                 android:onClick="onRegisterClick"
-                android:paddingBottom="5dp"
-                android:paddingTop="5dp"
+                android:paddingBottom="@dimen/alternate_half_padding"
+                android:paddingTop="@dimen/alternate_half_padding"
                 android:text="@string/auth_register"
                 android:textColor="@color/login_text_hint_color"
                 android:contentDescription="@string/auth_register"/>

res/layout/accounts_layout.xml

@@ -32,7 +32,7 @@
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent"
 		android:divider="@color/list_divider_background"
-		android:dividerHeight="1dip">
+		android:dividerHeight="@dimen/divider_height_independent">
 	</ListView>
 
 </LinearLayout>

res/layout/action_item.xml

@@ -36,8 +36,8 @@
 		android:layout_width="fill_parent" 
 		android:layout_height="fill_parent" 
 		android:gravity="center_vertical"
-		android:paddingLeft="5dip"
-		android:paddingRight="10dip"
+		android:paddingLeft="@dimen/alternate_half_padding_independent"
+		android:paddingRight="@dimen/alternate_padding_independent"
 		android:text="Chart"
 		android:textColor="#fff"/>
 									         

res/layout/activity_row.xml

@@ -21,11 +21,11 @@
     			android:id="@+id/list_item"
 				android:layout_width="match_parent"
 				android:layout_height="48dp"
-				android:paddingStart="16dip"
-				android:paddingEnd="16dip"
-				android:paddingRight="16dip"
-				android:paddingLeft="16dip"
-				android:minWidth="196dip"
+				android:paddingStart="@dimen/standard_padding_independent"
+				android:paddingEnd="@dimen/standard_padding_independent"
+				android:paddingRight="@dimen/standard_padding_independent"
+				android:paddingLeft="@dimen/standard_padding_independent"
+				android:minWidth="@dimen/activity_row_layout_min_width_independent"
 				android:background="?android:attr/activatedBackgroundIndicator"
     			android:orientation="vertical" >
 
@@ -36,11 +36,11 @@
 
 		<ImageView
 			android:id="@+id/icon"
-			android:layout_width="40dip"
-			android:layout_height="40dip"
+			android:layout_width="@dimen/user_icon_size_independent"
+			android:layout_height="@dimen/user_icon_size_independent"
 			android:layout_gravity="center_vertical"
-			android:layout_marginEnd="8dip"
-			android:layout_marginRight="8dip"
+			android:layout_marginEnd="@dimen/standard_half_padding_independent"
+			android:layout_marginRight="@dimen/standard_half_padding_independent"
 			android:duplicateParentState="true" />
 
         <TextView

res/layout/drawer_header.xml

@@ -69,7 +69,7 @@
             >
 
             <LinearLayout
-                android:layout_width="0dp"
+                android:layout_width="@dimen/zero"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_weight="1"
@@ -88,7 +88,7 @@
                     android:singleLine="true"
                     android:text="@string/app_name"
                     android:textColor="@android:color/white"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/drawer_header_text"
                     android:textStyle="bold"/>
 
                 <TextView
@@ -104,7 +104,7 @@
                     android:shadowRadius="2"
                     android:text="@string/app_name"
                     android:textColor="@android:color/white"
-                    android:textSize="12sp"/>
+                    android:textSize="@dimen/drawer_header_subtext"/>
 
             </LinearLayout>
 

res/layout/edit_share_layout.xml

@@ -41,7 +41,7 @@
         <View
             android:id="@+id/share_header_divider"
             android:layout_width="match_parent"
-            android:layout_height="2dp"
+            android:layout_height="@dimen/edit_share_layout_view_height"
             android:background="@color/owncloud_blue"
             />
     <LinearLayout
@@ -60,7 +60,7 @@
             android:layout_gravity="start"
             android:layout_marginTop="@dimen/standard_half_margin"
             android:textColor="@color/color_accent"
-            android:paddingLeft="0dp"
+            android:paddingLeft="@dimen/zero"
             style="?android:attr/listSeparatorTextViewStyle"
             />
 
@@ -96,7 +96,7 @@
             android:layout_gravity="start"
             android:layout_marginTop="@dimen/standard_half_margin"
             android:textColor="@color/color_accent"
-            android:paddingLeft="0dp"
+            android:paddingLeft="@dimen/zero"
             style="?android:attr/listSeparatorTextViewStyle"
             />
     </LinearLayout>

res/layout/file_actions.xml

@@ -18,7 +18,7 @@
     <View
         android:id="@+id/file_actions_header_divider"
         android:layout_width="match_parent"
-        android:layout_height="2dp"
+        android:layout_height="@dimen/file_actions_view_height"
         android:background="@color/owncloud_blue"
         android:visibility="gone"
         />
@@ -26,7 +26,7 @@
     <ListView
         android:id="@+id/file_actions_list"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
+        android:layout_height="@dimen/zero"
         android:layout_weight="1"
         />
 

res/layout/file_details_fragment.xml

@@ -81,7 +81,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_below="@+id/fdTypeLabel"
-					android:layout_marginTop="12dp"
+					android:layout_marginTop="@dimen/fragment_margin"
 					android:text="@string/filedetails_size"
 					android:textAppearance="?android:attr/textAppearanceMedium" />
 					
@@ -90,7 +90,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_below="@+id/fdSizeLabel"
-					android:layout_marginTop="12dp"
+					android:layout_marginTop="@dimen/fragment_margin"
 					android:text="@string/filedetails_created"
 					android:visibility="gone"
 					android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -100,7 +100,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_below="@+id/fdCreatedLabel"
-					android:layout_marginTop="12dp"
+					android:layout_marginTop="@dimen/fragment_margin"
 					android:text="@string/filedetails_modified"
 					android:textAppearance="?android:attr/textAppearanceMedium" />
 			</RelativeLayout>
@@ -125,7 +125,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_below="@+id/fdType"
-					android:layout_marginTop="12dp"
+					android:layout_marginTop="@dimen/fragment_margin"
 					android:text="@string/placeholder_filesize"
 					android:textAppearance="?android:attr/textAppearanceMedium" />
 					
@@ -134,7 +134,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_below="@+id/fdSize"
-					android:layout_marginTop="12dp"
+					android:layout_marginTop="@dimen/fragment_margin"
 					android:visibility="gone"
 					android:text="@string/placeholder_timestamp"
 					android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -144,7 +144,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_below="@+id/fdCreated"
-					android:layout_marginTop="12dp"
+					android:layout_marginTop="@dimen/fragment_margin"
 					android:text="@string/placeholder_timestamp"
 					android:textAppearance="?android:attr/textAppearanceMedium" />
 		
@@ -187,14 +187,14 @@
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:gravity="center"
-					android:layout_marginTop="12dp"
-					android:layout_marginBottom="12dp"
+					android:layout_marginTop="@dimen/fragment_margin"
+					android:layout_marginBottom="@dimen/fragment_margin"
 					android:orientation="horizontal"
 					>
 				    				
     				<ProgressBar 
     				    android:id="@+id/fdProgressBar"
-						android:layout_width="0dp"
+						android:layout_width="@dimen/zero"
 						android:layout_height="wrap_content"
 						android:layout_weight="1"
                         style="?android:attr/progressBarStyleHorizontal"
@@ -206,7 +206,7 @@
 						android:id="@+id/fdCancelBtn"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:layout_marginLeft="12dp"
+						android:layout_marginLeft="@dimen/fragment_margin"
 						android:src="@drawable/ic_action_cancel_grey"
 						android:background="@android:color/transparent"
 						/>

res/layout/file_download_fragment.xml

@@ -22,7 +22,7 @@
 	android:orientation="vertical" 
 	android:layout_gravity="center"
 	android:gravity="center_vertical"
-	android:padding="20dp"
+	android:padding="@dimen/file_download_fragment_layout_padding"
 	android:background="@color/black"
 	>
 	
@@ -32,7 +32,7 @@
 		android:layout_height="wrap_content"
 		android:textColor="@color/dark_background_text_color"
 		android:text="@string/downloader_not_downloaded_yet"
-		android:layout_marginBottom="15dp"
+		android:layout_marginBottom="@dimen/alternate_fragment_margin"
 	/>
 	
     <LinearLayout
@@ -40,13 +40,13 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:gravity="center"
-		android:layout_marginTop="12dp"
-		android:layout_marginBottom="15dp"
+		android:layout_marginTop="@dimen/fragment_margin"
+		android:layout_marginBottom="@dimen/alternate_fragment_margin"
 		android:orientation="horizontal"
 		>
 	    				
 		<ProgressBar android:id="@+id/progressBar"
-			android:layout_width="0dp"
+			android:layout_width="@dimen/zero"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
 			style="?android:attr/progressBarStyleHorizontal"
@@ -59,7 +59,7 @@
 			android:id="@+id/cancelBtn"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="12dp"
+			android:layout_marginLeft="@dimen/fragment_margin"
 			android:src="@drawable/ic_action_cancel_grey"
 			android:background="@android:color/transparent"
 		/>
@@ -70,7 +70,7 @@
 		android:id="@+id/error_image"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_margin="0dp"
+		android:layout_margin="@dimen/zero"
 		android:layout_gravity="center_horizontal"
 		android:contentDescription="@string/downloader_download_failed_ticker"
 		android:src="@drawable/image_fail" />
@@ -80,7 +80,7 @@
 	    android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center_horizontal"
-		android:layout_margin="40dp"
+		android:layout_margin="@dimen/file_download_fragment_display_text_margin"
 		android:textColor="@color/dark_background_text_color"
 		android:text="@string/downloader_download_failed_ticker"
 	/>

res/layout/file_preview.xml

@@ -58,7 +58,7 @@
    	    android:layout_width="match_parent"
    	    android:layout_height="wrap_content"
    	    android:layout_alignParentBottom="true"
-		android:layout_margin="16dp"
+		android:layout_margin="@dimen/standard_margin"
    	    />
 
 </RelativeLayout>

res/layout/files.xml

@@ -47,13 +47,13 @@
 
             <FrameLayout
                 android:id="@+id/left_fragment_container"
-                android:layout_width="0dp"
+                android:layout_width="@dimen/zero"
                 android:layout_height="match_parent"
                 android:layout_weight="1" />
 
             <FrameLayout
                 android:id="@+id/right_fragment_container"
-                android:layout_width="0dp"
+                android:layout_width="@dimen/zero"
                 android:layout_height="match_parent"
                 android:layout_weight="2" />
         </LinearLayout>
@@ -62,7 +62,7 @@
 
     <include
         layout="@layout/drawer"
-        android:layout_width="240dp"
+        android:layout_width="@dimen/drawer_width"
         android:layout_height="match_parent"
         android:layout_gravity="start"/>
 

res/layout/files_folder_picker.xml

@@ -26,7 +26,7 @@
 
 	<FrameLayout 
 		android:layout_width="match_parent"
-		android:layout_height="0dip"
+		android:layout_height="@dimen/zero"
         android:layout_weight="1"
 		android:id="@+id/fragment_container" />
 

res/layout/generic_explanation.xml

@@ -26,9 +26,9 @@
 	<TextView
 		android:id="@+id/message"
 		android:layout_width="match_parent"
-		android:layout_height="0dp"
+		android:layout_height="@dimen/zero"
 		android:layout_weight="2"
-	    android:padding="10dip"
+	    android:padding="@dimen/alternate_padding_independent"
 	    android:scrollbarAlwaysDrawVerticalTrack="true"
 		android:text="@string/placeholder_sentence" 
 		/>
@@ -36,9 +36,9 @@
 	<ListView 
 	    android:id="@+id/list"
 	    android:layout_width="match_parent"
-	    android:layout_height="0dp"
+	    android:layout_height="@dimen/zero"
 		android:layout_weight="3"
-	    android:padding="10dip"
+	    android:padding="@dimen/alternate_padding_independent"
 	    />
 	    
     <LinearLayout

res/layout/grid_image.xml

@@ -33,8 +33,8 @@
             android:id="@+id/thumbnail"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
+            android:paddingLeft="@dimen/alternate_padding"
+            android:paddingRight="@dimen/alternate_padding"
             android:scaleType="centerCrop"
             android:src="@drawable/ic_menu_archive"/>
 
@@ -43,7 +43,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="top|right"
-            android:layout_margin="4dp"
+            android:layout_margin="@dimen/standard_quarter_margin"
             android:src="@drawable/shared_via_link" />
 
         <ImageView
@@ -51,18 +51,18 @@
             android:layout_width="@dimen/file_icon_size"
             android:layout_height="@dimen/file_icon_size"
             android:layout_gravity="bottom|right"
-            android:layout_marginTop="4dp"
-            android:layout_marginBottom="4dp"
-            android:layout_marginRight="4dp"
+            android:layout_marginTop="@dimen/standard_quarter_margin"
+            android:layout_marginBottom="@dimen/standard_quarter_margin"
+            android:layout_marginRight="@dimen/standard_quarter_margin"
             android:src="@drawable/ic_synced" />
 
         <ImageView
             android:id="@+id/favoriteIcon"
-            android:layout_width="15dp"
-            android:layout_height="15dp"
+            android:layout_width="@dimen/favorite_icon_size"
+            android:layout_height="@dimen/favorite_icon_size"
             android:layout_gravity="bottom|right"
-            android:layout_marginBottom="4dp"
-            android:layout_marginRight="4dp"
+            android:layout_marginBottom="@dimen/standard_quarter_margin"
+            android:layout_marginRight="@dimen/standard_quarter_margin"
             android:src="@drawable/ic_available_offline" />
 
         <ImageView
@@ -70,8 +70,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical|top"
-            android:layout_marginLeft="4dp"
-            android:layout_marginRight="4dp"
+            android:layout_marginLeft="@dimen/standard_quarter_margin"
+            android:layout_marginRight="@dimen/standard_quarter_margin"
             android:gravity=""
             android:src="@android:drawable/checkbox_off_background" />
     </FrameLayout>

res/layout/grid_item.xml

@@ -35,15 +35,15 @@
             android:layout_width="@dimen/standard_list_item_size"
             android:layout_height="@dimen/standard_list_item_size"
             android:layout_gravity="center_horizontal"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginLeft="@dimen/fragment_margin"
+            android:layout_marginRight="@dimen/alternate_margin"
             android:src="@drawable/ic_menu_archive" />
 
         <ImageView
             android:id="@+id/sharedIcon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="4dp"
+            android:layout_margin="@dimen/standard_quarter_margin"
             android:layout_gravity="top|right"
             android:src="@drawable/shared_via_link" />
 
@@ -52,17 +52,17 @@
             android:layout_width="@dimen/file_icon_size"
             android:layout_height="@dimen/file_icon_size"
             android:layout_gravity="bottom|right"
-            android:layout_marginTop="2dp"
-            android:layout_marginRight="2dp"
+            android:layout_marginTop="@dimen/standard_eighth_margin"
+            android:layout_marginRight="@dimen/standard_eighth_margin"
             android:src="@drawable/ic_synced" />
 
         <ImageView
             android:id="@+id/favoriteIcon"
-            android:layout_width="15dp"
-            android:layout_height="15dp"
+            android:layout_width="@dimen/favorite_icon_size"
+            android:layout_height="@dimen/favorite_icon_size"
             android:layout_gravity="bottom|right"
-            android:layout_marginBottom="2dp"
-            android:layout_marginRight="2dp"
+            android:layout_marginBottom="@dimen/standard_eighth_margin"
+            android:layout_marginRight="@dimen/standard_eighth_margin"
             android:src="@drawable/ic_available_offline" />
 
         <ImageView
@@ -70,10 +70,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical|top"
-            android:layout_marginLeft="4dp"
-            android:layout_marginRight="4dp"
+            android:layout_marginLeft="@dimen/standard_quarter_margin"
+            android:layout_marginRight="@dimen/standard_quarter_margin"
             android:src="@android:drawable/checkbox_off_background"
-            android:elevation="30dp" />
+            android:elevation="@dimen/elevation" />
 
     </FrameLayout>
 
@@ -81,13 +81,13 @@
         android:id="@+id/Filename"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="4dp"
-        android:layout_marginRight="4dp"
+        android:layout_marginLeft="@dimen/standard_quarter_margin"
+        android:layout_marginRight="@dimen/standard_quarter_margin"
         android:ellipsize="middle"
         android:gravity="center_horizontal"
         android:singleLine="true"
         android:text="TextView"
         android:textColor="@color/textColor"
-        android:textSize="16dip" />
+        android:textSize="@dimen/grid_item_text_size" />
 
 </com.owncloud.android.ui.SquareLinearLayout>

res/layout/list_fragment.xml

@@ -57,11 +57,11 @@
             android:id="@+id/grid_root"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:columnWidth="100dp"
+            android:columnWidth="@dimen/list_fragment_column_width"
             android:gravity="center"
-            android:horizontalSpacing="2dp"
+            android:horizontalSpacing="@dimen/list_fragment_spacing"
             android:stretchMode="columnWidth"
-            android:verticalSpacing="2dp"
+            android:verticalSpacing="@dimen/list_fragment_spacing"
             android:visibility="visible" />
 
     </android.support.v4.widget.SwipeRefreshLayout>

res/layout/list_fragment_expandable.xml

@@ -5,7 +5,7 @@ This must be a clone of list_fragment.xml
 EXCEPT: ExpandableListView must be used for @+id/swipe_refresh_files_emptyView
  -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="0dp"
+	android:layout_width="@dimen/zero"
 	android:layout_height="match_parent"
 	android:layout_weight="1" >
 

res/layout/list_item.xml

@@ -44,7 +44,7 @@
                 android:layout_width="@dimen/file_icon_size"
                 android:layout_height="@dimen/file_icon_size"
                 android:layout_gravity="top|right"
-                android:layout_marginRight="4dp"
+                android:layout_marginRight="@dimen/standard_quarter_margin"
                 android:src="@drawable/ic_synced" />
 
             <ImageView
@@ -59,12 +59,12 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom|right"
-                android:layout_marginRight="4dp"
+                android:layout_marginRight="@dimen/standard_quarter_margin"
                 android:src="@drawable/ic_available_offline" />
         </FrameLayout>
 
         <LinearLayout
-            android:layout_width="0dp"
+            android:layout_width="@dimen/zero"
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:gravity="top"
@@ -76,8 +76,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginLeft="0dp"
-                android:layout_marginRight="4dp"
+                android:layout_marginLeft="@dimen/zero"
+                android:layout_marginRight="@dimen/standard_quarter_margin"
                 android:ellipsize="middle"
                 android:singleLine="true"
                 android:text="TextView"
@@ -87,8 +87,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="0dp"
-                android:layout_marginRight="4dp"
+                android:layout_marginLeft="@dimen/zero"
+                android:layout_marginRight="@dimen/standard_quarter_margin"
                 android:orientation="horizontal">
 
                 <TextView
@@ -132,10 +132,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginTop="4dp"
-                android:layout_marginLeft="4dp"
-                android:layout_marginBottom="4dp"
-                android:layout_marginRight="4dp"
+                android:layout_marginTop="@dimen/standard_quarter_margin"
+                android:layout_marginLeft="@dimen/standard_quarter_margin"
+                android:layout_marginBottom="@dimen/standard_quarter_margin"
+                android:layout_marginRight="@dimen/standard_quarter_margin"
                 android:src="@drawable/shared_via_link" />
 
             <ImageView
@@ -143,7 +143,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginLeft="4dp"
+                android:layout_marginLeft="@dimen/standard_quarter_margin"
 
                 android:src="@drawable/ic_checkbox_blank_outline"
                 android:layout_toRightOf="@id/sharedIcon"/>

res/layout/listrow_details.xml

@@ -30,7 +30,7 @@
         android:id="@+id/textView1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawablePadding="5dp"
+        android:drawablePadding="@dimen/alternate_half_padding"
         android:gravity="center_vertical"
         android:paddingLeft="@dimen/standard_padding"
         android:textSize="16dp" >

res/layout/listrow_group.xml

@@ -26,6 +26,6 @@
     android:gravity="left"
     android:paddingLeft="@dimen/standard_padding"
     android:paddingTop="@dimen/standard_half_padding"
-    android:textSize="16dp"
+    android:textSize="@dimen/listrow_group_text_size"
     android:groupIndicator="@android:color/transparent"
 /> 

res/layout/log_item.xml

@@ -28,7 +28,7 @@
         android:layout_alignParentTop="true"
         android:layout_alignParentBottom="true"
         android:textStyle="bold"
-        android:textSize="22dp"
+        android:textSize="@dimen/log_item_text_size"
         android:textColor="#000000"
         android:layout_marginBottom="@dimen/standard_margin" />
 

res/layout/log_send_file.xml

@@ -28,7 +28,7 @@
     <ScrollView
         android:id="@+id/scrollView1"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
+        android:layout_height="@dimen/zero"
         android:layout_marginBottom="@dimen/standard_margin"
         android:layout_weight="1">
 

res/layout/media_control.xml

@@ -27,7 +27,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:paddingTop="4dp"
+        android:paddingTop="@dimen/standard_quarter_padding"
         android:orientation="horizontal"
         >
 
@@ -56,35 +56,35 @@
 
         <TextView 
             android:id="@+id/currentTimeText"
-            android:textSize="14sp"
+            android:textSize="@dimen/two_line_secondary_text_size"
             android:textStyle="bold"
-            android:paddingTop="4dp"
-            android:paddingStart="4dp"
+            android:paddingTop="@dimen/standard_quarter_padding"
+            android:paddingStart="@dimen/standard_quarter_padding"
             android:layout_gravity="center_horizontal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingEnd="4dp"
+            android:paddingEnd="@dimen/standard_quarter_padding"
             android:text="@string/placeholder_media_time"
             />
 
         <SeekBar
             android:id="@+id/progressBar"
             style="?android:attr/progressBarStyleHorizontal"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/zero"
             android:layout_weight="1"
-            android:layout_height="32dp"
+            android:layout_height="@dimen/seek_bar_height"
             android:layout_alignParentStart="true"
             android:layout_alignParentEnd="true" />
 
         <TextView android:id="@+id/totalTimeText"
-            android:textSize="14sp"
+            android:textSize="@dimen/two_line_secondary_text_size"
             android:textStyle="bold"
-            android:paddingTop="4dp"
-            android:paddingEnd="4dp"
+            android:paddingTop="@dimen/standard_quarter_padding"
+            android:paddingEnd="@dimen/standard_quarter_padding"
             android:layout_gravity="center_horizontal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingStart="4dp"
+            android:paddingStart="@dimen/standard_quarter_padding"
             android:text="@string/placeholder_media_time"
             />
         

res/layout/notification_with_progress_bar.xml

@@ -28,10 +28,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:minHeight="64dp"
+        android:minHeight="@dimen/notification_with_progress_bar_layout_height"
         android:orientation="vertical"
-        android:paddingRight="12dp"
-        android:paddingLeft="12dp"
+        android:paddingRight="@dimen/notification_with_progress_bar_layout"
+        android:paddingLeft="@dimen/notification_with_progress_bar_layout"
         >
 		<TextView android:id="@+id/title"
 			android:layout_width="match_parent"
@@ -44,8 +44,8 @@
         <TextView android:id="@+id/text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="-2dp"
-            android:layout_marginBottom="-2dp"
+            android:layout_marginTop="@dimen/standard_eighth_margin_negative"
+            android:layout_marginBottom="@dimen/standard_eighth_margin_negative"
             android:singleLine="true"
             android:fadingEdge="horizontal"
             android:ellipsize="marquee"
@@ -53,7 +53,7 @@
             />
         <FrameLayout android:id="@+id/progressHolder"
             android:layout_width="match_parent"
-            android:layout_height="12dp"
+            android:layout_height="@dimen/notification_with_progress_bar_layout"
             >
             <!--  the FrameLayout is needed to change visibility of the
             	progress bar in Android 2.2, even though 

res/layout/participate_layout.xml

@@ -100,7 +100,7 @@
                         android:layout_height="wrap_content"
                         android:background="@color/white"
                         android:onClick="onGetRCPlayStoreClick"
-                        android:padding="0dp"
+                        android:padding="@dimen/zero"
                         android:src="@drawable/playstore"/>
 
                     <ImageButton
@@ -109,7 +109,7 @@
                         android:layout_height="wrap_content"
                         android:background="@color/white"
                         android:onClick="onGetRCFDroidClick"
-                        android:padding="0dp"
+                        android:padding="@dimen/zero"
                         android:src="@drawable/fdroid"/>
 
                 </LinearLayout>
@@ -134,7 +134,7 @@
                     android:layout_height="wrap_content"
                     android:background="@color/white"
                     android:onClick="onGetBetaFDroidClick"
-                    android:padding="0dp"
+                    android:padding="@dimen/zero"
                     android:src="@drawable/fdroid"/>
 
                 <TextView
@@ -181,7 +181,7 @@
 
     <include
         layout="@layout/drawer"
-        android:layout_width="240dp"
+        android:layout_width="@dimen/drawer_width"
         android:layout_height="match_parent"
         android:layout_gravity="start"/>
 

res/layout/passcodelock.xml

@@ -32,7 +32,7 @@
         android:text="@string/pass_code_enter_pass_code"
         android:textColor="@android:color/black"
         android:gravity="center_horizontal"
-        android:textSize="16sp"
+        android:textSize="@dimen/two_line_primary_text_size"
          />
 
     <TextView
@@ -42,7 +42,7 @@
         android:text="@string/pass_code_configure_your_pass_code_explanation"
         android:textAppearance="@android:style/TextAppearance.Small"
         android:gravity="center_horizontal"
-        android:textSize="14sp"
+        android:textSize="@dimen/two_line_secondary_text_size"
          />
     
     <LinearLayout

res/layout/popup.xml

@@ -25,11 +25,11 @@
       
   <ScrollView 
     android:id="@+id/scroller"
-    android:layout_marginTop="16dip"
+    android:layout_marginTop="@dimen/standard_margin_independent"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:background="@drawable/popup"
-      android:fadingEdgeLength="5dip"
+      android:fadingEdgeLength="@dimen/alternate_half_padding_independent"
       android:scrollbars="none">
         
       <LinearLayout
@@ -38,7 +38,7 @@
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_weight="1"
-          android:padding="10dip"/>
+          android:padding="@dimen/alternate_padding_independent"/>
        
   </ScrollView >
   
@@ -52,7 +52,7 @@
         android:id="@+id/arrow_down"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="-4dip"
+        android:layout_marginTop="@dimen/standard_quarter_margin_negative_independent"
         android:src="@drawable/arrow_down" android:layout_below="@+id/scroller"/>
 
 </RelativeLayout>

res/layout/preview_image_activity.xml

@@ -31,7 +31,7 @@
 
     <include
         layout="@layout/drawer"
-        android:layout_width="240dp"
+        android:layout_width="@dimen/drawer_width"
         android:layout_height="match_parent"
         android:layout_gravity="start"/>
     

res/layout/preview_image_fragment.xml

@@ -47,7 +47,7 @@
         android:id="@+id/image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_margin="0dp"
+        android:layout_margin="@dimen/zero"
         android:layout_centerInParent="true"
         android:contentDescription="@string/preview_image_description"
         android:src="@drawable/image_fail" />
@@ -58,7 +58,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_alignParentBottom="true"
-        android:layout_margin="40dp"
+        android:layout_margin="@dimen/preview_image_fragment_display_text_margin"
         android:text="@string/placeholder_sentence"
         android:textColor="@color/owncloud_blue_bright"
         />

res/layout/search_users_groups_layout.xml

@@ -21,7 +21,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:id="@+id/search_layout"
-    android:minWidth="200dp"
+    android:minWidth="@dimen/search_users_groups_layout_width"
     android:layout_marginRight="@dimen/standard_margin"
     android:layout_marginBottom="@dimen/standard_half_margin">
 
@@ -45,7 +45,7 @@
         android:layout_height="match_parent"
         android:id="@+id/searchUsersListView"
         android:scrollbars="vertical"
-        android:layout_marginLeft="20dp"
+        android:layout_marginLeft="@dimen/search_users_groups_layout_list_view_margin"
         android:layout_marginRight="@dimen/standard_half_margin"/>
 
 </LinearLayout>

res/layout/share_file_layout.xml

@@ -48,16 +48,16 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/standard_half_margin"
-                android:layout_marginLeft="4dp"
+                android:layout_marginLeft="@dimen/standard_quarter_margin"
                 android:layout_marginRight="@dimen/standard_half_margin"
-                android:layout_marginStart="4dp"
+                android:layout_marginStart="@dimen/standard_quarter_margin"
                 android:layout_toEndOf="@+id/shareFileIcon"
                 android:layout_toRightOf="@+id/shareFileIcon"
                 android:ellipsize="middle"
                 android:singleLine="true"
                 android:text="@string/placeholder_filename"
                 android:textColor="@color/black"
-                android:textSize="16sp"/>
+                android:textSize="@dimen/two_line_primary_text_size"/>
 
             <TextView
                 android:id="@+id/shareFileSize"
@@ -65,18 +65,18 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/shareFileName"
                 android:layout_gravity="center_vertical"
-                android:layout_marginLeft="4dp"
+                android:layout_marginLeft="@dimen/standard_quarter_margin"
                 android:layout_toEndOf="@+id/shareFileIcon"
                 android:layout_toRightOf="@+id/shareFileIcon"
                 android:text="@string/placeholder_filesize"
-                android:textSize="12sp"/>
+                android:textSize="@dimen/share_file_layout_text_size"/>
 
         </RelativeLayout>
 
         <View
             android:id="@+id/share_header_divider"
             android:layout_width="match_parent"
-            android:layout_height="2dp"
+            android:layout_height="@dimen/standard_eighth_margin"
             android:background="@color/owncloud_blue"
             />
 
@@ -114,7 +114,7 @@
                 android:layout_height="wrap_content"
                 android:padding="@dimen/standard_half_padding"
                 android:text="@string/share_no_users"
-                android:textSize="12sp"/>
+                android:textSize="@dimen/share_file_layout_text_size"/>
 
             <android.support.v7.widget.AppCompatButton
                 android:id="@+id/addUserButton"
@@ -219,7 +219,7 @@
                         android:padding="@dimen/standard_half_padding"
                         android:text="@string/share_via_link_hide_file_listing_permission_label"
                         android:textColor="@color/black"
-                        android:textSize="14sp"
+                        android:textSize="@dimen/two_line_secondary_text_size"
                         />
 
                 </RelativeLayout>
@@ -253,7 +253,7 @@
                         android:paddingTop="@dimen/standard_half_padding"
                         android:text="@string/share_via_link_password_label"
                         android:textColor="@color/black"
-                        android:textSize="14sp"
+                        android:textSize="@dimen/two_line_secondary_text_size"
                         />
 
                     <TextView
@@ -269,7 +269,7 @@
                         android:paddingLeft="@dimen/standard_half_padding"
                         android:paddingRight="@dimen/standard_half_padding"
                         android:text="@string/share_via_link_password_title"
-                        android:textSize="12sp"
+                        android:textSize="@dimen/share_file_layout_text_size"
                         android:visibility="invisible"
                         />
 
@@ -304,7 +304,7 @@
                         android:paddingTop="@dimen/standard_half_padding"
                         android:text="@string/share_via_link_expiration_date_label"
                         android:textColor="@color/black"
-                        android:textSize="14sp"
+                        android:textSize="@dimen/two_line_secondary_text_size"
                         />
 
                     <TextView
@@ -319,7 +319,7 @@
                         android:paddingBottom="@dimen/standard_half_padding"
                         android:paddingLeft="@dimen/standard_half_padding"
                         android:paddingRight="@dimen/standard_half_padding"
-                        android:textSize="12sp"
+                        android:textSize="@dimen/share_file_layout_text_size"
                         />
 
                 </RelativeLayout>

res/layout/share_user_item.xml

@@ -49,8 +49,8 @@
             android:layout_gravity="center_vertical"/>
 
         <ImageView
-            android:layout_width="36dp"
-            android:layout_height="36dp"
+            android:layout_width="@dimen/unshare_icon_size"
+            android:layout_height="@dimen/unshare_icon_size"
             android:id="@+id/unshareButton"
             android:src="@drawable/ic_action_delete_grey"
             android:layout_gravity="center_vertical"

res/layout/simple_dialog_list_item.xml

@@ -5,8 +5,8 @@
     android:layout_height="wrap_content"
     android:textAppearance="?android:attr/textAppearanceListItemSmall"
     android:textColor="@color/dialog_list_item"
-    android:textSize="16sp"
+    android:textSize="@dimen/two_line_primary_text_size"
     android:gravity="center_vertical"
     android:paddingLeft="@dimen/standard_padding"
     android:paddingRight="@dimen/standard_padding"
-    android:minHeight="48dp"/>
+    android:minHeight="@dimen/simple_dialog_list_item_layout_size"/>

res/layout/ssl_untrusted_cert_layout.xml

@@ -41,7 +41,7 @@
 		android:layout_height="wrap_content"
 		android:layout_weight="0"
 		android:layout_gravity="left"
-		android:paddingLeft="8dp"
+		android:paddingLeft="@dimen/standard_half_padding"
 		android:text="@string/ssl_validator_reason_cert_not_trusted"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
@@ -52,7 +52,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="left"
-		android:paddingLeft="8dp"
+		android:paddingLeft="@dimen/standard_half_padding"
 		android:text="@string/ssl_validator_reason_cert_expired"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
@@ -62,7 +62,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="left"
-		android:paddingLeft="8dp"
+		android:paddingLeft="@dimen/standard_half_padding"
 		android:text="@string/ssl_validator_reason_cert_not_yet_valid"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
@@ -72,7 +72,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="left"
-		android:paddingLeft="8dp"
+		android:paddingLeft="@dimen/standard_half_padding"
 		android:text="@string/ssl_validator_reason_hostname_not_verified"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
@@ -82,7 +82,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="left"
-		android:paddingLeft="8dp"
+		android:paddingLeft="@dimen/standard_half_padding"
 		android:text="@string/ssl_validator_no_info_about_error"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
@@ -90,9 +90,9 @@
     <ScrollView 
         android:id="@+id/details_scroll"
         android:visibility="gone" 
-    	android:padding="8dp"
+    	android:padding="@dimen/standard_half_padding"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
+        android:layout_height="@dimen/zero"
         android:layout_weight="1"
         >
         
@@ -108,7 +108,7 @@
 		        android:layout_width="wrap_content"
 		        android:layout_height="wrap_content"
 		        android:layout_gravity="left"
-		        android:paddingLeft="20dp"
+		        android:paddingLeft="@dimen/ssl_untrusted_cert_layout_padding"
 		        android:text="@string/ssl_validator_null_cert"
 		        android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -116,7 +116,7 @@
         			android:id="@+id/label_subject"
         			android:layout_width="wrap_content"
         			android:layout_height="wrap_content"
-					android:paddingBottom="5dp"
+					android:paddingBottom="@dimen/alternate_half_padding"
         			android:text="@string/ssl_validator_label_subject"
         			android:textAppearance="?android:attr/textAppearanceMedium"
         		/>
@@ -133,7 +133,7 @@
 				    android:id="@+id/value_subject_CN"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -150,7 +150,7 @@
 				    android:id="@+id/value_subject_O"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -167,7 +167,7 @@
 				    android:id="@+id/value_subject_OU"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -184,7 +184,7 @@
 				    android:id="@+id/value_subject_ST"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -201,7 +201,7 @@
 				    android:id="@+id/value_subject_C"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -218,7 +218,7 @@
 				    android:id="@+id/value_subject_L"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -228,7 +228,7 @@
         			android:id="@+id/label_issuer"
         			android:layout_width="wrap_content"
         			android:layout_height="wrap_content"
-					android:paddingBottom="5dp"
+					android:paddingBottom="@dimen/alternate_half_padding"
         			android:text="@string/ssl_validator_label_issuer"
         			android:textAppearance="?android:attr/textAppearanceMedium"
         		/>
@@ -245,7 +245,7 @@
 				    android:id="@+id/value_issuer_CN"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -262,7 +262,7 @@
 				    android:id="@+id/value_issuer_O"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -279,7 +279,7 @@
 				    android:id="@+id/value_issuer_OU"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -296,7 +296,7 @@
 				    android:id="@+id/value_issuer_ST"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -313,7 +313,7 @@
 				    android:id="@+id/value_issuer_C"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -330,7 +330,7 @@
 				    android:id="@+id/value_issuer_L"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -339,7 +339,7 @@
         			android:id="@+id/label_validity"
         			android:layout_width="wrap_content"
         			android:layout_height="wrap_content"
-					android:paddingBottom="5dp"
+					android:paddingBottom="@dimen/alternate_half_padding"
         			android:text="@string/ssl_validator_label_validity"
         			android:textAppearance="?android:attr/textAppearanceMedium"
         		/>
@@ -356,7 +356,7 @@
 				    android:id="@+id/value_validity_from"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -373,7 +373,7 @@
 				    android:id="@+id/value_validity_to"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -382,7 +382,7 @@
         			android:id="@+id/label_signature"
         			android:layout_width="wrap_content"
         			android:layout_height="wrap_content"
-					android:paddingBottom="5dp"
+					android:paddingBottom="@dimen/alternate_half_padding"
         			android:text="@string/ssl_validator_label_signature"
         			android:textAppearance="?android:attr/textAppearanceMedium"
         		/>
@@ -399,7 +399,7 @@
         			android:id="@+id/value_signature_algorithm"
         			android:layout_width="wrap_content"
         			android:layout_height="wrap_content"
-					android:paddingBottom="5dp"
+					android:paddingBottom="@dimen/alternate_half_padding"
         			android:text=""
         			android:textAppearance="?android:attr/textAppearanceSmall"
         		/>
@@ -408,7 +408,7 @@
 					android:id="@+id/label_certificate_fingerprint"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:paddingBottom="5dp"
+					android:paddingBottom="@dimen/alternate_half_padding"
 					android:text="@string/ssl_validator_label_certificate_fingerprint"
 					android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -417,7 +417,7 @@
 					android:id="@+id/value_certificate_fingerprint"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:paddingBottom="5dp"
+					android:paddingBottom="@dimen/alternate_half_padding"
 					android:text=""
 					android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -445,7 +445,7 @@
 		<android.support.v7.widget.AppCompatButton
             android:id="@+id/cancel"
 			style="@style/Button.Borderless"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/zero"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/common_no" />
@@ -453,7 +453,7 @@
 		<android.support.v7.widget.AppCompatButton
             android:id="@+id/details_btn"
 			style="@style/Button.Borderless"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/zero"
             android:layout_height="wrap_content"
             android:layout_weight="2"
             android:text="@string/ssl_validator_btn_details_see" />
@@ -461,7 +461,7 @@
 		<android.support.v7.widget.AppCompatButton
             android:id="@+id/ok"
 			style="@style/Button.Borderless"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/zero"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/common_yes" />

res/layout/ssl_validator_layout.xml

@@ -39,7 +39,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="left"
-		android:paddingLeft="8dp"
+		android:paddingLeft="@dimen/standard_half_padding"
 		android:text="@string/ssl_validator_reason_cert_not_trusted"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
@@ -49,7 +49,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="left"
-		android:paddingLeft="8dp"
+		android:paddingLeft="@dimen/standard_half_padding"
 		android:text="@string/ssl_validator_reason_cert_expired"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
@@ -59,7 +59,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="left"
-		android:paddingLeft="8dp"
+		android:paddingLeft="@dimen/standard_half_padding"
 		android:text="@string/ssl_validator_reason_cert_not_yet_valid"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
@@ -69,7 +69,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="left"
-		android:paddingLeft="8dp"
+		android:paddingLeft="@dimen/standard_half_padding"
 		android:text="@string/ssl_validator_reason_hostname_not_verified"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
@@ -77,9 +77,9 @@
     <ScrollView 
         android:id="@+id/details_scroll"
         android:visibility="gone" 
-    	android:padding="8dp"
+    	android:padding="@dimen/standard_half_padding"
         android:layout_width="wrap_content"
-        android:layout_height="180dp">
+        android:layout_height="@dimen/scroll_view_height">
         
 		<LinearLayout
     		android:id="@+id/details_view"
@@ -92,7 +92,7 @@
         			android:id="@+id/label_subject"
         			android:layout_width="wrap_content"
         			android:layout_height="wrap_content"
-					android:paddingBottom="5dp"
+					android:paddingBottom="@dimen/alternate_half_padding"
         			android:text="@string/ssl_validator_label_subject"
         			android:textAppearance="?android:attr/textAppearanceMedium"
         		/>
@@ -109,7 +109,7 @@
 				    android:id="@+id/value_subject_CN"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -126,7 +126,7 @@
 				    android:id="@+id/value_subject_O"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -143,7 +143,7 @@
 				    android:id="@+id/value_subject_OU"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -160,7 +160,7 @@
 				    android:id="@+id/value_subject_ST"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -177,7 +177,7 @@
 				    android:id="@+id/value_subject_C"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -194,7 +194,7 @@
 				    android:id="@+id/value_subject_L"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -204,7 +204,7 @@
         			android:id="@+id/label_issuer"
         			android:layout_width="wrap_content"
         			android:layout_height="wrap_content"
-					android:paddingBottom="5dp"
+					android:paddingBottom="@dimen/alternate_half_padding"
         			android:text="@string/ssl_validator_label_issuer"
         			android:textAppearance="?android:attr/textAppearanceMedium"
         		/>
@@ -221,7 +221,7 @@
 				    android:id="@+id/value_issuer_CN"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -238,7 +238,7 @@
 				    android:id="@+id/value_issuer_O"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -255,7 +255,7 @@
 				    android:id="@+id/value_issuer_OU"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -272,7 +272,7 @@
 				    android:id="@+id/value_issuer_ST"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -289,7 +289,7 @@
 				    android:id="@+id/value_issuer_C"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -306,7 +306,7 @@
 				    android:id="@+id/value_issuer_L"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -315,7 +315,7 @@
         			android:id="@+id/label_validity"
         			android:layout_width="wrap_content"
         			android:layout_height="wrap_content"
-					android:paddingBottom="5dp"
+					android:paddingBottom="@dimen/alternate_half_padding"
         			android:text="@string/ssl_validator_label_validity"
         			android:textAppearance="?android:attr/textAppearanceMedium"
         		/>
@@ -332,7 +332,7 @@
 				    android:id="@+id/value_validity_from"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -349,7 +349,7 @@
 				    android:id="@+id/value_validity_to"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
-				    android:paddingBottom="5dp"
+				    android:paddingBottom="@dimen/alternate_half_padding"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
@@ -359,7 +359,7 @@
         			android:id="@+id/label_signature"
         			android:layout_width="wrap_content"
         			android:layout_height="wrap_content"
-					android:paddingBottom="5dp"
+					android:paddingBottom="@dimen/alternate_half_padding"
         			android:text="@string/ssl_validator_label_signature"
         			android:textAppearance="?android:attr/textAppearanceMedium"
         		/>
@@ -376,7 +376,7 @@
         			android:id="@+id/value_signature_algorithm"
         			android:layout_width="wrap_content"
         			android:layout_height="wrap_content"
-					android:paddingBottom="5dp"
+					android:paddingBottom="@dimen/alternate_half_padding"
         			android:text=""
         			android:textAppearance="?android:attr/textAppearanceSmall"
         		/>
@@ -386,7 +386,7 @@
         			android:id="@+id/value_signature"
         			android:layout_width="wrap_content"
         			android:layout_height="wrap_content"
-					android:paddingBottom="5dp"
+					android:paddingBottom="@dimen/alternate_half_padding"
         			android:text=""
         			android:textAppearance="?android:attr/textAppearanceSmall"
         		/>
@@ -413,7 +413,7 @@
 		<android.support.v7.widget.AppCompatButton
             android:id="@+id/cancel"
 			style="@style/Button.Borderless"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/zero"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/common_no" />
@@ -421,7 +421,7 @@
 		<android.support.v7.widget.AppCompatButton
             android:id="@+id/details_btn"
 			style="@style/Button.Borderless"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/zero"
             android:layout_height="wrap_content"
             android:layout_weight="2"
             android:text="@string/ssl_validator_btn_details_see" />
@@ -429,7 +429,7 @@
 		<android.support.v7.widget.AppCompatButton
             android:id="@+id/ok"
 			style="@style/Button.Borderless"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/zero"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/common_yes" />

res/layout/toolbar_standard.xml

@@ -36,11 +36,11 @@
         android:id="@+id/progressBar"
         style="@style/Widget.ownCloud.TopProgressBar"
         android:layout_width="match_parent"
-        android:layout_height="4dp"
-        android:layout_margin="0dp"
+        android:layout_height="@dimen/standard_quarter_margin"
+        android:layout_margin="@dimen/zero"
         android:indeterminate="false"
         android:indeterminateOnly="false"
-        android:padding="0dp"
+        android:padding="@dimen/zero"
         android:visibility="visible"
         />
 

res/layout/upload_files_layout.xml

@@ -28,7 +28,7 @@
     <fragment
         android:id="@+id/local_files_list"
         android:layout_width="match_parent"
-        android:layout_height="0dip"
+        android:layout_height="@dimen/zero"
         android:layout_weight="1"
         class="com.owncloud.android.ui.fragment.LocalFileListFragment" />
 
@@ -63,7 +63,7 @@
 
         <Spinner
             android:layout_width="match_parent"
-            android:layout_height="0dp"
+            android:layout_height="@dimen/zero"
             android:id="@+id/upload_files_spinner_behaviour"
             android:layout_weight="1"/>
     </LinearLayout>

res/layout/upload_list_group.xml

@@ -9,11 +9,11 @@
        android:layout_height="wrap_content"
        android:layout_gravity="center_vertical"
        android:divider="@null"
-       android:dividerHeight="0dp"
+       android:dividerHeight="@dimen/zero"
        android:ellipsize="middle"
        android:showDividers="none"
        android:textColor="@color/color_accent"
-       android:paddingLeft="16dp"
+       android:paddingLeft="@dimen/standard_padding"
 	/>
 
 </RelativeLayout>

res/layout/upload_list_item.xml

@@ -9,7 +9,7 @@
     >
 
     <FrameLayout
-        android:layout_width="60dp"
+        android:layout_width="@dimen/upload_list_item_frame_layout_width"
         android:layout_height="@dimen/standard_list_item_size"
         android:focusable="false"
         android:focusableInTouchMode="false">
@@ -24,7 +24,7 @@
     </FrameLayout>
 
     <LinearLayout
-        android:layout_width="0dp"
+        android:layout_width="@dimen/zero"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="center_vertical"
@@ -40,7 +40,7 @@
             android:singleLine="true"
             android:textColor="@color/textColor"
             android:text="@string/placeholder_filename"
-            android:textSize="16sp" />
+            android:textSize="@dimen/two_line_primary_text_size" />
 
 
         <LinearLayout
@@ -55,23 +55,23 @@
                 android:ellipsize="middle"
                 android:singleLine="true"
                 android:text="@string/placeholder_filesize"
-                android:textSize="12sp"/>
+                android:textSize="@dimen/upload_list_item_text_size"/>
             <TextView
                 android:id="@+id/upload_date"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/list_item_lastmod_and_filesize_text"
-                android:layout_marginStart="4dp"
-                android:layout_marginEnd="4dp"
+                android:layout_marginStart="@dimen/standard_quarter_margin"
+                android:layout_marginEnd="@dimen/standard_quarter_margin"
                 android:text="@string/placeholder_timestamp"
-                android:textSize="12sp"/>
+                android:textSize="@dimen/upload_list_item_text_size"/>
             <TextView
                 android:id="@+id/upload_status"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/list_item_lastmod_and_filesize_text"
                 android:text="@string/uploads_view_upload_status_succeeded"
-                android:textSize="12sp"/>
+                android:textSize="@dimen/upload_list_item_text_size"/>
 
         </LinearLayout>
 
@@ -89,7 +89,7 @@
             android:textColor="@color/list_item_lastmod_and_filesize_text"
             android:singleLine="true"
             android:text="@string/auth_username"
-            android:textSize="12dip"/>
+            android:textSize="@dimen/upload_list_item_text_size_independent"/>
 
         <TextView
             android:id="@+id/upload_remote_path"
@@ -99,7 +99,7 @@
             android:ellipsize="middle"
             android:singleLine="true"
             android:text="@string/instant_upload_path"
-            android:textSize="12dip"/>
+            android:textSize="@dimen/upload_list_item_text_size_independent"/>
 
     </LinearLayout>
 
@@ -110,13 +110,13 @@
         android:focusable="false"
         android:focusableInTouchMode="false"
         android:layout_gravity="center_vertical"
-        android:paddingLeft="8dp"
+        android:paddingLeft="@dimen/standard_half_padding"
      >
 
         <ImageButton
             android:id="@+id/upload_right_button"
-            android:layout_width="35dp"
-            android:layout_height="35dp"
+            android:layout_width="@dimen/upload_list_item_image_size"
+            android:layout_height="@dimen/upload_list_item_image_size"
             android:layout_gravity="center"
             android:background="@android:color/transparent"
      />

res/layout/upload_list_layout.xml

@@ -41,7 +41,7 @@
 
     <include
         layout="@layout/drawer"
-        android:layout_width="240dp"
+        android:layout_width="@dimen/drawer_width"
         android:layout_height="match_parent"
         android:layout_gravity="start"/>
 

res/layout/uploader_list_item_layout.xml

@@ -28,11 +28,11 @@
         android:layout_width="@dimen/file_icon_size"
         android:layout_height="@dimen/file_icon_size"
         android:layout_gravity="center_vertical"
-        android:layout_margin="12dp"
+        android:layout_margin="@dimen/uploader_list_item_layout_image_margin"
         android:src="@drawable/ic_menu_archive" />
 
     <LinearLayout
-        android:layout_width="0dp"
+        android:layout_width="@dimen/zero"
         android:layout_height="@dimen/standard_list_item_size"
         android:layout_weight="1"
         android:gravity="center_vertical"
@@ -43,19 +43,19 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="0dp"
-            android:layout_marginRight="4dp"
+            android:layout_marginLeft="@dimen/zero"
+            android:layout_marginRight="@dimen/standard_quarter_margin"
             android:ellipsize="middle"
             android:singleLine="true"
             android:text="TextView"
             android:textColor="@color/textColor"
-            android:textSize="16dip" />
+            android:textSize="@dimen/two_line_primary_text_size" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="0dp"
-            android:layout_marginRight="4dp"
+            android:layout_marginLeft="@dimen/zero"
+            android:layout_marginRight="@dimen/standard_quarter_margin"
             android:orientation="horizontal">
 
             <TextView

res/values/dims.xml

@@ -31,7 +31,6 @@
     <dimen name="nav_drawer_header_avatar_second_account_margin">56dp</dimen>
     <dimen name="nav_drawer_menu_avatar_radius">12sp</dimen>
     <dimen name="list_item_avatar_icon_radius">20dp</dimen>
-
     <dimen name="file_icon_size">32dp</dimen>
     <dimen name="file_icon_size_grid">128dp</dimen>
     <dimen name="file_avatar_size">128dp</dimen>
@@ -40,12 +39,64 @@
     <dimen name="standard_quarter_padding">4dp</dimen>
     <dimen name="standard_margin">16dp</dimen>
     <dimen name="standard_half_margin">8dp</dimen>
+    <dimen name="standard_quarter_margin">4dp</dimen>
+    <dimen name="standard_eighth_margin">2dp</dimen>
+    <dimen name="standard_eighth_margin_negative">-2dp</dimen>
     <dimen name="min_list_item_size">56dp</dimen>
     <dimen name="standard_list_item_size">72dp</dimen>
-
     <dimen name="two_line_primary_text_size">16sp</dimen>
     <dimen name="two_line_secondary_text_size">14sp</dimen>
-
     <dimen name="list_item_avatar_icon_margin">20dp</dimen>
     <dimen name="list_item_avatar_text_margin">28dp</dimen>
+    <dimen name="account_action_layout_height">72dp</dimen>
+    <dimen name="zero">0dp</dimen>
+    <dimen name="account_item_layout_height">72dp</dimen>
+    <dimen name="user_icon_size">40dp</dimen>
+    <dimen name="alternate_margin">10dp</dimen>
+    <dimen name="alternate_half_margin">5dp</dimen>
+    <dimen name="alternate_padding">10dp</dimen>
+    <dimen name="alternate_half_padding">5dp</dimen>
+    <dimen name="alternate_padding_right">55dp</dimen>
+    <dimen name="display_text_min_height">32dp</dimen>
+    <dimen name="divider_height_independent">1dip</dimen>
+    <dimen name="alternate_padding_independent">10dip</dimen>
+    <dimen name="alternate_half_padding_independent">5dip</dimen>
+    <dimen name="standard_padding_independent">16dip</dimen>
+    <dimen name="standard_half_padding_independent">8dip</dimen>
+    <dimen name="activity_row_layout_min_width_independent">196dip</dimen>
+    <dimen name="user_icon_size_independent">40dip</dimen>
+    <dimen name="drawer_header_text">14sp</dimen>
+    <dimen name="drawer_header_subtext">12sp</dimen>
+    <dimen name="edit_share_layout_view_height">2dp</dimen>
+    <dimen name="file_actions_view_height">2dp</dimen>
+    <dimen name="fragment_margin">12dp</dimen>
+    <dimen name="file_download_fragment_layout_padding">20dp</dimen>
+    <dimen name="alternate_fragment_margin">15dp</dimen>
+    <dimen name="file_download_fragment_display_text_margin">40dp</dimen>
+    <dimen name="drawer_width">240dp</dimen>
+    <dimen name="favorite_icon_size">15dp</dimen>
+    <dimen name="elevation">30dp</dimen>
+    <dimen name="grid_item_text_size">16dip</dimen>
+    <dimen name="list_fragment_column_width">100dp</dimen>
+    <dimen name="list_fragment_spacing">2dp</dimen>
+    <dimen name="listrow_group_text_size">16dp</dimen>
+    <dimen name="log_item_text_size">22dp</dimen>
+    <dimen name="seek_bar_height">32dp</dimen>
+    <dimen name="notification_with_progress_bar_layout">12dp</dimen>
+    <dimen name="notification_with_progress_bar_layout_height">64dp</dimen>
+    <dimen name="standard_margin_independent">16dip</dimen>
+    <dimen name="standard_quarter_margin_negative_independent">-4dip</dimen>
+    <dimen name="preview_image_fragment_display_text_margin">40dp</dimen>
+    <dimen name="search_users_groups_layout_width">200dp</dimen>
+    <dimen name="search_users_groups_layout_list_view_margin">20dp</dimen>
+    <dimen name="share_file_layout_text_size">12sp</dimen>
+    <dimen name="unshare_icon_size">36dp</dimen>
+    <dimen name="simple_dialog_list_item_layout_size">48dp</dimen>
+    <dimen name="ssl_untrusted_cert_layout_padding">20dp</dimen>
+    <dimen name="scroll_view_height">180dp</dimen>
+    <dimen name="upload_list_item_frame_layout_width">60dp</dimen>
+    <dimen name="upload_list_item_text_size">12sp</dimen>
+    <dimen name="upload_list_item_text_size_independent">12dip</dimen>
+    <dimen name="upload_list_item_image_size">35dp</dimen>
+    <dimen name="uploader_list_item_layout_image_margin">12dp</dimen>
 </resources>