mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-11 03:18:18 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix cutout options crash (#7169)

Browse Source
This commit is contained in:
Timo T 2022-06-15 15:59:58 +02:00 committed by GitHub
parent 4d0230f70e
commit 0585194eaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/src/com/unciv/app/AndroidLauncher.kt
View File

@ -39,9 +39,7 @@ open class AndroidLauncher : AndroidApplication() {
val platformSpecificHelper = PlatformSpecificHelpersAndroid(this) val platformSpecificHelper = PlatformSpecificHelpersAndroid(this)
platformSpecificHelper.allowPortrait(settings.allowAndroidPortrait) platformSpecificHelper.allowPortrait(settings.allowAndroidPortrait)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { platformSpecificHelper.toggleDisplayCutout(settings.androidCutout)
platformSpecificHelper.toggleDisplayCutout(settings.androidCutout)
}
val androidParameters = UncivGameParameters( val androidParameters = UncivGameParameters(
version = BuildConfig.VERSION_NAME, version = BuildConfig.VERSION_NAME,

9
android/src/com/unciv/app/PlatformSpecificHelpersAndroid.kt
View File

@ -36,16 +36,15 @@ Sources for Info about current orientation in case need:
} }
override fun hasDisplayCutout(): Boolean { override fun hasDisplayCutout(): Boolean {
val displayCutout = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
activity.windowManager.defaultDisplay.cutout activity.windowManager.defaultDisplay.cutout != null
} else { } else {
TODO("VERSION.SDK_INT < Q") false
} }
return displayCutout != null
} }
@RequiresApi(Build.VERSION_CODES.P)
override fun toggleDisplayCutout(androidCutout: Boolean) { override fun toggleDisplayCutout(androidCutout: Boolean) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) return
val layoutParams = activity.window.attributes val layoutParams = activity.window.attributes
if (androidCutout) { if (androidCutout) {
layoutParams.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES layoutParams.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES