From bd9854c80e73b7d5a0911313ad28c33eae07de52 Mon Sep 17 00:00:00 2001
From: David Brenn <davidbrenn@t-online.de>
Date: Thu, 14 Aug 2025 16:03:52 +0200
Subject: [PATCH] fix: ninja test errors

---
 CONTRIBUTORS                                  |  5 +++++
 qt/aqt/preferences.py                         |  1 -
 ts/routes/graphs/TrueRetentionCombined.svelte |  2 +-
 ts/routes/graphs/TrueRetentionSingle.svelte   |  2 +-
 ts/routes/graphs/buttons.ts                   |  2 +-
 ts/routes/graphs/calendar.ts                  | 16 ++++++++++++++--
 ts/routes/graphs/ease.ts                      |  2 +-
 ts/routes/graphs/future-due.ts                |  2 +-
 ts/routes/graphs/reviews.ts                   |  3 +--
 9 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d334540fb..1070ffe22 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -232,6 +232,11 @@ Spiritual Father <https://github.com/spiritualfather>
 Emmanuel Ferdman <https://github.com/emmanuel-ferdman>
 Sunong2008 <https://github.com/Sunrongguo2008>
 Marvin Kopf <marvinkopf@outlook.com>
+David Brenn <davidbrenn@t-online.de>
+Felix Kühne <flxkhn0602@gmail.com>
+Matthis Ehrhardt <matthis-ehrhardt@gmx.de>
+Billy Julian Lesmana <hunter140797@gmail.com>
+
 ********************
 
 The text of the 3 clause BSD license follows:
diff --git a/qt/aqt/preferences.py b/qt/aqt/preferences.py
index 2ec5c4b63..5b7337a62 100644
--- a/qt/aqt/preferences.py
+++ b/qt/aqt/preferences.py
@@ -145,7 +145,6 @@ class Preferences(QDialog):
         form.pastePNG.setChecked(editing.paste_images_as_png)
         form.render_latex.setChecked(editing.render_latex)
         form.default_search_text.setText(editing.default_search_text)
