Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed default foreground color

This commit is contained in:
Nite 2021-10-28 09:59:33 +02:00
parent c83a9778fc
commit 70e42fb443
No known key found for this signature in database
GPG Key ID: 1D1AD59B1C6386C1
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/ServerColor.kt
View File

@ -25,10 +25,8 @@ object ServerColor {
} }
fun getForegroundColor(context: Context, serverColor: Int?): Int { fun getForegroundColor(context: Context, serverColor: Int?): Int {
if (serverColor == null) return ContextCompat.getColor( val backgroundColor = getBackgroundColor(context, serverColor)
context, Util.getResourceFromAttribute(context, R.attr.colorOnPrimary) val luminance = ColorUtils.calculateLuminance(backgroundColor)
)
val luminance = ColorUtils.calculateLuminance(serverColor)
return if (luminance < LUMINANCE_LIMIT) { return if (luminance < LUMINANCE_LIMIT) {
ContextCompat.getColor(context, R.color.selected_menu_dark) ContextCompat.getColor(context, R.color.selected_menu_dark)
} else { } else {