mirror-github-bspeice/itcs4180
1
0
Fork 0
mirror of https://github.com/bspeice/itcs4180 synced 2025-11-03 18:00:37 -05:00
Code Issues Releases Wiki Activity

Updated padding and removed settings menu.

Browse Source
This commit is contained in:
tokugawa
2014-04-26 11:05:06 -04:00
parent 31945d66b6
commit 5c124121fb
10 changed files with 4 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
UNCCScavenger/res/layout/activity_found.xml
View File

@ -12,6 +12,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="5dp"
android:text="@string/found_text"
android:textAppearance="?android:attr/textAppearanceLarge" />

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

@ -18,6 +18,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="5dp"
android:text="@string/default_text" />
<ImageView
@ -32,6 +33,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="5dp"
android:text="@string/default_text" />
</LinearLayout>

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

@ -3,10 +3,5 @@
xmlns:tools="http://schemas.android.com/tools"
tools:context="edu.uncc.scavenger.CompassActivity" >
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
android:title="@string/action_settings"
android:showAsAction="never"/>
</menu>

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

@ -3,10 +3,4 @@
xmlns:tools="http://schemas.android.com/tools"
tools:context="edu.uncc.scavenger.FoundActivity" >
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
android:title="@string/action_settings"
android:showAsAction="never"/>
</menu>

6
UNCCScavenger/res/menu/main.xml
View File

@ -1,9 +1,3 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
android:showAsAction="never"
android:title="@string/action_settings"/>
</menu>

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

@ -3,10 +3,4 @@
xmlns:tools="http://schemas.android.com/tools"
tools:context="edu.uncc.scavenger.SearchActivity" >
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
android:title="@string/action_settings"
android:showAsAction="never"/>
</menu>

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

@ -124,17 +124,6 @@ public class CompassActivity extends Activity implements SensorEventListener
return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// Handle action bar item clicks here. The action bar will
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
int id = item.getItemId();
if (id == R.id.action_settings) {
return true;
}
return super.onOptionsItemSelected(item);
}
@Override
public void onSensorChanged(SensorEvent event)

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

@ -59,16 +59,4 @@ public class FoundActivity extends Activity {
getMenuInflater().inflate(R.menu.found, menu);
return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// Handle action bar item clicks here. The action bar will
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
int id = item.getItemId();
if (id == R.id.action_settings) {
return true;
}
return super.onOptionsItemSelected(item);
}
}

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

@ -74,7 +74,7 @@ public class MainActivity extends Activity {
// We don't yet have any locations...
((TextView)findViewById(R.id.txtNoLocations)).setVisibility(View.VISIBLE);
((ListView)findViewById(R.id.listLocations)).setVisibility(View.GONE);
//Log.d("NoLocation", "NoLocations");
//Log.d("Location", "NoLocations");
}
// And kick off contacting to server to see if there are any new ones

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

@ -133,7 +133,6 @@ public class SearchActivity extends Activity {
}
});
//Toast.makeText(getApplicationContext(), restLocation.getRiddleImageUrl(), Toast.LENGTH_SHORT).show();
Bitmap locationPicture = BitmapAccess.loadBitmap(this, restLocation.getName());
if(locationPicture != null)
{
@ -152,18 +151,6 @@ public class SearchActivity extends Activity {
getMenuInflater().inflate(R.menu.search, menu);
return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// Handle action bar item clicks here. The action bar will
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
int id = item.getItemId();
if (id == R.id.action_settings) {
return true;
}
return super.onOptionsItemSelected(item);
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {