example: move theme menu to base

This commit is contained in:
Hannes Janetzek 2014-03-10 22:55:06 +01:00
parent 192bd9c96c
commit e7ad7110c8
2 changed files with 31 additions and 37 deletions

View File

@ -20,11 +20,13 @@ import org.oscim.android.MapActivity;
import org.oscim.android.MapView; import org.oscim.android.MapView;
import org.oscim.android.cache.TileCache; import org.oscim.android.cache.TileCache;
import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.theme.VtmThemes;
import org.oscim.tiling.TileSource; import org.oscim.tiling.TileSource;
import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
import android.os.Bundle; import android.os.Bundle;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem;
public class BaseMapActivity extends MapActivity { public class BaseMapActivity extends MapActivity {
@ -62,9 +64,37 @@ public class BaseMapActivity extends MapActivity {
mCache.dispose(); mCache.dispose();
} }
@Override
public boolean onMenuItemSelected(int featureId, MenuItem item) {
switch (item.getItemId()) {
case R.id.theme_default:
mMap.setTheme(VtmThemes.DEFAULT);
item.setChecked(true);
return true;
case R.id.theme_tubes:
mMap.setTheme(VtmThemes.TRONRENDER);
item.setChecked(true);
return true;
case R.id.theme_osmarender:
mMap.setTheme(VtmThemes.OSMARENDER);
item.setChecked(true);
return true;
case R.id.theme_newtron:
mMap.setTheme(VtmThemes.NEWTRON);
item.setChecked(true);
return true;
}
return false;
}
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.activity_map, menu); getMenuInflater().inflate(R.menu.theme_menu, menu);
return true; return true;
} }
} }

View File

@ -21,8 +21,6 @@ import org.oscim.map.Layers;
import org.oscim.theme.VtmThemes; import org.oscim.theme.VtmThemes;
import android.os.Bundle; import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
public class SimpleMapActivity extends BaseMapActivity { public class SimpleMapActivity extends BaseMapActivity {
@ -44,40 +42,6 @@ public class SimpleMapActivity extends BaseMapActivity {
mMap.setMapPosition(53.08, 8.83, Math.pow(2, 10)); mMap.setMapPosition(53.08, 8.83, Math.pow(2, 10));
} }
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.theme_menu, menu);
return true;
}
@Override
public boolean onMenuItemSelected(int featureId, MenuItem item) {
switch (item.getItemId()) {
case R.id.theme_default:
mMap.setTheme(VtmThemes.DEFAULT);
item.setChecked(true);
return true;
case R.id.theme_tubes:
mMap.setTheme(VtmThemes.TRONRENDER);
item.setChecked(true);
return true;
case R.id.theme_osmarender:
mMap.setTheme(VtmThemes.OSMARENDER);
item.setChecked(true);
return true;
case R.id.theme_newtron:
mMap.setTheme(VtmThemes.NEWTRON);
item.setChecked(true);
return true;
}
return false;
}
// Stress testing // Stress testing
void loooop(final int i) { void loooop(final int i) {
mMapView.postDelayed(new Runnable() { mMapView.postDelayed(new Runnable() {