xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

theme: add Newtron

Browse Source 
- fix: VtmThemes enum
This commit is contained in:
Hannes Janetzek 2014-03-10 01:43:18 +01:00
parent 968d97f440
commit 6188baa4db
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vtm-android-example/res/menu/theme_menu.xml
View File

@ -4,7 +4,6 @@
<item android:id="@+id/theme_default" android:checkable="true" android:title="@string/theme_default" android:checked="true" android:showAsAction="never"></item>
<item android:id="@+id/theme_tubes" android:checkable="true" android:title="@string/theme_tubes" android:showAsAction="never"></item>
<item android:id="@+id/theme_osmarender" android:checkable="true" android:title="@string/theme_osmarender" android:showAsAction="never"></item>
</group>
<item android:id="@+id/theme_newtron" android:checkable="true" android:title="@string/theme_newtron" android:showAsAction="never"></item>
</group>
</menu>

1
vtm-android-example/res/values/strings.xml
View File

@ -6,6 +6,7 @@
<string name="theme_default">Default</string>
<string name="theme_tubes">Tubes</string>
<string name="theme_osmarender">Osmarender</string>
<string name="theme_newtron">NewTron</string>
<string name="ok">OK</string>
<string name="cancel">Cancel</string>
<string name="error">Error</string>

5
vtm-android-example/src/org/oscim/android/test/SimpleMapActivity.java
View File

@ -68,6 +68,11 @@ public class SimpleMapActivity extends BaseMapActivity {
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;

10
vtm-gdx-ios/src/org/oscim/ios/RobovmLauncher.java
View File

@ -26,19 +26,17 @@ public class RobovmLauncher extends IOSApplication.Delegate {
config.orientationPortrait = true;
config.stencilFormat = GLKViewDrawableStencilFormat.Format8;
return new IOSApplication(new GdxMap() {
@Override
public void createLayers() {
TileSource tileSource = new OSciMap4TileSource();
//initDefaultLayers(tileSource, false,true, false);
VectorTileLayer l = mMap.setBaseMap(tileSource);
//initDefaultLayers(tileSource, false,true, false);
VectorTileLayer l = mMap.setBaseMap(tileSource);
mMap.setTheme(VtmThemes.NEWTRON);
mMap.layers().add(new BuildingLayer(mMap, l));
mMap.layers().add(new LabelLayer(mMap, l));
// mMap.getLayers().add(new GenericLayer(mMap, new
// GridRenderer(1,new Line(Color.LTGRAY, 1.2f),null)));
@ -54,7 +52,7 @@ public class RobovmLauncher extends IOSApplication.Delegate {
System.setProperty(org.slf4j.impl.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "TRACE");
CanvasAdapter.g = IosGraphics.get();
GLAdapter.g = new IosGLAdapter();
UIApplication.main(argv, null, RobovmLauncher.class);
pool.drain();
}

1
vtm-themes/src/org/oscim/theme/VtmThemes.java
View File

@ -40,6 +40,5 @@ public enum VtmThemes implements ThemeFile {
@Override
public InputStream getRenderThemeAsStream() {
return AssetAdapter.g.openFileAsStream(mPath);
//InternalRenderTheme.class.getResourceAsStream(mPath);
}
}