|
|
|
|
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 VerticalSpan = require("ui/widget/verticalspan")
|
|
|
|
|
local WidgetContainer = require("ui/widget/container/widgetcontainer")
|
|
|
|
|
local _ = require("gettext")
|
|
|
|
|
local Screen = Device.screen
|
|
|
|
|
|
|
|
|
|
local DateTimeWidget = InputContainer:new{
|
|
|
|
|
title_face = Font:getFace("x_smalltfont"),
|
|
|
|
|
info_text = nil,
|
|
|
|
|
width = nil,
|
|
|
|
|
height = nil,
|
|
|
|
|
is_date = true,
|
|
|
|
|
day = 1,
|
|
|
|
|
month = 1,
|
|
|
|
|
year = 2021,
|
|
|
|
|
hour = 12,
|
|
|
|
|
hour_max = 23,
|
|
|
|
|
min = 0,
|
|
|
|
|
ok_text = _("Apply"),
|
|
|
|
|
cancel_text = _("Close"),
|
|
|
|
|
-- Optional extra button on bottom
|
|
|
|
|
extra_text = nil,
|
|
|
|
|
extra_callback = nil,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function DateTimeWidget: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) *
|
|
|
|
|
(self.is_date and 0.8 or 0.6))
|
|
|
|
|
if Device:hasKeys() then
|
|
|
|
|
self.key_events = {
|
|
|
|
|
Close = { {"Back"}, doc = "close date 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
|
Tame some ButtonTable users into re-using Buttontable instances if possible (#7166)
* QuickDictLookup, ImageViewer, NumberPicker: Smarter `update` that will re-use most of the widget's layout instead of re-instantiating all the things.
* SpinWidget/DoubleSpinWidget: The NumberPicker change above renders a hack to preserve alpha on these widgets almost unnecessary. Also fixed said hack to also apply to the center, value button.
* Button: Don't re-instantiate the frame in setText/setIcon when unnecessary (e.g., no change at all, or no layout change).
* Button: Add a refresh method that repaints and refreshes a *specific* Button (provided it's been painted once) all on its lonesome.
* ConfigDialog: Free everything that's going to be re-instatiated on update
* A few more post #7118 fixes:
* SkimTo: Always flag the chapter nav buttons as vsync
* Button: Fix the highlight on rounded buttons when vsync is enabled (e.g., it's now entirely visible, instead of showing a weird inverted corner glitch).
* Some more heuristic tweaks in Menu/TouchMenu/Button/IconButton
* ButtonTable: fix the annoying rounding issue I'd noticed in #7054 ;).
* Enable dithering in TextBoxWidget (e.g., in the Wikipedia full view). This involved moving the HW dithering align fixup to base, where it always ought to have been ;).
* Switch a few widgets that were using "partial" on close to "ui", or, more rarely, "flashui". The intent being to limit "partial" purely to the Reader, because it has a latency cost when mixed with other refreshes, which happens often enough in UI ;).
* Minor documentation tweaks around UIManager's `setDirty` to reflect that change.
* ReaderFooter: Force a footer repaint on resume if it is visible (otherwise, just update it).
* ReaderBookmark: In the same vein, don't repaint an invisible footer on bookmark count changes.
4 years ago
|
|
|
|
|
|
|
|
|
-- Actually the widget layout
|
|
|
|
|
self:update()
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
function DateTimeWidget:update()
|
|
|
|
|
local year_widget = NumberPickerWidget:new{
|
|
|
|
|
show_parent = self,
|
|
|
|
|
value = self.year,
|
|
|
|
|
value_min = 2021,
|
|
|
|
|
value_max = 2041,
|
|
|
|
|
value_step = 1,
|
|
|
|
|
value_hold_step = 4,
|
|
|
|
|
}
|
|
|
|
|
local month_hour_widget = NumberPickerWidget:new{
|
|
|
|
|
show_parent = self,
|
|
|
|
|
value = self.is_date and self.month or self.hour,
|
|
|
|
|
value_min = self.is_date and 1 or 0,
|
|
|
|
|
value_max = self.is_date and 12 or self.hour_max,
|
|
|
|
|
value_step = 1,
|
|
|
|
|
value_hold_step = 3,
|
|
|
|
|
}
|
|
|
|
|
local day_min_widget = NumberPickerWidget:new{
|
|
|
|
|
show_parent = self,
|
|
|
|
|
value = self.is_date and self.day or self.min,
|
|
|
|
|
value_min = self.is_date and 1 or 0,
|
|
|
|
|
value_max = self.is_date and 31 or 59,
|
|
|
|
|
value_step = 1,
|
|
|
|
|
value_hold_step = self.is_date and 5 or 10,
|
|
|
|
|
date_month_hour = month_hour_widget,
|
|
|
|
|
date_year = year_widget,
|
|
|
|
|
}
|
|
|
|
|
local separator_space = TextBoxWidget:new{
|
|
|
|
|
text = self.is_date and "–" or ":",
|
|
|
|
|
alignment = "center",
|
|
|
|
|
face = self.title_face,
|
|
|
|
|
bold = true,
|
|
|
|
|
width = math.floor(math.min(self.screen_width, self.screen_height) *
|
|
|
|
|
(self.is_date and 0.02 or 0.05)),
|
|
|
|
|
}
|
|
|
|
|
local date_group = HorizontalGroup:new{
|
|
|
|
|
align = "center",
|
|
|
|
|
year_widget,
|
|
|
|
|
separator_space,
|
|
|
|
|
month_hour_widget,
|
|
|
|
|
separator_space,
|
|
|
|
|
day_min_widget,
|
|
|
|
|
}
|
|
|
|
|
if not self.is_date then
|
|
|
|
|
table.remove(date_group, 2)
|
|
|
|
|
table.remove(date_group, 1)
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
local date_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 date_line = LineWidget:new{
|
|
|
|
|
dimen = Geom:new{
|
|
|
|
|
w = self.width,
|
|
|
|
|
h = Size.line.thick,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
local date_info
|
|
|
|
|
if self.info_text then
|
|
|
|
|
date_info = FrameContainer:new{
|
|
|
|
|
padding = Size.padding.default,
|
|
|
|
|
margin = Size.margin.small,
|
|
|
|
|
bordersize = 0,
|
|
|
|
|
TextBoxWidget:new{
|
|
|
|
|
text = self.info_text,
|
|
|
|
|
face = Font:getFace("x_smallinfofont"),
|
|
|
|
|
width = math.floor(self.width * 0.9),
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
date_info = VerticalSpan:new{ width = 0 }
|
|
|
|
|
end
|
|
|
|
|
local buttons = {
|
|
|
|
|
{
|
|
|
|
|
{
|
|
|
|
|
text = self.cancel_text,
|
|
|
|
|
callback = function()
|
|
|
|
|
self:onClose()
|
|
|
|
|
end,
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
text = self.ok_text,
|
|
|
|
|
callback = function()
|
|
|
|
|
if self.callback then
|
|
|
|
|
self.year = year_widget:getValue()
|
|
|
|
|
if self.is_date then
|
|
|
|
|
self.month = month_hour_widget:getValue()
|
|
|
|
|
self.day = day_min_widget:getValue()
|
|
|
|
|
else
|
|
|
|
|
self.hour = month_hour_widget:getValue()
|
|
|
|
|
self.min = day_min_widget:getValue()
|
|
|
|
|
end
|
|
|
|
|
self:callback(self)
|
|
|
|
|
end
|
|
|
|
|
self:onClose()
|
|
|
|
|
end,
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if self.extra_text then
|
|
|
|
|
table.insert(buttons,{
|
|
|
|
|
{
|
|
|
|
|
text = self.extra_text,
|
|
|
|
|
callback = function()
|
|
|
|
|
if self.extra_callback then
|
|
|
|
|
self.extra_callback(year_widget:getValue(), month_hour_widget:getValue(),
|
|
|
|
|
day_min_widget:getValue())
|
|
|
|
|
end
|
|
|
|
|
if not self.keep_shown_on_apply then -- assume extra wants it same as ok
|
|
|
|
|
self:onClose()
|
|
|
|
|
end
|
|
|
|
|
end,
|
|
|
|
|
},
|
|
|
|
|
})
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
local ok_cancel_buttons = ButtonTable:new{
|
|
|
|
|
width = self.width - 2*Size.padding.default,
|
|
|
|
|
buttons = buttons,
|
|
|
|
|
zero_sep = true,
|
|
|
|
|
show_parent = self,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
self.date_frame = FrameContainer:new{
|
|
|
|
|
radius = Size.radius.window,
|
|
|
|
|
bordersize = Size.border.window,
|
|
|
|
|
padding = 0,
|
|
|
|
|
margin = 0,
|
|
|
|
|
background = Blitbuffer.COLOR_WHITE,
|
|
|
|
|
VerticalGroup:new{
|
|
|
|
|
align = "left",
|
|
|
|
|
date_title,
|
|
|
|
|
date_line,
|
|
|
|
|
date_info,
|
|
|
|
|
CenterContainer:new{
|
|
|
|
|
dimen = Geom:new{
|
|
|
|
|
w = self.width,
|
|
|
|
|
h = math.floor(date_group:getSize().h * 1.2),
|
|
|
|
|
},
|
|
|
|
|
date_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,
|
|
|
|
|
padding = Size.padding.default,
|
|
|
|
|
self.date_frame,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
UIManager:setDirty(self, function()
|
|
|
|
|
return "ui", self.date_frame.dimen
|
|
|
|
|
end)
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
function DateTimeWidget:onCloseWidget()
|
|
|
|
|
UIManager:setDirty(nil, function()
|
Tame some ButtonTable users into re-using Buttontable instances if possible (#7166)
* QuickDictLookup, ImageViewer, NumberPicker: Smarter `update` that will re-use most of the widget's layout instead of re-instantiating all the things.
* SpinWidget/DoubleSpinWidget: The NumberPicker change above renders a hack to preserve alpha on these widgets almost unnecessary. Also fixed said hack to also apply to the center, value button.
* Button: Don't re-instantiate the frame in setText/setIcon when unnecessary (e.g., no change at all, or no layout change).
* Button: Add a refresh method that repaints and refreshes a *specific* Button (provided it's been painted once) all on its lonesome.
* ConfigDialog: Free everything that's going to be re-instatiated on update
* A few more post #7118 fixes:
* SkimTo: Always flag the chapter nav buttons as vsync
* Button: Fix the highlight on rounded buttons when vsync is enabled (e.g., it's now entirely visible, instead of showing a weird inverted corner glitch).
* Some more heuristic tweaks in Menu/TouchMenu/Button/IconButton
* ButtonTable: fix the annoying rounding issue I'd noticed in #7054 ;).
* Enable dithering in TextBoxWidget (e.g., in the Wikipedia full view). This involved moving the HW dithering align fixup to base, where it always ought to have been ;).
* Switch a few widgets that were using "partial" on close to "ui", or, more rarely, "flashui". The intent being to limit "partial" purely to the Reader, because it has a latency cost when mixed with other refreshes, which happens often enough in UI ;).
* Minor documentation tweaks around UIManager's `setDirty` to reflect that change.
* ReaderFooter: Force a footer repaint on resume if it is visible (otherwise, just update it).
* ReaderBookmark: In the same vein, don't repaint an invisible footer on bookmark count changes.
4 years ago
|
|
|
|
return "ui", self.date_frame.dimen
|
|
|
|
|
end)
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
function DateTimeWidget:onShow()
|
|
|
|
|
UIManager:setDirty(self, function()
|
|
|
|
|
return "ui", self.date_frame.dimen
|
|
|
|
|
end)
|
|
|
|
|
return true
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
function DateTimeWidget:onAnyKeyPressed()
|
|
|
|
|
UIManager:close(self)
|
|
|
|
|
return true
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
function DateTimeWidget:onTapClose(arg, ges_ev)
|
|
|
|
|
if ges_ev.pos:notIntersectWith(self.date_frame.dimen) then
|
|
|
|
|
self:onClose()
|
|
|
|
|
end
|
|
|
|
|
return true
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
function DateTimeWidget:onClose()
|
|
|
|
|
UIManager:close(self)
|
|
|
|
|
return true
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
return DateTimeWidget
|