Skip to content

Preserve typed prepaint block variants #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
isomorphisms wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Preserve typed prepaint block variants #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/android-prepaint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ jobs:
with:
gradle-version: "8.13"

- name: Exercise typed prepaint model and compile refusals
run: sh tests/verify_typed_model.sh

- name: Test, lint, and build debug APK
run: gradle --no-daemon :app:testDebugUnitTest :app:lintDebug :app:verifyPrepaintBoundary

Expand Down
5 changes: 5 additions & 0 deletions android-prepaint/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ IB storage inspector or a later browser shell.
The boundary check rejects `android.webkit`, `WebView`, an Internet permission, or
a debug APK larger than 2 MiB.

`sh tests/verify_typed_model.sh` exercises the parser without Android and proves
that the checked wire variants remain distinct block types. It also compiles two
intentionally invalid consumers and requires rejection: an arbitrary string-kind
block and an integer outside the six-case heading-level type.

## Boundary

Idriç owns HTML extraction, URL policy, ICU execution, and the `InformationView`.
Expand Down
109 changes: 53 additions & 56 deletions android-prepaint/app/src/main/java/org/isomorphisms/ib/prepaint/PrepaintActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ private void renderRevision(PrepaintDocument.Revision revision) {
currentRevision = revision;
int oldScroll = scroll.getScrollY();
page.removeAllViews();
if (PrepaintDocument.TEXT_SOURCE.equals(document.sourceKind)) {
if (document.sourceKind == PrepaintDocument.SourceKind.PLAIN_TEXT) {
status.setText("IB PREPAINT · plain text");
} else {
status.setText("IB PREPAINT " + (revisionIndex + 1) + "/"
Expand Down Expand Up @@ -307,54 +307,55 @@ private void renderRevision(PrepaintDocument.Revision revision) {
}

private void addInformationBlock(PrepaintDocument.Block block) {
switch (block.kind) {
case PrepaintDocument.Block.HEADING:
float headingSize = block.level == 1 ? 20 : block.level == 2 ? 17 : 15;
TextView heading = text(block.values.get(0), headingSize, FOREGROUND);
heading.setTypeface(hack, Typeface.BOLD);
addBlock(heading, 0, block.level == 1 ? 8 : 4, 0, 8);
break;
case PrepaintDocument.Block.TEXT:
TextView paragraph = text(block.values.get(0), 15, FOREGROUND);
paragraph.setLineSpacing(0, 1.18f);
paragraph.setTextIsSelectable(true);
addBlock(paragraph, 0, 0, 0, 14);
break;
case PrepaintDocument.Block.LINK:
String label = block.values.get(0);
String target = block.values.get(1);
TextView link = text(label.equals(target) ? target : label + "\n" + target,
14, LINK);
link.setPadding(dp(8), dp(5), dp(8), dp(5));
link.setBackground(box(SURFACE, dp(4)));
link.setOnClickListener(ignored -> requestLink(target));
addBlock(link, 0, 2, 0, 14);
break;
case PrepaintDocument.Block.ROW:
addRow(block);
break;
case PrepaintDocument.Block.FORM:
TextView form = text("[ " + block.values.get(0) + " ] → "
+ block.values.get(1), 14, FOREGROUND);
form.setPadding(dp(12), dp(10), dp(12), dp(10));
form.setBackground(box(SURFACE, dp(4)));
addBlock(form, 0, 3, 0, 14);
break;
case PrepaintDocument.Block.IMAGE:
addImage(block);
break;
default:
throw new IllegalStateException("unhandled block " + block.kind);
if (block instanceof PrepaintDocument.HeadingBlock) {
addHeading((PrepaintDocument.HeadingBlock) block);
} else if (block instanceof PrepaintDocument.TextBlock) {
PrepaintDocument.TextBlock textBlock = (PrepaintDocument.TextBlock) block;
TextView paragraph = text(textBlock.text, 15, FOREGROUND);
paragraph.setLineSpacing(0, 1.18f);
paragraph.setTextIsSelectable(true);
addBlock(paragraph, 0, 0, 0, 14);
} else if (block instanceof PrepaintDocument.LinkBlock) {
PrepaintDocument.LinkBlock linkBlock = (PrepaintDocument.LinkBlock) block;
TextView link = text(linkBlock.label.equals(linkBlock.target)
? linkBlock.target
: linkBlock.label + "\n" + linkBlock.target,
14, LINK);
link.setPadding(dp(8), dp(5), dp(8), dp(5));
link.setBackground(box(SURFACE, dp(4)));
link.setOnClickListener(ignored -> requestLink(linkBlock.target));
addBlock(link, 0, 2, 0, 14);
} else if (block instanceof PrepaintDocument.RowBlock) {
addRow((PrepaintDocument.RowBlock) block);
} else if (block instanceof PrepaintDocument.FormBlock) {
PrepaintDocument.FormBlock formBlock = (PrepaintDocument.FormBlock) block;
TextView form = text("[ " + formBlock.label + " ] → "
+ formBlock.action, 14, FOREGROUND);
form.setPadding(dp(12), dp(10), dp(12), dp(10));
form.setBackground(box(SURFACE, dp(4)));
addBlock(form, 0, 3, 0, 14);
} else if (block instanceof PrepaintDocument.ImageBlock) {
addImage((PrepaintDocument.ImageBlock) block);
} else {
throw new AssertionError("unhandled prepaint block type");
}
}

private void addRow(PrepaintDocument.Block block) {
private void addHeading(PrepaintDocument.HeadingBlock block) {
int level = block.level.wireNumber;
float headingSize = level == 1 ? 20 : level == 2 ? 17 : 15;
TextView heading = text(block.text, headingSize, FOREGROUND);
heading.setTypeface(hack, Typeface.BOLD);
addBlock(heading, 0, level == 1 ? 8 : 4, 0, 8);
}

private void addRow(PrepaintDocument.RowBlock block) {
LinearLayout row = new LinearLayout(this);
row.setOrientation(LinearLayout.HORIZONTAL);
row.setGravity(Gravity.TOP);
row.setPadding(dp(1), dp(1), dp(1), dp(1));
row.setBackgroundColor(RULE);
for (String cellText : block.values) {
for (String cellText : block.cells) {
TextView cell = text(cellText, 13, FOREGROUND);
cell.setTextIsSelectable(true);
cell.setPadding(dp(9), dp(9), dp(9), dp(9));
Expand All @@ -367,17 +368,13 @@ private void addRow(PrepaintDocument.Block block) {
addBlock(row, 0, 0, 0, 3);
}

private void addImage(PrepaintDocument.Block block) {
String source = block.values.get(0);
String alternate = block.values.get(1);
String caption = block.values.get(2);
String target = block.values.get(3);
Drawable drawable = loadDrawable(source);
private void addImage(PrepaintDocument.ImageBlock block) {
Drawable drawable = loadDrawable(block.source);
if (drawable == null) {
TextView missing = text("[image] " + alternate, 13, SECONDARY);
if (!target.isEmpty()) {
TextView missing = text("[image] " + block.alternateText, 13, SECONDARY);
if (!block.linkTarget.isEmpty()) {
missing.setTextColor(LINK);
missing.setOnClickListener(ignored -> requestLink(target));
missing.setOnClickListener(ignored -> requestLink(block.linkTarget));
}
addBlock(missing, 0, 3, 0, 12);
return;
Expand All @@ -386,17 +383,17 @@ private void addImage(PrepaintDocument.Block block) {
ImageView image = new ImageView(this);
image.setAdjustViewBounds(true);
image.setScaleType(ImageView.ScaleType.FIT_CENTER);
image.setContentDescription(alternate);
image.setContentDescription(block.alternateText);
image.setImageDrawable(drawable);
if (!target.isEmpty()) {
if (!block.linkTarget.isEmpty()) {
image.setClickable(true);
image.setFocusable(true);
image.setOnClickListener(ignored -> requestLink(target));
image.setOnClickListener(ignored -> requestLink(block.linkTarget));
}
addBlock(image, 0, 5, 0, caption.isEmpty() ? 14 : 5);
addBlock(image, 0, 5, 0, block.caption.isEmpty() ? 14 : 5);

if (!caption.isEmpty()) {
TextView captionView = text(caption, 12, SECONDARY);
if (!block.caption.isEmpty()) {
TextView captionView = text(block.caption, 12, SECONDARY);
captionView.setLineSpacing(0, 1.12f);
addBlock(captionView, 0, 0, 0, 14);
}
Expand Down
Loading
Loading