Эх сурвалжийг харах

set standard 16dp whitespaces via config values not hardcoded

Andy Scherzinger 9 жил өмнө
parent
commit
8a8eb435a3

+ 1 - 1
res/layout/account_setup.xml

@@ -38,7 +38,7 @@
             android:id="@+id/thumbnail"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
+            android:layout_marginBottom="@dimen/standard_margin"
             android:src="@drawable/logo"
             android:contentDescription="@string/app_name"/>
 

+ 5 - 5
res/layout/drawer.xml

@@ -69,15 +69,15 @@
         <LinearLayout
             android:layout_width="fill_parent"
             android:layout_height="100dp"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
+            android:paddingTop="@dimen/standard_padding"
+            android:paddingBottom="@dimen/standard_padding"
             android:background="@color/owncloud_blue_accent">
 
             <ImageView
                 android:id="@+id/itemIcon"
                 android:layout_width="24sp"
                 android:layout_height="24sp"
-                android:layout_marginLeft="16sp"
+                android:layout_marginLeft="@dimen/standard_padding"
                 android:layout_marginBottom="3dp"
                 android:layout_gravity="bottom"
                 android:src="@drawable/ic_account_circle"
@@ -92,8 +92,8 @@
                 android:orientation="vertical"
                 android:text="@string/app_name"
                 android:textColor="#FFF"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
+                android:paddingLeft="@dimen/standard_padding"
+                android:paddingRight="@dimen/standard_padding"
                 android:textSize="24sp"
                 android:ellipsize="end"
                 android:singleLine="true"

+ 5 - 5
res/layout/drawer_list_item.xml

@@ -24,15 +24,15 @@
     android:layout_alignParentLeft="true"
     android:orientation="horizontal"
     android:background="@color/background_color"
-    android:layout_marginTop="16dp"
-    android:layout_marginBottom="16dp"
+    android:layout_marginTop="@dimen/standard_margin"
+    android:layout_marginBottom="@dimen/standard_margin"
     android:minHeight="?android:attr/listPreferredItemHeight">
 
     <ImageView
         android:id="@+id/itemIcon"
         android:layout_width="24sp"
         android:layout_height="24sp"
-        android:layout_marginLeft="16sp"
+        android:layout_marginLeft="@dimen/standard_margin"
         android:layout_gravity="center_vertical"
         />
 
@@ -40,8 +40,8 @@
         android:id="@+id/itemTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
+        android:paddingLeft="@dimen/standard_padding"
+        android:paddingRight="@dimen/standard_padding"
         android:textColor="@color/drawerMenuTextColor"
         android:text="@string/app_name"
         android:layout_gravity="center_vertical"

+ 3 - 3
res/layout/drawer_radiobutton.xml

@@ -21,7 +21,7 @@
     android:layout_width="fill_parent"
     android:layout_height="56dp"
     android:gravity="center_vertical"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
-    android:textColor="#000"
+    android:paddingLeft="@dimen/standard_padding"
+    android:paddingRight="@dimen/standard_padding"
+    android:textColor="@color/black"
     android:textSize="18dp" />

+ 8 - 7
res/layout/file_details_fragment.xml

@@ -32,9 +32,9 @@
 			android:id="@+id/fdFileHeaderContainer"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="16dp"
-			android:layout_marginRight="16dp"
-			android:layout_marginTop="4dp" >
+			android:layout_marginLeft="@dimen/standard_margin"
+			android:layout_marginRight="@dimen/standard_margin"
+			android:layout_marginTop="@dimen/standard_margin" >
 	
 			<ImageView
 				android:id="@+id/fdIcon"
@@ -57,8 +57,8 @@
 			android:id="@+id/fdDetailsContainer"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="16dp"
-			android:layout_marginRight="16dp"
+			android:layout_marginLeft="@dimen/standard_margin"
+			android:layout_marginRight="@dimen/standard_margin"
 			android:layout_below="@id/fdFileHeaderContainer" >
 		
 			<RelativeLayout
@@ -159,7 +159,7 @@
 			android:layout_height="wrap_content"
 			android:layout_below="@+id/fdDetailsContainer"
 			android:gravity="center_horizontal" 
-			android:layout_margin="16dp"
+			android:layout_margin="@dimen/standard_margin"
 			>
 			
 			<CheckBox
@@ -167,7 +167,8 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_centerHorizontal="true"
-				android:text="@string/favorite" />
+				android:text="@string/favorite"
+				android:checked="false" />
 
 			<LinearLayout
 				android:layout_width="match_parent"

+ 1 - 1
res/layout/file_preview.xml

@@ -39,7 +39,7 @@
 	        android:id="@+id/image_preview"
 	        android:layout_width="match_parent"
 	        android:layout_height="match_parent"
-	        android:layout_margin="16dp"
+	        android:layout_margin="@dimen/standard_margin"
 	        android:layout_gravity="center"
 	        android:contentDescription="@string/preview_image_description"
 	        android:src="@drawable/logo" />

+ 1 - 1
res/layout/list_item.xml

@@ -147,7 +147,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="4dp"
-            android:layout_marginRight="16dp"
+            android:layout_marginRight="@dimen/standard_margin"
             android:gravity=""
             android:src="@drawable/ic_checkbox_blank_outline" />
     </LinearLayout>

+ 2 - 2
res/layout/listrow_details.xml

@@ -23,7 +23,7 @@
     android:clickable="true"
     android:orientation="vertical"
     android:background="#fff"
-    android:paddingLeft="16dp"
+    android:paddingLeft="@dimen/standard_padding"
     tools:context=".MainActivity" >
 
     <TextView
@@ -32,7 +32,7 @@
         android:layout_height="wrap_content"
         android:drawablePadding="5dp"
         android:gravity="center_vertical"
-        android:paddingLeft="16dp"
+        android:paddingLeft="@dimen/standard_padding"
         android:textSize="16dp" >
 
     </TextView>

+ 1 - 1
res/layout/listrow_group.xml

@@ -24,7 +24,7 @@
     android:layout_height="56dp"
     android:layout_marginLeft="8dp"
     android:gravity="left"
-    android:paddingLeft="16dp"
+    android:paddingLeft="@dimen/standard_padding"
     android:paddingTop="8dp"
     android:textSize="16dp"
     android:groupIndicator="@android:color/transparent"

+ 3 - 3
res/layout/ssl_untrusted_cert_layout.xml

@@ -21,7 +21,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:gravity="center"
-	android:padding="16dp"
+	android:padding="@dimen/standard_padding"
     android:orientation="vertical" >
 
 	<TextView
@@ -29,7 +29,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_weight="0"
-		android:paddingBottom="16dp"
+		android:paddingBottom="@dimen/standard_padding"
 		android:text="@string/ssl_validator_header"
 		android:textAppearance="?android:attr/textAppearanceMedium"
 		android:textColor="@android:color/black"
@@ -424,7 +424,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
 		android:layout_weight="0"
-		android:paddingTop="16dp"
+		android:paddingTop="@dimen/standard_padding"
         android:text="@string/ssl_validator_question"
         android:textAppearance="?android:attr/textAppearanceMedium"
         >

+ 3 - 3
res/layout/ssl_validator_layout.xml

@@ -22,14 +22,14 @@
     android:layout_height="wrap_content"
     android:gravity="center"
     android:orientation="vertical"
-	android:padding="16dp">
+	android:padding="@dimen/standard_padding">
 
 	<TextView
 		android:id="@+id/header"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:text="@string/ssl_validator_header"
-		android:paddingBottom="16dp"
+		android:paddingBottom="@dimen/standard_padding"
 		android:textAppearance="?android:attr/textAppearanceMedium"
 		android:textColor="@color/black"
 		 />
@@ -399,7 +399,7 @@
         android:id="@+id/question"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-		android:paddingTop="16dp"
+		android:paddingTop="@dimen/standard_padding"
         android:text="@string/ssl_validator_question"
         android:textAppearance="?android:attr/textAppearanceMedium"
         >

+ 1 - 0
res/values/dims.xml

@@ -25,6 +25,7 @@
     <dimen name="file_icon_size">40dp</dimen>
     <dimen name="file_icon_size_grid">128dp</dimen>
     <dimen name="standard_padding">16dp</dimen>
+    <dimen name="standard_margin">16dp</dimen>
 
     <dimen name="two_line_primary_text_size">16sp</dimen>
     <dimen name="two_line_secondary_text_size">14sp</dimen>