MindmapNode is now a proper GUI element

- new icon (plus/minus when expandable/contractable)
- MindmapNode can be added as GUI element. This happens in the
  NodeColumn ListView at the moment

Author: Benedikt Koeppel

res/drawable-xhdpi/minus_alt.png

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="36dip"
+    android:layout_height="wrap_content"
     android:gravity="left|center"
     android:paddingBottom="6dip"
     android:paddingLeft="6dip"
@@ -21,15 +21,18 @@
         android:layout_height="wrap_content"
         android:layout_width="0dp"
         android:textSize="16sp"
-        android:textIsSelectable="false" />
-
-    <TextView
-        android:id="@+id/expandable"
-        android:layout_weight="0"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="32sp"
         android:textIsSelectable="false"
         android:layout_marginRight="6dip" />
+    
+    <ImageView
+        android:id="@+id/expandable"
+        android:layout_width="24dip"
+        android:layout_weight="0"
+        android:layout_height="24dip"
+        android:layout_marginRight="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:contentDescription="@string/noicon"
+        android:layout_gravity="top" />
 
 </LinearLayout>

res/drawable-xhdpi/plus_alt.png

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="contextcopy" type="id" />
+    <item name="contextopenlink" type="id" />
+    
+</resources>

res/drawable/minus_alt.png

@@ -9,10 +9,17 @@
 
 import android.content.Context;
 import android.net.Uri;
+import android.os.Build;
+import android.util.TypedValue;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
+import android.view.Gravity;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AbsListView;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 
 
 
@@ -114,11 +121,61 @@ public MindmapNode(Context context, Node node) {
 
 		// load the layout from the XML file
 		// TODO: somehow the height of the item is wrong
-        inflate(context, R.layout.mindmap_node_list_item, this);
+        MindmapNode.inflate(context, R.layout.mindmap_node_list_item, this);
+        refreshView();
 
 	}
 
 
+	public void refreshView() {
+		
+		// the mindmap_node_list_item consists of a ImageView (icon), a TextView (node text), and another TextView ("+" button)
+		ImageView iconView = (ImageView)findViewById(R.id.icon);
+		iconView.setImageResource(icon_res_id);
+		iconView.setContentDescription(icon_name);
+		
+		TextView textView = (TextView) findViewById(R.id.label);
+		textView.setTextColor(getContext().getResources().getColor(android.R.color.primary_text_light));
+		textView.setText(text);
+		
+		ImageView expandable = (ImageView) findViewById(R.id.expandable);
+		if ( isExpandable ) {
+			if ( getIsSelected() ) {
+				expandable.setImageResource(R.drawable.minus_alt);
+			} else {
+				expandable.setImageResource(R.drawable.plus_alt);
+			}
+		}
+		
+		// if the node is selected and has child nodes, give it a special background
+		if ( getIsSelected() && getNumChildMindmapNodes() > 0 ) {
+			int backgroundColor;
+			
+			// menu bar: if we are at least at API 11, the Home button is kind of a back button in the app
+	    	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+	    		backgroundColor = getContext().getResources().getColor(android.R.color.holo_blue_bright);
+	    	} else {
+	    		backgroundColor = getContext().getResources().getColor(android.R.color.darker_gray);
+	    	}
+			
+			setBackgroundColor(backgroundColor);	
+		} else {
+			setBackgroundColor(0);
+		}	
+		
+		// set the layout parameter
+		// TODO: this should not be necessary. The problem is that the inflate
+		// (in the constructor) loads the XML as child of this LinearView, so
+		// the MindmapNode-LinearView wraps the root LinearView from the
+		// mindmap_node_list_item XML file.
+		setLayoutParams(new AbsListView.LayoutParams(AbsListView.LayoutParams.MATCH_PARENT, AbsListView.LayoutParams.WRAP_CONTENT));
+		setGravity(Gravity.LEFT | Gravity.CENTER);
+//		int paddingPx = (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 6, getResources().getDisplayMetrics());
+//		setPadding(paddingPx, paddingPx, 0, paddingPx);
+	}
+	
+	
+	
 
 	/**
 	 * Returns the XML Node of which this MindmapNode was derived

res/drawable/plus_alt.png

@@ -10,23 +10,19 @@
 import android.content.Context;
 import android.graphics.Point;
 import android.os.Build;
+import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnCreateContextMenuListener;
 import android.view.ViewGroup;
-import android.widget.AdapterView.OnItemLongClickListener;
 import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
-import android.widget.AdapterView.OnItemClickListener;
-
-import android.util.Log;
 
 /**
  * A column of MindmapNodes, i.e. one level in the mind map. It extends
@@ -359,57 +355,16 @@ public MindmapNodeAdapter(Context context, int textViewResourceId, ArrayList<Min
 	@Override
 	public View getView(int position, View convertView, ViewGroup parent) {
 
-		// if convertView was specified, we will use this. Otherwise, we create
-		// a new view based on the R.layout.mindmap_node_list_item layout.
-		
-		// TODO: instead of loading a XML, we can generate the whole view in the MindmapNode.
-		// TODO: why do we need to open the same node twice, once as view and once as node, and then pass stuff around the node? should all go in the initializer or somewhere, and allow us to update the view somehow
+		// if convertView was specified, we cast it to a MindmapNode and then refresh it's design
+		// otherwise, we load the MindmapNode from the specified position in the column, and display it
 		MindmapNode view = (MindmapNode)convertView;
 		if ( view == null ) {
 			view = mindmapNodes.get(position);
 		}
 
-		MindmapNode node = mindmapNodes.get(position);
-		// get the node for which we generate the view
-		if ( node != null) {
-			
-			// the mindmap_node_list_item consists of a ImageView (icon), a TextView (node text), and another TextView ("+" button)
-			ImageView icon = (ImageView) view.findViewById(R.id.icon);
-			icon.setImageResource(node.icon_res_id);
-			icon.setContentDescription(node.icon_name);
-			
-			TextView text = (TextView) view.findViewById(R.id.label);
-			text.setTextColor(getContext().getResources().getColor(android.R.color.primary_text_light));
-			text.setText(node.text);
-			
-			TextView expandable = (TextView) view.findViewById(R.id.expandable);
-			expandable.setTextColor(getContext().getResources().getColor(android.R.color.primary_text_light));
-			if ( node.isExpandable ) {
-				expandable.setText("+");
-			} else {
-				expandable.setText("");
-			}
-			
-			// if the node is selected and has child nodes, give it a special background
-			if ( node.getIsSelected() && node.getNumChildMindmapNodes() > 0 ) {
-				int backgroundColor;
-				
-				// menu bar: if we are at least at API 11, the Home button is kind of a back button in the app
-		    	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-		    		backgroundColor = getContext().getResources().getColor(android.R.color.holo_blue_bright);
-		    	} else {
-		    		backgroundColor = getContext().getResources().getColor(android.R.color.darker_gray);
-		    	}
-				
-				view.setBackgroundColor(backgroundColor);	
-			} else {
-				view.setBackgroundColor(0);
-			}
-			
-		}
-		
-		Log.d(MainApplication.TAG, "Created a ListView item view");
-		
+		// tell the node to refresh it's view
+		view.refreshView();
+
 		return view;
 	}