From 70e42fb44349a3fa1613833c393550ef4563a475 Mon Sep 17 00:00:00 2001
From: Nite <shunite@gmail.com>
Date: Thu, 28 Oct 2021 09:59:33 +0200
Subject: [PATCH] Fixed default foreground color

---
 .../main/kotlin/org/moire/ultrasonic/util/ServerColor.kt    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/ServerColor.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/ServerColor.kt
index 6bc2104e..565e3aa7 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/ServerColor.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/ServerColor.kt
@@ -25,10 +25,8 @@ object ServerColor {
     }
 
     fun getForegroundColor(context: Context, serverColor: Int?): Int {
-        if (serverColor == null) return ContextCompat.getColor(
-            context, Util.getResourceFromAttribute(context, R.attr.colorOnPrimary)
-        )
-        val luminance = ColorUtils.calculateLuminance(serverColor)
+        val backgroundColor = getBackgroundColor(context, serverColor)
+        val luminance = ColorUtils.calculateLuminance(backgroundColor)
         return if (luminance < LUMINANCE_LIMIT) {
             ContextCompat.getColor(context, R.color.selected_menu_dark)
         } else {