Update nerdfonts symbol codepoints for the updated version with no PUA (#5595)

* Update nerdfonts symbol codepoints for the updated version with no PUA conflicts

Should no longer stomp on Arabic & CJK PUA stuff.
pull/5603/head
NiLuJe 5 years ago committed by GitHub
parent e166a77eba
commit b21b4c8776
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -52,13 +52,13 @@ local symbol_prefix = {
icons = { icons = {
time = "", time = "",
pages_left = "", pages_left = "",
battery = "", battery = "",
percentage = "", percentage = "",
book_time_to_read = "", book_time_to_read = "",
chapter_time_to_read = "", chapter_time_to_read = "",
frontlight = "", frontlight = "",
mem_usage = "", mem_usage = "",
wifi_status = "", wifi_status = "",
} }
} }
local PROGRESS_BAR_STYLE_THICK_DEFAULT_HEIGHT = 7 local PROGRESS_BAR_STYLE_THICK_DEFAULT_HEIGHT = 7
@ -89,30 +89,30 @@ local footerTextGeneratorMap = {
-- If we're using icons, use fancy variable icons -- If we're using icons, use fancy variable icons
if symbol_type == "icons" then if symbol_type == "icons" then
if powerd:isCharging() then if powerd:isCharging() then
prefix = "" prefix = ""
else else
if batt_lvl >= 100 then if batt_lvl >= 100 then
prefix = "" prefix = ""
elseif batt_lvl >= 90 then elseif batt_lvl >= 90 then
prefix = "" prefix = ""
elseif batt_lvl >= 80 then elseif batt_lvl >= 80 then
prefix = "" prefix = ""
elseif batt_lvl >= 70 then elseif batt_lvl >= 70 then
prefix = "" prefix = ""
elseif batt_lvl >= 60 then elseif batt_lvl >= 60 then
prefix = "" prefix = ""
elseif batt_lvl >= 50 then elseif batt_lvl >= 50 then
prefix = "" prefix = ""
elseif batt_lvl >= 40 then elseif batt_lvl >= 40 then
prefix = "" prefix = ""
elseif batt_lvl >= 30 then elseif batt_lvl >= 30 then
prefix = "" prefix = ""
elseif batt_lvl >= 20 then elseif batt_lvl >= 20 then
prefix = "" prefix = ""
elseif batt_lvl >= 10 then elseif batt_lvl >= 10 then
prefix = "" prefix = ""
else else
prefix = "" prefix = ""
end end
end end
return prefix .. batt_lvl .. "%" return prefix .. batt_lvl .. "%"

@ -611,30 +611,30 @@ function TouchMenu:updateItems()
local batt_lvl = powerd:getCapacity() local batt_lvl = powerd:getCapacity()
time_info_txt = time_info_txt .. "" time_info_txt = time_info_txt .. ""
if powerd:isCharging() then if powerd:isCharging() then
time_info_txt = time_info_txt .. "" time_info_txt = time_info_txt .. ""
else else
if batt_lvl >= 100 then if batt_lvl >= 100 then
time_info_txt = time_info_txt .. "" time_info_txt = time_info_txt .. ""
elseif batt_lvl >= 90 then elseif batt_lvl >= 90 then
time_info_txt = time_info_txt .. "" time_info_txt = time_info_txt .. ""
elseif batt_lvl >= 80 then elseif batt_lvl >= 80 then
time_info_txt = time_info_txt .. "" time_info_txt = time_info_txt .. ""
elseif batt_lvl >= 70 then elseif batt_lvl >= 70 then
time_info_txt = time_info_txt .. "" time_info_txt = time_info_txt .. ""
elseif batt_lvl >= 60 then elseif batt_lvl >= 60 then
time_info_txt = time_info_txt .. "" time_info_txt = time_info_txt .. ""
elseif batt_lvl >= 50 then elseif batt_lvl >= 50 then
time_info_txt = time_info_txt .. "" time_info_txt = time_info_txt .. ""
elseif batt_lvl >= 40 then elseif batt_lvl >= 40 then
time_info_txt = time_info_txt .. "" time_info_txt = time_info_txt .. ""
elseif batt_lvl >= 30 then elseif batt_lvl >= 30 then
time_info_txt = time_info_txt .. "" time_info_txt = time_info_txt .. ""
elseif batt_lvl >= 20 then elseif batt_lvl >= 20 then
time_info_txt = time_info_txt .. "" time_info_txt = time_info_txt .. ""
elseif batt_lvl >= 10 then elseif batt_lvl >= 10 then
time_info_txt = time_info_txt .. "" time_info_txt = time_info_txt .. ""
else else
time_info_txt = time_info_txt .. "" time_info_txt = time_info_txt .. ""
end end
end end
time_info_txt = time_info_txt .. batt_lvl .. "%" time_info_txt = time_info_txt .. batt_lvl .. "%"

@ -1 +1 @@
Subproject commit fa96f653b0ffc11a2402a97b66e27819cb524e9d Subproject commit 63e7df0afe4df9804eb43a70def122814495cb7e

@ -164,7 +164,7 @@ describe("Readerfooter module", function()
local timeinfo = footer.textGeneratorMap.time(footer) local timeinfo = footer.textGeneratorMap.time(footer)
local page_count = readerui.document:getPageCount() local page_count = readerui.document:getPageCount()
-- stats has not been initialized here, so we get na TB and TC -- stats has not been initialized here, so we get na TB and TC
assert.are.same('1 / '..page_count..' | '..timeinfo..' | ⇒ 0 | 0% | ⤠ 0% | ⏳ na | ⤻ na', assert.are.same('1 / '..page_count..' | '..timeinfo..' | ⇒ 0 | 0% | ⤠ 0% | ⏳ na | ⤻ na',
footer.footer_text.text) footer.footer_text.text)
end) end)
@ -179,7 +179,7 @@ describe("Readerfooter module", function()
local footer = readerui.view.footer local footer = readerui.view.footer
readerui.view.footer:updateFooter() readerui.view.footer:updateFooter()
local timeinfo = readerui.view.footer.textGeneratorMap.time(footer) local timeinfo = readerui.view.footer.textGeneratorMap.time(footer)
assert.are.same('1 / 2 | '..timeinfo..' | ⇒ 1 | 0% | ⤠ 50% | ⏳ na | ⤻ na', assert.are.same('1 / 2 | '..timeinfo..' | ⇒ 1 | 0% | ⤠ 50% | ⏳ na | ⤻ na',
readerui.view.footer.footer_text.text) readerui.view.footer.footer_text.text)
end) end)
@ -197,7 +197,7 @@ describe("Readerfooter module", function()
footer:resetLayout() footer:resetLayout()
footer:updateFooter() footer:updateFooter()
local timeinfo = footer.textGeneratorMap.time(footer) local timeinfo = footer.textGeneratorMap.time(footer)
assert.are.same('1 / 2 | '..timeinfo..' | ⇒ 1 | 0% | ⤠ 50% | ⏳ na | ⤻ na', assert.are.same('1 / 2 | '..timeinfo..' | ⇒ 1 | 0% | ⤠ 50% | ⏳ na | ⤻ na',
footer.footer_text.text) footer.footer_text.text)
-- disable show all at once, page progress should be on the first -- disable show all at once, page progress should be on the first
@ -214,10 +214,10 @@ describe("Readerfooter module", function()
-- disable page left, battery should follow -- disable page left, battery should follow
tapFooterMenu(fake_menu, "Pages left in chapter".." (⇒)") tapFooterMenu(fake_menu, "Pages left in chapter".." (⇒)")
assert.are.same('0%', footer.footer_text.text) assert.are.same('0%', footer.footer_text.text)
-- disable battery, percentage should follow -- disable battery, percentage should follow
tapFooterMenu(fake_menu, "Battery status".." ()") tapFooterMenu(fake_menu, "Battery status".." ()")
assert.are.same('⤠ 50%', footer.footer_text.text) assert.are.same('⤠ 50%', footer.footer_text.text)
-- disable percentage, book time to read should follow -- disable percentage, book time to read should follow

Loading…
Cancel
Save