-        
 
         form.backup_explanation.setText(
             anki.lang.with_collapsed_whitespace(tr.preferences_backup_explanation())
diff --git a/ts/routes/graphs/TrueRetentionCombined.svelte b/ts/routes/graphs/TrueRetentionCombined.svelte
index 119eeef9a..419bb59e5 100644
--- a/ts/routes/graphs/TrueRetentionCombined.svelte
+++ b/ts/routes/graphs/TrueRetentionCombined.svelte
@@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import { colorBlindColors, type GraphBounds } from "./graph-helpers";
+    import { colorBlindColors } from "./graph-helpers";
     import * as tr from "@generated/ftl";
     import { localizedNumber } from "@tslib/i18n";
     import { type RevlogRange } from "./graph-helpers";
diff --git a/ts/routes/graphs/TrueRetentionSingle.svelte b/ts/routes/graphs/TrueRetentionSingle.svelte
index cb7013816..e9f390ea2 100644
--- a/ts/routes/graphs/TrueRetentionSingle.svelte
+++ b/ts/routes/graphs/TrueRetentionSingle.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { colorBlindColors, type GraphBounds } from "./graph-helpers";
+    import { colorBlindColors } from "./graph-helpers";
     import * as tr from "@generated/ftl";
     import { type RevlogRange } from "./graph-helpers";
     import {
diff --git a/ts/routes/graphs/buttons.ts b/ts/routes/graphs/buttons.ts
index 5a70bfda9..e67092d55 100644
--- a/ts/routes/graphs/buttons.ts
+++ b/ts/routes/graphs/buttons.ts
@@ -21,7 +21,7 @@ import {
     sum,
 } from "d3";
 
-import { colorBlindColors, type GraphBounds } from "./graph-helpers";
+import {type GraphBounds } from "./graph-helpers";
 import { GraphRange } from "./graph-helpers";
 import { setDataAvailable } from "./graph-helpers";
 import { hideTooltip, showTooltip } from "./tooltip-utils.svelte";
diff --git a/ts/routes/graphs/calendar.ts b/ts/routes/graphs/calendar.ts
index dcef8d13b..5b5091cb2 100644
--- a/ts/routes/graphs/calendar.ts
+++ b/ts/routes/graphs/calendar.ts
@@ -138,9 +138,21 @@ export function renderCalendar(
     }
     const data = Array.from(dayMap.values());
     const cappedRange = scaleLinear().range([1,0]);
-    const blues = scaleSequentialSqrt()
+
+    const isColorBlindMode = (window as any).colorBlindMode;
+
+
+    let gradient;
+
+    if (isColorBlindMode) {
+        gradient = scaleSequentialSqrt()
         .domain([0, maxCount])
         .interpolator((n) => interpolateMagma(cappedRange(n)!));
+    }   else {
+        gradient = scaleSequentialSqrt()
+        .domain([0, maxCount])
+        .interpolator((n) => interpolateBlues(cappedRange(n)!));
+    }
 
     function tooltipText(d: DayDatum): string {
         const date = localizedDate(d.date, {
@@ -204,7 +216,7 @@ export function renderCalendar(
         })
         .transition()
         .duration(800)
-        .attr("fill", (d: DayDatum) => (d.count === 0 ? emptyColour : blues(d.count)!));
+        .attr("fill", (d: DayDatum) => (d.count === 0 ? emptyColour : gradient(d.count)!));
 }
 
 function timeFunctionForDay(firstDayOfWeek: Weekday): CountableTimeInterval {
diff --git a/ts/routes/graphs/ease.ts b/ts/routes/graphs/ease.ts
index 01612c32d..0a9418c59 100644
--- a/ts/routes/graphs/ease.ts
+++ b/ts/routes/graphs/ease.ts
@@ -8,7 +8,7 @@
 import type { GraphsResponse } from "@generated/anki/stats_pb";
 import * as tr from "@generated/ftl";
 import { localizedNumber } from "@tslib/i18n";
-import type { Bin, ScaleLinear, ScaleSequential } from "d3";
+import type { Bin, ScaleLinear } from "d3";
 import { bin, extent, interpolateRdYlGn, interpolateViridis, scaleLinear, scaleSequential, sum } from "d3";
 
 import type { SearchDispatch, TableDatum } from "./graph-helpers";
diff --git a/ts/routes/graphs/future-due.ts b/ts/routes/graphs/future-due.ts
index 1c849fc45..061d9ca81 100644
--- a/ts/routes/graphs/future-due.ts
+++ b/ts/routes/graphs/future-due.ts
@@ -10,7 +10,7 @@ import * as tr from "@generated/ftl";
 import { localizedNumber } from "@tslib/i18n";
 import { dayLabel } from "@tslib/time";
 import type { Bin } from "d3";
-import { bin, extent, interpolateGreens, scaleLinear, scaleSequential, sum, interpolateViridis, interpolateInferno, interpolateMagma, interpolatePlasma,interpolateCividis } from "d3";
+import { bin, extent, interpolateGreens, scaleLinear, scaleSequential, sum, interpolateViridis} from "d3";
 
 import type { SearchDispatch, TableDatum } from "./graph-helpers";
 import { getNumericMapBinValue, GraphRange, numericMap } from "./graph-helpers";
diff --git a/ts/routes/graphs/reviews.ts b/ts/routes/graphs/reviews.ts
index e6507f08b..e296b5402 100644
--- a/ts/routes/graphs/reviews.ts
+++ b/ts/routes/graphs/reviews.ts
@@ -27,7 +27,6 @@ import {
     min,
     pointer,
     scaleLinear,
-    scaleOrdinal,
     scaleSequential,
     select,
     sum,
@@ -197,7 +196,7 @@ export function renderReviews(
 
     function makeColorBlindGradient(baseHex: string, satAdjust = 0.02, lightAdjust = 0.02) {
         const base = color(baseHex);
-        if (!base) throw new Error(`Invalid color: ${baseHex}`);
+        if (!base) {throw new Error(`Invalid color: ${baseHex}`)};
 
         const lighter = hsl(base);
         lighter.s = Math.min(1, lighter.s + satAdjust);