diff --git a/android/jni/app/organicmaps/util/Config.cpp b/android/jni/app/organicmaps/util/Config.cpp index 6c92610c20..e754985f77 100644 --- a/android/jni/app/organicmaps/util/Config.cpp +++ b/android/jni/app/organicmaps/util/Config.cpp @@ -94,7 +94,6 @@ extern "C" Java_app_organicmaps_util_Config_nativeSetLargeFontsSize(JNIEnv * env, jclass thiz, jboolean value) { - frm()->SaveLargeFontsSize(value); frm()->SetLargeFontsSize(value); } diff --git a/iphone/Maps/Core/Settings/MWMSettings.mm b/iphone/Maps/Core/Settings/MWMSettings.mm index 2637a477b1..d999bf3289 100644 --- a/iphone/Maps/Core/Settings/MWMSettings.mm +++ b/iphone/Maps/Core/Settings/MWMSettings.mm @@ -122,10 +122,7 @@ NSString * const kUDTrackWarningAlertWasShown = @"TrackWarningAlertWasShown"; + (BOOL)largeFontSize { return GetFramework().LoadLargeFontsSize(); } + (void)setLargeFontSize:(BOOL)largeFontSize { - bool const isLargeSize = static_cast(largeFontSize); - auto & f = GetFramework(); - f.SaveLargeFontsSize(isLargeSize); - f.SetLargeFontsSize(isLargeSize); + GetFramework().SetLargeFontsSize(static_cast(largeFontSize)); } + (BOOL)transliteration { return GetFramework().LoadTransliteration(); } diff --git a/map/framework.cpp b/map/framework.cpp index e0e622c1f8..8ad2c45d99 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -2437,11 +2437,6 @@ void Framework::Load3dMode(bool & allow3d, bool & allow3dBuildings) allow3dBuildings = true; } -void Framework::SaveLargeFontsSize(bool isLargeSize) -{ - settings::Set(kLargeFontsSize, isLargeSize); -} - bool Framework::LoadLargeFontsSize() { bool isLargeSize; @@ -2452,6 +2447,8 @@ bool Framework::LoadLargeFontsSize() void Framework::SetLargeFontsSize(bool isLargeSize) { + settings::Set(kLargeFontsSize, isLargeSize); + double const scaleFactor = isLargeSize ? kLargeFontsScaleFactor : 1.0; ASSERT(m_drapeEngine.get() != nullptr, ()); diff --git a/map/framework.hpp b/map/framework.hpp index 00f6fb8877..62b963dc55 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -657,7 +657,6 @@ public: void Load3dMode(bool & allow3d, bool & allow3dBuildings); void SetLargeFontsSize(bool isLargeSize); - void SaveLargeFontsSize(bool isLargeSize); bool LoadLargeFontsSize(); bool LoadAutoZoom();