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

kobo: rename frontlight_state config to is_frontlight_on

Browse Source
This commit is contained in:
Qingping Hou
2016-03-02 00:05:56 -08:00
committed by NiLuJe
parent 8190093f83
commit 399d676cf0
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
frontend/ui/uimanager.lua
View File

@@ -64,23 +64,23 @@ function UIManager:init()
local kobo_light_on_start = tonumber(KOBO_LIGHT_ON_START)
if kobo_light_on_start then
local new_intensity
local new_state
local is_fl_on
if kobo_light_on_start > 0 then
new_intensity = math.min(kobo_light_on_start, 100)
new_state = true
is_fl_on = true
elseif kobo_light_on_start == 0 then
new_state = false
is_fl_on = false
elseif kobo_light_on_start == -2 then
local NickelConf = require("device/kobo/nickel_conf")
new_intensity = NickelConf.frontLightLevel.get()
new_state = NickelConf.frontLightState:get()
if new_state == nil then
is_fl_on = NickelConf.frontLightState:get()
if is_fl_on == nil then
-- this device does not support frontlight toggle,
-- we set the state based on frontlight intensity.
-- we set the value based on frontlight intensity.
if new_intensity > 0 then
new_state = true
is_fl_on = true
else
new_state = false
is_fl_on = false
end
end
end
@@ -90,7 +90,7 @@ function UIManager:init()
G_reader_settings:saveSetting("frontlight_intensity",
new_intensity)
end
G_reader_settings:saveSetting("frontlight_state", new_state)
G_reader_settings:saveSetting("is_frontlight_on", is_fl_on)
end
elseif Device:isKindle() then
self.event_handlers["IntoSS"] = function()

8
reader.lua
View File

@@ -122,14 +122,14 @@ if Device:isKobo() then
if powerd and powerd.restore_settings then
local intensity = G_reader_settings:readSetting("frontlight_intensity")
powerd.fl_intensity = intensity or powerd.fl_intensity
local state = G_reader_settings:readSetting("frontlight_state")
if state then
-- default state is off, turn it on
local is_fl_on = G_reader_settings:readSetting("is_frontlight_on")
if is_fl_on then
-- default is_fl_on is false, turn it on
powerd:toggleFrontlight()
else
-- the light can still be turned on manually outside of koreader
-- or nickel. so we always set the intensity to 0 here to keep it
-- in sync with the default state
-- in sync with powerd.is_fl_on (false by default)
-- NOTE: we cant use setIntensity method here because for kobo the
-- min intensity is 1 :(
powerd.fl:setBrightness(0)