Remove onSetFullScreen() (#12871)

This commit is contained in:
hius07
2024-12-09 12:33:16 +02:00
committed by GitHub
parent 0386e2619e
commit 7444ec53e9
5 changed files with 11 additions and 68 deletions

View File

@@ -946,11 +946,6 @@ function ReaderView:onRestoreDimensions(dimensions)
self:recalculate()
end
function ReaderView:onSetFullScreen(full_screen)
self.footer_visible = not full_screen
self.ui:handleEvent(Event:new("SetDimensions", Screen:getSize()))
end
function ReaderView:onSetScrollMode(page_scroll)
if self.ui.paging and page_scroll
and self.ui.zooming.paged_modes[self.zoom_mode]
@@ -991,13 +986,8 @@ function ReaderView:onReadSettings(config)
or Screen.DEVICE_ROTATED_UPRIGHT
self:onSetRotationMode(rotation_mode)
end
local full_screen = config:readSetting("kopt_full_screen") or self.document.configurable.full_screen
if full_screen == 0 then
self.footer_visible = false
end
self:resetLayout()
local page_scroll = config:readSetting("kopt_page_scroll") or self.document.configurable.page_scroll
self.page_scroll = page_scroll == 1 and true or false
self.page_scroll = (config:readSetting("kopt_page_scroll") or self.document.configurable.page_scroll) == 1
self.inverse_reading_order = config:isTrue("inverse_reading_order") or G_reader_settings:isTrue("inverse_reading_order")
self.page_overlap_enable = config:isTrue("show_overlap_enable") or G_reader_settings:isTrue("page_overlap_enable") or G_defaults:readSetting("DSHOWOVERLAP")
self.page_overlap_style = config:readSetting("page_overlap_style") or G_reader_settings:readSetting("page_overlap_style") or "dim"
@@ -1059,7 +1049,7 @@ function ReaderView:onReaderFooterVisibilityChange()
if self.ui.paging and self.state.page then
-- We don't need to do anything if reclaim is enabled ;).
if not self.footer.settings.reclaim_height then
-- NOTE: Mimic what onSetFullScreen does, since, without reclaim, toggling the footer affects the available area,
-- NOTE: Without reclaim, toggling the footer affects the available area,
-- so we need to recompute the full layout.
-- NOTE: ReaderView:recalculate will snap visible_area to page_area edges (depending on zoom direction).
-- We don't actually want to move here, so save & restore our current visible_area *coordinates*...

View File

@@ -258,7 +258,6 @@ local settingsList = {
kopt_zoom_direction = {category="string", paging=true},
kopt_page_scroll = {category="string", paging=true},
kopt_page_gap_height = {category="string", paging=true},
kopt_full_screen = {category="string", paging=true},
kopt_line_spacing = {category="configurable", paging=true},
kopt_justification = {category="configurable", paging=true},
kopt_font_size = {category="string", paging=true, title=_("Font Size")},
@@ -488,7 +487,6 @@ local dispatcher_menu_order = {
"kopt_zoom_direction",
"kopt_page_scroll",
"kopt_page_gap_height",
"kopt_full_screen",
"kopt_line_spacing",
"kopt_justification",
"kopt_font_size",

View File

@@ -368,17 +368,6 @@ left to right or reverse, top to bottom or reverse.]]),
precision = "%.1f",
},
},
{
name = "full_screen",
name_text = _("Progress Bar"),
toggle = {_("off"), _("on")},
values = {1, 0},
default_value = 1,
event = "SetFullScreen",
args = {true, false},
show = false, -- toggling bottom status can be done via tap
name_text_hold_callback = optionsutil.showValues,
},
{
name = "line_spacing",
name_text = _("Line Spacing"),

View File

@@ -11,7 +11,7 @@ local util = require("util")
local _ = require("gettext")
-- Date at which the last migration snippet was added
local CURRENT_MIGRATION_DATE = 20241207
local CURRENT_MIGRATION_DATE = 20241208
-- Retrieve the date of the previous migration, if any
local last_migration_date = G_reader_settings:readSetting("last_migration_date", 0)
@@ -768,5 +768,13 @@ if last_migration_date < 20241207 then
ffiUtil.purgeDir(DataStorage:getDataDir() .. "/plugins/patchmanagement.koplugin")
end
-- 20241208, Remove unused setting.
-- https://github.com/koreader/koreader/pull/12871
if last_migration_date < 20241208 then
logger.info("Performing one-time migration for 20241208")
G_reader_settings:delSetting("kopt_full_screen")
end
-- We're done, store the current migration date
G_reader_settings:saveSetting("last_migration_date", CURRENT_MIGRATION_DATE)

View File

@@ -120,48 +120,6 @@ describe("Readerfooter module", function()
readerui:onClose()
end)
it("should setup footer as invisible in full screen mode", function()
G_reader_settings:saveSetting("reader_footer_mode", 1)
-- default settings
local sample_pdf = "spec/front/unit/data/2col.pdf"
purgeDir(DocSettings:getSidecarDir(sample_pdf))
os.remove(DocSettings:getHistoryPath(sample_pdf))
local cfg = DocSettings:open(sample_pdf)
cfg:saveSetting("kopt_full_screen", 0)
cfg:flush()
local readerui = ReaderUI:new{
dimen = Screen:getSize(),
document = DocumentRegistry:openDocument(sample_pdf),
}
assert.is.same(false, readerui.view.footer_visible)
G_reader_settings:delSetting("reader_footer_mode")
readerui:closeDocument()
readerui:onClose()
end)
it("should setup footer as visible in mini progress bar mode", function()
G_reader_settings:saveSetting("reader_footer_mode", 1)
-- default settings
local sample_pdf = "spec/front/unit/data/2col.pdf"
purgeDir(DocSettings:getSidecarDir(sample_pdf))
os.remove(DocSettings:getHistoryPath(sample_pdf))
local cfg = DocSettings:open(sample_pdf)
cfg:delSetting("kopt_full_screen")
cfg:flush()
local readerui = ReaderUI:new{
dimen = Screen:getSize(),
document = DocumentRegistry:openDocument(sample_pdf),
}
assert.is.same(true, readerui.view.footer_visible)
G_reader_settings:delSetting("reader_footer_mode")
readerui:closeDocument()
readerui:onClose()
end)
it("should setup footer as invisible", function()
G_reader_settings:saveSetting("reader_footer_mode", 1)
-- default settings