From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Wed, 4 Nov 2015 09:22:26 +0000 (+0100)
Subject: Merge branch 'material_buttons' of https://github.com/owncloud/android into target_ma... 
X-Git-Tag: beta-20151122~22^2~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/282ce7c9a1e831c59d31d2d1acf6122b0e875fcc?hp=-c

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

282ce7c9a1e831c59d31d2d1acf6122b0e875fcc
diff --combined res/layout/list_item.xml
index 17b098aa,71efa7d7..ee1f26a7
--- a/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@@ -81,7 -81,7 +81,7 @@@
                  android:ellipsize="middle"
                  android:singleLine="true"
                  android:text="TextView"
 -                android:textColor="#303030"
 +                android:textColor="@color/textColor"
                  android:textSize="@dimen/two_line_primary_text_size" />
  
              <LinearLayout
@@@ -92,7 -92,7 +92,7 @@@
                  android:orientation="horizontal">
  
                  <TextView
-                     android:id="@+id/last_size"
+                     android:id="@+id/file_size"
                      android:layout_width="wrap_content"
                      android:layout_height="wrap_content"
                      android:text="Size MB"
@@@ -109,7 -109,7 +109,7 @@@
                      android:textSize="@dimen/two_line_secondary_text_size"/>
  
                  <TextView
-                     android:id="@+id/file_mod"
+                     android:id="@+id/last_mod"
                      android:layout_width="wrap_content"
                      android:layout_height="wrap_content"
                      android:gravity="right"
diff --combined res/values/colors.xml
index 694e231b,14aa3721..b3c2d54a
--- a/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>