From b2370cbb17cef3e933363692e81b788b4b8dce26 Mon Sep 17 00:00:00 2001
From: Maksim <MoNTE48@mail.ua>
Date: Sun, 29 Nov 2020 19:40:04 +0100
Subject: [PATCH] iOS: improve some default settings

---
 .../MultiCraft/SDVersion/SDVersion.h          |  2 ++
 build/iOS/MultiCraft/MultiCraft/ioswrap.m     |  6 +++-
 src/defaultsettings.cpp                       | 30 ++++++++++---------
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/build/iOS/MultiCraft/MultiCraft/SDVersion/SDVersion.h b/build/iOS/MultiCraft/MultiCraft/SDVersion/SDVersion.h
index f9495f2b..ce647b21 100755
--- a/build/iOS/MultiCraft/MultiCraft/SDVersion/SDVersion.h
+++ b/build/iOS/MultiCraft/MultiCraft/SDVersion/SDVersion.h
@@ -209,6 +209,8 @@ typedef NS_ENUM(NSInteger, DeviceVersion){
 
 #define SDVersion7and9Inch	(([SDVersion deviceVersion] == iPadMini2) | ([SDVersion deviceVersion] == iPadMini3) | ([SDVersion deviceVersion] == iPadMini4) | ([SDVersion deviceVersion] == iPadMini5))
 
+#define SDVersioniPhone12Series	(([SDVersion deviceVersion] == iPhone12Mini) | ([SDVersion deviceVersion] == iPhone12Mini) | ([SDVersion deviceVersion] == iPhone12Pro) | ([SDVersion deviceVersion] == iPhone12ProMax))
+
 //#define SDVersion11Inch		(([SDVersion deviceVersion] == iPadPro11Inch) || ([SDVersion deviceVersion] == iPadPro11Inch2Gen) || ([SDVersion deviceVersion] == iPadAir4))
 
 //#define SDVersion12and9Inch	(([SDVersion deviceVersion] == iPadPro12Dot9Inch) || ([SDVersion deviceVersion] == iPadPro12Dot9Inch2Gen) || ([SDVersion deviceVersion] == iPadPro12Dot9Inch3Gen) || ([SDVersion deviceVersion] == iPadPro12Dot9Inch4Gen))
diff --git a/build/iOS/MultiCraft/MultiCraft/ioswrap.m b/build/iOS/MultiCraft/MultiCraft/ioswrap.m
index 80941eba..9174d93c 100644
--- a/build/iOS/MultiCraft/MultiCraft/ioswrap.m
+++ b/build/iOS/MultiCraft/MultiCraft/ioswrap.m
@@ -8,7 +8,11 @@
 /* Initialization iOS Specific Things */
 void init_IOS_Settings()
 {
-	[Bugsnag startWithApiKey:CrashliticsApiKey]; // crash analytics
+	BugsnagConfiguration *config = [BugsnagConfiguration loadConfig];
+	config.enabledErrorTypes.ooms = NO;
+	config.apiKey = CrashliticsApiKey;
+	[Bugsnag startWithConfiguration:config]; // crash analytics
+
 	[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryAmbient error:nil]; // don't stop background music
 }
 
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 5e5fe2a7..cd41f550 100755
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -412,16 +412,16 @@ void set_default_settings(Settings *settings) {
 	settings->setDefault("autosave_screensize", "false");
 
 	// Set the optimal settings depending on the memory size [Android] | model [iOS]
+#ifdef __IOS__
+	float iOS_ver = [[[UIDevice currentDevice] systemVersion] floatValue];
+#endif
+
 #ifdef __ANDROID__
 	if (porting::getMemoryMax() < 2) {
 		// minimal settings for less than 2GB RAM
 #elif __IOS__
-	bool arm = false;
-#ifdef __arm__
-	arm = true;
-#endif
-	if (arm) {
-		// minimal settings for 32-bit devices
+	if (iOS_ver < 11.0) {
+		// minimal settings for legacy 32-bit devices
 		settings->setDefault("enable_minimap", "false");
 		settings->setDefault("enable_clouds", "false");
 #endif
@@ -442,9 +442,7 @@ void set_default_settings(Settings *settings) {
 	} else if (porting::getMemoryMax() >= 2 && porting::getMemoryMax() < 4) {
 		// low settings for 2-4GB RAM
 #elif __IOS__
-	} else if (([SDVersion deviceVersion] == iPhone5S) || ([SDVersion deviceVersion] == iPhone6) || ([SDVersion deviceVersion] == iPhone6Plus) ||
-			   ([SDVersion deviceVersion] == iPodTouch6Gen) ||
-			   ([SDVersion deviceVersion] == iPadMini2) || ([SDVersion deviceVersion] == iPadMini3)) {
+	} else if (iOS_ver < 13.0) {
 		// low settings
 		settings->setDefault("enable_minimap", "false");
 #endif
@@ -470,7 +468,6 @@ void set_default_settings(Settings *settings) {
 			   ([SDVersion deviceVersion] == iPhone7) || ([SDVersion deviceVersion] == iPhone7Plus) ||
 			   ([SDVersion deviceVersion] == iPadMini4) || ([SDVersion deviceVersion] == iPadAir)) {
 		// medium settings
-		settings->setDefault("enable_minimap", "false");
 #endif
 		settings->setDefault("client_unload_unused_data_timeout", "300");
 		settings->setDefault("client_mapblock_limit", "300");
@@ -485,12 +482,14 @@ void set_default_settings(Settings *settings) {
 		settings->setDefault("viewing_range", "80");
 		settings->setDefault("max_block_generate_distance", "5");
 
+#ifdef __IOS__
 		if (@available(iOS 13, *)) {
 			// enable visual shader effects
 			settings->setDefault("enable_waving_water", "true");
 			settings->setDefault("enable_waving_leaves", "true");
 			settings->setDefault("enable_waving_plants", "true");
 		}
+#endif
 	}
 
 	// Android Settings
@@ -579,13 +578,16 @@ void set_default_settings(Settings *settings) {
 	}
 
 	// Settings for the Rounded Screen and Home Bar
-	if (@available(iOS 11.0, *)) {
-		UIWindow *window = UIApplication.sharedApplication.keyWindow;
-		CGFloat bottomPadding = window.safeAreaInsets.bottom;
+	if (@available(iOS 11, *)) {
+		UIWindow *window = UIApplication.sharedApplication.windows.firstObject;
+		int bottomPadding = (int) window.safeAreaInsets.bottom;
 
 		if (bottomPadding > 0) {
 			settings->setDefault("hud_move_upwards", "20");
-			settings->setDefault("round_screen", "35");
+			if (SDVersioniPhone12Series)
+				settings->setDefault("round_screen", "75");
+			else
+				settings->setDefault("round_screen", "35");
 		}
 	}
 #endif // iOS