Fix crash in navigation in FileList

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

diff --git a/res/layout/list_fragment.xml b/res/layout/list_fragment.xml
index 564404a..81b5210 100644 (file)
--- a/res/layout/list_fragment.xml
+++ b/res/layout/list_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,


@@ -24,18 +24,36 @@
     android:layout_weight="1" >
 
     <android.support.v4.widget.SwipeRefreshLayout
     android:layout_weight="1" >
 
     <android.support.v4.widget.SwipeRefreshLayout

-        android:id="@+id/swipe_refresh_files"
+        android:id="@+id/swipe_containing_list"

         android:layout_width="match_parent"
         android:layout_width="match_parent"

-        android:layout_height="match_parent" >
-
+        android:layout_height="match_parent" 
+        android:layout_weight="1"
+        android:footerDividersEnabled="false"
+        android:visibility="visible" >
+        

         <com.owncloud.android.ui.ExtendedListView
             android:id="@+id/list_root"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
         <com.owncloud.android.ui.ExtendedListView
             android:id="@+id/list_root"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

+            android:visibility="visible" />
+
+    </android.support.v4.widget.SwipeRefreshLayout>
+
+    <android.support.v4.widget.SwipeRefreshLayout
+        android:id="@+id/swipe_containing_grid"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:footerDividersEnabled="false"
+        android:visibility="gone" >
+
+        <third_parties.in.srain.cube.GridViewWithHeaderAndFooter
+            android:id="@+id/grid_root"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"

             android:columnWidth="100dp"
             android:gravity="center"
             android:horizontalSpacing="2dp"
             android:columnWidth="100dp"
             android:gravity="center"
             android:horizontalSpacing="2dp"

-            android:numColumns="auto_fit"

             android:stretchMode="columnWidth"
             android:verticalSpacing="2dp"
             android:visibility="visible" />
             android:stretchMode="columnWidth"
             android:verticalSpacing="2dp"
             android:visibility="visible" />


@@ -43,19 +61,22 @@
     </android.support.v4.widget.SwipeRefreshLayout>
 
     <android.support.v4.widget.SwipeRefreshLayout
     </android.support.v4.widget.SwipeRefreshLayout>
 
     <android.support.v4.widget.SwipeRefreshLayout

-        android:id="@+id/swipe_refresh_files_emptyView"
+        android:id="@+id/swipe_containing_empty"

         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone" >
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone" >

-
-        <TextView
-            android:id="@+id/empty_list_view"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center_vertical|center_horizontal"
-            android:text="@string/empty"
-            android:visibility="visible" />
+            <ScrollView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" >
+                <TextView
+                    android:id="@+id/empty_list_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center_vertical|center_horizontal"
+                    android:text="@string/empty"
+                    android:visibility="visible" />
+            </ScrollView>

     </android.support.v4.widget.SwipeRefreshLayout>
 
 </FrameLayout>
\ No newline at end of file
     </android.support.v4.widget.SwipeRefreshLayout>
 
 </FrameLayout>
\ No newline at end of file