mirror of https://github.com/koreader/koreader
DateTimeWidget: replaces DateWidget and TimeWidget (#8240)
Deduplicate code by combining DateWidget and TimeWidget. ReadTimer plugin: some rewording.reviewable/pr8264/r1
zwim
3 years ago
committed by
GitHub
parent
84baf00416
commit
9ed22df03f
@ -1,208 +0,0 @@
|
||||
local Blitbuffer = require("ffi/blitbuffer")
|
||||
local ButtonTable = require("ui/widget/buttontable")
|
||||
local CenterContainer = require("ui/widget/container/centercontainer")
|
||||
local Device = require("device")
|
||||
local FrameContainer = require("ui/widget/container/framecontainer")
|
||||
local Geom = require("ui/geometry")
|
||||
local GestureRange = require("ui/gesturerange")
|
||||
local Font = require("ui/font")
|
||||
local HorizontalGroup = require("ui/widget/horizontalgroup")
|
||||
local InputContainer = require("ui/widget/container/inputcontainer")
|
||||
local LineWidget = require("ui/widget/linewidget")
|
||||
local NumberPickerWidget = require("ui/widget/numberpickerwidget")
|
||||
local Size = require("ui/size")
|
||||
local TextBoxWidget = require("ui/widget/textboxwidget")
|
||||
local TextWidget = require("ui/widget/textwidget")
|
||||
local UIManager = require("ui/uimanager")
|
||||
local VerticalGroup = require("ui/widget/verticalgroup")
|
||||
local WidgetContainer = require("ui/widget/container/widgetcontainer")
|
||||
local _ = require("gettext")
|
||||
local Screen = Device.screen
|
||||
|
||||
local TimeWidget = InputContainer:new{
|
||||
title_face = Font:getFace("x_smalltfont"),
|
||||
width = nil,
|
||||
height = nil,
|
||||
hour = 0,
|
||||
hour_max = 23,
|
||||
min = 0,
|
||||
ok_text = _("Apply"),
|
||||
cancel_text = _("Close"),
|
||||
}
|
||||
|
||||
function TimeWidget:init()
|
||||
self.screen_width = Screen:getWidth()
|
||||
self.screen_height = Screen:getHeight()
|
||||
self.width = self.width or math.floor(math.min(self.screen_width, self.screen_height) * 0.6)
|
||||
if Device:hasKeys() then
|
||||
self.key_events = {
|
||||
Close = { {"Back"}, doc = "close time widget" }
|
||||
}
|
||||
end
|
||||
if Device:isTouchDevice() then
|
||||
self.ges_events = {
|
||||
TapClose = {
|
||||
GestureRange:new{
|
||||
ges = "tap",
|
||||
range = Geom:new{
|
||||
w = self.screen_width,
|
||||
h = self.screen_height,
|
||||
}
|
||||
},
|
||||
},
|
||||
}
|
||||
end
|
||||
|
||||
-- Actually the widget layout
|
||||
self:update()
|
||||
end
|
||||
|
||||
function TimeWidget:update()
|
||||
local hour_widget = NumberPickerWidget:new{
|
||||
show_parent = self,
|
||||
value = self.hour,
|
||||
value_min = 0,
|
||||
value_max = self.hour_max,
|
||||
value_step = 1,
|
||||
value_hold_step = 4,
|
||||
}
|
||||
local min_widget = NumberPickerWidget:new{
|
||||
show_parent = self,
|
||||
value = self.min,
|
||||
value_min = 0,
|
||||
value_max = 59,
|
||||
value_step = 1,
|
||||
value_hold_step = 10,
|
||||
}
|
||||
local colon_space = TextBoxWidget:new{
|
||||
text = ":",
|
||||
alignment = "center",
|
||||
face = self.title_face,
|
||||
bold = true,
|
||||
width = math.floor(math.min(self.screen_width, self.screen_height) * 0.05),
|
||||
}
|
||||
local time_group = HorizontalGroup:new{
|
||||
align = "center",
|
||||
hour_widget,
|
||||
colon_space,
|
||||
min_widget,
|
||||
}
|
||||
|
||||
local time_title = FrameContainer:new{
|
||||
padding = Size.padding.default,
|
||||
margin = Size.margin.title,
|
||||
bordersize = 0,
|
||||
TextWidget:new{
|
||||
text = self.title_text,
|
||||
face = self.title_face,
|
||||
max_width = self.width - 2 * (Size.padding.default + Size.margin.title),
|
||||
},
|
||||
}
|
||||
local time_line = LineWidget:new{
|
||||
dimen = Geom:new{
|
||||
w = self.width,
|
||||
h = Size.line.thick,
|
||||
}
|
||||
}
|
||||
local buttons = {
|
||||
{
|
||||
{
|
||||
text = self.cancel_text,
|
||||
callback = function()
|
||||
self:onClose()
|
||||
end,
|
||||
},
|
||||
{
|
||||
text = self.ok_text,
|
||||
callback = function()
|
||||
if self.callback then
|
||||
self.hour = hour_widget:getValue()
|
||||
self.min = min_widget:getValue()
|
||||
self:callback(self)
|
||||
end
|
||||
self:onClose()
|
||||
end,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
local ok_cancel_buttons = ButtonTable:new{
|
||||
width = self.width - 2*Size.padding.default,
|
||||
buttons = buttons,
|
||||
zero_sep = true,
|
||||
show_parent = self,
|
||||
}
|
||||
|
||||
self.time_frame = FrameContainer:new{
|
||||
radius = Size.radius.window,
|
||||
padding = 0,
|
||||
margin = 0,
|
||||
background = Blitbuffer.COLOR_WHITE,
|
||||
VerticalGroup:new{
|
||||
align = "left",
|
||||
time_title,
|
||||
time_line,
|
||||
CenterContainer:new{
|
||||
dimen = Geom:new{
|
||||
w = self.width,
|
||||
h = math.floor(time_group:getSize().h * 1.2),
|
||||
},
|
||||
time_group
|
||||
},
|
||||
CenterContainer:new{
|
||||
dimen = Geom:new{
|
||||
w = self.width,
|
||||
h = ok_cancel_buttons:getSize().h,
|
||||
},
|
||||
ok_cancel_buttons
|
||||
}
|
||||
}
|
||||
}
|
||||
self[1] = WidgetContainer:new{
|
||||
align = "center",
|
||||
dimen = Geom:new{
|
||||
x = 0, y = 0,
|
||||
w = self.screen_width,
|
||||
h = self.screen_height,
|
||||
},
|
||||
FrameContainer:new{
|
||||
bordersize = 0,
|
||||
self.time_frame,
|
||||
}
|
||||
}
|
||||
UIManager:setDirty(self, function()
|
||||
return "ui", self.time_frame.dimen
|
||||
end)
|
||||
end
|
||||
|
||||
function TimeWidget:onCloseWidget()
|
||||
UIManager:setDirty(nil, function()
|
||||
return "ui", self.time_frame.dimen
|
||||
end)
|
||||
end
|
||||
|
||||
function TimeWidget:onShow()
|
||||
UIManager:setDirty(self, function()
|
||||
return "ui", self.time_frame.dimen
|
||||
end)
|
||||
return true
|
||||
end
|
||||
|
||||
function TimeWidget:onAnyKeyPressed()
|
||||
UIManager:close(self)
|
||||
return true
|
||||
end
|
||||
|
||||
function TimeWidget:onTapClose(arg, ges_ev)
|
||||
if ges_ev.pos:notIntersectWith(self.time_frame.dimen) then
|
||||
self:onClose()
|
||||
end
|
||||
return true
|
||||
end
|
||||
|
||||
function TimeWidget:onClose()
|
||||
UIManager:close(self)
|
||||
return true
|
||||
end
|
||||
|
||||
return TimeWidget
|
||||
Loading…
Reference in New Issue