Dark and Indigo map themes, #1229 (#1230)

Author: devemux86

docs/Changelog.md

@@ -3,6 +3,7 @@
 ## Next version
 
 - `ThemeCallback.getText` method [#1225](https://github.com/mapsforge/vtm/pull/1225)
+- Dark and Indigo map themes [#1229](https://github.com/mapsforge/vtm/issues/1229)
 - Motorider map theme improvements [#1183](https://github.com/mapsforge/vtm/issues/1183)
 - Biker map theme improvements [#1192](https://github.com/mapsforge/vtm/issues/1192)
 - Minor improvements and bug fixes

vtm-android-example/res/menu/theme_menu.xml

@@ -11,6 +11,12 @@
         <item
             android:id="@+id/theme_biker"
             android:title="@string/theme_biker" />
+        <item
+            android:id="@+id/theme_dark"
+            android:title="@string/theme_dark" />
+        <item
+            android:id="@+id/theme_indigo"
+            android:title="@string/theme_indigo" />
         <item
             android:id="@+id/theme_default"
             android:title="@string/theme_default" />

vtm-android-example/res/values/strings.xml

@@ -3,6 +3,8 @@
     <string name="app_name">VTM Samples</string>
     <string name="theme_motorider">Motorider</string>
     <string name="theme_biker">Biker</string>
+    <string name="theme_dark">Dark</string>
+    <string name="theme_indigo">Indigo</string>
     <string name="theme_default">Default</string>
     <string name="theme_osmarender">Osmarender</string>
     <string name="theme_external">External theme (Android 5)</string>

vtm-android-example/src/org/oscim/android/test/BaseMapActivity.java

@@ -84,6 +84,14 @@ public boolean onOptionsItemSelected(MenuItem item) {
             mMap.setTheme(VtmThemes.BIKER);
             item.setChecked(true);
             return true;
+        } else if (itemId == R.id.theme_dark) {
+            mMap.setTheme(VtmThemes.DARK);
+            item.setChecked(true);
+            return true;
+        } else if (itemId == R.id.theme_indigo) {
+            mMap.setTheme(VtmThemes.INDIGO);
+            item.setChecked(true);
+            return true;
         } else if (itemId == R.id.theme_default) {
             mMap.setTheme(VtmThemes.DEFAULT);
             item.setChecked(true);

vtm-android-example/src/org/oscim/android/test/MapsforgeActivity.java

@@ -120,6 +120,18 @@ public boolean onOptionsItemSelected(MenuItem item) {
             mTheme = mMap.setTheme(VtmThemes.BIKER);
             item.setChecked(true);
             return true;
+        } else if (itemId == R.id.theme_dark) {
+            if (mTheme != null)
+                mTheme.dispose();
+            mTheme = mMap.setTheme(VtmThemes.DARK);
+            item.setChecked(true);
+            return true;
+        } else if (itemId == R.id.theme_indigo) {
+            if (mTheme != null)
+                mTheme.dispose();
+            mTheme = mMap.setTheme(VtmThemes.INDIGO);
+            item.setChecked(true);
+            return true;
         } else if (itemId == R.id.theme_default) {
             if (mTheme != null)
                 mTheme.dispose();

vtm-gdx/src/org/oscim/gdx/InputHandler.java

@@ -126,21 +126,31 @@ public boolean keyDown(int keycode) {
                 break;
 
             case Input.Keys.NUM_3:
-                mMap.setTheme(VtmThemes.DEFAULT);
+                mMap.setTheme(VtmThemes.DARK);
                 mMap.updateMap(false);
                 break;
 
             case Input.Keys.NUM_4:
-                mMap.setTheme(VtmThemes.OSMARENDER);
+                mMap.setTheme(VtmThemes.INDIGO);
                 mMap.updateMap(false);
                 break;
 
             case Input.Keys.NUM_5:
-                mMap.setTheme(VtmThemes.TRONRENDER);
+                mMap.setTheme(VtmThemes.DEFAULT);
                 mMap.updateMap(false);
                 break;
 
             case Input.Keys.NUM_6:
+                mMap.setTheme(VtmThemes.OSMARENDER);
+                mMap.updateMap(false);
+                break;
+
+            case Input.Keys.NUM_7:
+                mMap.setTheme(VtmThemes.TRONRENDER);
+                mMap.updateMap(false);
+                break;
+
+            case Input.Keys.NUM_8:
                 mMap.setTheme(VtmThemes.NEWTRON);
                 mMap.updateMap(false);
                 break;