Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_...

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

diff --git a/res/layout/file_details_fragment.xml b/res/layout/file_details_fragment.xml
index ec75646..0ad98e3 100644 (file)
--- a/res/layout/file_details_fragment.xml
+++ b/res/layout/file_details_fragment.xml
@@ -3,7 +3,7 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski

-  Copyright (C) 2012-2013 ownCloud Inc.
+  Copyright (C) 2015 ownCloud Inc.

 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,


@@ -19,8 +19,10 @@
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
        android:id="@+id/fdScrollView"
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
        android:id="@+id/fdScrollView"

-       android:layout_width="fill_parent"
-       android:layout_height="fill_parent" >
+       android:layout_width="match_parent"
+       android:layout_height="match_parent"
+       android:fillViewport="true"
+       >

 
        <RelativeLayout
                android:layout_width="match_parent"
 
        <RelativeLayout
                android:layout_width="match_parent"


@@ -31,6 +33,7 @@
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:layout_marginLeft="16dp"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:layout_marginLeft="16dp"

+                       android:layout_marginRight="16dp"

                        android:layout_marginTop="4dp" >
        
                        <ImageView
                        android:layout_marginTop="4dp" >
        
                        <ImageView


@@ -54,6 +57,8 @@
                        android:id="@+id/fdDetailsContainer"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:id="@+id/fdDetailsContainer"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"

+                       android:layout_marginLeft="16dp"
+                       android:layout_marginRight="16dp"

                        android:layout_below="@id/fdFileHeaderContainer" >
                
                        <RelativeLayout
                        android:layout_below="@id/fdFileHeaderContainer" >
                
                        <RelativeLayout


@@ -61,8 +66,7 @@
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
                                android:layout_alignParentLeft="true"
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
                                android:layout_alignParentLeft="true"

-                               android:layout_alignParentTop="true"
-                               android:layout_marginLeft="16dp" >
+                               android:layout_alignParentTop="true" >

                                
                                <TextView
                                        android:id="@+id/fdTypeLabel"
                                
                                <TextView
                                        android:id="@+id/fdTypeLabel"


@@ -159,16 +163,16 @@
                        >
                        
                        <CheckBox
                        >
                        
                        <CheckBox

-                               android:id="@+id/fdKeepInSync"
+                               android:id="@+id/fdFavorite"

                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
                                android:layout_centerHorizontal="true"
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
                                android:layout_centerHorizontal="true"

-                               android:text="@string/fd_keep_in_sync" />
+                               android:text="@string/favorite" />

 
                        <LinearLayout
                                android:layout_width="match_parent"
                                android:layout_height="wrap_content"
 
                        <LinearLayout
                                android:layout_width="match_parent"
                                android:layout_height="wrap_content"

-                               android:layout_below="@id/fdKeepInSync"
+                               android:layout_below="@id/fdFavorite"

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


@@ -182,7 +186,7 @@
                                android:id="@+id/fdProgressBlock"
                                        android:layout_width="match_parent"
                                        android:layout_height="wrap_content"
                                android:id="@+id/fdProgressBlock"
                                        android:layout_width="match_parent"
                                        android:layout_height="wrap_content"

-                                       android:gravity="center_horizontal"
+                                       android:gravity="center"

                                        android:layout_marginTop="12dp"
                                        android:layout_marginBottom="12dp"
                                        android:orientation="horizontal"
                                        android:layout_marginTop="12dp"
                                        android:layout_marginBottom="12dp"
                                        android:orientation="horizontal"


@@ -193,17 +197,19 @@
                                                android:layout_width="0dp"
                                                android:layout_height="wrap_content"
                                                android:layout_weight="1"
                                                android:layout_width="0dp"
                                                android:layout_height="wrap_content"
                                                android:layout_weight="1"

-                                               android:progressDrawable="@android:drawable/progress_horizontal"
-                                               android:indeterminate="false" 
+                        style="?android:attr/progressBarStyleHorizontal"
+                        android:indeterminate="false"

                                                android:indeterminateOnly="false" 
                                        />
                                                                                                
                                                android:indeterminateOnly="false" 
                                        />
                                                                                                

-                                       <Button
+                                       <ImageButton

                                                android:id="@+id/fdCancelBtn"
                                                android:layout_width="wrap_content"
                                                android:layout_height="wrap_content"
                                                android:layout_marginLeft="12dp"
                                                android:id="@+id/fdCancelBtn"
                                                android:layout_width="wrap_content"
                                                android:layout_height="wrap_content"
                                                android:layout_marginLeft="12dp"

-                                               android:text="@string/common_cancel" />
+                                               android:src="@drawable/ic_cancel"
+                                               android:background="@android:color/transparent"
+                                               />

                                                
                                </LinearLayout>
        
                                                
                                </LinearLayout>