mirror of
https://github.com/bspeice/itcs4180
synced 2024-11-16 12:28:15 -05:00
Updated padding and removed settings menu.
This commit is contained in:
parent
31945d66b6
commit
5c124121fb
@ -12,6 +12,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_gravity="center_horizontal"
|
||||||
|
android:layout_margin="5dp"
|
||||||
android:text="@string/found_text"
|
android:text="@string/found_text"
|
||||||
android:textAppearance="?android:attr/textAppearanceLarge" />
|
android:textAppearance="?android:attr/textAppearanceLarge" />
|
||||||
|
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_gravity="center_horizontal"
|
||||||
|
android:layout_margin="5dp"
|
||||||
android:text="@string/default_text" />
|
android:text="@string/default_text" />
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
@ -32,6 +33,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_gravity="center_horizontal"
|
||||||
|
android:layout_margin="5dp"
|
||||||
android:text="@string/default_text" />
|
android:text="@string/default_text" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
@ -3,10 +3,5 @@
|
|||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
tools:context="edu.uncc.scavenger.CompassActivity" >
|
tools:context="edu.uncc.scavenger.CompassActivity" >
|
||||||
|
|
||||||
<item
|
|
||||||
android:id="@+id/action_settings"
|
|
||||||
android:orderInCategory="100"
|
|
||||||
android:title="@string/action_settings"
|
|
||||||
android:showAsAction="never"/>
|
|
||||||
|
|
||||||
</menu>
|
</menu>
|
||||||
|
@ -3,10 +3,4 @@
|
|||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
tools:context="edu.uncc.scavenger.FoundActivity" >
|
tools:context="edu.uncc.scavenger.FoundActivity" >
|
||||||
|
|
||||||
<item
|
|
||||||
android:id="@+id/action_settings"
|
|
||||||
android:orderInCategory="100"
|
|
||||||
android:title="@string/action_settings"
|
|
||||||
android:showAsAction="never"/>
|
|
||||||
|
|
||||||
</menu>
|
</menu>
|
||||||
|
@ -1,9 +1,3 @@
|
|||||||
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
|
<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>
|
</menu>
|
||||||
|
@ -3,10 +3,4 @@
|
|||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
tools:context="edu.uncc.scavenger.SearchActivity" >
|
tools:context="edu.uncc.scavenger.SearchActivity" >
|
||||||
|
|
||||||
<item
|
|
||||||
android:id="@+id/action_settings"
|
|
||||||
android:orderInCategory="100"
|
|
||||||
android:title="@string/action_settings"
|
|
||||||
android:showAsAction="never"/>
|
|
||||||
|
|
||||||
</menu>
|
</menu>
|
||||||
|
@ -124,17 +124,6 @@ public class CompassActivity extends Activity implements SensorEventListener
|
|||||||
return true;
|
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
|
@Override
|
||||||
public void onSensorChanged(SensorEvent event)
|
public void onSensorChanged(SensorEvent event)
|
||||||
|
@ -59,16 +59,4 @@ public class FoundActivity extends Activity {
|
|||||||
getMenuInflater().inflate(R.menu.found, menu);
|
getMenuInflater().inflate(R.menu.found, menu);
|
||||||
return true;
|
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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -74,7 +74,7 @@ public class MainActivity extends Activity {
|
|||||||
// We don't yet have any locations...
|
// We don't yet have any locations...
|
||||||
((TextView)findViewById(R.id.txtNoLocations)).setVisibility(View.VISIBLE);
|
((TextView)findViewById(R.id.txtNoLocations)).setVisibility(View.VISIBLE);
|
||||||
((ListView)findViewById(R.id.listLocations)).setVisibility(View.GONE);
|
((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
|
// And kick off contacting to server to see if there are any new ones
|
||||||
|
@ -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());
|
Bitmap locationPicture = BitmapAccess.loadBitmap(this, restLocation.getName());
|
||||||
if(locationPicture != null)
|
if(locationPicture != null)
|
||||||
{
|
{
|
||||||
@ -153,18 +152,6 @@ public class SearchActivity extends Activity {
|
|||||||
return true;
|
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
|
@Override
|
||||||
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||||
super.onActivityResult(requestCode, resultCode, data);
|
super.onActivityResult(requestCode, resultCode, data);
|
||||||
|
Loading…
Reference in New Issue
Block a user