From ecb13bc4ed98d29245bb7cefe152de0614b3b2dc Mon Sep 17 00:00:00 2001
From: DjBushido <bspeice.nc@gmail.com>
Date: Fri, 28 Feb 2014 20:34:01 -0500
Subject: [PATCH] Buttons now launch the correct activities Only thing left to
 do is the photo activities themselves.

---
 InClass3/res/layout/activity_main.xml                |  2 ++
 InClass3/src/edu/uncc/itcs4180/hw4/MainActivity.java | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/InClass3/res/layout/activity_main.xml b/InClass3/res/layout/activity_main.xml
index 0b772a8..a51b19d 100644
--- a/InClass3/res/layout/activity_main.xml
+++ b/InClass3/res/layout/activity_main.xml
@@ -16,6 +16,7 @@
         android:layout_alignParentTop="true"
         android:layout_alignRight="@+id/btnAsync"
         android:layout_marginTop="100dp"
+        android:onClick="onClick"
         android:text="Generate Image Thread" />
 
     <Button
@@ -25,6 +26,7 @@
         android:layout_below="@+id/btnThread"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="25dp"
+        android:onClick="onClick"
         android:text="Generate Image AsyncTask" />
 
 </RelativeLayout>
diff --git a/InClass3/src/edu/uncc/itcs4180/hw4/MainActivity.java b/InClass3/src/edu/uncc/itcs4180/hw4/MainActivity.java
index 574bc83..4b33419 100644
--- a/InClass3/src/edu/uncc/itcs4180/hw4/MainActivity.java
+++ b/InClass3/src/edu/uncc/itcs4180/hw4/MainActivity.java
@@ -2,7 +2,9 @@ package edu.uncc.itcs4180.hw4;
 
 import android.os.Bundle;
 import android.app.Activity;
+import android.content.Intent;
 import android.view.Menu;
+import android.view.View;
 
 public class MainActivity extends Activity {
 
@@ -18,5 +20,13 @@ public class MainActivity extends Activity {
 		getMenuInflater().inflate(R.menu.main, menu);
 		return true;
 	}
+	
+	public void onClick(View v) {
+		// One of our buttons has been clicked, let's start the activity and go!
+		if (v.getId() == R.id.btnAsync)
+			startActivity(new Intent(this, PhotoActivity.class));
+		else
+			startActivity(new Intent(this, PhotoThread.class));
+	}
 
 }