Font: unify font styling

plugins/goodreads.koplugin/doublekeyvaluepage.lua

@@ -1,24 +1,25 @@
-local InputContainer = require("ui/widget/container/inputcontainer")
-local FrameContainer = require("ui/widget/container/framecontainer")
-local VerticalGroup = require("ui/widget/verticalgroup")
-local VerticalSpan = require("ui/widget/verticalspan")
-local OverlapGroup = require("ui/widget/overlapgroup")
-local LeftContainer = require("ui/widget/container/topcontainer")
-local HorizontalSpan = require("ui/widget/horizontalspan")
-local LineWidget = require("ui/widget/linewidget")
 local Blitbuffer = require("ffi/blitbuffer")
 local CloseButton = require("ui/widget/closebutton")
-local UIManager = require("ui/uimanager")
-local TextWidget = require("ui/widget/textwidget")
-local GestureRange = require("ui/gesturerange")
-local RenderText = require("ui/rendertext")
-local Geom = require("ui/geometry")
-local Font = require("ui/font")
-local Device = require("device")
-local Screen = Device.screen
-local GoodreadsApi = require("goodreadsapi")
-local LuaSettings = require("luasettings")
 local DataStorage = require("datastorage")
+local Device = require("device")
+local Font = require("ui/font")
+local FrameContainer = require("ui/widget/container/framecontainer")
+local Geom = require("ui/geometry")
+local GestureRange = require("ui/gesturerange")
+local GoodreadsApi = require("goodreadsapi")
+local OverlapGroup = require("ui/widget/overlapgroup")
+local HorizontalSpan = require("ui/widget/horizontalspan")
+local InputContainer = require("ui/widget/container/inputcontainer")
+local LeftContainer = require("ui/widget/container/topcontainer")
+local LineWidget = require("ui/widget/linewidget")
+local LuaSettings = require("luasettings")
+local RenderText = require("ui/rendertext")
+local TextWidget = require("ui/widget/textwidget")
+local UIManager = require("ui/uimanager")
+local VerticalGroup = require("ui/widget/verticalgroup")
+local VerticalSpan = require("ui/widget/verticalspan")
+local Screen = Device.screen
+
 local _ = require("gettext")
 local InfoMessage = require("ui/widget/infomessage")
 
@@ -61,7 +62,7 @@ function DoubleKeyValueTitle:init()
         TextWidget:new{
             text = "",  -- page count
             fgcolor = Blitbuffer.COLOR_GREY,
-            face = Font:getFace("ffont", 20),
+            face = Font:getFace("x_smallinfofont"),
         },
     }
     self.title_bottom = OverlapGroup:new{
@@ -96,8 +97,8 @@ end
 local DoubleKeyValueItem = InputContainer:new{
     key = nil,
     value = nil,
-    cface_up = Font:getFace("cfont", 22),
-    cface_down = Font:getFace("cfont", 18),
+    cface_up = Font:getFace("smallinfofont"),
+    cface_down = Font:getFace("xx_smallinfofont"),
     width = nil,
     height = nil,
     align = "left",

plugins/goodreads.koplugin/goodreadsbook.lua

@@ -27,9 +27,9 @@ local GoodreadsBook = InputContainer:new{
 }
 
 function GoodreadsBook:init()
-    self.small_font_face = Font:getFace("ffont", 16)
-    self.medium_font_face = Font:getFace("ffont", 18)
-    self.large_font_face = Font:getFace("ffont", 22)
+    self.small_font_face = Font:getFace("smallffont")
+    self.medium_font_face = Font:getFace("ffont")
+    self.large_font_face = Font:getFace("largeffont")
     self.screen_width = Screen:getSize().w
     self.screen_height = Screen:getSize().h
     UIManager:setDirty(self, function()

plugins/statistics.koplugin/readerprogress.lua

@@ -1,23 +1,23 @@
-local InputContainer = require("ui/widget/container/inputcontainer")
-local FrameContainer = require("ui/widget/container/framecontainer")
-local CenterContainer = require("ui/widget/container/centercontainer")
-local LeftContainer = require("ui/widget/container/leftcontainer")
-local HorizontalGroup = require("ui/widget/horizontalgroup")
-local OverlapGroup = require("ui/widget/overlapgroup")
-local VerticalGroup = require("ui/widget/verticalgroup")
-local HorizontalSpan = require("ui/widget/horizontalspan")
-local VerticalSpan = require("ui/widget/verticalspan")
-local ProgressWidget = require("ui/widget/progresswidget")
-local LineWidget = require("ui/widget/linewidget")
-local TextWidget = require("ui/widget/textwidget")
-local CloseButton = require("ui/widget/closebutton")
-local Geom = require("ui/geometry")
 local Blitbuffer = require("ffi/blitbuffer")
-local Screen = require("device").screen
+local CenterContainer = require("ui/widget/container/centercontainer")
+local CloseButton = require("ui/widget/closebutton")
 local Font = require("ui/font")
-local _ = require("gettext")
+local Geom = require("ui/geometry")
+local FrameContainer = require("ui/widget/container/framecontainer")
+local HorizontalGroup = require("ui/widget/horizontalgroup")
+local HorizontalSpan = require("ui/widget/horizontalspan")
+local InputContainer = require("ui/widget/container/inputcontainer")
+local LeftContainer = require("ui/widget/container/leftcontainer")
+local LineWidget = require("ui/widget/linewidget")
+local OverlapGroup = require("ui/widget/overlapgroup")
+local ProgressWidget = require("ui/widget/progresswidget")
+local TextWidget = require("ui/widget/textwidget")
 local UIManager = require("ui/uimanager")
+local VerticalGroup = require("ui/widget/verticalgroup")
+local VerticalSpan = require("ui/widget/verticalspan")
 local util = require("util")
+local _ = require("gettext")
+local Screen = require("device").screen
 
 local LINE_COLOR = Blitbuffer.gray(0.4)
 local BG_COLOR = Blitbuffer.gray(0.2)
@@ -47,9 +47,9 @@ local shortDayOfWeekTranslation = {
 }
 
 function ReaderProgress:init()
-    self.small_font_face = Font:getFace("ffont", 15)
-    self.medium_font_face = Font:getFace("ffont", 20)
-    self.large_font_face = Font:getFace("ffont", 25)
+    self.small_font_face = Font:getFace("smallffont")
+    self.medium_font_face = Font:getFace("ffont")
+    self.large_font_face = Font:getFace("largeffont")
     self.screen_width = Screen:getSize().w
     self.screen_height = Screen:getSize().h
     UIManager:setDirty(self, function()
@@ -241,7 +241,7 @@ function ReaderProgress:genWeekStats(stats_day)
                 TextWidget:new{
                     padding = 2,
                     text = date_format_show .. " - " .. util.secondsToClock(select_day_time, true),
-                    face = Font:getFace("ffont", 16),
+                    face = Font:getFace("smallffont"),
                 },
             },
         }

plugins/terminal.koplugin/main.lua

@@ -1,4 +1,3 @@
-
 local DataStorage = require("datastorage")
 local Font = require("ui/font")
 local InfoMessage = require("ui/widget/infomessage")
@@ -67,7 +66,7 @@ function Terminal:execute()
     table.insert(entries, _("Output will also be written to"))
     table.insert(entries, self.dump_file)
     UIManager:show(InfoMessage:new{
-        cface = Font:getFace("ffont", 18),
+        cface = Font:getFace("xx_smallinfofont"),
         text = _("Command output\n") .. table.concat(entries, "\n"),
         show_icon = false,
         width = Screen:getWidth() * 0.8,