Mapsforge themes compatibility improvements #100 (#802)

vtm-android/src/org/oscim/android/theme/AssetsRenderTheme.java

@@ -1,6 +1,6 @@
 /*
  * Copyright 2010, 2011, 2012 mapsforge.org
- * Copyright 2016-2017 devemux86
+ * Copyright 2016-2021 devemux86
  * Copyright 2017 Andrey Novikov
  *
  * This program is free software: you can redistribute it and/or modify it under the
@@ -18,10 +18,8 @@ package org.oscim.android.theme;
 
 import android.content.res.AssetManager;
 import android.text.TextUtils;
-
 import org.oscim.theme.IRenderTheme.ThemeException;
 import org.oscim.theme.ThemeFile;
-import org.oscim.theme.ThemeUtils;
 import org.oscim.theme.XmlRenderThemeMenuCallback;
 import org.oscim.utils.Utils;
 
@@ -37,6 +35,7 @@ public class AssetsRenderTheme implements ThemeFile {
 
     private final AssetManager mAssetManager;
     private final String mFileName;
+    private boolean mMapsforgeTheme;
     private XmlRenderThemeMenuCallback mMenuCallback;
     private final String mRelativePathPrefix;
 
@@ -102,7 +101,12 @@ public class AssetsRenderTheme implements ThemeFile {
 
     @Override
     public boolean isMapsforgeTheme() {
-        return ThemeUtils.isMapsforgeTheme(this);
+        return mMapsforgeTheme;
+    }
+
+    @Override
+    public void setMapsforgeTheme(boolean mapsforgeTheme) {
+        mMapsforgeTheme = mapsforgeTheme;
     }
 
     @Override

vtm-android/src/org/oscim/android/theme/ContentRenderTheme.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 devemux86
+ * Copyright 2020-2021 devemux86
  *
  * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free Software
@@ -18,7 +18,6 @@ import android.content.ContentResolver;
 import android.net.Uri;
 import org.oscim.theme.IRenderTheme.ThemeException;
 import org.oscim.theme.ThemeFile;
-import org.oscim.theme.ThemeUtils;
 import org.oscim.theme.XmlRenderThemeMenuCallback;
 import org.oscim.utils.Utils;
 
@@ -33,6 +32,7 @@ public class ContentRenderTheme implements ThemeFile {
     private static final long serialVersionUID = 1L;
 
     private final ContentResolver mContentResolver;
+    private boolean mMapsforgeTheme;
     private XmlRenderThemeMenuCallback mMenuCallback;
     private final String mRelativePathPrefix;
     private final Uri mUri;
@@ -99,7 +99,12 @@ public class ContentRenderTheme implements ThemeFile {
 
     @Override
     public boolean isMapsforgeTheme() {
-        return ThemeUtils.isMapsforgeTheme(this);
+        return mMapsforgeTheme;
+    }
+
+    @Override
+    public void setMapsforgeTheme(boolean mapsforgeTheme) {
+        mMapsforgeTheme = mapsforgeTheme;
     }
 
     @Override