inital work on 16dp margin/padding values and material margin/padding values for...

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index e15aca5..48a518b 100644 (file)
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -21,7 +21,7 @@
     android:layout_width="match_parent"\r
     android:layout_height="match_parent"\r
     android:background="@color/login_background_color"\r
-       android:padding="8dip"\r
+       android:padding="@dimen/standard_padding"\r
     >\r
 \r
     <LinearLayout\r
@@ -56,7 +56,7 @@
                            android:layout_height="wrap_content"\r
                            android:gravity="center"\r
                            android:orientation="vertical"\r
-                           android:padding="8dp" >\r
+                           android:padding="0dp" >\r
                            \r
                                <Button\r
                                    android:id="@+id/centeredRefreshButton"\r

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 127187e..ce0d84d 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -32,7 +32,7 @@
         android:background="@color/login_background_color"\r
         android:gravity="center"\r
         android:orientation="vertical"\r
-        android:padding="8dp" >\r
+        android:padding="@dimen/standard_padding" >\r
 \r
         <ImageView\r
             android:id="@+id/thumbnail"\r

diff --git a/res/layout/list_item.xml b/res/layout/list_item.xml
index dd4509b..6ae184e 100644 (file)
--- a/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@ -22,7 +22,7 @@
     android:layout_width="match_parent"\r
     android:background="@drawable/list_selector"\r
     android:orientation="vertical"\r
-    android:layout_height="56dp">\r
+    android:layout_height="72dp">\r
 \r
     <LinearLayout\r
         android:layout_width="match_parent"\r
@@ -30,8 +30,9 @@
         android:orientation="horizontal">\r
 \r
         <FrameLayout\r
-            android:layout_width="56dp"\r
-            android:layout_height="56dp"\r
+            android:layout_width="90dp"\r
+            android:layout_height="72dp"\r
+            android:padding="@dimen/standard_padding"\r
             android:focusable="false"\r
             android:focusableInTouchMode="false">\r
 \r
@@ -39,16 +40,15 @@
                 android:id="@+id/localFileIndicator"\r
                 android:layout_width="@dimen/file_icon_size"\r
                 android:layout_height="@dimen/file_icon_size"\r
-                android:layout_gravity="center_vertical"\r
-                android:layout_marginLeft="22dp"\r
+                android:layout_gravity="top|right"\r
+                android:layout_marginLeft="21dp"\r
                 android:src="@drawable/local_file_indicator" />\r
 \r
             <ImageView\r
                 android:id="@+id/thumbnail"\r
                 android:layout_width="@dimen/file_icon_size"\r
                 android:layout_height="@dimen/file_icon_size"\r
-                android:layout_gravity="center_vertical"\r
-                android:layout_marginLeft="9dp"\r
+                android:layout_gravity="left|center_vertical"\r
                 android:src="@drawable/ic_menu_archive" />\r
 \r
             <ImageView\r
@@ -56,7 +56,6 @@
                 android:layout_width="wrap_content"\r
                 android:layout_height="wrap_content"\r
                 android:layout_gravity="bottom|right"\r
-                android:layout_marginBottom="10dp"\r
                 android:layout_marginRight="2dp"\r
                 android:src="@drawable/ic_favorite" />\r
         </FrameLayout>\r
@@ -66,6 +65,8 @@
             android:layout_height="match_parent"\r
             android:layout_weight="1"\r
             android:gravity="center_vertical"\r
+            android:paddingTop="@dimen/standard_padding"\r
+            android:paddingBottom="@dimen/standard_padding"\r
             android:orientation="vertical" >\r
 \r
             <TextView\r
@@ -73,18 +74,18 @@
                 android:layout_width="wrap_content"\r
                 android:layout_height="wrap_content"\r
                 android:layout_gravity="center_vertical"\r
