Recover badges: show status icons in grid View ( favoriteIcon, localFileIndicator...

diff --git a/res/layout/grid_image.xml b/res/layout/grid_image.xml
index e372faa..8bccde6 100644 (file)
--- a/res/layout/grid_image.xml
+++ b/res/layout/grid_image.xml
@@ -29,6 +29,15 @@
         android:layout_width="match_parent"\r
         android:layout_height="wrap_content" >\r
 \r
         android:layout_width="match_parent"\r
         android:layout_height="wrap_content" >\r
 \r

+        <com.owncloud.android.ui.SquareImageView\r
+            android:id="@+id/thumbnail"\r
+            android:layout_width="match_parent"\r
+            android:layout_height="match_parent"\r
+            android:paddingLeft="10dp"\r
+            android:paddingRight="10dp"\r
+            android:scaleType="centerCrop"\r
+            android:src="@drawable/ic_menu_archive"/>\r
+\r

         <LinearLayout\r
             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
         <LinearLayout\r
             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r


@@ -53,14 +62,6 @@
                 android:src="@drawable/shared_with_me"\r
                 android:visibility="invisible" />\r
         </LinearLayout>\r
                 android:src="@drawable/shared_with_me"\r
                 android:visibility="invisible" />\r
         </LinearLayout>\r

-        <com.owncloud.android.ui.SquareImageView\r
-            android:id="@+id/thumbnail"\r
-            android:layout_width="match_parent"\r
-            android:layout_height="match_parent"\r
-            android:paddingLeft="10dp"\r
-            android:paddingRight="10dp"\r
-            android:scaleType="centerCrop"\r
-            android:src="@drawable/ic_menu_archive"/>\r

 \r
         <ImageView\r
             android:id="@+id/localFileIndicator"\r
 \r
         <ImageView\r
             android:id="@+id/localFileIndicator"\r

diff --git a/res/layout/grid_item.xml b/res/layout/grid_item.xml
index b5c2039..b494d48 100644 (file)
--- a/res/layout/grid_item.xml
+++ b/res/layout/grid_item.xml
@@ -29,6 +29,16 @@
         android:layout_width="match_parent"\r
         android:layout_height="wrap_content"\r
         android:layout_gravity="center_horizontal" >\r
         android:layout_width="match_parent"\r
         android:layout_height="wrap_content"\r
         android:layout_gravity="center_horizontal" >\r

+\r
+        <ImageView\r
+            android:id="@+id/thumbnail"\r
+            android:layout_width="72dp"\r
+            android:layout_height="72dp"\r
+            android:layout_gravity="center_horizontal"\r
+            android:layout_marginLeft="10dp"\r
+            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
         <LinearLayout\r
             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r


@@ -53,14 +63,6 @@
                 android:src="@drawable/shared_with_me"\r
                 android:visibility="invisible" />\r
         </LinearLayout>\r
                 android:src="@drawable/shared_with_me"\r
                 android:visibility="invisible" />\r
         </LinearLayout>\r

-        <ImageView\r
-            android:id="@+id/thumbnail"\r
-            android:layout_width="72dp"\r
-            android:layout_height="72dp"\r
-            android:layout_gravity="center_horizontal"\r
-            android:layout_marginLeft="10dp"\r
-            android:layout_marginRight="10dp"\r
-            android:src="@drawable/ic_menu_archive" />\r

 \r
         <ImageView\r
             android:id="@+id/localFileIndicator"\r
 \r
         <ImageView\r
             android:id="@+id/localFileIndicator"\r