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

[UX] Right align keyvaluepage in statistics (#3507)

Browse Source
This commit is contained in:
Robert
2017-11-20 18:08:55 +01:00
committed by Frans de Jonge
parent 29b376fdd9
commit a6de9ff7d4
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -667,6 +667,7 @@ function ReaderStatistics:addToMainMenu(menu_items)
callback = function()
UIManager:show(KeyValuePage:new{
title = _("Statistics"),
value_overflow_align = "right",
kv_pairs = self:getCurrentStat(self.id_curr_book),
})
end,
@@ -715,6 +716,7 @@ function ReaderStatistics:statMenu()
local total_msg, kv_pairs = self:getTotalStats()
self.kv = KeyValuePage:new{
title = total_msg,
value_overflow_align = "right",
kv_pairs = kv_pairs,
callback_return = function()
UIManager:show(kv)
@@ -731,6 +733,7 @@ function ReaderStatistics:statMenu()
UIManager:close(self.kv)
self.kv = KeyValuePage:new{
title = _("Last week"),
value_overflow_align = "right",
kv_pairs = self:getDatesFromAll(7, "daily_weekday"),
callback_return = function()
UIManager:show(kv)
@@ -746,6 +749,7 @@ function ReaderStatistics:statMenu()
UIManager:close(self.kv)
self.kv = KeyValuePage:new{
title = _("Last month by day"),
value_overflow_align = "right",
kv_pairs = self:getDatesFromAll(30, "daily_weekday"),
callback_return = function()
UIManager:show(kv)
@@ -761,6 +765,7 @@ function ReaderStatistics:statMenu()
UIManager:close(self.kv)
self.kv = KeyValuePage:new{
title = _("Last year by day"),
value_overflow_align = "right",
kv_pairs = self:getDatesFromAll(365, "daily"),
callback_return = function()
UIManager:show(kv)
@@ -776,6 +781,7 @@ function ReaderStatistics:statMenu()
UIManager:close(self.kv)
self.kv = KeyValuePage:new{
title = _("Last year by week"),
value_overflow_align = "right",
kv_pairs = self:getDatesFromAll(365, "weekly"),
callback_return = function()
UIManager:show(kv)
@@ -791,6 +797,7 @@ function ReaderStatistics:statMenu()
UIManager:close(self.kv)
self.kv = KeyValuePage:new{
title = _("All stats by month"),
value_overflow_align = "right",
kv_pairs = self:getDatesFromAll(0, "monthly"),
callback_return = function()
UIManager:show(kv)
@@ -807,6 +814,7 @@ function ReaderStatistics:statMenu()
UIManager:close(self.kv)
self.kv = KeyValuePage:new{
title = _("Books by week"),
value_overflow_align = "right",
kv_pairs = self:getDatesFromAll(0, "weekly", true),
callback_return = function()
UIManager:show(kv)
@@ -822,6 +830,7 @@ function ReaderStatistics:statMenu()
UIManager:close(self.kv)
self.kv = KeyValuePage:new{
title = _("Books by month"),
value_overflow_align = "right",
kv_pairs = self:getDatesFromAll(0, "monthly", true),
callback_return = function()
UIManager:show(kv)
@@ -1017,6 +1026,7 @@ function ReaderStatistics:getBookStat(id_book)
UIManager:close(self.kv)
self.kv = KeyValuePage:new{
title = _("Read in days"),
value_overflow_align = "right",
kv_pairs = self:getDatesForBook(id_book),
callback_return = function()
UIManager:show(kv)
@@ -1095,6 +1105,7 @@ function ReaderStatistics:callbackMonthly(begin, finish, date_text, book_mode)
if book_mode then
self.kv = KeyValuePage:new{
title = T(_("Books from: %1"), date_text),
value_overflow_align = "right",
kv_pairs = self:getBooksFromPeriod(begin, finish),
callback_return = function()
UIManager:show(kv)
@@ -1104,6 +1115,7 @@ function ReaderStatistics:callbackMonthly(begin, finish, date_text, book_mode)
else
self.kv = KeyValuePage:new{
title = date_text,
value_overflow_align = "right",
kv_pairs = self:getDaysFromPeriod(begin, finish),
callback_return = function()
UIManager:show(kv)
@@ -1120,6 +1132,7 @@ function ReaderStatistics:callbackWeekly(begin, finish, date_text, book_mode)
if book_mode then
self.kv = KeyValuePage:new{
title = T(_("Books from: %1"), date_text),
value_overflow_align = "right",
kv_pairs = self:getBooksFromPeriod(begin, finish),
callback_return = function()
UIManager:show(kv)
@@ -1129,6 +1142,7 @@ function ReaderStatistics:callbackWeekly(begin, finish, date_text, book_mode)
else
self.kv = KeyValuePage:new{
title = date_text,
value_overflow_align = "right",
kv_pairs = self:getDaysFromPeriod(begin, finish),
callback_return = function()
UIManager:show(kv)
@@ -1144,6 +1158,7 @@ function ReaderStatistics:callbackDaily(begin, finish, date_text)
UIManager:close(kv)
self.kv = KeyValuePage:new{
title = date_text,
value_overflow_align = "right",
kv_pairs = self:getBooksFromPeriod(begin, finish),
callback_return = function()
UIManager:show(kv)
@@ -1286,6 +1301,7 @@ function ReaderStatistics:getDaysFromPeriod(period_begin, period_end)
UIManager:close(kv)
self.kv = KeyValuePage:new{
title = T(_("Books in %1"), result_book[1][i]),
value_overflow_align = "right",
kv_pairs = self:getBooksFromPeriod(time_begin, time_begin + 86400),
callback_return = function()
UIManager:show(kv)
@@ -1326,6 +1342,7 @@ function ReaderStatistics:getBooksFromPeriod(period_begin, period_end)
UIManager:close(self.kv)
self.kv = KeyValuePage:new{
title = _("Read in days"),
value_overflow_align = "right",
kv_pairs = self:getDatesForBook(tonumber(result_book[4][i])),
callback_return = function()
UIManager:show(kv)
@@ -1460,6 +1477,7 @@ function ReaderStatistics:getTotalStats()
self.kv = KeyValuePage:new{
title = book_title,
value_overflow_align = "right",
kv_pairs = self:getBookStat(id_book),
callback_return = function()
UIManager:show(kv)
@@ -1543,6 +1561,7 @@ function ReaderStatistics:resetBook()
end
kv_reset_book = KeyValuePage:new{
title = _("Reset book statistics"),
value_overflow_align = "right",
kv_pairs = total_stats,
}
UIManager:show(kv_reset_book)