From 2813af334c6afaf17de46620f587d7631727fe3d Mon Sep 17 00:00:00 2001
From: Bradlee Speice <bspeice.nc@gmail.com>
Date: Sat, 19 Apr 2014 13:32:56 -0400
Subject: [PATCH 1/2] Fix some stuff so the project generates correctly.

---
 UNCCScavenger/.classpath                     | 18 +++++++++---------
 UNCCScavenger/res/layout/activity_search.xml |  2 +-
 UNCCScavenger/res/menu/compass.xml           |  2 +-
 UNCCScavenger/res/menu/found.xml             |  2 +-
 UNCCScavenger/res/menu/search.xml            |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/UNCCScavenger/.classpath b/UNCCScavenger/.classpath
index 26bdfa6..5176974 100644
--- a/UNCCScavenger/.classpath
+++ b/UNCCScavenger/.classpath
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/UNCCScavenger/res/layout/activity_search.xml b/UNCCScavenger/res/layout/activity_search.xml
index 868855f..f893f2f 100644
--- a/UNCCScavenger/res/layout/activity_search.xml
+++ b/UNCCScavenger/res/layout/activity_search.xml
@@ -18,7 +18,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:src="@drawable/abc_ab_bottom_solid_dark_holo" />
+            android:src="@drawable/ic_launcher" />
 
         <TextView
             android:id="@+id/riddleView"
diff --git a/UNCCScavenger/res/menu/compass.xml b/UNCCScavenger/res/menu/compass.xml
index bf1b50e..86c8d22 100644
--- a/UNCCScavenger/res/menu/compass.xml
+++ b/UNCCScavenger/res/menu/compass.xml
@@ -7,6 +7,6 @@
         android:id="@+id/action_settings"
         android:orderInCategory="100"
         android:title="@string/action_settings"
-        app:showAsAction="never"/>
+        android:showAsAction="never"/>
 
 </menu>
diff --git a/UNCCScavenger/res/menu/found.xml b/UNCCScavenger/res/menu/found.xml
index 2f70f26..1799d64 100644
--- a/UNCCScavenger/res/menu/found.xml
+++ b/UNCCScavenger/res/menu/found.xml
@@ -7,6 +7,6 @@
         android:id="@+id/action_settings"
         android:orderInCategory="100"
         android:title="@string/action_settings"
-        app:showAsAction="never"/>
+        android:showAsAction="never"/>
 
 </menu>
diff --git a/UNCCScavenger/res/menu/search.xml b/UNCCScavenger/res/menu/search.xml
index 5a56c87..f3c65b2 100644
--- a/UNCCScavenger/res/menu/search.xml
+++ b/UNCCScavenger/res/menu/search.xml
@@ -7,6 +7,6 @@
         android:id="@+id/action_settings"
         android:orderInCategory="100"
         android:title="@string/action_settings"
-        app:showAsAction="never"/>
+        android:showAsAction="never"/>
 
 </menu>

From 9df7d344301ba5b126dfae03e20de1f750672c04 Mon Sep 17 00:00:00 2001
From: Bradlee Speice <bspeice.nc@gmail.com>
Date: Sat, 19 Apr 2014 13:34:39 -0400
Subject: [PATCH 2/2] Add a location image to the RestLocation

---
 .../src/edu/uncc/scavenger/rest/RestLocation.java          | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/UNCCScavenger/src/edu/uncc/scavenger/rest/RestLocation.java b/UNCCScavenger/src/edu/uncc/scavenger/rest/RestLocation.java
index bb21916..89bb078 100644
--- a/UNCCScavenger/src/edu/uncc/scavenger/rest/RestLocation.java
+++ b/UNCCScavenger/src/edu/uncc/scavenger/rest/RestLocation.java
@@ -18,6 +18,7 @@ public class RestLocation implements Serializable{
 	private String riddle;
 	private double locationLong;
 	private double locationLat;
+	private String locationImageURL;
 	private String key;
 	
 	public int getId() {
@@ -57,6 +58,12 @@ public class RestLocation implements Serializable{
 		this.key = key;
 	}
 
+	public String getLocationImageURL() {
+		return locationImageURL;
+	}
+	public void setLocationImageURL(String locationImageURL) {
+		this.locationImageURL = locationImageURL;
+	}
 	public Location getLocation() {
 		android.location.Location mLocation = new android.location.Location("NinerFinderServer");
 		mLocation.setLatitude(getLocationLat());