From 79ce86ac24ee84c18f8d4fe19d27f427a9aa52f7 Mon Sep 17 00:00:00 2001
From: Alejandro Alcalde <algui91@gmail.com>
Date: Sun, 10 Aug 2014 21:50:23 +0200
Subject: [PATCH] Revert "Improving performance unsing compoundDrawable in
 NodeAdapter"

This reverts commit bf177ace64bf3cec9255a4b24e5a7220c2a64510.
---
 SWADroid/res/layout/grid_item.xml             | 39 +++++++++++--------
 .../modules/downloads/NodeAdapter.java        | 16 +++++++-
 2 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/SWADroid/res/layout/grid_item.xml b/SWADroid/res/layout/grid_item.xml
index 7cd2f811..52a179a6 100644
--- a/SWADroid/res/layout/grid_item.xml
+++ b/SWADroid/res/layout/grid_item.xml
@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/widget44"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_x="201px"
-    android:layout_y="165px"
-    android:gravity="center_horizontal"
-    android:orientation="vertical" >
-
-    <TextView
-        android:id="@+id/icon_text"
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/widget44"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:maxLines="2"
-        android:textColor="@android:color/black"
-        android:textColorHighlight="#656565" >
+        android:orientation="vertical"
+        android:layout_x="201px"
+        android:layout_y="165px"
+        android:gravity="center_horizontal">
+    <ImageView
+            android:id="@+id/icon_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+    </ImageView>
+    <TextView
+            android:id="@+id/icon_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxLines="2"
+            android:gravity="center_horizontal"
+            android:textColorHighlight="#656565"
+            android:textColor="@android:color/black"
+            >
     </TextView>
-
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/downloads/NodeAdapter.java b/SWADroid/src/es/ugr/swad/swadroid/modules/downloads/NodeAdapter.java
index 33944aed..af239868 100644
--- a/SWADroid/src/es/ugr/swad/swadroid/modules/downloads/NodeAdapter.java
+++ b/SWADroid/src/es/ugr/swad/swadroid/modules/downloads/NodeAdapter.java
@@ -23,6 +23,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import es.ugr.swad.swadroid.R;
@@ -47,6 +48,7 @@ public class NodeAdapter extends BaseAdapter {
 
     static class ViewHolder {
         TextView text;
+        ImageView image;
     }
 
     @Override
@@ -82,18 +84,28 @@ public class NodeAdapter extends BaseAdapter {
 
             holder = new ViewHolder();
             holder.text = (TextView) convertView.findViewById(R.id.icon_text);
+            holder.image = (ImageView) convertView.findViewById(R.id.icon_image);
 
             convertView.setTag(holder);
         } else {
             holder = (ViewHolder) convertView.getTag();
         }
+        // Trying to use ellipsizing only when it is needed, it does not work
+        /*
+         *
+		String nodeName = ((DirectoryItem)list.get(position)).getName();
+		if(!isTooLarge(holder.text,nodeName)) 
+			holder.text.setEllipsize(null); //if the text fits in two lines, the ellipsizing is turn off
+		else
+			holder.text.setEllipsize(TextUtils.TruncateAt.END); //if the text does not fit in two lines, the ellipsizing is set to end
+		*/
 
         holder.text.setText(list.get(position).getName());
 
         if (list.get(position).isFolder()) {
-            holder.text.setCompoundDrawablesRelativeWithIntrinsicBounds(0, R.drawable.folder_open, 0, 0);
+            holder.image.setImageResource(R.drawable.folder_open);
         } else {
-            holder.text.setCompoundDrawablesRelativeWithIntrinsicBounds(0, R.drawable.file, 0, 0);
+            holder.image.setImageResource(R.drawable.file);
         }
 
         return convertView;