From 3dbc44e9c28eee74603416cee1c9fad4c89fe66c Mon Sep 17 00:00:00 2001
From: Emux <devemux86@gmail.com>
Date: Mon, 27 Feb 2017 21:35:38 +0200
Subject: [PATCH] Use Osmagray theme in samples #300

---
 docs/Changelog.md                                 |  1 +
 vtm-android-example/res/menu/theme_menu.xml       |  9 ++++++---
 vtm-android-example/res/values/strings.xml        |  3 ++-
 .../org/oscim/android/test/BaseMapActivity.java   | 15 ++++++++++-----
 .../oscim/android/test/MapsforgeMapActivity.java  | 15 ++++++++++-----
 vtm-gdx/src/org/oscim/gdx/InputHandler.java       |  9 +++++++--
 6 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index d44ae2ee..a37832ad 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -3,6 +3,7 @@
 ## New since 0.7.0
 
 - Symbol rotation [#294](https://github.com/mapsforge/vtm/issues/294)
+- Osmagray theme [#300](https://github.com/mapsforge/vtm/issues/300)
 - Many other minor improvements and bug fixes
 - [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.8.0)
 
diff --git a/vtm-android-example/res/menu/theme_menu.xml b/vtm-android-example/res/menu/theme_menu.xml
index a4d9fa05..fb2b8dfb 100644
--- a/vtm-android-example/res/menu/theme_menu.xml
+++ b/vtm-android-example/res/menu/theme_menu.xml
@@ -8,12 +8,15 @@
             android:id="@+id/theme_default"
             android:checked="true"
             android:title="@string/theme_default" />
-        <item
-            android:id="@+id/theme_tubes"
-            android:title="@string/theme_tubes" />
         <item
             android:id="@+id/theme_osmarender"
             android:title="@string/theme_osmarender" />
+        <item
+            android:id="@+id/theme_osmagray"
+            android:title="@string/theme_osmagray" />
+        <item
+            android:id="@+id/theme_tubes"
+            android:title="@string/theme_tubes" />
         <item
             android:id="@+id/theme_newtron"
             android:title="@string/theme_newtron" />
diff --git a/vtm-android-example/res/values/strings.xml b/vtm-android-example/res/values/strings.xml
index 80db8c4a..929f5a52 100644
--- a/vtm-android-example/res/values/strings.xml
+++ b/vtm-android-example/res/values/strings.xml
@@ -2,8 +2,9 @@
 
     <string name="app_name">VTM Samples</string>
     <string name="theme_default">Default</string>
-    <string name="theme_tubes">Tubes</string>
     <string name="theme_osmarender">Osmarender</string>
+    <string name="theme_osmagray">Osmagray</string>
+    <string name="theme_tubes">Tubes</string>
     <string name="theme_newtron">NewTron</string>
     <string name="ok">OK</string>
     <string name="cancel">Cancel</string>
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 b56dbf78..0efc2636 100644
--- a/vtm-android-example/src/org/oscim/android/test/BaseMapActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/BaseMapActivity.java
@@ -1,6 +1,6 @@
 /*
  * Copyright 2013 Hannes Janetzek
- * Copyright 2016 devemux86
+ * Copyright 2016-2017 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -86,13 +86,18 @@ public class BaseMapActivity extends MapActivity {
                 item.setChecked(true);
                 return true;
 
-            case R.id.theme_tubes:
-                mMap.setTheme(VtmThemes.TRONRENDER);
+            case R.id.theme_osmarender:
+                mMap.setTheme(VtmThemes.OSMARENDER);
                 item.setChecked(true);
                 return true;
 
-            case R.id.theme_osmarender:
-                mMap.setTheme(VtmThemes.OSMARENDER);
+            case R.id.theme_osmagray:
+                mMap.setTheme(VtmThemes.OSMAGRAY);
+                item.setChecked(true);
+                return true;
+
+            case R.id.theme_tubes:
+                mMap.setTheme(VtmThemes.TRONRENDER);
                 item.setChecked(true);
                 return true;
 
diff --git a/vtm-android-example/src/org/oscim/android/test/MapsforgeMapActivity.java b/vtm-android-example/src/org/oscim/android/test/MapsforgeMapActivity.java
index 4d01cfd9..5f102a5d 100644
--- a/vtm-android-example/src/org/oscim/android/test/MapsforgeMapActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/MapsforgeMapActivity.java
@@ -1,6 +1,6 @@
 /*
  * Copyright 2014 Hannes Janetzek
- * Copyright 2016 devemux86
+ * Copyright 2016-2017 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -70,13 +70,18 @@ public class MapsforgeMapActivity extends MapActivity {
                 item.setChecked(true);
                 return true;
 
-            case R.id.theme_tubes:
-                mMap.setTheme(VtmThemes.TRONRENDER);
+            case R.id.theme_osmarender:
+                mMap.setTheme(VtmThemes.OSMARENDER);
                 item.setChecked(true);
                 return true;
 
-            case R.id.theme_osmarender:
-                mMap.setTheme(VtmThemes.OSMARENDER);
+            case R.id.theme_osmagray:
+                mMap.setTheme(VtmThemes.OSMAGRAY);
+                item.setChecked(true);
+                return true;
+
+            case R.id.theme_tubes:
+                mMap.setTheme(VtmThemes.TRONRENDER);
                 item.setChecked(true);
                 return true;
 
diff --git a/vtm-gdx/src/org/oscim/gdx/InputHandler.java b/vtm-gdx/src/org/oscim/gdx/InputHandler.java
index 878de583..7e20de9d 100644
--- a/vtm-gdx/src/org/oscim/gdx/InputHandler.java
+++ b/vtm-gdx/src/org/oscim/gdx/InputHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 devemux86
+ * Copyright 2016-2017 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -115,11 +115,16 @@ public class InputHandler implements InputProcessor {
                 break;
 
             case Input.Keys.NUM_3:
-                mMap.setTheme(VtmThemes.TRONRENDER);
+                mMap.setTheme(VtmThemes.OSMAGRAY);
                 mMap.updateMap(false);
                 break;
 
             case Input.Keys.NUM_4:
+                mMap.setTheme(VtmThemes.TRONRENDER);
+                mMap.updateMap(false);
+                break;
+
+            case Input.Keys.NUM_5:
                 mMap.setTheme(VtmThemes.NEWTRON);
                 mMap.updateMap(false);
                 break;