AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 13:55:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added missing Romanian characters

Browse Source
This commit is contained in:
Yair Morgenstern 2020-05-03 20:39:08 +03:00
parent 9397f3608c
commit ad7d7fba60
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/com/unciv/ui/utils/Fonts.kt
View File

@ -10,7 +10,7 @@ object Fonts {
private val characterSetCache = HashMap<String, String>() private val characterSetCache = HashMap<String, String>()
private val fontCache = HashMap<String, BitmapFont>() private val fontCache = HashMap<String, BitmapFont>()
private fun getCharactersForFont(language:String=""): String { private fun getCharactersForFont(language: String = ""): String {
if (characterSetCache.containsKey(language)) return characterSetCache[language]!! if (characterSetCache.containsKey(language)) return characterSetCache[language]!!
val startTime = System.currentTimeMillis() val startTime = System.currentTimeMillis()
@ -28,9 +28,10 @@ object Fonts {
"АБВГҐДЂЕЁЄЖЗЅИІЇЙЈКЛЉМНЊОПРСТЋУЎФХЦЧЏШЩЪЫЬЭЮЯабвгґдђеёєжзѕиіїйјклљмнњопрстћуўфхцчџшщъыьэюя" + // Russian "АБВГҐДЂЕЁЄЖЗЅИІЇЙЈКЛЉМНЊОПРСТЋУЎФХЦЧЏШЩЪЫЬЭЮЯабвгґдђеёєжзѕиіїйјклљмнњопрстћуўфхцчџшщъыьэюя" + // Russian
"ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρστυφχψωάßΆέΈέΉίϊΐΊόΌύΰϋΎΫΏ" + // Greek "ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρστυφχψωάßΆέΈέΉίϊΐΊόΌύΰϋΎΫΏ" + // Greek
"กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู฿เแโใไๅๆ็่้๊๋์ํ๎๏๐๑๒๓๔๕๖๗๘๙๚๛" + // Thai "กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู฿เแโใไๅๆ็่้๊๋์ํ๎๏๐๑๒๓๔๕๖๗๘๙๚๛" + // Thai
"İıÇŞşĞğ"+ // Turkish "İıÇŞşĞğ" + // Turkish
"øæå" + // Scandinavian "øæå" + // Scandinavian
"ÃÕãõ" + // Portuguese "ÃÕãõ" + // Portuguese
"şţșț" + // Romanian
"1234567890" + "1234567890" +
"‘?ʼ’'“!”(%)[#]{@}/&\\<-+÷×=>®©\$€£¥¢:;,.…¡*|«»—∞✘✔" "‘?ʼ’'“!”(%)[#]{@}/&\\<-+÷×=>®©\$€£¥¢:;,.…¡*|«»—∞✘✔"
val charSet = HashSet<Char>() val charSet = HashSet<Char>()
@ -44,23 +45,23 @@ object Fonts {
} }
} }
val characterSetString = charSet.joinToString("") val characterSetString = charSet.joinToString("")
characterSetCache[language]=characterSetString characterSetCache[language] = characterSetString
val totalTime = System.currentTimeMillis() - startTime val totalTime = System.currentTimeMillis() - startTime
println("Loading characters for font - "+totalTime+"ms") println("Loading characters for font - " + totalTime + "ms")
return characterSetString return characterSetString
} }
fun getFont(size: Int): BitmapFont { fun getFont(size: Int): BitmapFont {
val language = UncivGame.Current.settings.language val language = UncivGame.Current.settings.language
val fontForLanguage ="Nativefont" val fontForLanguage = "Nativefont"
val isUniqueFont = language.contains("Chinese") || language == "Korean" || language=="Japanese" val isUniqueFont = language.contains("Chinese") || language == "Korean" || language == "Japanese"
val keyForFont = if(!isUniqueFont) "$fontForLanguage $size" else "$fontForLanguage $size $language" val keyForFont = if (!isUniqueFont) "$fontForLanguage $size" else "$fontForLanguage $size $language"
if (fontCache.containsKey(keyForFont)) return fontCache[keyForFont]!! if (fontCache.containsKey(keyForFont)) return fontCache[keyForFont]!!
val font=NativeFont(NativeFontPaint(size)) val font = NativeFont(NativeFontPaint(size))
val charsForFont = getCharactersForFont(if(isUniqueFont) language else "") val charsForFont = getCharactersForFont(if (isUniqueFont) language else "")
font.appendText(charsForFont) font.appendText(charsForFont)