Skip to content

Commit 809d13e

Browse files
committed
functora:card wip
1 parent 98b66d5 commit 809d13e

File tree

2 files changed

+41
-39
lines changed

2 files changed

+41
-39
lines changed

pub/functora/cfg/card.toml

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[img]
2+
out = "./img/functora-card-"
23
dpi = 96
34
width = 2100
45
height = 1200
@@ -19,18 +20,8 @@ vertical = true
1920
[[group.item]]
2021
kind = "Head"
2122
data = "Functora"
22-
size = 90
23-
padX = 734
24-
[[group.item]]
25-
kind = "Head"
26-
data = "Hi-end quality software development."
27-
size = 30
28-
padX = 635
29-
[[group.item]]
30-
kind = "Head"
31-
data = "Reliable. Functional. Pure."
32-
size = 30
33-
padX = 714
23+
size = 150
24+
padX = 585
3425
[[group.item]]
3526
data = "0xe677"
3627
kind = "Icon"
@@ -45,25 +36,28 @@ size = 590
4536
data = "https://functora.github.io"
4637
kind = "Note"
4738
size = 30
48-
padY = 5
39+
padY = 0
4940

5041
[[group]]
5142
[[group.item]]
43+
kind = "Head"
44+
data = ""
45+
size = 150
46+
[[group.item]]
5247
data = "0xe636"
5348
kind = "Icon"
54-
size = 210
55-
padX = 168
56-
padY = 236
49+
size = 217
50+
padX = 164
5751
[[group.item]]
5852
data = "https://functora.github.io/apps/currency-converter"
5953
kind = "Qr"
6054
size = 590
61-
padY = 52
55+
padY = 53
6256
[[group.item]]
6357
data = "https://functora.github.io/apps/"
6458
kind = "Note"
6559
size = 30
66-
padY = 5
60+
padY = 8
6761
[[group.item]]
6862
data = "currency-converter"
6963
kind = "Note"
@@ -72,21 +66,24 @@ padY = 0
7266

7367
[[group]]
7468
[[group.item]]
69+
kind = "Head"
70+
data = ""
71+
size = 150
72+
[[group.item]]
7573
data = "0xe60e"
7674
kind = "Icon"
7775
size = 180
7876
padX = 198
79-
padY = 240
8077
[[group.item]]
8178
data = "https://play.google.com/store/apps/details?id=com.functora.currency_converter"
8279
kind = "Qr"
8380
size = 594
84-
padY = 70
81+
padY = 90
8582
[[group.item]]
8683
data = "https://play.google.com/store/apps/"
8784
kind = "Note"
8885
size = 30
89-
padY = 5
86+
padY = 16
9087
[[group.item]]
9188
data = "details?id=com.functora.currency_converter"
9289
kind = "Note"

pub/functora/src/card/Functora/Card.hs

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ main = withUtf8 $ do
2626
fmap (foldl1 const) $ case cli of
2727
CliTextConf txt _ -> forM txt unToml
2828
CliFileConf loc _ -> forM loc $ readFile >=> unToml
29-
putStrLn $ inspect @Text @Cfg cfg
3029
headFont <- mkFont $ cfg ^. #cfgFont . #cfgFontHead
3130
iconFont <- mkFont $ cfg ^. #cfgFont . #cfgFontIcon
3231
noteFont <- mkFont $ cfg ^. #cfgFont . #cfgFontNote
@@ -47,6 +46,7 @@ main = withUtf8 $ do
4746
forM_ (Extra (Px width) (Px height) False : cfgExtra cfg) $ \ext -> do
4847
let extWidth = ext ^. #extraWidth . #unPx
4948
let extHeight = ext ^. #extraHeight . #unPx
49+
let out = from @Text @String $ cfg ^. #cfgImg . #imgOut
5050
let fin =
5151
R.renderDrawingAtDpi
5252
extWidth
@@ -59,23 +59,27 @@ main = withUtf8 $ do
5959
(unsafeFrom @Int @Float (extHeight - height) / 2)
6060
if extraVertical ext
6161
then
62-
CP.writePng
63-
( "./img/card-"
64-
<> inspect extHeight
65-
<> "x"
66-
<> inspect extWidth
67-
<> ".png"
68-
)
69-
$ JP.rotateRight90 fin
62+
( do
63+
let file =
64+
out
65+
<> inspect extHeight
66+
<> "x"
67+
<> inspect extWidth
68+
<> ".png"
69+
CP.writePng file $ JP.rotateRight90 fin
70+
putStrLn $ "Created ==> " <> file
71+
)
7072
else
71-
CP.writePng
72-
( "./img/card-"
73-
<> inspect extWidth
74-
<> "x"
75-
<> inspect extHeight
76-
<> ".png"
77-
)
78-
fin
73+
( do
74+
let file =
75+
out
76+
<> inspect extWidth
77+
<> "x"
78+
<> inspect extHeight
79+
<> ".png"
80+
CP.writePng file fin
81+
putStrLn $ "Created ==> " <> file
82+
)
7983

8084
mkFont :: Text -> IO TT.Font
8185
mkFont =
@@ -234,7 +238,8 @@ data Cfg = Cfg
234238
via GenericType Cfg
235239

236240
data Img = Img
237-
{ imgDpi :: Px,
241+
{ imgOut :: Text,
242+
imgDpi :: Px,
238243
imgWidth :: Px,
239244
imgHeight :: Px,
240245
imgPadX :: Px,

0 commit comments

Comments
 (0)