Add share icons and localFileIndicator to grid_image and grid_item layout

diff --git a/res/layout/grid_image.xml b/res/layout/grid_image.xml
index 6b58c2a..f8a171e 100644 (file)
--- a/res/layout/grid_image.xml
+++ b/res/layout/grid_image.xml
@@ -2,8 +2,7 @@
 <!--\r
   ownCloud Android client application\r
 \r
-  Copyright (C) 2012  Bartek Przybylski\r
-  Copyright (C) 2012-2013 ownCloud Inc.\r
+  Copyright (C) 2014 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
@@ -15,7 +14,7 @@
   GNU General Public License for more details.\r
 \r
   You should have received a copy of the GNU General Public License\r
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
   \r
 -->\r
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
@@ -31,6 +30,24 @@
         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
@@ -41,6 +58,15 @@
             android:src="@drawable/ic_menu_archive" />\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:src="@drawable/local_file_indicator" />\r
+\r
+        <ImageView\r
             android:id="@+id/favoriteIcon"\r
             android:layout_width="15dp"\r
             android:layout_height="15dp"\r
@@ -49,6 +75,8 @@
             android:layout_marginRight="2dp"\r
             android:src="@drawable/ic_favorite" />\r
 \r
+\r
+\r
     </FrameLayout>\r
 \r
 </LinearLayout>
\ No newline at end of file

diff --git a/res/layout/grid_item.xml b/res/layout/grid_item.xml
index 2373c77..905cf8d 100644 (file)
--- a/res/layout/grid_item.xml
+++ b/res/layout/grid_item.xml
@@ -2,8 +2,7 @@
 <!--\r
   ownCloud Android client application\r
 \r
-  Copyright (C) 2012  Bartek Przybylski\r
-  Copyright (C) 2012-2013 ownCloud Inc.\r
+  Copyright (C) 2014 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
@@ -33,13 +32,22 @@
         android:layout_gravity="center_horizontal" >\r
 \r
         <ImageView\r
-            android:id="@+id/favoriteIcon"\r
-            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:src="@drawable/ic_favorite" />\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
@@ -50,6 +58,24 @@
             android:layout_marginRight="10dp"\r
             android:src="@drawable/ic_menu_archive" />\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:src="@drawable/local_file_indicator" />\r
+\r
+        <ImageView\r
+            android:id="@+id/favoriteIcon"\r
+            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:src="@drawable/ic_favorite" />\r
+\r
     </FrameLayout>\r
 \r
     <TextView\r