-                android:layout_marginLeft="4dp"\r
+                android:layout_marginLeft="0dp"\r
                 android:layout_marginRight="4dp"\r
                 android:ellipsize="middle"\r
                 android:singleLine="true"\r
                 android:text="TextView"\r
                 android:textColor="#303030"\r
-                android:textSize="16dip" />\r
+                android:textSize="@dimen/two_line_primary_text_size" />\r
 \r
             <LinearLayout\r
                 android:layout_width="match_parent"\r
                 android:layout_height="wrap_content"\r
-                android:layout_marginLeft="4dp"\r
+                android:layout_marginLeft="0dp"\r
                 android:layout_marginRight="4dp"\r
                 android:weightSum="1">\r
 \r
@@ -95,7 +96,7 @@
                     android:text="TextView"\r
                     android:layout_weight=".5"\r
                     android:textColor="@color/list_item_lastmod_and_filesize_text"\r
-                    android:textSize="12dip"/>\r
+                    android:textSize="@dimen/two_line_secondary_text_size"/>\r
 \r
                 <TextView\r
                     android:id="@+id/file_size"\r
@@ -105,7 +106,7 @@
                     android:text="TextView"\r
                     android:textColor="@color/list_item_lastmod_and_filesize_text"\r
                     android:layout_weight=".5"\r
-                    android:textSize="12dip"/>\r
+                    android:textSize="@dimen/two_line_secondary_text_size"/>\r
 \r
             </LinearLayout>\r
 \r
@@ -146,7 +147,7 @@
             android:layout_height="wrap_content"\r
             android:layout_gravity="center_vertical"\r
             android:layout_marginLeft="4dp"\r
-            android:layout_marginRight="4dp"\r
+            android:layout_marginRight="16dp"\r
             android:gravity=""\r
             android:src="@drawable/ic_checkbox_blank_outline" />\r
     </LinearLayout>\r

diff --git a/res/layout/passcodelock.xml b/res/layout/passcodelock.xml
index f3a0d01..52a0d30 100644 (file)
--- a/res/layout/passcodelock.xml
+++ b/res/layout/passcodelock.xml
@@ -18,12 +18,11 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:oc="http://schemas.android.com/apk/res/com.owncloud.android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:gravity="center_horizontal"
     android:orientation="vertical"
-    android:padding="20dp" >
+    android:padding="@dimen/standard_padding" >
 
 
     <TextView
@@ -33,6 +32,7 @@
         android:text="@string/pass_code_enter_pass_code"
         android:textColor="@android:color/black"
         android:gravity="center_horizontal"
+        android:textSize="16sp"
          />
 
     <TextView
@@ -42,6 +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"
          />
     
     <LinearLayout

diff --git a/res/layout/ssl_untrusted_cert_layout.xml b/res/layout/ssl_untrusted_cert_layout.xml
index 2342a8a..c8d15fc 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_margin="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"
                 />
@@ -423,7 +423,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"
         >

diff --git a/res/layout/ssl_validator_layout.xml b/res/layout/ssl_validator_layout.xml
index 4c6fb4f..8fda8c2 100644 (file)
--- a/res/layout/ssl_validator_layout.xml
+++ b/res/layout/ssl_validator_layout.xml
@@ -21,16 +21,17 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:gravity="center"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+       android:padding="@dimen/standard_padding">
 
        <TextView
                android:id="@+id/header"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
+        android:paddingBottom="@dimen/standard_padding"
                android:text="@string/ssl_validator_header"
-               android:padding="5dp"
                android:textAppearance="?android:attr/textAppearanceMedium"
-                />
+        />
     
        <TextView
                android:id="@+id/reason_cert_not_trusted"
@@ -93,7 +94,7 @@
                                        android:paddingBottom="5dp"
                                android:text="@string/ssl_validator_label_subject"
                                android:textAppearance="?android:attr/textAppearanceMedium"
-                       />
+                                       />
                                
                                <TextView
                                    android:id="@+id/label_subject_CN"
