Rebrand Curare to Bennu under com.machankura.bennu
Move the packages to com.machankura.bennu.{compose,android,desktop}, the
Android applicationId to com.machankura.bennu.android and the iOS bundle
id to com.machankura.bennu.ios. The root project, launcher label, iOS
product, desktop window, user-facing strings, client tags and the
Curare* classes all say Bennu now.
Left alone on purpose: the mantra/ derivation tags, the `curated` desktop
data directory, the mantra.press relay and the curare.to references.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
dddfa68b38
commit
b75d4b427f
975 files changed
+7642
-7641
No files matched your search
@@ -18,7 +18,7 @@ set -uo pipefail
|
||||
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")/../.." || exit 1
|
||||
|
||||
UI=composeApp/src/commonMain/kotlin/to/curare/compose/ui
|
||||
UI=composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui
|
||||
THEME="$UI/theme"
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
@@ -214,9 +214,9 @@ def main():
|
||||
src = src[:start] + f'stringResource(Res.string.{names[fmt]}, {args})' + src[end:]
|
||||
rewritten += 1
|
||||
need = sorted({names[fmt] for *_x, fmt in [(c[0], c[4]) for c in found]})
|
||||
for imp in (['import curare.composeapp.generated.resources.Res',
|
||||
for imp in (['import bennu.composeapp.generated.resources.Res',
|
||||
'import org.jetbrains.compose.resources.stringResource']
|
||||
+ [f'import curare.composeapp.generated.resources.{n}' for n in need]):
|
||||
+ [f'import bennu.composeapp.generated.resources.{n}' for n in need]):
|
||||
if not has_import(src, imp):
|
||||
lines = src.split('\n')
|
||||
idx = max(i for i, l in enumerate(lines) if l.startswith('import '))
|
||||
|
||||
@@ -17,7 +17,7 @@ Usage:
|
||||
"""
|
||||
import os, re, sys, io, collections
|
||||
|
||||
UI = 'composeApp/src/commonMain/kotlin/to/curare/compose/ui'
|
||||
UI = 'composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui'
|
||||
STRINGS = 'composeApp/src/commonMain/composeResources/values/strings.xml'
|
||||
DRY = '--apply' not in sys.argv
|
||||
|
||||
@@ -243,7 +243,7 @@ def main():
|
||||
for start, end, value in reversed(found):
|
||||
src = src[:start] + f'stringResource(Res.string.{names[value]})' + src[end:]
|
||||
if changed:
|
||||
for imp in ('import curare.composeapp.generated.resources.Res',
|
||||
for imp in ('import bennu.composeapp.generated.resources.Res',
|
||||
'import org.jetbrains.compose.resources.stringResource'):
|
||||
if not has_import(src, imp):
|
||||
lines = src.split('\n')
|
||||
@@ -256,7 +256,7 @@ def main():
|
||||
lines = src.split('\n')
|
||||
idx = max(i for i, l in enumerate(lines) if l.startswith('import '))
|
||||
for nm in reversed(need):
|
||||
imp = f'import curare.composeapp.generated.resources.{nm}'
|
||||
imp = f'import bennu.composeapp.generated.resources.{nm}'
|
||||
if not has_import(src, imp):
|
||||
lines.insert(idx + 1, imp)
|
||||
src = '\n'.join(lines)
|
||||
|
||||
@@ -19,7 +19,7 @@ is a dimension and is left alone.
|
||||
"""
|
||||
import re, sys, io, os
|
||||
|
||||
UI = 'composeApp/src/commonMain/kotlin/to/curare/compose/ui'
|
||||
UI = 'composeApp/src/commonMain/kotlin/com/machankura/bennu/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
|
||||
@@ -131,11 +131,11 @@ def process(path):
|
||||
break
|
||||
lines.insert(idx + 1, 'import androidx.compose.material3.MaterialTheme')
|
||||
text = '\n'.join(lines)
|
||||
if 'import to.curare.compose.ui.theme.spacing' not in text and \
|
||||
if 'import com.machankura.bennu.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 to.curare.compose.ui.theme.spacing')
|
||||
lines.insert(idx + 1, 'import com.machankura.bennu.compose.ui.theme.spacing')
|
||||
text = '\n'.join(lines)
|
||||
if not DRY:
|
||||
io.open(path, 'w', encoding='utf-8').write(text)
|
||||
|
||||
@@ -18,7 +18,7 @@ Usage: m3-spacing-positions.py [--list]
|
||||
"""
|
||||
import os, re, sys
|
||||
|
||||
UI = 'composeApp/src/commonMain/kotlin/to/curare/compose/ui'
|
||||
UI = 'composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui'
|
||||
THEME = os.path.join(UI, 'theme')
|
||||
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ Usage: m3-title-case.py [--list]
|
||||
"""
|
||||
import os, re, sys
|
||||
|
||||
UI = 'composeApp/src/commonMain/kotlin/to/curare/compose/ui'
|
||||
UI = 'composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui'
|
||||
CATALOGUE = 'composeApp/src/commonMain/composeResources/values/strings.xml'
|
||||
|
||||
SMALL = {'a', 'an', 'the', 'to', 'of', 'for', 'and', 'or', 'via',
|
||||
|
||||
@@ -18,7 +18,7 @@ Usage: m3-touch-targets.py [--list]
|
||||
"""
|
||||
import os, re, sys
|
||||
|
||||
UI = 'composeApp/src/commonMain/kotlin/to/curare/compose/ui'
|
||||
UI = 'composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui'
|
||||
|
||||
|
||||
def offenders():
|
||||
|
||||
Reference in new issue
Block a user