Pin only pushed commits, with no local overrides: Ziran v0.5.0 (f9f92b46), Kryon b45cc524 (one lock entry, ref master, shared with the Css and Plot master edges), Apps 352901e, Entity b30dd4a and practices 893e5b6f, whose sharpened banners and regenerated Lumi guide clips the narration check now matches. The Library opens each Tao Te Ching chapter on its own picture page: the chapter art and its title, centered together; the text pages follow. The reader keeps the picture page across reflow, and a chapter start or a Contents pick opens it. The 81 approved chapter pictures are included. Breeze now uses Kryon's namespaced widgets (Text.Draw/Text.Props, Button, Image, Modal.ActionModal, Layout, TabBar, LoadingScreen, LoadingIndicator, Shape.Circle) instead of the removed Kryon/Widgets facades. Hosted apps import std/text explicitly, since a short "text" import now names Kryon's widget. AGENTS.md and the Text/Button API checks describe the namespaced forms; two unused test doubles are removed. Build fixes for the new toolchain: the bundle runtime carries Ziran's instruction engine (no BOOTSTRAP=1) and takes the pinned host zi2c for cross builds; the Apps controller's lock context has the manifest's module roots; the app codec generator lists Kryon's raw modules only; the package scripts read ZX revision 28 bundle assets. The Apps controller digest matches the Apps 352901e build. Also included: the stopped lanes' work in this tree (Radio download, Photos install, Lists, Lumi, Habits shop rewards, astral exercise selection, appearance and download recovery) and the raylib-free desktop lane's host modules (app_trace, host_input, host_window, host_clock), inactive unless DESKTOP_HOST is defined. Not included: the crash-recovery lane's picture-window and storage crash-safety changes, which that lane commits itself. Local tests: zi-check (510 modules), native and Android source checks, hosted app checks, build-laws, clean-text-api-check, button-api-check, library-reader-test, library-ui-test, storage-crash-zi-test and native-image-decode-test pass. The bundled Arcade is still ZX revision 26 and waits for an Arcade build on these pins.
284 lines
14 KiB
Python
284 lines
14 KiB
Python
"""The same Library interactions on desktop and Android, with optional captures."""
|
|
import re
|
|
import time
|
|
|
|
|
|
class LibraryReaderCases:
|
|
def __init__(self, driver, chapter_text, log_text=lambda: "", capture=lambda name: None):
|
|
self.driver = driver
|
|
self.chapter_text = chapter_text
|
|
self.log_text = log_text
|
|
self.capture = capture
|
|
|
|
def open_library(self):
|
|
if not self.driver.find(label="Library", role="button", visible=True):
|
|
self.driver.press(label="Find an app", role="text_field")
|
|
self.driver.type("Library")
|
|
self.driver.press(label="Library", role="button")
|
|
self.driver.wait_idle(frames=3)
|
|
downloads = self.driver.find(label="Download", role="button", visible=True)
|
|
if downloads:
|
|
self.driver.press(key=downloads[-1]["key"], role="button")
|
|
deadline = time.monotonic() + 60
|
|
while not (self.driver.find(label="Open", role="button", visible=True) or
|
|
self.driver.find(label="Tao Te Ching", role="button", visible=True)):
|
|
assert time.monotonic() < deadline, self.driver.text()
|
|
time.sleep(.05)
|
|
if self.driver.find(label="Open", role="button", visible=True):
|
|
self.driver.press(label="Open", role="button")
|
|
self.driver.wait(label="Tao Te Ching", role="button", timeout=60)
|
|
|
|
def open_book(self, mode):
|
|
self.driver.press(label="Tao Te Ching", role="button")
|
|
self.driver.wait_gone(key=27800)
|
|
self.driver.wait(key=27705, role="button")
|
|
assert not self.driver.find(label="Reading mode"), self.driver.text()
|
|
pictures = mode == "Picture book"
|
|
if self.driver.wait(key=27705)["selected"] != pictures:
|
|
self.driver.press(key=27705, role="button")
|
|
self.driver.wait_idle(frames=3)
|
|
|
|
def page_label(self):
|
|
self.driver.wait(key=27511)
|
|
labels = [label for label in self.driver.labels() if re.fullmatch(r"\d+ / \d+", label)]
|
|
assert len(labels) == 1, self.driver.text()
|
|
return labels[0]
|
|
|
|
def page_number(self):
|
|
return int(self.page_label().split(" / ")[0])
|
|
|
|
def page_text(self):
|
|
passage = self.driver.wait(key=27502)
|
|
heading = self.driver.wait(key=27501)
|
|
assert passage["hidden_lines"] == heading["hidden_lines"] == 0, (heading, passage)
|
|
assert passage["y"] >= heading["y"] + heading["height"], (heading, passage)
|
|
return passage["label"]
|
|
|
|
def picture_page(self, title):
|
|
"""A picture page shows only the illustration and its title, centered as one group."""
|
|
image = self.driver.wait(key=27503, role="image")
|
|
heading = self.driver.wait(key=27501, label=title)
|
|
assert not self.driver.find(key=27502, visible=True), self.driver.text()
|
|
label = self.driver.wait(key=27511)
|
|
scale = self.driver.wait(key=27710)["height"] / 44
|
|
middle = label["x"] + label["width"] / 2
|
|
assert abs(image["width"] - image["height"]) <= 1, image
|
|
assert abs(image["x"] + image["width"] / 2 - middle) <= 2, (image, label)
|
|
assert abs(heading["x"] + heading["width"] / 2 - middle) <= 2, (heading, label)
|
|
assert heading["y"] >= image["y"] + image["height"], (image, heading)
|
|
# The reading area runs from below the toolbar to above the page number.
|
|
above = image["y"] - 72 * scale
|
|
below = label["y"] - 8 * scale - (heading["y"] + heading["height"])
|
|
assert above >= 0 and below >= 0 and abs(above - below) <= 3, (above, below, image, heading, label)
|
|
|
|
def wait_page(self, number):
|
|
deadline = time.monotonic() + 20
|
|
while self.page_number() != number:
|
|
assert time.monotonic() < deadline, (number, self.driver.text())
|
|
time.sleep(.05)
|
|
|
|
def open_tools(self, tab=None):
|
|
self.driver.press(label=tab or "Annotations", role="button")
|
|
assert not self.driver.find(role="modal"), "Reader tools opened a modal"
|
|
|
|
def close_tools(self):
|
|
self.driver.press(label="Close", role="button")
|
|
self.driver.wait_idle(frames=3)
|
|
|
|
def press_chapter(self, number):
|
|
for _ in range(82):
|
|
matches = self.driver.find(key=27200 + number, role="button", visible=True)
|
|
if matches:
|
|
assert matches[0]["label"] and not re.match(r"^(Chapter\s+)?\d", matches[0]["label"]), matches[0]
|
|
self.driver.press(key=27200 + number, role="button")
|
|
return
|
|
self.driver.pointer(*self.driver.center(self.driver.wait(key=27605)), wheel=-3)
|
|
self.driver.release_pointer()
|
|
self.driver.wait_idle(frames=3)
|
|
raise AssertionError(("Chapter not visible", number, self.driver.text()))
|
|
|
|
def exercise(self):
|
|
self.driver.press(label="Apps", role="button")
|
|
self.open_library()
|
|
self.driver.wait(label="Tao Te Ching", role="button")
|
|
self.driver.wait(label="Tao Te Ching", role="text")
|
|
self.driver.wait(label="Lao Tzu", role="text")
|
|
assert not self.driver.find(label="Library", role="title_bar"), "Library still has a title bar"
|
|
assert not self.driver.find(label="Start reading"), self.driver.text()
|
|
assert "the local bundle cannot run" not in self.log_text()
|
|
self.capture("shelf")
|
|
self.driver.press(label="Tao Te Ching", role="button")
|
|
self.capture("opening")
|
|
self.driver.wait_gone(key=27800)
|
|
assert not self.driver.find(label="Reading mode"), self.driver.text()
|
|
self.picture_page("The Nameless Tao")
|
|
assert self.driver.wait(key=27705)["selected"], "Fresh reader did not enable artwork"
|
|
assert self.page_number() == 1
|
|
self.capture("reader-art-default")
|
|
# The chapter text follows its picture page, with the same title heading.
|
|
self.driver.key("right")
|
|
self.wait_page(2)
|
|
self.driver.wait_gone(key=27503)
|
|
assert self.chapter_text(1).startswith(self.page_text()), self.page_text()
|
|
self.driver.wait(key=27501, label="The Nameless Tao")
|
|
self.driver.key("left")
|
|
self.wait_page(1)
|
|
self.picture_page("The Nameless Tao")
|
|
self.driver.press(key=27705, role="button")
|
|
self.driver.wait_gone(key=27503)
|
|
assert not self.driver.wait(key=27705)["selected"]
|
|
first = self.page_text()
|
|
assert self.chapter_text(1).startswith(first), first
|
|
self.driver.wait(key=27501, label="The Nameless Tao")
|
|
initial_total = int(self.page_label().split(" / ")[1])
|
|
assert initial_total >= 81
|
|
self.driver.wait_gone(label="Apps", role="button")
|
|
# Page gestures and desktop arrows use the same page index.
|
|
area = self.driver.wait(key=27502)
|
|
left = area["visible_x"] + area["visible_width"] * .12
|
|
right = area["visible_x"] + area["visible_width"] * .88
|
|
middle = area["visible_y"] + area["visible_height"] / 2
|
|
self.driver.drag((right, middle), (left, middle))
|
|
self.wait_page(2)
|
|
self.capture("reader")
|
|
self.driver.drag((left, middle), (right, middle))
|
|
self.wait_page(1)
|
|
self.driver.key("right")
|
|
self.wait_page(2)
|
|
self.driver.key("left")
|
|
self.wait_page(1)
|
|
assert not self.driver.find(label="Next chapter"), self.driver.text()
|
|
theme_before = self.driver.wait(key=27704)["label"]
|
|
self.driver.press(key=27704, role="button")
|
|
theme_after = self.driver.wait(key=27704)["label"]
|
|
assert theme_after != theme_before, "Book theme did not change"
|
|
self.capture("reader-light" if theme_after == "Dark" else "reader-dark")
|
|
# Open contents inside the one reader panel; jump to a longer chapter.
|
|
self.open_tools("Contents")
|
|
self.driver.wait(label="The Nameless Tao", role="button")
|
|
self.capture("contents")
|
|
self.press_chapter(81)
|
|
self.driver.wait(key=27501, label="Words That Are True")
|
|
assert self.chapter_text(81).startswith(self.page_text()), self.page_text()
|
|
self.open_tools("Contents")
|
|
self.press_chapter(39)
|
|
self.driver.wait(key=27501, label="Holding to the One")
|
|
assert self.chapter_text(39).startswith(self.page_text()), self.page_text()
|
|
before = self.page_number()
|
|
self.driver.key("right")
|
|
self.wait_page(before + 1)
|
|
saved_page, saved_text = self.page_label(), self.page_text()
|
|
# Highlight and multiline note are stored by text range in account records.
|
|
self.page_text_snapshot = self.page_text()
|
|
self.open_tools("Annotations")
|
|
self.capture("tools")
|
|
self.driver.press(focus_id=27619, role="text_area")
|
|
self.driver.key("home")
|
|
start_cursor = self.driver.wait(focus_id=27619)["cursor"]
|
|
for _ in range(12):
|
|
self.driver.key("right", shift=True)
|
|
selection = self.driver.wait(focus_id=27619)
|
|
assert 0 < selection["cursor"] - start_cursor < len(self.page_text_snapshot)
|
|
self.driver.press(label="Highlight selection", role="toggle")
|
|
self.driver.press(focus_id=27621, role="text_area")
|
|
self.driver.type("A quiet passage.")
|
|
self.driver.key("enter")
|
|
self.driver.type("Remember the water.")
|
|
self.driver.wait(value="A quiet passage.\nRemember the water.", role="text_area")
|
|
self.capture("annotation")
|
|
self.close_tools()
|
|
self.capture("annotated-reader")
|
|
self.driver.press(label="Back", role="button")
|
|
self.driver.wait(label="Tao Te Ching", role="button")
|
|
self.open_book("Text only")
|
|
assert self.page_label() == saved_page and self.page_text() == saved_text
|
|
self.open_tools("Annotations")
|
|
self.driver.wait(value="A quiet passage.\nRemember the water.", role="text_area")
|
|
assert self.driver.wait(label="Highlight selection", role="toggle")["selected"]
|
|
self.close_tools()
|
|
# Font changes reflow from the saved text position; repeat changes give
|
|
# the same page count and never discard the anchored annotations.
|
|
self.open_tools("Font")
|
|
for _ in range(5):
|
|
self.driver.press(label="+", role="button")
|
|
self.close_tools()
|
|
large_total = int(self.page_label().split(" / ")[1])
|
|
assert large_total > initial_total, (initial_total, large_total)
|
|
self.open_tools("Font")
|
|
for _ in range(5):
|
|
self.driver.press(label="-", role="button")
|
|
self.close_tools()
|
|
assert self.page_label() == saved_page and self.page_text() == saved_text
|
|
self.open_tools("Annotations")
|
|
self.driver.wait(value="A quiet passage.\nRemember the water.", role="text_area")
|
|
assert self.driver.wait(label="Highlight selection", role="toggle")["selected"]
|
|
self.close_tools()
|
|
self.open_tools("Font")
|
|
self.driver.press(key=27631)
|
|
self.driver.press(label="Noto Sans", role="selectable")
|
|
self.close_tools()
|
|
assert self.driver.wait(key=27502)["hidden_lines"] == 0
|
|
self.open_tools("Font")
|
|
self.driver.press(key=27631)
|
|
self.driver.press(label="System font", role="selectable")
|
|
self.close_tools()
|
|
assert self.page_label() == saved_page and self.page_text() == saved_text
|
|
self.open_tools("Layout")
|
|
for _ in range(2):
|
|
self.driver.press(label="+", role="button", index=0)
|
|
self.driver.press(label="+", role="button", index=1)
|
|
self.close_tools()
|
|
assert self.driver.wait(key=27502)["hidden_lines"] == 0
|
|
self.open_tools("Layout")
|
|
for _ in range(2):
|
|
self.driver.press(label="-", role="button", index=0)
|
|
self.driver.press(label="-", role="button", index=1)
|
|
self.close_tools()
|
|
assert self.page_label() == saved_page and self.page_text() == saved_text
|
|
return {"page": saved_page, "text": saved_text, "theme": theme_after}
|
|
|
|
def resume(self, saved):
|
|
self.driver.press(label="Apps", role="button")
|
|
self.open_library()
|
|
self.open_book("Text only")
|
|
assert self.page_label() == saved["page"] and self.page_text() == saved["text"]
|
|
assert self.driver.wait(key=27704)["label"] == saved["theme"], "Book theme was lost after restart"
|
|
self.open_tools("Annotations")
|
|
self.driver.wait(value="A quiet passage.\nRemember the water.", role="text_area")
|
|
assert self.driver.wait(label="Highlight selection", role="toggle")["selected"]
|
|
self.close_tools()
|
|
self.driver.press(label="Back", role="button")
|
|
self.driver.wait(label="Tao Te Ching", role="button")
|
|
self.open_book("Picture book")
|
|
# Turning images on keeps a continuation page; text pages never change.
|
|
assert self.page_text() == saved["text"], self.page_text()
|
|
assert not self.driver.find(key=27503, visible=True), self.driver.text()
|
|
self.open_tools("Contents")
|
|
self.press_chapter(39)
|
|
self.picture_page("Holding to the One")
|
|
self.capture("reader-art-restored")
|
|
self.driver.key("right")
|
|
self.driver.wait_gone(key=27503)
|
|
assert self.chapter_text(39).startswith(self.page_text()), self.page_text()
|
|
# Artwork follows the actual chapter route, including the last chapter.
|
|
self.open_tools("Contents")
|
|
self.press_chapter(81)
|
|
self.picture_page("Words That Are True")
|
|
self.driver.key("right")
|
|
self.driver.wait_gone(key=27503)
|
|
assert self.chapter_text(81).startswith(self.page_text()), self.page_text()
|
|
self.driver.key("left")
|
|
self.picture_page("Words That Are True")
|
|
self.driver.press(key=27705, role="button")
|
|
self.driver.wait_gone(key=27503)
|
|
assert self.chapter_text(81).startswith(self.page_text()), self.page_text()
|
|
self.driver.press(key=27705, role="button")
|
|
self.picture_page("Words That Are True")
|
|
self.driver.press(label="Back", role="button")
|
|
self.driver.wait(label="Tao Te Ching", role="button")
|
|
self.driver.press(label="Tao Te Ching", role="button")
|
|
self.driver.wait_gone(key=27800)
|
|
self.picture_page("Words That Are True")
|
|
self.driver.press(label="Back", role="button")
|
|
self.driver.wait(label="Tao Te Ching", role="button")
|