AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-25 21:03:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolved ANRs when opening Options menu

Browse Source 
Was due to system fonts taking a long time to load
This commit is contained in:
Yair Morgenstern 2022-04-06 22:57:27 +03:00
parent 83327dabe8
commit 360d739b97
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/src/com/unciv/app/NativeFontAndroid.kt
View File

@ -66,7 +66,7 @@ class NativeFontAndroid(private val size: Int, private val fontFamily: String) :
override fun getAvailableFont(): Collection<FontData> {
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
SystemFonts.getAvailableFonts().mapNotNull {
SystemFonts.getAvailableFonts().asSequence().mapNotNull {
it.file?.nameWithoutExtension
}.map { FontData(it) }.toSet()
} else {

11
core/src/com/unciv/ui/worldscreen/mainmenu/OptionsPopup.kt
View File

@ -82,7 +82,12 @@ class OptionsPopup(val previousScreen: BaseScreen) : Popup(previousScreen) {
tabs.addPage("Language", getLanguageTab(), ImageGetter.getImage("FlagIcons/${settings.language}"), 24f)
tabs.addPage("Sound", getSoundTab(), ImageGetter.getImage("OtherIcons/Speaker"), 24f)
tabs.addPage("Multiplayer", getMultiplayerTab(), ImageGetter.getImage("OtherIcons/Multiplayer"), 24f)
tabs.addPage("Advanced", getAdvancedTab(), ImageGetter.getImage("OtherIcons/Settings"), 24f)
crashHandlingThread(name="Add Advanced Options Tab") {
val fontNames = Fonts.getAvailableFontFamilyNames() // This is a heavy operation and causes ANRs
postCrashHandlingRunnable {
tabs.addPage("Advanced", getAdvancedTab(fontNames), ImageGetter.getImage("OtherIcons/Settings"), 24f)
}
}
if (RulesetCache.size > BaseRuleset.values().size) {
val content = ModCheckTab(this) {
if (modCheckFirstRun) runModChecker()
@ -293,7 +298,7 @@ class OptionsPopup(val previousScreen: BaseScreen) : Popup(previousScreen) {
}).row()
}
private fun getAdvancedTab() = Table(BaseScreen.skin).apply {
private fun getAdvancedTab(fontNames: Collection<FontData>) = Table(BaseScreen.skin).apply {
pad(10f)
defaults().pad(5f)
@ -314,7 +319,7 @@ class OptionsPopup(val previousScreen: BaseScreen) : Popup(previousScreen) {
}
}
addFontFamilySelect(Fonts.getAvailableFontFamilyNames())
addFontFamilySelect(fontNames)
addTranslationGeneration()