Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab

[pub/Android/ownCloud.git] / res / layout / list_item.xml

diff --git a/res/layout/list_item.xml b/res/layout/list_item.xml
index 6ba201f..c18aee7 100644 (file)
--- a/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@ -30,9 +30,12 @@
         android:orientation="horizontal">\r
 \r
         <FrameLayout\r
         android:orientation="horizontal">\r
 \r
         <FrameLayout\r

-            android:layout_width="90dp"\r
+            android:layout_width="60dp"\r

             android:layout_height="72dp"\r
             android:layout_height="72dp"\r

-            android:padding="@dimen/standard_padding"\r
+            android:paddingLeft="@dimen/standard_padding"\r
+            android:paddingBottom="@dimen/standard_padding"\r
+            android:paddingTop="@dimen/standard_padding"\r
+            android:paddingRight="4dp"\r

             android:focusable="false"\r
             android:focusableInTouchMode="false">\r
 \r
             android:focusable="false"\r
             android:focusableInTouchMode="false">\r
 \r


@@ -64,9 +67,8 @@
             android:layout_width="0dp"\r
             android:layout_height="match_parent"\r
             android:layout_weight="1"\r
             android:layout_width="0dp"\r
             android:layout_height="match_parent"\r
             android:layout_weight="1"\r

-            android:gravity="center_vertical"\r
+            android:gravity="top"\r

             android:paddingTop="@dimen/standard_padding"\r
             android:paddingTop="@dimen/standard_padding"\r

-            android:paddingBottom="@dimen/standard_padding"\r

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


@@ -79,7 +81,7 @@
                 android:ellipsize="middle"\r
                 android:singleLine="true"\r
                 android:text="TextView"\r
                 android:ellipsize="middle"\r
                 android:singleLine="true"\r
                 android:text="TextView"\r

-                android:textColor="#303030"\r
+                android:textColor="@color/textColor"\r

                 android:textSize="@dimen/two_line_primary_text_size" />\r
 \r
             <LinearLayout\r
                 android:textSize="@dimen/two_line_primary_text_size" />\r
 \r
             <LinearLayout\r


@@ -87,14 +89,22 @@
                 android:layout_height="wrap_content"\r
                 android:layout_marginLeft="0dp"\r
                 android:layout_marginRight="4dp"\r
                 android:layout_height="wrap_content"\r
                 android:layout_marginLeft="0dp"\r
                 android:layout_marginRight="4dp"\r

-                android:weightSum="1">\r
+                android:orientation="horizontal">\r

 \r
                 <TextView\r
                     android:id="@+id/last_mod"\r
                     android:layout_width="wrap_content"\r
                     android:layout_height="wrap_content"\r
                     android:text="TextView"\r
 \r
                 <TextView\r
                     android:id="@+id/last_mod"\r
                     android:layout_width="wrap_content"\r
                     android:layout_height="wrap_content"\r
                     android:text="TextView"\r

-                    android:layout_weight=".5"\r
+                    android:textColor="@color/list_item_lastmod_and_filesize_text"\r
+                    android:textSize="@dimen/two_line_secondary_text_size"/>\r
+\r
+                <TextView\r
+                    android:id="@+id/file_separator"\r
+                    android:layout_width="wrap_content"\r
+                    android:layout_height="wrap_content"\r
+                    android:gravity="right"\r
+                    android:text=", "\r

                     android:textColor="@color/list_item_lastmod_and_filesize_text"\r
                     android:textSize="@dimen/two_line_secondary_text_size"/>\r
 \r
                     android:textColor="@color/list_item_lastmod_and_filesize_text"\r
                     android:textSize="@dimen/two_line_secondary_text_size"/>\r
 \r


@@ -105,7 +115,6 @@
                     android:gravity="right"\r
                     android:text="TextView"\r
                     android:textColor="@color/list_item_lastmod_and_filesize_text"\r
                     android:gravity="right"\r
                     android:text="TextView"\r
                     android:textColor="@color/list_item_lastmod_and_filesize_text"\r

-                    android:layout_weight=".5"\r

                     android:textSize="@dimen/two_line_secondary_text_size"/>\r
 \r
             </LinearLayout>\r
                     android:textSize="@dimen/two_line_secondary_text_size"/>\r
 \r
             </LinearLayout>\r