From f58d1c0449a4b755090ad3b9a94c1a7436168a0f Mon Sep 17 00:00:00 2001
From: NiLuJe <ninuje@gmail.com>
Date: Sun, 30 Oct 2022 22:34:48 +0100
Subject: [PATCH] Cleanup: Track color constant name change (#9716)

* Bump base

https://github.com/koreader/koreader-base/pull/1547
https://github.com/koreader/koreader-base/pull/1548
---
 base                                           |  2 +-
 defaults.lua                                   | 12 +++++-------
 frontend/ui/widget/bookmapwidget.lua           |  2 +-
 frontend/ui/widget/bookstatuswidget.lua        |  2 +-
 frontend/ui/widget/progresswidget.lua          |  2 +-
 plugins/statistics.koplugin/calendarview.lua   |  4 ++--
 plugins/statistics.koplugin/readerprogress.lua |  2 +-
 7 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/base b/base
index 1b3a23eed..0fd29ac60 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit 1b3a23eed12ff93ee7f1180c86fdbd8f23523dc4
+Subproject commit 0fd29ac60a0a301cdad73c799b5ce1a4992d6320
diff --git a/defaults.lua b/defaults.lua
index 4886bc645..a0ec22d73 100644
--- a/defaults.lua
+++ b/defaults.lua
@@ -180,13 +180,11 @@ DMINIBAR_CONTAINER_HEIGHT = 14,  -- Larger means more padding at the bottom, at
 -- insensitive sort
 DALPHA_SORT_CASE_INSENSITIVE = true,
 
--- Light parameter for Kobo
-KOBO_LIGHT_ON_START = -2,           -- -1, -2 or 0-100.
-                                   -- -1 uses previous koreader session saved brightness
-                                   -- -2 uses 'Kobo eReader.conf' brighness,
-                                   -- other sets light on start to a fix brighness
-KOBO_SYNC_BRIGHTNESS_WITH_NICKEL = true,  -- Save brightness set in KOreader
-                                         -- with nickel's 'Kobo eReader.conf'
+-- Frontlight behavior on Kobo
+KOBO_LIGHT_ON_START = -2,          -- -1, -2 or 0-100.
+                                   -- -1 uses the brightness set by KOReader (if any, 20% otherwise)
+                                   -- -2 uses the brightness set in Nickel
+KOBO_SYNC_BRIGHTNESS_WITH_NICKEL = true,  -- Update Nickel's config to match our own
 
 -- Network proxy settings
 -- proxy url should be a string in the format of "http://localhost:3128"
diff --git a/frontend/ui/widget/bookmapwidget.lua b/frontend/ui/widget/bookmapwidget.lua
index 9a0a68148..900e48529 100644
--- a/frontend/ui/widget/bookmapwidget.lua
+++ b/frontend/ui/widget/bookmapwidget.lua
@@ -332,7 +332,7 @@ function BookMapRow:init()
             end
             local color = Blitbuffer.COLOR_BLACK
             if self.current_session_duration and self.read_pages[page][2] < self.current_session_duration then
-                color = Blitbuffer.COLOR_DIM_GRAY
+                color = Blitbuffer.COLOR_GRAY_5
             end
             table.insert(self.pages_markers, {
                 x = x, y = y,
diff --git a/frontend/ui/widget/bookstatuswidget.lua b/frontend/ui/widget/bookstatuswidget.lua
index 07e125e70..9939335f5 100644
--- a/frontend/ui/widget/bookstatuswidget.lua
+++ b/frontend/ui/widget/bookstatuswidget.lua
@@ -185,7 +185,7 @@ function BookStatusWidget:genHeader(title)
     local header_title = TextWidget:new{
         text = title,
         face = self.medium_font_face,
-        fgcolor = Blitbuffer.COLOR_WEB_GRAY,
+        fgcolor = Blitbuffer.COLOR_GRAY_9,
     }
 
     local padding_span = HorizontalSpan:new{ width = self.padding }
diff --git a/frontend/ui/widget/progresswidget.lua b/frontend/ui/widget/progresswidget.lua
index 555e0eff1..1b31e0860 100644
--- a/frontend/ui/widget/progresswidget.lua
+++ b/frontend/ui/widget/progresswidget.lua
@@ -199,7 +199,7 @@ function ProgressWidget:updateStyle(thick, height)
         self.bordersize = 0
         self.radius = 0
         self.bgcolor = Blitbuffer.COLOR_GRAY
-        self.fillcolor = Blitbuffer.COLOR_DIM_GRAY
+        self.fillcolor = Blitbuffer.COLOR_GRAY_5
         self.ticks = nil
         self._orig_margin_v = nil
         self._orig_bordersize = nil
diff --git a/plugins/statistics.koplugin/calendarview.lua b/plugins/statistics.koplugin/calendarview.lua
index 757f41f44..ca8733edb 100644
--- a/plugins/statistics.koplugin/calendarview.lua
+++ b/plugins/statistics.koplugin/calendarview.lua
@@ -250,9 +250,9 @@ local SPAN_COLORS = {
     { Blitbuffer.COLOR_BLACK, Blitbuffer.COLOR_GRAY_E },
     { Blitbuffer.COLOR_BLACK, Blitbuffer.COLOR_LIGHT_GRAY },
     { Blitbuffer.COLOR_BLACK, Blitbuffer.COLOR_GRAY },
-    { Blitbuffer.COLOR_WHITE, Blitbuffer.COLOR_WEB_GRAY },
+    { Blitbuffer.COLOR_WHITE, Blitbuffer.COLOR_GRAY_9 },
     { Blitbuffer.COLOR_WHITE, Blitbuffer.COLOR_DARK_GRAY },
-    { Blitbuffer.COLOR_WHITE, Blitbuffer.COLOR_DIM_GRAY },
+    { Blitbuffer.COLOR_WHITE, Blitbuffer.COLOR_GRAY_5 },
     { Blitbuffer.COLOR_WHITE, Blitbuffer.COLOR_BLACK },
 }
 
diff --git a/plugins/statistics.koplugin/readerprogress.lua b/plugins/statistics.koplugin/readerprogress.lua
index 277c69cc8..ee145a05e 100644
--- a/plugins/statistics.koplugin/readerprogress.lua
+++ b/plugins/statistics.koplugin/readerprogress.lua
@@ -22,7 +22,7 @@ local util = require("util")
 local _ = require("gettext")
 local Screen = Device.screen
 
-local LINE_COLOR = Blitbuffer.COLOR_WEB_GRAY
+local LINE_COLOR = Blitbuffer.COLOR_GRAY_9
 local BG_COLOR = Blitbuffer.COLOR_LIGHT_GRAY
 
 -- Oh, hey, this one actually *is* an InputContainer!