mirror of
https://github.com/koreader/koreader.git
synced 2025-08-10 00:52:38 +00:00
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:
@@ -360,7 +360,7 @@ end
|
||||
-- lines than before
|
||||
function InputText:initTextBox(text, char_added)
|
||||
if self.text_widget then
|
||||
self.text_widget:free()
|
||||
self.text_widget:free(true)
|
||||
end
|
||||
self.text = text
|
||||
local fgcolor
|
||||
@@ -438,7 +438,7 @@ function InputText:initTextBox(text, char_added)
|
||||
}
|
||||
self.height = text_widget:getTextHeight()
|
||||
self.scroll = true
|
||||
text_widget:free()
|
||||
text_widget:free(true)
|
||||
end
|
||||
if self.scroll then
|
||||
self.text_widget = ScrollTextWidget:new{
|
||||
@@ -517,6 +517,11 @@ function InputText:initTextBox(text, char_added)
|
||||
self.edit_callback(self.is_text_edited)
|
||||
end
|
||||
end
|
||||
dbg:guard(InputText, "initTextBox",
|
||||
function(self, text, char_added)
|
||||
assert(type(text) == "string",
|
||||
"Wrong text type (expected string)")
|
||||
end)
|
||||
|
||||
function InputText:initKeyboard()
|
||||
local keyboard_layer = 2
|
||||
@@ -634,6 +639,11 @@ function InputText:onTextInput(text)
|
||||
end
|
||||
return false
|
||||
end
|
||||
dbg:guard(InputText, "onTextInput",
|
||||
function(self, text)
|
||||
assert(type(text) == "string",
|
||||
"Wrong text type (expected string)")
|
||||
end)
|
||||
|
||||
function InputText:onShowKeyboard(ignore_first_hold_release)
|
||||
Device:startTextInput()
|
||||
@@ -932,5 +942,10 @@ function InputText:setText(text, keep_edited_state)
|
||||
self:checkTextEditability()
|
||||
end
|
||||
end
|
||||
dbg:guard(InputText, "setText",
|
||||
function(self, text, keep_edited_state)
|
||||
assert(type(text) == "string",
|
||||
"Wrong text type (expected string)")
|
||||
end)
|
||||
|
||||
return InputText
|
||||
|
||||
Reference in New Issue
Block a user