helcel/beans
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 4 Wiki Activity

Fix regions not colored in regional mode

Browse Source
This commit is contained in:
fgerber 2024-04-10 16:50:18 +02:00
parent ca16a0d20f
commit 98582732cd
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/net/helcel/beans/svg/CSSWrapper.kt
View File

@ -3,6 +3,7 @@ package net.helcel.beans.svg
import android.content.Context import android.content.Context
import net.helcel.beans.countries.Country import net.helcel.beans.countries.Country
import net.helcel.beans.countries.GeoLoc import net.helcel.beans.countries.GeoLoc
import net.helcel.beans.countries.State
import net.helcel.beans.countries.World import net.helcel.beans.countries.World
import net.helcel.beans.helper.AUTO_GROUP import net.helcel.beans.helper.AUTO_GROUP
import net.helcel.beans.helper.Data import net.helcel.beans.helper.Data
@ -55,16 +56,17 @@ class CSSWrapper(private val ctx: Context) {
} }
}.map { }.map {
it.code it.code
}.joinToString(",") { "#${it}$id,#${it}" } + "{fill:${ }.takeIf { it.isNotEmpty() }?.joinToString(",") { "#${it}$id,#${it}" } + "{fill:${
colorToHex6(colorWrapper(ctx, android.R.attr.colorPrimary)) colorToHex6(colorWrapper(ctx, android.R.attr.colorPrimary))
};}" };}"
} }
else if (groups.getGroupFromKey(k).key == NO_GROUP) else if (groups.getGroupFromKey(k).key == NO_GROUP)
"" ""
else else {
v.joinToString(",") { "#${it}$id,#${it}" } + "{fill:${ v.joinToString(",") { "#${it}$id,#${it}" } + "{fill:${
colorToHex6(groups.getGroupFromKey(k).color) colorToHex6(groups.getGroupFromKey(k).color)
};}" };}"
}
}.joinToString("") }.joinToString("")
} }