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

diff --combined res/layout/list_item.xml
index 17b098a,71efa7d..ee1f26a
--- 1/res/layout/list_item.xml
--- 2/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@@ -81,7 -81,7 +81,7 @@@
                  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
@@@ -92,7 -92,7 +92,7 @@@
                  android:orientation="horizontal">\r
  \r
                  <TextView\r
-                     android:id="@+id/last_size"\r
+                     android:id="@+id/file_size"\r
                      android:layout_width="wrap_content"\r
                      android:layout_height="wrap_content"\r
                      android:text="Size MB"\r
@@@ -109,7 -109,7 +109,7 @@@
                      android:textSize="@dimen/two_line_secondary_text_size"/>\r
  \r
                  <TextView\r
-                     android:id="@+id/file_mod"\r
+                     android:id="@+id/last_mod"\r
                      android:layout_width="wrap_content"\r
                      android:layout_height="wrap_content"\r
                      android:gravity="right"\r

diff --combined res/values/colors.xml
index 694e231,14aa372..b3c2d54
--- 1/res/values/colors.xml
--- 2/res/values/colors.xml
+++ b/res/values/colors.xml
@@@ -23,16 -23,12 +23,16 @@@
      <color name="owncloud_blue_accent">#35537A</color>
      <color name="owncloud_blue_bright">#00ddff</color>
  
 -    <color name="list_item_lastmod_and_filesize_text">#989898</color>
 +    <color name="list_item_lastmod_and_filesize_text">@color/secondaryTextColor</color>
      <color name="black">#000000</color>
      <color name="white">#FFFFFF</color>
 -    <color name="textColor">#303030</color>
 +    <color name="fab_white">#fafafa</color>
 +    <color name="white_pressed">#f1f1f1</color>
 +    <color name="half_black">#808080</color>
 +    <color name="black_semi_transparent">#B2000000</color>
 +    <color name="textColor">@color/black</color>
      <color name="drawerMenuTextColor">#000000</color>
-     <color name="list_divider_background">#eee</color>
+     <color name="list_divider_background">#f8f8f8</color>
      <color name="filelist_icon_backgorund">#DDDDDD</color>
      <color name="dark_background_text_color">#EEEEEE</color>
      <color name="login_text_color">#757575</color>
@@@ -40,9 -36,6 +40,9 @@@
      <color name="primary_button_color">@color/owncloud_blue_accent</color>
      <color name="secondary_button_color">#D6D7D7</color>
      <color name="transparent">#00000000</color>
 +    <color name="secondaryTextColor">#a0a0a0</color>
 +    <color name="listItemHighlighted">#f8f8f8</color>
 +    <color name="highlightTextColor">#55739a</color>
  
      <!-- Colors -->
      <color name="color_accent">@color/owncloud_blue_accent</color>