mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2026-10-05 19:28:25 +00:00
Claude
a87222c51f
`:commons` is on the CLI classpath, yet it declared Compose UI, Coil, Compose resources, markdown and desktop Compose as dependencies, dragging ~40 MB of UI/Skiko jars into every `amy` distribution. This moves every Compose-dependent file into a new KMP module, `:commonsUI`, that `api`-depends on `:commons`; `:commons` keeps only the Compose runtime (stability annotations + snapshot state) and lifecycle-viewmodel. Files keep their `com.vitorpamplona.amethyst.commons.*` packages, so the split is a build-graph boundary and no consumer import changed. 236 files were `git mv`'d (composables, icons, robohash, theme, Coil fetchers, the `@Composable` relay-client entry points, `composeResources`, and the tests that exercise them). Two headless files needed surgery instead of a move: `GalleryParser` lost a vestigial foundation `@OptIn`, and the `LocalPrivacyLockState`/`lockStateFor` CompositionLocal accessor moved out of `PrivacyLockState` into its own commonsUI file. The feed DAL under `ui/feeds` and `ui/note/ParentNote`+`ReplyContext` stay in `commons` because ViewModels depend on them. `amethyst`, `desktopApp`, `nappletHost` (NappletWebContract serves the shell from composeResources) and `benchmark` now depend on `:commonsUI`; `cli`, `geode` and `marmotBench` do not. commons' androidMain gains an explicit androidx.core KTX dep it previously got transitively through Compose UI. CI, crowdin, the icon-font tools and the escaping hook point at the new composeResources location; CLAUDE.md, commons/ARCHITECTURE.md, a new commonsUI/ARCHITECTURE.md, CONTRIBUTING, BUILDING and the affected skills document the boundary. A plan doc under commons/plans records the classification method and follow-ups. Verified: JVM compiles for commons, commonsUI, cli, desktopApp; Android debug compiles for nappletHost and amethyst; commons/commonsUI/cli JVM test suites; both verifyKmpPurity gates; the cli runtime classpath no longer resolves Compose UI, material3, Skiko or Coil. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01N56KzPSYiN5edMRamvKEgD
89 lines
3.4 KiB
Python
Executable File
89 lines
3.4 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
"""Fail if the Compose resource catalog carries Android-only string escaping.
|
|
|
|
Android's aapt and Compose Multiplatform do not share escaping rules. Compose
|
|
(compose-gradle-plugin `handleSpecialCharacters`) resolves only \\uXXXX, \\n and
|
|
\\t, and collapses \\\\. It leaves \\' \\" \\? \\@ alone and renders Android's
|
|
quote-wrapping literally, so a value carried verbatim out of `res/values/` ships
|
|
a visible backslash: the login screen once read `Don\\'t have a Nostr account?`.
|
|
|
|
`tools:` attributes are the same class of mistake. They are an Android-lint
|
|
construct whose namespace is declared on the Android `<resources>` root; Compose
|
|
catalog roots do not declare it, so the prefix is unbound and the XML malformed.
|
|
|
|
**This recurs on every Crowdin sync.** Crowdin holds the Android-escaped source,
|
|
so each import reintroduces it -- twice in two days, 2,068 escaped apostrophes
|
|
across 40 locales each time, always the apostrophe-heavy regional variants
|
|
(uz-rUZ, fr-rFR, fr-rCA, tr-rTR). Like the orphan-strings desync, it arrives
|
|
through a bot-authored PR with no local session in the path, so CI is the layer
|
|
that has to catch it.
|
|
|
|
Repair with:
|
|
|
|
python3 tools/strings-migrate/fix_escapes.py --no-unwrap-quotes \\
|
|
commonsUI/src/commonMain/composeResources
|
|
|
|
`--no-unwrap-quotes` is mandatory on already-migrated files: escape conversion is
|
|
idempotent, quote-unwrapping is not, and a second unwrap strips the real display
|
|
quotes from values like `import_follows_tips`.
|
|
|
|
Only the Compose catalog is scanned. In an Android res tree the same escaping is
|
|
correct and must be left alone.
|
|
"""
|
|
import re
|
|
import sys
|
|
from collections import defaultdict
|
|
from pathlib import Path
|
|
|
|
CATALOG = "*/src/*/composeResources/values*/strings.xml"
|
|
|
|
# A backslash escape that is not itself escaped. \n, \t, \uXXXX and \\ are fine --
|
|
# Compose resolves those itself.
|
|
ANDROID_ESCAPE = re.compile(r"(?<!\\)\\(['\"?@])")
|
|
TOOLS_ATTR = re.compile(r'tools:[\w.-]+="')
|
|
|
|
|
|
def find_violations(root: Path):
|
|
found = defaultdict(lambda: defaultdict(int))
|
|
for path in sorted(root.glob(CATALOG)):
|
|
text = path.read_text(encoding="utf-8", errors="replace")
|
|
for esc in ANDROID_ESCAPE.findall(text):
|
|
found[path][f"\\{esc}"] += 1
|
|
n = len(TOOLS_ATTR.findall(text))
|
|
if n:
|
|
found[path]["tools: attribute"] += n
|
|
return found
|
|
|
|
|
|
def main() -> int:
|
|
root = Path(__file__).resolve().parents[2]
|
|
found = find_violations(root)
|
|
if not found:
|
|
return 0
|
|
|
|
out = sys.stderr
|
|
total = sum(sum(k.values()) for k in found.values())
|
|
print(
|
|
f"Android-only escaping in the Compose resource catalog: "
|
|
f"{total} occurrence(s) in {len(found)} file(s).",
|
|
file=out,
|
|
)
|
|
print("Compose does not resolve these; they render literally.\n", file=out)
|
|
for path, kinds in sorted(found.items(), key=lambda kv: -sum(kv[1].values()))[:12]:
|
|
detail = ", ".join(f"{k} x{v}" for k, v in sorted(kinds.items()))
|
|
print(f" {path.relative_to(root)}: {detail}", file=out)
|
|
if len(found) > 12:
|
|
print(f" ... and {len(found) - 12} more file(s)", file=out)
|
|
print(
|
|
"\nRepair:\n"
|
|
" python3 tools/strings-migrate/fix_escapes.py --no-unwrap-quotes \\\n"
|
|
" commonsUI/src/commonMain/composeResources\n"
|
|
"(--no-unwrap-quotes is mandatory on already-migrated files.)",
|
|
file=out,
|
|
)
|
|
return 1
|
|
|
|
|
|
if __name__ == "__main__":
|
|
sys.exit(main())
|