mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-28 13:48:49 +07:00
Code Issues Packages Projects Releases Wiki Activity

small fixes (#7181)

Browse Source 
* fixes

* relaced translations with _

* better displayCutout
This commit is contained in:
alexban011
2022-06-16 18:56:18 +03:00
committed by GitHub
parent d462100c19
commit 564f7b476c
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,12 +35,15 @@ Sources for Info about current orientation in case need:
if (activity.requestedOrientation != orientation) activity.requestedOrientation = orientation if (activity.requestedOrientation != orientation) activity.requestedOrientation = orientation
} }
override fun hasDisplayCutout(): Boolean { override fun hasDisplayCutout() = when {
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { Build.VERSION.SDK_INT >= Build.VERSION_CODES.R ->
activity.display?.cutout != null
Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ->
@Suppress("DEPRECATION")
activity.windowManager.defaultDisplay.cutout != null activity.windowManager.defaultDisplay.cutout != null
} else { Build.VERSION.SDK_INT >= Build.VERSION_CODES.P ->
false activity.window.decorView.rootWindowInsets.displayCutout != null
} else -> false
} }
override fun toggleDisplayCutout(androidCutout: Boolean) { override fun toggleDisplayCutout(androidCutout: Boolean) {

1
core/src/com/unciv/ui/newgamescreen/PlayerPickerTable.kt
View File

@ -50,7 +50,6 @@ class PlayerPickerTable(
): Table() { ): Table() {
val playerListTable = Table() val playerListTable = Table()
val civBlocksWidth = if(blockWidth <= 10f) previousScreen.stage.width / 3 - 5f else blockWidth val civBlocksWidth = if(blockWidth <= 10f) previousScreen.stage.width / 3 - 5f else blockWidth
val friendsBlocksWidth = if(blockWidth <= 10f) previousScreen.stage.width / 5 - 5f else blockWidth / 2
/** Locks player table for editing, currently unused, was previously used for scenarios and could be useful in the future.*/ /** Locks player table for editing, currently unused, was previously used for scenarios and could be useful in the future.*/
var locked = false var locked = false

2
tests/src/com/unciv/testing/TranslationTests.kt
View File

@ -171,7 +171,7 @@ class TranslationTests {
var allWordsTranslatedCorrectly = true var allWordsTranslatedCorrectly = true
for (translationEntry in translations.values) { for (translationEntry in translations.values) {
for ((language, translation) in translationEntry) { for ((language, _) in translationEntry) {
UncivGame.Current.settings.language = language UncivGame.Current.settings.language = language
try { try {
translationEntry.entry.tr() translationEntry.entry.tr()