From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Wed, 4 Nov 2015 09:52:08 +0000 (+0100)
Subject: Merge branch 'material_buttons' of https://github.com/owncloud/android into beta
X-Git-Tag: beta-20151122~44
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b82b4a4e587de081d522b3272a4938d859519d80?ds=inline;hp=-c

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

b82b4a4e587de081d522b3272a4938d859519d80
diff --combined res/layout/list_fragment.xml
index ac28fcf2,7160b32e..bd8b12d5
--- a/res/layout/list_fragment.xml
+++ b/res/layout/list_fragment.xml
@@@ -17,21 -17,17 +17,21 @@@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 +    xmlns:fab="http://schemas.android.com/apk/res-auto"
 +    android:layout_width="match_parent"
 +    android:layout_height="match_parent">
 +
  <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:tools="http://schemas.android.com/tools"
 +    xmlns:fab="http://schemas.android.com/apk/res-auto"
      android:layout_width="match_parent"
 -    android:layout_height="match_parent"
 -    android:layout_weight="1" >
 +    android:layout_height="match_parent">
  
      <android.support.v4.widget.SwipeRefreshLayout
          android:id="@+id/swipe_containing_list"
          android:layout_width="match_parent"
 -        android:layout_height="match_parent" 
 -        android:layout_weight="1"
 +        android:layout_height="match_parent"
          android:footerDividersEnabled="false"
          android:visibility="visible" >
          
@@@ -39,6 -35,8 +39,8 @@@
              android:id="@+id/list_root"
              android:layout_width="match_parent"
              android:layout_height="match_parent"
+             android:divider="@color/list_divider_background"
+             android:dividerHeight="1px"
              android:visibility="visible" />
  
      </android.support.v4.widget.SwipeRefreshLayout>
@@@ -83,52 -81,4 +85,52 @@@
              </ScrollView>
      </android.support.v4.widget.SwipeRefreshLayout>
  
 -</FrameLayout>
 +</FrameLayout>
 +    <com.getbase.floatingactionbutton.FloatingActionsMenu
 +        android:id="@+id/fab_main"
 +        android:layout_width="wrap_content"
 +        android:layout_height="wrap_content"
 +        android:layout_alignParentBottom="true"
 +        android:layout_alignParentRight="true"
 +        android:layout_alignParentEnd="true"
 +        fab:fab_addButtonColorNormal="@color/owncloud_blue_accent"
 +        fab:fab_addButtonColorPressed="@color/owncloud_blue"
 +        fab:fab_addButtonPlusIconColor="@color/white"
 +        fab:fab_labelStyle="@style/menu_labels_style"
 +        android:layout_marginBottom="@dimen/standard_margin"
 +        android:layout_marginRight="@dimen/standard_margin"
 +        android:layout_marginEnd="@dimen/standard_margin"
 +        android:visibility="gone">
 +
 +        <com.getbase.floatingactionbutton.FloatingActionButton
 +            android:id="@+id/fab_upload"
 +            android:layout_width="wrap_content"
 +            android:layout_height="wrap_content"
 +            fab:fab_size="mini"
 +            fab:fab_icon="@drawable/ic_action_upload"
 +            fab:fab_colorNormal="@color/owncloud_blue_accent"
 +            fab:fab_colorPressed="@color/owncloud_blue"
 +            fab:fab_title=""/>
 +
 +        <com.getbase.floatingactionbutton.FloatingActionButton
 +            android:id="@+id/fab_mkdir"
 +            android:layout_width="wrap_content"
 +            android:layout_height="wrap_content"
 +            fab:fab_size="mini"
 +            fab:fab_icon="@drawable/ic_action_create_dir"
 +            fab:fab_colorNormal="@color/owncloud_blue_accent"
 +            fab:fab_colorPressed="@color/owncloud_blue"
 +            fab:fab_title=""/>
 +
 +        <com.getbase.floatingactionbutton.FloatingActionButton
 +            android:id="@+id/fab_upload_from_app"
 +            android:layout_width="wrap_content"
 +            android:layout_height="wrap_content"
 +            fab:fab_size="mini"
 +            fab:fab_icon="@drawable/ic_import"
 +            fab:fab_colorNormal="@color/owncloud_blue_accent"
 +            fab:fab_colorPressed="@color/owncloud_blue"
 +            fab:fab_title=""/>
 +
 +    </com.getbase.floatingactionbutton.FloatingActionsMenu>
- </RelativeLayout>
++</RelativeLayout>
diff --combined res/values/colors.xml
index b3c2d54a,a138288b..694e231b
--- 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">#f8f8f8</color>
+     <color name="list_divider_background">#eee</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>