Fix crash in navigation in FileList

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

diff --git a/res/layout/grid_item.xml b/res/layout/grid_item.xml
index 905cf8d..d0f3d0f 100644 (file)
--- a/res/layout/grid_item.xml
+++ b/res/layout/grid_item.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <!--\r
   ownCloud Android client application\r
-\r
-  Copyright (C) 2014 ownCloud Inc.\r
+  Copyright (C) 2015 ownCloud Inc.\r
 \r
   This program is free software: you can redistribute it and/or modify\r
   it under the terms of the GNU General Public License version 2,\r
@@ -32,24 +31,6 @@
         android:layout_gravity="center_horizontal" >\r
 \r
         <ImageView\r
-            android:id="@+id/sharedIcon"\r
-            android:layout_width="wrap_content"\r
-            android:layout_height="wrap_content"\r
-            android:layout_gravity="top|left"\r
-            android:layout_marginLeft="2dp"\r
-            android:layout_marginTop="2dp"\r
-            android:src="@drawable/sharedlink" />\r
-\r
-        <ImageView\r
-            android:id="@+id/sharedWithMeIcon"\r
-            android:layout_width="wrap_content"\r
-            android:layout_height="wrap_content"\r
-            android:layout_gravity="bottom|left"\r
-            android:layout_marginLeft="2dp"\r
-            android:layout_marginTop="2dp"\r
-            android:src="@drawable/shared_with_me" />\r
-\r
-        <ImageView\r
             android:id="@+id/thumbnail"\r
             android:layout_width="72dp"\r
             android:layout_height="72dp"\r
@@ -58,11 +39,36 @@
             android:layout_marginRight="10dp"\r
             android:src="@drawable/ic_menu_archive" />\r
 \r
+        <LinearLayout\r
+            android:layout_width="wrap_content"\r
+            android:layout_height="wrap_content"\r
+            android:layout_gravity="top|right"\r
+            android:orientation="vertical"\r
+            android:layout_margin="2dp">\r
+\r
+            <ImageView\r
+                android:id="@+id/sharedIcon"\r
+                android:layout_width="wrap_content"\r
+                android:layout_height="wrap_content"\r
+                android:layout_gravity="center"\r
+                android:layout_marginBottom="2dp"\r
+                android:src="@drawable/sharedlink" />\r
+\r
+            <ImageView\r
+                android:id="@+id/sharedWithMeIcon"\r
+                android:layout_width="wrap_content"\r
+                android:layout_height="wrap_content"\r
+                android:layout_gravity="center"\r
+                android:layout_marginTop="2dp"\r
+                android:src="@drawable/shared_with_me"\r
+                android:visibility="invisible" />\r
+        </LinearLayout>\r
+\r
         <ImageView\r
             android:id="@+id/localFileIndicator"\r
             android:layout_width="@dimen/file_icon_size"\r
             android:layout_height="@dimen/file_icon_size"\r
-            android:layout_gravity="top|right"\r
+            android:layout_gravity="bottom|right"\r
             android:layout_marginTop="2dp"\r
             android:layout_marginRight="2dp"\r
             android:src="@drawable/local_file_indicator" />\r
@@ -76,6 +82,8 @@
             android:layout_marginRight="2dp"\r
             android:src="@drawable/ic_favorite" />\r
 \r
+\r
+\r
     </FrameLayout>\r
 \r
     <TextView\r