mirror of
https://github.com/koreader/koreader
synced 2024-11-13 19:11:25 +00:00
a7f23efa65
Make 'em match backward & forward. Now that we have working overrides and the gesture manager, trying to fit them in a weird superset of the top corner tapzones in a vain attempt to avoid bad interactions doesn't make much sense anymore, and just makes the Gesture Manager UI confusing. Also make sure the corner zones override the L/R ones for double taps, like it's the case with other gestures. Fix #7710
102 lines
3.6 KiB
Lua
102 lines
3.6 KiB
Lua
describe("defaults module", function()
|
|
local Defaults, DataStorage
|
|
setup(function()
|
|
require("commonrequire")
|
|
Defaults = require("apps/filemanager/filemanagersetdefaults")
|
|
DataStorage = require("datastorage")
|
|
end)
|
|
|
|
it("should load all defaults from defaults.lua", function()
|
|
Defaults:init()
|
|
assert.is_same(101, #Defaults.defaults_name)
|
|
end)
|
|
|
|
it("should save changes to defaults.persistent.lua", function()
|
|
local persistent_filename = DataStorage:getDataDir() .. "/defaults.persistent.lua"
|
|
os.remove(persistent_filename)
|
|
|
|
-- To see indices and help updating this when new settings are added:
|
|
-- for i=1, 101 do print(i.." ".. Defaults.defaults_name[i]) end
|
|
|
|
-- not in persistent but checked in defaults
|
|
Defaults.changed[20] = true
|
|
Defaults.changed[50] = true
|
|
Defaults.changed[56] = true
|
|
Defaults.changed[85] = true
|
|
Defaults:saveSettings()
|
|
assert.is_same(101, #Defaults.defaults_name)
|
|
assert.is_same("DTAP_ZONE_BACKWARD", Defaults.defaults_name[86])
|
|
assert.is_same("DCREREADER_CONFIG_WORD_SPACING_LARGE", Defaults.defaults_name[50])
|
|
assert.is_same("DCREREADER_CONFIG_H_MARGIN_SIZES_XXX_LARGE", Defaults.defaults_name[20])
|
|
dofile(persistent_filename)
|
|
assert.is_same(DCREREADER_CONFIG_WORD_SPACING_LARGE, { [1] = 100, [2] = 90 })
|
|
assert.is_same(DTAP_ZONE_BACKWARD, { ["y"] = 0, ["x"] = 0, ["h"] = 1, ["w"] = 0.25 })
|
|
assert.is_same(DCREREADER_CONFIG_H_MARGIN_SIZES_XXX_LARGE, { [1] = 50, [2] = 50 })
|
|
assert.is_same(DDOUBLE_TAP_ZONE_PREV_CHAPTER, { ["y"] = 0, ["x"] = 0, ["h"] = 1, ["w"] = 0.25 })
|
|
|
|
-- in persistent
|
|
Defaults:init()
|
|
Defaults.changed[56] = true
|
|
Defaults.defaults_value[56] = {
|
|
y = 0,
|
|
x = 0,
|
|
h = 0.25,
|
|
w = 0.75
|
|
}
|
|
Defaults.changed[86] = true
|
|
Defaults.defaults_value[86] = {
|
|
y = 10,
|
|
x = 10.125,
|
|
h = 20.25,
|
|
w = 20.75
|
|
}
|
|
Defaults:saveSettings()
|
|
dofile(persistent_filename)
|
|
assert.is_same(DCREREADER_CONFIG_WORD_SPACING_LARGE, { [2] = 90, [1] = 100 })
|
|
assert.is_same(DDOUBLE_TAP_ZONE_PREV_CHAPTER, {
|
|
["y"] = 0,
|
|
["x"] = 0,
|
|
["h"] = 0.25,
|
|
["w"] = 0.75
|
|
})
|
|
assert.is_same(DCREREADER_CONFIG_H_MARGIN_SIZES_XXX_LARGE, { [2] = 50, [1] = 50 })
|
|
assert.is_same(DTAP_ZONE_BACKWARD, {
|
|
["y"] = 10,
|
|
["x"] = 10.125,
|
|
["h"] = 20.25,
|
|
["w"] = 20.75
|
|
})
|
|
os.remove(persistent_filename)
|
|
end)
|
|
|
|
it("should delete entry from defaults.persistent.lua if value is reverted back to default", function()
|
|
local persistent_filename = DataStorage:getDataDir() .. "/defaults.persistent.lua"
|
|
local fd = io.open(persistent_filename, "w")
|
|
fd:write(
|
|
[[-- For configuration changes that persists between updates
|
|
DCREREADER_CONFIG_H_MARGIN_SIZES_LARGE = {
|
|
[1] = 15,
|
|
[2] = 15
|
|
}
|
|
DCREREADER_VIEW_MODE = "page"
|
|
DHINTCOUNT = 2
|
|
]])
|
|
fd:close()
|
|
|
|
-- in persistent
|
|
Defaults:init()
|
|
Defaults.changed[58] = true
|
|
Defaults.defaults_value[58] = 1
|
|
Defaults:saveSettings()
|
|
dofile(persistent_filename)
|
|
assert.Equals(DCREREADER_VIEW_MODE, "page")
|
|
assert.is_same(DCREREADER_CONFIG_H_MARGIN_SIZES_LARGE, {
|
|
[2] = 15,
|
|
[1] = 15
|
|
})
|
|
assert.Equals(DGLOBAL_CACHE_FREE_PROPORTION, 1)
|
|
assert.Equals(DHINTCOUNT, 2)
|
|
os.remove(persistent_filename)
|
|
end)
|
|
end)
|