[Android] Wifi status in footer (#3396)

Implemented through the Android API so it's reasonably cheap.
pull/3443/head
mwoz123 7 years ago committed by Frans de Jonge
parent 575fc82081
commit a01271b8a6

@ -27,6 +27,7 @@ local MODE = {
chapter_time_to_read = 7, chapter_time_to_read = 7,
frontlight = 8, frontlight = 8,
mem_usage = 9, mem_usage = 9,
wifi_status = 10,
} }
local MODE_NB = 0 local MODE_NB = 0
@ -101,6 +102,14 @@ local footerTextGeneratorMap = {
end end
return "" return ""
end, end,
wifi_status = function()
local NetworkMgr = require("ui/network/manager")
if NetworkMgr:isWifiOn() then
return "W:On"
else
return "W:Off"
end
end,
} }
local ReaderFooter = WidgetContainer:extend{ local ReaderFooter = WidgetContainer:extend{
@ -138,6 +147,7 @@ function ReaderFooter:init()
chapter_time_to_read = true, chapter_time_to_read = true,
frontlight = false, frontlight = false,
mem_usage = false, mem_usage = false,
wifi_status = false,
} }
if self.settings.disabled then if self.settings.disabled then
@ -331,6 +341,7 @@ local option_titles = {
chapter_time_to_read = _("Chapter time to read"), chapter_time_to_read = _("Chapter time to read"),
frontlight = _("Frontlight level"), frontlight = _("Frontlight level"),
mem_usage = _("KOReader memory usage"), mem_usage = _("KOReader memory usage"),
wifi_status = _("Wi-Fi status"),
} }
function ReaderFooter:addToMainMenu(menu_items) function ReaderFooter:addToMainMenu(menu_items)
@ -458,6 +469,9 @@ function ReaderFooter:addToMainMenu(menu_items)
table.insert(sub_items, getMinibarOption("frontlight")) table.insert(sub_items, getMinibarOption("frontlight"))
end end
table.insert(sub_items, getMinibarOption("mem_usage")) table.insert(sub_items, getMinibarOption("mem_usage"))
if Device:isAndroid() then
table.insert(sub_items, getMinibarOption("wifi_status"))
end
end end
-- this method will be updated at runtime based on user setting -- this method will be updated at runtime based on user setting
@ -606,6 +620,7 @@ function ReaderFooter:applyFooterMode(mode)
-- 7 for from statistics chapter time to read -- 7 for from statistics chapter time to read
-- 8 for front light level -- 8 for front light level
-- 9 for memory usage -- 9 for memory usage
-- 10 for wifi status
if mode ~= nil then self.mode = mode end if mode ~= nil then self.mode = mode end
self.view.footer_visible = (self.mode ~= MODE.off) self.view.footer_visible = (self.mode ~= MODE.off)
if not self.view.footer_visible or self.settings.all_at_once then return end if not self.view.footer_visible or self.settings.all_at_once then return end

@ -59,6 +59,9 @@ function Device:initNetworkManager(NetworkMgr)
NetworkMgr.turnOffWifi = function() NetworkMgr.turnOffWifi = function()
android.setWifiEnabled(false) android.setWifiEnabled(false)
end end
NetworkMgr.isWifiOn = function()
return android.isWifiEnabled()
end
end end
return Device return Device

@ -25,6 +25,7 @@ end
-- NetworkMgr:setWirelessBackend -- NetworkMgr:setWirelessBackend
function NetworkMgr:turnOnWifi() end function NetworkMgr:turnOnWifi() end
function NetworkMgr:turnOffWifi() end function NetworkMgr:turnOffWifi() end
function NetworkMgr:isWifiOn() end
function NetworkMgr:getNetworkList() end function NetworkMgr:getNetworkList() end
function NetworkMgr:getCurrentNetwork() end function NetworkMgr:getCurrentNetwork() end
function NetworkMgr:authenticateNetwork() end function NetworkMgr:authenticateNetwork() end

Loading…
Cancel
Save