mirrors/koreader
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ReaderGesture: cleanup (#6292)

Browse source 
convert all gesture actions to use events for better modularity
add network event handlers and device event handlers
This commit is contained in:
yparitcher 2020-07-12 14:47:49 -04:00 • committed by GitHub
commit 70f89c4df1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 585 additions and 595 deletions
Download patch file Download diff file Expand all files Collapse all files

12
frontend/apps/reader/modules/readermenu.lua
View file

@ -65,9 +65,9 @@ function ReaderMenu:init()
else
-- map menu key to only top menu because bottom menu is only
-- designed for touch devices
self.key_events.ShowReaderMenu = { { "Menu" }, doc = "show menu", }
self.key_events.ShowMenu = { { "Menu" }, doc = "show menu", }
if Device:hasFewKeys() then
self.key_events.ShowReaderMenu = { { { "Menu", "Right" } }, doc = "show menu", }
self.key_events.ShowMenu = { { { "Menu", "Right" } }, doc = "show menu", }
end
end
end
@ -231,7 +231,7 @@ function ReaderMenu:setUpdateItemTable()
return self:getPreviousFile() ~= nil
end,
callback = function()
self.ui:switchDocument(self:getPreviousFile())
self.ui:onOpenLastDoc()
end,
hold_callback = function()
local previous_file = self:getPreviousFile()
@ -293,7 +293,7 @@ function ReaderMenu:exitOrRestart(callback)
end
end
function ReaderMenu:onShowReaderMenu(tab_index)
function ReaderMenu:onShowMenu(tab_index)
if self.tab_item_table == nil then
self:setUpdateItemTable()
end
@ -386,7 +386,7 @@ function ReaderMenu:onSwipeShowMenu(ges)
if G_reader_settings:nilOrTrue("show_bottom_menu") then
self.ui:handleEvent(Event:new("ShowConfigMenu"))
end
self.ui:handleEvent(Event:new("ShowReaderMenu", self:_getTabIndexFromLocation(ges)))
self.ui:handleEvent(Event:new("ShowMenu", self:_getTabIndexFromLocation(ges)))
return true
end
end
@ -396,7 +396,7 @@ function ReaderMenu:onTapShowMenu(ges)
if G_reader_settings:nilOrTrue("show_bottom_menu") then
self.ui:handleEvent(Event:new("ShowConfigMenu"))
end
self.ui:handleEvent(Event:new("ShowReaderMenu", self:_getTabIndexFromLocation(ges)))
self.ui:handleEvent(Event:new("ShowMenu", self:_getTabIndexFromLocation(ges)))
return true
end
end