mirror-github-bspeice
/
itcs4180
mirror of https://github.com/bspeice/itcs4180
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

master
tokugawa 2014-04-19 16:37:36 -04:00
parent e8f4fe9a7b 9df7d34430
commit 496fd2c9fc
6 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
UNCCScavenger/.classpath
View File

@ -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>

2
UNCCScavenger/res/layout/activity_search.xml
View File

@ -25,7 +25,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"

2
UNCCScavenger/res/menu/compass.xml
View File

@ -7,6 +7,6 @@
android:id="@+id/action_settings"
android:orderInCategory="100"
android:title="@string/action_settings"
app:showAsAction="never"/>
android:showAsAction="never"/>
</menu>

2
UNCCScavenger/res/menu/found.xml
View File

@ -7,6 +7,6 @@
android:id="@+id/action_settings"
android:orderInCategory="100"
android:title="@string/action_settings"
app:showAsAction="never"/>
android:showAsAction="never"/>
</menu>

2
UNCCScavenger/res/menu/search.xml
View File

@ -7,6 +7,6 @@
android:id="@+id/action_settings"
android:orderInCategory="100"
android:title="@string/action_settings"
app:showAsAction="never"/>
android:showAsAction="never"/>
</menu>

7
UNCCScavenger/src/edu/uncc/scavenger/rest/RestLocation.java
View File

@ -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());