From: masensio <masensio@solidgear.es>
Date: Tue, 27 Jan 2015 08:46:19 +0000 (+0100)
Subject: Add share icons and localFileIndicator to grid_image and grid_item layout
X-Git-Tag: oc-android-1.7.0_signed~16^2~6
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/051265620c60418557e343b8f2d03cc3120a7506?hp=--cc

Add share icons and localFileIndicator to grid_image and grid_item layout
---

051265620c60418557e343b8f2d03cc3120a7506
diff --git a/res/layout/grid_image.xml b/res/layout/grid_image.xml
index 6b58c2ae..f8a171ef 100644
--- a/res/layout/grid_image.xml
+++ b/res/layout/grid_image.xml
@@ -2,8 +2,7 @@
 <!--
   ownCloud Android client application
 
-  Copyright (C) 2012  Bartek Przybylski
-  Copyright (C) 2012-2013 ownCloud Inc.
+  Copyright (C) 2014 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,
@@ -15,7 +14,7 @@
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -31,6 +30,24 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" >
 
+        <ImageView
+            android:id="@+id/sharedIcon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top|left"
+            android:layout_marginLeft="2dp"
+            android:layout_marginTop="2dp"
+            android:src="@drawable/sharedlink" />
+
+        <ImageView
+            android:id="@+id/sharedWithMeIcon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|left"
+            android:layout_marginLeft="2dp"
+            android:layout_marginTop="2dp"
+            android:src="@drawable/shared_with_me" />
+
         <com.owncloud.android.ui.SquareImageView
             android:id="@+id/thumbnail"
             android:layout_width="match_parent"
@@ -41,6 +58,15 @@
             android:src="@drawable/ic_menu_archive" />
 
         <ImageView
+            android:id="@+id/localFileIndicator"
+            android:layout_width="@dimen/file_icon_size"
+            android:layout_height="@dimen/file_icon_size"
+            android:layout_gravity="top|right"
+            android:layout_marginTop="2dp"
+            android:layout_marginRight="2dp"
+            android:src="@drawable/local_file_indicator" />
+
+        <ImageView
             android:id="@+id/favoriteIcon"
             android:layout_width="15dp"
             android:layout_height="15dp"
@@ -49,6 +75,8 @@
             android:layout_marginRight="2dp"
             android:src="@drawable/ic_favorite" />
 
+
+
     </FrameLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/grid_item.xml b/res/layout/grid_item.xml
index 2373c773..905cf8de 100644
--- a/res/layout/grid_item.xml
+++ b/res/layout/grid_item.xml
@@ -2,8 +2,7 @@
 <!--
   ownCloud Android client application
 
-  Copyright (C) 2012  Bartek Przybylski
-  Copyright (C) 2012-2013 ownCloud Inc.
+  Copyright (C) 2014 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,
@@ -33,13 +32,22 @@
         android:layout_gravity="center_horizontal" >
 
         <ImageView
-            android:id="@+id/favoriteIcon"
-            android:layout_width="15dp"
-            android:layout_height="15dp"
-            android:layout_gravity="bottom|right"
-            android:layout_marginBottom="2dp"
-            android:layout_marginRight="2dp"
-            android:src="@drawable/ic_favorite" />
+            android:id="@+id/sharedIcon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top|left"
+            android:layout_marginLeft="2dp"
+            android:layout_marginTop="2dp"
+            android:src="@drawable/sharedlink" />
+
+        <ImageView
+            android:id="@+id/sharedWithMeIcon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|left"
+            android:layout_marginLeft="2dp"
+            android:layout_marginTop="2dp"
+            android:src="@drawable/shared_with_me" />
 
         <ImageView
             android:id="@+id/thumbnail"
@@ -50,6 +58,24 @@
             android:layout_marginRight="10dp"
             android:src="@drawable/ic_menu_archive" />
 
+        <ImageView
+            android:id="@+id/localFileIndicator"
+            android:layout_width="@dimen/file_icon_size"
+            android:layout_height="@dimen/file_icon_size"
+            android:layout_gravity="top|right"
+            android:layout_marginTop="2dp"
+            android:layout_marginRight="2dp"
+            android:src="@drawable/local_file_indicator" />
+
+        <ImageView
+            android:id="@+id/favoriteIcon"
+            android:layout_width="15dp"
+            android:layout_height="15dp"
+            android:layout_gravity="bottom|right"
+            android:layout_marginBottom="2dp"
+            android:layout_marginRight="2dp"
+            android:src="@drawable/ic_favorite" />
+
     </FrameLayout>
 
     <TextView