Thumbnail in ListView

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 1bab20b..273f936 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -31,7 +31,6 @@ import android.view.LayoutInflater;
 import android.view.View;\r
 import android.view.ViewGroup;\r
 import android.widget.BaseAdapter;\r
 import android.view.View;\r
 import android.view.ViewGroup;\r
 import android.widget.BaseAdapter;\r

-import android.widget.GridView;\r

 import android.widget.ImageView;\r
 import android.widget.ListAdapter;\r
 import android.widget.ListView;\r
 import android.widget.ImageView;\r
 import android.widget.ListAdapter;\r
 import android.widget.ListView;\r


@@ -108,48 +107,24 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
 \r
     @Override\r
     public View getView(int position, View convertView, ViewGroup parent) {\r
 \r
     @Override\r
     public View getView(int position, View convertView, ViewGroup parent) {\r

-     // decide image vs. file view\r
-        double count = 0;\r
-        \r
-        \r
-        for (OCFile file : mFiles){\r
-            if (file.isImage()){\r
-                count++;\r
-            }\r
-        }\r
-        \r
-        // > 50% Images --> image view\r
-        boolean fileView = true;\r
-        if ((count / mFiles.size()) >= 0.5){\r
-            Log_OC.i("FileListListAdapter", "Image View");\r
-            fileView = false;\r
-        } else {\r
-            Log_OC.i("FileListListAdapter", "File View");\r
-            fileView = true;\r
-        }\r
+     \r

         \r
         View view = convertView;\r
         \r
         View view = convertView;\r

-//        if (view == null) {\r
+        if (view == null) {\r

             LayoutInflater inflator = (LayoutInflater) mContext\r
                     .getSystemService(Context.LAYOUT_INFLATER_SERVICE);\r
             LayoutInflater inflator = (LayoutInflater) mContext\r
                     .getSystemService(Context.LAYOUT_INFLATER_SERVICE);\r

-            if (fileView){\r
-                view = inflator.inflate(R.layout.list_item, null);\r
-            } else {\r
-                view = inflator.inflate(R.layout.image_item, null);\r
-                View frame = view.findViewById(R.id.imageItemFrame);\r
-                frame.setVisibility(View.GONE);\r
-            }\r
-//        }\r
-            view.invalidate();\r
-    \r
+           view = inflator.inflate(R.layout.list_item, null);\r
+         \r
+        }\r
+         \r

         if (mFiles != null && mFiles.size() > position) {\r
             OCFile file = mFiles.get(position);\r
             TextView fileName = (TextView) view.findViewById(R.id.Filename);\r
         if (mFiles != null && mFiles.size() > position) {\r
             OCFile file = mFiles.get(position);\r
             TextView fileName = (TextView) view.findViewById(R.id.Filename);\r

-            if (!fileView){fileName.setVisibility(View.GONE);}\r
+            fileName.setVisibility(View.GONE);\r

             String name = file.getFileName();\r
 \r
             fileName.setText(name);\r
             String name = file.getFileName();\r
 \r
             fileName.setText(name);\r

-            ImageView fileIcon = (ImageView) view.findViewById(R.id.thumbnail);\r
+            ImageView fileIcon = (ImageView) view.findViewById(R.id.imageView1);\r

             ImageView sharedIconV = (ImageView) view.findViewById(R.id.sharedIcon);\r
             ImageView sharedWithMeIconV = (ImageView) view.findViewById(R.id.sharedWithMeIcon);\r
             sharedWithMeIconV.setVisibility(View.GONE);\r
             ImageView sharedIconV = (ImageView) view.findViewById(R.id.sharedIcon);\r
             ImageView sharedWithMeIconV = (ImageView) view.findViewById(R.id.sharedWithMeIcon);\r
             sharedWithMeIconV.setVisibility(View.GONE);\r


@@ -188,8 +163,8 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                     view.findViewById(R.id.imageView3).setVisibility(View.VISIBLE);\r
                 }\r
                 \r
                     view.findViewById(R.id.imageView3).setVisibility(View.VISIBLE);\r
                 }\r
                 \r

-                GridView parentList = (GridView)parent;\r
-                if (parentList.getChoiceMode() == GridView.CHOICE_MODE_NONE) { \r
+                ListView parentList = (ListView)parent;\r
+                if (parentList.getChoiceMode() == ListView.CHOICE_MODE_NONE) { \r

                     checkBoxV.setVisibility(View.GONE);\r
                 } else {\r
                     if (parentList.isItemChecked(position)) {\r
                     checkBoxV.setVisibility(View.GONE);\r
                 } else {\r
                     if (parentList.isItemChecked(position)) {\r


@@ -217,7 +192,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
             } \r
             else {\r
                 fileSizeV.setVisibility(View.INVISIBLE);\r
             } \r
             else {\r
                 fileSizeV.setVisibility(View.INVISIBLE);\r

-                fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));\r
+                //fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));\r

                 lastModV.setVisibility(View.VISIBLE);\r
                 lastModV.setText(DisplayUtils.unixTimeToHumanReadable(file.getModificationTimestamp()));\r
                 checkBoxV.setVisibility(View.GONE);\r
                 lastModV.setVisibility(View.VISIBLE);\r
                 lastModV.setText(DisplayUtils.unixTimeToHumanReadable(file.getModificationTimestamp()));\r
                 checkBoxV.setVisibility(View.GONE);\r