@@ -101,7 +102,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_CN"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
                            
                                <TextView
                                    android:id="@+id/value_subject_CN"
@@ -110,7 +111,7 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
                                
                                <TextView
                                    android:id="@+id/label_subject_O"
@@ -118,7 +119,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_O"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
                            
                                <TextView
                                    android:id="@+id/value_subject_O"
@@ -127,7 +128,7 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
                                
                                <TextView
                                    android:id="@+id/label_subject_OU"
@@ -135,7 +136,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_OU"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
                            
                                <TextView
                                    android:id="@+id/value_subject_OU"
@@ -144,7 +145,7 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
                                
                                <TextView
                                    android:id="@+id/label_subject_ST"
@@ -152,7 +153,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_ST"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
                            
                                <TextView
                                    android:id="@+id/value_subject_ST"
@@ -161,7 +162,7 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
 
                                <TextView
                                    android:id="@+id/label_subject_C"
@@ -169,7 +170,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_C"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
                                
                                <TextView
                                    android:id="@+id/value_subject_C"
@@ -178,7 +179,7 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
                                
                                <TextView
                                    android:id="@+id/label_subject_L"
@@ -186,7 +187,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_L"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
                            
                                <TextView
                                    android:id="@+id/value_subject_L"
@@ -196,7 +197,6 @@
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                />
-                           
 
                                <TextView
                                android:id="@+id/label_issuer"
@@ -205,7 +205,7 @@
                                        android:paddingBottom="5dp"
                                android:text="@string/ssl_validator_label_issuer"
                                android:textAppearance="?android:attr/textAppearanceMedium"
-                       />
+                               />
                                
                                <TextView
                                    android:id="@+id/label_issuer_CN"
@@ -213,7 +213,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_CN"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
                            
                                <TextView
                                    android:id="@+id/value_issuer_CN"
@@ -222,7 +222,7 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
                                
                                <TextView
                                    android:id="@+id/label_issuer_O"
@@ -230,7 +230,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_O"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
                            
                                <TextView
                                    android:id="@+id/value_issuer_O"
@@ -239,7 +239,7 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
                                
                                <TextView
                                    android:id="@+id/label_issuer_OU"
@@ -247,7 +247,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_OU"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
                            
                                <TextView
                                    android:id="@+id/value_issuer_OU"
@@ -256,7 +256,7 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
                                
                                <TextView
                                    android:id="@+id/label_issuer_ST"
@@ -264,7 +264,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_ST"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
                            
                                <TextView
                                    android:id="@+id/value_issuer_ST"
@@ -273,7 +273,7 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
 
                                <TextView
                                    android:id="@+id/label_issuer_C"
@@ -281,7 +281,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_C"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
                                
                                <TextView
                                    android:id="@+id/value_issuer_C"
@@ -290,7 +290,7 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
                                
                                <TextView
                                    android:id="@+id/label_issuer_L"
@@ -298,7 +298,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_L"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
                            
                                <TextView
                                    android:id="@+id/value_issuer_L"
@@ -307,7 +307,7 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
                            
                                <TextView
                                android:id="@+id/label_validity"
@@ -316,7 +316,7 @@
                                        android:paddingBottom="5dp"
                                android:text="@string/ssl_validator_label_validity"
                                android:textAppearance="?android:attr/textAppearanceMedium"
-                       />
+                               />
                                
                                <TextView
                                    android:id="@+id/label_validity_from"
@@ -324,7 +324,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_validity_from"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
                            
                                <TextView
                                    android:id="@+id/value_validity_from"
@@ -333,7 +333,7 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
                                
                                <TextView
                                    android:id="@+id/label_validity_to"
@@ -341,7 +341,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_validity_to"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
+                                       />
                            
                                <TextView
                                    android:id="@+id/value_validity_to"
@@ -350,8 +350,7 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
-                               />
-                               
+                                       />
 
                                <TextView
                                android:id="@+id/label_signature"
