Add full formatting display + WYSIWYG editing

- Decode all paragraph + inline attribute_run fields (corrects README's
  earlier mapping: 0=Title not Body, 103=Checkbox not 101). Adds
  DASHED_LIST style, font_weight/underline/strike/link/attachment fields.
- MergeableDataDecoder for table CKAttachments — walks the CRDT graph
  (KeyItems, TypeItems, GraphObjects: List/Dict/String/CustomMap/
  OrderedSet) and extracts a real 2D grid via cellColumns iteration.
- Image attachments fetched via Media CKReference → Asset downloadURL.
- FormattedNoteBody renders styled paragraphs + AnnotatedString inline,
  table grids, inline images, attachment placeholder cards, clickable
  links via LinkAnnotation, and tap-to-toggle checkboxes (auto-saves).
- Edit mode is WYSIWYG via VisualTransformation: heading sizes, inline
  bold/italic/underline/strike/link styling, list markers (• – 1. ☐ ☑)
  visible while editing, with OffsetMapping keeping cursor/selection
  aligned to the underlying chars.
- Formatting toolbar (Material 3, animated) with paragraph style picker,
  list style toggles, B/I/U/S, and link dialog. Save path threads new
  AttrSpan list through NoteAppender; format-only changes use a
  rewriteAttributeRunsOnly fast path that preserves the substring tree.
- 7 JVM unit tests round-trip a real iCloud-pulled fmt-baseline-1.proto
  through encoder/decoder, asserting bold/heading/checkbox edits survive.
- GitHub Action builds debug APK on push/PR/dispatch and uploads it.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: ericmigi

.github/workflows/build-apk.yml

@@ -0,0 +1,31 @@
+name: Build APK
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '17'
+
+      - uses: gradle/actions/setup-gradle@v4
+
+      - name: Build debug APK
+        run: ./gradlew :app:assembleDebug --no-daemon
+
+      - name: Upload debug APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: app-debug
+          path: app/build/outputs/apk/debug/app-debug.apk
+          if-no-files-found: error

README.md

@@ -21,9 +21,12 @@ report for the next person (or agent) who picks it up.
 | Auto-save on lifecycle pause | Works (lifecycle `ON_PAUSE` only — see [AppleNotesApp.kt:1052](app/src/main/java/com/example/applenotes/ui/AppleNotesApp.kt)) |
 | Share OUT (Android intent chooser) | Works (plaintext only) |
 | Delete | Uses CloudKit `forceDelete`; Mac surfaces as "Recently Deleted" (server-managed, not a hard wipe) |
-| Format display (headings, lists, checkboxes) | Decoded but not rendered yet (Phase D1 done; D2 pending) |
-| Format input toolbar | Not built |
-| Image attachments | Renders `` stub; no image display |
+| Format display (paragraph styles + inline) | Works — Title / Heading / Subheading / Body / Monospaced; Bulleted / Dashed / Numbered / Checkbox; bold / italic / underline / strikethrough; clickable links |
+| Table attachments | Decoded from `MergeableDataEncrypted` (CRDT graph), rendered as a real grid |
+| Image attachments | Fetched as CKAsset bytes from the Media reference, rendered inline |
+| Other attachments (sketches, maps, etc.) | Rendered as a labeled placeholder card |
+| Format input toolbar | Works — paragraph style picker, list toggles (bullet/dash/numbered/checkbox), inline B/I/U/S, link |
+| Tap-to-toggle checkbox | Works in formatted view (auto-saves) |
 | Conflict UX | Auto-retry on CONFLICT/oplock; no concurrent-edit merge yet |
 
 ## The most important thing we think we learned (not yet end-to-end confirmed)
@@ -163,22 +166,73 @@ of Mac trashing — we ruled this out by sampling.
 - `` (U+FFFC OBJECT REPLACEMENT) is Apple's placeholder for inline attachments.
   We pass through but don't render the attachment.
 
-### Paragraph styles (in `AttributeRun.f2.f3`)
+### Paragraph styles (`AttributeRun.f2.f1`)
 
 | Code | Style |
 |---|---|
