From a7b8f196a26283fc2480f8913fcfec2c2620d20c Mon Sep 17 00:00:00 2001
From: tokugawa <brodenmayer@yahoo.com>
Date: Sun, 9 Mar 2014 21:56:40 -0400
Subject: [PATCH] Now working with text label. Just have to format and put in
 the right text.

---
 InClass3/res/layout/grid_schema.xml           | 19 +++++++++++
 .../edu/uncc/itcs4180/hw4/PhotoActivity.java  | 32 +++++++++++++------
 2 files changed, 42 insertions(+), 9 deletions(-)
 create mode 100644 InClass3/res/layout/grid_schema.xml

diff --git a/InClass3/res/layout/grid_schema.xml b/InClass3/res/layout/grid_schema.xml
new file mode 100644
index 0000000..60579ec
--- /dev/null
+++ b/InClass3/res/layout/grid_schema.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <ImageView
+        android:id="@+id/imageView1"
+        android:layout_width="140dp"
+        android:layout_height="140dp"
+        android:src="@drawable/ic_launcher" />
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ems="10" />
+
+</LinearLayout>
diff --git a/InClass3/src/edu/uncc/itcs4180/hw4/PhotoActivity.java b/InClass3/src/edu/uncc/itcs4180/hw4/PhotoActivity.java
index 3cfb175..54fcf72 100644
--- a/InClass3/src/edu/uncc/itcs4180/hw4/PhotoActivity.java
+++ b/InClass3/src/edu/uncc/itcs4180/hw4/PhotoActivity.java
@@ -6,7 +6,7 @@ package edu.uncc.itcs4180.hw4;
  * In Class 3
  * PhotoActivity.java
  */
-
+ 
 import java.net.URL;
 import java.util.ArrayList;
 
@@ -17,6 +17,7 @@ import android.app.ProgressDialog;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.View;
 import android.view.ViewGroup;
@@ -25,6 +26,7 @@ import android.widget.Button;
 import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 
 public class PhotoActivity extends Activity {
 
@@ -142,21 +144,33 @@ public class PhotoActivity extends Activity {
 		@Override
 		public View getView(int position, View convertView, ViewGroup parent) 
 		{
-			ImageView newImageView = new ImageView(getBaseContext());
+			Holder holder = new Holder();
+			View vi = convertView;
 			
-			if(convertView == null)
+			if(vi == null)
 			{
-				newImageView.setLayoutParams(new GridView.LayoutParams(
-						140, 140));
-				newImageView.setPadding(5, 5, 5, 5);
+				vi = getLayoutInflater().inflate(R.layout.grid_schema, null);
+				
+				holder.textView = (TextView)vi.findViewById(R.id.textView1);
+				holder.imageView = (ImageView)vi.findViewById(R.id.imageView1);
+				
+				vi.setTag(holder);
 			}
 			else
 			{
-				newImageView = (ImageView) convertView;
+				holder = (Holder)(vi.getTag());
 			}
-			newImageView.setImageBitmap(bitmapList.get(position));
+			holder.textView.setText(imageUrlIds[position]);
+			if(bitmapList.get(position)!=null)
+				holder.imageView.setImageBitmap(bitmapList.get(position));
 			
-			return newImageView;
+			return vi;
 		}
 	}
+	
+	static class Holder
+	{
+		TextView textView;
+		ImageView imageView;
+	}
 }