diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
index 9451fbfc..2052140d 100644
--- a/composeApp/build.gradle.kts
+++ b/composeApp/build.gradle.kts
@@ -13,7 +13,7 @@ plugins {
alias(libs.plugins.ksp)
// No sqldelight plugin here on purpose. The fr.acinq.phoenix.db.sqldelight databases this
// module used to generate are the same three lightning-kmp-app's :library generates from an
- // identical copy of the .sq sources, and nothing under com.it.curated touches them. Generating
+ // identical copy of the .sq sources, and nothing under to.curare touches them. Generating
// them on both sides put every generated class in the apk twice, which debug tolerates and
// mergeDexRelease rejects as duplicate types. The library's copies are the ones that count.
}
@@ -159,14 +159,18 @@ kotlin {
}
android {
- namespace = "com.it.curated.android"
+ namespace = "to.curare.android"
compileSdk = libs.versions.android.compileSdk.get().toInt()
buildFeatures {
buildConfig = true
}
defaultConfig {
- applicationId = "com.it.curated"
+ // The store identity and the namespace are one value again. They were split when
+ // the app was com.it.curated so the base package could land verbatim as the
+ // applicationId; the rebrand collapsed them, so `BuildConfig` and the manifest's
+ // relative `android:name=".CurareApplication"` resolve against this same package.
+ applicationId = "to.curare.android"
minSdk = libs.versions.android.minSdk.get().toInt()
targetSdk = libs.versions.android.targetSdk.get().toInt()
versionCode = 2
@@ -243,7 +247,7 @@ val m3Audit = tasks.register("m3Audit") {
val script = rootProject.layout.projectDirectory.file("docs/scripts/m3-audit.sh").asFile
val uiSources = rootProject.layout.projectDirectory
- .dir("composeApp/src/commonMain/kotlin/com/it/curated/compose/ui")
+ .dir("composeApp/src/commonMain/kotlin/to/curare/compose/ui")
val projectDirectory = rootProject.layout.projectDirectory.asFile
inputs.file(script).withPropertyName("auditScript")
@@ -286,11 +290,11 @@ tasks.named("check") { dependsOn(m3Audit) }
compose.desktop {
application {
- mainClass = "com.it.curated.desktop.MainKt"
+ mainClass = "to.curare.desktop.MainKt"
nativeDistributions {
targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
- packageName = "com.it.curated.desktop"
+ packageName = "to.curare.desktop"
packageVersion = "1.0.0"
}
}
diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/1.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/1.json
similarity index 100%
rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/1.json
rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/1.json
diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/10.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/10.json
similarity index 100%
rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/10.json
rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/10.json
diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/11.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/11.json
similarity index 100%
rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/11.json
rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/11.json
diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/12.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/12.json
similarity index 100%
rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/12.json
rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/12.json
diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/13.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/13.json
similarity index 100%
rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/13.json
rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/13.json
diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/14.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/14.json
similarity index 100%
rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/14.json
rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/14.json
diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/15.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/15.json
similarity index 100%
rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/15.json
rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/15.json
diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/16.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/16.json
similarity index 100%
rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/16.json
rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/16.json
diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/17.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/17.json
similarity index 100%
rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/17.json
rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/17.json
diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/18.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/18.json
similarity index 100%
rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/18.json
rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/18.json
diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/19.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/19.json
similarity index 100%
rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/19.json
rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/19.json
diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/2.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/2.json
similarity index 100%
rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/2.json
rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/2.json
diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/3.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/3.json
similarity index 100%
rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/3.json
rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/3.json
diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/4.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/4.json
similarity index 100%
rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/4.json
rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/4.json
diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/5.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/5.json
similarity index 100%
rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/5.json
rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/5.json
diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/6.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/6.json
similarity index 100%
rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/6.json
rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/6.json
diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/7.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/7.json
similarity index 100%
rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/7.json
rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/7.json
diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/8.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/8.json
similarity index 100%
rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/8.json
rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/8.json
diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/9.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/9.json
similarity index 100%
rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/9.json
rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/9.json
diff --git a/composeApp/src/androidMain/AndroidManifest.xml b/composeApp/src/androidMain/AndroidManifest.xml
index 28f59742..b239300b 100644
--- a/composeApp/src/androidMain/AndroidManifest.xml
+++ b/composeApp/src/androidMain/AndroidManifest.xml
@@ -7,7 +7,7 @@
+ android:name="to.curare.android.MainActivity">
diff --git a/composeApp/src/androidMain/kotlin/com/it/curated/android/CuratedApplication.kt b/composeApp/src/androidMain/kotlin/to/curare/android/CurareApplication.kt
similarity index 92%
rename from composeApp/src/androidMain/kotlin/com/it/curated/android/CuratedApplication.kt
rename to composeApp/src/androidMain/kotlin/to/curare/android/CurareApplication.kt
index cbf73289..4a02da38 100644
--- a/composeApp/src/androidMain/kotlin/com/it/curated/android/CuratedApplication.kt
+++ b/composeApp/src/androidMain/kotlin/to/curare/android/CurareApplication.kt
@@ -1,4 +1,4 @@
-package com.it.curated.android
+package to.curare.android
import android.app.Application
import android.content.Context
@@ -14,7 +14,7 @@ import fr.acinq.phoenix.utils.preferences.GlobalPrefs
/** This datastore persists preferences across node ids. */
val Context.globalPrefs: DataStore by preferencesDataStore(name = "globalprefs")
-class CuratedApplication: Application(), LightningApplication {
+class CurareApplication: Application(), LightningApplication {
private lateinit var globalPrefs: GlobalPrefs
private lateinit var phoenixGlobal: PhoenixGlobal
diff --git a/composeApp/src/androidMain/kotlin/com/it/curated/android/MainActivity.kt b/composeApp/src/androidMain/kotlin/to/curare/android/MainActivity.kt
similarity index 87%
rename from composeApp/src/androidMain/kotlin/com/it/curated/android/MainActivity.kt
rename to composeApp/src/androidMain/kotlin/to/curare/android/MainActivity.kt
index fa9ea30e..5b40aad5 100644
--- a/composeApp/src/androidMain/kotlin/com/it/curated/android/MainActivity.kt
+++ b/composeApp/src/androidMain/kotlin/to/curare/android/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.it.curated.android
+package to.curare.android
import android.content.Intent
import android.nfc.NfcAdapter
@@ -8,9 +8,9 @@ import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.navigation.compose.rememberNavController
import fr.acinq.phoenix.NFCActivity
-import com.it.curated.compose.PlatformContext
-import com.it.curated.compose.CuratedApp
-import com.it.curated.compose.CuratedGlobal
+import to.curare.compose.PlatformContext
+import to.curare.compose.CurareApp
+import to.curare.compose.CurareGlobal
import fr.acinq.phoenix.PhoenixGlobal
import fr.acinq.phoenix.android.services.HceService
@@ -25,9 +25,9 @@ class MainActivity : ComponentActivity(), NFCActivity {
setContent {
val navController = rememberNavController()
- CuratedApp(
+ CurareApp(
navController = navController,
- curatedGlobal = CuratedGlobal(
+ curareGlobal = CurareGlobal(
platformContext = PlatformContext(
applicationContext = applicationContext
)
diff --git a/composeApp/src/androidMain/kotlin/com/it/curated/compose/AppVersion.android.kt b/composeApp/src/androidMain/kotlin/to/curare/compose/AppVersion.android.kt
similarity index 72%
rename from composeApp/src/androidMain/kotlin/com/it/curated/compose/AppVersion.android.kt
rename to composeApp/src/androidMain/kotlin/to/curare/compose/AppVersion.android.kt
index 6faaf115..a9b4c177 100644
--- a/composeApp/src/androidMain/kotlin/com/it/curated/compose/AppVersion.android.kt
+++ b/composeApp/src/androidMain/kotlin/to/curare/compose/AppVersion.android.kt
@@ -1,6 +1,6 @@
-package com.it.curated.compose
+package to.curare.compose
-import com.it.curated.android.BuildConfig
+import to.curare.android.BuildConfig
actual object AppVersion {
actual val versionName: String
diff --git a/composeApp/src/androidMain/kotlin/com/it/curated/compose/Platform.android.kt b/composeApp/src/androidMain/kotlin/to/curare/compose/Platform.android.kt
similarity index 60%
rename from composeApp/src/androidMain/kotlin/com/it/curated/compose/Platform.android.kt
rename to composeApp/src/androidMain/kotlin/to/curare/compose/Platform.android.kt
index a44b6da4..a4bfa293 100644
--- a/composeApp/src/androidMain/kotlin/com/it/curated/compose/Platform.android.kt
+++ b/composeApp/src/androidMain/kotlin/to/curare/compose/Platform.android.kt
@@ -1,4 +1,4 @@
-package com.it.curated.compose
+package to.curare.compose
import android.os.Build
diff --git a/composeApp/src/androidMain/kotlin/com/it/curated/compose/PlatformContext.android.kt b/composeApp/src/androidMain/kotlin/to/curare/compose/PlatformContext.android.kt
similarity index 75%
rename from composeApp/src/androidMain/kotlin/com/it/curated/compose/PlatformContext.android.kt
rename to composeApp/src/androidMain/kotlin/to/curare/compose/PlatformContext.android.kt
index c8740099..ba72bbe2 100644
--- a/composeApp/src/androidMain/kotlin/com/it/curated/compose/PlatformContext.android.kt
+++ b/composeApp/src/androidMain/kotlin/to/curare/compose/PlatformContext.android.kt
@@ -1,4 +1,4 @@
-package com.it.curated.compose
+package to.curare.compose
import android.content.Context
diff --git a/composeApp/src/androidMain/kotlin/com/it/curated/compose/database/builder/PlatformDatabaseBuilder.android.kt b/composeApp/src/androidMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.android.kt
similarity index 65%
rename from composeApp/src/androidMain/kotlin/com/it/curated/compose/database/builder/PlatformDatabaseBuilder.android.kt
rename to composeApp/src/androidMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.android.kt
index abefc988..6f388407 100644
--- a/composeApp/src/androidMain/kotlin/com/it/curated/compose/database/builder/PlatformDatabaseBuilder.android.kt
+++ b/composeApp/src/androidMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.android.kt
@@ -1,22 +1,22 @@
-package com.it.curated.compose.database.builder
+package to.curare.compose.database.builder
import androidx.room3.Room
import androidx.room3.RoomDatabase
-import com.it.curated.compose.PlatformContext
-import com.it.curated.compose.database.CuratedDatabase
+import to.curare.compose.PlatformContext
+import to.curare.compose.database.CurareDatabase
actual object PlatformDatabaseBuilder {
- actual fun getDatabaseBuilder(platformContext: PlatformContext): RoomDatabase.Builder {
+ actual fun getDatabaseBuilder(platformContext: PlatformContext): RoomDatabase.Builder {
val appContext = platformContext.applicationContext
val dbFile = appContext.getDatabasePath("aux.db")
- return Room.databaseBuilder(
+ return Room.databaseBuilder(
context = appContext,
name = dbFile.absolutePath
)
}
- actual fun getInMemoryDatabaseBuilder(platform: PlatformContext): RoomDatabase.Builder {
+ actual fun getInMemoryDatabaseBuilder(platform: PlatformContext): RoomDatabase.Builder {
return Room.inMemoryDatabaseBuilder(
context = platform.applicationContext
)
diff --git a/composeApp/src/androidMain/kotlin/com/it/curated/compose/extensions/Phoenix.android.kt b/composeApp/src/androidMain/kotlin/to/curare/compose/extensions/Phoenix.android.kt
similarity index 89%
rename from composeApp/src/androidMain/kotlin/com/it/curated/compose/extensions/Phoenix.android.kt
rename to composeApp/src/androidMain/kotlin/to/curare/compose/extensions/Phoenix.android.kt
index 66cecddd..7b65495e 100644
--- a/composeApp/src/androidMain/kotlin/com/it/curated/compose/extensions/Phoenix.android.kt
+++ b/composeApp/src/androidMain/kotlin/to/curare/compose/extensions/Phoenix.android.kt
@@ -1,6 +1,6 @@
-package com.it.curated.compose.extensions
+package to.curare.compose.extensions
-import com.it.curated.android.CuratedApplication
+import to.curare.android.CurareApplication
import fr.acinq.phoenix.PhoenixGlobal
import fr.acinq.phoenix.android.BusinessManager
import fr.acinq.phoenix.android.services.ChannelsWatcher
@@ -23,11 +23,11 @@ actual fun schedulePlatformLogic(phoenixGlobal: PhoenixGlobal) {
ContactsPhotoCleaner.schedule(phoenixGlobal.ctx.applicationContext)
}
actual fun getShowIntroFlow(phoenixGlobal: PhoenixGlobal): Flow {
- val machankuraApplication = phoenixGlobal.ctx.applicationContext as CuratedApplication
+ val machankuraApplication = phoenixGlobal.ctx.applicationContext as CurareApplication
return machankuraApplication.getGlobalPrefs().getShowIntro
}
actual fun getGlobalPrefs(phoenixGlobal: PhoenixGlobal): GlobalPrefs {
- val machankuraApplication = phoenixGlobal.ctx.applicationContext as CuratedApplication
+ val machankuraApplication = phoenixGlobal.ctx.applicationContext as CurareApplication
return machankuraApplication.getGlobalPrefs()
}
\ No newline at end of file
diff --git a/composeApp/src/androidMain/kotlin/com/it/curated/compose/ui/theme/Motion.android.kt b/composeApp/src/androidMain/kotlin/to/curare/compose/ui/theme/Motion.android.kt
similarity index 98%
rename from composeApp/src/androidMain/kotlin/com/it/curated/compose/ui/theme/Motion.android.kt
rename to composeApp/src/androidMain/kotlin/to/curare/compose/ui/theme/Motion.android.kt
index f862c472..e7f9475d 100644
--- a/composeApp/src/androidMain/kotlin/com/it/curated/compose/ui/theme/Motion.android.kt
+++ b/composeApp/src/androidMain/kotlin/to/curare/compose/ui/theme/Motion.android.kt
@@ -1,4 +1,4 @@
-package com.it.curated.compose.ui.theme
+package to.curare.compose.ui.theme
import android.database.ContentObserver
import android.provider.Settings
diff --git a/composeApp/src/androidMain/kotlin/com/it/curated/compose/ui/theme/Theme.android.kt b/composeApp/src/androidMain/kotlin/to/curare/compose/ui/theme/Theme.android.kt
similarity index 98%
rename from composeApp/src/androidMain/kotlin/com/it/curated/compose/ui/theme/Theme.android.kt
rename to composeApp/src/androidMain/kotlin/to/curare/compose/ui/theme/Theme.android.kt
index 543248b0..d811a28f 100644
--- a/composeApp/src/androidMain/kotlin/com/it/curated/compose/ui/theme/Theme.android.kt
+++ b/composeApp/src/androidMain/kotlin/to/curare/compose/ui/theme/Theme.android.kt
@@ -1,4 +1,4 @@
-package com.it.curated.compose.ui.theme
+package to.curare.compose.ui.theme
import android.app.UiModeManager
import android.content.Context
diff --git a/composeApp/src/androidMain/kotlin/com/it/curated/compose/ui/view/model/NavigationViewModel.android.kt b/composeApp/src/androidMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.android.kt
similarity index 95%
rename from composeApp/src/androidMain/kotlin/com/it/curated/compose/ui/view/model/NavigationViewModel.android.kt
rename to composeApp/src/androidMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.android.kt
index d289818c..17947250 100644
--- a/composeApp/src/androidMain/kotlin/com/it/curated/compose/ui/view/model/NavigationViewModel.android.kt
+++ b/composeApp/src/androidMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.android.kt
@@ -1,7 +1,7 @@
-package com.it.curated.compose.ui.view.model
+package to.curare.compose.ui.view.model
-import com.it.curated.android.CuratedApplication
-import com.it.curated.compose.AppVersion
+import to.curare.android.CurareApplication
+import to.curare.compose.AppVersion
import co.touchlab.kermit.Logger
import fr.acinq.bitcoin.MnemonicCode
import fr.acinq.lightning.crypto.LocalKeyManager
@@ -35,12 +35,12 @@ actual fun loadAndDecryptSeed(phoenixGlobal: PhoenixGlobal): DecryptSeedResult {
}
actual fun getAvailableWalletsMeta(phoenixGlobal: PhoenixGlobal): Flow