RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[Android] Fixed theme switching on the map

Browse source
This commit is contained in:
r.kuznetsov 2017-08-15 11:17:27 +03:00 • committed by Vladimir Byko-Ianko
parent 5d0563b29b
commit e86e1922f6
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
android/src/com/mapswithme/util/ThemeSwitcher.java
View file

@ -91,9 +91,7 @@ public final class ThemeSwitcher
if (!newTheme.equals(oldTheme))
{
// Activity and drape engine will be recreated so we have to mark new map style.
// Changes will be applied in process of recreation.
Framework.nativeMarkMapStyle(style);
SetMapStyle(style);
DownloaderStatusIcon.clearCache();
@ -107,11 +105,17 @@ public final class ThemeSwitcher
int currentStyle = Framework.nativeGetMapStyle();
if (currentStyle == style)
return;
if (sRendererActive)
Framework.nativeSetMapStyle(style);
else
Framework.nativeMarkMapStyle(style);
SetMapStyle(style);
}
}
private static void SetMapStyle(@Framework.MapStyle int style)
{
// If rendering is not active we can mark map style, because all graphics
// will be recreated after rendering activation.
if (sRendererActive)
Framework.nativeSetMapStyle(style);
else
Framework.nativeMarkMapStyle(style);
}
}