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

4.5.0-patch2

Browse Source 
Lazy loading of system fonts so startup is fast
This commit is contained in:
Yair Morgenstern
2023-02-26 09:32:51 +02:00
parent fd9fc914bc
commit 8e17c9ed98
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/src/com/unciv/app/FontAndroid.kt
View File

@ -20,13 +20,14 @@ import kotlin.math.abs
class FontAndroid : FontImplementation { class FontAndroid : FontImplementation {
private val fontList: HashSet<Font> = hashSetOf() private val fontList by lazy {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) emptySet()
else SystemFonts.getAvailableFonts()
}
private val paint: Paint = Paint() private val paint: Paint = Paint()
private var currentFontFamily: String? = null private var currentFontFamily: String? = null
init { init {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
fontList.addAll(SystemFonts.getAvailableFonts())
paint.isAntiAlias = true paint.isAntiAlias = true
paint.strokeWidth = 0f paint.strokeWidth = 0f
paint.setARGB(255, 255, 255, 255) paint.setARGB(255, 255, 255, 255)
@ -49,7 +50,6 @@ class FontAndroid : FontImplementation {
else else
{ {
paint.typeface = createTypefaceSystem(fontFamilyData.invariantName) paint.typeface = createTypefaceSystem(fontFamilyData.invariantName)
} }
} }

4
buildSrc/src/main/kotlin/BuildConfig.kt
View File

@ -3,8 +3,8 @@ package com.unciv.build
object BuildConfig { object BuildConfig {
const val kotlinVersion = "1.8.0" const val kotlinVersion = "1.8.0"
const val appName = "Unciv" const val appName = "Unciv"
const val appCodeNumber = 820 const val appCodeNumber = 821
const val appVersion = "4.5.0-patch1" const val appVersion = "4.5.0-patch2"
const val gdxVersion = "1.11.0" const val gdxVersion = "1.11.0"
const val roboVMVersion = "2.3.1" const val roboVMVersion = "2.3.1"

4
core/src/com/unciv/models/ruleset/Building.kt
View File

@ -21,11 +21,11 @@ import com.unciv.models.stats.Stat
import com.unciv.models.stats.Stats import com.unciv.models.stats.Stats
import com.unciv.models.translations.fillPlaceholders import com.unciv.models.translations.fillPlaceholders
import com.unciv.models.translations.tr import com.unciv.models.translations.tr
import com.unciv.ui.screens.civilopediascreen.FormattedLine
import com.unciv.ui.components.Fonts import com.unciv.ui.components.Fonts
import com.unciv.ui.components.extensions.getConsumesAmountString import com.unciv.ui.components.extensions.getConsumesAmountString
import com.unciv.ui.components.extensions.getNeedMoreAmountString import com.unciv.ui.components.extensions.getNeedMoreAmountString
import com.unciv.ui.components.extensions.toPercent import com.unciv.ui.components.extensions.toPercent
import com.unciv.ui.screens.civilopediascreen.FormattedLine
import kotlin.math.pow import kotlin.math.pow
@ -382,7 +382,7 @@ class Building : RulesetStatsObject(), INonPerpetualConstruction {
&& matchesFilter(it.params[0]) && matchesFilter(it.params[0])
&& city.matchesFilter(it.params[3]) && city.matchesFilter(it.params[3])
} }
|| return super.canBePurchasedWithStat(city, stat) || super.canBePurchasedWithStat(city, stat)
) )
} }