From: masensio <masensio@solidgear.es>
Date: Tue, 27 Jan 2015 12:51:44 +0000 (+0100)
Subject: Show status icons in gridview
X-Git-Tag: oc-android-1.7.0_signed~16^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/8ebaba45e77c0c8f32762493e2a3dcebcddded4b?ds=sidebyside;hp=--cc

Show status icons in gridview
---

8ebaba45e77c0c8f32762493e2a3dcebcddded4b
diff --git a/res/layout/grid_image.xml b/res/layout/grid_image.xml
index f8a171ef..e372faaa 100644
--- a/res/layout/grid_image.xml
+++ b/res/layout/grid_image.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ownCloud Android client application
-
   Copyright (C) 2014 ownCloud Inc.
 
   This program is free software: you can redistribute it and/or modify
@@ -30,24 +29,30 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" >
 
-        <ImageView
-            android:id="@+id/sharedIcon"
+        <LinearLayout
             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" />
+            android:layout_gravity="top|right"
+            android:orientation="vertical"
+            android:layout_margin="4dp">
 
-        <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/sharedIcon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginBottom="4dp"
+                android:src="@drawable/sharedlink" />
 
+            <ImageView
+                android:id="@+id/sharedWithMeIcon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="4dp"
+                android:src="@drawable/shared_with_me"
+                android:visibility="invisible" />
+        </LinearLayout>
         <com.owncloud.android.ui.SquareImageView
             android:id="@+id/thumbnail"
             android:layout_width="match_parent"
@@ -55,15 +60,16 @@
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
             android:scaleType="centerCrop"
-            android:src="@drawable/ic_menu_archive" />
+            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:layout_gravity="bottom|right"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="4dp"
+            android:layout_marginRight="4dp"
             android:src="@drawable/local_file_indicator" />
 
         <ImageView
@@ -71,12 +77,9 @@
             android:layout_width="15dp"
             android:layout_height="15dp"
             android:layout_gravity="bottom|right"
-            android:layout_marginBottom="2dp"
-            android:layout_marginRight="2dp"
+            android:layout_marginBottom="4dp"
+            android:layout_marginRight="4dp"
             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 905cf8de..b5c20393 100644
--- a/res/layout/grid_item.xml
+++ b/res/layout/grid_item.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ownCloud Android client application
-
   Copyright (C) 2014 ownCloud Inc.
 
   This program is free software: you can redistribute it and/or modify
@@ -30,25 +29,30 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal" >
-
-        <ImageView
-            android:id="@+id/sharedIcon"
+        <LinearLayout
             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" />
+            android:layout_gravity="top|right"
+            android:orientation="vertical"
+            android:layout_margin="2dp">
 
-        <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/sharedIcon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginBottom="2dp"
+                android:src="@drawable/sharedlink" />
 
+            <ImageView
+                android:id="@+id/sharedWithMeIcon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="2dp"
+                android:src="@drawable/shared_with_me"
+                android:visibility="invisible" />
+        </LinearLayout>
         <ImageView
             android:id="@+id/thumbnail"
             android:layout_width="72dp"
@@ -62,7 +66,7 @@
             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_gravity="bottom|right"
             android:layout_marginTop="2dp"
             android:layout_marginRight="2dp"
             android:src="@drawable/local_file_indicator" />
@@ -76,6 +80,8 @@
             android:layout_marginRight="2dp"
             android:src="@drawable/ic_favorite" />
 
+
+
     </FrameLayout>
 
     <TextView
diff --git a/res/layout/list_item.xml b/res/layout/list_item.xml
index 1b2f1424..0ea3bced 100644
--- a/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@ -117,26 +117,26 @@
             android:gravity="center_vertical"
             android:orientation="vertical">
 
-        <ImageView
-            android:id="@+id/sharedIcon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginLeft="4dp"
-            android:layout_marginBottom="4dp"
-            android:layout_marginRight="4dp"
-            android:src="@drawable/sharedlink" />
+            <ImageView
+                android:id="@+id/sharedIcon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginLeft="4dp"
+                android:layout_marginBottom="4dp"
+                android:layout_marginRight="4dp"
+                android:src="@drawable/sharedlink" />
 
-        <ImageView
-            android:id="@+id/sharedWithMeIcon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginLeft="4dp"
-            android:layout_marginRight="4dp"
-            android:layout_marginTop="4dp"
-            android:src="@drawable/shared_with_me"
-            android:visibility="invisible" />
+            <ImageView
+                android:id="@+id/sharedWithMeIcon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:layout_marginTop="4dp"
+                android:src="@drawable/shared_with_me"
+                android:visibility="invisible" />
 
         </LinearLayout>
 
diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 76dc4985..1e6670dc 100644
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -149,11 +149,11 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
         OCFile file = null;
         LayoutInflater inflator = (LayoutInflater) mContext
                 .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        
+
         if (mFiles != null && mFiles.size() > position) {
             file = mFiles.get(position);
         }
