renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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
parent f4dad2fae8
commit 70f89c4df1
26 changed files with 585 additions and 595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
plugins/statistics.koplugin/main.lua
View File

@@ -149,38 +149,6 @@ function ReaderStatistics:init()
end
return readingprogress
end
local ReaderGesture = require("apps/reader/modules/readergesture")
ReaderGesture.getReaderProgress = function()
local readingprogress
self:insertDB(self.id_curr_book)
local current_period, current_pages = self:getCurrentBookStats()
local today_period, today_pages = self:getTodayBookStats()
local dates_stats = self:getReadingProgressStats(7)
if dates_stats then
readingprogress = ReaderProgress:new{
dates = dates_stats,
current_period = current_period,
current_pages = current_pages,
today_period = today_period,
today_pages = today_pages,
--readonly = true,
}
end
return readingprogress
end
ReaderGesture.getBookStats = function()
if self:isDocless() or not self.is_enabled then return end
local stats = KeyValuePage:new{
title = _("Current statistics"),
kv_pairs = self:getCurrentStat(self.id_curr_book),
}
return stats
end
ReaderGesture.getCalendarView = function()
return self:getCalendarView()
end
end
function ReaderStatistics:initData()
@@ -692,7 +660,7 @@ function ReaderStatistics:getStatisticEnabledMenuItem()
end
self:saveSettings()
if not self:isDocless() then
self.view.footer:updateFooter()
self.view.footer:onUpdateFooter()
end
end,
}
@@ -2007,7 +1975,7 @@ end
function ReaderStatistics:onReaderReady()
-- we have correct page count now, do the actual initialization work
self:initData()
self.view.footer:updateFooter()
self.view.footer:onUpdateFooter()
end
function ReaderStatistics:getCalendarView()
@@ -2101,4 +2069,36 @@ function ReaderStatistics:getReadBookByDay(month)
return per_day
end
function ReaderStatistics:onShowReaderProgress()
local readingprogress
self:insertDB(self.id_curr_book)
local current_period, current_pages = self:getCurrentBookStats()
local today_period, today_pages = self:getTodayBookStats()
local dates_stats = self:getReadingProgressStats(7)
if dates_stats then
readingprogress = ReaderProgress:new{
dates = dates_stats,
current_period = current_period,
current_pages = current_pages,
today_period = today_period,
today_pages = today_pages,
--readonly = true,
}
end
UIManager:show(readingprogress)
end
function ReaderStatistics:onShowBookStats()
if self:isDocless() or not self.is_enabled then return end
local stats = KeyValuePage:new{
title = _("Current statistics"),
kv_pairs = self:getCurrentStat(self.id_curr_book),
}
UIManager:show(stats)
end
function ReaderStatistics:onShowCalendarView()
UIManager:show(self:getCalendarView())
end
return ReaderStatistics