From 5c124121fb2a9d7dab5baeb5afa0b92e64b33a51 Mon Sep 17 00:00:00 2001 From: tokugawa Date: Sat, 26 Apr 2014 11:05:06 -0400 Subject: [PATCH] Updated padding and removed settings menu. --- UNCCScavenger/res/layout/activity_found.xml | 1 + UNCCScavenger/res/layout/activity_search.xml | 2 ++ UNCCScavenger/res/menu/compass.xml | 5 ----- UNCCScavenger/res/menu/found.xml | 6 ------ UNCCScavenger/res/menu/main.xml | 6 ------ UNCCScavenger/res/menu/search.xml | 6 ------ .../src/edu/uncc/scavenger/CompassActivity.java | 11 ----------- .../src/edu/uncc/scavenger/FoundActivity.java | 12 ------------ .../src/edu/uncc/scavenger/MainActivity.java | 2 +- .../src/edu/uncc/scavenger/SearchActivity.java | 13 ------------- 10 files changed, 4 insertions(+), 60 deletions(-) diff --git a/UNCCScavenger/res/layout/activity_found.xml b/UNCCScavenger/res/layout/activity_found.xml index e54fef5..e7cd8fd 100644 --- a/UNCCScavenger/res/layout/activity_found.xml +++ b/UNCCScavenger/res/layout/activity_found.xml @@ -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" /> diff --git a/UNCCScavenger/res/layout/activity_search.xml b/UNCCScavenger/res/layout/activity_search.xml index 617823b..c4e7417 100644 --- a/UNCCScavenger/res/layout/activity_search.xml +++ b/UNCCScavenger/res/layout/activity_search.xml @@ -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" /> diff --git a/UNCCScavenger/res/menu/compass.xml b/UNCCScavenger/res/menu/compass.xml index 86c8d22..7247b9e 100644 --- a/UNCCScavenger/res/menu/compass.xml +++ b/UNCCScavenger/res/menu/compass.xml @@ -3,10 +3,5 @@ xmlns:tools="http://schemas.android.com/tools" tools:context="edu.uncc.scavenger.CompassActivity" > - diff --git a/UNCCScavenger/res/menu/found.xml b/UNCCScavenger/res/menu/found.xml index 1799d64..8606f2f 100644 --- a/UNCCScavenger/res/menu/found.xml +++ b/UNCCScavenger/res/menu/found.xml @@ -3,10 +3,4 @@ xmlns:tools="http://schemas.android.com/tools" tools:context="edu.uncc.scavenger.FoundActivity" > - - diff --git a/UNCCScavenger/res/menu/main.xml b/UNCCScavenger/res/menu/main.xml index d122a4b..ff2a4a2 100644 --- a/UNCCScavenger/res/menu/main.xml +++ b/UNCCScavenger/res/menu/main.xml @@ -1,9 +1,3 @@ - - diff --git a/UNCCScavenger/res/menu/search.xml b/UNCCScavenger/res/menu/search.xml index f3c65b2..a622322 100644 --- a/UNCCScavenger/res/menu/search.xml +++ b/UNCCScavenger/res/menu/search.xml @@ -3,10 +3,4 @@ xmlns:tools="http://schemas.android.com/tools" tools:context="edu.uncc.scavenger.SearchActivity" > - - diff --git a/UNCCScavenger/src/edu/uncc/scavenger/CompassActivity.java b/UNCCScavenger/src/edu/uncc/scavenger/CompassActivity.java index cfede3d..b2624f6 100644 --- a/UNCCScavenger/src/edu/uncc/scavenger/CompassActivity.java +++ b/UNCCScavenger/src/edu/uncc/scavenger/CompassActivity.java @@ -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) diff --git a/UNCCScavenger/src/edu/uncc/scavenger/FoundActivity.java b/UNCCScavenger/src/edu/uncc/scavenger/FoundActivity.java index dc75fe7..f45d065 100644 --- a/UNCCScavenger/src/edu/uncc/scavenger/FoundActivity.java +++ b/UNCCScavenger/src/edu/uncc/scavenger/FoundActivity.java @@ -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); - } } diff --git a/UNCCScavenger/src/edu/uncc/scavenger/MainActivity.java b/UNCCScavenger/src/edu/uncc/scavenger/MainActivity.java index 1a3f1d4..80a838e 100644 --- a/UNCCScavenger/src/edu/uncc/scavenger/MainActivity.java +++ b/UNCCScavenger/src/edu/uncc/scavenger/MainActivity.java @@ -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 diff --git a/UNCCScavenger/src/edu/uncc/scavenger/SearchActivity.java b/UNCCScavenger/src/edu/uncc/scavenger/SearchActivity.java index 8ccad34..b19be74 100644 --- a/UNCCScavenger/src/edu/uncc/scavenger/SearchActivity.java +++ b/UNCCScavenger/src/edu/uncc/scavenger/SearchActivity.java @@ -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) {