set standard 16dp whitespaces via config values not hardcoded

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 0b022bb..c909e06 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -38,7 +38,7 @@
             android:id="@+id/thumbnail"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:id="@+id/thumbnail"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r

-            android:layout_marginBottom="16dp"\r
+            android:layout_marginBottom="@dimen/standard_margin"\r

             android:src="@drawable/logo"\r
             android:contentDescription="@string/app_name"/>\r
 \r
             android:src="@drawable/logo"\r
             android:contentDescription="@string/app_name"/>\r
 \r

diff --git a/res/layout/drawer.xml b/res/layout/drawer.xml
index cf68f44..6bad340 100644 (file)
--- a/res/layout/drawer.xml
+++ b/res/layout/drawer.xml
@@ -69,15 +69,15 @@
         <LinearLayout
             android:layout_width="fill_parent"
             android:layout_height="100dp"
         <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: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"
                 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: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"
                 android:textSize="24sp"
                 android:ellipsize="end"
                 android:singleLine="true"

diff --git a/res/layout/drawer_list_item.xml b/res/layout/drawer_list_item.xml
index 9b6c182..c1698b7 100644 (file)
--- a/res/layout/drawer_list_item.xml
+++ b/res/layout/drawer_list_item.xml
@@ -24,15 +24,15 @@
     android:layout_alignParentLeft="true"
     android:orientation="horizontal"
     android:background="@color/background_color"
     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: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"
         />
 
         android:layout_gravity="center_vertical"
         />
 


@@ -40,8 +40,8 @@
         android:id="@+id/itemTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         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"
         android:textColor="@color/drawerMenuTextColor"
         android:text="@string/app_name"
         android:layout_gravity="center_vertical"

diff --git a/res/layout/drawer_radiobutton.xml b/res/layout/drawer_radiobutton.xml
index 726d057..3c4bbdb 100644 (file)
--- a/res/layout/drawer_radiobutton.xml
+++ b/res/layout/drawer_radiobutton.xml
@@ -21,7 +21,7 @@
     android:layout_width="fill_parent"
     android:layout_height="56dp"
     android:gravity="center_vertical"
     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" />
\ No newline at end of file
     android:textSize="18dp" />
\ No newline at end of file

diff --git a/res/layout/file_details_fragment.xml b/res/layout/file_details_fragment.xml
index 0ad98e3..cc59ddb 100644 (file)
--- a/res/layout/file_details_fragment.xml
+++ b/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: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"
        
                        <ImageView
                                android:id="@+id/fdIcon"


@@ -57,8 +57,8 @@
                        android:id="@+id/fdDetailsContainer"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        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
                        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_height="wrap_content"
                        android:layout_below="@+id/fdDetailsContainer"
                        android:gravity="center_horizontal" 

-                       android:layout_margin="16dp"
+                       android:layout_margin="@dimen/standard_margin"

                        >
                        
                        <CheckBox
                        >
                        
                        <CheckBox


@@ -167,7 +167,8 @@
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
                                android:layout_centerHorizontal="true"
                                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"
 
                        <LinearLayout
                                android:layout_width="match_parent"

diff --git a/res/layout/file_preview.xml b/res/layout/file_preview.xml
index d371e10..3c4e619 100644 (file)
--- a/res/layout/file_preview.xml
+++ b/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: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" />
                android:layout_gravity="center"
                android:contentDescription="@string/preview_image_description"
                android:src="@drawable/logo" />

diff --git a/res/layout/list_item.xml b/res/layout/list_item.xml
index 6ae184e..6ba201f 100644 (file)
--- a/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@ -147,7 +147,7 @@
             android:layout_height="wrap_content"\r
             android:layout_gravity="center_vertical"\r
             android:layout_marginLeft="4dp"\r
             android:layout_height="wrap_content"\r
             android:layout_gravity="center_vertical"\r
             android:layout_marginLeft="4dp"\r

-            android:layout_marginRight="16dp"\r
+            android:layout_marginRight="@dimen/standard_margin"\r

             android:gravity=""\r
             android:src="@drawable/ic_checkbox_blank_outline" />\r
     </LinearLayout>\r
             android:gravity=""\r
             android:src="@drawable/ic_checkbox_blank_outline" />\r
     </LinearLayout>\r

diff --git a/res/layout/listrow_details.xml b/res/layout/listrow_details.xml
index 7d7a377..2bc5d66 100644 (file)
--- a/res/layout/listrow_details.xml
+++ b/res/layout/listrow_details.xml
@@ -23,7 +23,7 @@
     android:clickable="true"
     android:orientation="vertical"
     android:background="#fff"
     android:clickable="true"
     android:orientation="vertical"
     android:background="#fff"

-    android:paddingLeft="16dp"
+    android:paddingLeft="@dimen/standard_padding"

     tools:context=".MainActivity" >
 
     <TextView
     tools:context=".MainActivity" >
 
     <TextView


@@ -32,7 +32,7 @@
         android:layout_height="wrap_content"
         android:drawablePadding="5dp"
         android:gravity="center_vertical"
         android:layout_height="wrap_content"
         android:drawablePadding="5dp"
         android:gravity="center_vertical"

-        android:paddingLeft="16dp"
+        android:paddingLeft="@dimen/standard_padding"

         android:textSize="16dp" >
 
     </TextView>
         android:textSize="16dp" >
 
     </TextView>

diff --git a/res/layout/listrow_group.xml b/res/layout/listrow_group.xml
index 753d738..ac71114 100644 (file)
--- a/res/layout/listrow_group.xml
+++ b/res/layout/listrow_group.xml
@@ -24,7 +24,7 @@
     android:layout_height="56dp"
     android:layout_marginLeft="8dp"
     android:gravity="left"
     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"
     android:paddingTop="8dp"
     android:textSize="16dp"
     android:groupIndicator="@android:color/transparent"

diff --git a/res/layout/ssl_untrusted_cert_layout.xml b/res/layout/ssl_untrusted_cert_layout.xml
index 8ef7b13..9e195b5 100644 (file)
--- a/res/layout/ssl_untrusted_cert_layout.xml
+++ b/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:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:gravity="center"

-       android:padding="16dp"
+       android:padding="@dimen/standard_padding"

     android:orientation="vertical" >
 
        <TextView
     android:orientation="vertical" >
 
        <TextView


@@ -29,7 +29,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_weight="0"
                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"
                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: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"
         >
         android:text="@string/ssl_validator_question"
         android:textAppearance="?android:attr/textAppearanceMedium"
         >

diff --git a/res/layout/ssl_validator_layout.xml b/res/layout/ssl_validator_layout.xml
index 4cbd46a..df14a35 100644 (file)
--- a/res/layout/ssl_validator_layout.xml
+++ b/res/layout/ssl_validator_layout.xml
@@ -22,14 +22,14 @@
     android:layout_height="wrap_content"
     android:gravity="center"
     android:orientation="vertical"
     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"
 
        <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"
                 />
                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: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"
         >
         android:text="@string/ssl_validator_question"
         android:textAppearance="?android:attr/textAppearanceMedium"
         >

diff --git a/res/values/dims.xml b/res/values/dims.xml
index c36430c..ab3ec55 100644 (file)
--- a/res/values/dims.xml
+++ b/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="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>
 
     <dimen name="two_line_primary_text_size">16sp</dimen>
     <dimen name="two_line_secondary_text_size">14sp</dimen>