From d6cc4660dd0638ac72ea46a304e3ec72f947a20f Mon Sep 17 00:00:00 2001
From: Corey Woodworth <coreywoodworth@gmail.com>
Date: Fri, 31 Oct 2025 09:17:53 -0400
Subject: [PATCH] Using ColorsConvert.js instead of adding functions to
 ClockLoader.qml

---
 Modules/Bar/Calendar/ClockLoader.qml | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/Modules/Bar/Calendar/ClockLoader.qml b/Modules/Bar/Calendar/ClockLoader.qml
index 98da9a12..253c5a86 100644
--- a/Modules/Bar/Calendar/ClockLoader.qml
+++ b/Modules/Bar/Calendar/ClockLoader.qml
@@ -2,6 +2,7 @@ import QtQuick
 import qs.Commons
 import qs.Services
 import Quickshell
+import "../../../Helpers/ColorsConvert.js" as ColorsConvert
 
 Item {
   id: clockRoot
@@ -11,20 +12,6 @@ Item {
   property color backgroundColor: Color.mPrimary
   property color clockColor: Color.mOnPrimary
 
-  function getRelativeLuminance(color) {
-    return 0.2126 * color.r + 0.7152 * color.g + 0.0722 * color.b
-  }
-
-  function getContrastRatio(color1, color2) {
-    var L1 = getRelativeLuminance(color1)
-    var L2 = getRelativeLuminance(color2)
-    if (L1 > L2) {
-      return (L1 + 0.05) / (L2 + 0.05)
-    } else {
-      return (L2 + 0.05) / (L1 + 0.05)
-    }
-  }
-
   property color secondHandColor: {
     var defaultColor = Color.mError
     var bestContrast = 1.0 // 1.0 is "no contrast"
@@ -35,11 +22,11 @@ Item {
 
     for (var i = 0; i < candidates.length; i++) {
       var candidate = candidates[i]
-      var contrastClock = getContrastRatio(candidate, clockColor)
+      var contrastClock = ColorsConvert.getContrastRatio(candidate.toString(), clockColor.toString())
       if (contrastClock < minContrast) {
         continue
       }
-      var contrastBg = getContrastRatio(candidate, backgroundColor)
+      var contrastBg = ColorsConvert.getContrastRatio(candidate.toString(), backgroundColor.toString())
       if (contrastBg < minContrast) {
         continue
       }