-| 0 | Body |
-| 1 | Title |
-| 2 | Heading |
-| 3 | Subheading |
+| 0 | Title (also: implicit for the first line) |
+| 1 | Heading |
+| 2 | Subheading |
+| 3 | Body (also: f1 absent → Body) |
 | 4 | Monospaced |
 | 100 | Bulleted list |
-| 101 | Checkbox (with `f4=1` if checked) |
+| 101 | Dashed list |
 | 102 | Numbered list |
+| 103 | Checkbox list |
 
-`f9` inside `f2` is a 16-byte paragraph UUID (Mac uses these; iCloud.com doesn't,
-yet both round-trip). Decode via
-[`NoteBodyEditor.parseAttributeRuns`](app/src/main/java/com/example/applenotes/proto/NoteBodyEditor.kt).
+(The earlier draft of this README listed 0=Body / 1=Title / 101=Checkbox. Wrong:
+verified by sampling a baseline note that contained one of every style.)
+
+Checkbox checked-state lives at `AttributeRun.f2.f5` — a 20-byte sub-message
+containing `{f1: 16-byte UUID, f2: 0|1 (done flag)}`, NOT in `AttributeRun.f2.f4`.
+
+### Inline formatting (siblings of `AttributeRun.f2`)
+
+| Field | Meaning |
+|---|---|
+| `f5` (varint) | font weight enum: 1=Bold, 2=Italic, 3=BoldItalic |
+| `f6` (varint) | underlined (bool) |
+| `f7` (varint) | strikethrough (bool) |
+| `f9` (bytes) | link URL (UTF-8 string) |
+| `f12` (msg) | attachment_info `{f1: UUID-string, f2: UTI-string}` (table/image/etc.) |
+
+Decode via [`NoteBodyEditor.parseAttributeRuns`](app/src/main/java/com/example/applenotes/proto/NoteBodyEditor.kt).
+Re-encode via [`NoteBodyEditor.encodeAttributeRunField`](app/src/main/java/com/example/applenotes/proto/NoteBodyEditor.kt).
+
+### Table attachments
+
+Tables are stored as separate `Attachment` CKRecords (UTI
+`com.apple.notes.table`). Their content lives in `MergeableDataEncrypted` — a
+zlib-deflate'd protobuf encoding Apple's MergeableData CRDT graph. The graph
+nodes form a typed object soup:
+
+- **KeyItems** (field 4): string field names — `self`, `crRows`, `crColumns`,
+  `cellColumns`, `crTableColumnDirection`, `identity`, `UUIDIndex`.
+- **TypeItems** (field 5): string type names — `com.apple.CRDT.NSString`,
+  `com.apple.CRDT.NSUUID`, `com.apple.notes.ICTable`, etc. Indexed.
+- **UUIDItems** (field 6): 16-byte UUIDs. Indexed.
+- **GraphObjects** (field 3): repeated, indexed. Each is one of:
+  - `f1` List, `f6` Dictionary, `f10` String (with f2 = current text),
+    `f13` CustomMap (typed map, like ICTable), `f16` OrderedSet.
+
+The root ICTable's CustomMap has entries `crRows` (OrderedSet of row UUIDs),
+`crColumns` (OrderedSet of column UUIDs), and `cellColumns` (Dict of
+col_uuid → Dict of row_uuid → string_obj_id). Walk those to extract a 2D
+grid; resolve each string_obj_id to its NSString.currentText.
+
+See [`MergeableDataDecoder.kt`](app/src/main/java/com/example/applenotes/proto/MergeableDataDecoder.kt).
+The decoder uses cellColumns iteration order as the column order and
+first-appearance order across columns as the row order — crRows/crColumns
+OrderedSets carry the canonical visual order via a separate UUIDIndex layer
+that we don't fully reconstruct yet, but the iteration order matches the
+visual order for tables created left-to-right top-to-bottom.
+
+### Image attachments
+
+Image Attachment records carry a `Media` field that's a CKReference to a
+separate "Media" record. Look up the media record; its `Asset` (or
+`MediaEncrypted`) field is a CKAsset whose `value.downloadURL` is the binary's
+signed download URL. GET it with the session's cookies.
 
 ## What we tried that failed
 

app/build.gradle.kts

@@ -37,6 +37,10 @@ android {
         excludes += "/META-INF/{AL2.0,LGPL2.1}"
       }
     }
