ReaderActivityIndicator: Oh god, my eyes, they buuuuurn.

Make this a real boy, with a transient lipc handle.
And get rid of the insane 1s sleep on affected ReaderView paints,
because ouchy.

This is completely deprecated anyway, so this is entirely pointless,
and mainly to prevent implementation details from creeping into
reader.lua.
reviewable/pr10821/r1
NiLuJe 9 months ago
parent ac1358e0f0
commit 4acf131071

@ -2,10 +2,8 @@
local ReaderActivityIndicator = {} local ReaderActivityIndicator = {}
function ReaderActivityIndicator:isStub() return true end function ReaderActivityIndicator:isStub() return true end
function ReaderActivityIndicator:init() end
function ReaderActivityIndicator:onStartActivityIndicator() end function ReaderActivityIndicator:onStartActivityIndicator() end
function ReaderActivityIndicator:onStopActivityIndicator() end function ReaderActivityIndicator:onStopActivityIndicator() end
function ReaderActivityIndicator:coda() end
-- Now, if we're on Kindle, and we haven't actually murdered Pillow, see what we can do... -- Now, if we're on Kindle, and we haven't actually murdered Pillow, see what we can do...
local Device = require("device") local Device = require("device")
@ -31,7 +29,9 @@ local EventListener = require("ui/widget/eventlistener")
local util = require("ffi/util") local util = require("ffi/util")
-- lipc -- lipc
ReaderActivityIndicator = EventListener:new{} ReaderActivityIndicator = EventListener:extend{
lipc_handle = nil,
}
function ReaderActivityIndicator:isStub() return false end function ReaderActivityIndicator:isStub() return false end
@ -69,15 +69,15 @@ function ReaderActivityIndicator:onStopActivityIndicator()
"clientId":"com.github.koreader.activityindicator", \ "clientId":"com.github.koreader.activityindicator", \
"priority":true}}') "priority":true}}')
self.indicator_started = false self.indicator_started = false
util.usleep(1000000)
end end
return true return true
end end
function ReaderActivityIndicator:coda() function ReaderActivityIndicator:onCloseWidget()
if self.lipc_handle then if self.lipc_handle then
self.lipc_handle:close() self.lipc_handle:close()
end end
self.lipc_handle = nil
end end
return ReaderActivityIndicator return ReaderActivityIndicator

@ -334,9 +334,6 @@ local function exitReader()
end end
end end
local ReaderActivityIndicator =
require("apps/reader/modules/readeractivityindicator")
-- Save any device settings before closing G_reader_settings -- Save any device settings before closing G_reader_settings
Device:saveSettings() Device:saveSettings()
@ -344,9 +341,6 @@ local function exitReader()
G_reader_settings:saveSetting("closed_rotation_mode", Device.orig_rotation_mode or Device.screen:getRotationMode()) G_reader_settings:saveSetting("closed_rotation_mode", Device.orig_rotation_mode or Device.screen:getRotationMode())
G_reader_settings:close() G_reader_settings:close()
-- Close lipc handles
ReaderActivityIndicator:coda()
-- Restore initial inversion state -- Restore initial inversion state
Device.screen:setHWNightmode(hw_nightmode) Device.screen:setHWNightmode(hw_nightmode)

Loading…
Cancel
Save