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

Highlights popup dialog: add "Color" and "Details" buttons (#12461)

Browse Source
This commit is contained in:
hius07
2024-09-07 17:56:40 +03:00
committed by GitHub
parent ffc4929504
commit 7572a812cc
3 changed files with 253 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

313
frontend/apps/reader/modules/readerbookmark.lua
View File

@@ -318,7 +318,7 @@ function ReaderBookmark:onToggleBookmark()
end)
-- And ask for a footer refresh, in case we have bookmark_count enabled.
-- Assuming the footer is visible, it'll request a refresh regardless, but the EPDC should optimize it out if no content actually changed.
self.view.footer:onUpdateFooter(self.view.footer_visible)
self.view.footer:maybeUpdateFooter()
return true
end
@@ -402,9 +402,9 @@ end
-- remove, update bookmark
function ReaderBookmark:removeItem(item)
local index = self.ui.annotation:getItemIndex(item)
if item.pos0 then
function ReaderBookmark:removeItem(item, item_idx)
local index = item_idx or self:getBookmarkItemIndex(item)
if item.drawer then
self.ui.highlight:deleteHighlight(index) -- will call ReaderBookmark:removeItemByIndex()
else -- dogear bookmark, update it in case we removed a bookmark for current page
self:removeItemByIndex(index)
@@ -421,11 +421,11 @@ function ReaderBookmark:removeItemByIndex(index)
self.ui:handleEvent(Event:new("AnnotationsModified", { item, nb_notes_added = -1 }))
end
table.remove(self.ui.annotation.annotations, index)
self.view.footer:onUpdateFooter(self.view.footer_visible)
self.view.footer:maybeUpdateFooter()
end
function ReaderBookmark:deleteItemNote(item)
local index = self.ui.annotation:getItemIndex(item)
local index = self:getBookmarkItemIndex(item)
self.ui.annotation.annotations[index].note = nil
self.ui:handleEvent(Event:new("AnnotationsModified", { item, nb_highlights_added = 1, nb_notes_added = -1 }))
end
@@ -1026,7 +1026,7 @@ function ReaderBookmark:updateBookmarkList(item_table, item_number)
end
function ReaderBookmark:getBookmarkItemIndex(item)
if self.match_table or self.show_edited_only or self.show_drawer_only -- filtered
if not item.idx or self.match_table or self.show_edited_only or self.show_drawer_only -- filtered
or self.sorting_mode ~= "page" then -- or item_table order does not match with annotations
return self.ui.annotation:getItemIndex(item)
end
@@ -1068,142 +1068,169 @@ function ReaderBookmark:_getDialogHeader(bookmark)
return T(_("Page: %1"), page_str) .. " " .. T(_("Time: %1"), bookmark.datetime)
end
function ReaderBookmark:showBookmarkDetails(item)
local bm_menu = self.bookmark_menu[1]
local item_table = bm_menu.item_table
function ReaderBookmark:showBookmarkDetails(item_or_index)
local item_table, item, item_idx, item_type
local bm_menu = self.bookmark_menu and self.bookmark_menu[1]
if bm_menu then -- called from Bookmark list, got item
item_table = bm_menu.item_table
item = item_or_index
item_idx = item.idx
item_type = item.type
else -- called from Reader, got index
item_table = self.ui.annotation.annotations
item_idx = item_or_index
item = item_table[item_idx]
item_type = self.getBookmarkType(item)
end
local items_nb = #item_table
local text = self:_getDialogHeader(item) .. "\n\n"
local prefix = item.type == "bookmark" and self.display_prefix["bookmark"] or self.display_prefix["highlight"]
text = text .. prefix .. item.text_orig
local prefix = item_type == "bookmark" and self.display_prefix["bookmark"] or self.display_prefix["highlight"]
text = text .. prefix .. (item.text_orig or item.text)
if item.note then
text = text .. "\n\n" .. self.display_prefix["note"] .. item.note
end
local not_select_mode = not bm_menu.select_count and not self.ui.highlight.select_mode
local not_select_mode = not (bm_menu and bm_menu.select_count) and not self.ui.highlight.select_mode
local textviewer
local edit_details_callback = function()
local function _goToBookmark()
UIManager:close(textviewer)
self.ui.link:addCurrentLocationToStack()
self:gotoBookmark(item.page, item.pos0)
end
local function _showBookmarkDetails(idx)
UIManager:close(textviewer)
if bm_menu then
self:updateBookmarkList(nil, idx)
self:showBookmarkDetails(item_table[idx])
else
self:showBookmarkDetails(idx)
end
end
local function edit_details_callback()
self.details_updated = true
UIManager:close(textviewer)
self:showBookmarkDetails(item_table[item.idx])
self:showBookmarkDetails(item_or_index)
end
local _showBookmarkDetails = function(idx)
UIManager:close(textviewer)
self:updateBookmarkList(nil, idx)
self:showBookmarkDetails(item_table[idx])
end
-- Refresh the bookmark list whenever details may have been edited
local _updateBookmarkList = function()
local function close_callback()
if self.details_updated then
self.details_updated = nil
if self.show_edited_only then
for i = #item_table, 1, -1 do
if not item_table[i].text_edited then
table.remove(item_table, i)
if bm_menu then
if self.show_edited_only then
for i = items_nb, 1, -1 do
if not item_table[i].text_edited then
table.remove(item_table, i)
end
end
end
self:updateBookmarkList(item_table, -1)
else
if self.view.highlight.note_mark then -- refresh note marker
UIManager:setDirty(self.dialog, "ui")
end
end
self:updateBookmarkList(item_table, -1)
end
end
local buttons_table = {
{
{
text = _("Reset text"),
enabled = item.text_edited and not_select_mode or false,
callback = function()
self:setHighlightedText(item_or_index, nil, edit_details_callback)
end,
},
{
text = _("Edit text"),
enabled = item.drawer and not_select_mode or false,
callback = function()
self:editHighlightedText(item_or_index, edit_details_callback)
end,
},
},
{
{
text = _("Remove bookmark"),
enabled = not_select_mode,
callback = function()
UIManager:show(ConfirmBox:new{
text = _("Remove this bookmark?"),
ok_text = _("Remove"),
ok_callback = function()
UIManager:close(textviewer)
self:removeItem(item, not bm_menu and item_idx)
if bm_menu then
table.remove(item_table, item_idx)
self:updateBookmarkList(item_table, -1)
end
end,
})
end,
},
{
text = item.note and _("Edit note") or _("Add note"),
enabled = not_select_mode,
callback = function()
self:setBookmarkNote(item_or_index, nil, nil, edit_details_callback)
end,
},
},
{
{
text = _("Close"),
callback = function()
textviewer:onClose()
end,
},
{
text = _("Go to bookmark"),
enabled = not (bm_menu and bm_menu.select_count),
callback = function()
_goToBookmark()
if bm_menu then
bm_menu.close_callback()
end
end,
},
},
{
{
text = "▕◁",
enabled = item_idx > 1,
callback = function()
_showBookmarkDetails(1)
end,
},
{
text = "◁",
enabled = item_idx > 1,
callback = function()
_showBookmarkDetails(item_idx - 1)
end,
},
{
text = "▷",
enabled = item_idx < items_nb,
callback = function()
_showBookmarkDetails(item_idx + 1)
end,
},
{
text = "▷▏",
enabled = item_idx < items_nb,
callback = function()
_showBookmarkDetails(items_nb)
end,
},
},
}
textviewer = TextViewer:new{
title = T(_("Bookmark details (%1/%2)"), item.idx, #item_table),
title = T(_("Bookmark details (%1/%2)"), item_idx, items_nb),
text = text,
text_type = "bookmark",
close_callback = function()
_updateBookmarkList()
end,
buttons_table = {
{
{
text = _("Reset text"),
enabled = item.drawer and not_select_mode and item.text_edited or false,
callback = function()
self:setHighlightedText(item, nil, edit_details_callback)
end,
},
{
text = _("Edit text"),
enabled = item.drawer and not_select_mode or false,
callback = function()
self:editHighlightedText(item, edit_details_callback)
end,
},
},
{
{
text = _("Remove bookmark"),
enabled = not_select_mode,
callback = function()
UIManager:show(ConfirmBox:new{
text = _("Remove this bookmark?"),
ok_text = _("Remove"),
ok_callback = function()
self:removeItem(item)
table.remove(item_table, item.idx)
self:updateBookmarkList(item_table, -1)
UIManager:close(textviewer)
end,
})
end,
},
{
text = item.note and _("Edit note") or _("Add note"),
enabled = not bm_menu.select_count,
callback = function()
self:setBookmarkNote(item, nil, nil, edit_details_callback)
end,
},
},
{
{
text = _("Close"),
callback = function()
_updateBookmarkList()
UIManager:close(textviewer)
end,
},
{
text = _("Go to bookmark"),
enabled = not bm_menu.select_count,
callback = function()
UIManager:close(textviewer)
self.ui.link:addCurrentLocationToStack()
self:gotoBookmark(item.page, item.pos0)
bm_menu.close_callback()
end,
},
},
{
{
text = "▕◁",
enabled = item.idx > 1,
callback = function()
_showBookmarkDetails(1)
end,
},
{
text = "◁",
enabled = item.idx > 1,
callback = function()
_showBookmarkDetails(item.idx - 1)
end,
},
{
text = "▷",
enabled = item.idx < #item_table,
callback = function()
_showBookmarkDetails(item.idx + 1)
end,
},
{
text = "▷▏",
enabled = item.idx < #item_table,
callback = function()
_showBookmarkDetails(#item_table)
end,
},
},
}
buttons_table = buttons_table,
close_callback = close_callback,
}
UIManager:show(textviewer)
return true
@@ -1264,6 +1291,7 @@ function ReaderBookmark:setBookmarkNote(item_or_index, is_new_note, new_note, ca
value = nil
end
annotation.note = value
self.ui.highlight:writePdfAnnotation("content", annotation, value)
local type_after = self.getBookmarkType(annotation)
if type_before ~= type_after then
if type_before == "highlight" then
@@ -1290,12 +1318,18 @@ function ReaderBookmark:setBookmarkNote(item_or_index, is_new_note, new_note, ca
input_dialog:onShowKeyboard()
end
function ReaderBookmark:editHighlightedText(item, caller_callback)
function ReaderBookmark:editHighlightedText(item_or_index, caller_callback)
local item
if self.bookmark_menu then
item = item_or_index -- in item_table
else -- from Highlight
item = self.ui.annotation.annotations[item_or_index]
end
local input_dialog
input_dialog = InputDialog:new{
title = _("Edit highlighted text"),
description = " " .. self:_getDialogHeader(item),
input = item.text_orig,
input = item.text_orig or item.text,
allow_newline = true,
add_scroll_buttons = true,
use_available_height = true,
@@ -1312,7 +1346,7 @@ function ReaderBookmark:editHighlightedText(item, caller_callback)
text = _("Save"),
is_enter_default = true,
callback = function()
self:setHighlightedText(item, input_dialog:getInputText(), caller_callback)
self:setHighlightedText(item_or_index, input_dialog:getInputText(), caller_callback)
UIManager:close(input_dialog)
end,
},
@@ -1323,23 +1357,32 @@ function ReaderBookmark:editHighlightedText(item, caller_callback)
input_dialog:onShowKeyboard()
end
function ReaderBookmark:setHighlightedText(item, text, caller_callback)
function ReaderBookmark:setHighlightedText(item_or_index, text, caller_callback)
local item, index
if self.bookmark_menu then
item = item_or_index -- in item_table
index = self:getBookmarkItemIndex(item)
else -- from Highlight
index = item_or_index
end
local annotation = self.ui.annotation.annotations[index]
local edited
if text then
edited = true
else -- reset to selected text
if self.ui.rolling then
text = self.ui.document:getTextFromXPointers(item.pos0, item.pos1)
text = self.ui.document:getTextFromXPointers(annotation.pos0, annotation.pos1)
else
text = self.ui.document:getTextFromPositions(item.pos0, item.pos1).text
text = self.ui.document:getTextFromPositions(annotation.pos0, annotation.pos1).text
end
end
local index = self:getBookmarkItemIndex(item)
self.ui.annotation.annotations[index].text = text
self.ui.annotation.annotations[index].text_edited = edited
item.text_orig = text
item.text = self:getBookmarkItemText(item)
item.text_edited = edited
annotation.text = text
annotation.text_edited = edited
if item then
item.text_orig = text
item.text = self:getBookmarkItemText(item)
item.text_edited = edited
end
caller_callback()
end