mirror-github-bspeice/itcs4180
1
0
Fork 0
mirror of https://github.com/bspeice/itcs4180 synced 2024-12-04 13:18:16 -05:00
Code Issues Releases Wiki Activity

Fixed contexts.

Browse Source
This commit is contained in:
tokugawa 2014-04-21 14:51:10 -04:00
parent a9e13e3826
commit c4a3799243
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UNCCScavenger/src/edu/uncc/scavenger/CompassActivity.java
View File

@ -60,7 +60,7 @@ public class CompassActivity extends Activity implements SensorEventListener
compassRoseView = (ImageView)findViewById(R.id.compassRoseView); compassRoseView = (ImageView)findViewById(R.id.compassRoseView);
searchImageView = (ImageView)findViewById(R.id.searchImageView); searchImageView = (ImageView)findViewById(R.id.searchImageView);
searchImageView.setVisibility(View.INVISIBLE); searchImageView.setVisibility(View.INVISIBLE);
Bitmap b = BitmapAccess.loadBitmap(getApplicationContext(), restLocation.getName()); Bitmap b = BitmapAccess.loadBitmap(this, restLocation.getName());
if(b != null) if(b != null)
{ {
searchImageView.setImageBitmap(b); searchImageView.setImageBitmap(b);
@ -94,7 +94,7 @@ public class CompassActivity extends Activity implements SensorEventListener
} }
}); });
Toast.makeText(getApplicationContext(), ""+searchLocation.getLatitude()+", "+searchLocation.getLongitude(), Toast.LENGTH_SHORT).show(); Toast.makeText(this, ""+searchLocation.getLatitude()+", "+searchLocation.getLongitude(), Toast.LENGTH_SHORT).show();
} }
@Override @Override

2
UNCCScavenger/src/edu/uncc/scavenger/FoundActivity.java
View File

@ -46,7 +46,7 @@ public class FoundActivity extends Activity {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
intent = new Intent(getApplicationContext(), MainActivity.class); intent = new Intent(FoundActivity.this, MainActivity.class);
startActivity(intent); startActivity(intent);
finish(); finish();
} }

3
UNCCScavenger/src/edu/uncc/scavenger/MainActivity.java
View File

@ -64,7 +64,7 @@ public class MainActivity extends Activity {
@Override @Override
public void onItemClick(AdapterView<?> parent, View view,int position, long id) { public void onItemClick(AdapterView<?> parent, View view,int position, long id) {
Intent intent = new Intent(getApplicationContext(), SearchActivity.class); Intent intent = new Intent(MainActivity.this, SearchActivity.class);
intent.putExtra("restLocation", locations.get(position)); intent.putExtra("restLocation", locations.get(position));
startActivity(intent); startActivity(intent);
} }
@ -94,6 +94,7 @@ public class MainActivity extends Activity {
// And we're even kind enough to update the database // And we're even kind enough to update the database
LocationDatabaseHelper.getInstance(MainActivity.this).persistAll(result); LocationDatabaseHelper.getInstance(MainActivity.this).persistAll(result);
locations = LocationDatabaseHelper.getInstance(getBaseContext()).fetchAll();
} }
}.execute(); }.execute();

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

@ -101,7 +101,7 @@ public class SearchActivity extends Activity {
if(lm.isProviderEnabled(LocationManager.GPS_PROVIDER)) if(lm.isProviderEnabled(LocationManager.GPS_PROVIDER))
{ {
intent = new Intent(getApplicationContext(), CompassActivity.class); intent = new Intent(SearchActivity.this, CompassActivity.class);
intent.putExtra("restLocation", restLocation); intent.putExtra("restLocation", restLocation);
startActivity(intent); startActivity(intent);
} }
@ -131,7 +131,7 @@ public class SearchActivity extends Activity {
}); });
Toast.makeText(getApplicationContext(), restLocation.getRiddleImageUrl(), Toast.LENGTH_SHORT).show(); Toast.makeText(getApplicationContext(), restLocation.getRiddleImageUrl(), Toast.LENGTH_SHORT).show();
Bitmap locationPicture = BitmapAccess.loadBitmap(getApplicationContext(), restLocation.getName()); Bitmap locationPicture = BitmapAccess.loadBitmap(this, restLocation.getName());
if(locationPicture != null) if(locationPicture != null)
{ {
locationImage.setImageBitmap(locationPicture); locationImage.setImageBitmap(locationPicture);
@ -171,18 +171,18 @@ public class SearchActivity extends Activity {
String contents = data.getStringExtra("SCAN_RESULT"); String contents = data.getStringExtra("SCAN_RESULT");
if(contents.equals(restLocation.getName())) if(contents.equals(restLocation.getName()))
{ {
intent = new Intent(getApplicationContext(), FoundActivity.class); intent = new Intent(SearchActivity.this, FoundActivity.class);
startActivity(intent); startActivity(intent);
finish(); finish();
} }
else else
{ {
Toast.makeText(getApplicationContext(), "Incorrect place found: "+contents, Toast.LENGTH_SHORT).show(); Toast.makeText(SearchActivity.this, "Incorrect place found: "+contents, Toast.LENGTH_SHORT).show();
} }
} }
else if (resultCode == RESULT_CANCELED) else if (resultCode == RESULT_CANCELED)
{ {
Toast.makeText(getApplicationContext(), "Error scanning code", Toast.LENGTH_SHORT).show(); Toast.makeText(SearchActivity.this, "Error scanning code", Toast.LENGTH_SHORT).show();
} }
} }
} }
@ -209,7 +209,7 @@ public class SearchActivity extends Activity {
if(result!=null) if(result!=null)
{ {
locationImage.setImageBitmap(result); locationImage.setImageBitmap(result);
BitmapAccess.saveBitmap(getApplicationContext(), result, restLocation.getName()); BitmapAccess.saveBitmap(SearchActivity.this, result, restLocation.getName());
} }
} }
} }