Keep the integrated Sun Salutation guide clean on desktop

This commit is contained in:
waozi committed 2026-10-23 18:38:57 -03:00
1 parent bdc8b21eda
commit 4551dca454
25 files changed
+191 -64

No files matched your search

+4
View File
@@ -1,5 +1,9 @@
# Changelog
## [2.1.45] - 2026-10-23
- Practice illustrations keep clean, smooth edges on desktop, without dark seams across the Sun Salutation guide.
## [2.1.44] - 2026-10-23
- Lists: lists are chips that wrap onto more rows; pull the items down to show finished ones.
+4
View File
@@ -1,5 +1,9 @@
# Changelog
## [1.3.9] - 2026-10-23
- Maintenance release for Inner Breeze 2.1.45.
## [1.3.8] - 2026-10-23
- Maintenance release for Inner Breeze 2.1.44.
+4
View File
@@ -1,5 +1,9 @@
# Changelog
## [1.2.10] - 2026-10-23
- Maintenance release for Inner Breeze 2.1.45.
## [1.2.9] - 2026-10-23
- Maintenance release for Inner Breeze 2.1.44.
+4
View File
@@ -1,5 +1,9 @@
# Changelog
## [2.1.45] - 2026-10-23
- Bring Lumi 1.5.11, Habits 1.2.10, Practices 1.3.10, Lists 1.1.13, Diary 1.3.9 and Leaderboard 1.0.14 for Inner Breeze 2.1.45.
## [2.1.44] - 2026-10-23
- Bring Lumi 1.5.10, Habits 1.2.9, Practices 1.3.9, Lists 1.1.12, Diary 1.3.8 and Leaderboard 1.0.13 for Inner Breeze 2.1.44.
+4
View File
@@ -1,5 +1,9 @@
# Changelog
## [1.0.14] - 2026-10-23
- Maintenance release for Inner Breeze 2.1.45.
## [1.0.13] - 2026-10-23
- Maintenance release for Inner Breeze 2.1.44.
+4
View File
@@ -1,5 +1,9 @@
# Changelog
## [1.1.13] - 2026-10-23
- Maintenance release for Inner Breeze 2.1.45.
## [1.1.12] - 2026-10-23
- Lists are chips that wrap onto more rows; pull the items down to show or hide finished ones.
+4
View File
@@ -1,5 +1,9 @@
# Changelog
## [1.5.11] - 2026-10-23
- Maintenance release for Inner Breeze 2.1.45.
## [1.5.10] - 2026-10-23
- Maintenance release for Inner Breeze 2.1.44.
+4
View File
@@ -1,5 +1,9 @@
# Changelog
## [1.3.10] - 2026-10-23
- Maintenance release for Inner Breeze 2.1.45.
## [1.3.9] - 2026-10-23
- Maintenance release for Inner Breeze 2.1.44.
+21 -21
View File
@@ -5,59 +5,59 @@
"apps": {
"inbe": {
"id": "inbe",
"version": "2.1.44",
"sequence": 41,
"version": "2.1.45",
"sequence": 42,
"bundled": true,
"host_api": 27,
"release": "2.1.44"
"release": "2.1.45"
},
"habits": {
"id": "inbe.habits",
"version": "1.2.9",
"sequence": 21,
"version": "1.2.10",
"sequence": 22,
"bundled": true,
"host_api": 26,
"release": "2.1.44"
"release": "2.1.45"
},
"practices": {
"id": "inbe.practices",
"version": "1.3.9",
"sequence": 20,
"version": "1.3.10",
"sequence": 21,
"bundled": true,
"host_api": 23,
"release": "2.1.44"
"release": "2.1.45"
},
"lists": {
"id": "inbe.lists",
"version": "1.1.12",
"sequence": 20,
"version": "1.1.13",
"sequence": 21,
"bundled": true,
"host_api": 27,
"release": "2.1.44"
"release": "2.1.45"
},
"diary": {
"id": "inbe.diary",
"version": "1.3.8",
"sequence": 25,
"version": "1.3.9",
"sequence": 26,
"bundled": true,
"host_api": 21,
"release": "2.1.44"
"release": "2.1.45"
},
"lumi": {
"id": "inbe.lumi",
"version": "1.5.10",
"sequence": 28,
"version": "1.5.11",
"sequence": 29,
"bundled": true,
"host_api": 20,
"release": "2.1.44"
"release": "2.1.45"
},
"leaderboard": {
"id": "inbe.leaderboard",
"version": "1.0.13",
"sequence": 14,
"version": "1.0.14",
"sequence": 15,
"bundled": true,
"host_api": 25,
"release": "2.1.44"
"release": "2.1.45"
}
},
"node_apps": {
+2 -2
View File
@@ -67,8 +67,8 @@ android {
minSdk 21
targetSdk 36
testInstrumentationRunner "android.test.InstrumentationTestRunner"
versionCode 181
versionName "2.1.44"
versionCode 182
versionName "2.1.45"
manifestPlaceholders = [
inbeAppLabel: "Inner Breeze",
inbeUsesCleartextTraffic: "false"
@@ -0,0 +1 @@
- Practice illustrations keep clean, smooth edges on desktop, without dark seams across the Sun Salutation guide.
+1 -1
View File
@@ -1,5 +1,5 @@
Package: inbe.waozi
Version: 2.1.44
Version: 2.1.45
Architecture: arm64
Maintainer: Waozi <[email protected]>
Click-Version: 0.4
+1 -1
View File
@@ -28,7 +28,7 @@
<binary>inbe</binary>
</provides>
<releases>
<release version="2.1.44" date="2026-10-23"/>
<release version="2.1.45" date="2026-10-23"/>
</releases>
<content_rating type="oars-1.1"/>
</component>
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "inbe",
"title": "Inner Breeze",
"version": "2.1.44",
"version": "2.1.45",
"architecture": "arm64",
"framework": "ubuntu-sdk-20.04",
"description": "Syncable breathing, meditation, and habit practice app.",
+1 -1
View File
@@ -2,7 +2,7 @@
"manifest_version": 3,
"name": "Inner Breeze",
"short_name": "Inbe",
"version": "2.1.44",
"version": "2.1.45",
"description": "Breathing, meditation, habit tracking, and encrypted sync.",
"permissions": [
"contextMenus"
+1 -1
View File
@@ -22,7 +22,7 @@
<binary>inbe</binary>
</provides>
<releases>
<release version="2.1.44" date="2026-10-23"/>
<release version="2.1.45" date="2026-10-23"/>
</releases>
<content_rating type="oars-1.1"/>
</component>
+1 -1
View File
@@ -22,7 +22,7 @@
<binary>inbe</binary>
</provides>
<releases>
<release version="2.1.44" date="2026-10-23"/>
<release version="2.1.45" date="2026-10-23"/>
</releases>
<content_rating type="oars-1.1"/>
</component>
+1 -1
View File
@@ -6,7 +6,7 @@ description: |
meditation, and habit tracking with visual and audio cues, meditation
timers, habit counters, session history, and optional sync.
version: '2.1.44'
version: '2.1.45'
license: BSD-3-Clause
base: core22
confinement: strict
+2 -2
View File
@@ -3,7 +3,7 @@ PackageBundledVersion :: (index: s32) -> string {
if index < 0 || index >= 7 {
return ""
}
versions: [7]string = .["2.1.44", "1.1.12", "1.2.9", "1.3.9", "1.3.8", "1.5.10", "1.0.13"]
versions: [7]string = .["2.1.45", "1.1.13", "1.2.10", "1.3.10", "1.3.9", "1.5.11", "1.0.14"]
return versions[index]
}
@@ -11,6 +11,6 @@ PackageBundledSequence :: (index: s32) -> s32 {
if index < 0 || index >= 7 {
return 0
}
sequences: [7]s32 = .[41, 20, 21, 20, 25, 28, 14]
sequences: [7]s32 = .[42, 21, 22, 21, 26, 29, 15]
return sequences[index]
}
+2 -2
View File
@@ -3,7 +3,7 @@
#define APP_VERSION_MAJOR 2
#define APP_VERSION_MINOR 1
#define APP_VERSION_PATCH 44
#define APP_VERSION_STRING "2.1.44"
#define APP_VERSION_PATCH 45
#define APP_VERSION_STRING "2.1.45"
#endif
+2 -2
View File
@@ -1,5 +1,5 @@
// Generated by update_version.sh from CHANGELOG.md. Do not edit by hand.
VersionMajor :: 2
VersionMinor :: 1
VersionPatch :: 44
VersionString :: "2.1.44"
VersionPatch :: 45
VersionString :: "2.1.45"
+103 -9
View File
@@ -1,16 +1,23 @@
#!/usr/bin/env python3
"""Every practice shows its picture, and a running Sun Salutation its figure."""
import ast
import contextlib
import json
import os
from pathlib import Path
import shutil
import sqlite3
import subprocess
import sys
import tempfile
import time
from PIL import Image, ImageStat
from PIL import Image, ImageChops, ImageStat
assert int(os.environ.get("DISPLAY", ":0").split(":")[-1].split(".")[0]) >= 300
from ui_driver import UiDriver
DISPLAY_KEYS = ("DISPLAY", "WAYLAND_DISPLAY", "XAUTHORITY", "DBUS_SESSION_BUS_ADDRESS")
assert all(not os.environ.get(key) for key in DISPLAY_KEYS), "Inherited desktop environment"
root = Path(__file__).resolve().parents[1]
binary = Path(sys.argv[1]).resolve()
output = root / "build/practice-images-ui-test"
@@ -18,10 +25,14 @@ output.mkdir(parents=True, exist_ok=True)
WIDTH, HEIGHT = 390, 844
PRACTICES = ("wim-hof", "patterns", "meditation", "astral-projection",
"sun-salutation", "tai-chi", "workout")
driver = UiDriver(output / "driver")
environment = os.environ | driver.environment() | {
"SDL_VIDEODRIVER": "x11", "SDL_AUDIODRIVER": "dummy",
"YUE_DESKTOP_RECOVERY": "0", "APP_NO_TRAY": "1"}
def command(*args):
return subprocess.check_output(args, text=True, timeout=5).strip()
return subprocess.check_output(args, env=environment, text=True, timeout=5).strip()
def click(window, x, y):
@@ -45,6 +56,24 @@ def pictured(image, box):
return max(ImageStat.Stat(image.crop(box)).stddev) > 12
def state(window):
value = command("xprop", "-id", window, "_HARMONY_APP_STATE")
assert " = " in value, "App has not published its state"
return json.loads(ast.literal_eval(value.split(" = ", 1)[1]))
def pause(window, paused, request):
control = "practice.pause" if paused else "practice.resume"
command("xprop", "-id", window, "-f", "_HARMONY_APP_ACTION", "8s", "-set",
"_HARMONY_APP_ACTION", json.dumps(dict(control=control, request_id=request)))
deadline = time.monotonic() + 5
while state(window)["last_request_id"] != request:
assert time.monotonic() < deadline, "Pause action was not handled"
time.sleep(.05)
actual = state(window)
assert actual["last_request_ok"] and actual["paused"] == paused, actual
def stop(process):
if process.poll() is None:
process.terminate()
@@ -57,12 +86,13 @@ def stop(process):
def launch(profile, name):
log = (output / (name + ".log")).open("w")
app = subprocess.Popen([str(binary)], cwd=root, env=os.environ | {"APP_DATA_ROOT": str(profile)},
app = subprocess.Popen([str(binary)], cwd=root, env=environment | {"APP_DATA_ROOT": str(profile)},
stdout=log, stderr=subprocess.STDOUT)
driver.attach(app, output / (name + ".log"))
for _ in range(200):
assert app.poll() is None, (output / (name + ".log")).read_text()
found = subprocess.run(["xdotool", "search", "--onlyvisible", "--pid", str(app.pid)],
capture_output=True, text=True)
env=environment, capture_output=True, text=True)
if found.returncode == 0 and (profile / "inbe.db").exists():
window = found.stdout.splitlines()[0]
command("xdotool", "windowsize", window, str(WIDTH), str(HEIGHT))
@@ -74,8 +104,30 @@ def launch(profile, name):
raise AssertionError("Inbe did not map its window")
with tempfile.TemporaryDirectory(prefix="inbe-practice-images-") as directory:
with tempfile.TemporaryDirectory(prefix="inbe-practice-images-") as directory, contextlib.ExitStack() as stack:
display_log = stack.enter_context((output / "display.log").open("w"))
display = subprocess.Popen(["Xvfb", "-noreset", "-displayfd", "1", "-screen", "0", "1280x900x24",
"-nolisten", "tcp"], env=environment,
stdout=subprocess.PIPE, stderr=display_log)
stack.callback(stop, display)
number = display.stdout.readline().decode().strip()
display.stdout.close()
assert number.isdecimal() and display.poll() is None, "Private display did not start"
server = Path(f"/proc/{display.pid}")
assert server.stat().st_uid == os.getuid(), "Private X server has another owner"
assert server.joinpath("exe").resolve() == Path(shutil.which("Xvfb")).resolve(), "Unexpected X server"
assert b"-displayfd\x001\x00" in server.joinpath("cmdline").read_bytes(), "Unexpected display allocation source"
display_log.write(f"Verified owned Xvfb pid={display.pid} display=:{number}\n")
display_log.flush()
environment["DISPLAY"] = ":" + number
profile = Path(directory)
cache = profile / "packages"
cache.mkdir()
# Start the real practice offline. A cover on the Install screen must
# never count as the running guide, even though both contain a picture.
for name in ("sunsalutation", "guide.en"):
shutil.copyfile(root / "build/practice-content" / (name + ".zib"),
cache / ("practice-" + name + ".zib"))
app, _ = launch(profile, "first-start")
stop(app)
with sqlite3.connect(profile / "inbe.db") as db:
@@ -83,6 +135,9 @@ with tempfile.TemporaryDirectory(prefix="inbe-practice-images-") as directory:
settings = {"language": "en", "language_system": 0, "language_setup_done": 1,
"apps_setup_done": 1, "main_tab": 1, "tutorial_seen": 1,
"habits_guide_seen": 1, "lumi_guides_seen": 127, "launcher_guide_seen": 1, "package_updates_allowed": 0,
"voice_narration_enabled": 0, "music_volume": 0,
"sun_salutation_character": 0,
"sun_salutation_start_seconds": 6, "sun_salutation_end_seconds": 6,
"apps_last_update_check": 1900000000}
for key, value in settings.items():
db.execute("INSERT INTO settings(user_id,key,value,updated_at) VALUES(?,?,?,1) "
@@ -103,11 +158,50 @@ with tempfile.TemporaryDirectory(prefix="inbe-practice-images-") as directory:
if not pictured(capture(window, practice), (0, 40, WIDTH, 420)):
missing.append(practice)
click(window, 145, 24) # Yoga.
click(window, 195, 678) # Start Sun Salutation.
if not pictured(capture(window, "sun-salutation-running"), (100, 250, 290, 650)):
driver.wait(label="Start Practice", role="button")
driver.press(label="How to", role="button")
driver.wait(contains="Mountain")
capture(window, "sun-salutation-guide")
driver.press(label="Back", role="button")
driver.press(label="Start Practice", role="button")
driver.wait(label="Next", role="button")
actual = state(window)
assert actual["practice_running"] and actual["screen"] == 3, actual
deadline = time.monotonic() + 5
while any(node["kind"] == "navigation_bar" and node["visible"] for node in driver.tree()):
assert time.monotonic() < deadline, "Practice navigation did not retract"
time.sleep(.05)
next_button = driver.wait(label="Next", role="button")
assert next_button["height"] >= 44 and next_button["y"] + next_button["height"] <= HEIGHT, \
"Practice controls are clipped"
figure = (24, 240, WIDTH - 24, round(next_button["y"] - 18))
running = capture(window, "sun-salutation-running")
if not pictured(running, figure):
missing.append("sun-salutation figure")
# This interior patch contains the jade cloth and its wrap shadow,
# whose green channels are 143 and 123. Retained-frame alpha errors
# add dark seams between the opaque, adjoining illustration pieces.
cloth = running.crop((175, 450, 195, 510))
assert cloth.getchannel("G").getextrema()[0] >= 115, \
"The retained guide has dark seams across its clothing"
driver.press(label="Next", role="button", settle=False)
time.sleep(.5)
first = capture(window, "sun-salutation-moving-first").crop(figure)
time.sleep(1)
second = capture(window, "sun-salutation-moving-second").crop(figure)
assert ImageChops.difference(first, second).getbbox(), "The live guide did not move"
pause(window, True, "practice-images-pause")
time.sleep(.2)
first = capture(window, "sun-salutation-paused-first").crop(figure)
time.sleep(.6)
second = capture(window, "sun-salutation-paused-second").crop(figure)
assert not ImageChops.difference(first, second).getbbox(), "The paused guide kept moving"
pause(window, False, "practice-images-resume")
time.sleep(.5)
resumed = capture(window, "sun-salutation-resumed").crop(figure)
assert ImageChops.difference(second, resumed).getbbox(), "The guide did not resume"
assert not missing, "Practice pictures are missing: " + ", ".join(missing)
assert app.poll() is None, (output / "practice.log").read_text()
finally:
stop(app)
print("All seven practice covers and the running Sun Salutation figure passed")
print("All seven practice covers, Sun Salutation guide, real session, animation, pause and resume passed")
+1 -1
View File
@@ -4,5 +4,5 @@ root=$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd)
binary=${1:-"$root/build/bin/linux/breeze-linux-x86_64"}
env -u DISPLAY -u WAYLAND_DISPLAY -u XAUTHORITY -u DBUS_SESSION_BUS_ADDRESS -u GDK_DISPLAY \
-u SESSION_MANAGER YUE_DESKTOP_RECOVERY=0 SDL_AUDIODRIVER=dummy APP_NO_TRAY=1 \
timeout 120s xvfb-run -a -n 301 -s '-noreset -screen 0 1280x900x24' \
timeout 180s \
python3 "$root/tests/practice_images_ui_test.py" "$binary"
+4 -4
View File
@@ -6,8 +6,8 @@ IDI_APP_ICON ICON "inbe.ico"
IDI_NOTIFICATION_ICON ICON "inbe.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,1,44,0
PRODUCTVERSION 2,1,44,0
FILEVERSION 2,1,45,0
PRODUCTVERSION 2,1,45,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -24,11 +24,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "waozi"
VALUE "FileDescription", "Inner Breeze"
VALUE "FileVersion", "2.1.44"
VALUE "FileVersion", "2.1.45"
VALUE "InternalName", "breeze"
VALUE "OriginalFilename", "breeze-windows-x86_64.exe"
VALUE "ProductName", "Inner Breeze"
VALUE "ProductVersion", "2.1.44"
VALUE "ProductVersion", "2.1.45"
END
END
BLOCK "VarFileInfo"
+14 -14
View File
@@ -10,6 +10,14 @@
"source": true,
"url": "https://github.com/raysan5/rini.git"
},
{
"commit": "60096945f5a8256c4d4216f085f631e463e4633c",
"dependencies": {"raylib": "p5a77c9c35110e925"},
"id": "p0b584bfe3be567d2",
"name": "kryon",
"ref": "master",
"url": "https://github.com/kryonlabs/kryon.git"
},
{
"commit": "ac9489451a93903030c50550a99ce234a49716ce",
"dependencies": {"oqs": "p7098ac9cd92f7e5f"},
@@ -28,7 +36,7 @@
},
{
"commit": "1cb9df183089a77c8a16448a556186f30b261a98",
"dependencies": {"kryon": "p62b1df489d9e5c45"},
"dependencies": {"kryon": "p0b584bfe3be567d2"},
"id": "p1b13dda539ed2a39",
"name": "Kss",
"ref": "master",
@@ -36,7 +44,7 @@
},
{
"commit": "bad2caaa84ef3eae61e40c99bf572d2b060d0ca2",
"dependencies": {"kryon": "p62b1df489d9e5c45"},
"dependencies": {"kryon": "p0b584bfe3be567d2"},
"id": "p20eb23d3e6db3711",
"name": "Game2D",
"ref": "master",
@@ -60,14 +68,6 @@
"source": true,
"url": "https://github.com/raysan5/raylib.git"
},
{
"commit": "55af1b53b186f5eaaf7249ac7653da3ef1e606d0",
"dependencies": {"raylib": "p5a77c9c35110e925"},
"id": "p62b1df489d9e5c45",
"name": "kryon",
"ref": "master",
"url": "https://github.com/kryonlabs/kryon.git"
},
{
"commit": "22d2ddbdc236796953c905a05a2cebf5ab1b4ff3",
"dependencies": {"liboqs": "p4b0a50b49959e674"},
@@ -87,7 +87,7 @@
},
{
"commit": "efe0ac0d83ec9c2ecb15a20a320994ca6fc347d2",
"dependencies": {"daochi_client": "p0cff069893bdc938", "kryon": "p62b1df489d9e5c45", "monocypher": "p809b4d31a48625a3", "qrcode": "p0dfa70137405b096"},
"dependencies": {"daochi_client": "p0cff069893bdc938", "kryon": "p0b584bfe3be567d2", "monocypher": "p809b4d31a48625a3", "qrcode": "p0dfa70137405b096"},
"id": "pabca5e1965868141",
"name": "Entity",
"ref": "master",
@@ -95,7 +95,7 @@
},
{
"commit": "33f888e50ebefdbee532731fe2aad9ea6f5ab964",
"dependencies": {"crypto": "pf039d7a776333200", "kryon": "p62b1df489d9e5c45"},
"dependencies": {"crypto": "pf039d7a776333200", "kryon": "p0b584bfe3be567d2"},
"id": "pae8cbf8fa0578bfc",
"name": "Apps",
"ref": "master",
@@ -120,7 +120,7 @@
},
{
"commit": "4b0e25bd2df86b54a8f5af3db48282bd41daab1a",
"dependencies": {"kryon": "p62b1df489d9e5c45"},
"dependencies": {"kryon": "p0b584bfe3be567d2"},
"id": "pe8e21a1f2b5ff52c",
"name": "plot",
"ref": "master",
@@ -145,7 +145,7 @@
}
],
"root": {
"dependencies": {"apps": "pae8cbf8fa0578bfc", "crypto": "pf039d7a776333200", "curl": "pd4bcd11b7d623073", "daochi_client": "p0cff069893bdc938", "entity": "pabca5e1965868141", "game2d": "p20eb23d3e6db3711", "kryon": "p62b1df489d9e5c45", "kss": "p1b13dda539ed2a39", "liboqs": "p4b0a50b49959e674", "mingcute": "pe1027b9d16704793", "monocypher": "p809b4d31a48625a3", "oqs": "p7098ac9cd92f7e5f", "plot": "pe8e21a1f2b5ff52c", "qrcode": "p0dfa70137405b096", "rini": "p09fa77e94b0dfc6c", "sqlite": "peaa43c4b7ef72edf"},
"dependencies": {"apps": "pae8cbf8fa0578bfc", "crypto": "pf039d7a776333200", "curl": "pd4bcd11b7d623073", "daochi_client": "p0cff069893bdc938", "entity": "pabca5e1965868141", "game2d": "p20eb23d3e6db3711", "kryon": "p0b584bfe3be567d2", "kss": "p1b13dda539ed2a39", "liboqs": "p4b0a50b49959e674", "mingcute": "pe1027b9d16704793", "monocypher": "p809b4d31a48625a3", "oqs": "p7098ac9cd92f7e5f", "plot": "pe8e21a1f2b5ff52c", "qrcode": "p0dfa70137405b096", "rini": "p09fa77e94b0dfc6c", "sqlite": "peaa43c4b7ef72edf"},
"name": "Inbe"
},
"toolchain": {