-        
+
         // Find out which layout should be displayed
         ViewType viewType;
         if (!fileView){
@@ -166,15 +166,15 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
 
         // Create View
         switch (viewType){
-        case GRID_IMAGE:
-            view = inflator.inflate(R.layout.grid_image, null);
-            break;
-        case GRID_ITEM:
-            view = inflator.inflate(R.layout.grid_item, null);
-            break;
-        case LIST_ITEM:
-            view = inflator.inflate(R.layout.list_item, null);
-            break;
+            case GRID_IMAGE:
+                view = inflator.inflate(R.layout.grid_image, null);
+                break;
+            case GRID_ITEM:
+                view = inflator.inflate(R.layout.grid_item, null);
+                break;
+            case LIST_ITEM:
+                view = inflator.inflate(R.layout.list_item, null);
+                break;
         }
 
         view.invalidate();
@@ -184,49 +184,56 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
             ImageView fileIcon = (ImageView) view.findViewById(R.id.thumbnail);
             TextView fileName;
             String name;
-            
+
             switch (viewType){
-            case LIST_ITEM:
-                fileName = (TextView) view.findViewById(R.id.Filename);
-                name = file.getFileName();
-                fileName.setText(name);
-                
-                TextView fileSizeV = (TextView) view.findViewById(R.id.file_size);
-                TextView lastModV = (TextView) view.findViewById(R.id.last_mod);
-                ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);
-                
-                lastModV.setVisibility(View.VISIBLE);
-                lastModV.setText(showRelativeTimestamp(file));
-                
-                checkBoxV.setVisibility(View.GONE);
-                
-                fileSizeV.setVisibility(View.VISIBLE);
-                fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));
-                
-                ImageView sharedIconV = (ImageView) view.findViewById(R.id.sharedIcon);
-                
-
-                if (file.isShareByLink()) {
-                    sharedIconV.setVisibility(View.VISIBLE);
-                } else {
-                    sharedIconV.setVisibility(View.GONE);
-                }
-                
-                ImageView localStateView = (ImageView) view.findViewById(R.id.localFileIndicator);
-                
-                if (!file.isFolder()) {
-                    GridView parentList = (GridView)parent;
-                    if (parentList.getChoiceMode() == GridView.CHOICE_MODE_NONE) { 
-                        checkBoxV.setVisibility(View.GONE);
-                    } else {
-                        if (parentList.isItemChecked(position)) {
-                            checkBoxV.setImageResource(android.R.drawable.checkbox_on_background);
+                case LIST_ITEM:
+                    TextView fileSizeV = (TextView) view.findViewById(R.id.file_size);
+                    TextView lastModV = (TextView) view.findViewById(R.id.last_mod);
+                    ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);
+
+                    lastModV.setVisibility(View.VISIBLE);
+                    lastModV.setText(showRelativeTimestamp(file));
+
+                    checkBoxV.setVisibility(View.GONE);
+
+                    fileSizeV.setVisibility(View.VISIBLE);
+                    fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));
+
+                    if (!file.isFolder()) {
+                        GridView parentList = (GridView)parent;
+                        if (parentList.getChoiceMode() == GridView.CHOICE_MODE_NONE) {
+                            checkBoxV.setVisibility(View.GONE);
                         } else {
-                            checkBoxV.setImageResource(android.R.drawable.checkbox_off_background);
+                            if (parentList.isItemChecked(position)) {
+                                checkBoxV.setImageResource(android.R.drawable.checkbox_on_background);
+                            } else {
+                                checkBoxV.setImageResource(android.R.drawable.checkbox_off_background);
+                            }
+                            checkBoxV.setVisibility(View.VISIBLE);
                         }
-                        checkBoxV.setVisibility(View.VISIBLE);
+
+                    } else { //Folder
+                        fileSizeV.setVisibility(View.INVISIBLE);
+                    }
+
+                case GRID_ITEM:
+                    // filename
+                    fileName = (TextView) view.findViewById(R.id.Filename);
+                    name = file.getFileName();
+                    fileName.setText(name);
+
+                case GRID_IMAGE:
+                    // sharedIcon
+                    ImageView sharedIconV = (ImageView) view.findViewById(R.id.sharedIcon);
+                    if (file.isShareByLink()) {
+                        sharedIconV.setVisibility(View.VISIBLE);
+                        sharedIconV.bringToFront();
+                    } else {
+                        sharedIconV.setVisibility(View.GONE);
                     }
-                    
+
+                    // local state
+                    ImageView localStateView = (ImageView) view.findViewById(R.id.localFileIndicator);
                     localStateView.bringToFront();
                     FileDownloaderBinder downloaderBinder = mTransferServiceGetter.getFileDownloaderBinder();
                     FileUploaderBinder uploaderBinder = mTransferServiceGetter.getFileUploaderBinder();
@@ -242,25 +249,19 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                     } else {
                         localStateView.setVisibility(View.INVISIBLE);
                     }
-                    
-                    ImageView sharedWithMeIconV = (ImageView) view.findViewById(R.id.sharedWithMeIcon);
-                    if (checkIfFileIsSharedWithMe(file)) {
-                        sharedWithMeIconV.setVisibility(View.VISIBLE);
-                    } else {
-                        sharedWithMeIconV.setVisibility(View.GONE);
+
+                    // share with me icon
+                    if (!file.isFolder()) {
+                        ImageView sharedWithMeIconV = (ImageView) view.findViewById(R.id.sharedWithMeIcon);
+                        sharedWithMeIconV.bringToFront();
+                        if (checkIfFileIsSharedWithMe(file)) {
+                            sharedWithMeIconV.setVisibility(View.VISIBLE);
+                        } else {
+                            sharedWithMeIconV.setVisibility(View.GONE);
+                        }
                     }
-                } else { //Folder
-                    fileSizeV.setVisibility(View.INVISIBLE);
-                    localStateView.setVisibility(View.INVISIBLE);
-                }
-                break;
-            case GRID_ITEM:
-                fileName = (TextView) view.findViewById(R.id.Filename);
-                name = file.getFileName();
-                fileName.setText(name);
-                break;
-            case GRID_IMAGE:
-                break;
+
+                    break;
             }
             
             // For all Views
@@ -318,7 +319,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                             DisplayUtils.getFileTypeIconId(file.getMimetype(), file.getFileName())
                     );
                 }
-            }           
+            }
         }
 
         return view;