Initial Kindle PW5 support (#8856)

* Rejig frontlight warmth API to more closely match the existing API, and, hopefully, clarify some of its quirks, and reduce boilerplate and duplicate code in platform implementations.
* Tweak Kindle:setDateTime to prefer using the platform's custom script, as in interacts better with the stock UI. And make the fallbacks handle old busybox versions better.
* Add Kindle PW5 support ;).
* Add warmth support to the Kindle platform.
* Random TextBoxWidget cleanups: make sure we immediately free destroyed instances.
* FrontLightWidget: Refactor to make it slightly less obnoxious to grok and update; i.e., separate layout from update, and properly separate brightness from warmth handling. Move to simpler widgets instead of reinventing the wheel.
* TextBoxWidgets: Implement `setText` to match TextWidget's API, as some callers may be using the two interchangeably (i.e., Button).
* NaturalLightWidget: Make sure we pass a string to InputText
* InputText: Add debug guards to catch bad callers not passing strings ;).
This commit is contained in:
NiLuJe
2022-03-14 19:56:18 +01:00
committed by GitHub
parent f709cc48e6
commit 217a73f3c0
27 changed files with 682 additions and 450 deletions

View File

@@ -28,6 +28,7 @@ local TimeVal = require("ui/timeval")
local UIManager = require("ui/uimanager")
local Math = require("optmath")
local logger = require("logger")
local dbg = require("dbg")
local util = require("util")
local Screen = require("device").screen
@@ -151,6 +152,26 @@ function TextBoxWidget:init()
self.text_height = self.lines_per_page * self.line_height_px
end
self:_computeTextDimensions()
self:_updateLayout()
if self.editable then
self:moveCursorToCharPos(self.charpos or 1)
end
self.dimen = Geom:new(self:getSize())
if Device:isTouchDevice() then
self.ges_events = {
TapImage = {
GestureRange:new{
ges = "tap",
range = function() return self.dimen end,
},
},
}
end
end
function TextBoxWidget:_computeTextDimensions()
if self.use_xtext then
self:_measureWithXText()
else
@@ -185,21 +206,6 @@ function TextBoxWidget:init()
self:scrollViewToCharPos()
end
end
self:_updateLayout()
if self.editable then
self:moveCursorToCharPos(self.charpos or 1)
end
self.dimen = Geom:new(self:getSize())
if Device:isTouchDevice() then
self.ges_events = {
TapImage = {
GestureRange:new{
ges = "tap",
range = function() return self.dimen end,
},
},
}
end
end
function TextBoxWidget:unfocus()
@@ -1168,6 +1174,26 @@ function TextBoxWidget:update(scheduled_update)
self.scheduled_update = nil
end
function TextBoxWidget:setText(text)
if text == self.text then
return
end
self.text = text
self:_computeTextDimensions()
self:update()
-- Don't break the reference
local new_size = self:getSize()
self.dimen.w = new_size.w
self.dimen.h = new_size.h
end
dbg:guard(TextBoxWidget, "setText",
function(self, text)
assert(type(text) == "string",
"Wrong text type (expected string)")
end)
function TextBoxWidget:onTapImage(arg, ges)
if self.line_num_to_image and self.line_num_to_image[self.virtual_line_num] then
local image = self.line_num_to_image[self.virtual_line_num]