diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/MantraApp.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/MantraApp.kt index bd2ce2d2..321545fa 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/MantraApp.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/MantraApp.kt @@ -7,7 +7,7 @@ import androidx.compose.ui.Modifier import androidx.navigation.NavHostController import press.mantra.compose.ui.composable.navigation.MantraNavHost import press.mantra.compose.ui.composable.widgets.ProvideSnackbarHost -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import fr.acinq.phoenix.PhoenixGlobal @Composable @@ -16,7 +16,7 @@ fun MantraApp( mantraGlobal: MantraGlobal, phoenixGlobal: PhoenixGlobal ) { - TorchTheme { + MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/Profile.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/Profile.kt index f6e7e758..f7d1ba98 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/Profile.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/Profile.kt @@ -23,7 +23,7 @@ import com.vitorpamplona.quartz.nip51Lists.relayLists.RelayFeedsListEvent import press.mantra.compose.ui.composable.navigation.routes.NostrEventDetailRoute import press.mantra.compose.ui.composable.widgets.profile.ProfileAvatar import press.mantra.compose.ui.composable.widgets.profile.ProfileColor -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import kotlin.time.Clock import kotlin.time.Instant import press.mantra.compose.ui.theme.ConformancePreviews @@ -180,7 +180,7 @@ fun ProfileRenderAsListItemPreview() { about = "I am the stone that the builder refused.", nostrEventId = "nostrEventId" ) - TorchTheme { + MantraTheme { Surface( modifier = Modifier.padding(20.dp) ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/intermdiate/LocalQuotedNostrEvent.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/intermdiate/LocalQuotedNostrEvent.kt index f016a4f1..a6c516a6 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/intermdiate/LocalQuotedNostrEvent.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/intermdiate/LocalQuotedNostrEvent.kt @@ -21,7 +21,7 @@ import press.mantra.compose.database.model.Profile import press.mantra.compose.database.model.QuotedRelation import press.mantra.compose.ui.composable.widgets.content.RichContent import press.mantra.compose.ui.composable.widgets.profile.ProfileAvatar -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import press.mantra.compose.ui.theme.ConformancePreviews data class LocalQuotedNostrEvent( @@ -113,7 +113,7 @@ data class LocalQuotedNostrEvent( @ConformancePreviews @Composable private fun LocalQuotedNostrEventPreview() { - TorchTheme { + MantraTheme { Surface( modifier = Modifier.padding(20.dp) ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/network/UserAgent.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/network/UserAgent.kt index 87744cfd..557b63dc 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/network/UserAgent.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/network/UserAgent.kt @@ -1,8 +1,8 @@ package press.mantra.compose.network object UserAgent { - const val APP_NAME = "Torch" - const val CLIENT_NAME = "Torch" + const val APP_NAME = "Mantra" + const val CLIENT_NAME = "Mantra" } fun String.asClientTag(): Array = arrayOf( diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ActiveProfileScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ActiveProfileScreen.kt index 3f90c02c..ecbb13ae 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ActiveProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ActiveProfileScreen.kt @@ -395,7 +395,7 @@ fun ActiveProfileScreen( @ConformancePreviews @Composable private fun UnannouncedProfileScreenPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/AddArtifactScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/AddArtifactScreen.kt index c3b1df70..693afa49 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/AddArtifactScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/AddArtifactScreen.kt @@ -59,7 +59,7 @@ import press.mantra.compose.repository.NostrRepository import press.mantra.compose.ui.composable.navigation.routes.ChatRoomDetailRoute import press.mantra.compose.ui.composable.navigation.routes.Route import press.mantra.compose.ui.composable.widgets.LoadingDataIndicator -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import press.mantra.compose.ui.view.state.ChatRoomMessagingUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey import press.mantra.compose.repository.MantraRepository @@ -405,7 +405,7 @@ fun AddArtifactScreen( @ConformancePreviews @Composable private fun AddArtifactScreenPreview() { - TorchTheme { + MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/AddChapterScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/AddChapterScreen.kt index d2627f34..f46431ef 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/AddChapterScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/AddChapterScreen.kt @@ -49,7 +49,7 @@ import press.mantra.compose.ui.composable.navigation.routes.FrostSigningRoute import press.mantra.compose.ui.composable.navigation.routes.ImplementationPendingRoute import press.mantra.compose.ui.composable.navigation.routes.Route import press.mantra.compose.ui.composable.widgets.LoadingDataIndicator -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import press.mantra.compose.ui.view.model.AddChapterViewModel import press.mantra.compose.ui.view.state.AddChapterUIState import press.mantra.compose.ui.theme.spacing @@ -313,7 +313,7 @@ fun AddChapterScreen( @ConformancePreviews @Composable private fun AddChapterScreenPreview() { - TorchTheme { + MantraTheme { Surface(modifier = Modifier.fillMaxSize()) { AddChapterScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/AddDialectScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/AddDialectScreen.kt index ee088cd2..f352dd58 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/AddDialectScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/AddDialectScreen.kt @@ -51,7 +51,7 @@ import press.mantra.compose.ui.composable.navigation.routes.FrostSigningRoute import press.mantra.compose.ui.composable.navigation.routes.ImplementationPendingRoute import press.mantra.compose.ui.composable.navigation.routes.Route import press.mantra.compose.ui.composable.widgets.LoadingDataIndicator -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import press.mantra.compose.ui.view.model.AddDialectViewModel import press.mantra.compose.ui.view.state.AddDialectUIState import press.mantra.compose.ui.theme.spacing @@ -340,7 +340,7 @@ fun AddDialectScreen( @ConformancePreviews @Composable private fun AddDialectScreenPreview() { - TorchTheme { + MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt index 4c6cca36..d8c93b38 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt @@ -32,7 +32,7 @@ import press.mantra.compose.database.model.intermdiate.LocalChatRoom import press.mantra.compose.repository.ChatRepository import press.mantra.compose.repository.NostrRepository import press.mantra.compose.ui.composable.widgets.LoadingDataIndicator -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import press.mantra.compose.ui.view.model.AddMemberToChatRoomConfirmationViewModel import press.mantra.compose.ui.view.state.AddMemberToChatRoomConfirmationUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -217,7 +217,7 @@ fun AddMemberToChatRoomConfirmationScreen( @ConformancePreviews @Composable private fun ChatRoomDetailScreenPreview() { - TorchTheme { + MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { @@ -227,7 +227,7 @@ private fun ChatRoomDetailScreenPreview() { chatRoomId = "publicKey", relayHint = null, initialChatRoomDetailUIState = -// AddMemberToChatRoomConfirmationUIState.Error("Profile missing key package event.\n\nTry again later or tell Person to use Torch."), +// AddMemberToChatRoomConfirmationUIState.Error("Profile missing key package event.\n\nTry again later or tell Person to use Mantra."), AddMemberToChatRoomConfirmationUIState.Loaded( localChatRoom = LocalChatRoom( chatRoom = ChatRoom( diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/AddTranslationArtifactVersionScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/AddTranslationArtifactVersionScreen.kt index 366a627a..7f46159b 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/AddTranslationArtifactVersionScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/AddTranslationArtifactVersionScreen.kt @@ -53,7 +53,7 @@ import press.mantra.compose.ui.composable.navigation.routes.FrostSigningRoute import press.mantra.compose.ui.composable.navigation.routes.ImplementationPendingRoute import press.mantra.compose.ui.composable.navigation.routes.Route import press.mantra.compose.ui.composable.widgets.LoadingDataIndicator -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import press.mantra.compose.ui.view.model.AddTranslationArtifactVersionViewModel import press.mantra.compose.ui.view.state.AddTranslationArtifactVersionUIState import press.mantra.compose.ui.theme.spacing @@ -317,7 +317,7 @@ fun AddTranslationArtifactVersionScreen( @ConformancePreviews @Composable private fun AddTranslationArtifactVersionScreenPreview() { - TorchTheme { + MantraTheme { Surface(modifier = Modifier.fillMaxSize()) { AddTranslationArtifactVersionScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ArtifactDetailScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ArtifactDetailScreen.kt index 627f7b97..442aba14 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ArtifactDetailScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ArtifactDetailScreen.kt @@ -44,7 +44,7 @@ import press.mantra.compose.ui.composable.navigation.routes.ChapterDetailRoute import press.mantra.compose.ui.composable.navigation.routes.Route import press.mantra.compose.ui.composable.navigation.routes.TranslationArtifactVersionDetailRoute import press.mantra.compose.ui.composable.widgets.LoadingDataIndicator -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import press.mantra.compose.ui.view.model.ArtifactDetailViewModel import press.mantra.compose.ui.view.state.ArtifactDetailUIState import press.mantra.compose.ui.theme.spacing @@ -333,7 +333,7 @@ fun ArtifactDetailScreen( @ConformancePreviews @Composable private fun ArtifactDetailScreenPreview() { - TorchTheme { + MantraTheme { Surface(modifier = Modifier.fillMaxSize()) { ArtifactDetailScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ChapterDetailScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ChapterDetailScreen.kt index f4c91cfa..37ae0687 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ChapterDetailScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ChapterDetailScreen.kt @@ -34,7 +34,7 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import press.mantra.compose.database.model.MantraChapter import press.mantra.compose.repository.MantraRepository import press.mantra.compose.ui.composable.widgets.LoadingDataIndicator -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import press.mantra.compose.ui.view.model.ChapterDetailViewModel import press.mantra.compose.ui.view.state.ChapterDetailUIState import press.mantra.compose.ui.theme.spacing @@ -199,7 +199,7 @@ fun ChapterDetailScreen( @ConformancePreviews @Composable private fun ChapterDetailScreenPreview() { - TorchTheme { + MantraTheme { Surface(modifier = Modifier.fillMaxSize()) { ChapterDetailScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ChatRoomCreationScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ChatRoomCreationScreen.kt index 6f938a16..008dfb7c 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ChatRoomCreationScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ChatRoomCreationScreen.kt @@ -175,7 +175,7 @@ fun ChatRoomCreationScreen( @ConformancePreviews @Composable private fun LoadingScreenPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ChatRoomDetailScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ChatRoomDetailScreen.kt index 70340da0..e816e78b 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ChatRoomDetailScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ChatRoomDetailScreen.kt @@ -77,7 +77,7 @@ import press.mantra.compose.ui.composable.widgets.LoadingDataIndicator import press.mantra.compose.ui.composable.widgets.dialogs.ModalBottomSheet import press.mantra.compose.ui.composable.widgets.rememberNotifier import press.mantra.compose.ui.composable.widgets.profile.ProfileAvatar -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import press.mantra.compose.ui.view.model.ChatRoomDetailViewModel import press.mantra.compose.ui.view.state.ChatRoomDetailUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -1222,7 +1222,7 @@ private fun ReindexMarmotGroupEventsButton( @ConformancePreviews @Composable private fun ChatRoomMessagingScreenPreview() { - TorchTheme { + MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ChatRoomMessagingScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ChatRoomMessagingScreen.kt index 657dfab7..e2a70c8f 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ChatRoomMessagingScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ChatRoomMessagingScreen.kt @@ -52,7 +52,7 @@ import press.mantra.compose.ui.composable.navigation.routes.FrostSigningRoute import press.mantra.compose.ui.composable.navigation.routes.ProposalListRoute import press.mantra.compose.ui.composable.navigation.routes.Route import press.mantra.compose.ui.composable.widgets.LoadingDataIndicator -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import press.mantra.compose.ui.view.model.ChatRoomMessagingViewModel import press.mantra.compose.ui.view.state.ChatRoomMessagingUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -466,7 +466,7 @@ fun ChatRoomMessagingScreen( @ConformancePreviews @Composable private fun ChatRoomMessagingScreenPreview() { - TorchTheme { + MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/CreateProfileScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/CreateProfileScreen.kt index 4720d7f8..da11d54a 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/CreateProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/CreateProfileScreen.kt @@ -396,7 +396,7 @@ fun CreateProfileScreen( @ConformancePreviews @Composable fun CreateAccountScreenPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/DkgRitualScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/DkgRitualScreen.kt index 75c07645..e246e90b 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/DkgRitualScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/DkgRitualScreen.kt @@ -63,7 +63,7 @@ import press.mantra.compose.repository.ChatRepository import press.mantra.compose.repository.DkgRepository import press.mantra.compose.ui.composable.widgets.LoadingDataIndicator import press.mantra.compose.ui.composable.widgets.profile.ProfileColor -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import press.mantra.compose.database.model.types.DkgApprovalStep import press.mantra.compose.ui.composable.navigation.routes.DkgJoinApprovalRoute import press.mantra.compose.ui.composable.navigation.routes.DkgRound1ApprovalRoute @@ -865,7 +865,7 @@ private fun QuorumStepper( @ConformancePreviews @Composable private fun DkgRitualScreenPreview() { - TorchTheme { + MantraTheme { Surface(modifier = Modifier.fillMaxSize()) { DkgRitualScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/FrostSigningScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/FrostSigningScreen.kt index 00efaa4f..f9917824 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/FrostSigningScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/FrostSigningScreen.kt @@ -52,7 +52,7 @@ import press.mantra.compose.repository.ChatRepository import press.mantra.compose.repository.FrostSigningRepository import press.mantra.compose.text.ProposedEvent import press.mantra.compose.ui.composable.widgets.profile.ProfileAvatar -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import press.mantra.compose.ui.view.model.FrostSigningViewModel import press.mantra.compose.ui.view.state.FrostSigningUIState import press.mantra.compose.ui.theme.spacing @@ -410,7 +410,7 @@ private fun statusOf(session: FrostSigningSession): String = when (session.stage @ConformancePreviews @Composable private fun FrostSigningScreenPreview() { - TorchTheme { + MantraTheme { Surface(modifier = Modifier.fillMaxSize()) { FrostSigningScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/HomeScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/HomeScreen.kt index cd40abc7..fc20e8ec 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/HomeScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/HomeScreen.kt @@ -48,7 +48,7 @@ import press.mantra.compose.ui.composable.navigation.routes.Route import press.mantra.compose.ui.composable.widgets.LoadingDataIndicator import press.mantra.compose.ui.composable.widgets.dialogs.NewChatBottomSheetDialog import press.mantra.compose.ui.composable.widgets.dialogs.StartDirectMessageToNpubOrNip05Dialog -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import press.mantra.compose.ui.view.model.ChatRoomListViewModel import press.mantra.compose.ui.view.model.HomeScreenType import press.mantra.compose.ui.view.model.HomeViewModel @@ -155,10 +155,12 @@ fun HomeScreen( title = { // "Mantra". The launcher label, the desktop window title, the // landing screen and the package name all say so; this bar was - // the last place still saying "Torch". `UserAgent.APP_NAME` is - // the other, and is left alone -- it goes on the wire to relay - // operators, so it is a network identity question rather than - // a content one. + // the last place still saying "Torch", the brand before this + // one, and `UserAgent.CLIENT_NAME` was the other. That one went + // last, because it goes on the wire: it is the `client` tag on + // every relay list this app publishes. It could move because it + // is attribution and nothing derives from it -- unlike the two + // `mantra/` hash tags, which must never move at all. Text(stringResource(Res.string.mantra)) }, // No navigation icon and no actions. The avatar in the leading @@ -350,7 +352,7 @@ fun HomeScreen( @ConformancePreviews @Composable private fun HomeScreenPreview() { - TorchTheme { + MantraTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ImplementationPendingScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ImplementationPendingScreen.kt index 364a5477..cd4c2015 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ImplementationPendingScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ImplementationPendingScreen.kt @@ -47,7 +47,7 @@ fun ImplementationPendingScreen( @ConformancePreviews @Composable private fun ImplementationPendingScreenPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/KeyPackageManagementScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/KeyPackageManagementScreen.kt index 67c481f0..e787472d 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/KeyPackageManagementScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/KeyPackageManagementScreen.kt @@ -246,7 +246,7 @@ fun KeyPackageManagementScreen( @ConformancePreviews @Composable private fun UnannouncedProfileScreenPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/KeyRecoveryScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/KeyRecoveryScreen.kt index 5e2e387b..7d5f3396 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/KeyRecoveryScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/KeyRecoveryScreen.kt @@ -299,7 +299,7 @@ private fun KeyRecoveryOption( @ConformancePreviews @Composable private fun KeyRecoveryScreenPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/LandingScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/LandingScreen.kt index 4be7fa3d..9b594afc 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/LandingScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/LandingScreen.kt @@ -115,7 +115,7 @@ fun LandingScreen( @ConformancePreviews @Composable private fun LandingScreenPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/LoadingScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/LoadingScreen.kt index 47e1115c..4d44721a 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/LoadingScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/LoadingScreen.kt @@ -31,7 +31,7 @@ fun LoadingScreen( @ConformancePreviews @Composable private fun LoadingScreenPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/NostrEventDetailScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/NostrEventDetailScreen.kt index 1483e70b..348a912a 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/NostrEventDetailScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/NostrEventDetailScreen.kt @@ -23,7 +23,7 @@ import press.mantra.compose.ui.composable.navigation.routes.Route import press.mantra.compose.ui.composable.widgets.LoadingDataIndicator import press.mantra.compose.ui.composable.widgets.detail.MetadataEventDetail import press.mantra.compose.ui.composable.widgets.detail.TextNoteEventDetail -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import press.mantra.compose.ui.view.model.NostrEventDetailViewModel import press.mantra.compose.ui.view.state.NostrEventDetailUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -149,7 +149,7 @@ fun NostrEventDetailScreen( @ConformancePreviews @Composable private fun NostrEventDetailScreenPreview() { - TorchTheme { + MantraTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ProposalListScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ProposalListScreen.kt index 0ad4346f..2ac182c3 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ProposalListScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ProposalListScreen.kt @@ -50,7 +50,7 @@ import press.mantra.compose.repository.FrostSigningRepository import press.mantra.compose.text.ProposedEvent import press.mantra.compose.ui.composable.navigation.routes.FrostSigningRoute import press.mantra.compose.ui.composable.navigation.routes.Route -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import press.mantra.compose.ui.view.model.ProposalListViewModel import press.mantra.compose.ui.view.state.ProposalListUIState import press.mantra.compose.ui.theme.spacing @@ -418,7 +418,7 @@ private fun ProposalListScreenPreview() { signerId = 1 ) - TorchTheme { + MantraTheme { Surface(modifier = Modifier.fillMaxSize()) { ProposalListScreen( activeUserPublicKey = "u".repeat(64), diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/RecoveryPhraseScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/RecoveryPhraseScreen.kt index 9dae5c95..904c3768 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/RecoveryPhraseScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/RecoveryPhraseScreen.kt @@ -460,7 +460,7 @@ private fun RecoveryPhraseCheckbox( @ConformancePreviews @Composable private fun RecoveryPhraseScreenPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { @@ -487,7 +487,7 @@ private fun RecoveryPhraseScreenPreview() { @ConformancePreviews @Composable private fun RecoveryPhraseScreenHiddenPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt index f0215c77..67b25221 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt @@ -35,7 +35,7 @@ import press.mantra.compose.ui.composable.navigation.routes.AddMemberToChatRoomC import press.mantra.compose.ui.composable.navigation.routes.Route import press.mantra.compose.ui.composable.widgets.LoadingDataIndicator import press.mantra.compose.ui.composable.widgets.profile.ProfileAvatar -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import press.mantra.compose.ui.view.model.SearchMemberToAddToChatRoomViewModel import press.mantra.compose.ui.view.state.SearchMemberToAddToChatRoomUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -226,7 +226,7 @@ fun SearchMemberToAddToChatRoomScreen( @ConformancePreviews @Composable private fun ChatRoomDetailScreenPreview() { - TorchTheme { + MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SearchResultScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SearchResultScreen.kt index 0e6d0793..83afd9f3 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SearchResultScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SearchResultScreen.kt @@ -284,7 +284,7 @@ fun SearchResultScreen( @ConformancePreviews @Composable private fun SearchResultScreenPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SearchScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SearchScreen.kt index 295fb2c6..02d31c75 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SearchScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SearchScreen.kt @@ -58,7 +58,7 @@ import press.mantra.compose.ui.composable.navigation.routes.Route import press.mantra.compose.ui.composable.navigation.routes.SearchResultRoute import press.mantra.compose.ui.composable.widgets.profile.ProfileAvatar import press.mantra.compose.ui.composable.widgets.profile.ProfileColor -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import press.mantra.compose.ui.view.model.SearchViewModel import press.mantra.compose.ui.view.state.SearchUIState import press.mantra.compose.ui.theme.spacing @@ -426,7 +426,7 @@ fun SearchScreen( @ConformancePreviews @Composable private fun SearchScreenPreview() { - TorchTheme { + MantraTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SelectChatRoomMembersScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SelectChatRoomMembersScreen.kt index 4fb9af0a..f1aa9dbc 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SelectChatRoomMembersScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SelectChatRoomMembersScreen.kt @@ -37,7 +37,7 @@ import press.mantra.compose.repository.NostrRepository import press.mantra.compose.ui.composable.navigation.routes.Route import press.mantra.compose.ui.composable.widgets.LoadingDataIndicator import press.mantra.compose.ui.composable.widgets.profile.ProfileAvatar -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import press.mantra.compose.ui.view.model.SelectChatRoomMembersViewModel import press.mantra.compose.ui.view.state.SelectChatRoomMembersUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -283,7 +283,7 @@ fun SelectChatRoomMembersScreen( @ConformancePreviews @Composable private fun SelectChatRoomMembersScreenPreview() { - TorchTheme { + MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SelectChatRoomTypeScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SelectChatRoomTypeScreen.kt index 9f58557e..b31969d6 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SelectChatRoomTypeScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SelectChatRoomTypeScreen.kt @@ -47,7 +47,7 @@ import press.mantra.compose.repository.DkgRepository import press.mantra.compose.repository.NostrRepository import press.mantra.compose.ui.composable.navigation.routes.Route import press.mantra.compose.ui.composable.widgets.LoadingDataIndicator -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import press.mantra.compose.ui.view.model.SelectChatRoomTypeViewModel import press.mantra.compose.ui.view.state.SelectChatRoomTypeUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -465,7 +465,7 @@ private fun QuorumPicker( @ConformancePreviews @Composable private fun SelectChatRoomTypeScreenPreview() { - TorchTheme { + MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SelectSubgroupAdminsScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SelectSubgroupAdminsScreen.kt index c2baba8c..dd9028bb 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SelectSubgroupAdminsScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SelectSubgroupAdminsScreen.kt @@ -62,7 +62,7 @@ import press.mantra.compose.ui.composable.widgets.LocalSnackbarHostState import press.mantra.compose.ui.composable.widgets.ScreenStateTransition import press.mantra.compose.ui.composable.widgets.profile.ProfileAvatar import press.mantra.compose.ui.theme.ConformancePreviews -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import press.mantra.compose.ui.theme.readableContent import press.mantra.compose.ui.theme.spacing import press.mantra.compose.ui.view.model.SelectSubgroupAdminsViewModel @@ -326,7 +326,7 @@ private fun QuorumStepper( @ConformancePreviews @Composable private fun SelectSubgroupAdminsScreenPreview() { - TorchTheme { + MantraTheme { Surface(modifier = Modifier.fillMaxSize()) { SelectSubgroupAdminsScreen( activeUserPublicKey = "a".repeat(64), diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ShareProfileScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ShareProfileScreen.kt index eeb75341..b458efb5 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ShareProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ShareProfileScreen.kt @@ -230,7 +230,7 @@ fun ShareProfileScreen( @ConformancePreviews @Composable private fun UnannouncedProfileScreenPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SignInScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SignInScreen.kt index ae53143f..8bc2e213 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SignInScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SignInScreen.kt @@ -45,7 +45,7 @@ fun SignInToProfileScreen() { @ConformancePreviews @Composable private fun SignInToProfileScreenPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SocialPreconditionScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SocialPreconditionScreen.kt index 4d310826..ab33152d 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SocialPreconditionScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SocialPreconditionScreen.kt @@ -127,7 +127,7 @@ fun SocialPreconditionScreen( @ConformancePreviews @Composable private fun SocialPreconditionScreenPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/TranslateChunkScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/TranslateChunkScreen.kt index 72ec6024..0d767b3d 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/TranslateChunkScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/TranslateChunkScreen.kt @@ -49,7 +49,7 @@ import press.mantra.compose.ui.composable.navigation.routes.FrostSigningRoute import press.mantra.compose.ui.composable.navigation.routes.ImplementationPendingRoute import press.mantra.compose.ui.composable.navigation.routes.Route import press.mantra.compose.ui.composable.widgets.LoadingDataIndicator -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import press.mantra.compose.ui.view.model.TranslateChunkViewModel import press.mantra.compose.ui.view.state.TranslateChunkUIState import press.mantra.compose.ui.theme.spacing @@ -270,7 +270,7 @@ fun TranslateChunkScreen( @ConformancePreviews @Composable private fun TranslateChunkScreenPreview() { - TorchTheme { + MantraTheme { Surface(modifier = Modifier.fillMaxSize()) { TranslateChunkScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/TranslationArtifactVersionDetailScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/TranslationArtifactVersionDetailScreen.kt index 52a86552..fef9c9d2 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/TranslationArtifactVersionDetailScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/TranslationArtifactVersionDetailScreen.kt @@ -42,7 +42,7 @@ import press.mantra.compose.ui.composable.navigation.routes.Route import press.mantra.compose.ui.composable.navigation.routes.TranslationChapterRoute import press.mantra.compose.ui.composable.widgets.DetailRow import press.mantra.compose.ui.composable.widgets.LoadingDataIndicator -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import press.mantra.compose.ui.view.model.TranslationArtifactVersionDetailViewModel import press.mantra.compose.ui.view.state.TranslationArtifactVersionDetailUIState import press.mantra.compose.ui.theme.spacing @@ -287,7 +287,7 @@ fun TranslationArtifactVersionDetailScreen( @ConformancePreviews @Composable private fun TranslationArtifactVersionDetailScreenPreview() { - TorchTheme { + MantraTheme { Surface(modifier = Modifier.fillMaxSize()) { TranslationArtifactVersionDetailScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/TranslationChapterScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/TranslationChapterScreen.kt index 79f3a62a..1d0b5df7 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/TranslationChapterScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/TranslationChapterScreen.kt @@ -42,7 +42,7 @@ import press.mantra.compose.repository.MantraRepository import press.mantra.compose.ui.composable.navigation.routes.Route import press.mantra.compose.ui.composable.navigation.routes.TranslateChunkRoute import press.mantra.compose.ui.composable.widgets.LoadingDataIndicator -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import press.mantra.compose.ui.view.model.TranslationChapterViewModel import press.mantra.compose.ui.view.state.ChunkTranslationPair import press.mantra.compose.ui.view.state.TranslationChapterUIState @@ -245,7 +245,7 @@ private fun TableRow( @ConformancePreviews @Composable private fun TranslationChapterScreenPreview() { - TorchTheme { + MantraTheme { Surface(modifier = Modifier.fillMaxSize()) { TranslationChapterScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/UnannouncedProfileScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/UnannouncedProfileScreen.kt index 8a03a051..2b33e12e 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/UnannouncedProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/UnannouncedProfileScreen.kt @@ -79,7 +79,7 @@ fun UnannouncedProfileScreen() { @ConformancePreviews @Composable private fun UnannouncedProfileScreenPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/UnindexedProfileScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/UnindexedProfileScreen.kt index 44bae335..cb63f8b2 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/UnindexedProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/UnindexedProfileScreen.kt @@ -79,7 +79,7 @@ fun UnindexedProfileScreen() { @ConformancePreviews @Composable private fun UnannouncedProfileScreenPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/UnqueuedProfileScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/UnqueuedProfileScreen.kt index 96f918ce..e3b1c6b2 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/UnqueuedProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/UnqueuedProfileScreen.kt @@ -79,7 +79,7 @@ fun UnqueuedProfileScreen() { @ConformancePreviews @Composable private fun UnannouncedProfileScreenPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/UnqueuedProfileSynchronizationScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/UnqueuedProfileSynchronizationScreen.kt index 6bbcbb9f..f45a39d6 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/UnqueuedProfileSynchronizationScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/UnqueuedProfileSynchronizationScreen.kt @@ -91,7 +91,7 @@ fun UnqueuedProfileSynchronizationScreen( @ConformancePreviews @Composable private fun UnqueuedProfileSynchronizationScreenPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/UnsignedProfileScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/UnsignedProfileScreen.kt index fdafc1d0..a6b1a699 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/UnsignedProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/UnsignedProfileScreen.kt @@ -73,7 +73,7 @@ fun UnsignedProfileScreen() { @ConformancePreviews @Composable private fun UnsignedProfileScreenPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/UnsyncedProfileScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/UnsyncedProfileScreen.kt index f59d26ea..0fa869a7 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/UnsyncedProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/UnsyncedProfileScreen.kt @@ -75,7 +75,7 @@ fun UnsyncedProfileScreen( @ConformancePreviews @Composable private fun UnsyncedProfileScreenPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/WriteNewNoteScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/WriteNewNoteScreen.kt index 00bce1e0..bdef27a3 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/WriteNewNoteScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/WriteNewNoteScreen.kt @@ -468,7 +468,7 @@ fun WriteNewNoteScreen( @ConformancePreviews @Composable private fun WriteNewNoteScreenPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/LoadingDataIndicator.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/LoadingDataIndicator.kt index 98737303..6c36e7f4 100755 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/LoadingDataIndicator.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/LoadingDataIndicator.kt @@ -69,7 +69,7 @@ fun LoadingDataIndicator( @ConformancePreviews @Composable private fun TransferHistoryScreenPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface(modifier = Modifier.fillMaxSize()) { LoadingDataIndicator( text = "Starting up" diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/content/QuotedNote.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/content/QuotedNote.kt index 597b51ff..551187ef 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/content/QuotedNote.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/content/QuotedNote.kt @@ -120,7 +120,7 @@ fun QuotedNote( @ConformancePreviews @Composable private fun QuotedNotePreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/content/RichContent.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/content/RichContent.kt index 40f4ab4b..73f0903f 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/content/RichContent.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/content/RichContent.kt @@ -401,7 +401,7 @@ fun RichContent( @ConformancePreviews @Composable private fun RichContentPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/detail/MetadataEventDetail.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/detail/MetadataEventDetail.kt index ccadaa71..2ad86228 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/detail/MetadataEventDetail.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/detail/MetadataEventDetail.kt @@ -50,7 +50,7 @@ import press.mantra.compose.ui.composable.navigation.routes.ChatRoomMessagingRou import press.mantra.compose.ui.composable.navigation.routes.ImplementationPendingRoute import press.mantra.compose.ui.composable.navigation.routes.Route import press.mantra.compose.ui.composable.widgets.profile.ProfileAvatar -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import press.mantra.compose.ui.view.model.MetadataEventDetailType import press.mantra.compose.ui.view.model.MetadataEventDetailViewModel import press.mantra.compose.ui.view.state.MetadataEventDetailUIState @@ -326,7 +326,7 @@ fun MetadataEventDetail( @Composable private fun MetadataEventEventDetailPreview() { - TorchTheme { + MantraTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/detail/TextNoteEventDetail.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/detail/TextNoteEventDetail.kt index 34927ce1..35304a9f 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/detail/TextNoteEventDetail.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/detail/TextNoteEventDetail.kt @@ -393,7 +393,7 @@ fun TextNoteEventDetail( @Composable private fun TextNoteEventDetailPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05Dialog.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05Dialog.kt index ca97f935..9fe197c1 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05Dialog.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05Dialog.kt @@ -36,7 +36,7 @@ import press.mantra.compose.extensions.bech32ToHexOrNull import press.mantra.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute import press.mantra.compose.ui.composable.navigation.routes.ImplementationPendingRoute import press.mantra.compose.ui.composable.navigation.routes.Route -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import com.vitorpamplona.quartz.nip01Core.core.HexKey import fr.acinq.phoenix.utils.Parser import kotlinx.coroutines.CoroutineScope @@ -190,7 +190,7 @@ fun StartDirectMessageToNpubOrNip05Dialog( @ConformancePreviews @Composable private fun StartDirectMessageToNpubOrNip05DialogPreview() { - TorchTheme { + MantraTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/feed/EventListView.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/feed/EventListView.kt index b74c6f2e..d825d9a3 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/feed/EventListView.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/feed/EventListView.kt @@ -129,7 +129,7 @@ fun press.mantra.compose.database.model.intermdiate.LocalNostrEvent.ListView( @ConformancePreviews @Composable private fun EventListViewRepostedPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { @@ -180,7 +180,7 @@ private fun EventListViewRepostedPreview() { @ConformancePreviews @Composable private fun EventListViewInReplyPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/feed/TextNoteFeedItem.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/feed/TextNoteFeedItem.kt index bbe77197..5cbbfa60 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/feed/TextNoteFeedItem.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/feed/TextNoteFeedItem.kt @@ -187,7 +187,7 @@ internal fun TextNoteFeedItem( @ConformancePreviews @Composable private fun TextNoteFeedItemPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { @@ -218,7 +218,7 @@ private fun TextNoteFeedItemPreview() { @ConformancePreviews @Composable private fun TextNoteFeedItemInReplyToPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { @@ -272,7 +272,7 @@ private fun TextNoteFeedItemInReplyToPreview() { @ConformancePreviews @Composable private fun TextNoteFeedItemQuoteNostrEventPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/profile/ProfileAvatar.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/profile/ProfileAvatar.kt index 24cd82b4..d0b1a198 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/profile/ProfileAvatar.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/widgets/profile/ProfileAvatar.kt @@ -93,7 +93,7 @@ fun ProfileAvatar( @ConformancePreviews @Composable fun ProfileAvatarPreview() { - press.mantra.compose.ui.theme.TorchTheme { + press.mantra.compose.ui.theme.MantraTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/theme/Breakpoint.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/theme/Breakpoint.kt index 5d210bf2..ee87c588 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/theme/Breakpoint.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/theme/Breakpoint.kt @@ -59,7 +59,7 @@ enum class Breakpoint(val minWidth: Dp) { * them. * * Total, including for a width below [Compact.minWidth]. This is called from - * [TorchTheme] on every composition, and a desktop window reports a zero size for + * [MantraTheme] on every composition, and a desktop window reports a zero size for * the frame before its first layout pass; throwing there would take the app down * on a resize rather than on anything a user did. */ @@ -71,7 +71,7 @@ enum class Breakpoint(val minWidth: Dp) { /** * The breakpoint the current window is in. * - * Provided by [TorchTheme] as [LocalBreakpoint], so screens read + * Provided by [MantraTheme] as [LocalBreakpoint], so screens read * `MaterialTheme.breakpoint` rather than calling this. It is public because the two * entry points that compose above the theme -- the desktop passphrase gate, and any * future splash -- have nowhere else to get it. @@ -79,7 +79,7 @@ enum class Breakpoint(val minWidth: Dp) { * **Why the window size and not `currentWindowAdaptiveInfo()`.** The latter also computes * a [androidx.compose.material3.adaptive.Posture] from the platform's fold state, which * on android means reaching for `WindowInfoTracker` and an `Activity`. This is called - * from [TorchTheme], which wraps every `@Preview` in the tree, and a preview context is + * from [MantraTheme], which wraps every `@Preview` in the tree, and a preview context is * not an activity. `currentWindowDpSize()` is `LocalWindowInfo` and `LocalDensity` and * nothing else, so it answers everywhere. The pane scaffolds ask for posture themselves, * where a fold genuinely changes the answer. @@ -90,7 +90,7 @@ fun currentBreakpoint(): Breakpoint = Breakpoint.ofWidth(currentWindowDpSize().w /** * Defaults to [Breakpoint.Compact] rather than throwing, because that is the layout every - * screen in this app was written against: a composable that never reaches a [TorchTheme] + * screen in this app was written against: a composable that never reaches a [MantraTheme] * should render as it did before breakpoints existed, not fail. */ val LocalBreakpoint = staticCompositionLocalOf { Breakpoint.Compact } diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/theme/ConformancePreviews.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/theme/ConformancePreviews.kt index d1e56707..28d9e553 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/theme/ConformancePreviews.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/theme/ConformancePreviews.kt @@ -21,7 +21,7 @@ import androidx.compose.ui.tooling.preview.Preview * is right in the default scheme is right in the high-contrast one by construction. A * per-screen high-contrast preview would be 51 more renders checking something already * proved, and there is no `@Preview` parameter for it anyway -- it needs - * `TorchTheme(contrast = …)` in the body. [ThemeGallery] covers the schemes once, over + * `MantraTheme(contrast = …)` in the body. [ThemeGallery] covers the schemes once, over * the components rather than over the screens. * * @see ThemeGallery diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/theme/Motion.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/theme/Motion.kt index 6022a524..2b612736 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/theme/Motion.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/theme/Motion.kt @@ -17,7 +17,7 @@ import androidx.navigation.NavBackStackEntry /** * Whether the platform has been asked to keep motion to a minimum. * - * Provided by [TorchTheme] as [LocalReducedMotion]; the transitions below read it, so a + * Provided by [MantraTheme] as [LocalReducedMotion]; the transitions below read it, so a * call site does not have to remember to. Reading it directly is for a screen animating * something the shared helpers do not cover. * diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/theme/Spacing.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/theme/Spacing.kt index f333eeda..cf702bb3 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/theme/Spacing.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/theme/Spacing.kt @@ -12,7 +12,7 @@ import androidx.compose.ui.unit.dp * M3's spacing scale, and the semantic names layered over it. * * `MaterialTheme` has no spacing slot, so this rides a composition local beside it, the - * same way [ExtendedColors] does. [TorchTheme] provides it. + * same way [ExtendedColors] does. [MantraTheme] provides it. * * **The scale** is M3's own, an 8dp system where `space100 = 8dp`, including the sub-8 * nested units Material defines because its components need them. Numbers are from diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/theme/Theme.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/theme/Theme.kt index d5c2c66f..68998d58 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/theme/Theme.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/theme/Theme.kt @@ -393,7 +393,7 @@ val unspecified_scheme = ColorFamily( * Brand colours that are not part of the generated scheme. * * `ColorScheme` has no slot for them -- M3 calls them extended colours and expects them to - * ride alongside -- so they travel on their own composition local, provided by [TorchTheme] + * ride alongside -- so they travel on their own composition local, provided by [MantraTheme] * from the same `darkTheme` the scheme is chosen with. Reading `isSystemInDarkTheme()` at * the call site instead would be subtly wrong: it would ignore a caller who passed * `darkTheme` explicitly, and a preview forcing dark would show light pills. @@ -408,7 +408,7 @@ data class ExtendedColors( * The extended colours for the current theme. * * Defaults to the light families rather than to `unspecified_scheme` so that anything - * composing outside [TorchTheme] renders a real colour instead of nothing. That should not + * composing outside [MantraTheme] renders a real colour instead of nothing. That should not * happen -- as of this commit nothing in the tree does -- but an invisible button is a worse * way to find out than a light-themed one. */ @@ -484,7 +484,7 @@ internal fun appColorScheme(darkTheme: Boolean, contrast: ThemeContrast): ColorS */ @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable -fun TorchTheme( +fun MantraTheme( darkTheme: Boolean = isSystemInDarkTheme(), contrast: ThemeContrast = platformThemeContrast(), // Dynamic color is available on Android 12+ diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/theme/ThemeGallery.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/theme/ThemeGallery.kt index e5e393a0..7f8af17c 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/theme/ThemeGallery.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/theme/ThemeGallery.kt @@ -44,7 +44,7 @@ import press.mantra.compose.ui.composable.widgets.Decorative @Preview(name = "Six schemes", group = "schemes", widthDp = 1200, heightDp = 900) @Composable private fun ThemeGalleryPreview() { - // One render holding all six, not six renders. The contrast step is a `TorchTheme` + // One render holding all six, not six renders. The contrast step is a `MantraTheme` // parameter and no preview annotation can set it, so the combinations have to be laid // out in the body -- and laying them out side by side is what makes them comparable, // which is the only reason to look at them at all. @@ -70,7 +70,7 @@ private fun ThemeGalleryPreview() { */ @Composable fun ThemeGallery(darkTheme: Boolean, contrast: ThemeContrast) { - TorchTheme(darkTheme = darkTheme, contrast = contrast, dynamicColor = false) { + MantraTheme(darkTheme = darkTheme, contrast = contrast, dynamicColor = false) { Surface { Column( modifier = Modifier.padding(MaterialTheme.spacing.compactPadding), diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/view/model/AddMemberToChatRoomConfirmationViewModel.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/view/model/AddMemberToChatRoomConfirmationViewModel.kt index 456e364a..914cb8ab 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/view/model/AddMemberToChatRoomConfirmationViewModel.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/view/model/AddMemberToChatRoomConfirmationViewModel.kt @@ -74,7 +74,7 @@ class AddMemberToChatRoomConfirmationViewModel( val lookupTimeout = launch { delay(RELAY_LOOKUP_TIMEOUT) addMemberToChatRoomConfirmationUIState = - AddMemberToChatRoomConfirmationUIState.Error("Profile missing key package event. Try again later or tell ${profile.humanReadableNameOrPubkey()} to use Torch.") + AddMemberToChatRoomConfirmationUIState.Error("Profile missing key package event. Try again later or tell ${profile.humanReadableNameOrPubkey()} to use Mantra.") } // Observe rather than read once: the key package usually lands a moment after diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/view/model/ChatRoomMessagingViewModel.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/view/model/ChatRoomMessagingViewModel.kt index 22682987..07937d03 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/view/model/ChatRoomMessagingViewModel.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/view/model/ChatRoomMessagingViewModel.kt @@ -123,7 +123,7 @@ class ChatRoomMessagingViewModel( val lookupTimeout = viewModelScope.launch { delay(RELAY_LOOKUP_TIMEOUT) chatRoomMessagingUIState = ChatRoomMessagingUIState.Error( - "Couldn't find this profile's chat details on the relays yet. They may not have finished setting up Torch." + "Couldn't find this profile's chat details on the relays yet. They may not have finished setting up Mantra." ) } diff --git a/composeApp/src/jvmMain/kotlin/press/mantra/desktop/Main.kt b/composeApp/src/jvmMain/kotlin/press/mantra/desktop/Main.kt index 76885170..470a7ceb 100644 --- a/composeApp/src/jvmMain/kotlin/press/mantra/desktop/Main.kt +++ b/composeApp/src/jvmMain/kotlin/press/mantra/desktop/Main.kt @@ -40,7 +40,7 @@ import press.mantra.compose.MantraApp import press.mantra.compose.MantraGlobal import press.mantra.compose.PlatformContext import press.mantra.compose.defaultMantraDir -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import java.awt.Dimension import java.io.File @@ -80,16 +80,16 @@ fun main() = application { // 400x600 is the narrowest window the phase's acceptance widths name. LaunchedEffect(window) { window.minimumSize = Dimension(400, 600) } - // TorchTheme wraps both branches, not just the app. PassphraseGate used to sit + // MantraTheme wraps both branches, not just the app. PassphraseGate used to sit // beside MantraApp -- which applies the theme itself -- so it composed under the // default MaterialTheme and its colorScheme and typography were baseline M3 // rather than this app's. It is the first screen a desktop user sees. // - // MantraApp still applies TorchTheme, so the unlocked branch is wrapped twice. + // MantraApp still applies MantraTheme, so the unlocked branch is wrapped twice. // That is deliberate: android and ios enter through MantraApp and would lose the // theme entirely if it moved out, and a second application of the same values // costs one composition of a CompositionLocalProvider. - TorchTheme { + MantraTheme { if (unlocked) { val navController = rememberNavController() MantraApp( diff --git a/composeApp/src/jvmTest/kotlin/press/mantra/compose/ui/composable/ChatPaneLayoutJvmTest.kt b/composeApp/src/jvmTest/kotlin/press/mantra/compose/ui/composable/ChatPaneLayoutJvmTest.kt index b4443882..ac4d48b7 100644 --- a/composeApp/src/jvmTest/kotlin/press/mantra/compose/ui/composable/ChatPaneLayoutJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/press/mantra/compose/ui/composable/ChatPaneLayoutJvmTest.kt @@ -18,7 +18,7 @@ import press.mantra.compose.repository.DkgRepository import press.mantra.compose.repository.FrostSigningRepository import press.mantra.compose.repository.NostrRepository import press.mantra.compose.ui.composable.widgets.ProvideSnackbarHost -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import press.mantra.compose.ui.view.state.HomeScreenUIState import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent import kotlin.test.Test @@ -83,7 +83,7 @@ class ChatPaneLayoutJvmTest { @androidx.compose.runtime.Composable private fun Home() { - TorchTheme { + MantraTheme { // Required, and deliberately so: `LocalSnackbarHostState` throws rather than // defaulting, because a default would make every `notify` on a screen that // forgot the host a silent no-op. diff --git a/composeApp/src/jvmTest/kotlin/press/mantra/compose/ui/composable/GroupKeyStateSheetLayoutJvmTest.kt b/composeApp/src/jvmTest/kotlin/press/mantra/compose/ui/composable/GroupKeyStateSheetLayoutJvmTest.kt index 3f856919..4fc7e259 100644 --- a/composeApp/src/jvmTest/kotlin/press/mantra/compose/ui/composable/GroupKeyStateSheetLayoutJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/press/mantra/compose/ui/composable/GroupKeyStateSheetLayoutJvmTest.kt @@ -18,7 +18,7 @@ import press.mantra.compose.database.model.GroupKeyState import press.mantra.compose.database.model.GroupSignedEvent import press.mantra.compose.nostr.frost.GroupKeyStateEvent import press.mantra.compose.ui.composable.widgets.ProvideSnackbarHost -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme /** * The one thing about this sheet that reading it does not settle. @@ -78,7 +78,7 @@ class GroupKeyStateSheetLayoutJvmTest { fun `the signed event wraps inside the sheet rather than running off it`() = runDesktopComposeUiTest(width = 800, height = 2400) { setContent { - TorchTheme { + MantraTheme { // The sheet reports a copy through the snackbar host, so it // needs one in scope the way every screen does. ProvideSnackbarHost { @@ -105,7 +105,7 @@ class GroupKeyStateSheetLayoutJvmTest { fun `a device holding no signed event still renders the state`() = runDesktopComposeUiTest(width = 800, height = 2400) { setContent { - TorchTheme { + MantraTheme { ProvideSnackbarHost { Box(modifier = Modifier.width(phoneWidth).testTag(SHEET)) { GroupKeyStateSheetContent( diff --git a/composeApp/src/jvmTest/kotlin/press/mantra/compose/ui/composable/navigation/NavigationSuiteRenderJvmTest.kt b/composeApp/src/jvmTest/kotlin/press/mantra/compose/ui/composable/navigation/NavigationSuiteRenderJvmTest.kt index 4082b769..afe085b7 100644 --- a/composeApp/src/jvmTest/kotlin/press/mantra/compose/ui/composable/navigation/NavigationSuiteRenderJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/press/mantra/compose/ui/composable/navigation/NavigationSuiteRenderJvmTest.kt @@ -19,7 +19,7 @@ import press.mantra.compose.ui.composable.navigation.routes.ChatRoomMessagingRou import press.mantra.compose.ui.composable.navigation.routes.HomeRoute import press.mantra.compose.ui.composable.navigation.routes.SearchRoute import press.mantra.compose.ui.theme.Breakpoint -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import kotlin.test.Test /** @@ -131,7 +131,7 @@ class NavigationSuiteRenderJvmTest { profileNostrEventId: String?, navController: NavHostController = rememberNavController(), ) { - TorchTheme { + MantraTheme { MantraNavigationSuite( navController = navController, breakpoint = Breakpoint.Large, diff --git a/composeApp/src/jvmTest/kotlin/press/mantra/compose/ui/composable/widgets/ScreenStateTransitionJvmTest.kt b/composeApp/src/jvmTest/kotlin/press/mantra/compose/ui/composable/widgets/ScreenStateTransitionJvmTest.kt index c00c6add..6b1b0a03 100644 --- a/composeApp/src/jvmTest/kotlin/press/mantra/compose/ui/composable/widgets/ScreenStateTransitionJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/press/mantra/compose/ui/composable/widgets/ScreenStateTransitionJvmTest.kt @@ -8,7 +8,7 @@ import androidx.compose.ui.test.ExperimentalTestApi import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.runDesktopComposeUiTest -import press.mantra.compose.ui.theme.TorchTheme +import press.mantra.compose.ui.theme.MantraTheme import kotlin.test.Test /** Stand-ins for a screen's UI state: two classes, and data that changes within one. */ @@ -39,7 +39,7 @@ class ScreenStateTransitionJvmTest { runDesktopComposeUiTest(400, 600) { var state by mutableStateOf(Fixture.Loading) mainClock.autoAdvance = false - setContent { TorchTheme { ScreenStateTransition(state) { Render(it) } } } + setContent { MantraTheme { ScreenStateTransition(state) { Render(it) } } } mainClock.advanceTimeBy(16) onNodeWithText("loading").assertIsDisplayed() @@ -61,7 +61,7 @@ class ScreenStateTransitionJvmTest { fun `data changing inside one state does not animate`() = runDesktopComposeUiTest(400, 600) { var state by mutableStateOf(Fixture.Loaded("first")) mainClock.autoAdvance = false - setContent { TorchTheme { ScreenStateTransition(state) { Render(it) } } } + setContent { MantraTheme { ScreenStateTransition(state) { Render(it) } } } mainClock.advanceTimeBy(16) onNodeWithText("first").assertIsDisplayed() diff --git a/composeApp/src/jvmTest/kotlin/press/mantra/compose/ui/theme/NavigationMotionJvmTest.kt b/composeApp/src/jvmTest/kotlin/press/mantra/compose/ui/theme/NavigationMotionJvmTest.kt index 961150be..9cae71b2 100644 --- a/composeApp/src/jvmTest/kotlin/press/mantra/compose/ui/theme/NavigationMotionJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/press/mantra/compose/ui/theme/NavigationMotionJvmTest.kt @@ -75,12 +75,12 @@ class NavigationMotionJvmTest { controller = rememberNavController() // Through the theme's parameter rather than by providing the local // around it. Providing it outside is what this test did first, and - // `TorchTheme` silently overwrote it -- the reduced case read 54dp of - // slide. That is also why `reducedMotion` is a `TorchTheme` parameter + // `MantraTheme` silently overwrote it -- the reduced case read 54dp of + // slide. That is also why `reducedMotion` is a `MantraTheme` parameter // rather than something the theme only reads from the platform: the // desktop actual is a hardcoded `false`, and a value nothing can override // is a value nothing can test either. - TorchTheme(reducedMotion = reducedMotion) { + MantraTheme(reducedMotion = reducedMotion) { NavHost( navController = controller, startDestination = First, diff --git a/composeApp/src/jvmTest/kotlin/press/mantra/compose/ui/theme/ReadableContentLayoutJvmTest.kt b/composeApp/src/jvmTest/kotlin/press/mantra/compose/ui/theme/ReadableContentLayoutJvmTest.kt index 647c55af..bea41cd9 100644 --- a/composeApp/src/jvmTest/kotlin/press/mantra/compose/ui/theme/ReadableContentLayoutJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/press/mantra/compose/ui/theme/ReadableContentLayoutJvmTest.kt @@ -78,7 +78,7 @@ class ReadableContentLayoutJvmTest { var margin: Dp? = null runDesktopComposeUiTest(width = windowWidth, height = 900) { setContent { - TorchTheme { + MantraTheme { seen = MaterialTheme.breakpoint margin = MaterialTheme.spacing.screenMargin } @@ -109,7 +109,7 @@ class ReadableContentLayoutJvmTest { @Composable private fun TaggedContent() { - TorchTheme { + MantraTheme { Box(Modifier.readableContent()) { Box(Modifier.fillMaxWidth().height(8.dp).testTag(Content)) } diff --git a/docs/material-design-conformance.md b/docs/material-design-conformance.md index b8709b3a..50a2e1c0 100644 --- a/docs/material-design-conformance.md +++ b/docs/material-design-conformance.md @@ -121,7 +121,7 @@ Three gaps: today; the trap springs the first time an expressive component does. 2. **The medium and high contrast schemes are dead code.** All four are declared - `private val`; `TorchTheme` only ever selects `darkScheme` or `lightScheme`. + `private val`; `MantraTheme` only ever selects `darkScheme` or `lightScheme`. There is no plumbing to the platform's contrast setting, so the two schemes that would honour it are unreachable. The accessibility foundation's first principle is *honour individuals* — *"supporting varying preferences and @@ -138,7 +138,7 @@ Two entry points render outside the theme: under the **default** `MaterialTheme`. Its `MaterialTheme.colorScheme.error` and `typography.headlineSmall` are baseline M3, not this app's. It is the first screen a desktop user sees. -- `Profile.kt:183` and 50 other `@Preview` bodies wrap in `TorchTheme` by hand, +- `Profile.kt:183` and 50 other `@Preview` bodies wrap in `MantraTheme` by hand, which is correct, but there is no preview that exercises dark, high-contrast or a wide window — so nothing catches the two problems below. @@ -418,7 +418,7 @@ find-and-replace. Keep the existing hex values for the roles already defined so nothing shifts visually; this phase adds, it does not restyle. -2. **Reach the contrast schemes.** *Built.* `TorchTheme` takes a `ThemeContrast` +2. **Reach the contrast schemes.** *Built.* `MantraTheme` takes a `ThemeContrast` defaulted from a new `platformThemeContrast()` expect/actual, and the six-way selection table lives in common code as `appColorScheme`. The old `themeColorScheme` expect took four arguments and did both jobs; it splits into @@ -441,7 +441,7 @@ find-and-replace. 3. **Give the theme its other three slots.** *Built.* The expressive-vs-standard question was put to the product owner on 2026-09-08 and answered - **expressive**, so `TorchTheme` calls `MaterialExpressiveTheme` with all four + **expressive**, so `MantraTheme` calls `MaterialExpressiveTheme` with all four slots passed explicitly — colour, `MotionScheme.expressive()`, `MantraShapes`, `AuxTypography`. Explicitly, because `MaterialExpressiveTheme` would otherwise default them to `expressiveLightColorScheme()` and friends, which is Material's @@ -472,10 +472,10 @@ find-and-replace. `container`/`on`/`onContainer`. `CreateProfileScreen.kt:311` and `:329` then stop pairing them with `Color.White`/`Color.DarkGray` by eye. -6. **Wrap the desktop gate.** *Built.* `Main.kt` moves `TorchTheme` outside the +6. **Wrap the desktop gate.** *Built.* `Main.kt` moves `MantraTheme` outside the `unlocked` branch, so `PassphraseGate` — the first screen a desktop user sees — stops composing under the default `MaterialTheme`. `MantraApp` keeps its own - `TorchTheme`, so the unlocked branch is wrapped twice: android and ios enter + `MantraTheme`, so the unlocked branch is wrapped twice: android and ios enter through `MantraApp` and would lose the theme entirely if it moved out, and a second application of the same values costs one `CompositionLocalProvider`. @@ -651,8 +651,12 @@ the whole sentence is, and several of them are pluralisations — `(if (n == 2) "event" else "events")` — which want a real plural resource rather than a format argument. `m3-extract-formatted.py --remaining` lists them. -`UserAgent.APP_NAME` still says "Torch". It goes on the wire to relay operators, so it is -a network identity question rather than a content one. +`UserAgent.APP_NAME` and `CLIENT_NAME` said "Torch" until the pull described in +[curated-to-mantra.md](./curated-to-mantra.md) retired the brand for good, in its Phase 0. +They were left for last on purpose: `CLIENT_NAME` goes on the wire as the `client` tag on +every relay list this app publishes, so it was a network identity question rather than a +content one. It could move because it is attribution and nothing derives from it -- unlike +the two `mantra/` hash tags, which are inputs to key derivation and must never move. --- @@ -729,13 +733,13 @@ panes last because both were product decisions. see below. 2. **`Breakpoint`**, the five-value enum with `ofWidth` as a pure function so the - thresholds are assertable without a Compose runtime. `TorchTheme` classifies + thresholds are assertable without a Compose runtime. `MantraTheme` classifies once and provides `LocalBreakpoint`, so no two screens can disagree about the window they are both in. It reads `currentWindowDpSize()` rather than `currentWindowAdaptiveInfo()`, because the latter also computes a `Posture` from the platform's fold state — - on android, `WindowInfoTracker` and an activity. This call sits in `TorchTheme`, + on android, `WindowInfoTracker` and an activity. This call sits in `MantraTheme`, which wraps all 51 `@Preview` bodies in the tree, and a preview context is not an activity. @@ -950,9 +954,9 @@ reduced. And a crossfade is told from a cut by the one frame in which *both* states are composed. **A test found a design flaw rather than a bug.** The reduced case read 54dp of -slide at first, because the test provided `LocalReducedMotion` around `TorchTheme` +slide at first, because the test provided `LocalReducedMotion` around `MantraTheme` and the theme overwrote it. The fix is not in the test: `reducedMotion` is now a -`TorchTheme` parameter defaulted to the platform, exactly as `contrast` is, +`MantraTheme` parameter defaulted to the platform, exactly as `contrast` is, because a value nothing can override is a value nothing can test — and because the desktop actual is a hardcoded `false` that a settings screen will need to override anyway. @@ -1017,7 +1021,7 @@ finding that out is most of what it was worth. High contrast is deliberately not in the annotation. Contrast is a property of the scheme rather than of a screen, `ColorSchemeContrastTest` measures every pair in all six, and there is no `@Preview` parameter for it — it needs - `TorchTheme(contrast = …)` in the body. `ThemeGallery` covers the six once, + `MantraTheme(contrast = …)` in the body. `ThemeGallery` covers the six once, over components rather than screens, with `dynamicColor = false` because an android 12+ preview would otherwise paint all six columns from the wallpaper. It is the only place the medium and high contrast schemes can be seen at all. @@ -1104,7 +1108,7 @@ Phases 1–5 can be worked in parallel by different people if 1 lands first; `ExperimentalMaterial3ExpressiveApi` opt-ins and the pinned alpha both point expressive, but it is a product decision with a visible outcome, and it should be made deliberately rather than inherited from an import. -- **Whether dynamic colour should keep overriding the brand.** `TorchTheme` defaults +- **Whether dynamic colour should keep overriding the brand.** `MantraTheme` defaults `dynamicColor = true`, and on Android 12+ that wins unconditionally — so on essentially every current Android device, none of the six schemes below is used and the app renders in whatever the user's wallpaper produced. Verified on an API diff --git a/docs/scripts/curated-unbrand.py b/docs/scripts/curated-unbrand.py index 0b01fdd3..a415e543 100755 --- a/docs/scripts/curated-unbrand.py +++ b/docs/scripts/curated-unbrand.py @@ -43,11 +43,11 @@ _RULES = [ (r'\bCurareShapes\b', 'MantraShapes'), (r'\bCurareConverters\b', 'MantraConverters'), (r'\bdefaultCurareDir\b', 'defaultMantraDir'), - (r'\bCurareTheme\b', 'TorchTheme'), # Mantra's theme is still TorchTheme; change here if Phase 0 renames it + (r'\bCurareTheme\b', 'MantraTheme'), (r'Res\.string\.curare\b', 'Res.string.mantra'), (r'Curare', 'Mantra'), - (r'const val APP_NAME = "Curare"', 'const val APP_NAME = "Torch"'), # and here - (r'const val CLIENT_NAME = "Curare"', 'const val CLIENT_NAME = "Torch"'), # and here + (r'const val APP_NAME = "Curare"', 'const val APP_NAME = "Mantra"'), + (r'const val CLIENT_NAME = "Curare"', 'const val CLIENT_NAME = "Mantra"'), (r'APP_DIR_NAME = "curated"', 'APP_DIR_NAME = "mantra"'), (r'rootProject\.name = "Curare"', 'rootProject.name = "Mantra"'), (r'namespace = "to\.curare\.android"', 'namespace = "press.mantra.android"'), @@ -68,17 +68,17 @@ _RULES = [ (r'\bCuratedShapes\b', 'MantraShapes'), (r'\bCuratedConverters\b', 'MantraConverters'), (r'\bdefaultCuratedDir\b', 'defaultMantraDir'), - (r'\bCuratedTheme\b', 'TorchTheme'), - (r'const val APP_NAME = "Curated"', 'const val APP_NAME = "Torch"'), - (r'const val CLIENT_NAME = "Curated"', 'const val CLIENT_NAME = "Torch"'), + (r'\bCuratedTheme\b', 'MantraTheme'), + (r'const val APP_NAME = "Curated"', 'const val APP_NAME = "Mantra"'), + (r'const val CLIENT_NAME = "Curated"', 'const val CLIENT_NAME = "Mantra"'), (r'rootProject\.name = "Curated"', 'rootProject.name = "Mantra"'), (r'namespace = "com\.it\.curated\.android"', 'namespace = "press.mantra.android"'), (r'applicationId = "com\.it\.curated"', 'applicationId = "press.mantra.android"'), - # ios: Mantra never left Torch / ac.aux.compose.Aux (see the plan's Phase 0) - (r'PRODUCT_NAME=Curare\b', 'PRODUCT_NAME=Torch'), (r'PRODUCT_NAME=Curated\b', 'PRODUCT_NAME=Torch'), - (r'PRODUCT_BUNDLE_IDENTIFIER=to\.curare\b', 'PRODUCT_BUNDLE_IDENTIFIER=ac.aux.compose.Aux'), - (r'PRODUCT_BUNDLE_IDENTIFIER=com\.it\.curated\b', 'PRODUCT_BUNDLE_IDENTIFIER=ac.aux.compose.Aux'), - (r'\bCurare\.app\b', 'Torch.app'), (r'\bCurated\.app\b', 'Torch.app'), + # ios: Mantra is `Mantra` / press.mantra.ios since the plan's Phase 0 + (r'PRODUCT_NAME=Curare\b', 'PRODUCT_NAME=Mantra'), (r'PRODUCT_NAME=Curated\b', 'PRODUCT_NAME=Mantra'), + (r'PRODUCT_BUNDLE_IDENTIFIER=to\.curare\.ios', 'PRODUCT_BUNDLE_IDENTIFIER=press.mantra.ios'), + (r'PRODUCT_BUNDLE_IDENTIFIER=com\.it\.curated\b', 'PRODUCT_BUNDLE_IDENTIFIER=press.mantra.ios'), + (r'\bCurare\.app\b', 'Mantra.app'), (r'\bCurated\.app\b', 'Mantra.app'), # string keys carrying the brand: `_` is a word character, so \b never fires inside them (r'sign_in_is_not_yet_available_while_curare_is', 'sign_in_is_not_yet_available_while_mantra_is'), (r'sign_in_is_not_yet_available_while_curated_is', 'sign_in_is_not_yet_available_while_mantra_is'), diff --git a/iosApp/Configuration/Config.xcconfig b/iosApp/Configuration/Config.xcconfig index 3faaa0ad..951f1f68 100644 --- a/iosApp/Configuration/Config.xcconfig +++ b/iosApp/Configuration/Config.xcconfig @@ -1,7 +1,7 @@ TEAM_ID= -PRODUCT_NAME=Torch -PRODUCT_BUNDLE_IDENTIFIER=ac.aux.compose.Aux$(TEAM_ID) +PRODUCT_NAME=Mantra +PRODUCT_BUNDLE_IDENTIFIER=press.mantra.ios$(TEAM_ID) CURRENT_PROJECT_VERSION=1 MARKETING_VERSION=1.0 \ No newline at end of file diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj index 683c17c7..3a0c2f5e 100644 --- a/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/iosApp/iosApp.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXFileReference section */ - 41CB266BF907B985085BE6EC /* Aux.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Aux.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 41CB266BF907B985085BE6EC /* Mantra.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Mantra.app; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ @@ -59,7 +59,7 @@ ECDAFDDED408A506DEFE0AF1 /* Products */ = { isa = PBXGroup; children = ( - 41CB266BF907B985085BE6EC /* Aux.app */, + 41CB266BF907B985085BE6EC /* Mantra.app */, ); name = Products; sourceTree = ""; @@ -87,7 +87,7 @@ packageProductDependencies = ( ); productName = iosApp; - productReference = 41CB266BF907B985085BE6EC /* Aux.app */; + productReference = 41CB266BF907B985085BE6EC /* Mantra.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */