diff --git a/DefaultLayout.lua b/DefaultLayout.lua index c00a2dc..424643a 100644 --- a/DefaultLayout.lua +++ b/DefaultLayout.lua @@ -90,15 +90,26 @@ if props.shopState.selectedCurrency then local footer - if smolFont:getWidth(footerMessage) < display.bgCanvas.width then + local footerSize = theme.formatting.footerSize + if footerSize == "auto" and bigFont:getWidth(footerMessage) < display.bgCanvas.width then + footerSize = "large" + elseif footerSize == "auto" and smolFont:getWidth(footerMessage) < display.bgCanvas.width then + footerSize = "medium" + elseif footerSize == "auto" then + footerSize = "small" + end + if footerSize == "large" then + footer = BigText { display=display, text=footerMessage, x=1, y=display.bgCanvas.height-bigFont.height-6, align=theme.formatting.footerAlign, bg=theme.colors.footerBgColor, color = theme.colors.footerColor, width=display.bgCanvas.width } + footerHeight = smolFont.height + 6 + elseif footerSize == "medium" then footer = SmolText { display=display, text=footerMessage, x=1, y=display.bgCanvas.height-smolFont.height-4, align=theme.formatting.footerAlign, bg=theme.colors.footerBgColor, color = theme.colors.footerColor, width=display.bgCanvas.width } + footerHeight = smolFont.height + 4 else footer = BasicText { display=display, text=footerMessage, x=1, y=math.floor(display.bgCanvas.height/3), align=theme.formatting.footerAlign, bg=theme.colors.footerBgColor, color = theme.colors.footerColor, width=math.ceil(display.bgCanvas.width/2) } + footerHeight = smolFont.height + 4 end - table.insert(elements, footer) end - footerHeight = smolFont.height + 4 end local maxAddrWidth = 0 diff --git a/config.lua b/config.lua index f5fa6c9..2c56bca 100644 --- a/config.lua +++ b/config.lua @@ -27,6 +27,7 @@ formatting = { headerAlign = "center", footerAlign = "center", + footerSize = "auto", productNameAlign = "center", layout = "auto", -- "auto" automatically picks from "small", "medium", or "large" -- based on the size of the screen diff --git a/core/ConfigValidator.lua b/core/ConfigValidator.lua index 0eecf3a..ecadaaa 100644 --- a/core/ConfigValidator.lua +++ b/core/ConfigValidator.lua @@ -28,6 +28,7 @@ formatting = { headerAlign = "enum<'left' | 'center' | 'right'>: alignment", footerAlign = "enum<'left' | 'center' | 'right'>: alignment", + footerSize = "enum<'small' | 'medium' | 'large' | 'auto'>: size", productNameAlign = "enum<'left' | 'center' | 'right'>: alignment", layout = "enum<'small' | 'medium' | 'large' | 'auto' | 'custom'>: layout", layoutFile = "file?" diff --git a/fonts/bigfont.lua b/fonts/bigfont.lua index 2aabc5b..a4e1677 100644 --- a/fonts/bigfont.lua +++ b/fonts/bigfont.lua @@ -6,6 +6,6 @@ local bigFontData = base64.decode(cFont) local bigFontSheet = loadRIF(bigFontData) -local bigFont = createFont(bigFontSheet, " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789/-,.\164!:\6@") +local bigFont = createFont(bigFontSheet, " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789/-,.\164!:\6@'<>") return bigFont diff --git a/radon.lua b/radon.lua index b530a3e..1e5f815 100644 --- a/radon.lua +++ b/radon.lua @@ -1,7 +1,7 @@ local oldPullEvent = os.pullEvent os.pullEvent = os.pullEventRaw -local version = "1.2.0" +local version = "1.2.1" --- Imports local _ = require("util.score") diff --git a/res/cfont.lua b/res/cfont.lua index 72b1768..115d844 100644 --- a/res/cfont.lua +++ b/res/cfont.lua @@ -1,48 +1,57 @@ -- Base 64 encoded font data -return [[UklWAgGkAAoBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +return [[UklWAgH0AAoBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAABwAAAAAAAAAHAAAAAAdwAAAAcAAAcAAHBwAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAABw -AAAAAAAAAAAAAAAAAAAAAAAAAHdwB3dwAHdwB3dwB3d3B3d3AHd3BwAHB3cAAHBwAHBwAAcABwcA -BwB3cAd3AAd3AHd3AAd3cHd3cHAAcHAAcHAAcHAAcHAAcHd3cAd3AABwAAd3AAd3AAAHcHd3cAB3 -AHd3cAd3AAd3AAAAcAAAAAAAAAAHAHAHAAAAAAcAAAd3dwAAAAAAAAAAAAAABwAAAAAAAAAHAAAA -AHAAAAAAcAAAAAAABwAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAA -BwAHBwAHBwAHBwAHBwAABwAABwAABwAHAHAAAHBwBwBwAAdwdwdwBwcABwcAcHAAcHAAcHAAAABw -AHAAcHAAcHAAcAcHAAcHAAAAcHAAcAdwAHAAcHAAcABwcHAAAAcAAHAAcHAAcHAAcAAHAAAAAAAA -AAAHBwAHAAcAAHdwAHcAB3AAAAAAAAAAAHdwBwdwAHdwAHcHAHdwB3dwB3dwcHcAcAAHBwBwcAdw -cAd3cAB3cAcHcAB3BwcHcAB3dwd3BwAHBwAHBwAHBwAHBwAHB3d3B3d3B3dwBwAABwAHB3cAB3cA -BwB3B3d3AHAAAHB3cABwAAcHBwcHBwcABwd3AHAAcHd3AAd3AABwAHAAcHAAcHAAcABwAABwAAAH -AHAHcABwAAAAcAAAcAcAcHd3AHAAAAAAcHAAcHAAcAAHAAAAAAAAAAB3d3AHAAAAB3d3AHAHcHAA -AAAAAAAAAAAHB3AHBwAHBwB3BwAHAHAAcABwdwBwcAAHBwcAcAcHBwcABwcABwdwBwcAdwdwBwcA -AABwBwAHBwAHBwAHAHBwBwAHAABwBwAHBwAHBwAABwAHBwAABwAABwAHBwAHAHAAAHBwBwBwAAcA -BwcAdwcABwcAAHAAcHAAcAAAcABwAHAAcHAAcHAAcAcHAABwAABwAHBwcABwAAB3AAB3AHAAcAAA -cHd3AAAHAAd3AAd3cABwAHd3cAAAAAAHcAAHAAAAd3d3cHBwcHAAAAAAAAAAAHd3BwAHBwAABwAH -B3d3AHAAcABwcABwcAAHB3AAcAcHBwcABwcABwcABwcABwcAAAB3cABwBwAHBwAHBwcHAAcABwAH -AAcABwAHBwAHBwAABwAHBwAABwAABwAHBwAHAHAAAHBwAHBwAAcABwcABwcABwcAAHAAcHAAcAAA -cABwAHAAcAcHAHBwcHAAcABwAAcAAHcAcABwAAcAAAAAcHd3cAAAcHAAcABwAHAAcAAAcAcAAAAA -AAAAAAB3d3AHAAAAdwcHcHB3d3AAAAAAAAAABwAHBwAHBwAHBwAHBwAAAHAAB3dwcABwcHAHBwcA -cAcABwcABwcABwd3cAB3dwcAAAAABwBwBwAHAHBwBwcHAHBwAHd3AHAABwAHBwAHBwAHBwAHBwAA -BwAABwAHBwAHAHAHAHBwAHBwAAcABwcABwcABwcAAHAHAHAAcHAAcABwAHAAcAcHAHcHcHAAcABw -AHAAAHAAcABwAHAAcHAAcAAAcHAAcHAAcABwAHAAcAAHAAcAAAAAAAAAAAAHBwAAAAcAAAcAAHcA -AAAAAAAAAAAAAHd3B3dwAHdwAHd3AHd3AHAAAABwcABwcHAHBwBwBwcABwcABwB3cAcAAAAABwcA -AAd3cAAHAHd3AAcAAHd3BwAHAAAHB3d3BwAHB3dwAHdwB3dwB3d3BwAAAHdwBwAHB3cAdwBwAHB3 -dwcABwcABwB3cAcAAAdwcHAAcAd3AABwAAd3AABwAHAAcHAAcABwAHd3cAd3AHd3cHd3cAd3AAAA -cAd3AAd3AABwAAd3AAdwAHAAAAAAAAcABwAHAHAHAAAAAHdwAAd3dwAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAd3cAAAAAAAdwAAAAAAAAAAAAAAAAAAcAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAA -B3dwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAABwAA +AAAHcAAAAHAAAHAABwcAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAA +AAB3cAd3cAB3cAd3cAd3dwd3dwB3dwcABwd3AABwcABwcAAHAAcHAAcAd3AHdwAHdwB3dwAHd3B3 +d3BwAHBwAHBwAHBwAHBwAHB3d3AHdwAAcAAHdwAHdwAAB3B3d3AAdwB3d3AHdwAHdwAAAHAAAAAA +AAAABwBwBwAAAAAHAAAHd3cAAHAABwcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAHAAAAAAAAAAcAAAAAcAAAAABwAAAAAAAHAABwAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAHAAcHAAcHAAcHAAcHAAAHAAAHAAAHAAcAcAAAcHAHAHAA +B3B3B3AHBwAHBwBwcABwcABwcAAAAHAAcABwcABwcABwBwcABwcAAABwcABwB3AAcABwcABwAHBw +cAAABwAAcABwcABwcABwAAcAAAAAAAAAAAcHAAcABwAAd3AAdwAHcABwAHAAcAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHdwBwdwAHdwAHcHAHdwB3dwB3dwcHcAcAAH +BwBwcAdwcAd3cAB3cAcHcAB3BwcHcAB3dwd3BwAHBwAHBwAHBwAHBwAHB3d3B3d3B3dwBwAABwAH +B3cAB3cABwB3B3d3AHAAAHB3cABwAAcHBwcHBwcABwd3AHAAcHd3AAd3AABwAHAAcHAAcHAAcABw +AABwAAAHAHAHcABwAAAAcAAAcAcAcHd3AHAAAAAAcHAAcHAAcAAHAAAAAAAAAAB3d3AHAAAAB3d3 +AHAHcHAHAAcAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwdw +BwcABwcAdwcABwBwAHAAcHcAcHAABwcHAHAHBwcHAAcHAAcHcAcHAHcHcAcHAAAAcAcABwcABwcA +BwBwcAcABwAAcAcABwcABwcAAAcABwcAAAcAAAcABwcABwBwAABwcAcAcAAHAAcHAHcHAAcHAABw +AHBwAHAAAHAAcABwAHBwAHBwAHAHBwAAcAAAcABwcHAAcAAAdwAAdwBwAHAAAHB3dwAABwAHdwAH +d3AAcAB3d3AAAAAAB3AABwAAAHd3d3BwcHBwAABwAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAd3cHAAcHAAAHAAcHd3cAcABwAHBwAHBwAAcHcABwBwcHBwAHBwAH +BwAHBwAHBwAAAHdwAHAHAAcHAAcHBwcABwAHAAcABwAHAAcHAAcHAAAHAAcHAAAHAAAHAAcHAAcA +cAAAcHAAcHAABwAHBwAHBwAHBwAAcABwcABwAABwAHAAcABwBwcAcHBwcABwAHAABwAAdwBwAHAA +BwAAAABwd3dwAABwcABwAHAAcABwAABwBwAAAAAAAAAAAHd3cAcAAAB3BwdwcHd3cAAABwAABwAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAHBwAHBwAHBwAHBwAAAHAA +B3dwcABwcHAHBwcAcAcABwcABwcABwd3cAB3dwcAAAAABwBwBwAHAHBwBwcHAHBwAHd3AHAABwAH +BwAHBwAHBwAHBwAABwAABwAHBwAHAHAHAHBwAHBwAAcABwcABwcABwcAAHAHAHAAcHAAcABwAHAA +cAcHAHcHcHAAcABwAHAAAHAAcABwAHAAcHAAcAAAcHAAcHAAcABwAHAAcAAHAAcAAAAAAAAAAAAH +BwAAAAcAAAcAAHcAAAAAAABwAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAB3dwd3cAB3cAB3dwB3dwBwAAAAcHAAcHBwBwcAcAcHAAcHAAcAd3AHAAAAAAcHAAAHd3AA +BwB3dwAHAAB3dwcABwAABwd3dwcABwd3cAB3cAd3cAd3dwcAAAB3cAcABwd3AHcAcABwd3cHAAcH +AAcAd3AHAAAHcHBwAHAHdwAAcAAHdwAAcABwAHBwAHAAcAB3d3AHdwB3d3B3d3AHdwAAAHAHdwAH +dwAAcAAHdwAHcABwAAAAAAAHAAcABwBwBwAAAAB3cAAHd3cAAAAABwcAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3dwAAAAAAB3AAAAAA +AAAAAAAAAAAABwAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAHd3AAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAQAAAQAAAQAAAQAAAQAAEAAAEAAAEBAAA -QAAEAEAAAEAAAEAAAEAAAEAAAEAAAEAAAEAAQAAAQAAAQAAAQAAAQAAAQAAAQAAAQAAAQAAAQAAA -QAAAQAAAQAAAQAAAQABAAAQAAAQAAEAAAEAAAEAAAEAABAAABAAABAAABAAABAAABAAABAAABAAA -BAAABAAABAAABAAABAAABAAABAAABAAABAAABAAABAAABAAABAAABAAABAAEAAQAAAQABAAEAAAA -BAAAAAQAAAAAAP////////////////////////////////////////////////////////////// -////////f/9///n7Xu////////v/////YziGQTB08bredWMcwyHouq7rgvEexyc4g3H8/v9t/33w -///3//fvv//3/v////+//////991Xdf3fbev7UnWta7r767r1vXr5q67+r3ruvf/X3ePc/7/YzlO -YxjKXmsajuVUDtF1XdcFQdh3cdwE++JeVV3swvHuuu6+3+b+vi3sv657//9gf7Dp//9lXdPtLuvV -Vl2XNVm/Xdet3dt1fdf3Xbev7V3T9a777q7r1vuu7vPsvvAdhzv4n/cDqv7/Q9d3we66Xm7VdV3X -j9t11d3dXdd3fd91+7redV3vuu/u1qq79+zev+Dr7u7b//9gP6Xg/991XdfvoavVdl0XDv233Vqt -w951Xdf3Xbet613X9bbr7m5Nurvv7q77uu7u3v3/X3/f8///QzgOw/66WlvXjf3XhzfcQ/cFXTiG -QT92MbvQdWOfuvEe7667gzEIxm8c73Hu/91t/3jw////////8H/+///ff///////4f////////// -///////////////////////////f////////vu/7vvd9vbfv+77v++77vu/7vu/7vu/77n3v+773 -fd/3fd/3fd/3fd/3fd/3fXff3d/f/w==]] \ No newline at end of file +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAQAAAQAAA +QAAAQAAAQAAEAAAEAAAEBAAAQAAEAEAAAEAAAEAAAEAAAEAAAEAAAEAAAEAAQAAAQAAAQAAAQAAA +QAAAQAAAQAAAQAAAQAAAQAAAQAAAQAAAQAAAQAAAQABAAAQAAAQAAEAAAEAAAEAAAEAABAAABAAA +BAAABAAABAAABAAABAAABAAABAAABAAABAAABAAABAAABAAABAAABAAABAAABAAABAAABAAABAAA +BAAABAAEAAQAAAQABAAEAAAABAAAAAQABAAAQAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAD///////////////////////////////////////////////////////////// +//////////////////////9//3//+fte7///////+/////9jOIZBMHTxut51YxzDIei6ruuC8R7H +JziDcfz+/23/ffBe///////////////3//fvv//3/v////+//////991Xdf3fbev7UnWta7r767r +1vXr5q67+r3ruvf/X3ePc+7u/////////////2M5TmMYyl5rGo7lVA7RdV3XBUHYd3HcBPviXlVd +7MLx7rruvt/m/r4t7L+ue///YH+waff9/////////////2Vd0+0u69VWXZc1Wb9d163d23V91/dd +t6/tXdP1rvvuruvW+67u8+y+8B2HO/if9wOqvr//////////////Q9d3we66Xm7VdV3Xj9t11d3d +Xdd3fd91+7redV3vuu/u1qq79+zev+Dr7u7b//9gP6Xg9/3////////////fdV3X76Gr1XZdFw79 +t91arcPedV3X9123retd1/W26+5uTbq77+6u+7ru7t79/19/3/P/7v////////////9DOA7D/rpa +W9eN/deHN9xD9wVdOIZBP3Yxu9B1Y5+68R7vrruDMQjGbxzvce7/3W3/ePBf//////////////// +////8H/+///ff///////4f/////////////////////////////////////f//////////////// +/////77v+773fb237/u+7/vu+77v+77v+77v++597/u+933f933f933f933f933f9313393f3733 +////////////]] \ No newline at end of file diff --git a/res/cfont.rif b/res/cfont.rif index 2a7def0..a3272c0 100644 --- a/res/cfont.rif +++ b/res/cfont.rif Binary files differ