From e7ad7110c87a2d98111bb992c3604c4bda7220ca Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Mon, 10 Mar 2014 22:55:06 +0100
Subject: [PATCH] example: move theme menu to base
---
.../oscim/android/test/BaseMapActivity.java | 32 ++++++++++++++++-
.../oscim/android/test/SimpleMapActivity.java | 36 -------------------
2 files changed, 31 insertions(+), 37 deletions(-)
diff --git a/vtm-android-example/src/org/oscim/android/test/BaseMapActivity.java b/vtm-android-example/src/org/oscim/android/test/BaseMapActivity.java
index 45ede080..b10ce96b 100644
--- a/vtm-android-example/src/org/oscim/android/test/BaseMapActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/BaseMapActivity.java
@@ -20,11 +20,13 @@ import org.oscim.android.MapActivity;
import org.oscim.android.MapView;
import org.oscim.android.cache.TileCache;
import org.oscim.layers.tile.vector.VectorTileLayer;
+import org.oscim.theme.VtmThemes;
import org.oscim.tiling.TileSource;
import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
import android.os.Bundle;
import android.view.Menu;
+import android.view.MenuItem;
public class BaseMapActivity extends MapActivity {
@@ -62,9 +64,37 @@ public class BaseMapActivity extends MapActivity {
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
public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.activity_map, menu);
+ getMenuInflater().inflate(R.menu.theme_menu, menu);
return true;
}
}
diff --git a/vtm-android-example/src/org/oscim/android/test/SimpleMapActivity.java b/vtm-android-example/src/org/oscim/android/test/SimpleMapActivity.java
index acdc0938..1ded0011 100644
--- a/vtm-android-example/src/org/oscim/android/test/SimpleMapActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/SimpleMapActivity.java
@@ -21,8 +21,6 @@ import org.oscim.map.Layers;
import org.oscim.theme.VtmThemes;
import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
public class SimpleMapActivity extends BaseMapActivity {
@@ -44,40 +42,6 @@ public class SimpleMapActivity extends BaseMapActivity {
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
void loooop(final int i) {
mMapView.postDelayed(new Runnable() {