`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>
160 lines
5.9 KiB
Python
Executable File
160 lines
5.9 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
"""Rewrite .dp literals that sit in spacing positions onto MaterialTheme.spacing.
|
|
|
|
Checked in because phase 2 runs it twice and the breakpoint phase will want it again.
|
|
Usage:
|
|
|
|
m3-migrate-spacing.py '{"5":"space50","15":"space200"}' # dry run
|
|
m3-migrate-spacing.py '{"5":"space50","15":"space200"}' --apply
|
|
|
|
Only three call shapes are touched, and each is matched with the literal in place so a
|
|
dimension can never be caught by accident:
|
|
|
|
padding(...) any of the overloads, including named start/end/top/bottom
|
|
Arrangement.spacedBy(N) horizontal or vertical
|
|
Spacer height/width a .height()/.width() whose enclosing call is Spacer(
|
|
|
|
Everything else -- .size(), a non-Spacer .height(), RoundedCornerShape, BorderStroke --
|
|
is a dimension and is left alone.
|
|
"""
|
|
import re, sys, io, os
|
|
|
|
UI = 'composeApp/src/commonMain/kotlin/com/it/curated/compose/ui'
|
|
# {"padding": {"8": "compactPadding"}, "gap": {...}, "spacer": {...}, "*": {...}}
|
|
# A shape-specific entry wins over "*". Shape matters because the same number means
|
|
# different things in different positions: 8dp of padding is compactPadding, 8dp of gap
|
|
# is itemGap, and 8dp under a Spacer is neither.
|
|
MAPPING = {}
|
|
DRY = '--apply' not in sys.argv
|
|
|
|
def token(value, shape):
|
|
return MAPPING.get(shape, {}).get(value) or MAPPING.get('*', {}).get(value)
|
|
|
|
def spacer_spans(text):
|
|
"""Character ranges covered by a Spacer( ... ) call, brace-matched."""
|
|
spans = []
|
|
for m in re.finditer(r'\bSpacer\s*\(', 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 in_spans(pos, spans):
|
|
return any(a <= pos <= b for a, b in spans)
|
|
|
|
def padding_spans(text):
|
|
spans = []
|
|
for m in re.finditer(r'\.?\bpadding\s*\(|\bPaddingValues\s*\(', 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 spacedby_spans(text):
|
|
spans = []
|
|
for m in re.finditer(r'\bspacedBy\s*\(', 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 process(path):
|
|
text = io.open(path, encoding='utf-8').read()
|
|
original = text
|
|
changed = []
|
|
|
|
for _ in range(60): # spans shift after each edit; recompute
|
|
pads = padding_spans(text)
|
|
gaps = spacedby_spans(text)
|
|
spacers = spacer_spans(text)
|
|
# a .height()/.width() literal counts only inside a Spacer(
|
|
hw = [(m.start(1), m.end(1), m.group(1))
|
|
for m in re.finditer(r'\.(?:height|width)\s*\(\s*(\d+\.dp)\s*\)', text)
|
|
if in_spans(m.start(), spacers)]
|
|
|
|
edit = None
|
|
for m in re.finditer(r'\b(\d+)\.dp\b', text):
|
|
lit = m.group(0)
|
|
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): # a comment
|
|
continue
|
|
if in_spans(pos, pads):
|
|
shape = 'padding'
|
|
elif in_spans(pos, gaps):
|
|
shape = 'gap'
|
|
elif any(a <= pos < b for a, b, _ in hw):
|
|
shape = 'spacer'
|
|
else:
|
|
continue
|
|
tok = token(m.group(1), shape)
|
|
if tok is None:
|
|
continue
|
|
edit = (m.start(), m.end(), tok, lit, line.strip()[:80])
|
|
break
|
|
if edit is None:
|
|
break
|
|
a, b, tok, lit, ctx = edit
|
|
text = text[:a] + f'MaterialTheme.spacing.{tok}' + text[b:]
|
|
changed.append((lit, tok, ctx))
|
|
|
|
if text != original:
|
|
if 'import androidx.compose.material3.MaterialTheme' not in text:
|
|
# insert alphabetically among the material3 imports, else after the last import
|
|
lines = text.split('\n')
|
|
idx = max(i for i, l in enumerate(lines) if l.startswith('import '))
|
|
for i, l in enumerate(lines):
|
|
if l.startswith('import androidx.compose.material3.') and l > 'import androidx.compose.material3.MaterialTheme':
|
|
idx = i - 1
|
|
break
|
|
lines.insert(idx + 1, 'import androidx.compose.material3.MaterialTheme')
|
|
text = '\n'.join(lines)
|
|
if 'import com.it.curated.compose.ui.theme.spacing' not in text and \
|
|
not path.endswith('theme/Spacing.kt'):
|
|
lines = text.split('\n')
|
|
idx = max(i for i, l in enumerate(lines) if l.startswith('import '))
|
|
lines.insert(idx + 1, 'import com.it.curated.compose.ui.theme.spacing')
|
|
text = '\n'.join(lines)
|
|
if not DRY:
|
|
io.open(path, 'w', encoding='utf-8').write(text)
|
|
return changed
|
|
|
|
if __name__ == '__main__':
|
|
import json
|
|
MAPPING.update(json.loads(sys.argv[1]))
|
|
total = 0
|
|
for root, _, files in os.walk(UI):
|
|
for f in sorted(files):
|
|
if not f.endswith('.kt'):
|
|
continue
|
|
p = os.path.join(root, f)
|
|
ch = process(p)
|
|
if ch:
|
|
print(f'{p.replace(UI + "/", "")}')
|
|
for lit, tok, ctx in ch:
|
|
print(f' {lit:>7s} -> {tok:18s} {ctx}')
|
|
total += len(ch)
|
|
print(f'\n{total} literal(s) {"would be " if DRY else ""}rewritten')
|