Merge branch 'develop' into thumbnailOOM

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

diff --git a/res/layout/grid_image.xml b/res/layout/grid_image.xml
index f8a171e..383c615 100644 (file)
--- a/res/layout/grid_image.xml
+++ b/res/layout/grid_image.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
@@ -30,24 +29,6 @@
         android:layout_width="match_parent"\r
         android:layout_height="wrap_content" >\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
         <com.owncloud.android.ui.SquareImageView\r
             android:id="@+id/thumbnail"\r
             android:layout_width="match_parent"\r
@@ -55,15 +36,41 @@
             android:paddingLeft="10dp"\r
             android:paddingRight="10dp"\r
             android:scaleType="centerCrop"\r
-            android:src="@drawable/ic_menu_archive" />\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="4dp">\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="4dp"\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="4dp"\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_marginTop="2dp"\r
-            android:layout_marginRight="2dp"\r
+            android:layout_gravity="bottom|right"\r
+            android:layout_marginTop="4dp"\r
+            android:layout_marginBottom="4dp"\r
+            android:layout_marginRight="4dp"\r
             android:src="@drawable/local_file_indicator" />\r
 \r
         <ImageView\r
@@ -71,12 +78,9 @@
             android:layout_width="15dp"\r
             android:layout_height="15dp"\r
             android:layout_gravity="bottom|right"\r
-            android:layout_marginBottom="2dp"\r
-            android:layout_marginRight="2dp"\r
+            android:layout_marginBottom="4dp"\r
+            android:layout_marginRight="4dp"\r
             android:src="@drawable/ic_favorite" />\r
-\r
-\r
-\r
     </FrameLayout>\r
 \r
 </LinearLayout>
\ No newline at end of file