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

Add a button so that previously found locations can go straight to 

results.
master
DjBushido 2014-04-28 12:41:57 -04:00
parent dba76dd0a6
commit 8a3870e763
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,12 @@
android:layout_weight="0" android:layout_weight="0"
android:orientation="vertical" > android:orientation="vertical" >
<Button
android:id="@+id/btnViewResult"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="View Result" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" > android:layout_height="wrap_content" >

15
UNCCScavenger/src/edu/uncc/scavenger/SearchActivity.java
View File

@ -37,7 +37,7 @@ import android.widget.Toast;
public class SearchActivity extends Activity { public class SearchActivity extends Activity {
ImageView locationImage; ImageView locationImage;
Button compassButton, scanButton; Button compassButton, scanButton, resultButton;
TextView locationText, riddleView; TextView locationText, riddleView;
Intent intent; Intent intent;
RestLocation restLocation; RestLocation restLocation;
@ -52,6 +52,7 @@ public class SearchActivity extends Activity {
locationImage = (ImageView)findViewById(R.id.locationImage); locationImage = (ImageView)findViewById(R.id.locationImage);
compassButton = (Button)findViewById(R.id.compassButton); compassButton = (Button)findViewById(R.id.compassButton);
scanButton = (Button)findViewById(R.id.scanButton); scanButton = (Button)findViewById(R.id.scanButton);
resultButton = (Button)findViewById(R.id.btnViewResult);
riddleView = (TextView)findViewById(R.id.riddleView); riddleView = (TextView)findViewById(R.id.riddleView);
restLocation = (RestLocation)(getIntent().getSerializableExtra("restLocation")); restLocation = (RestLocation)(getIntent().getSerializableExtra("restLocation"));
@ -59,6 +60,9 @@ public class SearchActivity extends Activity {
locationText.setText(restLocation.getName()); locationText.setText(restLocation.getName());
riddleView.setText(restLocation.getRiddle()); riddleView.setText(restLocation.getRiddle());
if (restLocation.getKey() != null) {
resultButton.setVisibility(View.VISIBLE);
}
scanButton.setOnClickListener(new OnClickListener(){ scanButton.setOnClickListener(new OnClickListener(){
@ -133,6 +137,15 @@ public class SearchActivity extends Activity {
} }
}); });
resultButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View arg0) {
Intent i = new Intent(SearchActivity.this, FoundActivity.class);
i.putExtra("restLocation", restLocation);
startActivity(i);
}
});
Bitmap locationPicture = BitmapAccess.loadBitmap(this, restLocation.getName()); Bitmap locationPicture = BitmapAccess.loadBitmap(this, restLocation.getName());
if(locationPicture != null) if(locationPicture != null)
{ {