+
+    testOptions {
+      unitTests.isReturnDefaultValues = true
+    }
 }
 
 kotlin {

app/src/main/AndroidManifest.xml

@@ -35,6 +35,8 @@
                 <action android:name="com.example.applenotes.APPEND_BY_TITLE" />
                 <action android:name="com.example.applenotes.SET_BODY_BY_TITLE" />
                 <action android:name="com.example.applenotes.DELETE_BY_TITLE" />
+                <action android:name="com.example.applenotes.DUMP_BY_TITLE" />
+                <action android:name="com.example.applenotes.DUMP_RECORD" />
                 <action android:name="com.example.applenotes.CREATE" />
             </intent-filter>
         </receiver>

app/src/main/java/com/example/applenotes/client/AppleNotesClient.kt

@@ -7,9 +7,11 @@ import com.example.applenotes.auth.USER_AGENT
 import com.example.applenotes.proto.NoteBodyEditor
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
+import io.ktor.client.request.get
 import io.ktor.client.request.headers
 import io.ktor.client.request.post
 import io.ktor.client.request.setBody
+import io.ktor.client.statement.HttpResponse
 import io.ktor.http.ContentType
 import io.ktor.http.HttpHeaders
 import io.ktor.http.contentType
@@ -310,6 +312,24 @@ class AppleNotesClient(
      * Delete a note via a hard CloudKit delete operation. Mac/iOS Notes
      * surface this as moving the note to "Recently Deleted" (server-managed).
      */
+    /**
+     * Download a CKAsset's binary body via its `downloadURL`. iCloud signs the
+     * URL with the session's auth so we just GET it with our cookie jar.
+     */
+    suspend fun fetchAssetBytes(downloadUrl: String): ByteArray? = runCatching {
+        val response: HttpResponse = httpClient.get(downloadUrl) {
+            headers {
+                append(HttpHeaders.UserAgent, USER_AGENT)
+                append(HttpHeaders.Cookie, session.cookieHeader)
+            }
+        }
+        if (response.status.value !in 200..299) {
+            Log.w(TAG, "fetchAssetBytes HTTP ${response.status.value} for $downloadUrl")
+            return@runCatching null
+        }
+        response.body<ByteArray>()
+    }.getOrNull()
+
     suspend fun deleteNote(recordName: String, recordChangeTag: String): String {
         val payload: JsonObject = buildJsonObject {
             put("zoneID", buildJsonObject { put("zoneName", "Notes") })
@@ -657,6 +677,18 @@ internal fun extractStringValue(field: JsonElement): String? {
     return runCatching { value.jsonPrimitive.content }.getOrNull()
 }
 
+/**
+ * CKAsset fields look like
+ *   { "type": "ASSETID", "value": { "downloadURL": "...", "size": N, "fileChecksum": "..." } }
+ * Pull `value.downloadURL`. Some download URLs come back with `${f}` placeholders
+ * that need substitution; we surface the raw URL and let the caller request it.
+ */
+internal fun extractAssetDownloadUrl(field: JsonElement): String? {
+    val obj = field as? JsonObject ?: return null
+    val value = obj["value"] as? JsonObject ?: return null
+    return runCatching { value["downloadURL"]?.jsonPrimitive?.content }.getOrNull()
+}
+
 /**
  * CKReference fields look like
  *   { "type": "REFERENCE", "value": { "recordName": "...", "action": "NONE", "zoneID": {...} } }

app/src/main/java/com/example/applenotes/debug/DebugReceiver.kt

@@ -153,6 +153,75 @@ class DebugReceiver : BroadcastReceiver() {
                     }
                 }
             }
+            ACTION_DUMP_RECORD -> {
+                val recordName = intent.getStringExtra("recordName")
+                if (recordName == null) {
+                    Log.e(TAG, "DUMP_RECORD missing recordName")
+                    return
+                }
+                launchOp("DUMP_RECORD") { client, _ ->
+                    val record = client.lookupNote(recordName)
+                    Log.i(TAG, "DUMP_RECORD type=${record.recordType} tag=${record.recordChangeTag}")
+                    for ((name, _) in record.rawFields) {
+                        val s = record.stringField(name)
+                        if (s == null) continue
+                        Log.i(TAG, "FIELD $name (b64.len=${s.length})")
+                        val chunkSize = 800
+                        val chunks = (s.length + chunkSize - 1) / chunkSize
+                        for (i in 0 until chunks) {
+                            val start = i * chunkSize
+                            val end = minOf(start + chunkSize, s.length)
+                            Log.i(TAG, "FIELD_B64 $name [$i/$chunks] ${s.substring(start, end)}")
+                        }
+                    }
+                }
+            }
+            ACTION_DUMP_BY_TITLE -> {
+                val title = intent.getStringExtra("title")
+                if (title == null) {
+                    Log.e(TAG, "DUMP_BY_TITLE missing title")
+                    return
+                }
+                launchOp("DUMP_BY_TITLE") { client, _ ->
+                    val match = findByTitle(client, title)
+                    if (match == null) {
+                        Log.w(TAG, "DUMP_BY_TITLE_NOT_FOUND title='$title'")
+                    } else {
+                        Log.i(TAG, "DUMP_BY_TITLE_FOUND '$title' -> ${match.recordName}")
+                        val record = client.lookupNote(match.recordName)
+                        val b64 = record.stringField("TextDataEncrypted")
+                        if (b64 == null) {
+                            Log.w(TAG, "DUMP_BY_TITLE_NO_BODY")
+                        } else {
+                            Log.i(TAG, "DUMP_KIND ${NoteBodyEditor.probeBase64(b64)}")
+                            // Log b64 in 1KB chunks so logcat doesn't truncate.
+                            val chunkSize = 800
+                            val chunks = (b64.length + chunkSize - 1) / chunkSize
+                            Log.i(TAG, "DUMP_B64_BEGIN total=${b64.length} chunks=$chunks")
+                            for (i in 0 until chunks) {
+                                val start = i * chunkSize
+                                val end = minOf(start + chunkSize, b64.length)
+                                Log.i(TAG, "DUMP_B64[$i/$chunks] ${b64.substring(start, end)}")
+                            }
+                            Log.i(TAG, "DUMP_B64_END")
+                            Log.i(TAG, "DUMP_SUMMARY ${NoteBodyEditor.summarizeBase64(b64)}")
+                            // describeBase64 is multi-line; split for logcat.
+                            val desc = NoteBodyEditor.describeBase64(b64)
+                            Log.i(TAG, "DUMP_DESCRIBE_BEGIN")
+                            for (line in desc.lines()) Log.i(TAG, "DESC $line")
+                            Log.i(TAG, "DUMP_DESCRIBE_END")
+                            val ar = NoteBodyEditor.dumpAttributeRunsBase64(b64)
+                            Log.i(TAG, "DUMP_ATTRRUNS_BEGIN")
+                            for (line in ar.lines()) Log.i(TAG, "AR $line")
+                            Log.i(TAG, "DUMP_ATTRRUNS_END")
+                            val tree = NoteBodyEditor.dumpSubstringTreeBase64(b64)
+                            Log.i(TAG, "DUMP_TREE_BEGIN")
+                            for (line in tree.lines()) Log.i(TAG, "TREE $line")
+                            Log.i(TAG, "DUMP_TREE_END")
+                        }
+                    }
+                }
+            }
             ACTION_CREATE -> {
                 val title = intent.getStringExtra("title") ?: ""
                 val body = intent.getStringExtra("body") ?: ""
@@ -275,6 +344,8 @@ class DebugReceiver : BroadcastReceiver() {
         private const val ACTION_APPEND_BY_TITLE = "com.example.applenotes.APPEND_BY_TITLE"
         private const val ACTION_SET_BODY_BY_TITLE = "com.example.applenotes.SET_BODY_BY_TITLE"
         private const val ACTION_DELETE_BY_TITLE = "com.example.applenotes.DELETE_BY_TITLE"
+        private const val ACTION_DUMP_BY_TITLE = "com.example.applenotes.DUMP_BY_TITLE"
+        private const val ACTION_DUMP_RECORD = "com.example.applenotes.DUMP_RECORD"
         private const val ACTION_CREATE = "com.example.applenotes.CREATE"
 
         private val httpClient by lazy {