Skip to content

Debloat any Android or Google TV over Wi-Fi and get an Apple TV-style home.

README: a shorter Halloween line, and the card's 360 and 30 in plain digits (the pumpkin 0s read as 36 and 3)

Gathin23718f98c96e68
diff --git a/README.md b/README.md
index 753bb2252..a5b7a6090 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
</p>
<p align="center">
- πŸŽƒ <b>New: the Halloween pack.</b> A spooky Home and a Haunted screensaver for your TV, until 1 November. <a href="https://cleanyour.tv/halloween">cleanyour.tv/halloween</a>
+ πŸŽƒ <b>New: the Halloween pack</b> (until 1 Nov): <a href="https://cleanyour.tv/halloween">cleanyour.tv/halloween</a>
</p>
<p align="center">
diff --git a/docs/card-halloween.jpg b/docs/card-halloween.jpg
index ce5a4d42d..41cb70b7f 100644
Binary files a/docs/card-halloween.jpg and b/docs/card-halloween.jpg differ
diff --git a/docs/pumpkin-3d.png b/docs/pumpkin-3d.png
deleted file mode 100644
index bf1c93b29..000000000
Binary files a/docs/pumpkin-3d.png and /dev/null differ
diff --git a/docs/stats-halloween.png b/docs/stats-halloween.png
index 1cac03682..ab1fefea7 100644
Binary files a/docs/stats-halloween.png and b/docs/stats-halloween.png differ
diff --git a/tools/readme_card.py b/tools/readme_card.py
index 43453432f..50e0f8bc0 100644
--- a/tools/readme_card.py
+++ b/tools/readme_card.py
@@ -6,7 +6,7 @@ python3 tools/readme_card.py Fredoka.ttf docs/card.jpg
python3 tools/readme_card.py --halloween Fredoka.ttf docs/card-halloween.jpg # the October variant
The Halloween variant keeps the layout and the generated numbers: it shows docs/stats-halloween.png
(python3 tools/readme_stats.py --halloween Fredoka.ttf docs/stats-halloween.png: the same numbers in pumpkin
-orange, each 0 a pumpkin), recolours the headings to orange, adds a thin dripping stripe and a few bats, and
+orange), recolours the headings to orange, adds a thin dripping stripe and a few bats, and
shows docs/new-home-halloween.jpg as AFTER. docs/card.jpg is not touched, so the README goes back with one line.
Fredoka is the variable TTF from Google Fonts, and its file is not in this repo: pass the path of the
copy you downloaded. The four pictures it stacks are this checkout's own - docs/stock-home.jpg,
diff --git a/tools/readme_stats.py b/tools/readme_stats.py
index 2f2221736..8a3b04d4a 100644
--- a/tools/readme_stats.py
+++ b/tools/readme_stats.py
@@ -3,9 +3,8 @@
Update STATS, then: python3 tools/readme_stats.py Fredoka.ttf docs/stats.png
and rebuild the card with tools/readme_card.py.
python3 tools/readme_stats.py --halloween Fredoka.ttf docs/stats-halloween.png draws the October strip for
-tools/readme_card.py --halloween: the same STATS in pumpkin orange, each digit 0 the 3D pumpkin of the
-spooky logo (docs/pumpkin-3d.png). Fredoka is the variable TTF from Google Fonts, and its
-file is not in this repo: download it and pass the path of the copy you saved.
+tools/readme_card.py --halloween: the same STATS in pumpkin orange. Fredoka is the variable TTF from
+Google Fonts, and its file is not in this repo: download it and pass the path of the copy you saved.
"""
import os
import sys
@@ -91,44 +90,12 @@ def f(size, wt):
f(12, 400) # the font is the argument the reader brings, so a wrong one is named before any drawing
num, lab = f(92, 600), f(30, 500)
NUM_FILL = "#ff9a3c" if HALLOWEEN else "#cfffcf"
-PUMPKIN = None
-if HALLOWEEN:
- if not os.path.isfile("docs/pumpkin-3d.png"):
- sys.exit("cannot read docs/pumpkin-3d.png: the Halloween strip draws each 0 as that picture, so run "
- "this from the repository root. Nothing was written.")
- PUMPKIN = Image.open("docs/pumpkin-3d.png").convert("RGBA")
- PUMPKIN = PUMPKIN.crop(PUMPKIN.getbbox())
-
-
-def number(d, cx, n):
- """`n` with each 0 drawn as the pumpkin: as tall as the digits, standing on their baseline."""
- top, bottom = d.textbbox((0, 40), "3", font=num)[1::2]
- h = bottom - top
- pk = PUMPKIN.resize((round(PUMPKIN.width * h / PUMPKIN.height), h), Image.LANCZOS)
- gap = 10
- parts = n.split("0")
- seq = []
- for i, text in enumerate(parts):
- if text:
- seq.append(("t", text, d.textlength(text, font=num)))
- if i < len(parts) - 1:
- seq.append(("p", None, pk.width + gap))
- x = cx - sum(w for _, _, w in seq) / 2
- for kind, text, w in seq:
- if kind == "t":
- d.text((x, 40), text, font=num, fill=NUM_FILL)
- else:
- img.paste(pk, (round(x + gap / 2), bottom - h), pk)
- x += w
PAD = 70
col = (W - 2 * PAD) / len(STATS)
for i, (n, l) in enumerate(STATS):
cx = PAD + col * i + col / 2
- if HALLOWEEN and "0" in n:
- number(d, cx, n)
- else:
- w = d.textlength(n, font=num); d.text((cx - w / 2, 40), n, font=num, fill=NUM_FILL)
+ w = d.textlength(n, font=num); d.text((cx - w / 2, 40), n, font=num, fill=NUM_FILL)
sp = 5; w = sum(d.textlength(c, font=lab) for c in l) + sp * (len(l) - 1); x = cx - w / 2
for c in l: d.text((x, 160), c, font=lab, fill="#aab3bd"); x += d.textlength(c, font=lab) + sp
if i: d.line([(PAD + col * i, 56), (PAD + col * i, H - 56)], fill="#2c313a", width=3)