From 73dcf5e7009982be7fbc0ed08b6b118b55e4af4d Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 12 Feb 2023 23:10:30 -0500 Subject: [PATCH] v2.0.0: improved iOS gesture overriding and added device PPI listing --- .../ios/IOSLauncher.java | 35 ++++++++++++++++--- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/ios/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ios/IOSLauncher.java b/ios/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ios/IOSLauncher.java index d7057952f..ac0c4612f 100644 --- a/ios/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ios/IOSLauncher.java +++ b/ios/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ios/IOSLauncher.java @@ -47,6 +47,7 @@ import org.robovm.apple.foundation.NSString; import org.robovm.apple.glkit.GLKViewDrawableColorFormat; import org.robovm.apple.glkit.GLKViewDrawableDepthFormat; import org.robovm.apple.uikit.UIApplication; +import org.robovm.apple.uikit.UIRectEdge; import org.robovm.apple.uikit.UIScreen; import java.io.File; @@ -108,6 +109,8 @@ public class IOSLauncher extends IOSApplication.Delegate { config.hideHomeIndicator = SPDSettings.fullscreen(); config.overrideRingerSwitch = SPDSettings.ignoreSilentMode(); + config.screenEdgesDeferringSystemGestures = UIRectEdge.All; + if (NSProcessInfo.getSharedProcessInfo().getOperatingSystemVersion().getMajorVersion() >= 11) { config.preferredFramesPerSecond = (int)(UIScreen.getMainScreen().getMaximumFramesPerSecond()); } @@ -129,22 +132,44 @@ public class IOSLauncher extends IOSApplication.Delegate { config.addIosDevice("IPHONE_12", "iPhone13,2", 460); config.addIosDevice("IPHONE_12_PRO", "iPhone13,3", 460); config.addIosDevice("IPHONE_12_PRO_MAX", "iPhone13,4", 458); + config.addIosDevice("IPHONE_13_PRO", "iPhone14,2", 460); + config.addIosDevice("IPHONE_13_PRO_MAX", "iPhone14,3", 458); + config.addIosDevice("IPHONE_13_MINI", "iPhone14,4", 476); + config.addIosDevice("IPHONE_13", "iPhone14,5", 460); + config.addIosDevice("IPHONE_SE_3G", "iPhone14,6", 326); + config.addIosDevice("IPHONE_14", "iPhone14,7", 460); + config.addIosDevice("IPHONE_14_PLUS", "iPhone14,8", 458); + config.addIosDevice("IPHONE_14_PRO", "iPhone15,2", 460); + config.addIosDevice("IPHONE_14_PRO_MAX", "iPhone15,3", 460); config.addIosDevice("IPAD_7G_WIFI", "iPad7,11", 264); config.addIosDevice("IPAD_7G_WIFI_CELLULAR", "iPad7,12", 264); - config.addIosDevice("IPAD_8G_WIFI", "iPad11,6", 264); config.addIosDevice("IPAD_8G_WIFI_CELLULAR", "iPad11,7", 264); config.addIosDevice("IPAD_AIR_4G_WIFI", "iPad13,1", 264); config.addIosDevice("IPAD_AIR_4G_WIFI_CELLULAR", "iPad13,2", 264); + config.addIosDevice("IPAD_9G_WIFI", "iPad12,1", 264); + config.addIosDevice("IPAD_9G_WIFI_CELLULAR", "iPad12,2", 264); + config.addIosDevice("IPAD_MINI_6G_WIFI", "iPad14,1", 326); + config.addIosDevice("IPAD_MINI_6G_WIFI_CELLULAR", "iPad14,2", 326); + config.addIosDevice("IPAD_AIR_4G_WIFI", "iPad13,1", 264); + config.addIosDevice("IPAD_AIR_4G_WIFI_CELLULAR", "iPad13,2", 264); config.addIosDevice("IPAD_PRO_11_3G", "iPad13,4", 264); config.addIosDevice("IPAD_PRO_11_3G", "iPad13,5", 264); config.addIosDevice("IPAD_PRO_11_3G", "iPad13,6", 264); config.addIosDevice("IPAD_PRO_11_3G", "iPad13,7", 264); - config.addIosDevice("IPAD_PRO_12.8_5G", "iPad13,8", 264); - config.addIosDevice("IPAD_PRO_12.8_5G", "iPad13,9", 264); - config.addIosDevice("IPAD_PRO_12.8_5G", "iPad13,10", 264); - config.addIosDevice("IPAD_PRO_12.8_5G", "iPad13,11", 264); + config.addIosDevice("IPAD_PRO_12.9_5G", "iPad13,8", 264); + config.addIosDevice("IPAD_PRO_12.9_5G", "iPad13,9", 264); + config.addIosDevice("IPAD_PRO_12.9_5G", "iPad13,10", 264); + config.addIosDevice("IPAD_PRO_12.9_5G", "iPad13,11", 264); + config.addIosDevice("IPAD_AIR_5G_WIF", "iPad13,16", 264); + config.addIosDevice("IPAD_AIR_5G_WIFI_CELLULAR", "iPad13,17", 264); + config.addIosDevice("IPAD_10G", "iPad13,18", 264); + config.addIosDevice("IPAD_10G", "iPad13,19", 264); + config.addIosDevice("IPAD_PRO_11_4G", "iPad14,3", 264); + config.addIosDevice("IPAD_PRO_11_4G", "iPad14,4", 264); + config.addIosDevice("IPAD_PRO_12.9_6G", "iPad14,5", 264); + config.addIosDevice("IPAD_PRO_12.9_6G", "iPad14,6", 264); return new IOSApplication(new ShatteredPixelDungeon(new IOSPlatformSupport()), config); }