`press.mantra.{compose,android,desktop}` becomes `com.it.curated.{compose,android,desktop}`
across 680 file moves, and the app is Curated everywhere a user can see it. The work
that mattered was not the rename; it was deciding which of the 6355 occurrences of
"mantra" were the brand and which were something else wearing it.
**"Mantra" was two words in one tree, and only one of them is a brand.** 1369 of the
tokens belong to a domain model -- `MantraArtifact`, `MantraChapter`, `MantraChunk`,
`MantraDialect`, the seven `MantraTranslation*` types, their 15 DAOs and
`MantraRepository` -- and those 12 entity classes declare no `tableName`, so Room takes
the class name as the SQLite table name. A blanket `s/Mantra/Curated/` renames 12 live
tables, which is not a rename but a v20 with 12 `@RenameTable` specs and a regenerated
schema. Asked, the decision was brand surface only, so the domain keeps its name and the
database keeps every one of its tables. The count is the check: the same 1369 tokens are
present before and after, and Room found all 19 existing schemas at the moved directory
and generated no stray -- which is what proves no table moved.
**Renamed instead is the set of names that only ever meant "this app".** `CuratedApp`,
`CuratedApplication`, `CuratedGlobal`, `CuratedNavHost`, `CuratedNavigationSuite`,
`CuratedShapes`, `CuratedConverters`, `defaultCuratedDir`, and `CuratedDatabase` with its
constructor and test. `CuratedDatabase` is safe to rename precisely because the entity
classes were not: the `@Database` class name picks the schema *directory*
(`composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/`), never a table,
so the 19 schema files move unmodified and the AutoMigration chain from 1 is untouched.
**`com.it.curated` is the applicationId; the namespace is `com.it.curated.android`.**
These were one value before, and splitting them is what lets the identifier land verbatim
as the app's store identity while `BuildConfig` and the manifest's relative
`android:name=".CuratedApplication"` keep resolving against the android source package.
The debug build is `com.it.curated.debug` via the existing suffix.
**The generated resources package moved because `rootProject.name` did.** Compose
Resources derives it from the root project, so `Mantra` -> `Curated` silently turns
`mantra.composeapp.generated.resources` into `curated.composeapp.generated.resources` and
breaks all 501 imports at once. They are rewritten, along with the two string keys that
carried the brand -- `mantra` -> `curated` and `sign_in_is_not_yet_available_while_mantra_is`
-- and their three call sites. The seven `docs/scripts/` tools and `m3-audit.sh` hardcode
the UI source path, so they moved too; the audit passing is the evidence they still see
the whole tree rather than an empty one.
**Two hash inputs and a hostname keep the old name, and now say why.**
`SharedKeyDerivation.TWEAK_TAG` and `ChillDkgRitualManager.HOST_KEY_DERIVATION_TAG` are
`"mantra/..."` strings that are fed to SHA256. Renaming them derives different keys from
the same seed: every room already created is orphaned, every completed ChillDKG becomes
unrecoverable, and a Curated client and a Mantra client sharing a group derive different
keys from one threshold key, so their partial signatures aggregate to something that
verifies against nothing. That is a protocol fork and belongs in a `v2` tag, not in a
rebrand. `Relays.ephemeral` stays on `wss://ephemeral.mantra.press` for the duller reason
that it is a relay that is running and is in the bootstrap, publish, finder and DM sets;
pointing it at a name nobody has stood up takes the app off the network. All three sites,
and `docs/shared-key-derivation.md`, now carry the reasoning, because the failure mode of
each is silent and the next reader will otherwise finish the job.
**iOS had never been moved off the brand before this one.** `Config.xcconfig` still read
`PRODUCT_NAME=Torch` with a bundle id of `ac.aux.compose.Aux` -- two brands ago -- so a
Curated repo built a Torch.app. It is now `Curated` / `com.it.curated`, with the pbxproj's
three product references renamed to match. This is wider than Mantra -> Curated and is
called out for that reason; it is also unverified here, because the build gates the ios
targets behind `isMacOsX` and this was built on linux. In the same spirit the last stale
`press.auxiliary.compose` file -- a KMP template test asserting `1 + 2 == 3` -- was
relocated rather than deleted, so the source tree has one root package instead of an
orphan under the vacated one.
**Three things still say the old names on purpose and are not oversights.**
`UserAgent.APP_NAME` and `CLIENT_NAME` still read `"Torch"`, which a previous rename left
deliberately: it goes on the wire to relay operators and is a network identity rather
than a content one. `.gitea/workflows/material-design-conformance.yml` triggers on
`branches: [mantra]` because that is still the branch's real name. And
`docs/material-design-conformance.md:278` records that the top bar once read `"Torch"`
while the window title read `"Mantra"` -- a finding about a past defect, which rewriting
would falsify.
1136 tests pass -- 733 in `:composeApp:jvmTest`, 403 in `:composeApp:testDebugUnitTest` --
`:composeApp:compileDebugKotlinAndroid` is clean, and `m3Audit` meets every budget.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
111 lines
3.9 KiB
Python
Executable File
111 lines
3.9 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
"""Count .dp literals by whether they sit in a spacing position or a dimension one.
|
|
|
|
m3-audit.sh used to split them by value, exempting a list of numbers that "looked like"
|
|
dimensions -- which is wrong twice over. 16.dp is a spacing stop *and* a plausible icon
|
|
size, and 50.dp was a Spacer height in 53 places and a divider width in one. Only the call
|
|
shape says which, so this reads the shape.
|
|
|
|
spacing padding(...), PaddingValues(...), Arrangement.spacedBy(...), and a
|
|
.height()/.width() whose enclosing call is Spacer(
|
|
dimension .size(), a non-Spacer .height()/.width(), RoundedCornerShape(),
|
|
BorderStroke(), a `size =` argument
|
|
|
|
Spacing positions are what phase 2 drives to zero; dimensions are out of its scope and are
|
|
reported so the number is visible rather than exempted.
|
|
|
|
Usage: m3-spacing-positions.py [--list]
|
|
"""
|
|
import os, re, sys
|
|
|
|
UI = 'composeApp/src/commonMain/kotlin/com/it/curated/compose/ui'
|
|
THEME = os.path.join(UI, 'theme')
|
|
|
|
|
|
def _spans(text, opener):
|
|
"""Brace-matched character ranges of every call matching `opener`."""
|
|
spans = []
|
|
for m in re.finditer(opener, text):
|
|
depth, i = 0, m.end() - 1
|
|
while i < len(text):
|
|
if text[i] == '(':
|
|
depth += 1
|
|
elif text[i] == ')':
|
|
depth -= 1
|
|
if depth == 0:
|
|
spans.append((m.start(), i))
|
|
break
|
|
i += 1
|
|
return spans
|
|
|
|
|
|
def classify(path):
|
|
text = open(path, encoding='utf-8').read()
|
|
pads = _spans(text, r'\.?\bpadding\s*\(|\bPaddingValues\s*\(')
|
|
gaps = _spans(text, r'\bspacedBy\s*\(')
|
|
spacers = _spans(text, r'\bSpacer\s*\(')
|
|
|
|
def inside(pos, spans):
|
|
return any(a <= pos <= b for a, b in spans)
|
|
|
|
hw = [
|
|
(m.start(1), m.end(1))
|
|
for m in re.finditer(r'\.(?:height|width)\s*\(\s*(\d+\.dp)\s*\)', text)
|
|
if inside(m.start(), spacers)
|
|
]
|
|
|
|
spacing, dimension = [], []
|
|
for m in re.finditer(r'\b(\d+)\.dp\b', text):
|
|
pos = m.start()
|
|
line_start = text.rfind('\n', 0, pos) + 1
|
|
line = text[line_start:text.find('\n', pos)]
|
|
if re.match(r'\s*(//|\*|/\*)', line):
|
|
continue
|
|
# An explicit, reasoned opt-out. A value that is genuinely not a step in the
|
|
# spacing rhythm -- room reserved below a list, say -- is marked at the site
|
|
# rather than exempted by value in this file, so the reason travels with it
|
|
# and a reviewer sees it in the diff.
|
|
# Walk back over the unbroken run of comment lines directly above.
|
|
exempt = False
|
|
prev = text[:line_start].rstrip('\n').split('\n')
|
|
for candidate in reversed(prev[-8:]):
|
|
stripped = candidate.strip()
|
|
if not stripped.startswith('//'):
|
|
break
|
|
if 'm3-spacing-exempt' in stripped:
|
|
exempt = True
|
|
break
|
|
if exempt:
|
|
continue
|
|
entry = (path, text[:pos].count('\n') + 1, m.group(0), line.strip()[:90])
|
|
if inside(pos, pads) or inside(pos, gaps) or any(a <= pos < b for a, b in hw):
|
|
spacing.append(entry)
|
|
else:
|
|
dimension.append(entry)
|
|
return spacing, dimension
|
|
|
|
|
|
def main():
|
|
spacing, dimension = [], []
|
|
for root, _, files in os.walk(UI):
|
|
if root.startswith(THEME):
|
|
continue
|
|
for f in sorted(files):
|
|
if f.endswith('.kt'):
|
|
s, d = classify(os.path.join(root, f))
|
|
spacing += s
|
|
dimension += d
|
|
|
|
print(f' {"dp literals in spacing positions":42s} {len(spacing):6d}')
|
|
print(f' {"dp literals in dimension positions":42s} {len(dimension):6d} (out of scope)')
|
|
|
|
if '--list' in sys.argv:
|
|
for path, line, lit, ctx in spacing:
|
|
print(f' {path.replace(UI + "/", "")}:{line} {lit:>7s} {ctx}')
|
|
|
|
return 1 if spacing else 0
|
|
|
|
|
|
if __name__ == '__main__':
|
|
sys.exit(main())
|