@@ -360,7 +359,7 @@
                                        android:paddingBottom="5dp"
                                android:text="@string/ssl_validator_label_signature"
                                android:textAppearance="?android:attr/textAppearanceMedium"
-                       />
+                               />
                                
                                <TextView
                                android:id="@+id/label_signature_algorithm"
@@ -368,18 +367,17 @@
                                android:layout_height="wrap_content"
                                android:text="@string/ssl_validator_label_signature_algorithm"
                                android:textAppearance="?android:attr/textAppearanceSmall"
-                       />
+                               />
                                
-                                                               <TextView
+                               <TextView
                                android:id="@+id/value_signature_algorithm"
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
                                        android:paddingBottom="5dp"
                                android:text=""
                                android:textAppearance="?android:attr/textAppearanceSmall"
-                       />
-                                                                                                                                                                                               
-                                                               
+                               />
+
                                <TextView
                                android:id="@+id/value_signature"
                                android:layout_width="wrap_content"
@@ -387,7 +385,7 @@
                                        android:paddingBottom="5dp"
                                android:text=""
                                android:textAppearance="?android:attr/textAppearanceSmall"
-                       />
+                               />
                                
                </LinearLayout>
                
@@ -397,7 +395,7 @@
         android:id="@+id/question"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-               android:padding="5dp"
+        android:paddingTop="@dimen/standard_padding"
         android:text="@string/ssl_validator_question"
         android:textAppearance="?android:attr/textAppearanceMedium"
         >

diff --git a/res/layout/uploader_list_item_layout.xml b/res/layout/uploader_list_item_layout.xml
index f83608e..b66df44 100644 (file)
--- a/res/layout/uploader_list_item_layout.xml
+++ b/res/layout/uploader_list_item_layout.xml
@@ -22,15 +22,16 @@
        android:layout_width="fill_parent"
        android:background="#fefefe"
        android:orientation="horizontal"
-       android:layout_height="56dp"  >
+       android:layout_height="72dp"
+    android:padding="@dimen/standard_padding">
   
     <ImageView 
-        android:layout_width="20dp"
-        android:layout_height="20dp"
+        android:layout_width="@dimen/file_icon_size"
+        android:layout_height="@dimen/file_icon_size"
         android:layout_gravity="center_vertical|center"
-        android:layout_margin="4dp"
         android:src="@drawable/ic_menu_archive" 
-        android:id="@+id/thumbnail" />
+        android:id="@+id/thumbnail"
+        android:layout_marginRight="@dimen/standard_padding"/>
     
     <TextView 
         android:text="TextView" 

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 22c082c..800a4b6 100644 (file)
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -5,7 +5,7 @@
 
                <attr name="optionOneString" format="string" />
                <attr name="optionOneColor" format="color" />
-    <attr name="optionTwoString" format="string" />
+       <attr name="optionTwoString" format="string" />
                <attr name="optionTwoColor" format="color" />
                <attr name="onBadgeClick" format="string" />
 

diff --git a/res/values/dims.xml b/res/values/dims.xml
index 955f87e..c36430c 100644 (file)
--- a/res/values/dims.xml
+++ b/res/values/dims.xml
@@ -17,6 +17,15 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <resources>
-       <dimen name="file_icon_size">32dp</dimen>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">@dimen/standard_padding</dimen>
+    <dimen name="activity_vertical_margin">@dimen/standard_padding</dimen>
+    <dimen name="nav_drawer_width">260dp</dimen>
+
+    <dimen name="file_icon_size">40dp</dimen>
     <dimen name="file_icon_size_grid">128dp</dimen>
+    <dimen name="standard_padding">16dp</dimen>
+
+    <dimen name="two_line_primary_text_size">16sp</dimen>
+    <dimen name="two_line_secondary_text_size">14sp</dimen>
 </resources>