From b75d4b427fe39098d3745582fdf9d68fd116a0be Mon Sep 17 00:00:00 2001 From: Kgothatso Ngako Date: Tue, 20 Oct 2026 13:53:45 +0200 Subject: [PATCH] Rebrand Curare to Bennu under com.machankura.bennu Move the packages to com.machankura.bennu.{compose,android,desktop}, the Android applicationId to com.machankura.bennu.android and the iOS bundle id to com.machankura.bennu.ios. The root project, launcher label, iOS product, desktop window, user-facing strings, client tags and the Curare* classes all say Bennu now. Left alone on purpose: the mantra/ derivation tags, the `curated` desktop data directory, the mantra.press relay and the curare.to references. Co-Authored-By: Claude Opus 5.5 --- composeApp/build.gradle.kts | 14 +- .../1.json | 0 .../10.json | 0 .../11.json | 0 .../12.json | 0 .../13.json | 0 .../14.json | 0 .../15.json | 0 .../16.json | 0 .../17.json | 0 .../18.json | 0 .../19.json | 0 .../2.json | 0 .../20.json | 0 .../21.json | 0 .../22.json | 0 .../23.json | 0 .../24.json | 0 .../25.json | 0 .../3.json | 0 .../4.json | 0 .../5.json | 0 .../6.json | 0 .../7.json | 0 .../8.json | 0 .../9.json | 0 .../src/androidMain/AndroidManifest.xml | 4 +- .../bennu/android/BennuApplication.kt} | 4 +- .../machankura/bennu}/android/MainActivity.kt | 12 +- .../bennu}/compose/AppVersion.android.kt | 4 +- .../bennu}/compose/Platform.android.kt | 2 +- .../bennu}/compose/PlatformContext.android.kt | 2 +- .../PlatformDatabaseBuilder.android.kt | 12 +- .../compose/extensions/Phoenix.android.kt | 8 +- .../PlatformHttpClientEngine.android.kt | 2 +- .../bennu}/compose/ui/theme/Motion.android.kt | 2 +- .../bennu}/compose/ui/theme/Theme.android.kt | 2 +- .../view/model/NavigationViewModel.android.kt | 10 +- .../src/androidMain/res/values/strings.xml | 2 +- .../composeResources/values/strings.xml | 22 +- .../machankura/bennu}/compose/AppLifecycle.kt | 2 +- .../machankura/bennu}/compose/AppVersion.kt | 2 +- .../machankura/bennu/compose/BennuApp.kt} | 20 +- .../machankura/bennu/compose/BennuGlobal.kt | 5 + .../com/machankura/bennu/compose/Platform.kt | 7 + .../bennu/compose/PlatformContext.kt | 3 + .../bennu}/compose/cryptography/Extensions.kt | 8 +- .../bennu/compose/database/BennuDatabase.kt} | 240 ++++++------- .../database/BennuDatabaseConstructor.kt | 9 + .../builder/PlatformDatabaseBuilder.kt | 18 +- .../database/converters/BennuConverters.kt} | 8 +- .../dao/BroadcastNostrEventReceiptDao.kt | 21 ++ .../dao/BroadcastNostrEventRequestDao.kt | 8 +- ...geBroadcastNostrEventReceiptRelationDao.kt | 4 +- ...geBroadcastNostrEventRequestRelationDao.kt | 4 +- .../compose/database/dao/ChatMessageDao.kt | 14 +- .../dao/ChatMessageNostrEventRelationDao.kt | 11 + .../compose/database/dao/ChatRoomDao.kt | 8 +- .../compose/database/dao/ConnectionDao.kt | 12 +- .../compose/database/dao/DkgSessionDao.kt | 6 +- .../database/dao/FrostSigningSessionDao.kt | 12 +- .../database/dao/GiftWrapMessageDao.kt | 8 +- .../database/dao/GiftWrapPayloadDao.kt | 4 +- .../compose/database/dao/GiftWrapSealDao.kt | 6 +- .../compose/database/dao/GroupKeyStateDao.kt | 4 +- .../database/dao/GroupSignedEventDao.kt | 4 +- .../database/dao/InReplyToRelationDao.kt | 10 +- .../compose/database/dao/MantraArtifactDao.kt | 4 +- .../database/dao/MantraArtifactVersionDao.kt | 4 +- .../compose/database/dao/MantraChapterDao.kt | 4 +- .../compose/database/dao/MantraChunkDao.kt | 4 +- .../bennu}/compose/database/dao/MantraDao.kt | 28 +- .../compose/database/dao/MantraDialectDao.kt | 4 +- ...ranslationArtifactVersionContributorDao.kt | 4 +- .../MantraTranslationArtifactVersionDao.kt | 4 +- .../MantraTranslationChapterContributorDao.kt | 6 +- .../dao/MantraTranslationChapterDao.kt | 4 +- .../database/dao/MantraTranslationChunkDao.kt | 4 +- .../dao/MantraTranslationContributorDao.kt | 4 +- .../database/dao/MantraTranslationDao.kt | 4 +- .../database/dao/MarmotCommitResultDao.kt | 4 +- .../database/dao/MarmotGroupEventDao.kt | 4 +- .../database/dao/MarmotInnerEventDao.kt | 4 +- .../database/dao/MarmotKeyPackageBundleDao.kt | 4 +- .../database/dao/MarmotKeyPackageDao.kt | 4 +- .../compose/database/dao/MarmotOutboundDao.kt | 64 ++-- .../dao/MarmotPublishObligationDao.kt | 6 +- .../dao/MarmotRetainedEpochSecretDao.kt | 4 +- .../compose/database/dao/MarmotRoutingDao.kt | 4 +- .../bennu}/compose/database/dao/MentionDao.kt | 6 +- .../dao/NegentropySynchronizeRequestDao.kt | 4 +- .../dao/NegentropySynchronizeResultDao.kt | 10 + .../bennu}/compose/database/dao/NostrDao.kt | 100 +++--- .../compose/database/dao/NostrEventDao.kt | 28 +- .../database/dao/NostrEventRelayDao.kt | 4 +- .../compose/database/dao/NostrNip17Dao.kt | 28 +- .../compose/database/dao/ParticipantDao.kt | 4 +- .../bennu/compose/database/dao/PostDao.kt | 21 ++ .../bennu}/compose/database/dao/ProfileDao.kt | 12 +- .../compose/database/dao/QuotedRelationDao.kt | 10 +- .../bennu/compose/database/dao/ReactionDao.kt | 18 + .../compose/database/dao/RecentSearchDao.kt | 22 ++ .../bennu/compose/database/dao/RelayDao.kt | 19 ++ .../database/dao/RepostedRelationDao.kt | 10 +- .../dao/SynchronizeNostrEventRequestDao.kt | 12 +- .../dao/SynchronizeNostrEventResultDao.kt | 10 + .../database/dao/UnsignedNostrEventDao.kt | 6 +- .../bennu}/compose/database/dao/ZapDao.kt | 4 +- .../migrations/ChronicleRenameMigration.kt | 4 +- .../migrations/DkgApprovalRequestMigration.kt | 4 +- .../migrations/FrostSigningItemMigration.kt | 2 +- .../migrations/JoinedGroupAtMigration.kt | 4 +- .../model/BroadcastNostrEventReceipt.kt | 6 +- .../model/BroadcastNostrEventRequest.kt | 8 +- .../compose/database/model/BroadcastStatus.kt | 4 +- .../compose/database/model/ChatMessage.kt | 76 ++--- ...ssageBroadcastNostrEventReceiptRelation.kt | 6 +- ...ssageBroadcastNostrEventRequestRelation.kt | 6 +- .../model/ChatMessageNostrEventRelation.kt | 6 +- .../bennu}/compose/database/model/ChatRoom.kt | 12 +- .../compose/database/model/Connection.kt | 12 +- .../database/model/DkgParticipantMessage.kt | 2 +- .../compose/database/model/DkgSession.kt | 10 +- .../database/model/FrostSignerMessage.kt | 2 +- .../database/model/FrostSigningItem.kt | 2 +- .../database/model/FrostSigningSession.kt | 10 +- .../compose/database/model/GiftWrapMessage.kt | 12 +- .../compose/database/model/GiftWrapPayload.kt | 10 +- .../compose/database/model/GiftWrapSeal.kt | 10 +- .../compose/database/model/GroupKeyState.kt | 8 +- .../database/model/GroupSignedEvent.kt | 10 +- .../database/model/InReplyToRelation.kt | 10 +- .../compose/database/model/MantraArtifact.kt | 18 +- .../database/model/MantraArtifactVersion.kt | 10 +- .../compose/database/model/MantraChapter.kt | 18 +- .../compose/database/model/MantraChunk.kt | 14 +- .../compose/database/model/MantraDialect.kt | 14 +- .../database/model/MantraTranslation.kt | 12 +- .../model/MantraTranslationArtifactVersion.kt | 18 +- ...raTranslationArtifactVersionContributor.kt | 12 +- .../model/MantraTranslationChapter.kt | 14 +- .../MantraTranslationChapterContributor.kt | 12 +- .../database/model/MantraTranslationChunk.kt | 14 +- .../model/MantraTranslationChunkProposal.kt | 14 +- .../model/MantraTranslationContributor.kt | 10 +- .../database/model/MarmotCommitResult.kt | 10 +- .../database/model/MarmotGroupEvent.kt | 10 +- .../database/model/MarmotInnerEvent.kt | 12 +- .../database/model/MarmotKeyPackage.kt | 12 +- .../database/model/MarmotKeyPackageBundle.kt | 12 +- .../database/model/MarmotPublishObligation.kt | 2 +- .../model/MarmotRetainedEpochSecret.kt | 6 +- .../compose/database/model/MarmotRouting.kt | 2 +- .../bennu}/compose/database/model/Mention.kt | 10 +- .../model/NegentropySynchronizeRequest.kt | 12 +- .../model/NegentropySynchronizeResult.kt | 4 +- .../compose/database/model/NostrEvent.kt | 16 +- .../compose/database/model/NostrEventRelay.kt | 6 +- .../compose/database/model/Participant.kt | 12 +- .../bennu}/compose/database/model/Post.kt | 18 +- .../bennu}/compose/database/model/Profile.kt | 32 +- .../compose/database/model/QuotedRelation.kt | 12 +- .../bennu}/compose/database/model/Reaction.kt | 18 +- .../compose/database/model/RecentSearch.kt | 6 +- .../bennu}/compose/database/model/Relay.kt | 2 +- .../database/model/RepostedRelation.kt | 12 +- .../model/SynchronizeNostrEventRequest.kt | 10 +- .../model/SynchronizeNostrEventResult.kt | 6 +- .../database/model/UnsignedNostrEvent.kt | 10 +- .../bennu}/compose/database/model/Zap.kt | 14 +- .../model/intermdiate/ChatRoomLastMessage.kt | 4 +- .../model/intermdiate/FrostSignerTally.kt | 2 +- .../model/intermdiate/LocalAccount.kt | 39 +++ .../LocalBroadcastNostrEventRequest.kt | 14 + .../model/intermdiate/LocalChatMessage.kt | 34 ++ .../model/intermdiate/LocalChatRoom.kt | 14 +- .../intermdiate/LocalFrostSigningSession.kt | 8 +- .../intermdiate/LocalInReplyToNostrEvent.kt | 14 +- .../model/intermdiate/LocalMention.kt | 14 + .../model/intermdiate/LocalNostrEvent.kt | 20 +- .../model/intermdiate/LocalParticipant.kt | 14 + .../database/model/intermdiate/LocalPost.kt | 6 +- .../model/intermdiate/LocalProfile.kt | 6 +- .../intermdiate/LocalProfileWithFollowers.kt | 10 +- .../intermdiate/LocalProfileWithFollowing.kt | 10 +- .../intermdiate/LocalQuotedNostrEvent.kt | 30 +- .../intermdiate/LocalRepostedNostrEvent.kt | 14 +- .../model/traits/BroadcastableEntity.kt | 2 +- .../database/model/traits/LocalStoreEntity.kt | 2 +- .../database/model/traits/NostrEventEntity.kt | 2 +- .../model/traits/OptionalNostrEventEntity.kt | 2 +- .../model/traits/ProfilePublicKeyEntity.kt | 2 +- .../database/model/traits/ReplyingToEntity.kt | 2 +- .../model/traits/SoftDeletableEntity.kt | 2 +- .../model/traits/TimestampedEntity.kt | 2 +- .../model/traits/UnsignedNostrEventEntity.kt | 2 +- .../model/traits/UserViewableEntity.kt | 2 +- .../database/model/typealiases/HexArray.kt | 4 + .../database/model/typealiases/KindArray.kt | 3 + .../typealiases/SynchronizationFilterArray.kt | 3 + .../database/model/types/ChatRoomType.kt | 2 +- .../database/model/types/DkgApprovalStep.kt | 2 +- .../database/model/types/DkgRitualStage.kt | 2 +- .../database/model/types/FrostSigningStage.kt | 2 +- .../model/types/MarmotReindexReport.kt | 2 +- .../model/types/SynchronizationFilter.kt | 2 +- .../database/query/NostrEventFilterQuery.kt | 4 +- .../repository/DatabaseChatRepository.kt | 68 ++-- .../repository/DatabaseDkgRepository.kt | 38 +-- .../DatabaseFrostSigningRepository.kt | 26 +- .../repository/DatabaseMantraRepository.kt | 28 +- .../repository/DatabaseMarmotRepository.kt | 24 +- .../repository/DatabaseNostrRepository.kt | 96 +++--- .../repository/DatabasePostRepository.kt | 5 + .../repository/DatabaseSearchRepository.kt | 12 + .../GiftWrapImpersonationException.kt | 3 + .../GiftWrapPayloadUnsupportedException.kt | 3 + .../GiftWrapSealDecryptionException.kt | 3 + .../exceptions/GiftWrapUnsealException.kt | 3 + .../InvalidNostrPrivateKeyException.kt | 3 + .../MarmotCommitPendingException.kt | 2 +- .../MarmotConvergencePendingException.kt | 2 +- .../MarmotKeyPackageProfileException.kt | 2 +- .../MarmotMissingChatGroupException.kt | 2 +- .../MarmotMissingKeyPackageBundleException.kt | 2 +- ...MarmotMissingKeyPackageEventIdException.kt | 2 +- .../MarmotMissingNostrGroupDataExtension.kt | 2 +- ...MissingRetainedExporterSecretsException.kt | 2 +- .../MarmotNotMemberOfChatGroupException.kt | 2 +- .../MarmotUnprocessableInnerEventException.kt | 2 +- .../MarmotUnsupportedWireFormatException.kt | 2 +- ...MarmotWelcomeMismatchedGroupIdException.kt | 2 +- .../MarmotWelcomeMissingGroupIdException.kt | 2 +- .../compose/exceptions/NetworkException.kt | 2 +- .../exceptions/NostrNoticeException.kt | 6 + .../exceptions/NostrPublishException.kt | 2 +- .../compose/exceptions/SignatureException.kt | 3 + .../exceptions/SigningKeyNotFoundException.kt | 2 +- .../exceptions/SigningRejectedException.kt | 3 + .../bennu}/compose/extensions/Credentials.kt | 4 +- .../bennu}/compose/extensions/Instant.kt | 2 +- .../bennu}/compose/extensions/Member.kt | 4 +- .../compose/extensions/MlsGroupExtensions.kt | 2 +- .../bennu}/compose/extensions/Phoenix.kt | 2 +- .../extensions/WalletManagerExtension.kt | 2 +- .../compose/identity/CredentialParser.kt | 2 +- .../bennu}/compose/identity/ForgetIdentity.kt | 4 +- .../bennu}/compose/identity/Identity.kt | 2 +- .../bennu}/compose/identity/IdentityWriter.kt | 6 +- .../compose/identity/NewProfileWriter.kt | 2 +- .../compose/identity/SeedCredentials.kt | 2 +- .../bennu}/compose/identity/StoredIdentity.kt | 2 +- .../compose/managers/AuxDatabaseManager.kt | 26 ++ .../compose/managers/ChillDkgRitualManager.kt | 74 ++-- .../compose/managers/ChronicleManager.kt | 40 +-- .../bennu}/compose/managers/CommitOrdering.kt | 2 +- .../compose/managers/FrostSigningManager.kt | 122 +++---- .../compose/managers/GroupKeyStateManager.kt | 32 +- .../managers/LiveSubscriptionManager.kt | 28 +- .../bennu}/compose/managers/MarmotEngine.kt | 10 +- .../compose/managers/MarmotGroupCreation.kt | 20 +- .../compose/managers/MarmotGroupFactory.kt | 4 +- .../compose/managers/MarmotGroupName.kt | 2 +- .../compose/managers/MarmotInboundManager.kt | 52 +-- .../compose/managers/MarmotReindexSweep.kt | 4 +- .../compose/managers/MarmotRoomIdentity.kt | 2 +- .../bennu}/compose/managers/MlsGroupCache.kt | 4 +- .../compose/managers/MlsGroupProfile.kt | 4 +- .../managers/RoomMlsGroupStateStore.kt | 10 +- .../managers/RoomPublishObligationStore.kt | 12 +- .../compose/managers/SharedKeyDerivation.kt | 12 +- .../compose/managers/SubgroupManager.kt | 36 +- .../compose/managers/TranslationScaffold.kt | 8 +- .../compose/managers/WelcomeBundleMatch.kt | 2 +- .../network/PlatformHttpClientEngine.kt | 2 +- .../bennu/compose/network/UserAgent.kt | 11 + .../bennu}/compose/network/dto/RelayDTO.kt | 4 +- .../network/relays/EventPublishTransport.kt | 8 +- .../compose/network/relays/FallbackRelays.kt | 4 +- .../relays/LiveSubscriptionTransport.kt | 4 +- .../network/relays/NostrPublishResult.kt | 4 +- .../network/relays/RelayBackPressure.kt | 2 +- .../compose/network/relays/RelayPool.kt | 72 ++-- .../network/relays/RelaysSocketManager.kt | 30 +- .../broadcast/BroadcastEventResponse.kt | 2 +- .../relays/broadcast/BroadcastRequestBody.kt | 2 +- .../network/serialization/CommonJson.kt | 2 +- .../network/serialization/SocketsJson.kt | 4 +- .../network/sockets/NostrIncomingMessage.kt | 10 +- .../sockets/NostrIncomingMessageExt.kt | 2 +- .../sockets/NostrIncomingMessageParser.kt | 12 +- .../sockets/NostrOutgoingMessageBuilder.kt | 2 +- .../network/sockets/NostrSocketClient.kt | 2 +- .../sockets/NostrSocketClientFactory.kt | 6 +- .../network/sockets/NostrSocketClientImpl.kt | 4 +- .../compose/network/sockets/NostrVerb.kt | 2 +- .../network/sockets/ReconnectBackoff.kt | 2 +- .../sockets/SocketConnectionCallbacks.kt | 2 +- .../bennu}/compose/nostr/CuratedSuggestion.kt | 16 +- .../compose/nostr/DirectMessagePeerSync.kt | 10 +- .../bennu}/compose/nostr/GroupCuratedEntry.kt | 8 +- .../compose/nostr/GroupCuratedSchema.kt | 16 +- .../compose/nostr/GroupEventProposal.kt | 8 +- .../bennu}/compose/nostr/GroupNostrProfile.kt | 4 +- .../bennu}/compose/nostr/GroupPost.kt | 4 +- .../bennu}/compose/nostr/GroupRelayList.kt | 4 +- .../bennu}/compose/nostr/MarmotDelivery.kt | 10 +- .../compose/nostr/MarmotDirectMessage.kt | 2 +- .../bennu}/compose/nostr/MarmotProfile.kt | 2 +- .../bennu}/compose/nostr/MemberProfileSync.kt | 8 +- .../bennu}/compose/nostr/Nip17Filters.kt | 4 +- .../machankura/bennu}/compose/nostr/Relays.kt | 8 +- .../bennu}/compose/nostr/SignInSync.kt | 6 +- .../compose/nostr/chronicle/ChronicleEvent.kt | 28 +- .../nostr/chronicle/ChronicleRequestEvent.kt | 2 +- .../nostr/chronicle/tags/ChronicleIdTag.kt | 2 +- .../nostr/chronicle/tags/ChroniclePageTag.kt | 2 +- .../chronicle/tags/ChronicleRecipientTag.kt | 2 +- .../nostr/curated/CuratedEntryEvent.kt | 2 +- .../compose/nostr/curated/CuratedSchema.kt | 4 +- .../nostr/curated/CuratedSchemaEvent.kt | 2 +- .../nostr/curated/CuratedSchemaTemplate.kt | 2 +- .../compose/nostr/dkg/DkgRitualEvents.kt | 8 +- .../compose/nostr/dkg/tags/DkgSessionIdTag.kt | 2 +- .../compose/nostr/dkg/tags/DkgThresholdTag.kt | 2 +- .../compose/nostr/frost/FrostSigningEvents.kt | 14 +- .../compose/nostr/frost/GroupKeyStateEvent.kt | 16 +- .../frost/tags/FrostDerivationPathTag.kt | 4 +- .../compose/nostr/frost/tags/FrostKeyTag.kt | 2 +- .../nostr/frost/tags/FrostSessionIdTag.kt | 2 +- .../nostr/frost/tags/FrostSignerIdsTag.kt | 2 +- .../nostr/frost/tags/FrostSilentMembersTag.kt | 2 +- .../compose/nostr/nip30303/ArtifactEvent.kt | 12 +- .../nostr/nip30303/ArtifactVersionEvent.kt | 6 +- .../compose/nostr/nip30303/ChapterEvent.kt | 12 +- .../compose/nostr/nip30303/ChunkEvent.kt | 10 +- .../compose/nostr/nip30303/DialectEvent.kt | 8 +- .../compose/nostr/nip30303/SubmissionEvent.kt | 6 +- ...tionArtifactVersionContributorListEvent.kt | 2 +- .../TranslationArtifactVersionEvent.kt | 12 +- .../TranslationChapterContributorListEvent.kt | 2 +- .../nostr/nip30303/TranslationChapterEvent.kt | 8 +- .../nostr/nip30303/TranslationChunkEvent.kt | 10 +- .../nip30303/TranslationChunkProposalEvent.kt | 10 +- .../TranslationContributorListEvent.kt | 2 +- .../nostr/nip30303/TranslationEvent.kt | 6 +- .../nostr/nip30303/tags/ArtifactIdTag.kt | 2 +- .../nip30303/tags/ArtifactVersionIdTag.kt | 2 +- .../tags/ArtifactVersionMetadataTag.kt | 2 +- .../nostr/nip30303/tags/ChapterIdTag.kt | 2 +- .../compose/nostr/nip30303/tags/ChunkIdTag.kt | 2 +- .../nostr/nip30303/tags/ContributorTag.kt | 2 +- .../compose/nostr/nip30303/tags/CountryTag.kt | 2 +- .../nostr/nip30303/tags/DialectIdTag.kt | 2 +- .../compose/nostr/nip30303/tags/IndexTag.kt | 2 +- .../nostr/nip30303/tags/LanguageTag.kt | 2 +- .../compose/nostr/nip30303/tags/LicenseTag.kt | 2 +- .../compose/nostr/nip30303/tags/NameTag.kt | 2 +- .../nostr/nip30303/tags/OriginalTextTag.kt | 2 +- .../nostr/nip30303/tags/PayloadIdTag.kt | 2 +- .../nostr/nip30303/tags/PayloadKindTag.kt | 2 +- .../tags/TranslationArtifactVersionIdTag.kt | 2 +- .../nip30303/tags/TranslationChapterIdTag.kt | 2 +- .../nip30303/tags/TranslationChunkIdTag.kt | 2 +- .../nostr/nip30303/tags/TranslationIdTag.kt | 2 +- .../compose/nostr/nip30303/tags/UrlTag.kt | 2 +- .../nostr/nip30303/tags/VisibilityTag.kt | 2 +- .../nostr/nip30303/tags/WordStatisticsTag.kt | 2 +- .../subgroup/SubgroupBirthCertificateEvent.kt | 12 +- .../nostr/subgroup/SubgroupParentage.kt | 2 +- .../tags/SubgroupBirthCertificateTag.kt | 2 +- .../nostr/subgroup/tags/SubgroupKeyTag.kt | 4 +- .../nostr/subgroup/tags/SubgroupParentTag.kt | 2 +- .../repository/CachingImportRepository.kt | 40 +++ .../compose/repository/ChatRepository.kt | 38 +-- .../compose/repository/DkgRepository.kt | 18 +- .../repository/FrostSigningRepository.kt | 14 +- .../compose/repository/MantraRepository.kt | 20 +- .../compose/repository/MarmotRepository.kt | 8 +- .../repository/NostrNotaryRepository.kt | 38 +-- .../repository/NostrPublisherRepository.kt | 22 +- .../compose/repository/NostrRepository.kt | 38 +-- .../compose/repository/PostRepository.kt | 3 + .../bennu}/compose/repository/ProfilesOf.kt | 4 +- .../compose/repository/RelayRepository.kt | 4 +- .../compose/repository/SearchRepository.kt | 6 +- .../bennu}/compose/text/Markdown.kt | 2 +- .../bennu}/compose/text/ProposedEvent.kt | 30 +- .../bennu}/compose/ui/BlurHashDecoder.kt | 2 +- .../AcceptCuratedSuggestionScreen.kt | 134 ++++---- .../ui/composable/ActiveProfileScreen.kt | 88 ++--- .../ui/composable/AddArtifactScreen.kt | 74 ++-- .../compose/ui/composable/AddChapterScreen.kt | 66 ++-- .../compose/ui/composable/AddDialectScreen.kt | 62 ++-- .../ui/composable/AddGroupPostScreen.kt | 60 ++-- .../AddMemberToChatRoomConfirmationScreen.kt | 56 ++-- .../AddTranslationArtifactVersionScreen.kt | 62 ++-- .../ui/composable/ArtifactDetailScreen.kt | 68 ++-- .../BroadcastGroupSignedEventScreen.kt | 94 +++--- .../ui/composable/ChapterDetailScreen.kt | 44 +-- .../ui/composable/ChatRoomCreationScreen.kt | 36 +- .../ui/composable/ChatRoomDetailScreen.kt | 200 +++++------ .../ui/composable/ChatRoomMessagingScreen.kt | 72 ++-- .../ui/composable/CreateProfileScreen.kt | 72 ++-- .../composable/CuratedSuggestionListScreen.kt | 100 +++--- .../ui/composable/DkgApprovalScaffold.kt | 30 +- .../ui/composable/DkgJoinApprovalScreen.kt | 12 +- .../compose/ui/composable/DkgRitualScreen.kt | 128 +++---- .../ui/composable/DkgRound1ApprovalScreen.kt | 18 +- .../ui/composable/DkgRound2ApprovalScreen.kt | 16 +- .../EditGroupCuratedSchemaScreen.kt | 290 ++++++++-------- .../composable/EditGroupNostrProfileScreen.kt | 80 ++--- .../ui/composable/EditGroupRelaysScreen.kt | 102 +++--- .../ui/composable/FrostSigningScreen.kt | 84 ++--- .../composable/GroupCuratedEntriesScreen.kt | 106 +++--- .../composable/GroupCuratedSchemasScreen.kt | 76 ++--- .../ui/composable/GroupNostrProfileScreen.kt | 64 ++-- .../compose/ui/composable/GroupPostsScreen.kt | 68 ++-- .../ui/composable/GroupRelaysScreen.kt | 68 ++-- .../compose/ui/composable/HomeScreen.kt | 88 ++--- .../composable/ImplementationPendingScreen.kt | 18 +- .../composable/KeyPackageManagementScreen.kt | 52 +-- .../ui/composable/KeyRecoveryScreen.kt | 64 ++-- .../compose/ui/composable/LandingScreen.kt | 30 +- .../compose/ui/composable/LoadingScreen.kt | 12 +- .../ui/composable/NostrEventDetailScreen.kt | 52 +-- .../ui/composable/NostrSecretScreen.kt | 88 ++--- .../ui/composable/ProfilePreviewScreen.kt | 74 ++-- .../compose/ui/composable/ProfilesScreen.kt | 30 +- .../ui/composable/ProposalListScreen.kt | 128 +++---- .../ui/composable/ProposeGroupEventScreen.kt | 86 ++--- .../ui/composable/RecoveryPhraseScreen.kt | 62 ++-- .../SearchMemberToAddToChatRoomScreen.kt | 48 +-- .../ui/composable/SearchResultScreen.kt | 46 +-- .../compose/ui/composable/SearchScreen.kt | 42 +-- .../composable/SelectChatRoomMembersScreen.kt | 52 +-- .../ui/composable/SelectChatRoomTypeScreen.kt | 66 ++-- .../SelectCuratedSchemaTemplateScreen.kt | 50 +-- .../composable/SelectSubgroupAdminsScreen.kt | 66 ++-- .../ui/composable/ShareProfileScreen.kt | 52 +-- .../compose/ui/composable/SignInScreen.kt | 84 ++--- .../ui/composable/SocialPreconditionScreen.kt | 30 +- .../SovereignWalletStartupScreen.kt | 60 ++-- .../ui/composable/TranslateChunkScreen.kt | 58 ++-- .../TranslationArtifactVersionDetailScreen.kt | 58 ++-- .../ui/composable/TranslationChapterScreen.kt | 40 +-- .../ui/composable/UnannouncedProfileScreen.kt | 20 +- .../ui/composable/UnindexedProfileScreen.kt | 20 +- .../ui/composable/UnqueuedProfileScreen.kt | 20 +- .../UnqueuedProfileSynchronizationScreen.kt | 28 +- .../ui/composable/UnsignedProfileScreen.kt | 20 +- .../ui/composable/UnsyncedProfileScreen.kt | 66 ++-- .../ui/composable/WriteNewNoteScreen.kt | 92 ++--- .../ui/composable/navigation/BennuNavHost.kt} | 316 +++++++++--------- .../navigation/BennuNavigationSuite.kt} | 10 +- .../navigation/TopLevelDestination.kt | 18 +- .../routes/AcceptCuratedSuggestionRoute.kt | 2 +- .../navigation/routes/ActiveProfileRoute.kt | 2 +- .../navigation/routes/AddArtifactRoute.kt | 2 +- .../navigation/routes/AddChapterRoute.kt | 2 +- .../navigation/routes/AddDialectRoute.kt | 2 +- .../navigation/routes/AddGroupPostRoute.kt | 2 +- .../AddMemberToChatRoomConfirmationRoute.kt | 2 +- .../navigation/routes/AddTranslationRoute.kt | 2 +- .../navigation/routes/ArtifactDetailRoute.kt | 2 +- .../routes/AuthenticatedProfileRoute.kt | 6 + .../navigation/routes/BlankRoute.kt | 6 + .../routes/BroadcastGroupSignedEventRoute.kt | 2 +- .../navigation/routes/ChapterDetailRoute.kt | 2 +- .../routes/ChatRoomCreationRoute.kt | 2 +- .../navigation/routes/ChatRoomDetailRoute.kt | 2 +- .../routes/ChatRoomMessagingRoute.kt | 2 +- .../navigation/routes/CreateProfileRoute.kt | 2 +- .../routes/CuratedSuggestionListRoute.kt | 2 +- .../navigation/routes/DkgJoinApprovalRoute.kt | 2 +- .../navigation/routes/DkgRitualRoute.kt | 2 +- .../routes/DkgRound1ApprovalRoute.kt | 2 +- .../routes/DkgRound2ApprovalRoute.kt | 2 +- .../routes/EditGroupCuratedSchemaRoute.kt | 2 +- .../routes/EditGroupNostrProfileRoute.kt | 2 +- .../navigation/routes/EditGroupRelaysRoute.kt | 2 +- .../navigation/routes/FrostSigningRoute.kt | 2 +- .../routes/GroupCuratedEntriesRoute.kt | 2 +- .../routes/GroupCuratedSchemasRoute.kt | 2 +- .../routes/GroupNostrProfileRoute.kt | 2 +- .../navigation/routes/GroupPostsRoute.kt | 2 +- .../navigation/routes/GroupRelaysRoute.kt | 2 +- .../composable/navigation/routes/HomeRoute.kt | 2 +- .../routes/ImplementationPendingRoute.kt | 2 +- .../routes/KeyPackageManagementRoute.kt | 2 +- .../navigation/routes/KeyRecoveryRoute.kt | 2 +- .../navigation/routes/LandingRoute.kt | 6 + .../navigation/routes/LoadingRoute.kt | 2 +- .../routes/NostrEventDetailRoute.kt | 2 +- .../navigation/routes/NostrSecretRoute.kt | 2 +- .../navigation/routes/ProfilePreviewRoute.kt | 2 +- .../navigation/routes/ProfilesRoute.kt | 2 +- .../navigation/routes/ProposalDestination.kt | 4 +- .../navigation/routes/ProposalListRoute.kt | 4 +- .../routes/ProposeGroupEventRoute.kt | 2 +- .../navigation/routes/RecoveryPhraseRoute.kt | 2 +- .../ui/composable/navigation/routes/Route.kt | 3 + .../SearchMemberToAddToChatRoomRoute.kt | 2 +- .../navigation/routes/SearchResultRoute.kt | 2 +- .../navigation/routes/SearchRoute.kt | 2 +- .../routes/SelectChatRoomMembersRoute.kt | 2 +- .../routes/SelectChatRoomTypeRoute.kt | 2 +- .../SelectCuratedSchemaTemplateRoute.kt | 2 +- .../routes/SelectSubgroupAdminsRoute.kt | 2 +- .../navigation/routes/ShareProfileRoute.kt | 2 +- .../navigation/routes/SignInRoute.kt | 6 + .../routes/SocialPreconditionRoute.kt | 2 +- .../routes/SovereignWalletStartupRoute.kt | 6 + .../navigation/routes/TranslateChunkRoute.kt | 2 +- .../TranslationArtifactVersionDetailRoute.kt | 2 +- .../routes/TranslationChapterRoute.kt | 2 +- .../routes/UnannouncedProfileRoute.kt | 2 +- .../routes/UnindexedProfileRoute.kt | 2 +- .../navigation/routes/UnqueuedProfileRoute.kt | 2 +- .../UnqueuedProfileSynchronizationRoute.kt | 2 +- .../navigation/routes/UnsignedProfileRoute.kt | 2 +- .../navigation/routes/UnsyncedProfileRoute.kt | 2 +- .../navigation/routes/WriteNewNoteRoute.kt | 2 +- .../ui/composable/widgets/DetailRow.kt | 2 +- .../widgets/LoadingDataIndicator.kt | 8 +- .../composable/widgets/NavigateBackButton.kt | 6 +- .../ui/composable/widgets/QRCodeView.kt | 8 +- .../composable/widgets/RelayOutcomeLabel.kt | 16 +- .../ui/composable/widgets/ScreenState.kt | 12 +- .../ui/composable/widgets/Semantics.kt | 2 +- .../composable/widgets/SigningCapability.kt | 4 +- .../ui/composable/widgets/Snackbars.kt | 2 +- .../widgets/buttons/BroadcastButton.kt | 10 +- .../composable/widgets/buttons/Clickable.kt | 6 +- .../composable/widgets/buttons/ExtendedFab.kt | 4 +- .../composable/widgets/chat/ChatTranscript.kt | 64 ++-- .../widgets/coil/forwardingPainter.kt | 2 +- .../composable/widgets/content/ArticleCard.kt | 16 +- .../composable/widgets/content/Constants.kt | 2 +- .../widgets/content/ContentParser.kt | 2 +- .../widgets/content/ContentSegment.kt | 2 +- .../widgets/content/FullScreenImageViewer.kt | 4 +- .../ui/composable/widgets/content/Helpers.kt | 4 +- .../widgets/content/ImageWithContextMenu.kt | 12 +- .../widgets/content/InvoicePayState.kt | 2 +- .../widgets/content/LightningInvoiceCard.kt | 24 +- .../composable/widgets/content/LinkPreview.kt | 6 +- .../widgets/content/LiveStreamCard.kt | 6 +- .../widgets/content/LiveStreamCardContent.kt | 20 +- .../widgets/content/LoadingAsyncImage.kt | 2 +- .../composable/widgets/content/MediaMeta.kt | 2 +- .../composable/widgets/content/NoteActions.kt | 4 +- .../ui/composable/widgets/content/OgData.kt | 2 +- .../widgets/content/QuotedAddressableNote.kt | 10 +- .../composable/widgets/content/QuotedNote.kt | 22 +- .../composable/widgets/content/RichContent.kt | 38 +-- .../widgets/content/UnsupportedKindBadge.kt | 10 +- .../widgets/detail/MetadataEventDetail.kt | 56 ++-- .../widgets/detail/TextNoteEventDetail.kt | 60 ++-- .../widgets/dialogs/BottomSheetDialog.kt | 4 +- .../dialogs/NewChatBottomSheetDialog.kt | 16 +- .../dialogs/SignOutOfReadOnlyDialog.kt | 14 +- .../StartDirectMessageToNpubOrNip05Dialog.kt | 28 +- .../composable/widgets/feed/EventListView.kt | 52 +-- .../widgets/feed/TextNoteFeedItem.kt | 80 ++--- .../widgets/profile/ProfileAvatar.kt | 20 +- .../widgets/profile/ProfileColor.kt | 4 +- .../widgets/wallet/AddProfileRows.kt | 14 +- .../widgets/wallet/RememberProfilesOf.kt | 8 +- .../composable/widgets/wallet/WalletAvatar.kt | 8 +- .../widgets/wallet/WalletsSelector.kt | 22 +- .../bennu}/compose/ui/theme/Breakpoint.kt | 10 +- .../bennu}/compose/ui/theme/Color.kt | 2 +- .../compose/ui/theme/ConformancePreviews.kt | 4 +- .../bennu}/compose/ui/theme/Motion.kt | 4 +- .../bennu}/compose/ui/theme/Panes.kt | 2 +- .../compose/ui/theme/ReadableMeasure.kt | 2 +- .../bennu}/compose/ui/theme/Shape.kt | 4 +- .../bennu}/compose/ui/theme/Spacing.kt | 4 +- .../bennu}/compose/ui/theme/Theme.kt | 10 +- .../bennu}/compose/ui/theme/ThemeGallery.kt | 8 +- .../bennu}/compose/ui/theme/Type.kt | 2 +- .../model/AcceptCuratedSuggestionViewModel.kt | 18 +- .../ui/view/model/ActiveProfileViewModel.kt | 18 +- .../ui/view/model/AddArtifactViewModel.kt | 18 +- .../ui/view/model/AddChapterViewModel.kt | 24 +- .../ui/view/model/AddDialectViewModel.kt | 14 +- .../ui/view/model/AddGroupPostViewModel.kt | 12 +- ...ddMemberToChatRoomConfirmationViewModel.kt | 28 +- .../AddTranslationArtifactVersionViewModel.kt | 26 +- .../ui/view/model/ArtifactDetailViewModel.kt | 6 +- .../BroadcastGroupSignedEventViewModel.kt | 34 +- .../ui/view/model/ChapterDetailViewModel.kt | 6 +- .../ui/view/model/ChatMessageListViewModel.kt | 36 +- .../view/model/ChatRoomCreationViewModel.kt | 8 +- .../ui/view/model/ChatRoomDetailViewModel.kt | 20 +- .../ui/view/model/ChatRoomListViewModel.kt | 34 +- .../view/model/ChatRoomMessagingViewModel.kt | 18 +- .../ui/view/model/CreateProfileViewModel.kt | 12 +- .../model/CuratedSuggestionListViewModel.kt | 18 +- .../ui/view/model/DkgRitualViewModel.kt | 34 +- .../model/EditGroupCuratedSchemaViewModel.kt | 32 +- .../model/EditGroupNostrProfileViewModel.kt | 12 +- .../ui/view/model/EditGroupRelaysViewModel.kt | 16 +- .../ui/view/model/FeedListViewModel.kt | 36 +- .../ui/view/model/FollowersListViewModel.kt | 46 +-- .../ui/view/model/FollowingListViewModel.kt | 46 +-- .../ui/view/model/FrostSigningViewModel.kt | 16 +- .../model/GroupCuratedEntriesViewModel.kt | 12 +- .../model/GroupCuratedSchemasViewModel.kt | 6 +- .../view/model/GroupNostrProfileViewModel.kt | 6 +- .../ui/view/model/GroupPostsViewModel.kt | 6 +- .../ui/view/model/GroupRelaysViewModel.kt | 6 +- .../compose/ui/view/model/HomeViewModel.kt | 8 +- .../ui/view/model/InReplyToViewModel.kt | 58 ++-- .../model/KeyPackageManagementViewModel.kt | 12 +- .../model/MetadataEventDetailViewModel.kt | 48 +-- .../ui/view/model/NavigationViewModel.kt | 14 +- .../ui/view/model/NewProfileWriters.kt | 10 +- .../view/model/NostrEventDetailViewModel.kt | 24 +- .../ui/view/model/NostrSecretViewModel.kt | 16 +- .../compose/ui/view/model/NotaryViewModel.kt | 22 +- .../ui/view/model/ProfilePreviewViewModel.kt | 26 +- .../ui/view/model/ProfilesViewModel.kt | 12 +- .../ui/view/model/ProposalListViewModel.kt | 24 +- .../view/model/ProposeGroupEventViewModel.kt | 12 +- .../ui/view/model/RecoveryPhraseViewModel.kt | 6 +- .../SearchMemberToAddToChatRoomViewModel.kt | 16 +- .../ui/view/model/SearchResultViewModel.kt | 20 +- .../compose/ui/view/model/SearchViewModel.kt | 24 +- .../model/SelectChatRoomMembersViewModel.kt | 18 +- .../view/model/SelectChatRoomTypeViewModel.kt | 32 +- .../model/SelectSubgroupAdminsViewModel.kt | 18 +- .../ui/view/model/ShareProfileViewModel.kt | 14 +- .../ui/view/model/SignInToProfileViewModel.kt | 16 +- .../compose/ui/view/model/SignOutViewModel.kt | 10 +- .../model/SovereignWalletStartupViewModel.kt | 8 +- .../ui/view/model/SovereignWalletViewModel.kt | 24 +- .../ui/view/model/SynchronizationViewModel.kt | 48 +-- .../ui/view/model/TranslateChunkViewModel.kt | 16 +- ...anslationArtifactVersionDetailViewModel.kt | 20 +- .../view/model/TranslationChapterViewModel.kt | 8 +- ...UnqueuedProfileSynchronizationViewModel.kt | 8 +- .../ui/view/model/UnsyncedProfileViewModel.kt | 12 +- .../ui/view/model/WriteNewNoteViewModel.kt | 42 +-- .../state/AcceptCuratedSuggestionUIState.kt | 8 +- .../ui/view/state/ActiveProfileUIState.kt | 4 +- .../ui/view/state/AddArtifactUIState.kt | 6 +- .../ui/view/state/AddChapterUIState.kt | 8 +- .../ui/view/state/AddDialectUIState.kt | 4 +- .../ui/view/state/AddGroupPostUIState.kt | 6 +- .../AddMemberToChatRoomConfirmationUIState.kt | 8 +- .../AddTranslationArtifactVersionUIState.kt | 12 +- .../ui/view/state/ArtifactDetailUIState.kt | 10 +- .../state/BroadcastGroupSignedEventUIState.kt | 10 +- .../ui/view/state/ChapterDetailUIState.kt | 6 +- .../ui/view/state/ChatMessageListUIState.kt | 4 +- .../ui/view/state/ChatRoomDetailUIState.kt | 20 +- .../ui/view/state/ChatRoomListUIState.kt | 4 +- .../ui/view/state/ChatRoomMessagingUIState.kt | 4 +- .../ui/view/state/CreateProfileUIState.kt | 4 +- .../state/CuratedSuggestionListUIState.kt | 8 +- .../compose/ui/view/state/DkgRitualUIState.kt | 18 +- .../state/EditGroupCuratedSchemaUIState.kt | 6 +- .../state/EditGroupNostrProfileUIState.kt | 6 +- .../ui/view/state/EditGroupRelaysUIState.kt | 6 +- .../compose/ui/view/state/FeedListUIState.kt | 4 +- .../ui/view/state/FollowersListUIState.kt | 4 +- .../ui/view/state/FollowingListUIState.kt | 4 +- .../ui/view/state/FrostSigningUIState.kt | 16 +- .../view/state/GroupCuratedEntriesUIState.kt | 8 +- .../view/state/GroupCuratedSchemasUIState.kt | 6 +- .../ui/view/state/GroupNostrProfileUIState.kt | 6 +- .../ui/view/state/GroupPostsUIState.kt | 8 +- .../ui/view/state/GroupRelaysUIState.kt | 6 +- .../ui/view/state/HomeScreenUIState.kt | 4 +- .../view/state/KeyPackageManagementUIState.kt | 4 +- .../view/state/MetadataEventDetailUIState.kt | 14 + .../ui/view/state/NavigationUIState.kt | 14 +- .../ui/view/state/NostrEventDetailUIState.kt | 4 +- .../ui/view/state/NostrSecretUIState.kt | 2 +- .../ui/view/state/ProfilePreviewUIState.kt | 6 +- .../compose/ui/view/state/ProfilesUIState.kt | 6 +- .../compose/ui/view/state/ProposalFilter.kt | 2 +- .../ui/view/state/ProposalListUIState.kt | 12 +- .../compose/ui/view/state/ProposalState.kt | 4 +- .../ui/view/state/ProposeGroupEventUIState.kt | 6 +- .../ui/view/state/RecoveryPhraseUIState.kt | 2 +- .../SearchMemberToAddToChatRoomUIState.kt | 6 +- .../ui/view/state/SearchResultListUIState.kt | 4 +- .../compose/ui/view/state/SearchUIState.kt | 4 +- .../state/SelectChatRoomMembersUIState.kt | 4 +- .../view/state/SelectChatRoomTypeUIState.kt | 4 +- .../view/state/SelectSubgroupAdminsUIState.kt | 6 +- .../ui/view/state/ShareProfileUIState.kt | 4 +- .../ui/view/state/SignInToProfileUIState.kt | 6 +- .../ui/view/state/SovereignWalletUIState.kt | 2 +- .../compose/ui/view/state/StartupChoice.kt | 4 +- .../ui/view/state/TranslateChunkUIState.kt | 6 +- ...TranslationArtifactVersionDetailUIState.kt | 10 +- .../view/state/TranslationChapterUIState.kt | 6 +- .../ui/view/state/UnsyncedProfileUIState.kt | 2 +- .../ui/view/state/WriteNewNoteUIState.kt | 24 ++ .../state/form/ChatRoomCreationFormState.kt | 2 +- .../view/state/form/CreateProfileFormState.kt | 2 +- .../state/form/SignInToProfileFormState.kt | 2 +- .../ui/view/state/form/TextFieldForm.kt | 2 +- .../view/state/form/WriteNewNoteFormState.kt | 2 +- .../kotlin/to/curare/compose/CurareGlobal.kt | 5 - .../kotlin/to/curare/compose/Platform.kt | 7 - .../to/curare/compose/PlatformContext.kt | 3 - .../database/CurareDatabaseConstructor.kt | 9 - .../dao/BroadcastNostrEventReceiptDao.kt | 21 -- .../dao/ChatMessageNostrEventRelationDao.kt | 11 - .../dao/NegentropySynchronizeResultDao.kt | 10 - .../to/curare/compose/database/dao/PostDao.kt | 21 -- .../compose/database/dao/ReactionDao.kt | 18 - .../compose/database/dao/RecentSearchDao.kt | 22 -- .../curare/compose/database/dao/RelayDao.kt | 19 -- .../dao/SynchronizeNostrEventResultDao.kt | 10 - .../model/intermdiate/LocalAccount.kt | 39 --- .../LocalBroadcastNostrEventRequest.kt | 14 - .../model/intermdiate/LocalChatMessage.kt | 34 -- .../model/intermdiate/LocalMention.kt | 14 - .../model/intermdiate/LocalParticipant.kt | 14 - .../database/model/typealiases/HexArray.kt | 4 - .../database/model/typealiases/KindArray.kt | 3 - .../typealiases/SynchronizationFilterArray.kt | 3 - .../repository/DatabasePostRepository.kt | 5 - .../repository/DatabaseSearchRepository.kt | 12 - .../GiftWrapImpersonationException.kt | 3 - .../GiftWrapPayloadUnsupportedException.kt | 3 - .../GiftWrapSealDecryptionException.kt | 3 - .../exceptions/GiftWrapUnsealException.kt | 3 - .../InvalidNostrPrivateKeyException.kt | 3 - .../exceptions/NostrNoticeException.kt | 6 - .../compose/exceptions/SignatureException.kt | 3 - .../exceptions/SigningRejectedException.kt | 3 - .../compose/managers/AuxDatabaseManager.kt | 26 -- .../to/curare/compose/network/UserAgent.kt | 11 - .../repository/CachingImportRepository.kt | 40 --- .../compose/repository/PostRepository.kt | 3 - .../routes/AuthenticatedProfileRoute.kt | 6 - .../navigation/routes/BlankRoute.kt | 6 - .../navigation/routes/LandingRoute.kt | 6 - .../ui/composable/navigation/routes/Route.kt | 3 - .../navigation/routes/SignInRoute.kt | 6 - .../routes/SovereignWalletStartupRoute.kt | 6 - .../view/state/MetadataEventDetailUIState.kt | 14 - .../ui/view/state/WriteNewNoteUIState.kt | 24 -- .../bennu}/compose/ComposeAppCommonTest.kt | 2 +- .../model/ChatRoomMembershipWindowTest.kt | 2 +- .../database/model/GiftWrapMessageTest.kt | 2 +- .../model/MarmotChatLineReconciliationTest.kt | 2 +- .../model/MarmotCommitResultMappingTest.kt | 2 +- .../model/MarmotGroupEventRoomFilterTest.kt | 2 +- .../database/model/RumorIdAgreementTest.kt | 18 +- .../model/TranscriptRequestStateTest.kt | 2 +- .../ChatRoomLastMessagePreviewTest.kt | 10 +- .../query/NostrEventFilterQueryTest.kt | 8 +- .../extensions/ChatListTimestampTest.kt | 2 +- .../managers/ChillDkgRitualOrderingTest.kt | 4 +- .../compose/managers/FrostSigningRoundTest.kt | 14 +- .../compose/managers/GroupKeyStateTest.kt | 20 +- .../compose/managers/LiveInstanceCacheTest.kt | 2 +- .../managers/LiveSubscriptionPlanTest.kt | 30 +- .../managers/LiveSubscriptionReconcileTest.kt | 22 +- .../compose/managers/MarmotGroupNameTest.kt | 2 +- .../managers/MarmotMip03CarveOutTest.kt | 4 +- .../managers/MarmotReindexSweepTest.kt | 2 +- .../managers/MarmotRoomIdentityTest.kt | 2 +- .../managers/SharedKeyDerivationTest.kt | 6 +- .../compose/managers/SignedArtifactTest.kt | 14 +- .../compose/managers/SignedChapterTest.kt | 14 +- .../managers/TranslationScaffoldTest.kt | 14 +- .../network/relays/RelayBackPressureTest.kt | 2 +- .../relays/RelayPoolSubscriptionTest.kt | 18 +- .../network/sockets/ReconnectBackoffTest.kt | 2 +- .../compose/nostr/CuratedSuggestionTest.kt | 24 +- .../nostr/DirectMessagePeerSyncTest.kt | 4 +- .../compose/nostr/GroupCuratedEntryTest.kt | 24 +- .../compose/nostr/GroupCuratedSchemaTest.kt | 20 +- .../compose/nostr/GroupEventProposalTest.kt | 14 +- .../compose/nostr/GroupNostrProfileTest.kt | 8 +- .../bennu}/compose/nostr/GroupPostTest.kt | 8 +- .../compose/nostr/GroupRelayListTest.kt | 8 +- .../compose/nostr/MarmotAppPayloadTest.kt | 2 +- .../compose/nostr/MarmotDeliveryTest.kt | 4 +- .../nostr/MarmotDirectMessageDeliveryTest.kt | 2 +- .../compose/nostr/MarmotDirectMessageTest.kt | 2 +- .../compose/nostr/MarmotPayloadBoundsTest.kt | 8 +- .../compose/nostr/MemberProfileSyncTest.kt | 14 +- .../bennu}/compose/nostr/Nip17FiltersTest.kt | 6 +- .../bennu}/compose/nostr/SignInSyncTest.kt | 2 +- .../nostr/chronicle/ChronicleEventTest.kt | 40 +-- .../nostr/chronicle/ChronicleRoundTripTest.kt | 40 +-- .../nostr/curated/CuratedEntryEventTest.kt | 2 +- .../nostr/curated/CuratedSchemaEventTest.kt | 2 +- .../curated/CuratedSchemaTemplateTest.kt | 2 +- .../nostr/frost/FrostProposalCodecTest.kt | 2 +- .../nostr/frost/FrostSilentMembersTagTest.kt | 4 +- .../nostr/nip30303/ArtifactEventTest.kt | 4 +- .../nostr/nip30303/ChapterChunkSplitTest.kt | 6 +- .../nip30303/InitialArtifactVersionTest.kt | 4 +- .../nostr/nip30303/SubmissionEventTest.kt | 2 +- .../SubgroupBirthCertificateEventTest.kt | 6 +- .../bennu}/compose/text/ProposedEventTest.kt | 6 +- .../navigation/NavigationSuiteTest.kt | 10 +- .../routes/ProposalDestinationTest.kt | 4 +- .../ui/theme/AppColorSchemeSelectionTest.kt | 2 +- .../bennu}/compose/ui/theme/BreakpointTest.kt | 2 +- .../ui/theme/ColorSchemeContrastTest.kt | 2 +- .../bennu}/compose/ui/theme/PanesTest.kt | 2 +- .../compose/ui/theme/ReadableMeasureTest.kt | 2 +- .../compose/ui/theme/SpacingScaleTest.kt | 2 +- .../ui/view/model/NavigationRoutingTest.kt | 18 +- .../view/model/UnsyncedProfileDecisionTest.kt | 20 +- .../ui/view/state/FrostSigningMembersTest.kt | 12 +- .../view/state/FrostSigningResendStateTest.kt | 18 +- .../ui/view/state/ProposalAskAgainTest.kt | 12 +- .../ui/view/state/ProposalFilterTest.kt | 10 +- .../ui/view/state/ProposalProgressTest.kt | 6 +- .../ui/view/state/ProposalStateTest.kt | 14 +- .../ui/view/state/StartupChoiceTest.kt | 4 +- .../bennu}/compose/AppVersion.ios.kt | 2 +- .../bennu}/compose/MainViewController.kt | 6 +- .../machankura/bennu}/compose/Platform.ios.kt | 2 +- .../bennu/compose/PlatformContext.ios.kt | 3 + .../builder/PlatformDatabaseBuilder.ios.kt | 12 +- .../bennu}/compose/extensions/Phoenix.ios.kt | 2 +- .../network/PlatformHttpClientEngine.ios.kt | 2 +- .../bennu}/compose/ui/theme/Motion.ios.kt | 2 +- .../bennu}/compose/ui/theme/Theme.ios.kt | 2 +- .../ui/view/model/NavigationViewModel.ios.kt | 2 +- .../to/curare/compose/PlatformContext.ios.kt | 3 - .../bennu}/compose/AppVersion.jvm.kt | 2 +- .../machankura/bennu}/compose/Platform.jvm.kt | 2 +- .../bennu}/compose/PlatformContext.jvm.kt | 10 +- .../builder/PlatformDatabaseBuilder.jvm.kt | 12 +- .../compose/extensions/JvmGlobalPrefs.kt | 2 +- .../bennu}/compose/extensions/Phoenix.jvm.kt | 2 +- .../network/PlatformHttpClientEngine.jvm.kt | 2 +- .../bennu}/compose/ui/theme/Motion.jvm.kt | 2 +- .../bennu}/compose/ui/theme/Theme.jvm.kt | 2 +- .../ui/view/model/NavigationViewModel.jvm.kt | 4 +- .../machankura/bennu}/desktop/Main.kt | 34 +- .../compose/database/BennuDatabaseJvmTest.kt} | 24 +- .../BroadcastNostrEventRequestDaoJvmTest.kt | 14 +- .../database/dao/ChatMessageDaoJvmTest.kt | 20 +- .../database/dao/ChatRoomDaoJvmTest.kt | 20 +- .../database/dao/DkgSessionDaoJvmTest.kt | 22 +- .../dao/FrostSigningSessionDaoJvmTest.kt | 28 +- .../dao/GroupSignedEventDaoJvmTest.kt | 26 +- .../compose/database/dao/MantraDaoJvmTest.kt | 26 +- .../database/dao/MarmotKeyPackageFixture.kt | 8 +- .../dao/MarmotKeyPackageIngestJvmTest.kt | 22 +- .../database/dao/MarmotOutboundDaoJvmTest.kt | 28 +- .../dao/MarmotOutboundQueueJvmTest.kt | 26 +- .../dao/MarmotPreJoinIndexingJvmTest.kt | 18 +- .../MarmotRetainedEpochSecretDaoJvmTest.kt | 18 +- .../compose/database/dao/NostrDaoJvmTest.kt | 24 +- .../database/dao/NostrEventDaoJvmTest.kt | 14 +- .../database/dao/NostrNip17DaoJvmTest.kt | 16 +- .../database/dao/OwnedRequestQueueJvmTest.kt | 22 +- .../dao/ReadOnlyGiftWrapDaoJvmTest.kt | 12 +- .../database/dao/SubgroupDaoJvmTest.kt | 22 +- ...onizeNostrEventRequestCompletionJvmTest.kt | 18 +- .../dao/UnsignedNostrEventQueueJvmTest.kt | 14 +- .../ChronicleRenameMigrationJvmTest.kt | 4 +- .../FrostSigningItemMigrationJvmTest.kt | 2 +- .../JoinedGroupAtMigrationJvmTest.kt | 4 +- .../database/model/MarmotSystemRowJvmTest.kt | 8 +- .../model/TranslationChunkApplyJvmTest.kt | 12 +- .../NostrEventFilterQueryExecutionTest.kt | 16 +- .../CurrentProfileKeyPackageJvmTest.kt | 18 +- .../DatabaseChatRepositoryJvmTest.kt | 24 +- .../FindDirectMessageRoomJvmTest.kt | 18 +- .../repository/ForgetLocalAccountJvmTest.kt | 12 +- .../SetUpProfileForExistingKeyJvmTest.kt | 12 +- .../repository/SignInToProfileTwiceJvmTest.kt | 12 +- .../identity/AddProfileFromInsideJvmTest.kt | 28 +- .../identity/CredentialParserJvmTest.kt | 4 +- .../compose/identity/ForgetIdentityJvmTest.kt | 4 +- .../compose/identity/IdentitySwitchJvmTest.kt | 32 +- .../compose/identity/IdentityWriterJvmTest.kt | 8 +- .../MultipleProfilesRoundTripJvmTest.kt | 44 +-- .../identity/NpubPreviewRoundTripJvmTest.kt | 36 +- .../identity/NsecRestoreRoundTripJvmTest.kt | 20 +- .../identity/SeedCredentialsJvmTest.kt | 6 +- .../compose/identity/StoredIdentityJvmTest.kt | 2 +- .../managers/ChapterBatchProposalJvmTest.kt | 34 +- .../compose/managers/ChronicleApplyJvmTest.kt | 62 ++-- .../managers/ChronicleAssemblyJvmTest.kt | 44 +-- .../managers/ConvergenceForkJvmTest.kt | 18 +- .../managers/CurrentProfileInteropJvmTest.kt | 18 +- .../managers/FrostSigningDeclineJvmTest.kt | 40 +-- .../managers/FrostSigningResendJvmTest.kt | 48 +-- .../compose/managers/GroupLifecycleJvmTest.kt | 24 +- .../managers/MarmotGroupCreationJvmTest.kt | 20 +- .../managers/MarmotGroupFactoryJvmTest.kt | 8 +- .../bennu}/compose/managers/MarmotStandIn.kt | 20 +- .../managers/PublishBeforeApplyJvmTest.kt | 28 +- .../managers/RobustRoomKeyCeremonyTest.kt | 22 +- .../managers/RoomMlsGroupStateStoreJvmTest.kt | 18 +- .../managers/SignedGroupKeyStateTest.kt | 52 +-- .../SubgroupCeremonyInParentRoomTest.kt | 44 +-- .../managers/SubgroupManagerJvmTest.kt | 36 +- .../TranslationBatchProposalJvmTest.kt | 46 +-- .../managers/WelcomeBundleMatchJvmTest.kt | 4 +- .../RelaysSocketManagerSwitchJvmTest.kt | 26 +- .../compose/ui/StringCatalogueJvmTest.kt | 18 +- .../AcceptCuratedSuggestionScreenJvmTest.kt | 42 +-- .../BroadcastGroupSignedEventScreenJvmTest.kt | 38 +-- .../ui/composable/ChatPaneLayoutJvmTest.kt | 26 +- .../ui/composable/ChatPaneSelectionJvmTest.kt | 32 +- .../ui/composable/ChatRoomMemberRowJvmTest.kt | 30 +- .../composable/CreateProfileScreenJvmTest.kt | 18 +- .../CuratedSuggestionListScreenJvmTest.kt | 46 +-- .../EditGroupCuratedSchemaScreenJvmTest.kt | 42 +-- .../GroupCuratedEntriesScreenJvmTest.kt | 42 +-- .../GroupCuratedSchemasScreenJvmTest.kt | 30 +- .../GroupKeyStateSheetLayoutJvmTest.kt | 16 +- .../GroupNostrProfileScreenJvmTest.kt | 26 +- .../ui/composable/GroupPostsScreenJvmTest.kt | 30 +- .../ui/composable/GroupRelaysScreenJvmTest.kt | 28 +- .../ui/composable/GroupSignedWorkFixtures.kt | 40 +-- .../composable/GroupSignedWorkRowsJvmTest.kt | 52 +-- .../composable/NavigateBackButtonJvmTest.kt | 24 +- .../composable/ProfilePreviewScreenJvmTest.kt | 42 +-- .../ui/composable/ProfilesScreenJvmTest.kt | 22 +- .../composable/ProposalListScreenJvmTest.kt | 30 +- .../ProposeGroupEventScreenJvmTest.kt | 18 +- .../ui/composable/ReadOnlyEntrancesJvmTest.kt | 50 +-- ...electCuratedSchemaTemplateScreenJvmTest.kt | 18 +- .../NavigationSuiteRenderJvmTest.kt | 20 +- .../widgets/ScreenStateTransitionJvmTest.kt | 8 +- .../widgets/buttons/ExtendedFabJvmTest.kt | 14 +- ...DirectMessageToNpubOrNip05DialogJvmTest.kt | 14 +- .../ui/theme/NavigationMotionJvmTest.kt | 8 +- .../ui/theme/ReadableContentLayoutJvmTest.kt | 6 +- ...AcceptCuratedSuggestionViewModelJvmTest.kt | 46 +-- ...oadcastGroupSignedEventViewModelJvmTest.kt | 40 +-- .../CuratedSuggestionListViewModelJvmTest.kt | 44 +-- .../EditGroupCuratedSchemaViewModelJvmTest.kt | 36 +- .../model/EditGroupRelaysViewModelJvmTest.kt | 18 +- .../GroupCuratedEntriesViewModelJvmTest.kt | 38 +-- .../model/NavigationIdentityRoutingJvmTest.kt | 20 +- .../view/model/NostrSecretViewModelJvmTest.kt | 14 +- .../model/ProfilePreviewViewModelJvmTest.kt | 40 +-- .../model/ProposalListViewModelJvmTest.kt | 28 +- .../model/SignInToProfileViewModelJvmTest.kt | 12 +- .../ui/view/model/SignOutViewModelJvmTest.kt | 10 +- docs/dead-code.md | 50 +-- docs/frost-batch-signing.md | 34 +- docs/frost-session-resend.md | 2 +- docs/jvm-target.md | 22 +- docs/long-running-sync.md | 8 +- docs/marmot-v2.md | 42 +-- docs/material-design-conformance.md | 55 +-- docs/member-chronicle.md | 28 +- docs/multiple-profiles.md | 50 +-- docs/npub-profile-preview.md | 56 ++-- docs/npub-sign-in.md | 58 ++-- docs/nsec-sign-in.md | 60 ++-- docs/scripts/m3-audit.sh | 2 +- docs/scripts/m3-extract-formatted.py | 4 +- docs/scripts/m3-extract-strings.py | 6 +- docs/scripts/m3-migrate-spacing.py | 6 +- docs/scripts/m3-spacing-positions.py | 2 +- docs/scripts/m3-title-case.py | 2 +- docs/scripts/m3-touch-targets.py | 2 +- docs/subgroups.md | 12 +- iosApp/Configuration/Config.xcconfig | 4 +- iosApp/iosApp.xcodeproj/project.pbxproj | 6 +- settings.gradle.kts | 2 +- 975 files changed, 7642 insertions(+), 7641 deletions(-) rename composeApp/schemas/{to.curare.compose.database.CurareDatabase => com.machankura.bennu.compose.database.BennuDatabase}/1.json (100%) rename composeApp/schemas/{to.curare.compose.database.CurareDatabase => com.machankura.bennu.compose.database.BennuDatabase}/10.json (100%) rename composeApp/schemas/{to.curare.compose.database.CurareDatabase => com.machankura.bennu.compose.database.BennuDatabase}/11.json (100%) rename composeApp/schemas/{to.curare.compose.database.CurareDatabase => com.machankura.bennu.compose.database.BennuDatabase}/12.json (100%) rename composeApp/schemas/{to.curare.compose.database.CurareDatabase => com.machankura.bennu.compose.database.BennuDatabase}/13.json (100%) rename composeApp/schemas/{to.curare.compose.database.CurareDatabase => com.machankura.bennu.compose.database.BennuDatabase}/14.json (100%) rename composeApp/schemas/{to.curare.compose.database.CurareDatabase => com.machankura.bennu.compose.database.BennuDatabase}/15.json (100%) rename composeApp/schemas/{to.curare.compose.database.CurareDatabase => com.machankura.bennu.compose.database.BennuDatabase}/16.json (100%) rename composeApp/schemas/{to.curare.compose.database.CurareDatabase => com.machankura.bennu.compose.database.BennuDatabase}/17.json (100%) rename composeApp/schemas/{to.curare.compose.database.CurareDatabase => com.machankura.bennu.compose.database.BennuDatabase}/18.json (100%) rename composeApp/schemas/{to.curare.compose.database.CurareDatabase => com.machankura.bennu.compose.database.BennuDatabase}/19.json (100%) rename composeApp/schemas/{to.curare.compose.database.CurareDatabase => com.machankura.bennu.compose.database.BennuDatabase}/2.json (100%) rename composeApp/schemas/{to.curare.compose.database.CurareDatabase => com.machankura.bennu.compose.database.BennuDatabase}/20.json (100%) rename composeApp/schemas/{to.curare.compose.database.CurareDatabase => com.machankura.bennu.compose.database.BennuDatabase}/21.json (100%) rename composeApp/schemas/{to.curare.compose.database.CurareDatabase => com.machankura.bennu.compose.database.BennuDatabase}/22.json (100%) rename composeApp/schemas/{to.curare.compose.database.CurareDatabase => com.machankura.bennu.compose.database.BennuDatabase}/23.json (100%) rename composeApp/schemas/{to.curare.compose.database.CurareDatabase => com.machankura.bennu.compose.database.BennuDatabase}/24.json (100%) rename composeApp/schemas/{to.curare.compose.database.CurareDatabase => com.machankura.bennu.compose.database.BennuDatabase}/25.json (100%) rename composeApp/schemas/{to.curare.compose.database.CurareDatabase => com.machankura.bennu.compose.database.BennuDatabase}/3.json (100%) rename composeApp/schemas/{to.curare.compose.database.CurareDatabase => com.machankura.bennu.compose.database.BennuDatabase}/4.json (100%) rename composeApp/schemas/{to.curare.compose.database.CurareDatabase => com.machankura.bennu.compose.database.BennuDatabase}/5.json (100%) rename composeApp/schemas/{to.curare.compose.database.CurareDatabase => com.machankura.bennu.compose.database.BennuDatabase}/6.json (100%) rename composeApp/schemas/{to.curare.compose.database.CurareDatabase => com.machankura.bennu.compose.database.BennuDatabase}/7.json (100%) rename composeApp/schemas/{to.curare.compose.database.CurareDatabase => com.machankura.bennu.compose.database.BennuDatabase}/8.json (100%) rename composeApp/schemas/{to.curare.compose.database.CurareDatabase => com.machankura.bennu.compose.database.BennuDatabase}/9.json (100%) rename composeApp/src/androidMain/kotlin/{to/curare/android/CurareApplication.kt => com/machankura/bennu/android/BennuApplication.kt} (91%) rename composeApp/src/androidMain/kotlin/{to/curare => com/machankura/bennu}/android/MainActivity.kt (87%) rename composeApp/src/androidMain/kotlin/{to/curare => com/machankura/bennu}/compose/AppVersion.android.kt (69%) rename composeApp/src/androidMain/kotlin/{to/curare => com/machankura/bennu}/compose/Platform.android.kt (59%) rename composeApp/src/androidMain/kotlin/{to/curare => com/machankura/bennu}/compose/PlatformContext.android.kt (72%) rename composeApp/src/androidMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/builder/PlatformDatabaseBuilder.android.kt (64%) rename composeApp/src/androidMain/kotlin/{to/curare => com/machankura/bennu}/compose/extensions/Phoenix.android.kt (88%) rename composeApp/src/androidMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/PlatformHttpClientEngine.android.kt (80%) rename composeApp/src/androidMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/theme/Motion.android.kt (98%) rename composeApp/src/androidMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/theme/Theme.android.kt (98%) rename composeApp/src/androidMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/NavigationViewModel.android.kt (89%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/AppLifecycle.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/AppVersion.kt (75%) rename composeApp/src/commonMain/kotlin/{to/curare/compose/CurareApp.kt => com/machankura/bennu/compose/BennuApp.kt} (79%) create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/BennuGlobal.kt create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/Platform.kt create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/PlatformContext.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/cryptography/Extensions.kt (76%) rename composeApp/src/commonMain/kotlin/{to/curare/compose/database/CurareDatabase.kt => com/machankura/bennu/compose/database/BennuDatabase.kt} (69%) create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/BennuDatabaseConstructor.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/builder/PlatformDatabaseBuilder.kt (53%) rename composeApp/src/commonMain/kotlin/{to/curare/compose/database/converters/CurareConverters.kt => com/machankura/bennu/compose/database/converters/BennuConverters.kt} (94%) create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/BroadcastNostrEventReceiptDao.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/BroadcastNostrEventRequestDao.kt (90%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/ChatMessageBroadcastNostrEventReceiptRelationDao.kt (57%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/ChatMessageBroadcastNostrEventRequestRelationDao.kt (79%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/ChatMessageDao.kt (84%) create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ChatMessageNostrEventRelationDao.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/ChatRoomDao.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/ConnectionDao.kt (54%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/DkgSessionDao.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/FrostSigningSessionDao.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/GiftWrapMessageDao.kt (69%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/GiftWrapPayloadDao.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/GiftWrapSealDao.kt (57%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/GroupKeyStateDao.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/GroupSignedEventDao.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/InReplyToRelationDao.kt (54%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MantraArtifactDao.kt (80%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MantraArtifactVersionDao.kt (83%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MantraChapterDao.kt (90%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MantraChunkDao.kt (82%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MantraDao.kt (87%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MantraDialectDao.kt (82%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MantraTranslationArtifactVersionContributorDao.kt (62%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MantraTranslationArtifactVersionDao.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MantraTranslationChapterContributorDao.kt (50%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MantraTranslationChapterDao.kt (85%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MantraTranslationChunkDao.kt (90%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MantraTranslationContributorDao.kt (60%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MantraTranslationDao.kt (68%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MarmotCommitResultDao.kt (77%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MarmotGroupEventDao.kt (76%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MarmotInnerEventDao.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MarmotKeyPackageBundleDao.kt (91%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MarmotKeyPackageDao.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MarmotOutboundDao.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MarmotPublishObligationDao.kt (80%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MarmotRetainedEpochSecretDao.kt (89%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MarmotRoutingDao.kt (90%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MentionDao.kt (51%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/NegentropySynchronizeRequestDao.kt (94%) create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NegentropySynchronizeResultDao.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/NostrDao.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/NostrEventDao.kt (85%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/NostrEventRelayDao.kt (70%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/NostrNip17Dao.kt (91%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/ParticipantDao.kt (84%) create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/PostDao.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/ProfileDao.kt (80%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/QuotedRelationDao.kt (55%) create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ReactionDao.kt create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/RecentSearchDao.kt create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/RelayDao.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/RepostedRelationDao.kt (56%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/SynchronizeNostrEventRequestDao.kt (76%) create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/SynchronizeNostrEventResultDao.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/UnsignedNostrEventDao.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/ZapDao.kt (72%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/migrations/ChronicleRenameMigration.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/migrations/DkgApprovalRequestMigration.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/migrations/FrostSigningItemMigration.kt (98%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/migrations/JoinedGroupAtMigration.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/BroadcastNostrEventReceipt.kt (83%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/BroadcastNostrEventRequest.kt (80%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/BroadcastStatus.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/ChatMessage.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/ChatMessageBroadcastNostrEventReceiptRelation.kt (83%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/ChatMessageBroadcastNostrEventRequestRelation.kt (83%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/ChatMessageNostrEventRelation.kt (83%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/ChatRoom.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/Connection.kt (72%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/DkgParticipantMessage.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/DkgSession.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/FrostSignerMessage.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/FrostSigningItem.kt (98%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/FrostSigningSession.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/GiftWrapMessage.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/GiftWrapPayload.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/GiftWrapSeal.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/GroupKeyState.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/GroupSignedEvent.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/InReplyToRelation.kt (84%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/MantraArtifact.kt (90%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/MantraArtifactVersion.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/MantraChapter.kt (89%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/MantraChunk.kt (90%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/MantraDialect.kt (89%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/MantraTranslation.kt (88%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/MantraTranslationArtifactVersion.kt (90%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/MantraTranslationArtifactVersionContributor.kt (85%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/MantraTranslationChapter.kt (91%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/MantraTranslationChapterContributor.kt (85%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/MantraTranslationChunk.kt (91%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/MantraTranslationChunkProposal.kt (90%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/MantraTranslationContributor.kt (91%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/MarmotCommitResult.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/MarmotGroupEvent.kt (77%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/MarmotInnerEvent.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/MarmotKeyPackage.kt (86%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/MarmotKeyPackageBundle.kt (90%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/MarmotPublishObligation.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/MarmotRetainedEpochSecret.kt (81%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/MarmotRouting.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/Mention.kt (77%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/NegentropySynchronizeRequest.kt (83%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/NegentropySynchronizeResult.kt (87%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/NostrEvent.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/NostrEventRelay.kt (76%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/Participant.kt (85%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/Post.kt (74%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/Profile.kt (83%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/QuotedRelation.kt (77%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/Reaction.kt (71%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/RecentSearch.kt (80%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/Relay.kt (81%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/RepostedRelation.kt (77%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/SynchronizeNostrEventRequest.kt (88%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/SynchronizeNostrEventResult.kt (78%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/UnsignedNostrEvent.kt (87%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/Zap.kt (79%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/intermdiate/ChatRoomLastMessage.kt (84%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/intermdiate/FrostSignerTally.kt (94%) create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalAccount.kt create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalBroadcastNostrEventRequest.kt create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalChatMessage.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/intermdiate/LocalChatRoom.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/intermdiate/LocalFrostSigningSession.kt (84%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/intermdiate/LocalInReplyToNostrEvent.kt (84%) create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalMention.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/intermdiate/LocalNostrEvent.kt (80%) create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalParticipant.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/intermdiate/LocalPost.kt (58%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/intermdiate/LocalProfile.kt (57%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/intermdiate/LocalProfileWithFollowers.kt (55%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/intermdiate/LocalProfileWithFollowing.kt (55%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/intermdiate/LocalQuotedNostrEvent.kt (81%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/intermdiate/LocalRepostedNostrEvent.kt (84%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/traits/BroadcastableEntity.kt (60%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/traits/LocalStoreEntity.kt (58%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/traits/NostrEventEntity.kt (65%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/traits/OptionalNostrEventEntity.kt (67%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/traits/ProfilePublicKeyEntity.kt (67%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/traits/ReplyingToEntity.kt (65%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/traits/SoftDeletableEntity.kt (59%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/traits/TimestampedEntity.kt (65%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/traits/UnsignedNostrEventEntity.kt (55%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/traits/UserViewableEntity.kt (59%) create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/typealiases/HexArray.kt create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/typealiases/KindArray.kt create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/typealiases/SynchronizationFilterArray.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/types/ChatRoomType.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/types/DkgApprovalStep.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/types/DkgRitualStage.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/types/FrostSigningStage.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/types/MarmotReindexReport.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/types/SynchronizationFilter.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/query/NostrEventFilterQuery.kt (98%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/repository/DatabaseChatRepository.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/repository/DatabaseDkgRepository.kt (87%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/repository/DatabaseFrostSigningRepository.kt (90%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/repository/DatabaseMantraRepository.kt (80%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/repository/DatabaseMarmotRepository.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/repository/DatabaseNostrRepository.kt (90%) create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabasePostRepository.kt create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseSearchRepository.kt create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/GiftWrapImpersonationException.kt create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/GiftWrapPayloadUnsupportedException.kt create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/GiftWrapSealDecryptionException.kt create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/GiftWrapUnsealException.kt create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/InvalidNostrPrivateKeyException.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/exceptions/MarmotCommitPendingException.kt (90%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/exceptions/MarmotConvergencePendingException.kt (91%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/exceptions/MarmotKeyPackageProfileException.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/exceptions/MarmotMissingChatGroupException.kt (71%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/exceptions/MarmotMissingKeyPackageBundleException.kt (72%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/exceptions/MarmotMissingKeyPackageEventIdException.kt (72%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/exceptions/MarmotMissingNostrGroupDataExtension.kt (71%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/exceptions/MarmotMissingRetainedExporterSecretsException.kt (72%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/exceptions/MarmotNotMemberOfChatGroupException.kt (71%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/exceptions/MarmotUnprocessableInnerEventException.kt (72%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/exceptions/MarmotUnsupportedWireFormatException.kt (71%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/exceptions/MarmotWelcomeMismatchedGroupIdException.kt (72%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/exceptions/MarmotWelcomeMissingGroupIdException.kt (71%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/exceptions/NetworkException.kt (50%) create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/NostrNoticeException.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/exceptions/NostrPublishException.kt (62%) create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/SignatureException.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/exceptions/SigningKeyNotFoundException.kt (73%) create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/SigningRejectedException.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/extensions/Credentials.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/extensions/Instant.kt (98%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/extensions/Member.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/extensions/MlsGroupExtensions.kt (78%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/extensions/Phoenix.kt (90%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/extensions/WalletManagerExtension.kt (88%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/identity/CredentialParser.kt (99%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/identity/ForgetIdentity.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/identity/Identity.kt (99%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/identity/IdentityWriter.kt (99%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/identity/NewProfileWriter.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/identity/SeedCredentials.kt (98%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/identity/StoredIdentity.kt (99%) create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/AuxDatabaseManager.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/managers/ChillDkgRitualManager.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/managers/ChronicleManager.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/managers/CommitOrdering.kt (98%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/managers/FrostSigningManager.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/managers/GroupKeyStateManager.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/managers/LiveSubscriptionManager.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/managers/MarmotEngine.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/managers/MarmotGroupCreation.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/managers/MarmotGroupFactory.kt (98%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/managers/MarmotGroupName.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/managers/MarmotInboundManager.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/managers/MarmotReindexSweep.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/managers/MarmotRoomIdentity.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/managers/MlsGroupCache.kt (98%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/managers/MlsGroupProfile.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/managers/RoomMlsGroupStateStore.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/managers/RoomPublishObligationStore.kt (76%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/managers/SharedKeyDerivation.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/managers/SubgroupManager.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/managers/TranslationScaffold.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/managers/WelcomeBundleMatch.kt (98%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/PlatformHttpClientEngine.kt (90%) create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/UserAgent.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/dto/RelayDTO.kt (86%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/relays/EventPublishTransport.kt (80%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/relays/FallbackRelays.kt (70%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/relays/LiveSubscriptionTransport.kt (89%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/relays/NostrPublishResult.kt (53%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/relays/RelayBackPressure.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/relays/RelayPool.kt (84%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/relays/RelaysSocketManager.kt (80%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/relays/broadcast/BroadcastEventResponse.kt (79%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/relays/broadcast/BroadcastRequestBody.kt (76%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/serialization/CommonJson.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/serialization/SocketsJson.kt (78%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/sockets/NostrIncomingMessage.kt (80%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/sockets/NostrIncomingMessageExt.kt (98%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/sockets/NostrIncomingMessageParser.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/sockets/NostrOutgoingMessageBuilder.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/sockets/NostrSocketClient.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/sockets/NostrSocketClientFactory.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/sockets/NostrSocketClientImpl.kt (99%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/sockets/NostrVerb.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/sockets/ReconnectBackoff.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/sockets/SocketConnectionCallbacks.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/CuratedSuggestion.kt (91%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/DirectMessagePeerSync.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/GroupCuratedEntry.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/GroupCuratedSchema.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/GroupEventProposal.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/GroupNostrProfile.kt (98%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/GroupPost.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/GroupRelayList.kt (99%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/MarmotDelivery.kt (87%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/MarmotDirectMessage.kt (99%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/MarmotProfile.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/MemberProfileSync.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/Nip17Filters.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/Relays.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/SignInSync.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/chronicle/ChronicleEvent.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/chronicle/ChronicleRequestEvent.kt (98%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/chronicle/tags/ChronicleIdTag.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/chronicle/tags/ChroniclePageTag.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/chronicle/tags/ChronicleRecipientTag.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/curated/CuratedEntryEvent.kt (99%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/curated/CuratedSchema.kt (99%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/curated/CuratedSchemaEvent.kt (99%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/curated/CuratedSchemaTemplate.kt (99%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/dkg/DkgRitualEvents.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/dkg/tags/DkgSessionIdTag.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/dkg/tags/DkgThresholdTag.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/frost/FrostSigningEvents.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/frost/GroupKeyStateEvent.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/frost/tags/FrostDerivationPathTag.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/frost/tags/FrostKeyTag.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/frost/tags/FrostSessionIdTag.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/frost/tags/FrostSignerIdsTag.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/frost/tags/FrostSilentMembersTag.kt (98%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/ArtifactEvent.kt (86%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/ArtifactVersionEvent.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/ChapterEvent.kt (85%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/ChunkEvent.kt (91%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/DialectEvent.kt (85%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/SubmissionEvent.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/TranslationArtifactVersionContributorListEvent.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/TranslationArtifactVersionEvent.kt (83%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/TranslationChapterContributorListEvent.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/TranslationChapterEvent.kt (86%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/TranslationChunkEvent.kt (83%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/TranslationChunkProposalEvent.kt (83%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/TranslationContributorListEvent.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/TranslationEvent.kt (87%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/tags/ArtifactIdTag.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/tags/ArtifactVersionIdTag.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/tags/ArtifactVersionMetadataTag.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/tags/ChapterIdTag.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/tags/ChunkIdTag.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/tags/ContributorTag.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/tags/CountryTag.kt (91%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/tags/DialectIdTag.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/tags/IndexTag.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/tags/LanguageTag.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/tags/LicenseTag.kt (91%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/tags/NameTag.kt (91%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/tags/OriginalTextTag.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/tags/PayloadIdTag.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/tags/PayloadKindTag.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/tags/TranslationArtifactVersionIdTag.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/tags/TranslationChapterIdTag.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/tags/TranslationChunkIdTag.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/tags/TranslationIdTag.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/tags/UrlTag.kt (91%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/tags/VisibilityTag.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/tags/WordStatisticsTag.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/subgroup/SubgroupBirthCertificateEvent.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/subgroup/SubgroupParentage.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/subgroup/tags/SubgroupBirthCertificateTag.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/subgroup/tags/SubgroupKeyTag.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/subgroup/tags/SubgroupParentTag.kt (97%) create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/CachingImportRepository.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/repository/ChatRepository.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/repository/DkgRepository.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/repository/FrostSigningRepository.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/repository/MantraRepository.kt (86%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/repository/MarmotRepository.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/repository/NostrNotaryRepository.kt (64%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/repository/NostrPublisherRepository.kt (64%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/repository/NostrRepository.kt (91%) create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/PostRepository.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/repository/ProfilesOf.kt (89%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/repository/RelayRepository.kt (55%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/repository/SearchRepository.kt (52%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/text/Markdown.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/text/ProposedEvent.kt (91%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/BlurHashDecoder.kt (98%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/AcceptCuratedSuggestionScreen.kt (87%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/ActiveProfileScreen.kt (87%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/AddArtifactScreen.kt (87%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/AddChapterScreen.kt (87%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/AddDialectScreen.kt (88%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/AddGroupPostScreen.kt (87%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt (84%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/AddTranslationArtifactVersionScreen.kt (88%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/ArtifactDetailScreen.kt (87%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/BroadcastGroupSignedEventScreen.kt (89%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/ChapterDetailScreen.kt (86%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/ChatRoomCreationScreen.kt (85%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/ChatRoomDetailScreen.kt (91%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/ChatRoomMessagingScreen.kt (89%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/CreateProfileScreen.kt (88%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/CuratedSuggestionListScreen.kt (88%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/DkgApprovalScaffold.kt (91%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/DkgJoinApprovalScreen.kt (89%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/DkgRitualScreen.kt (89%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/DkgRound1ApprovalScreen.kt (87%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/DkgRound2ApprovalScreen.kt (86%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/EditGroupCuratedSchemaScreen.kt (86%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/EditGroupNostrProfileScreen.kt (86%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/EditGroupRelaysScreen.kt (88%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/FrostSigningScreen.kt (90%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/GroupCuratedEntriesScreen.kt (85%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/GroupCuratedSchemasScreen.kt (88%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/GroupNostrProfileScreen.kt (86%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/GroupPostsScreen.kt (85%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/GroupRelaysScreen.kt (85%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/HomeScreen.kt (89%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/ImplementationPendingScreen.kt (81%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/KeyPackageManagementScreen.kt (87%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/KeyRecoveryScreen.kt (85%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/LandingScreen.kt (80%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/LoadingScreen.kt (70%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/NostrEventDetailScreen.kt (83%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/NostrSecretScreen.kt (86%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/ProfilePreviewScreen.kt (85%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/ProfilesScreen.kt (77%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/ProposalListScreen.kt (89%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/ProposeGroupEventScreen.kt (86%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/RecoveryPhraseScreen.kt (89%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt (87%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/SearchResultScreen.kt (88%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/SearchScreen.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/SelectChatRoomMembersScreen.kt (88%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/SelectChatRoomTypeScreen.kt (90%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/SelectCuratedSchemaTemplateScreen.kt (85%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/SelectSubgroupAdminsScreen.kt (86%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/ShareProfileScreen.kt (86%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/SignInScreen.kt (81%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/SocialPreconditionScreen.kt (81%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/SovereignWalletStartupScreen.kt (90%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/TranslateChunkScreen.kt (86%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/TranslationArtifactVersionDetailScreen.kt (88%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/TranslationChapterScreen.kt (89%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/UnannouncedProfileScreen.kt (79%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/UnindexedProfileScreen.kt (79%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/UnqueuedProfileScreen.kt (79%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/UnqueuedProfileSynchronizationScreen.kt (73%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/UnsignedProfileScreen.kt (78%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/UnsyncedProfileScreen.kt (83%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/WriteNewNoteScreen.kt (86%) rename composeApp/src/commonMain/kotlin/{to/curare/compose/ui/composable/navigation/CurareNavHost.kt => com/machankura/bennu/compose/ui/composable/navigation/BennuNavHost.kt} (86%) rename composeApp/src/commonMain/kotlin/{to/curare/compose/ui/composable/navigation/CurareNavigationSuite.kt => com/machankura/bennu/compose/ui/composable/navigation/BennuNavigationSuite.kt} (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/TopLevelDestination.kt (85%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/AcceptCuratedSuggestionRoute.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/ActiveProfileRoute.kt (66%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/AddArtifactRoute.kt (72%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/AddChapterRoute.kt (75%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/AddDialectRoute.kt (76%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/AddGroupPostRoute.kt (76%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/AddMemberToChatRoomConfirmationRoute.kt (80%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/AddTranslationRoute.kt (76%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/ArtifactDetailRoute.kt (76%) create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/AuthenticatedProfileRoute.kt create mode 100755 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/BlankRoute.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/BroadcastGroupSignedEventRoute.kt (83%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/ChapterDetailRoute.kt (76%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/ChatRoomCreationRoute.kt (62%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/ChatRoomDetailRoute.kt (73%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/ChatRoomMessagingRoute.kt (73%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/CreateProfileRoute.kt (87%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/CuratedSuggestionListRoute.kt (90%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/DkgJoinApprovalRoute.kt (89%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/DkgRitualRoute.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/DkgRound1ApprovalRoute.kt (89%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/DkgRound2ApprovalRoute.kt (90%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/EditGroupCuratedSchemaRoute.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/EditGroupNostrProfileRoute.kt (77%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/EditGroupRelaysRoute.kt (76%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/FrostSigningRoute.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/GroupCuratedEntriesRoute.kt (88%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/GroupCuratedSchemasRoute.kt (88%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/GroupNostrProfileRoute.kt (91%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/GroupPostsRoute.kt (85%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/GroupRelaysRoute.kt (86%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/HomeRoute.kt (59%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/ImplementationPendingRoute.kt (59%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/KeyPackageManagementRoute.kt (67%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/KeyRecoveryRoute.kt (66%) create mode 100755 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/LandingRoute.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/LoadingRoute.kt (58%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/NostrEventDetailRoute.kt (66%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/NostrSecretRoute.kt (74%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/ProfilePreviewRoute.kt (89%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/ProfilesRoute.kt (83%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/ProposalDestination.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/ProposalListRoute.kt (89%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/ProposeGroupEventRoute.kt (81%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/RecoveryPhraseRoute.kt (58%) create mode 100755 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/Route.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/SearchMemberToAddToChatRoomRoute.kt (74%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/SearchResultRoute.kt (65%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/SearchRoute.kt (60%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/SelectChatRoomMembersRoute.kt (85%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/SelectChatRoomTypeRoute.kt (87%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/SelectCuratedSchemaTemplateRoute.kt (90%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/SelectSubgroupAdminsRoute.kt (90%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/ShareProfileRoute.kt (66%) create mode 100755 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SignInRoute.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/SocialPreconditionRoute.kt (61%) create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SovereignWalletStartupRoute.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/TranslateChunkRoute.kt (78%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/TranslationArtifactVersionDetailRoute.kt (78%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/TranslationChapterRoute.kt (77%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/UnannouncedProfileRoute.kt (61%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/UnindexedProfileRoute.kt (60%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/UnqueuedProfileRoute.kt (60%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/UnqueuedProfileSynchronizationRoute.kt (68%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/UnsignedProfileRoute.kt (61%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/UnsyncedProfileRoute.kt (59%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/WriteNewNoteRoute.kt (72%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/DetailRow.kt (86%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/LoadingDataIndicator.kt (91%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/NavigateBackButton.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/QRCodeView.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/RelayOutcomeLabel.kt (66%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/ScreenState.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/Semantics.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/SigningCapability.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/Snackbars.kt (98%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/buttons/BroadcastButton.kt (82%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/buttons/Clickable.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/buttons/ExtendedFab.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/chat/ChatTranscript.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/coil/forwardingPainter.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/content/ArticleCard.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/content/Constants.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/content/ContentParser.kt (99%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/content/ContentSegment.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/content/FullScreenImageViewer.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/content/Helpers.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/content/ImageWithContextMenu.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/content/InvoicePayState.kt (51%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/content/LightningInvoiceCard.kt (91%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/content/LinkPreview.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/content/LiveStreamCard.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/content/LiveStreamCardContent.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/content/LoadingAsyncImage.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/content/MediaMeta.kt (68%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/content/NoteActions.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/content/OgData.kt (66%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/content/QuotedAddressableNote.kt (88%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/content/QuotedNote.kt (87%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/content/RichContent.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/content/UnsupportedKindBadge.kt (81%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/detail/MetadataEventDetail.kt (89%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/detail/TextNoteEventDetail.kt (86%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/dialogs/BottomSheetDialog.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/dialogs/NewChatBottomSheetDialog.kt (90%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/dialogs/SignOutOfReadOnlyDialog.kt (76%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05Dialog.kt (90%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/feed/EventListView.kt (79%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/feed/TextNoteFeedItem.kt (79%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/profile/ProfileAvatar.kt (84%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/profile/ProfileColor.kt (74%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/wallet/AddProfileRows.kt (86%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/wallet/RememberProfilesOf.kt (76%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/wallet/WalletAvatar.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/wallet/WalletsSelector.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/theme/Breakpoint.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/theme/Color.kt (99%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/theme/ConformancePreviews.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/theme/Motion.kt (98%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/theme/Panes.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/theme/ReadableMeasure.kt (98%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/theme/Shape.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/theme/Spacing.kt (98%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/theme/Theme.kt (99%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/theme/ThemeGallery.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/theme/Type.kt (98%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/AcceptCuratedSuggestionViewModel.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/ActiveProfileViewModel.kt (67%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/AddArtifactViewModel.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/AddChapterViewModel.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/AddDialectViewModel.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/AddGroupPostViewModel.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/AddMemberToChatRoomConfirmationViewModel.kt (89%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/AddTranslationArtifactVersionViewModel.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/ArtifactDetailViewModel.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/BroadcastGroupSignedEventViewModel.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/ChapterDetailViewModel.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/ChatMessageListViewModel.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/ChatRoomCreationViewModel.kt (87%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/ChatRoomDetailViewModel.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/ChatRoomListViewModel.kt (90%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/ChatRoomMessagingViewModel.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/CreateProfileViewModel.kt (91%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/CuratedSuggestionListViewModel.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/DkgRitualViewModel.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/EditGroupCuratedSchemaViewModel.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/EditGroupNostrProfileViewModel.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/EditGroupRelaysViewModel.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/FeedListViewModel.kt (82%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/FollowersListViewModel.kt (74%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/FollowingListViewModel.kt (74%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/FrostSigningViewModel.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/GroupCuratedEntriesViewModel.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/GroupCuratedSchemasViewModel.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/GroupNostrProfileViewModel.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/GroupPostsViewModel.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/GroupRelaysViewModel.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/HomeViewModel.kt (88%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/InReplyToViewModel.kt (73%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/KeyPackageManagementViewModel.kt (91%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/MetadataEventDetailViewModel.kt (84%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/NavigationViewModel.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/NewProfileWriters.kt (86%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/NostrEventDetailViewModel.kt (71%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/NostrSecretViewModel.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/NotaryViewModel.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/ProfilePreviewViewModel.kt (90%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/ProfilesViewModel.kt (91%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/ProposalListViewModel.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/ProposeGroupEventViewModel.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/RecoveryPhraseViewModel.kt (97%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/SearchMemberToAddToChatRoomViewModel.kt (89%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/SearchResultViewModel.kt (84%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/SearchViewModel.kt (64%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/SelectChatRoomMembersViewModel.kt (88%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/SelectChatRoomTypeViewModel.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/SelectSubgroupAdminsViewModel.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/ShareProfileViewModel.kt (85%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/SignInToProfileViewModel.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/SignOutViewModel.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/SovereignWalletStartupViewModel.kt (91%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/SovereignWalletViewModel.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/SynchronizationViewModel.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/TranslateChunkViewModel.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/TranslationArtifactVersionDetailViewModel.kt (91%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/TranslationChapterViewModel.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/UnqueuedProfileSynchronizationViewModel.kt (88%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/UnsyncedProfileViewModel.kt (93%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/WriteNewNoteViewModel.kt (71%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/AcceptCuratedSuggestionUIState.kt (81%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/ActiveProfileUIState.kt (60%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/AddArtifactUIState.kt (74%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/AddChapterUIState.kt (76%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/AddDialectUIState.kt (79%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/AddGroupPostUIState.kt (84%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/AddMemberToChatRoomConfirmationUIState.kt (61%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/AddTranslationArtifactVersionUIState.kt (80%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/ArtifactDetailUIState.kt (58%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/BroadcastGroupSignedEventUIState.kt (78%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/ChapterDetailUIState.kt (63%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/ChatMessageListUIState.kt (65%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/ChatRoomDetailUIState.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/ChatRoomListUIState.kt (54%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/ChatRoomMessagingUIState.kt (72%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/CreateProfileUIState.kt (74%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/CuratedSuggestionListUIState.kt (85%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/DkgRitualUIState.kt (92%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/EditGroupCuratedSchemaUIState.kt (89%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/EditGroupNostrProfileUIState.kt (85%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/EditGroupRelaysUIState.kt (85%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/FeedListUIState.kt (51%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/FollowersListUIState.kt (58%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/FollowingListUIState.kt (58%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/FrostSigningUIState.kt (90%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/GroupCuratedEntriesUIState.kt (83%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/GroupCuratedSchemasUIState.kt (84%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/GroupNostrProfileUIState.kt (85%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/GroupPostsUIState.kt (84%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/GroupRelaysUIState.kt (83%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/HomeScreenUIState.kt (51%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/KeyPackageManagementUIState.kt (72%) create mode 100755 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/MetadataEventDetailUIState.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/NavigationUIState.kt (54%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/NostrEventDetailUIState.kt (62%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/NostrSecretUIState.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/ProfilePreviewUIState.kt (91%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/ProfilesUIState.kt (86%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/ProposalFilter.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/ProposalListUIState.kt (96%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/ProposalState.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/ProposeGroupEventUIState.kt (84%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/RecoveryPhraseUIState.kt (95%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/SearchMemberToAddToChatRoomUIState.kt (65%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/SearchResultListUIState.kt (55%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/SearchUIState.kt (56%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/SelectChatRoomMembersUIState.kt (72%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/SelectChatRoomTypeUIState.kt (75%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/SelectSubgroupAdminsUIState.kt (87%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/ShareProfileUIState.kt (60%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/SignInToProfileUIState.kt (88%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/SovereignWalletUIState.kt (86%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/StartupChoice.kt (94%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/TranslateChunkUIState.kt (76%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/TranslationArtifactVersionDetailUIState.kt (82%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/TranslationChapterUIState.kt (79%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/UnsyncedProfileUIState.kt (89%) create mode 100644 composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/WriteNewNoteUIState.kt rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/form/ChatRoomCreationFormState.kt (72%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/form/CreateProfileFormState.kt (71%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/form/SignInToProfileFormState.kt (62%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/form/TextFieldForm.kt (84%) rename composeApp/src/commonMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/form/WriteNewNoteFormState.kt (61%) delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/CurareGlobal.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/Platform.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/PlatformContext.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/CurareDatabaseConstructor.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/BroadcastNostrEventReceiptDao.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatMessageNostrEventRelationDao.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NegentropySynchronizeResultDao.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/PostDao.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ReactionDao.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/RecentSearchDao.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/RelayDao.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/SynchronizeNostrEventResultDao.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalAccount.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalBroadcastNostrEventRequest.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalChatMessage.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalMention.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalParticipant.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/model/typealiases/HexArray.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/model/typealiases/KindArray.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/model/typealiases/SynchronizationFilterArray.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabasePostRepository.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseSearchRepository.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/GiftWrapImpersonationException.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/GiftWrapPayloadUnsupportedException.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/GiftWrapSealDecryptionException.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/GiftWrapUnsealException.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/InvalidNostrPrivateKeyException.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/NostrNoticeException.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/SignatureException.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/SigningRejectedException.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/managers/AuxDatabaseManager.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/network/UserAgent.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/repository/CachingImportRepository.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/repository/PostRepository.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AuthenticatedProfileRoute.kt delete mode 100755 composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/BlankRoute.kt delete mode 100755 composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/LandingRoute.kt delete mode 100755 composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/Route.kt delete mode 100755 composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SignInRoute.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SovereignWalletStartupRoute.kt delete mode 100755 composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/MetadataEventDetailUIState.kt delete mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/WriteNewNoteUIState.kt rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/ComposeAppCommonTest.kt (80%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/ChatRoomMembershipWindowTest.kt (98%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/GiftWrapMessageTest.kt (99%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/MarmotChatLineReconciliationTest.kt (99%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/MarmotCommitResultMappingTest.kt (99%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/MarmotGroupEventRoomFilterTest.kt (98%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/RumorIdAgreementTest.kt (90%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/TranscriptRequestStateTest.kt (99%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/intermdiate/ChatRoomLastMessagePreviewTest.kt (96%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/query/NostrEventFilterQueryTest.kt (97%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/extensions/ChatListTimestampTest.kt (98%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/ChillDkgRitualOrderingTest.kt (98%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/FrostSigningRoundTest.kt (98%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/GroupKeyStateTest.kt (98%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/LiveInstanceCacheTest.kt (99%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/LiveSubscriptionPlanTest.kt (85%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/LiveSubscriptionReconcileTest.kt (95%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/MarmotGroupNameTest.kt (97%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/MarmotMip03CarveOutTest.kt (97%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/MarmotReindexSweepTest.kt (99%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/MarmotRoomIdentityTest.kt (97%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/SharedKeyDerivationTest.kt (97%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/SignedArtifactTest.kt (96%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/SignedChapterTest.kt (97%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/TranslationScaffoldTest.kt (93%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/network/relays/RelayBackPressureTest.kt (97%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/network/relays/RelayPoolSubscriptionTest.kt (95%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/network/sockets/ReconnectBackoffTest.kt (97%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/CuratedSuggestionTest.kt (90%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/DirectMessagePeerSyncTest.kt (96%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/GroupCuratedEntryTest.kt (94%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/GroupCuratedSchemaTest.kt (95%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/GroupEventProposalTest.kt (97%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/GroupNostrProfileTest.kt (98%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/GroupPostTest.kt (98%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/GroupRelayListTest.kt (98%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/MarmotAppPayloadTest.kt (98%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/MarmotDeliveryTest.kt (97%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/MarmotDirectMessageDeliveryTest.kt (99%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/MarmotDirectMessageTest.kt (99%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/MarmotPayloadBoundsTest.kt (96%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/MemberProfileSyncTest.kt (92%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/Nip17FiltersTest.kt (94%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/SignInSyncTest.kt (98%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/chronicle/ChronicleEventTest.kt (93%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/chronicle/ChronicleRoundTripTest.kt (92%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/curated/CuratedEntryEventTest.kt (99%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/curated/CuratedSchemaEventTest.kt (99%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/curated/CuratedSchemaTemplateTest.kt (99%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/frost/FrostProposalCodecTest.kt (98%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/frost/FrostSilentMembersTagTest.kt (96%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/ArtifactEventTest.kt (97%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/ChapterChunkSplitTest.kt (97%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/InitialArtifactVersionTest.kt (97%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/nip30303/SubmissionEventTest.kt (98%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/nostr/subgroup/SubgroupBirthCertificateEventTest.kt (99%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/text/ProposedEventTest.kt (96%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/NavigationSuiteTest.kt (92%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/routes/ProposalDestinationTest.kt (98%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/theme/AppColorSchemeSelectionTest.kt (98%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/theme/BreakpointTest.kt (99%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/theme/ColorSchemeContrastTest.kt (99%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/theme/PanesTest.kt (98%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/theme/ReadableMeasureTest.kt (98%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/theme/SpacingScaleTest.kt (99%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/NavigationRoutingTest.kt (93%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/UnsyncedProfileDecisionTest.kt (87%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/FrostSigningMembersTest.kt (91%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/FrostSigningResendStateTest.kt (91%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/ProposalAskAgainTest.kt (95%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/ProposalFilterTest.kt (96%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/ProposalProgressTest.kt (97%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/ProposalStateTest.kt (95%) rename composeApp/src/commonTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/state/StartupChoiceTest.kt (95%) rename composeApp/src/iosMain/kotlin/{to/curare => com/machankura/bennu}/compose/AppVersion.ios.kt (91%) rename composeApp/src/iosMain/kotlin/{to/curare => com/machankura/bennu}/compose/MainViewController.kt (84%) rename composeApp/src/iosMain/kotlin/{to/curare => com/machankura/bennu}/compose/Platform.ios.kt (67%) create mode 100644 composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/PlatformContext.ios.kt rename composeApp/src/iosMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/builder/PlatformDatabaseBuilder.ios.kt (76%) rename composeApp/src/iosMain/kotlin/{to/curare => com/machankura/bennu}/compose/extensions/Phoenix.ios.kt (95%) rename composeApp/src/iosMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/PlatformHttpClientEngine.ios.kt (80%) rename composeApp/src/iosMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/theme/Motion.ios.kt (97%) rename composeApp/src/iosMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/theme/Theme.ios.kt (98%) rename composeApp/src/iosMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/NavigationViewModel.ios.kt (97%) delete mode 100644 composeApp/src/iosMain/kotlin/to/curare/compose/PlatformContext.ios.kt rename composeApp/src/jvmMain/kotlin/{to/curare => com/machankura/bennu}/compose/AppVersion.jvm.kt (94%) rename composeApp/src/jvmMain/kotlin/{to/curare => com/machankura/bennu}/compose/Platform.jvm.kt (81%) rename composeApp/src/jvmMain/kotlin/{to/curare => com/machankura/bennu}/compose/PlatformContext.jvm.kt (89%) rename composeApp/src/jvmMain/kotlin/{to/curare => com/machankura/bennu}/compose/database/builder/PlatformDatabaseBuilder.jvm.kt (66%) rename composeApp/src/jvmMain/kotlin/{to/curare => com/machankura/bennu}/compose/extensions/JvmGlobalPrefs.kt (96%) rename composeApp/src/jvmMain/kotlin/{to/curare => com/machankura/bennu}/compose/extensions/Phoenix.jvm.kt (97%) rename composeApp/src/jvmMain/kotlin/{to/curare => com/machankura/bennu}/compose/network/PlatformHttpClientEngine.jvm.kt (80%) rename composeApp/src/jvmMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/theme/Motion.jvm.kt (95%) rename composeApp/src/jvmMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/theme/Theme.jvm.kt (98%) rename composeApp/src/jvmMain/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/NavigationViewModel.jvm.kt (94%) rename composeApp/src/jvmMain/kotlin/{to/curare => com/machankura/bennu}/desktop/Main.kt (88%) rename composeApp/src/jvmTest/kotlin/{to/curare/compose/database/CurareDatabaseJvmTest.kt => com/machankura/bennu/compose/database/BennuDatabaseJvmTest.kt} (90%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/BroadcastNostrEventRequestDaoJvmTest.kt (94%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/ChatMessageDaoJvmTest.kt (94%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/ChatRoomDaoJvmTest.kt (90%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/DkgSessionDaoJvmTest.kt (93%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/FrostSigningSessionDaoJvmTest.kt (95%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/GroupSignedEventDaoJvmTest.kt (93%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MantraDaoJvmTest.kt (90%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MarmotKeyPackageFixture.kt (96%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MarmotKeyPackageIngestJvmTest.kt (91%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MarmotOutboundDaoJvmTest.kt (94%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MarmotOutboundQueueJvmTest.kt (93%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MarmotPreJoinIndexingJvmTest.kt (91%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/MarmotRetainedEpochSecretDaoJvmTest.kt (92%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/NostrDaoJvmTest.kt (94%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/NostrEventDaoJvmTest.kt (96%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/NostrNip17DaoJvmTest.kt (95%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/OwnedRequestQueueJvmTest.kt (88%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/ReadOnlyGiftWrapDaoJvmTest.kt (95%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/SubgroupDaoJvmTest.kt (94%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/SynchronizeNostrEventRequestCompletionJvmTest.kt (81%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/dao/UnsignedNostrEventQueueJvmTest.kt (95%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/migrations/ChronicleRenameMigrationJvmTest.kt (98%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/migrations/FrostSigningItemMigrationJvmTest.kt (99%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/migrations/JoinedGroupAtMigrationJvmTest.kt (98%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/MarmotSystemRowJvmTest.kt (87%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/model/TranslationChunkApplyJvmTest.kt (96%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/query/NostrEventFilterQueryExecutionTest.kt (95%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/repository/CurrentProfileKeyPackageJvmTest.kt (95%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/repository/DatabaseChatRepositoryJvmTest.kt (84%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/repository/FindDirectMessageRoomJvmTest.kt (87%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/repository/ForgetLocalAccountJvmTest.kt (84%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/repository/SetUpProfileForExistingKeyJvmTest.kt (87%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/database/repository/SignInToProfileTwiceJvmTest.kt (83%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/identity/AddProfileFromInsideJvmTest.kt (88%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/identity/CredentialParserJvmTest.kt (98%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/identity/ForgetIdentityJvmTest.kt (97%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/identity/IdentitySwitchJvmTest.kt (91%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/identity/IdentityWriterJvmTest.kt (98%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/identity/MultipleProfilesRoundTripJvmTest.kt (89%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/identity/NpubPreviewRoundTripJvmTest.kt (90%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/identity/NsecRestoreRoundTripJvmTest.kt (91%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/identity/SeedCredentialsJvmTest.kt (97%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/identity/StoredIdentityJvmTest.kt (99%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/ChapterBatchProposalJvmTest.kt (89%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/ChronicleApplyJvmTest.kt (94%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/ChronicleAssemblyJvmTest.kt (94%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/ConvergenceForkJvmTest.kt (95%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/CurrentProfileInteropJvmTest.kt (92%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/FrostSigningDeclineJvmTest.kt (93%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/FrostSigningResendJvmTest.kt (97%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/GroupLifecycleJvmTest.kt (92%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/MarmotGroupCreationJvmTest.kt (94%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/MarmotGroupFactoryJvmTest.kt (95%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/MarmotStandIn.kt (90%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/PublishBeforeApplyJvmTest.kt (91%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/RobustRoomKeyCeremonyTest.kt (96%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/RoomMlsGroupStateStoreJvmTest.kt (87%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/SignedGroupKeyStateTest.kt (97%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/SubgroupCeremonyInParentRoomTest.kt (93%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/SubgroupManagerJvmTest.kt (96%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/TranslationBatchProposalJvmTest.kt (92%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/managers/WelcomeBundleMatchJvmTest.kt (97%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/network/relays/RelaysSocketManagerSwitchJvmTest.kt (89%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/StringCatalogueJvmTest.kt (86%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/AcceptCuratedSuggestionScreenJvmTest.kt (87%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/BroadcastGroupSignedEventScreenJvmTest.kt (88%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/ChatPaneLayoutJvmTest.kt (86%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/ChatPaneSelectionJvmTest.kt (89%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/ChatRoomMemberRowJvmTest.kt (80%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/CreateProfileScreenJvmTest.kt (77%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/CuratedSuggestionListScreenJvmTest.kt (90%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/EditGroupCuratedSchemaScreenJvmTest.kt (90%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/GroupCuratedEntriesScreenJvmTest.kt (87%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/GroupCuratedSchemasScreenJvmTest.kt (88%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/GroupKeyStateSheetLayoutJvmTest.kt (91%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/GroupNostrProfileScreenJvmTest.kt (85%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/GroupPostsScreenJvmTest.kt (85%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/GroupRelaysScreenJvmTest.kt (83%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/GroupSignedWorkFixtures.kt (85%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/GroupSignedWorkRowsJvmTest.kt (86%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/NavigateBackButtonJvmTest.kt (85%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/ProfilePreviewScreenJvmTest.kt (85%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/ProfilesScreenJvmTest.kt (92%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/ProposalListScreenJvmTest.kt (96%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/ProposeGroupEventScreenJvmTest.kt (89%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/ReadOnlyEntrancesJvmTest.kt (90%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/SelectCuratedSchemaTemplateScreenJvmTest.kt (87%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/navigation/NavigationSuiteRenderJvmTest.kt (91%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/ScreenStateTransitionJvmTest.kt (91%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/buttons/ExtendedFabJvmTest.kt (93%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05DialogJvmTest.kt (89%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/theme/NavigationMotionJvmTest.kt (95%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/theme/ReadableContentLayoutJvmTest.kt (98%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/AcceptCuratedSuggestionViewModelJvmTest.kt (92%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/BroadcastGroupSignedEventViewModelJvmTest.kt (92%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/CuratedSuggestionListViewModelJvmTest.kt (90%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/EditGroupCuratedSchemaViewModelJvmTest.kt (94%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/EditGroupRelaysViewModelJvmTest.kt (94%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/GroupCuratedEntriesViewModelJvmTest.kt (89%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/NavigationIdentityRoutingJvmTest.kt (94%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/NostrSecretViewModelJvmTest.kt (91%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/ProfilePreviewViewModelJvmTest.kt (90%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/ProposalListViewModelJvmTest.kt (97%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/SignInToProfileViewModelJvmTest.kt (94%) rename composeApp/src/jvmTest/kotlin/{to/curare => com/machankura/bennu}/compose/ui/view/model/SignOutViewModelJvmTest.kt (93%) diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts index 59f28b5d..7c1fa1d4 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 to.curare touches them. Generating + // identical copy of the .sq sources, and nothing under com.machankura.bennu 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. } @@ -184,7 +184,7 @@ tasks.withType().configureEa } android { - namespace = "to.curare.android" + namespace = "com.machankura.bennu.android" compileSdk = libs.versions.android.compileSdk.get().toInt() buildFeatures { @@ -194,8 +194,8 @@ android { // 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" + // relative `android:name=".BennuApplication"` resolve against this same package. + applicationId = "com.machankura.bennu.android" minSdk = libs.versions.android.minSdk.get().toInt() targetSdk = libs.versions.android.targetSdk.get().toInt() versionCode = 9 @@ -272,7 +272,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/to/curare/compose/ui") + .dir("composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui") val projectDirectory = rootProject.layout.projectDirectory.asFile inputs.file(script).withPropertyName("auditScript") @@ -315,11 +315,11 @@ tasks.named("check") { dependsOn(m3Audit) } compose.desktop { application { - mainClass = "to.curare.desktop.MainKt" + mainClass = "com.machankura.bennu.desktop.MainKt" nativeDistributions { targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb) - packageName = "to.curare.desktop" + packageName = "com.machankura.bennu.desktop" packageVersion = "1.0.0" } } diff --git a/composeApp/schemas/to.curare.compose.database.CurareDatabase/1.json b/composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/1.json similarity index 100% rename from composeApp/schemas/to.curare.compose.database.CurareDatabase/1.json rename to composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/1.json diff --git a/composeApp/schemas/to.curare.compose.database.CurareDatabase/10.json b/composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/10.json similarity index 100% rename from composeApp/schemas/to.curare.compose.database.CurareDatabase/10.json rename to composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/10.json diff --git a/composeApp/schemas/to.curare.compose.database.CurareDatabase/11.json b/composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/11.json similarity index 100% rename from composeApp/schemas/to.curare.compose.database.CurareDatabase/11.json rename to composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/11.json diff --git a/composeApp/schemas/to.curare.compose.database.CurareDatabase/12.json b/composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/12.json similarity index 100% rename from composeApp/schemas/to.curare.compose.database.CurareDatabase/12.json rename to composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/12.json diff --git a/composeApp/schemas/to.curare.compose.database.CurareDatabase/13.json b/composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/13.json similarity index 100% rename from composeApp/schemas/to.curare.compose.database.CurareDatabase/13.json rename to composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/13.json diff --git a/composeApp/schemas/to.curare.compose.database.CurareDatabase/14.json b/composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/14.json similarity index 100% rename from composeApp/schemas/to.curare.compose.database.CurareDatabase/14.json rename to composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/14.json diff --git a/composeApp/schemas/to.curare.compose.database.CurareDatabase/15.json b/composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/15.json similarity index 100% rename from composeApp/schemas/to.curare.compose.database.CurareDatabase/15.json rename to composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/15.json diff --git a/composeApp/schemas/to.curare.compose.database.CurareDatabase/16.json b/composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/16.json similarity index 100% rename from composeApp/schemas/to.curare.compose.database.CurareDatabase/16.json rename to composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/16.json diff --git a/composeApp/schemas/to.curare.compose.database.CurareDatabase/17.json b/composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/17.json similarity index 100% rename from composeApp/schemas/to.curare.compose.database.CurareDatabase/17.json rename to composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/17.json diff --git a/composeApp/schemas/to.curare.compose.database.CurareDatabase/18.json b/composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/18.json similarity index 100% rename from composeApp/schemas/to.curare.compose.database.CurareDatabase/18.json rename to composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/18.json diff --git a/composeApp/schemas/to.curare.compose.database.CurareDatabase/19.json b/composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/19.json similarity index 100% rename from composeApp/schemas/to.curare.compose.database.CurareDatabase/19.json rename to composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/19.json diff --git a/composeApp/schemas/to.curare.compose.database.CurareDatabase/2.json b/composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/2.json similarity index 100% rename from composeApp/schemas/to.curare.compose.database.CurareDatabase/2.json rename to composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/2.json diff --git a/composeApp/schemas/to.curare.compose.database.CurareDatabase/20.json b/composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/20.json similarity index 100% rename from composeApp/schemas/to.curare.compose.database.CurareDatabase/20.json rename to composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/20.json diff --git a/composeApp/schemas/to.curare.compose.database.CurareDatabase/21.json b/composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/21.json similarity index 100% rename from composeApp/schemas/to.curare.compose.database.CurareDatabase/21.json rename to composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/21.json diff --git a/composeApp/schemas/to.curare.compose.database.CurareDatabase/22.json b/composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/22.json similarity index 100% rename from composeApp/schemas/to.curare.compose.database.CurareDatabase/22.json rename to composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/22.json diff --git a/composeApp/schemas/to.curare.compose.database.CurareDatabase/23.json b/composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/23.json similarity index 100% rename from composeApp/schemas/to.curare.compose.database.CurareDatabase/23.json rename to composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/23.json diff --git a/composeApp/schemas/to.curare.compose.database.CurareDatabase/24.json b/composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/24.json similarity index 100% rename from composeApp/schemas/to.curare.compose.database.CurareDatabase/24.json rename to composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/24.json diff --git a/composeApp/schemas/to.curare.compose.database.CurareDatabase/25.json b/composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/25.json similarity index 100% rename from composeApp/schemas/to.curare.compose.database.CurareDatabase/25.json rename to composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/25.json diff --git a/composeApp/schemas/to.curare.compose.database.CurareDatabase/3.json b/composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/3.json similarity index 100% rename from composeApp/schemas/to.curare.compose.database.CurareDatabase/3.json rename to composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/3.json diff --git a/composeApp/schemas/to.curare.compose.database.CurareDatabase/4.json b/composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/4.json similarity index 100% rename from composeApp/schemas/to.curare.compose.database.CurareDatabase/4.json rename to composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/4.json diff --git a/composeApp/schemas/to.curare.compose.database.CurareDatabase/5.json b/composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/5.json similarity index 100% rename from composeApp/schemas/to.curare.compose.database.CurareDatabase/5.json rename to composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/5.json diff --git a/composeApp/schemas/to.curare.compose.database.CurareDatabase/6.json b/composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/6.json similarity index 100% rename from composeApp/schemas/to.curare.compose.database.CurareDatabase/6.json rename to composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/6.json diff --git a/composeApp/schemas/to.curare.compose.database.CurareDatabase/7.json b/composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/7.json similarity index 100% rename from composeApp/schemas/to.curare.compose.database.CurareDatabase/7.json rename to composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/7.json diff --git a/composeApp/schemas/to.curare.compose.database.CurareDatabase/8.json b/composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/8.json similarity index 100% rename from composeApp/schemas/to.curare.compose.database.CurareDatabase/8.json rename to composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/8.json diff --git a/composeApp/schemas/to.curare.compose.database.CurareDatabase/9.json b/composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/9.json similarity index 100% rename from composeApp/schemas/to.curare.compose.database.CurareDatabase/9.json rename to composeApp/schemas/com.machankura.bennu.compose.database.BennuDatabase/9.json diff --git a/composeApp/src/androidMain/AndroidManifest.xml b/composeApp/src/androidMain/AndroidManifest.xml index b239300b..7cdc5451 100644 --- a/composeApp/src/androidMain/AndroidManifest.xml +++ b/composeApp/src/androidMain/AndroidManifest.xml @@ -7,7 +7,7 @@ + android:name="com.machankura.bennu.android.MainActivity"> diff --git a/composeApp/src/androidMain/kotlin/to/curare/android/CurareApplication.kt b/composeApp/src/androidMain/kotlin/com/machankura/bennu/android/BennuApplication.kt similarity index 91% rename from composeApp/src/androidMain/kotlin/to/curare/android/CurareApplication.kt rename to composeApp/src/androidMain/kotlin/com/machankura/bennu/android/BennuApplication.kt index 4a02da38..9b006dfd 100644 --- a/composeApp/src/androidMain/kotlin/to/curare/android/CurareApplication.kt +++ b/composeApp/src/androidMain/kotlin/com/machankura/bennu/android/BennuApplication.kt @@ -1,4 +1,4 @@ -package to.curare.android +package com.machankura.bennu.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 CurareApplication: Application(), LightningApplication { +class BennuApplication: Application(), LightningApplication { private lateinit var globalPrefs: GlobalPrefs private lateinit var phoenixGlobal: PhoenixGlobal diff --git a/composeApp/src/androidMain/kotlin/to/curare/android/MainActivity.kt b/composeApp/src/androidMain/kotlin/com/machankura/bennu/android/MainActivity.kt similarity index 87% rename from composeApp/src/androidMain/kotlin/to/curare/android/MainActivity.kt rename to composeApp/src/androidMain/kotlin/com/machankura/bennu/android/MainActivity.kt index 5b40aad5..23439813 100644 --- a/composeApp/src/androidMain/kotlin/to/curare/android/MainActivity.kt +++ b/composeApp/src/androidMain/kotlin/com/machankura/bennu/android/MainActivity.kt @@ -1,4 +1,4 @@ -package to.curare.android +package com.machankura.bennu.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 to.curare.compose.PlatformContext -import to.curare.compose.CurareApp -import to.curare.compose.CurareGlobal +import com.machankura.bennu.compose.PlatformContext +import com.machankura.bennu.compose.BennuApp +import com.machankura.bennu.compose.BennuGlobal import fr.acinq.phoenix.PhoenixGlobal import fr.acinq.phoenix.android.services.HceService @@ -25,9 +25,9 @@ class MainActivity : ComponentActivity(), NFCActivity { setContent { val navController = rememberNavController() - CurareApp( + BennuApp( navController = navController, - curareGlobal = CurareGlobal( + bennuGlobal = BennuGlobal( platformContext = PlatformContext( applicationContext = applicationContext ) diff --git a/composeApp/src/androidMain/kotlin/to/curare/compose/AppVersion.android.kt b/composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/AppVersion.android.kt similarity index 69% rename from composeApp/src/androidMain/kotlin/to/curare/compose/AppVersion.android.kt rename to composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/AppVersion.android.kt index a9b4c177..eae77cf3 100644 --- a/composeApp/src/androidMain/kotlin/to/curare/compose/AppVersion.android.kt +++ b/composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/AppVersion.android.kt @@ -1,6 +1,6 @@ -package to.curare.compose +package com.machankura.bennu.compose -import to.curare.android.BuildConfig +import com.machankura.bennu.android.BuildConfig actual object AppVersion { actual val versionName: String diff --git a/composeApp/src/androidMain/kotlin/to/curare/compose/Platform.android.kt b/composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/Platform.android.kt similarity index 59% rename from composeApp/src/androidMain/kotlin/to/curare/compose/Platform.android.kt rename to composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/Platform.android.kt index a4bfa293..7bdf5202 100644 --- a/composeApp/src/androidMain/kotlin/to/curare/compose/Platform.android.kt +++ b/composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/Platform.android.kt @@ -1,4 +1,4 @@ -package to.curare.compose +package com.machankura.bennu.compose import android.os.Build diff --git a/composeApp/src/androidMain/kotlin/to/curare/compose/PlatformContext.android.kt b/composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/PlatformContext.android.kt similarity index 72% rename from composeApp/src/androidMain/kotlin/to/curare/compose/PlatformContext.android.kt rename to composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/PlatformContext.android.kt index ba72bbe2..c98758c7 100644 --- a/composeApp/src/androidMain/kotlin/to/curare/compose/PlatformContext.android.kt +++ b/composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/PlatformContext.android.kt @@ -1,4 +1,4 @@ -package to.curare.compose +package com.machankura.bennu.compose import android.content.Context diff --git a/composeApp/src/androidMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.android.kt b/composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/database/builder/PlatformDatabaseBuilder.android.kt similarity index 64% rename from composeApp/src/androidMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.android.kt rename to composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/database/builder/PlatformDatabaseBuilder.android.kt index 6f388407..94eb9405 100644 --- a/composeApp/src/androidMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.android.kt +++ b/composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/database/builder/PlatformDatabaseBuilder.android.kt @@ -1,22 +1,22 @@ -package to.curare.compose.database.builder +package com.machankura.bennu.compose.database.builder import androidx.room3.Room import androidx.room3.RoomDatabase -import to.curare.compose.PlatformContext -import to.curare.compose.database.CurareDatabase +import com.machankura.bennu.compose.PlatformContext +import com.machankura.bennu.compose.database.BennuDatabase 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/to/curare/compose/extensions/Phoenix.android.kt b/composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/extensions/Phoenix.android.kt similarity index 88% rename from composeApp/src/androidMain/kotlin/to/curare/compose/extensions/Phoenix.android.kt rename to composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/extensions/Phoenix.android.kt index 7b65495e..4b3a84f8 100644 --- a/composeApp/src/androidMain/kotlin/to/curare/compose/extensions/Phoenix.android.kt +++ b/composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/extensions/Phoenix.android.kt @@ -1,6 +1,6 @@ -package to.curare.compose.extensions +package com.machankura.bennu.compose.extensions -import to.curare.android.CurareApplication +import com.machankura.bennu.android.BennuApplication 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 CurareApplication + val machankuraApplication = phoenixGlobal.ctx.applicationContext as BennuApplication return machankuraApplication.getGlobalPrefs().getShowIntro } actual fun getGlobalPrefs(phoenixGlobal: PhoenixGlobal): GlobalPrefs { - val machankuraApplication = phoenixGlobal.ctx.applicationContext as CurareApplication + val machankuraApplication = phoenixGlobal.ctx.applicationContext as BennuApplication return machankuraApplication.getGlobalPrefs() } \ No newline at end of file diff --git a/composeApp/src/androidMain/kotlin/to/curare/compose/network/PlatformHttpClientEngine.android.kt b/composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/network/PlatformHttpClientEngine.android.kt similarity index 80% rename from composeApp/src/androidMain/kotlin/to/curare/compose/network/PlatformHttpClientEngine.android.kt rename to composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/network/PlatformHttpClientEngine.android.kt index 0fb439a3..8ce27bc4 100644 --- a/composeApp/src/androidMain/kotlin/to/curare/compose/network/PlatformHttpClientEngine.android.kt +++ b/composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/network/PlatformHttpClientEngine.android.kt @@ -1,4 +1,4 @@ -package to.curare.compose.network +package com.machankura.bennu.compose.network import io.ktor.client.engine.HttpClientEngineFactory import io.ktor.client.engine.cio.CIO diff --git a/composeApp/src/androidMain/kotlin/to/curare/compose/ui/theme/Motion.android.kt b/composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/ui/theme/Motion.android.kt similarity index 98% rename from composeApp/src/androidMain/kotlin/to/curare/compose/ui/theme/Motion.android.kt rename to composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/ui/theme/Motion.android.kt index e7f9475d..02c33d8d 100644 --- a/composeApp/src/androidMain/kotlin/to/curare/compose/ui/theme/Motion.android.kt +++ b/composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/ui/theme/Motion.android.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.theme +package com.machankura.bennu.compose.ui.theme import android.database.ContentObserver import android.provider.Settings diff --git a/composeApp/src/androidMain/kotlin/to/curare/compose/ui/theme/Theme.android.kt b/composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/ui/theme/Theme.android.kt similarity index 98% rename from composeApp/src/androidMain/kotlin/to/curare/compose/ui/theme/Theme.android.kt rename to composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/ui/theme/Theme.android.kt index d811a28f..df4e2e78 100644 --- a/composeApp/src/androidMain/kotlin/to/curare/compose/ui/theme/Theme.android.kt +++ b/composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/ui/theme/Theme.android.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.theme +package com.machankura.bennu.compose.ui.theme import android.app.UiModeManager import android.content.Context diff --git a/composeApp/src/androidMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.android.kt b/composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/ui/view/model/NavigationViewModel.android.kt similarity index 89% rename from composeApp/src/androidMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.android.kt rename to composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/ui/view/model/NavigationViewModel.android.kt index 71d48ff0..90bd9c66 100644 --- a/composeApp/src/androidMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.android.kt +++ b/composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/ui/view/model/NavigationViewModel.android.kt @@ -1,6 +1,6 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model -import to.curare.android.CurareApplication +import com.machankura.bennu.android.BennuApplication import fr.acinq.phoenix.PhoenixGlobal import fr.acinq.phoenix.android.BusinessManager import fr.acinq.phoenix.data.DecryptSeedResult @@ -24,12 +24,12 @@ actual fun loadAndDecryptSeed(phoenixGlobal: PhoenixGlobal): DecryptSeedResult { } actual fun getAvailableWalletsMeta(phoenixGlobal: PhoenixGlobal): Flow> { - val machankuraApplication = phoenixGlobal.ctx.applicationContext as CurareApplication + val machankuraApplication = phoenixGlobal.ctx.applicationContext as BennuApplication return machankuraApplication.getGlobalPrefs().getAvailableWalletsMeta } actual suspend fun saveAvailableWalletMeta(phoenixGlobal: PhoenixGlobal, metadata: UserWalletMetadata) { - val machankuraApplication = phoenixGlobal.ctx.applicationContext as CurareApplication + val machankuraApplication = phoenixGlobal.ctx.applicationContext as BennuApplication machankuraApplication.getGlobalPrefs().saveAvailableWalletMeta(metadata) } @@ -40,7 +40,7 @@ actual suspend fun saveAvailableWalletMeta( avatar: String, isHidden: Boolean ) { - val machankuraApplication = phoenixGlobal.ctx.applicationContext as CurareApplication + val machankuraApplication = phoenixGlobal.ctx.applicationContext as BennuApplication machankuraApplication.getGlobalPrefs().saveAvailableWalletMeta( walletId = walletId, name = name, diff --git a/composeApp/src/androidMain/res/values/strings.xml b/composeApp/src/androidMain/res/values/strings.xml index 2fe49528..bb141374 100644 --- a/composeApp/src/androidMain/res/values/strings.xml +++ b/composeApp/src/androidMain/res/values/strings.xml @@ -1,5 +1,5 @@ a - Curare + Bennu Channels watcher Shows up when you need to start Phoenix. diff --git a/composeApp/src/commonMain/composeResources/values/strings.xml b/composeApp/src/commonMain/composeResources/values/strings.xml index 3a86794d..a01b90bb 100644 --- a/composeApp/src/commonMain/composeResources/values/strings.xml +++ b/composeApp/src/commonMain/composeResources/values/strings.xml @@ -11,7 +11,7 @@ actual 334 strings sat inside composables. The launcher label is a separate resource, in androidMain/res/values/strings.xml, - which is what AndroidManifest.xml points at. Both now say "Curare". + which is what AndroidManifest.xml points at. Both now say "Bennu". Externalising the 334 is the rest of phase 4 in docs/material-design-conformance.md. They land here. @@ -23,7 +23,7 @@ Abandoned Abandoned. Nothing was signed. All - Curare + Bennu Add a dialect the group can translate into Add artifact to library Add artifact to the group library @@ -112,7 +112,7 @@ How many members will it take to sign? I have saved my recovery phrase somewhere safe. I understand that if I lose this phone and my recovery phrase, I lose this profile and the funds in its wallet. - If you are new to Curare or just want to create a fresh profile + If you are new to Bennu or just want to create a fresh profile Initial version label Input npub... or nip05 Introduce yourself @@ -149,7 +149,7 @@ Lose this phone before you do, and the profile goes with it. Lock prompt coming soon. Malformed note - Curare + Bennu Members members Name @@ -274,7 +274,7 @@ The ceremony was abandoned. The group can hold one key together, split so that no single member holds it. Signing with it takes a quorum. The group has a shared key. - The recovery phrase (sometimes called a seed) is a list of 12 English words. It is the only way back to this profile: the key that signs as you, and the wallet that holds your coins, are both derived from it.\n\nOnly you have this phrase. Keep it private — nobody from Curare will ever ask you for it.\n\nDo not lose it. Write it down and keep it somewhere safe that is not this phone. If you lose both the phone and the phrase, this profile and its funds are gone for good. + The recovery phrase (sometimes called a seed) is a list of 12 English words. It is the only way back to this profile: the key that signs as you, and the wallet that holds your coins, are both derived from it.\n\nOnly you have this phrase. Keep it private — nobody from Bennu will ever ask you for it.\n\nDo not lose it. Write it down and keep it somewhere safe that is not this phone. If you lose both the phone and the phrase, this profile and its funds are gone for good. These are your keys. Keep them safe so they can keep unlocking this profile and its coins, even when you lose or change your phone. This artifact has no version for a translation to be of. This artifact has no version for a chapter to attach to. @@ -298,7 +298,7 @@ This device holds no key for %1$s, so there is nothing to lose. The profile stays on the relays, and you can sign in again any time. Could not sign out. Please try again. This will give you write access to the profile. - Curare broadcasts what you publish to a distributed set of relays, so it stays decentralised. + Bennu broadcasts what you publish to a distributed set of relays, so it stays decentralised. Translate chunk Translate into which dialect? Translated text @@ -386,7 +386,7 @@ to join the %1$s chat room. Translate %1$s Unsupported event kind: %1$s - %1$s was created, but %2$s couldn't be added yet. Invite them again from the chat once they're on Curare. + %1$s was created, but %2$s couldn't be added yet. Invite them again from the chat once they're on Bennu. %1$s was created, but its shared key ceremony couldn't be started. Open the chat and start it from the group's details — until then the group has no key of its own. %1$s words · %2$s characters #%1$s @@ -727,7 +727,7 @@ That nostr secret key is not valid. That recovery phrase is not valid. Check each word and the order. The key could not be saved on this device. - Whatever you paste stays on this device. Curare checks it, shows you the profile it opens, and writes nothing until you confirm. + Whatever you paste stays on this device. Bennu checks it, shows you the profile it opens, and writes nothing until you confirm. This key is already on this device. Twelve words, nsec1… or npub1… Use a different key @@ -742,7 +742,7 @@ Copy nsec Could not forget the key. Please try again. Could not unlock your key. Please try again. - Curare will delete the nsec for %1$s from this device. Anything not yet published is lost. The profile stays on the relays, and the key can be signed in again. + Bennu will delete the nsec for %1$s from this device. Anything not yet published is lost. The profile stays on the relays, and the key can be signed in again. Display nostr secret key Forget Forget this key @@ -755,7 +755,7 @@ Nostr secret key Remove the key from this device. The profile stays on the relays. Store the nsec that signs as this profile. There is no phrase behind it: the key is the whole backup. - The nsec is the key that signs as you. This profile was signed in with it rather than made from a recovery phrase, so there is no phrase to write down and no wallet attached: the key is the whole of the backup.\n\nOnly you have it. Keep it private — nobody from Curare will ever ask you for it.\n\nDo not lose it. Store it somewhere safe that is not this phone. If you lose both the phone and the key, this profile is gone for good. + The nsec is the key that signs as you. This profile was signed in with it rather than made from a recovery phrase, so there is no phrase to write down and no wallet attached: the key is the whole of the backup.\n\nOnly you have it. Keep it private — nobody from Bennu will ever ask you for it.\n\nDo not lose it. Store it somewhere safe that is not this phone. If you lose both the phone and the key, this profile is gone for good. This device holds no nostr secret key for the profile that is open. If it was made from a recovery phrase, the phrase is its backup. Unlocking your key… You have not backed up your nostr secret key @@ -787,5 +787,5 @@ Start new chat You already have a chat with %1$s. Checking whether %1$s can receive messages here. - %1$s hasn't set up messaging on Curare yet. Try again later, or ask them to open Curare. + %1$s hasn't set up messaging on Bennu yet. Try again later, or ask them to open Bennu. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/AppLifecycle.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/AppLifecycle.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/AppLifecycle.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/AppLifecycle.kt index d89e87d8..d83737b2 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/AppLifecycle.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/AppLifecycle.kt @@ -1,4 +1,4 @@ -package to.curare.compose +package com.machankura.bennu.compose import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/AppVersion.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/AppVersion.kt similarity index 75% rename from composeApp/src/commonMain/kotlin/to/curare/compose/AppVersion.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/AppVersion.kt index 30ed2ebf..f527f87c 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/AppVersion.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/AppVersion.kt @@ -1,4 +1,4 @@ -package to.curare.compose +package com.machankura.bennu.compose expect object AppVersion { val versionName: String diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/CurareApp.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/BennuApp.kt similarity index 79% rename from composeApp/src/commonMain/kotlin/to/curare/compose/CurareApp.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/BennuApp.kt index cda96268..84bd13ca 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/CurareApp.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/BennuApp.kt @@ -1,4 +1,4 @@ -package to.curare.compose +package com.machankura.bennu.compose import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material3.Surface @@ -9,10 +9,10 @@ import coil3.ImageLoader import coil3.compose.setSingletonImageLoaderFactory import coil3.network.ktor3.KtorNetworkFetcherFactory import io.ktor.client.HttpClient -import to.curare.compose.network.platformHttpClientEngineFactory -import to.curare.compose.ui.composable.navigation.CurareNavHost -import to.curare.compose.ui.composable.widgets.ProvideSnackbarHost -import to.curare.compose.ui.theme.CurareTheme +import com.machankura.bennu.compose.network.platformHttpClientEngineFactory +import com.machankura.bennu.compose.ui.composable.navigation.BennuNavHost +import com.machankura.bennu.compose.ui.composable.widgets.ProvideSnackbarHost +import com.machankura.bennu.compose.ui.theme.BennuTheme import fr.acinq.phoenix.PhoenixGlobal /** @@ -24,9 +24,9 @@ import fr.acinq.phoenix.PhoenixGlobal private val imageHttpClient by lazy { HttpClient(platformHttpClientEngineFactory()) } @Composable -fun CurareApp( +fun BennuApp( navController: NavHostController, - curareGlobal: CurareGlobal, + bennuGlobal: BennuGlobal, phoenixGlobal: PhoenixGlobal ) { setSingletonImageLoaderFactory { context -> @@ -37,7 +37,7 @@ fun CurareApp( .build() } - CurareTheme { + BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { @@ -47,8 +47,8 @@ fun CurareApp( // outcome does not have to be handed a state through the parameter list of // every composable between it and the Scaffold. ProvideSnackbarHost { - CurareNavHost( - curareGlobal = curareGlobal, + BennuNavHost( + bennuGlobal = bennuGlobal, phoenixGlobal = phoenixGlobal, navController = navController ) diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/BennuGlobal.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/BennuGlobal.kt new file mode 100644 index 00000000..cd595914 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/BennuGlobal.kt @@ -0,0 +1,5 @@ +package com.machankura.bennu.compose + +class BennuGlobal( + val platformContext: PlatformContext +) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/Platform.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/Platform.kt new file mode 100644 index 00000000..28d070aa --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/Platform.kt @@ -0,0 +1,7 @@ +package com.machankura.bennu.compose + +interface Platform { + val name: String +} + +expect fun getPlatform(): Platform \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/PlatformContext.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/PlatformContext.kt new file mode 100644 index 00000000..9578bc6c --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/PlatformContext.kt @@ -0,0 +1,3 @@ +package com.machankura.bennu.compose + +expect class PlatformContext \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/cryptography/Extensions.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/cryptography/Extensions.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/to/curare/compose/cryptography/Extensions.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/cryptography/Extensions.kt index f0276a2d..330ad438 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/cryptography/Extensions.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/cryptography/Extensions.kt @@ -1,6 +1,6 @@ -package to.curare.compose.cryptography +package com.machankura.bennu.compose.cryptography -import to.curare.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.NostrEvent import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync @@ -8,12 +8,12 @@ import com.vitorpamplona.quartz.nip19Bech32.bech32.Bech32 import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import kotlin.time.Instant -fun to.curare.compose.database.model.UnsignedNostrEvent.signOrThrow(nsec: String): NostrEvent { +fun com.machankura.bennu.compose.database.model.UnsignedNostrEvent.signOrThrow(nsec: String): NostrEvent { val hexPrivateKey = Bech32.decodeBytes(nsec).second return this.signOrThrow(hexPrivateKey) } -fun to.curare.compose.database.model.UnsignedNostrEvent.signOrThrow(hexPrivateKey: ByteArray): NostrEvent { +fun com.machankura.bennu.compose.database.model.UnsignedNostrEvent.signOrThrow(hexPrivateKey: ByteArray): NostrEvent { val tempSigner = NostrSignerSync( KeyPair( privKey = hexPrivateKey diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/CurareDatabase.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/BennuDatabase.kt similarity index 69% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/CurareDatabase.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/BennuDatabase.kt index c28e6ba3..41a7be20 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/CurareDatabase.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/BennuDatabase.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database +package com.machankura.bennu.compose.database import androidx.room3.ColumnTypeConverters import androidx.room3.AutoMigration @@ -7,122 +7,122 @@ import androidx.room3.Database import androidx.room3.RoomDatabase import androidx.room3.immediateTransaction import androidx.room3.useWriterConnection -import to.curare.compose.database.converters.CurareConverters -import to.curare.compose.database.dao.BroadcastNostrEventReceiptDao -import to.curare.compose.database.dao.BroadcastNostrEventRequestDao -import to.curare.compose.database.dao.ChatMessageBroadcastNostrEventReceiptRelationDao -import to.curare.compose.database.dao.ChatMessageBroadcastNostrEventRequestRelationDao -import to.curare.compose.database.dao.ChatMessageDao -import to.curare.compose.database.dao.ChatMessageNostrEventRelationDao -import to.curare.compose.database.dao.ChatRoomDao -import to.curare.compose.database.dao.ConnectionDao -import to.curare.compose.database.dao.DkgSessionDao -import to.curare.compose.database.dao.FrostSigningSessionDao -import to.curare.compose.database.dao.GiftWrapMessageDao -import to.curare.compose.database.dao.GiftWrapPayloadDao -import to.curare.compose.database.dao.GiftWrapSealDao -import to.curare.compose.database.dao.GroupKeyStateDao -import to.curare.compose.database.dao.GroupSignedEventDao -import to.curare.compose.database.dao.InReplyToRelationDao -import to.curare.compose.database.dao.MantraArtifactDao -import to.curare.compose.database.dao.MantraArtifactVersionDao -import to.curare.compose.database.dao.MantraChapterDao -import to.curare.compose.database.dao.MantraChunkDao -import to.curare.compose.database.dao.MantraDao -import to.curare.compose.database.dao.MantraDialectDao -import to.curare.compose.database.dao.MantraTranslationArtifactVersionDao -import to.curare.compose.database.dao.MantraTranslationArtifactVersionContributorDao -import to.curare.compose.database.dao.MantraTranslationChapterDao -import to.curare.compose.database.dao.MantraTranslationChapterContributorDao -import to.curare.compose.database.dao.MantraTranslationChunkDao -import to.curare.compose.database.dao.MantraTranslationDao -import to.curare.compose.database.dao.MantraTranslationContributorDao -import to.curare.compose.database.dao.MarmotCommitResultDao -import to.curare.compose.database.dao.MarmotOutboundDao -import to.curare.compose.database.dao.MarmotGroupEventDao -import to.curare.compose.database.dao.MarmotInnerEventDao -import to.curare.compose.database.dao.MarmotKeyPackageBundleDao -import to.curare.compose.database.dao.MarmotRoutingDao -import to.curare.compose.database.dao.MarmotPublishObligationDao -import to.curare.compose.database.dao.MarmotKeyPackageDao -import to.curare.compose.database.dao.MarmotRetainedEpochSecretDao -import to.curare.compose.database.dao.MentionDao -import to.curare.compose.database.dao.NegentropySynchronizeRequestDao -import to.curare.compose.database.dao.NegentropySynchronizeResultDao -import to.curare.compose.database.dao.NostrDao -import to.curare.compose.database.dao.NostrEventDao -import to.curare.compose.database.dao.NostrEventRelayDao -import to.curare.compose.database.dao.NostrNip17Dao -import to.curare.compose.database.dao.ParticipantDao -import to.curare.compose.database.dao.PostDao -import to.curare.compose.database.dao.ProfileDao -import to.curare.compose.database.dao.QuotedRelationDao -import to.curare.compose.database.dao.ReactionDao -import to.curare.compose.database.dao.RecentSearchDao -import to.curare.compose.database.dao.RelayDao -import to.curare.compose.database.dao.RepostedRelationDao -import to.curare.compose.database.dao.SynchronizeNostrEventRequestDao -import to.curare.compose.database.dao.SynchronizeNostrEventResultDao -import to.curare.compose.database.dao.UnsignedNostrEventDao -import to.curare.compose.database.dao.ZapDao -import to.curare.compose.database.model.BroadcastNostrEventReceipt -import to.curare.compose.database.model.BroadcastNostrEventRequest -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.ChatMessageBroadcastNostrEventReceiptRelation -import to.curare.compose.database.model.ChatMessageBroadcastNostrEventRequestRelation -import to.curare.compose.database.model.ChatMessageNostrEventRelation -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.Connection -import to.curare.compose.database.model.GiftWrapMessage -import to.curare.compose.database.model.GiftWrapPayload -import to.curare.compose.database.model.GiftWrapSeal -import to.curare.compose.database.model.GroupKeyState -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.InReplyToRelation -import to.curare.compose.database.model.MantraArtifact -import to.curare.compose.database.model.MantraArtifactVersion -import to.curare.compose.database.model.MantraChapter -import to.curare.compose.database.model.MantraChunk -import to.curare.compose.database.model.MantraDialect -import to.curare.compose.database.model.MantraTranslation -import to.curare.compose.database.model.MantraTranslationArtifactVersion -import to.curare.compose.database.model.MantraTranslationArtifactVersionContributor -import to.curare.compose.database.model.MantraTranslationChapter -import to.curare.compose.database.model.MantraTranslationChapterContributor -import to.curare.compose.database.model.MantraTranslationChunk -import to.curare.compose.database.model.MantraTranslationContributor -import to.curare.compose.database.model.MarmotCommitResult -import to.curare.compose.database.model.MarmotGroupEvent -import to.curare.compose.database.model.MarmotInnerEvent -import to.curare.compose.database.model.MarmotKeyPackage -import to.curare.compose.database.model.MarmotKeyPackageBundle -import to.curare.compose.database.model.MarmotRouting -import to.curare.compose.database.model.MarmotPublishObligation -import to.curare.compose.database.model.MarmotOutboundGate -import to.curare.compose.managers.MarmotEngine -import to.curare.compose.database.model.MarmotRetainedEpochSecret -import to.curare.compose.database.model.Mention -import to.curare.compose.database.model.NegentropySynchronizeRequest -import to.curare.compose.database.model.NegentropySynchronizeResult -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.NostrEventRelay -import to.curare.compose.database.model.Participant -import to.curare.compose.database.model.Post -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.QuotedRelation -import to.curare.compose.database.model.Reaction -import to.curare.compose.database.model.RecentSearch -import to.curare.compose.database.model.DkgParticipantMessage -import to.curare.compose.database.model.DkgSession -import to.curare.compose.database.model.FrostSignerMessage -import to.curare.compose.database.model.FrostSigningItem -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.Relay -import to.curare.compose.database.model.RepostedRelation -import to.curare.compose.database.model.SynchronizeNostrEventRequest -import to.curare.compose.database.model.SynchronizeNostrEventResult -import to.curare.compose.database.model.UnsignedNostrEvent -import to.curare.compose.database.model.Zap +import com.machankura.bennu.compose.database.converters.BennuConverters +import com.machankura.bennu.compose.database.dao.BroadcastNostrEventReceiptDao +import com.machankura.bennu.compose.database.dao.BroadcastNostrEventRequestDao +import com.machankura.bennu.compose.database.dao.ChatMessageBroadcastNostrEventReceiptRelationDao +import com.machankura.bennu.compose.database.dao.ChatMessageBroadcastNostrEventRequestRelationDao +import com.machankura.bennu.compose.database.dao.ChatMessageDao +import com.machankura.bennu.compose.database.dao.ChatMessageNostrEventRelationDao +import com.machankura.bennu.compose.database.dao.ChatRoomDao +import com.machankura.bennu.compose.database.dao.ConnectionDao +import com.machankura.bennu.compose.database.dao.DkgSessionDao +import com.machankura.bennu.compose.database.dao.FrostSigningSessionDao +import com.machankura.bennu.compose.database.dao.GiftWrapMessageDao +import com.machankura.bennu.compose.database.dao.GiftWrapPayloadDao +import com.machankura.bennu.compose.database.dao.GiftWrapSealDao +import com.machankura.bennu.compose.database.dao.GroupKeyStateDao +import com.machankura.bennu.compose.database.dao.GroupSignedEventDao +import com.machankura.bennu.compose.database.dao.InReplyToRelationDao +import com.machankura.bennu.compose.database.dao.MantraArtifactDao +import com.machankura.bennu.compose.database.dao.MantraArtifactVersionDao +import com.machankura.bennu.compose.database.dao.MantraChapterDao +import com.machankura.bennu.compose.database.dao.MantraChunkDao +import com.machankura.bennu.compose.database.dao.MantraDao +import com.machankura.bennu.compose.database.dao.MantraDialectDao +import com.machankura.bennu.compose.database.dao.MantraTranslationArtifactVersionDao +import com.machankura.bennu.compose.database.dao.MantraTranslationArtifactVersionContributorDao +import com.machankura.bennu.compose.database.dao.MantraTranslationChapterDao +import com.machankura.bennu.compose.database.dao.MantraTranslationChapterContributorDao +import com.machankura.bennu.compose.database.dao.MantraTranslationChunkDao +import com.machankura.bennu.compose.database.dao.MantraTranslationDao +import com.machankura.bennu.compose.database.dao.MantraTranslationContributorDao +import com.machankura.bennu.compose.database.dao.MarmotCommitResultDao +import com.machankura.bennu.compose.database.dao.MarmotOutboundDao +import com.machankura.bennu.compose.database.dao.MarmotGroupEventDao +import com.machankura.bennu.compose.database.dao.MarmotInnerEventDao +import com.machankura.bennu.compose.database.dao.MarmotKeyPackageBundleDao +import com.machankura.bennu.compose.database.dao.MarmotRoutingDao +import com.machankura.bennu.compose.database.dao.MarmotPublishObligationDao +import com.machankura.bennu.compose.database.dao.MarmotKeyPackageDao +import com.machankura.bennu.compose.database.dao.MarmotRetainedEpochSecretDao +import com.machankura.bennu.compose.database.dao.MentionDao +import com.machankura.bennu.compose.database.dao.NegentropySynchronizeRequestDao +import com.machankura.bennu.compose.database.dao.NegentropySynchronizeResultDao +import com.machankura.bennu.compose.database.dao.NostrDao +import com.machankura.bennu.compose.database.dao.NostrEventDao +import com.machankura.bennu.compose.database.dao.NostrEventRelayDao +import com.machankura.bennu.compose.database.dao.NostrNip17Dao +import com.machankura.bennu.compose.database.dao.ParticipantDao +import com.machankura.bennu.compose.database.dao.PostDao +import com.machankura.bennu.compose.database.dao.ProfileDao +import com.machankura.bennu.compose.database.dao.QuotedRelationDao +import com.machankura.bennu.compose.database.dao.ReactionDao +import com.machankura.bennu.compose.database.dao.RecentSearchDao +import com.machankura.bennu.compose.database.dao.RelayDao +import com.machankura.bennu.compose.database.dao.RepostedRelationDao +import com.machankura.bennu.compose.database.dao.SynchronizeNostrEventRequestDao +import com.machankura.bennu.compose.database.dao.SynchronizeNostrEventResultDao +import com.machankura.bennu.compose.database.dao.UnsignedNostrEventDao +import com.machankura.bennu.compose.database.dao.ZapDao +import com.machankura.bennu.compose.database.model.BroadcastNostrEventReceipt +import com.machankura.bennu.compose.database.model.BroadcastNostrEventRequest +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.ChatMessageBroadcastNostrEventReceiptRelation +import com.machankura.bennu.compose.database.model.ChatMessageBroadcastNostrEventRequestRelation +import com.machankura.bennu.compose.database.model.ChatMessageNostrEventRelation +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.Connection +import com.machankura.bennu.compose.database.model.GiftWrapMessage +import com.machankura.bennu.compose.database.model.GiftWrapPayload +import com.machankura.bennu.compose.database.model.GiftWrapSeal +import com.machankura.bennu.compose.database.model.GroupKeyState +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.InReplyToRelation +import com.machankura.bennu.compose.database.model.MantraArtifact +import com.machankura.bennu.compose.database.model.MantraArtifactVersion +import com.machankura.bennu.compose.database.model.MantraChapter +import com.machankura.bennu.compose.database.model.MantraChunk +import com.machankura.bennu.compose.database.model.MantraDialect +import com.machankura.bennu.compose.database.model.MantraTranslation +import com.machankura.bennu.compose.database.model.MantraTranslationArtifactVersion +import com.machankura.bennu.compose.database.model.MantraTranslationArtifactVersionContributor +import com.machankura.bennu.compose.database.model.MantraTranslationChapter +import com.machankura.bennu.compose.database.model.MantraTranslationChapterContributor +import com.machankura.bennu.compose.database.model.MantraTranslationChunk +import com.machankura.bennu.compose.database.model.MantraTranslationContributor +import com.machankura.bennu.compose.database.model.MarmotCommitResult +import com.machankura.bennu.compose.database.model.MarmotGroupEvent +import com.machankura.bennu.compose.database.model.MarmotInnerEvent +import com.machankura.bennu.compose.database.model.MarmotKeyPackage +import com.machankura.bennu.compose.database.model.MarmotKeyPackageBundle +import com.machankura.bennu.compose.database.model.MarmotRouting +import com.machankura.bennu.compose.database.model.MarmotPublishObligation +import com.machankura.bennu.compose.database.model.MarmotOutboundGate +import com.machankura.bennu.compose.managers.MarmotEngine +import com.machankura.bennu.compose.database.model.MarmotRetainedEpochSecret +import com.machankura.bennu.compose.database.model.Mention +import com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest +import com.machankura.bennu.compose.database.model.NegentropySynchronizeResult +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.NostrEventRelay +import com.machankura.bennu.compose.database.model.Participant +import com.machankura.bennu.compose.database.model.Post +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.QuotedRelation +import com.machankura.bennu.compose.database.model.Reaction +import com.machankura.bennu.compose.database.model.RecentSearch +import com.machankura.bennu.compose.database.model.DkgParticipantMessage +import com.machankura.bennu.compose.database.model.DkgSession +import com.machankura.bennu.compose.database.model.FrostSignerMessage +import com.machankura.bennu.compose.database.model.FrostSigningItem +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.Relay +import com.machankura.bennu.compose.database.model.RepostedRelation +import com.machankura.bennu.compose.database.model.SynchronizeNostrEventRequest +import com.machankura.bennu.compose.database.model.SynchronizeNostrEventResult +import com.machankura.bennu.compose.database.model.UnsignedNostrEvent +import com.machankura.bennu.compose.database.model.Zap import kotlin.time.Instant val GENESIS_AT = Instant.fromEpochMilliseconds(1231006505000L) @@ -370,9 +370,9 @@ val GENESIS_AT = Instant.fromEpochMilliseconds(1231006505000L) AutoMigration(from = 24, to = 25), ] ) -@ConstructedBy(CurareDatabaseConstructor::class) -@ColumnTypeConverters(CurareConverters::class) -abstract class CurareDatabase: RoomDatabase() { +@ConstructedBy(BennuDatabaseConstructor::class) +@ColumnTypeConverters(BennuConverters::class) +abstract class BennuDatabase: RoomDatabase() { /** * The Marmot engine for this database's current-profile rooms, made on first use * and living as long as the database does. Owned here rather than registered diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/BennuDatabaseConstructor.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/BennuDatabaseConstructor.kt new file mode 100644 index 00000000..9e148cf6 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/BennuDatabaseConstructor.kt @@ -0,0 +1,9 @@ +package com.machankura.bennu.compose.database + +import androidx.room3.RoomDatabaseConstructor + +@Suppress("KotlinNoActualForExpect", "NO_ACTUAL_FOR_EXPECT") +expect object BennuDatabaseConstructor: RoomDatabaseConstructor { + + override fun initialize(): BennuDatabase +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/builder/PlatformDatabaseBuilder.kt similarity index 53% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/builder/PlatformDatabaseBuilder.kt index 2afdb272..13e5f002 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/builder/PlatformDatabaseBuilder.kt @@ -1,23 +1,23 @@ -package to.curare.compose.database.builder +package com.machankura.bennu.compose.database.builder import androidx.room3.RoomDatabase import androidx.sqlite.driver.bundled.BundledSQLiteDriver -import to.curare.compose.database.migrations.MIGRATION_3_4 -import to.curare.compose.database.migrations.MIGRATION_9_10 -import to.curare.compose.database.migrations.MIGRATION_13_14 -import to.curare.compose.database.migrations.MIGRATION_14_15 +import com.machankura.bennu.compose.database.migrations.MIGRATION_3_4 +import com.machankura.bennu.compose.database.migrations.MIGRATION_9_10 +import com.machankura.bennu.compose.database.migrations.MIGRATION_13_14 +import com.machankura.bennu.compose.database.migrations.MIGRATION_14_15 import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO expect object PlatformDatabaseBuilder { - fun getDatabaseBuilder(platformContext: to.curare.compose.PlatformContext): RoomDatabase.Builder + fun getDatabaseBuilder(platformContext: com.machankura.bennu.compose.PlatformContext): RoomDatabase.Builder - fun getInMemoryDatabaseBuilder(platform: to.curare.compose.PlatformContext): RoomDatabase.Builder + fun getInMemoryDatabaseBuilder(platform: com.machankura.bennu.compose.PlatformContext): RoomDatabase.Builder } fun getRoomDatabase( - builder: RoomDatabase.Builder -): to.curare.compose.database.CurareDatabase { + builder: RoomDatabase.Builder +): com.machankura.bennu.compose.database.BennuDatabase { return builder // Everything else Room generates itself. These four move data rather than // only changing shape, which an AutoMigration cannot express: 3->4 rewrites diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/converters/CurareConverters.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/converters/BennuConverters.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/converters/CurareConverters.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/converters/BennuConverters.kt index 4172ae73..6b0c288b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/converters/CurareConverters.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/converters/BennuConverters.kt @@ -1,13 +1,13 @@ -package to.curare.compose.database.converters +package com.machankura.bennu.compose.database.converters import androidx.room3.ColumnTypeConverter -import to.curare.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter import co.touchlab.kermit.Logger import kotlinx.serialization.json.Json import kotlin.time.Instant -class CurareConverters { - val logger = Logger.withTag("CurareConverters") +class BennuConverters { + val logger = Logger.withTag("BennuConverters") @ColumnTypeConverter fun fromTimestamp(value: Long?): Instant? { diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/BroadcastNostrEventReceiptDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/BroadcastNostrEventReceiptDao.kt new file mode 100644 index 00000000..36e67889 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/BroadcastNostrEventReceiptDao.kt @@ -0,0 +1,21 @@ +package com.machankura.bennu.compose.database.dao + +import androidx.room3.Dao +import androidx.room3.Query +import androidx.room3.Upsert +import kotlinx.coroutines.flow.Flow + +@Dao +interface BroadcastNostrEventReceiptDao { + @Query("SELECT * FROM BroadcastNostrEventReceipt") + suspend fun getAllBroadcastNostrEventReceipts(): List + + @Query("SELECT * FROM BroadcastNostrEventReceipt WHERE id = :id") + fun getBroadcastNostrEventReceiptById(id: Long): Flow + + @Query("SELECT * FROM BroadcastNostrEventReceipt WHERE nostrEventId = :nostrEventId") + fun getBroadcastNostrEventReceiptByNostrEventId(nostrEventId: String): Flow + + @Upsert + suspend fun upsert(broadcastNostrEventReceipt: com.machankura.bennu.compose.database.model.BroadcastNostrEventReceipt): Long +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/BroadcastNostrEventRequestDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/BroadcastNostrEventRequestDao.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/BroadcastNostrEventRequestDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/BroadcastNostrEventRequestDao.kt index 3125cee6..75190e81 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/BroadcastNostrEventRequestDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/BroadcastNostrEventRequestDao.kt @@ -1,11 +1,11 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Insert import androidx.room3.Query import androidx.room3.Upsert -import to.curare.compose.database.model.BroadcastNostrEventRequest -import to.curare.compose.database.model.intermdiate.LocalBroadcastNostrEventRequest +import com.machankura.bennu.compose.database.model.BroadcastNostrEventRequest +import com.machankura.bennu.compose.database.model.intermdiate.LocalBroadcastNostrEventRequest import kotlinx.coroutines.flow.Flow import kotlin.time.Instant @@ -39,7 +39,7 @@ interface BroadcastNostrEventRequestDao { * "failed", so those rows are dead weight. Requeue everything a previous process left behind * when we start up, so an interrupted publish is retried instead of lost. Not "rejected": * that is a relay's answer to these exact bytes, and it does not change on a retry -- see - * [to.curare.compose.database.model.BroadcastStatus]. + * [com.machankura.bennu.compose.database.model.BroadcastStatus]. */ @Query("UPDATE BroadcastNostrEventRequest SET status = 'pending' WHERE status IN ('processing', 'failed') AND createdAt <= :staleBefore") suspend fun requeueStaleBroadcastNostrEventRequests(staleBefore: Instant): Int diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatMessageBroadcastNostrEventReceiptRelationDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ChatMessageBroadcastNostrEventReceiptRelationDao.kt similarity index 57% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatMessageBroadcastNostrEventReceiptRelationDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ChatMessageBroadcastNostrEventReceiptRelationDao.kt index 5a54d24a..32116230 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatMessageBroadcastNostrEventReceiptRelationDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ChatMessageBroadcastNostrEventReceiptRelationDao.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Upsert @@ -6,5 +6,5 @@ import androidx.room3.Upsert @Dao interface ChatMessageBroadcastNostrEventReceiptRelationDao { @Upsert - suspend fun upsert(chatMessageBroadcastNostrEventReceiptRelation: to.curare.compose.database.model.ChatMessageBroadcastNostrEventReceiptRelation) + suspend fun upsert(chatMessageBroadcastNostrEventReceiptRelation: com.machankura.bennu.compose.database.model.ChatMessageBroadcastNostrEventReceiptRelation) } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatMessageBroadcastNostrEventRequestRelationDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ChatMessageBroadcastNostrEventRequestRelationDao.kt similarity index 79% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatMessageBroadcastNostrEventRequestRelationDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ChatMessageBroadcastNostrEventRequestRelationDao.kt index 4dda3434..e2def85a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatMessageBroadcastNostrEventRequestRelationDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ChatMessageBroadcastNostrEventRequestRelationDao.kt @@ -1,9 +1,9 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Query import androidx.room3.Upsert -import to.curare.compose.database.model.ChatMessageBroadcastNostrEventRequestRelation +import com.machankura.bennu.compose.database.model.ChatMessageBroadcastNostrEventRequestRelation @Dao interface ChatMessageBroadcastNostrEventRequestRelationDao { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatMessageDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ChatMessageDao.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatMessageDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ChatMessageDao.kt index 7fdeb465..b2e0c24d 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatMessageDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ChatMessageDao.kt @@ -1,10 +1,10 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Query import androidx.room3.Transaction import androidx.room3.Upsert -import to.curare.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.ChatMessage import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.flow.Flow @@ -12,7 +12,7 @@ import kotlinx.coroutines.flow.Flow * The room's transcript, newest first -- the order the feed's `reverseLayout` draws from the * bottom up, so the first row is the line sitting above the composer. * - * `id DESC` is not decoration. [to.curare.compose.database.converters.CurareConverters] + * `id DESC` is not decoration. [com.machankura.bennu.compose.database.converters.BennuConverters] * stores an `Instant` as epoch seconds, so lines written inside one second tie: a ceremony * puts a dozen into a room faster than that, and a request with the answer it triggers * routinely lands inside one. `createdAt DESC` alone left those to whatever order the sorter @@ -33,11 +33,11 @@ private const val TRANSCRIPT = interface ChatMessageDao { @Transaction @Query(TRANSCRIPT) - fun observeChatMessagesByChatRoomId(chatRoomId: String): Flow> + fun observeChatMessagesByChatRoomId(chatRoomId: String): Flow> @Transaction @Query(TRANSCRIPT) - suspend fun getChatMessagesByChatRoomId(chatRoomId: String): List + suspend fun getChatMessagesByChatRoomId(chatRoomId: String): List @Query("SELECT * FROM ChatMessage WHERE giftWrapPayloadId = :giftWrapPayloadId ORDER BY createdAt DESC") suspend fun getChatMessagesByGiftWrapPayloadId(giftWrapPayloadId: HexKey): ChatMessage? @@ -58,7 +58,7 @@ interface ChatMessageDao { * a lookup per event -- `marmotGroupEventId` carries no index, so each of those * is a scan of the whole table. * - * [unresolvedTypes] is [to.curare.compose.database.model.ChatMessage.UNRESOLVED_MARMOT_TYPES]: + * [unresolvedTypes] is [com.machankura.bennu.compose.database.model.ChatMessage.UNRESOLVED_MARMOT_TYPES]: * lines that stand in for a message still to come rather than reporting one. */ @Query( @@ -72,5 +72,5 @@ interface ChatMessageDao { ): List @Upsert - suspend fun upsert(chatMessage: to.curare.compose.database.model.ChatMessage): Long + suspend fun upsert(chatMessage: com.machankura.bennu.compose.database.model.ChatMessage): Long } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ChatMessageNostrEventRelationDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ChatMessageNostrEventRelationDao.kt new file mode 100644 index 00000000..8494b885 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ChatMessageNostrEventRelationDao.kt @@ -0,0 +1,11 @@ +package com.machankura.bennu.compose.database.dao + +import androidx.room3.Dao +import androidx.room3.Upsert + +@Dao +interface ChatMessageNostrEventRelationDao { + + @Upsert + suspend fun upsert(chatMessageNostrEventRelation: com.machankura.bennu.compose.database.model.ChatMessageNostrEventRelation) +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatRoomDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ChatRoomDao.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatRoomDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ChatRoomDao.kt index d193203d..9754e4d5 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatRoomDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ChatRoomDao.kt @@ -1,19 +1,19 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Delete import androidx.room3.Query import androidx.room3.Transaction import androidx.room3.Upsert -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom import kotlinx.coroutines.flow.Flow /** * The chat-list queries carry the room's newest line with them. * * A correlated subquery rather than a `GROUP BY chatRoomId` with `MAX(createdAt)`: an - * [to.curare.compose.database.model.ChatMessage] timestamp is stored to the second, + * [com.machankura.bennu.compose.database.model.ChatMessage] timestamp is stored to the second, * so a burst of ritual lines written in the same second ties, and the aggregate would * pick one of them arbitrarily. Falling back to `id DESC` breaks the tie on the order * the rows were actually written, which is the order the transcript shows them in. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ConnectionDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ConnectionDao.kt similarity index 54% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ConnectionDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ConnectionDao.kt index 66cfd15e..1a158460 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ConnectionDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ConnectionDao.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Delete @@ -11,19 +11,19 @@ import kotlinx.coroutines.flow.Flow @Dao interface ConnectionDao { @Query("SELECT * FROM Connection LIMIT :limit") - suspend fun getAllConnections(limit: Int = 21): List + suspend fun getAllConnections(limit: Int = 21): List @Query("SELECT * FROM Connection WHERE (sourcePublicKey = :alicePublicKey AND destinationPublicKey = :bobPublicKey) OR (sourcePublicKey = :bobPublicKey AND destinationPublicKey = :alicePublicKey)") - fun observeRelation(alicePublicKey: HexKey, bobPublicKey: HexKey): Flow> + fun observeRelation(alicePublicKey: HexKey, bobPublicKey: HexKey): Flow> @Insert - suspend fun insertPlaceholderProfile(connection: to.curare.compose.database.model.Connection) + suspend fun insertPlaceholderProfile(connection: com.machankura.bennu.compose.database.model.Connection) @Upsert - suspend fun upsert(connection: to.curare.compose.database.model.Connection) + suspend fun upsert(connection: com.machankura.bennu.compose.database.model.Connection) @Delete - suspend fun delete(connection: to.curare.compose.database.model.Connection) + suspend fun delete(connection: com.machankura.bennu.compose.database.model.Connection) } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/DkgSessionDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/DkgSessionDao.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/DkgSessionDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/DkgSessionDao.kt index 1f1e8d28..fa571590 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/DkgSessionDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/DkgSessionDao.kt @@ -1,10 +1,10 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Query import androidx.room3.Upsert -import to.curare.compose.database.model.DkgParticipantMessage -import to.curare.compose.database.model.DkgSession +import com.machankura.bennu.compose.database.model.DkgParticipantMessage +import com.machankura.bennu.compose.database.model.DkgSession import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.Kind import kotlinx.coroutines.flow.Flow diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/FrostSigningSessionDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/FrostSigningSessionDao.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/FrostSigningSessionDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/FrostSigningSessionDao.kt index 08435645..094e698c 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/FrostSigningSessionDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/FrostSigningSessionDao.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Query @@ -7,11 +7,11 @@ import androidx.room3.Upsert import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.Kind import kotlinx.coroutines.flow.Flow -import to.curare.compose.database.model.FrostSignerMessage -import to.curare.compose.database.model.FrostSigningItem -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.intermdiate.FrostSignerTally -import to.curare.compose.database.model.intermdiate.LocalFrostSigningSession +import com.machankura.bennu.compose.database.model.FrostSignerMessage +import com.machankura.bennu.compose.database.model.FrostSigningItem +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.intermdiate.FrostSignerTally +import com.machankura.bennu.compose.database.model.intermdiate.LocalFrostSigningSession @Dao interface FrostSigningSessionDao { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GiftWrapMessageDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/GiftWrapMessageDao.kt similarity index 69% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GiftWrapMessageDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/GiftWrapMessageDao.kt index 8bd15d4a..d8ef54aa 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GiftWrapMessageDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/GiftWrapMessageDao.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Query @@ -7,7 +7,7 @@ import androidx.room3.Upsert @Dao interface GiftWrapMessageDao { @Query("SELECT * FROM GiftWrapMessage") - suspend fun getAllGiftWrapMessages(): List + suspend fun getAllGiftWrapMessages(): List /** * Every wrap addressed to [receiverPublicKey] that the device stored and never @@ -19,9 +19,9 @@ interface GiftWrapMessageDao { "AND id NOT IN (SELECT giftWrapMessageId FROM GiftWrapSeal WHERE giftWrapMessageId IS NOT NULL) " + "ORDER BY createdAt ASC" ) - suspend fun getUnopenedAddressedTo(receiverPublicKey: String): List + suspend fun getUnopenedAddressedTo(receiverPublicKey: String): List @Upsert - suspend fun upsert(giftWrapMessage: to.curare.compose.database.model.GiftWrapMessage) + suspend fun upsert(giftWrapMessage: com.machankura.bennu.compose.database.model.GiftWrapMessage) } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GiftWrapPayloadDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/GiftWrapPayloadDao.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GiftWrapPayloadDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/GiftWrapPayloadDao.kt index fe5c1037..22275c1e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GiftWrapPayloadDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/GiftWrapPayloadDao.kt @@ -1,10 +1,10 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Insert import androidx.room3.Query import androidx.room3.Upsert -import to.curare.compose.database.model.GiftWrapPayload +import com.machankura.bennu.compose.database.model.GiftWrapPayload import com.vitorpamplona.quartz.nip01Core.core.Kind import kotlinx.coroutines.flow.Flow diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GiftWrapSealDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/GiftWrapSealDao.kt similarity index 57% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GiftWrapSealDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/GiftWrapSealDao.kt index 30fe66b4..1f0ddbf6 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GiftWrapSealDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/GiftWrapSealDao.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Query @@ -7,12 +7,12 @@ import androidx.room3.Upsert @Dao interface GiftWrapSealDao { @Query("SELECT * FROM GiftWrapSeal") - suspend fun getAllGiftWrapSeals(): List + suspend fun getAllGiftWrapSeals(): List @Query("SELECT COUNT(*) FROM GiftWrapSeal WHERE giftWrapMessageId = :giftWrapMessageId") suspend fun countForMessage(giftWrapMessageId: String): Int @Upsert - suspend fun upsert(giftWrapSeal: to.curare.compose.database.model.GiftWrapSeal) + suspend fun upsert(giftWrapSeal: com.machankura.bennu.compose.database.model.GiftWrapSeal) } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GroupKeyStateDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/GroupKeyStateDao.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GroupKeyStateDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/GroupKeyStateDao.kt index 7fdc886d..15dd26f4 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GroupKeyStateDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/GroupKeyStateDao.kt @@ -1,11 +1,11 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Query import androidx.room3.Transaction import androidx.room3.Upsert import kotlinx.coroutines.flow.Flow -import to.curare.compose.database.model.GroupKeyState +import com.machankura.bennu.compose.database.model.GroupKeyState @Dao abstract class GroupKeyStateDao { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GroupSignedEventDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/GroupSignedEventDao.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GroupSignedEventDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/GroupSignedEventDao.kt index b6f6b73e..3e2d0736 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GroupSignedEventDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/GroupSignedEventDao.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Query @@ -8,7 +8,7 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.Kind import kotlin.time.Clock import kotlinx.coroutines.flow.Flow -import to.curare.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.GroupSignedEvent @Dao abstract class GroupSignedEventDao { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/InReplyToRelationDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/InReplyToRelationDao.kt similarity index 54% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/InReplyToRelationDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/InReplyToRelationDao.kt index 0e626560..05ef8840 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/InReplyToRelationDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/InReplyToRelationDao.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Insert @@ -8,14 +8,14 @@ import androidx.room3.Upsert @Dao interface InReplyToRelationDao { @Query("SELECT * FROM InReplyToRelation WHERE replyingNostrEventId = :replyingNostrEventId") - suspend fun getRepostByReplyingNostrEventId(replyingNostrEventId: String): to.curare.compose.database.model.InReplyToRelation? + suspend fun getRepostByReplyingNostrEventId(replyingNostrEventId: String): com.machankura.bennu.compose.database.model.InReplyToRelation? @Query("SELECT * FROM InReplyToRelation WHERE inReplyToNostrEventId = :inReplyToNostrEventId") - suspend fun getRepostByInReplyToNostrEventId(inReplyToNostrEventId: String): to.curare.compose.database.model.InReplyToRelation? + suspend fun getRepostByInReplyToNostrEventId(inReplyToNostrEventId: String): com.machankura.bennu.compose.database.model.InReplyToRelation? @Insert - suspend fun insert(inReplyToRelation: to.curare.compose.database.model.InReplyToRelation) + suspend fun insert(inReplyToRelation: com.machankura.bennu.compose.database.model.InReplyToRelation) @Upsert - suspend fun upsert(inReplyToRelation: to.curare.compose.database.model.InReplyToRelation) + suspend fun upsert(inReplyToRelation: com.machankura.bennu.compose.database.model.InReplyToRelation) } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraArtifactDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraArtifactDao.kt similarity index 80% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraArtifactDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraArtifactDao.kt index e3d42c37..9fb30e42 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraArtifactDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraArtifactDao.kt @@ -1,9 +1,9 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Query import androidx.room3.Upsert -import to.curare.compose.database.model.MantraArtifact +import com.machankura.bennu.compose.database.model.MantraArtifact @Dao interface MantraArtifactDao { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraArtifactVersionDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraArtifactVersionDao.kt similarity index 83% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraArtifactVersionDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraArtifactVersionDao.kt index 6113ed01..845c191d 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraArtifactVersionDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraArtifactVersionDao.kt @@ -1,11 +1,11 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Insert import androidx.room3.OnConflictStrategy.Companion.IGNORE import androidx.room3.Query import androidx.room3.Upsert -import to.curare.compose.database.model.MantraArtifactVersion +import com.machankura.bennu.compose.database.model.MantraArtifactVersion @Dao interface MantraArtifactVersionDao { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraChapterDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraChapterDao.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraChapterDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraChapterDao.kt index 9b899e4f..c25108e6 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraChapterDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraChapterDao.kt @@ -1,11 +1,11 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Insert import androidx.room3.OnConflictStrategy.Companion.IGNORE import androidx.room3.Query import androidx.room3.Upsert -import to.curare.compose.database.model.MantraChapter +import com.machankura.bennu.compose.database.model.MantraChapter @Dao interface MantraChapterDao { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraChunkDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraChunkDao.kt similarity index 82% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraChunkDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraChunkDao.kt index e24c5b9d..e0913038 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraChunkDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraChunkDao.kt @@ -1,11 +1,11 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Insert import androidx.room3.OnConflictStrategy.Companion.IGNORE import androidx.room3.Query import androidx.room3.Upsert -import to.curare.compose.database.model.MantraChunk +import com.machankura.bennu.compose.database.model.MantraChunk @Dao interface MantraChunkDao { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraDao.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraDao.kt index e73a2cf2..5cf51b92 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraDao.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Transaction @@ -7,23 +7,23 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.MantraArtifactVersion -import to.curare.compose.database.model.MantraDialect -import to.curare.compose.database.model.MarmotInnerEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.nip30303.ArtifactVersionEvent -import to.curare.compose.nostr.nip30303.DialectEvent -import to.curare.compose.nostr.nip30303.SubmissionEvent -import to.curare.compose.nostr.nip30303.tags.ArtifactIdTag -import to.curare.compose.repository.MantraRepository.Companion.DEFAULT_LICENSE -import to.curare.compose.repository.MantraRepository.Companion.DEFAULT_VISIBILITY +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.MantraArtifactVersion +import com.machankura.bennu.compose.database.model.MantraDialect +import com.machankura.bennu.compose.database.model.MarmotInnerEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.nip30303.ArtifactVersionEvent +import com.machankura.bennu.compose.nostr.nip30303.DialectEvent +import com.machankura.bennu.compose.nostr.nip30303.SubmissionEvent +import com.machankura.bennu.compose.nostr.nip30303.tags.ArtifactIdTag +import com.machankura.bennu.compose.repository.MantraRepository.Companion.DEFAULT_LICENSE +import com.machankura.bennu.compose.repository.MantraRepository.Companion.DEFAULT_VISIBILITY import kotlin.time.Instant @Dao abstract class MantraDao( - private val database: CurareDatabase, + private val database: BennuDatabase, ) { val logger = Logger.withTag("NostrDao") diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraDialectDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraDialectDao.kt similarity index 82% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraDialectDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraDialectDao.kt index 63ee74cf..1d4b7f40 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraDialectDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraDialectDao.kt @@ -1,11 +1,11 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Insert import androidx.room3.OnConflictStrategy.Companion.IGNORE import androidx.room3.Query import androidx.room3.Upsert -import to.curare.compose.database.model.MantraDialect +import com.machankura.bennu.compose.database.model.MantraDialect @Dao interface MantraDialectDao { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationArtifactVersionContributorDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraTranslationArtifactVersionContributorDao.kt similarity index 62% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationArtifactVersionContributorDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraTranslationArtifactVersionContributorDao.kt index 419b54dc..b15910d7 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationArtifactVersionContributorDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraTranslationArtifactVersionContributorDao.kt @@ -1,8 +1,8 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Upsert -import to.curare.compose.database.model.MantraTranslationArtifactVersionContributor +import com.machankura.bennu.compose.database.model.MantraTranslationArtifactVersionContributor @Dao interface MantraTranslationArtifactVersionContributorDao { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationArtifactVersionDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraTranslationArtifactVersionDao.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationArtifactVersionDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraTranslationArtifactVersionDao.kt index 4f0dc180..ca26aca6 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationArtifactVersionDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraTranslationArtifactVersionDao.kt @@ -1,11 +1,11 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Insert import androidx.room3.OnConflictStrategy.Companion.IGNORE import androidx.room3.Query import androidx.room3.Upsert -import to.curare.compose.database.model.MantraTranslationArtifactVersion +import com.machankura.bennu.compose.database.model.MantraTranslationArtifactVersion @Dao interface MantraTranslationArtifactVersionDao { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationChapterContributorDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraTranslationChapterContributorDao.kt similarity index 50% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationChapterContributorDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraTranslationChapterContributorDao.kt index e5590040..f5826cb7 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationChapterContributorDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraTranslationChapterContributorDao.kt @@ -1,9 +1,9 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Upsert -import to.curare.compose.database.model.MantraTranslationChapter -import to.curare.compose.database.model.MantraTranslationChapterContributor +import com.machankura.bennu.compose.database.model.MantraTranslationChapter +import com.machankura.bennu.compose.database.model.MantraTranslationChapterContributor @Dao interface MantraTranslationChapterContributorDao { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationChapterDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraTranslationChapterDao.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationChapterDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraTranslationChapterDao.kt index c3433741..9cb71940 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationChapterDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraTranslationChapterDao.kt @@ -1,11 +1,11 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Insert import androidx.room3.OnConflictStrategy.Companion.IGNORE import androidx.room3.Query import androidx.room3.Upsert -import to.curare.compose.database.model.MantraTranslationChapter +import com.machankura.bennu.compose.database.model.MantraTranslationChapter @Dao interface MantraTranslationChapterDao { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationChunkDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraTranslationChunkDao.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationChunkDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraTranslationChunkDao.kt index 1a4cef36..a80eca2d 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationChunkDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraTranslationChunkDao.kt @@ -1,11 +1,11 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Insert import androidx.room3.OnConflictStrategy.Companion.IGNORE import androidx.room3.Query import androidx.room3.Upsert -import to.curare.compose.database.model.MantraTranslationChunk +import com.machankura.bennu.compose.database.model.MantraTranslationChunk @Dao interface MantraTranslationChunkDao { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationContributorDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraTranslationContributorDao.kt similarity index 60% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationContributorDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraTranslationContributorDao.kt index afc35bc2..da5ce79e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationContributorDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraTranslationContributorDao.kt @@ -1,8 +1,8 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Upsert -import to.curare.compose.database.model.MantraTranslationContributor +import com.machankura.bennu.compose.database.model.MantraTranslationContributor @Dao interface MantraTranslationContributorDao { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraTranslationDao.kt similarity index 68% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraTranslationDao.kt index a23e1d11..0c13bb3f 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MantraTranslationDao.kt @@ -1,10 +1,10 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Insert import androidx.room3.OnConflictStrategy.Companion.IGNORE import androidx.room3.Upsert -import to.curare.compose.database.model.MantraTranslation +import com.machankura.bennu.compose.database.model.MantraTranslation @Dao interface MantraTranslationDao { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotCommitResultDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotCommitResultDao.kt similarity index 77% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotCommitResultDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotCommitResultDao.kt index b71878ef..ece30356 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotCommitResultDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotCommitResultDao.kt @@ -1,9 +1,9 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Query import androidx.room3.Upsert -import to.curare.compose.database.model.MarmotCommitResult +import com.machankura.bennu.compose.database.model.MarmotCommitResult import com.vitorpamplona.quartz.nip01Core.core.HexKey @Dao diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotGroupEventDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotGroupEventDao.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotGroupEventDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotGroupEventDao.kt index cbbaf757..17270638 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotGroupEventDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotGroupEventDao.kt @@ -1,10 +1,10 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Query import androidx.room3.Upsert import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.database.model.MarmotGroupEvent +import com.machankura.bennu.compose.database.model.MarmotGroupEvent @Dao interface MarmotGroupEventDao { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotInnerEventDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotInnerEventDao.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotInnerEventDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotInnerEventDao.kt index 17723db4..8867b41c 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotInnerEventDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotInnerEventDao.kt @@ -1,9 +1,9 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Query import androidx.room3.Upsert -import to.curare.compose.database.model.MarmotInnerEvent +import com.machankura.bennu.compose.database.model.MarmotInnerEvent import kotlinx.coroutines.flow.Flow @Dao diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotKeyPackageBundleDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotKeyPackageBundleDao.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotKeyPackageBundleDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotKeyPackageBundleDao.kt index 5af00447..fbeeec02 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotKeyPackageBundleDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotKeyPackageBundleDao.kt @@ -1,9 +1,9 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Query import androidx.room3.Upsert -import to.curare.compose.database.model.MarmotKeyPackageBundle +import com.machankura.bennu.compose.database.model.MarmotKeyPackageBundle import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.flow.Flow diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotKeyPackageDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotKeyPackageDao.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotKeyPackageDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotKeyPackageDao.kt index ba8fc08f..4fcd9ab0 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotKeyPackageDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotKeyPackageDao.kt @@ -1,9 +1,9 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Query import androidx.room3.Upsert -import to.curare.compose.database.model.MarmotKeyPackage +import com.machankura.bennu.compose.database.model.MarmotKeyPackage import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.flow.Flow diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotOutboundDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotOutboundDao.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotOutboundDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotOutboundDao.kt index 24cd9cd1..d8593d31 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotOutboundDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotOutboundDao.kt @@ -1,37 +1,37 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Transaction -import to.curare.compose.database.CurareDatabase -import to.curare.compose.managers.ChronicleManager -import to.curare.compose.database.model.BroadcastNostrEventRequest -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.ChatMessageBroadcastNostrEventRequestRelation -import to.curare.compose.database.model.ChatMessageNostrEventRelation -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.GiftWrapPayload -import to.curare.compose.database.model.MarmotCommitResult -import to.curare.compose.database.model.MarmotGroupEvent -import to.curare.compose.database.model.MarmotInnerEvent -import to.curare.compose.database.model.MarmotInnerEvent.Companion.disappearingExpiration -import to.curare.compose.database.model.MarmotKeyPackage -import to.curare.compose.database.model.MarmotRouting -import to.curare.compose.managers.MarmotGroupFactory -import to.curare.compose.nostr.MarmotProfile -import to.curare.compose.database.model.MarmotRetainedEpochSecret -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Participant -import to.curare.compose.exceptions.MarmotCommitPendingException -import to.curare.compose.exceptions.MarmotKeyPackageProfileException -import to.curare.compose.exceptions.MarmotMissingChatGroupException -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.extensions.exporterSecret -import to.curare.compose.extensions.shortened -import to.curare.compose.extensions.toHex -import to.curare.compose.managers.MarmotInboundManager.EPOCH_RETENTION_WINDOW -import to.curare.compose.nostr.MarmotDelivery -import to.curare.compose.nostr.MarmotDirectMessage -import to.curare.compose.nostr.Relays +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.managers.ChronicleManager +import com.machankura.bennu.compose.database.model.BroadcastNostrEventRequest +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.ChatMessageBroadcastNostrEventRequestRelation +import com.machankura.bennu.compose.database.model.ChatMessageNostrEventRelation +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.GiftWrapPayload +import com.machankura.bennu.compose.database.model.MarmotCommitResult +import com.machankura.bennu.compose.database.model.MarmotGroupEvent +import com.machankura.bennu.compose.database.model.MarmotInnerEvent +import com.machankura.bennu.compose.database.model.MarmotInnerEvent.Companion.disappearingExpiration +import com.machankura.bennu.compose.database.model.MarmotKeyPackage +import com.machankura.bennu.compose.database.model.MarmotRouting +import com.machankura.bennu.compose.managers.MarmotGroupFactory +import com.machankura.bennu.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.database.model.MarmotRetainedEpochSecret +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Participant +import com.machankura.bennu.compose.exceptions.MarmotCommitPendingException +import com.machankura.bennu.compose.exceptions.MarmotKeyPackageProfileException +import com.machankura.bennu.compose.exceptions.MarmotMissingChatGroupException +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.extensions.exporterSecret +import com.machankura.bennu.compose.extensions.shortened +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.managers.MarmotInboundManager.EPOCH_RETENTION_WINDOW +import com.machankura.bennu.compose.nostr.MarmotDelivery +import com.machankura.bennu.compose.nostr.MarmotDirectMessage +import com.machankura.bennu.compose.nostr.Relays import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.foundation.appEvents.MarmotAppEvent import com.vitorpamplona.quartz.marmot.appComponents.AppComponentIds @@ -64,7 +64,7 @@ import kotlin.time.Instant @Dao abstract class MarmotOutboundDao( - private val database: CurareDatabase + private val database: BennuDatabase ) { val logger = Logger.withTag(TAG) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotPublishObligationDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotPublishObligationDao.kt similarity index 80% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotPublishObligationDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotPublishObligationDao.kt index 32d414eb..d57d24d2 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotPublishObligationDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotPublishObligationDao.kt @@ -1,11 +1,11 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Query import androidx.room3.Upsert import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.database.model.MarmotOutboundGate -import to.curare.compose.database.model.MarmotPublishObligation +import com.machankura.bennu.compose.database.model.MarmotOutboundGate +import com.machankura.bennu.compose.database.model.MarmotPublishObligation @Dao interface MarmotPublishObligationDao { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotRetainedEpochSecretDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotRetainedEpochSecretDao.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotRetainedEpochSecretDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotRetainedEpochSecretDao.kt index 482398a1..48fd531e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotRetainedEpochSecretDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotRetainedEpochSecretDao.kt @@ -1,11 +1,11 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Delete import androidx.room3.Insert import androidx.room3.OnConflictStrategy.Companion.IGNORE import androidx.room3.Query -import to.curare.compose.database.model.MarmotRetainedEpochSecret +import com.machankura.bennu.compose.database.model.MarmotRetainedEpochSecret import com.vitorpamplona.quartz.nip01Core.core.HexKey @Dao diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotRoutingDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotRoutingDao.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotRoutingDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotRoutingDao.kt index f741969f..f236192b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotRoutingDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotRoutingDao.kt @@ -1,10 +1,10 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Query import androidx.room3.Upsert import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.database.model.MarmotRouting +import com.machankura.bennu.compose.database.model.MarmotRouting @Dao interface MarmotRoutingDao { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MentionDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MentionDao.kt similarity index 51% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MentionDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MentionDao.kt index 32577ad7..7dcfc75c 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MentionDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MentionDao.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Insert @@ -11,8 +11,8 @@ interface MentionDao { @Insert( onConflict = IGNORE ) - suspend fun insert(mention: to.curare.compose.database.model.Mention) + suspend fun insert(mention: com.machankura.bennu.compose.database.model.Mention) @Upsert - suspend fun upsert(mention: to.curare.compose.database.model.Mention) + suspend fun upsert(mention: com.machankura.bennu.compose.database.model.Mention) } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NegentropySynchronizeRequestDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NegentropySynchronizeRequestDao.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NegentropySynchronizeRequestDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NegentropySynchronizeRequestDao.kt index 699ad2c0..7be3d9a9 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NegentropySynchronizeRequestDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NegentropySynchronizeRequestDao.kt @@ -1,9 +1,9 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Query import androidx.room3.Upsert -import to.curare.compose.database.model.NegentropySynchronizeRequest +import com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest import kotlinx.coroutines.flow.Flow @Dao diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NegentropySynchronizeResultDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NegentropySynchronizeResultDao.kt new file mode 100644 index 00000000..3b98ee70 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NegentropySynchronizeResultDao.kt @@ -0,0 +1,10 @@ +package com.machankura.bennu.compose.database.dao + +import androidx.room3.Dao +import androidx.room3.Upsert + +@Dao +interface NegentropySynchronizeResultDao { + @Upsert + suspend fun upsert(negentropySynchronizeResult: com.machankura.bennu.compose.database.model.NegentropySynchronizeResult) +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NostrDao.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NostrDao.kt index 6f55aa2e..ac1381d7 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NostrDao.kt @@ -1,51 +1,51 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Transaction -import to.curare.compose.database.GENESIS_AT -import to.curare.compose.database.model.BroadcastNostrEventRequest -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.ChatMessageBroadcastNostrEventRequestRelation -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.Connection -import to.curare.compose.database.model.GiftWrapPayload -import to.curare.compose.database.model.MarmotGroupEvent -import to.curare.compose.database.model.MarmotKeyPackage -import to.curare.compose.database.model.Mention -import to.curare.compose.database.model.NegentropySynchronizeRequest -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.NostrEventRelay -import to.curare.compose.database.model.Participant -import to.curare.compose.database.model.Post -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.types.MarmotReindexReport -import to.curare.compose.database.model.types.SynchronizationFilter -import to.curare.compose.exceptions.GiftWrapImpersonationException -import to.curare.compose.exceptions.GiftWrapSealDecryptionException -import to.curare.compose.exceptions.GiftWrapUnsealException -import to.curare.compose.exceptions.MarmotMissingChatGroupException -import to.curare.compose.exceptions.MarmotMissingKeyPackageBundleException -import to.curare.compose.exceptions.MarmotMissingNostrGroupDataExtension -import to.curare.compose.exceptions.MarmotNotMemberOfChatGroupException -import to.curare.compose.extensions.toHex -import to.curare.compose.managers.ChillDkgRitualManager -import to.curare.compose.nostr.MarmotProfile -import to.curare.compose.nostr.Relays -import to.curare.compose.nostr.dkg.DkgRitualEvents -import to.curare.compose.nostr.frost.FrostSigningEvents -import to.curare.compose.managers.FrostSigningManager -import to.curare.compose.managers.GroupKeyStateManager -import to.curare.compose.managers.MlsGroupCache -import to.curare.compose.managers.MarmotInboundManager -import to.curare.compose.managers.MarmotReindexSweep -import to.curare.compose.managers.MarmotEngine.Companion.inRoom -import to.curare.compose.managers.WelcomeBundleMatch -import to.curare.compose.managers.roomDescription -import to.curare.compose.managers.roomName -import to.curare.compose.managers.roomId -import to.curare.compose.managers.routingId -import to.curare.compose.database.model.MarmotRouting +import com.machankura.bennu.compose.database.GENESIS_AT +import com.machankura.bennu.compose.database.model.BroadcastNostrEventRequest +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.ChatMessageBroadcastNostrEventRequestRelation +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.Connection +import com.machankura.bennu.compose.database.model.GiftWrapPayload +import com.machankura.bennu.compose.database.model.MarmotGroupEvent +import com.machankura.bennu.compose.database.model.MarmotKeyPackage +import com.machankura.bennu.compose.database.model.Mention +import com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.NostrEventRelay +import com.machankura.bennu.compose.database.model.Participant +import com.machankura.bennu.compose.database.model.Post +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.types.MarmotReindexReport +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.exceptions.GiftWrapImpersonationException +import com.machankura.bennu.compose.exceptions.GiftWrapSealDecryptionException +import com.machankura.bennu.compose.exceptions.GiftWrapUnsealException +import com.machankura.bennu.compose.exceptions.MarmotMissingChatGroupException +import com.machankura.bennu.compose.exceptions.MarmotMissingKeyPackageBundleException +import com.machankura.bennu.compose.exceptions.MarmotMissingNostrGroupDataExtension +import com.machankura.bennu.compose.exceptions.MarmotNotMemberOfChatGroupException +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.managers.ChillDkgRitualManager +import com.machankura.bennu.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.nostr.Relays +import com.machankura.bennu.compose.nostr.dkg.DkgRitualEvents +import com.machankura.bennu.compose.nostr.frost.FrostSigningEvents +import com.machankura.bennu.compose.managers.FrostSigningManager +import com.machankura.bennu.compose.managers.GroupKeyStateManager +import com.machankura.bennu.compose.managers.MlsGroupCache +import com.machankura.bennu.compose.managers.MarmotInboundManager +import com.machankura.bennu.compose.managers.MarmotReindexSweep +import com.machankura.bennu.compose.managers.MarmotEngine.Companion.inRoom +import com.machankura.bennu.compose.managers.WelcomeBundleMatch +import com.machankura.bennu.compose.managers.roomDescription +import com.machankura.bennu.compose.managers.roomName +import com.machankura.bennu.compose.managers.roomId +import com.machankura.bennu.compose.managers.routingId +import com.machankura.bennu.compose.database.model.MarmotRouting import co.touchlab.kermit.Logger import kotlinx.coroutines.CancellationException import com.vitorpamplona.quartz.marmot.GroupEventResult @@ -53,7 +53,7 @@ import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageEvent import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageRelayListEvent import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageUtils import com.vitorpamplona.quartz.marmot.mip02Welcome.WelcomeEvent -import to.curare.compose.managers.CommitOrdering +import com.machankura.bennu.compose.managers.CommitOrdering import com.vitorpamplona.quartz.marmot.mip03GroupMessages.GroupEvent import com.vitorpamplona.quartz.marmot.mls.group.MlsGroup import com.vitorpamplona.quartz.marmot.mls.messages.KeyPackageBundle @@ -76,7 +76,7 @@ import kotlin.time.Instant @Dao abstract class NostrDao( - private val database: to.curare.compose.database.CurareDatabase, + private val database: com.machankura.bennu.compose.database.BennuDatabase, ) { val logger = Logger.withTag("NostrDao") @@ -94,7 +94,7 @@ abstract class NostrDao( ) open suspend fun publishNostrEvent( - unsignedNostrEvent: to.curare.compose.database.model.UnsignedNostrEvent, + unsignedNostrEvent: com.machankura.bennu.compose.database.model.UnsignedNostrEvent, nostrEvent: NostrEvent, relayURLs: List, activeKeyPair: KeyPair @@ -129,7 +129,7 @@ abstract class NostrDao( */ @Transaction protected open suspend fun commitPublishedNostrEvent( - unsignedNostrEvent: to.curare.compose.database.model.UnsignedNostrEvent, + unsignedNostrEvent: com.machankura.bennu.compose.database.model.UnsignedNostrEvent, nostrEvent: NostrEvent, relayURLs: List ) { @@ -1867,7 +1867,7 @@ abstract class NostrDao( /** * Persist the rescheduling using a transaction so that we are assured of the existence of the - * [ChatMessageBroadcastNostrEventRequestRelation] when we produce the [to.curare.compose.database.model.BroadcastNostrEventReceipt] + * [ChatMessageBroadcastNostrEventRequestRelation] when we produce the [com.machankura.bennu.compose.database.model.BroadcastNostrEventReceipt] */ @Transaction open suspend fun rescheduleBroadcastNostrEventRequests(broadcastNostrEventRequests: List) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrEventDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NostrEventDao.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrEventDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NostrEventDao.kt index c2f68fb7..28985b78 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrEventDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NostrEventDao.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Insert @@ -8,8 +8,8 @@ import androidx.room3.RawQuery import androidx.room3.RoomRawQuery import androidx.room3.Transaction import androidx.room3.Upsert -import to.curare.compose.database.model.MarmotGroupEvent -import to.curare.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.MarmotGroupEvent +import com.machankura.bennu.compose.database.model.NostrEvent import com.vitorpamplona.quartz.marmot.mip03GroupMessages.GroupEvent import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.Kind @@ -21,35 +21,35 @@ import kotlin.time.Instant interface NostrEventDao { @Transaction @Query("SELECT * FROM NostrEvent WHERE kind in (:kinds) ORDER BY createdAt DESC") - fun observeNostrEvents(kinds: Array): Flow> + fun observeNostrEvents(kinds: Array): Flow> @Transaction @Query("SELECT * FROM NostrEvent WHERE content LIKE '%' || :search || '%' AND kind in (:kinds) ORDER BY createdAt DESC") fun observeFilteredNostrEvents( kinds: Array, search: String - ): Flow> + ): Flow> @Transaction @Query("SELECT * FROM NostrEvent WHERE kind in (:kinds) AND id in (:ids) ORDER BY createdAt DESC") fun observeFilteredNostrEvents( kinds: Array, ids: Array, - ): Flow> + ): Flow> @Transaction @Query("SELECT * FROM NostrEvent WHERE kind in (:kinds) AND pubKey in (:authors) ORDER BY createdAt DESC LIMIT 50") fun observeAuthoredNostrEvents( kinds: Array, authors: Array, - ): Flow> + ): Flow> @Transaction @Query("SELECT * FROM NostrEvent WHERE tags LIKE '%' || :publicKey || '%' AND kind in (:kinds) ORDER BY createdAt DESC") fun observePublicKeyMentionedNostrEvents( kinds: Array, publicKey: HexKey - ): Flow> + ): Flow> @Transaction @Query("SELECT * FROM NostrEvent WHERE tags LIKE '%' || :eventId || '%reply%' AND kind in (:kinds) AND createdAt > :since ORDER BY createdAt DESC") @@ -57,17 +57,17 @@ interface NostrEventDao { kinds: Array, eventId: HexKey, since: Instant - ): Flow> + ): Flow> @Transaction @RawQuery fun observePublicKeyFollowingNostrEvents( query: RoomRawQuery - ): Flow> + ): Flow> /** * Events matching an arbitrary NIP-01 filter, built by - * [to.curare.compose.database.query.NostrEventFilterQuery]. Raw because a nostr filter is + * [com.machankura.bennu.compose.database.query.NostrEventFilterQuery]. Raw because a nostr filter is * a variable set of constraints over variable-length lists, which `@Query` cannot express * without one method per shape — and the per-shape methods this replaced each dropped the * constraints they had no parameter for. @@ -83,10 +83,10 @@ interface NostrEventDao { * author's kind 0 arrives after the row does re-emits with the name filled in. */ @Transaction - @RawQuery(observedEntities = [NostrEvent::class, to.curare.compose.database.model.Profile::class]) + @RawQuery(observedEntities = [NostrEvent::class, com.machankura.bennu.compose.database.model.Profile::class]) fun observeNostrEventsMatchingFilter( query: RoomRawQuery - ): Flow> + ): Flow> @Transaction @Query("SELECT * FROM NostrEvent WHERE kind in (:kinds) AND createdAt > :since ORDER BY createdAt ASC LIMIT :limit") @@ -206,7 +206,7 @@ interface NostrEventDao { @Transaction @Query("SELECT * FROM NostrEvent WHERE id = :id") - fun observeNostrEventById(id: String): Flow + fun observeNostrEventById(id: String): Flow @Query("SELECT * FROM NostrEvent WHERE id = :id") suspend fun getNostrEventById(id: String): NostrEvent? diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrEventRelayDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NostrEventRelayDao.kt similarity index 70% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrEventRelayDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NostrEventRelayDao.kt index 4a532acc..c645eea9 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrEventRelayDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NostrEventRelayDao.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Query @@ -8,7 +8,7 @@ import androidx.room3.Upsert interface NostrEventRelayDao { @Upsert - suspend fun upsert(nostrEventRelay: to.curare.compose.database.model.NostrEventRelay) + suspend fun upsert(nostrEventRelay: com.machankura.bennu.compose.database.model.NostrEventRelay) /** The relays an event was seen on, oldest first. */ @Query("SELECT relayURL FROM NostrEventRelay WHERE nostrEventId = :nostrEventId ORDER BY createdAt ASC") diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrNip17Dao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NostrNip17Dao.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrNip17Dao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NostrNip17Dao.kt index 87f0d379..4d1a4891 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrNip17Dao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NostrNip17Dao.kt @@ -1,19 +1,19 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Transaction -import to.curare.compose.database.GENESIS_AT -import to.curare.compose.database.model.BroadcastNostrEventRequest -import to.curare.compose.database.model.ChatMessageBroadcastNostrEventRequestRelation -import to.curare.compose.database.model.ChatMessageNostrEventRelation -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.GiftWrapMessage -import to.curare.compose.database.model.GiftWrapPayload -import to.curare.compose.database.model.GiftWrapSeal -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Participant -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.Relays +import com.machankura.bennu.compose.database.GENESIS_AT +import com.machankura.bennu.compose.database.model.BroadcastNostrEventRequest +import com.machankura.bennu.compose.database.model.ChatMessageBroadcastNostrEventRequestRelation +import com.machankura.bennu.compose.database.model.ChatMessageNostrEventRelation +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.GiftWrapMessage +import com.machankura.bennu.compose.database.model.GiftWrapPayload +import com.machankura.bennu.compose.database.model.GiftWrapSeal +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Participant +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.Relays import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.tags.people.PTag @@ -25,7 +25,7 @@ import kotlin.time.Instant @Dao abstract class NostrNip17Dao( - private val database: to.curare.compose.database.CurareDatabase + private val database: com.machankura.bennu.compose.database.BennuDatabase ) { val logger = Logger.withTag(TAG) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ParticipantDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ParticipantDao.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ParticipantDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ParticipantDao.kt index 92a1e094..72bd6d74 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ParticipantDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ParticipantDao.kt @@ -1,10 +1,10 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Delete import androidx.room3.Query import androidx.room3.Upsert -import to.curare.compose.database.model.Participant +import com.machankura.bennu.compose.database.model.Participant @Dao interface ParticipantDao { diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/PostDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/PostDao.kt new file mode 100644 index 00000000..b4dbb5bf --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/PostDao.kt @@ -0,0 +1,21 @@ +package com.machankura.bennu.compose.database.dao + +import androidx.room3.Dao +import androidx.room3.Insert +import androidx.room3.Query +import androidx.room3.Upsert + +@Dao +interface PostDao { + @Query("SELECT * FROM Post") + suspend fun getAllPosts(): List + + @Query("SELECT * FROM Post WHERE id = :id") + suspend fun getPostById(id: String): com.machankura.bennu.compose.database.model.Post? + + @Insert + suspend fun insert(post: com.machankura.bennu.compose.database.model.Post) + + @Upsert + suspend fun upsert(post: com.machankura.bennu.compose.database.model.Post) +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ProfileDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ProfileDao.kt similarity index 80% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ProfileDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ProfileDao.kt index 2beb670e..50507b60 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ProfileDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ProfileDao.kt @@ -1,11 +1,11 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Insert import androidx.room3.Query import androidx.room3.Upsert -import to.curare.compose.database.GENESIS_AT -import to.curare.compose.database.model.Profile +import com.machankura.bennu.compose.database.GENESIS_AT +import com.machankura.bennu.compose.database.model.Profile import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.flow.Flow import kotlin.time.Instant @@ -23,7 +23,7 @@ interface ProfileDao { @Query("SELECT * FROM NostrEvent WHERE kind = 0 AND content LIKE '%' || :searchTerm || '%' LIMIT :limit") - suspend fun filterProfiles(searchTerm: String, limit: Int = 21): List + suspend fun filterProfiles(searchTerm: String, limit: Int = 21): List @Query("SELECT * FROM Profile WHERE publicKey = :publicKey") suspend fun getProfileByPublicKey(publicKey: String): Profile? @@ -35,10 +35,10 @@ interface ProfileDao { suspend fun getProfileByPublicKeys(publicKeys: List): List @Query("SELECT * FROM NostrEvent WHERE kind = 0 AND pubKey = :publicKey") - fun observeProfileWithFollowersByPublicKey(publicKey: String): Flow + fun observeProfileWithFollowersByPublicKey(publicKey: String): Flow @Query("SELECT * FROM NostrEvent WHERE kind = 0 AND pubKey = :publicKey") - fun observeProfileWithFollowingByPublicKey(publicKey: String): Flow + fun observeProfileWithFollowingByPublicKey(publicKey: String): Flow @Insert suspend fun insertPlaceholderProfile(profile: Profile) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/QuotedRelationDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/QuotedRelationDao.kt similarity index 55% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/QuotedRelationDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/QuotedRelationDao.kt index c18954b0..b19c2bfe 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/QuotedRelationDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/QuotedRelationDao.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Insert @@ -8,14 +8,14 @@ import androidx.room3.Upsert @Dao interface QuotedRelationDao { @Query("SELECT * FROM QuotedRelation WHERE quotingNostrEventId = :quotingNostrEventId") - suspend fun getRepostByQuotingNostrEventId(quotingNostrEventId: String): to.curare.compose.database.model.QuotedRelation? + suspend fun getRepostByQuotingNostrEventId(quotingNostrEventId: String): com.machankura.bennu.compose.database.model.QuotedRelation? @Query("SELECT * FROM QuotedRelation WHERE quotedNostrEventId = :quotedNostrEventId") - suspend fun getRepostByQuotedNostrEventId(quotedNostrEventId: String): to.curare.compose.database.model.QuotedRelation? + suspend fun getRepostByQuotedNostrEventId(quotedNostrEventId: String): com.machankura.bennu.compose.database.model.QuotedRelation? @Insert - suspend fun insert(quotedRelation: to.curare.compose.database.model.QuotedRelation) + suspend fun insert(quotedRelation: com.machankura.bennu.compose.database.model.QuotedRelation) @Upsert - suspend fun upsert(quotedRelation: to.curare.compose.database.model.QuotedRelation) + suspend fun upsert(quotedRelation: com.machankura.bennu.compose.database.model.QuotedRelation) } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ReactionDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ReactionDao.kt new file mode 100644 index 00000000..012267dc --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ReactionDao.kt @@ -0,0 +1,18 @@ +package com.machankura.bennu.compose.database.dao + +import androidx.room3.Dao +import androidx.room3.Query +import androidx.room3.Upsert +import kotlinx.coroutines.flow.Flow + +@Dao +interface ReactionDao { + @Query("SELECT * FROM Reaction") + suspend fun getAllReactions(): List + + @Query("SELECT * FROM Reaction WHERE id = :id") + fun getReactionById(id: String): Flow + + @Upsert + suspend fun upsert(reaction: com.machankura.bennu.compose.database.model.Reaction) +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/RecentSearchDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/RecentSearchDao.kt new file mode 100644 index 00000000..c2a39fe7 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/RecentSearchDao.kt @@ -0,0 +1,22 @@ +package com.machankura.bennu.compose.database.dao + +import androidx.room3.Dao +import androidx.room3.Delete +import androidx.room3.Query +import androidx.room3.Upsert +import kotlinx.coroutines.flow.Flow + +@Dao +interface RecentSearchDao { + @Query("SELECT * FROM RecentSearch WHERE `query` = :query") + fun observeRecentSearchByQuery(query: String): Flow + + @Query("SELECT * FROM RecentSearch ORDER BY createdAt DESC LIMIT :limit ") + suspend fun getAllRecentSearches(limit: Int = 21): List + + @Delete + suspend fun deleteRecentSearch(recentSearch: com.machankura.bennu.compose.database.model.RecentSearch) + + @Upsert + suspend fun upsert(recentSearch: com.machankura.bennu.compose.database.model.RecentSearch) +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/RelayDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/RelayDao.kt new file mode 100644 index 00000000..6cf07a80 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/RelayDao.kt @@ -0,0 +1,19 @@ +package com.machankura.bennu.compose.database.dao + +import androidx.room3.Dao +import androidx.room3.Query +import androidx.room3.Upsert +import kotlinx.coroutines.flow.Flow + +@Dao +interface RelayDao { + @Query("SELECT * FROM Relay") + suspend fun getAllPosts(): List + + @Query("SELECT * FROM Relay WHERE publicKey = :publicKey") + fun observePublicKeyRelays(publicKey: String): Flow> + + @Upsert + suspend fun upsert(relay: com.machankura.bennu.compose.database.model.Relay) + +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/RepostedRelationDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/RepostedRelationDao.kt similarity index 56% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/RepostedRelationDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/RepostedRelationDao.kt index bd2bdbd0..4e956ee2 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/RepostedRelationDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/RepostedRelationDao.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Query @@ -7,14 +7,14 @@ import androidx.room3.Upsert @Dao interface RepostedRelationDao { @Query("SELECT * FROM RepostedRelation") - suspend fun getAllReposts(): List + suspend fun getAllReposts(): List @Query("SELECT * FROM RepostedRelation WHERE repostingNostrEventId = :repostingNostrEventId") - suspend fun getRepostByRepostingId(repostingNostrEventId: String): to.curare.compose.database.model.RepostedRelation? + suspend fun getRepostByRepostingId(repostingNostrEventId: String): com.machankura.bennu.compose.database.model.RepostedRelation? @Query("SELECT * FROM RepostedRelation WHERE repostedNostrEventId = :repostedNostrEventId") - suspend fun getRepostByRepostedId(repostedNostrEventId: String): to.curare.compose.database.model.RepostedRelation? + suspend fun getRepostByRepostedId(repostedNostrEventId: String): com.machankura.bennu.compose.database.model.RepostedRelation? @Upsert - suspend fun upsert(repostedRelation: to.curare.compose.database.model.RepostedRelation) + suspend fun upsert(repostedRelation: com.machankura.bennu.compose.database.model.RepostedRelation) } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/SynchronizeNostrEventRequestDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/SynchronizeNostrEventRequestDao.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/SynchronizeNostrEventRequestDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/SynchronizeNostrEventRequestDao.kt index bc3659e9..90dc972a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/SynchronizeNostrEventRequestDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/SynchronizeNostrEventRequestDao.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Insert @@ -12,7 +12,7 @@ interface SynchronizeNostrEventRequestDao { // once-evaluated `Clock.System.now()` for the life of the Flow and hid every // request queued before the observer subscribed. @Query("SELECT * FROM SynchronizeNostrEventRequest WHERE status = :status ORDER BY createdAt ASC, id ASC LIMIT 1") - fun observeSynchronizeNostrEventRequestsByStatus(status: String): Flow + fun observeSynchronizeNostrEventRequestsByStatus(status: String): Flow /** * The same head-of-queue, for one identity: its own requests and the ones nobody @@ -24,13 +24,13 @@ interface SynchronizeNostrEventRequestDao { "WHERE status = :status AND (ownerPublicKey = :ownerPublicKey OR ownerPublicKey IS NULL) " + "ORDER BY createdAt ASC, id ASC LIMIT 1" ) - fun observeSynchronizeNostrEventRequestsByStatusFor(status: String, ownerPublicKey: String): Flow + fun observeSynchronizeNostrEventRequestsByStatusFor(status: String, ownerPublicKey: String): Flow @Query("SELECT COUNT(*) FROM SynchronizeNostrEventRequest WHERE purpose = :purpose AND status IN (:status)") fun observeSynchronizeNostrEventRequestByPurposeAndStatusCount(purpose: String, status: List): Flow @Upsert - suspend fun upsert(synchronizeNostrEventRequest: to.curare.compose.database.model.SynchronizeNostrEventRequest) + suspend fun upsert(synchronizeNostrEventRequest: com.machankura.bennu.compose.database.model.SynchronizeNostrEventRequest) /** * Records that the relay has said everything it has, *if* nothing arrived: a request @@ -42,8 +42,8 @@ interface SynchronizeNostrEventRequestDao { suspend fun markCompleteIfSent(id: String, status: String, updatedAt: kotlin.time.Instant): Int @Insert - suspend fun insert(synchronizeNostrEventRequests: List) + suspend fun insert(synchronizeNostrEventRequests: List) @Query("SELECT * FROM SynchronizeNostrEventRequest") - suspend fun getAll(): List + suspend fun getAll(): List } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/SynchronizeNostrEventResultDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/SynchronizeNostrEventResultDao.kt new file mode 100644 index 00000000..d8b1f2a3 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/SynchronizeNostrEventResultDao.kt @@ -0,0 +1,10 @@ +package com.machankura.bennu.compose.database.dao + +import androidx.room3.Dao +import androidx.room3.Upsert + +@Dao +interface SynchronizeNostrEventResultDao { + @Upsert + suspend fun upsert(synchronizeNostrEventResult: com.machankura.bennu.compose.database.model.SynchronizeNostrEventResult) +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/UnsignedNostrEventDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/UnsignedNostrEventDao.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/UnsignedNostrEventDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/UnsignedNostrEventDao.kt index 7c0dd4c1..93200326 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/UnsignedNostrEventDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/UnsignedNostrEventDao.kt @@ -1,13 +1,13 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Insert import androidx.room3.Query import androidx.room3.Transaction import androidx.room3.Upsert -import to.curare.compose.database.model.intermdiate.LocalAccount +import com.machankura.bennu.compose.database.model.intermdiate.LocalAccount import kotlinx.coroutines.flow.Flow -import to.curare.compose.database.model.UnsignedNostrEvent +import com.machankura.bennu.compose.database.model.UnsignedNostrEvent @Dao interface UnsignedNostrEventDao { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ZapDao.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ZapDao.kt similarity index 72% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ZapDao.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ZapDao.kt index 90ed491d..73df11fe 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ZapDao.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/ZapDao.kt @@ -1,9 +1,9 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Dao import androidx.room3.Query import androidx.room3.Upsert -import to.curare.compose.database.model.Zap +import com.machankura.bennu.compose.database.model.Zap import kotlinx.coroutines.flow.Flow @Dao diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/migrations/ChronicleRenameMigration.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/migrations/ChronicleRenameMigration.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/migrations/ChronicleRenameMigration.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/migrations/ChronicleRenameMigration.kt index 08af1d8f..b011a0f1 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/migrations/ChronicleRenameMigration.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/migrations/ChronicleRenameMigration.kt @@ -1,9 +1,9 @@ -package to.curare.compose.database.migrations +package com.machankura.bennu.compose.database.migrations import androidx.room3.migration.Migration import androidx.sqlite.SQLiteConnection import androidx.sqlite.execSQL -import to.curare.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.ChatMessage /** * Renames the group's signed record from "archive" to "chronicle", everywhere the diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/migrations/DkgApprovalRequestMigration.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/migrations/DkgApprovalRequestMigration.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/migrations/DkgApprovalRequestMigration.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/migrations/DkgApprovalRequestMigration.kt index 587e028e..2e8bd8c0 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/migrations/DkgApprovalRequestMigration.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/migrations/DkgApprovalRequestMigration.kt @@ -1,9 +1,9 @@ -package to.curare.compose.database.migrations +package com.machankura.bennu.compose.database.migrations import androidx.room3.migration.Migration import androidx.sqlite.SQLiteConnection import androidx.sqlite.execSQL -import to.curare.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.ChatMessage /** * Splits the single `dkgApprovalNeeded` chat line into one type per ritual step. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/migrations/FrostSigningItemMigration.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/migrations/FrostSigningItemMigration.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/migrations/FrostSigningItemMigration.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/migrations/FrostSigningItemMigration.kt index fa236a5a..06485bf1 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/migrations/FrostSigningItemMigration.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/migrations/FrostSigningItemMigration.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.migrations +package com.machankura.bennu.compose.database.migrations import androidx.room3.migration.Migration import androidx.sqlite.SQLiteConnection diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/migrations/JoinedGroupAtMigration.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/migrations/JoinedGroupAtMigration.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/migrations/JoinedGroupAtMigration.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/migrations/JoinedGroupAtMigration.kt index 0086806c..23a6813d 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/migrations/JoinedGroupAtMigration.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/migrations/JoinedGroupAtMigration.kt @@ -1,9 +1,9 @@ -package to.curare.compose.database.migrations +package com.machankura.bennu.compose.database.migrations import androidx.room3.migration.Migration import androidx.sqlite.SQLiteConnection import androidx.sqlite.execSQL -import to.curare.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.ChatMessage /** * Records when this device joined each room, and clears the lines it wrote for diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/BroadcastNostrEventReceipt.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/BroadcastNostrEventReceipt.kt similarity index 83% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/BroadcastNostrEventReceipt.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/BroadcastNostrEventReceipt.kt index bd93a06d..8409ce53 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/BroadcastNostrEventReceipt.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/BroadcastNostrEventReceipt.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -35,5 +35,5 @@ data class BroadcastNostrEventReceipt( val isSync: Boolean = false, val relayURL: String, val messages: String? = null -): to.curare.compose.database.model.traits.NostrEventEntity, - to.curare.compose.database.model.traits.UnsignedNostrEventEntity \ No newline at end of file +): com.machankura.bennu.compose.database.model.traits.NostrEventEntity, + com.machankura.bennu.compose.database.model.traits.UnsignedNostrEventEntity \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/BroadcastNostrEventRequest.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/BroadcastNostrEventRequest.kt similarity index 80% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/BroadcastNostrEventRequest.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/BroadcastNostrEventRequest.kt index e7b6ed89..393f29a6 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/BroadcastNostrEventRequest.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/BroadcastNostrEventRequest.kt @@ -1,12 +1,12 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.Index import androidx.room3.PrimaryKey -import to.curare.compose.database.model.traits.NostrEventEntity -import to.curare.compose.database.model.traits.TimestampedEntity -import to.curare.compose.database.model.traits.UnsignedNostrEventEntity +import com.machankura.bennu.compose.database.model.traits.NostrEventEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.database.model.traits.UnsignedNostrEventEntity import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/BroadcastStatus.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/BroadcastStatus.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/BroadcastStatus.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/BroadcastStatus.kt index 0eaca341..54d57b63 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/BroadcastStatus.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/BroadcastStatus.kt @@ -1,6 +1,6 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model -import to.curare.compose.exceptions.NostrPublishException +import com.machankura.bennu.compose.exceptions.NostrPublishException /** * What a `BroadcastNostrEventRequest.status` can be, and how a relay's answer diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessage.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/ChatMessage.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessage.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/ChatMessage.kt index 22048622..4b28c771 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessage.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/ChatMessage.kt @@ -1,20 +1,20 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.Index import androidx.room3.PrimaryKey import com.vitorpamplona.quartz.experimental.nip82SoftwareApps.application.name -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.model.traits.LocalStoreEntity -import to.curare.compose.database.model.traits.SoftDeletableEntity -import to.curare.compose.database.model.traits.TimestampedEntity -import to.curare.compose.database.model.traits.UserViewableEntity -import to.curare.compose.exceptions.MarmotUnprocessableInnerEventException -import to.curare.compose.managers.ChronicleManager -import to.curare.compose.managers.GroupKeyStateManager -import to.curare.compose.managers.SubgroupManager -import to.curare.compose.extensions.toHex +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.model.traits.LocalStoreEntity +import com.machankura.bennu.compose.database.model.traits.SoftDeletableEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.database.model.traits.UserViewableEntity +import com.machankura.bennu.compose.exceptions.MarmotUnprocessableInnerEventException +import com.machankura.bennu.compose.managers.ChronicleManager +import com.machankura.bennu.compose.managers.GroupKeyStateManager +import com.machankura.bennu.compose.managers.SubgroupManager +import com.machankura.bennu.compose.extensions.toHex import com.vitorpamplona.quartz.marmot.GroupEventResult import com.vitorpamplona.quartz.marmot.foundation.appEvents.MarmotAppEvent import com.vitorpamplona.quartz.marmot.mip03GroupMessages.GroupEvent @@ -23,34 +23,34 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent -import to.curare.compose.nostr.GroupCuratedSchema -import to.curare.compose.nostr.GroupNostrProfile -import to.curare.compose.nostr.curated.CuratedEntryEvent -import to.curare.compose.nostr.curated.CuratedSchemaEvent -import to.curare.compose.nostr.GroupRelaySet +import com.machankura.bennu.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.nostr.GroupNostrProfile +import com.machankura.bennu.compose.nostr.curated.CuratedEntryEvent +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaEvent +import com.machankura.bennu.compose.nostr.GroupRelaySet import com.vitorpamplona.quartz.nipC7Chats.ChatEvent -import to.curare.compose.nostr.dkg.DkgRitualEvents -import to.curare.compose.nostr.frost.FrostSigningEvents -import to.curare.compose.nostr.frost.GroupKeyStateEvent -import to.curare.compose.nostr.subgroup.SubgroupBirthCertificateEvent -import to.curare.compose.nostr.nip30303.ArtifactEvent -import to.curare.compose.nostr.nip30303.ArtifactVersionEvent -import to.curare.compose.nostr.nip30303.ChapterEvent -import to.curare.compose.nostr.nip30303.ChunkEvent -import to.curare.compose.nostr.nip30303.DialectEvent -import to.curare.compose.nostr.chronicle.ChronicleEvent -import to.curare.compose.nostr.chronicle.ChronicleRequestEvent -import to.curare.compose.nostr.nip30303.SubmissionEvent -import to.curare.compose.nostr.nip30303.TranslationArtifactVersionContributorListEvent -import to.curare.compose.nostr.nip30303.TranslationArtifactVersionEvent -import to.curare.compose.nostr.nip30303.TranslationChapterEvent -import to.curare.compose.nostr.nip30303.TranslationChunkEvent -import to.curare.compose.nostr.nip30303.TranslationContributorListEvent -import to.curare.compose.nostr.nip30303.TranslationEvent +import com.machankura.bennu.compose.nostr.dkg.DkgRitualEvents +import com.machankura.bennu.compose.nostr.frost.FrostSigningEvents +import com.machankura.bennu.compose.nostr.frost.GroupKeyStateEvent +import com.machankura.bennu.compose.nostr.subgroup.SubgroupBirthCertificateEvent +import com.machankura.bennu.compose.nostr.nip30303.ArtifactEvent +import com.machankura.bennu.compose.nostr.nip30303.ArtifactVersionEvent +import com.machankura.bennu.compose.nostr.nip30303.ChapterEvent +import com.machankura.bennu.compose.nostr.nip30303.ChunkEvent +import com.machankura.bennu.compose.nostr.nip30303.DialectEvent +import com.machankura.bennu.compose.nostr.chronicle.ChronicleEvent +import com.machankura.bennu.compose.nostr.chronicle.ChronicleRequestEvent +import com.machankura.bennu.compose.nostr.nip30303.SubmissionEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationArtifactVersionContributorListEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationArtifactVersionEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationChapterEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationChunkEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationContributorListEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationEvent import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.firstTagValue import com.vitorpamplona.quartz.nip59Giftwrap.wraps.GiftWrapEvent -import to.curare.compose.nostr.MarmotDirectMessage +import com.machankura.bennu.compose.nostr.MarmotDirectMessage import kotlin.time.Clock import kotlin.time.Instant @@ -740,7 +740,7 @@ data class ChatMessage( * key that says so. */ private suspend fun directMessage( - database: CurareDatabase, + database: BennuDatabase, activeKeyPair: KeyPair, groupEvent: GroupEvent, chatRoomId: String, @@ -853,7 +853,7 @@ data class ChatMessage( * which yields false, exactly as before. */ suspend fun fromGroupEventResult( - database: CurareDatabase, + database: BennuDatabase, activeKeyPair: KeyPair, groupEvent: GroupEvent, groupEventResult: GroupEventResult, @@ -1115,7 +1115,7 @@ data class ChatMessage( * writes carries it. */ internal suspend fun applyInnerEvent( - database: CurareDatabase, + database: BennuDatabase, groupId: String, event: Event, marmotGroupEventId: HexKey?, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessageBroadcastNostrEventReceiptRelation.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/ChatMessageBroadcastNostrEventReceiptRelation.kt similarity index 83% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessageBroadcastNostrEventReceiptRelation.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/ChatMessageBroadcastNostrEventReceiptRelation.kt index 442a03b5..08a6395c 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessageBroadcastNostrEventReceiptRelation.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/ChatMessageBroadcastNostrEventReceiptRelation.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -32,5 +32,5 @@ data class ChatMessageBroadcastNostrEventReceiptRelation( override val createdAt: Instant = Clock.System.now(), override val updatedAt: Instant = Clock.System.now(), override val savedAt: Instant = Clock.System.now() -): to.curare.compose.database.model.traits.TimestampedEntity, - to.curare.compose.database.model.traits.LocalStoreEntity +): com.machankura.bennu.compose.database.model.traits.TimestampedEntity, + com.machankura.bennu.compose.database.model.traits.LocalStoreEntity diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessageBroadcastNostrEventRequestRelation.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/ChatMessageBroadcastNostrEventRequestRelation.kt similarity index 83% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessageBroadcastNostrEventRequestRelation.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/ChatMessageBroadcastNostrEventRequestRelation.kt index 962c7194..e2330f24 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessageBroadcastNostrEventRequestRelation.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/ChatMessageBroadcastNostrEventRequestRelation.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -33,5 +33,5 @@ data class ChatMessageBroadcastNostrEventRequestRelation( override val createdAt: Instant = Clock.System.now(), override val updatedAt: Instant = Clock.System.now(), override val savedAt: Instant = Clock.System.now() -): to.curare.compose.database.model.traits.TimestampedEntity, - to.curare.compose.database.model.traits.LocalStoreEntity +): com.machankura.bennu.compose.database.model.traits.TimestampedEntity, + com.machankura.bennu.compose.database.model.traits.LocalStoreEntity diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessageNostrEventRelation.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/ChatMessageNostrEventRelation.kt similarity index 83% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessageNostrEventRelation.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/ChatMessageNostrEventRelation.kt index f1e7bf74..05b67446 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessageNostrEventRelation.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/ChatMessageNostrEventRelation.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -33,5 +33,5 @@ data class ChatMessageNostrEventRelation( override val createdAt: Instant = Clock.System.now(), override val updatedAt: Instant = Clock.System.now(), override val savedAt: Instant = Clock.System.now(), -): to.curare.compose.database.model.traits.TimestampedEntity, - to.curare.compose.database.model.traits.LocalStoreEntity +): com.machankura.bennu.compose.database.model.traits.TimestampedEntity, + com.machankura.bennu.compose.database.model.traits.LocalStoreEntity diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatRoom.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/ChatRoom.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatRoom.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/ChatRoom.kt index 0f78765b..69d939b5 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatRoom.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/ChatRoom.kt @@ -1,17 +1,17 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.Ignore import androidx.room3.PrimaryKey -import to.curare.compose.database.model.traits.LocalStoreEntity -import to.curare.compose.database.model.traits.SoftDeletableEntity -import to.curare.compose.database.model.traits.TimestampedEntity -import to.curare.compose.database.model.traits.UserViewableEntity +import com.machankura.bennu.compose.database.model.traits.LocalStoreEntity +import com.machankura.bennu.compose.database.model.traits.SoftDeletableEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.database.model.traits.UserViewableEntity import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.appComponents.MarmotGroupState import com.vitorpamplona.quartz.marmot.mls.group.MlsGroup -import to.curare.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.nostr.MarmotProfile import com.vitorpamplona.quartz.marmot.mls.group.MlsGroupState import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Connection.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/Connection.kt similarity index 72% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Connection.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/Connection.kt index 8606bf60..068a0ef2 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Connection.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/Connection.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -34,8 +34,8 @@ data class Connection( override val savedAt: Instant = Clock.System.now(), override val deletedAt: Instant? = null, override val broadcastedAt: Instant? = null, -): to.curare.compose.database.model.traits.NostrEventEntity, - to.curare.compose.database.model.traits.TimestampedEntity, - to.curare.compose.database.model.traits.LocalStoreEntity, - to.curare.compose.database.model.traits.BroadcastableEntity, - to.curare.compose.database.model.traits.SoftDeletableEntity +): com.machankura.bennu.compose.database.model.traits.NostrEventEntity, + com.machankura.bennu.compose.database.model.traits.TimestampedEntity, + com.machankura.bennu.compose.database.model.traits.LocalStoreEntity, + com.machankura.bennu.compose.database.model.traits.BroadcastableEntity, + com.machankura.bennu.compose.database.model.traits.SoftDeletableEntity diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/DkgParticipantMessage.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/DkgParticipantMessage.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/DkgParticipantMessage.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/DkgParticipantMessage.kt index bbf77f24..503badf9 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/DkgParticipantMessage.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/DkgParticipantMessage.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/DkgSession.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/DkgSession.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/DkgSession.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/DkgSession.kt index 248ce59b..8f71c1fe 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/DkgSession.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/DkgSession.kt @@ -1,13 +1,13 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.Index import androidx.room3.PrimaryKey -import to.curare.compose.database.model.traits.LocalStoreEntity -import to.curare.compose.database.model.traits.TimestampedEntity -import to.curare.compose.database.model.types.DkgApprovalStep -import to.curare.compose.database.model.types.DkgRitualStage +import com.machankura.bennu.compose.database.model.traits.LocalStoreEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.database.model.types.DkgApprovalStep +import com.machankura.bennu.compose.database.model.types.DkgRitualStage import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray import fr.acinq.bitcoin.ByteVector diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/FrostSignerMessage.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/FrostSignerMessage.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/FrostSignerMessage.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/FrostSignerMessage.kt index 3c8c2c5f..e5d1569e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/FrostSignerMessage.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/FrostSignerMessage.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/FrostSigningItem.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/FrostSigningItem.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/FrostSigningItem.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/FrostSigningItem.kt index e9ff8bd9..0afc0e06 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/FrostSigningItem.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/FrostSigningItem.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/FrostSigningSession.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/FrostSigningSession.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/FrostSigningSession.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/FrostSigningSession.kt index b5b4b86e..8786b3b6 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/FrostSigningSession.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/FrostSigningSession.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -7,10 +7,10 @@ import androidx.room3.PrimaryKey import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlin.time.Clock import kotlin.time.Instant -import to.curare.compose.database.model.traits.LocalStoreEntity -import to.curare.compose.database.model.traits.TimestampedEntity -import to.curare.compose.database.model.types.FrostSigningStage -import to.curare.compose.managers.SharedKeyDerivation +import com.machankura.bennu.compose.database.model.traits.LocalStoreEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.database.model.types.FrostSigningStage +import com.machankura.bennu.compose.managers.SharedKeyDerivation /** * One FROST signing session, as this device sees it. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GiftWrapMessage.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/GiftWrapMessage.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GiftWrapMessage.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/GiftWrapMessage.kt index d27239ff..c2895aa7 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GiftWrapMessage.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/GiftWrapMessage.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -72,11 +72,11 @@ data class GiftWrapMessage( override val savedAt: Instant = Clock.System.now(), override val viewedAt: Instant? = null, override val deletedAt: Instant? = null, // Who this message should be seen by (used to derive conversationId) -): to.curare.compose.database.model.traits.NostrEventEntity, - to.curare.compose.database.model.traits.TimestampedEntity, - to.curare.compose.database.model.traits.LocalStoreEntity, - to.curare.compose.database.model.traits.UserViewableEntity, - to.curare.compose.database.model.traits.SoftDeletableEntity { +): com.machankura.bennu.compose.database.model.traits.NostrEventEntity, + com.machankura.bennu.compose.database.model.traits.TimestampedEntity, + com.machankura.bennu.compose.database.model.traits.LocalStoreEntity, + com.machankura.bennu.compose.database.model.traits.UserViewableEntity, + com.machankura.bennu.compose.database.model.traits.SoftDeletableEntity { @Ignore private val logger = Logger.withTag("GiftWrapMessage") diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GiftWrapPayload.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/GiftWrapPayload.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GiftWrapPayload.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/GiftWrapPayload.kt index e35a31d1..0c65e544 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GiftWrapPayload.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/GiftWrapPayload.kt @@ -1,13 +1,13 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.Ignore import androidx.room3.PrimaryKey -import to.curare.compose.database.model.traits.LocalStoreEntity -import to.curare.compose.database.model.traits.SoftDeletableEntity -import to.curare.compose.database.model.traits.TimestampedEntity -import to.curare.compose.database.model.traits.UserViewableEntity +import com.machankura.bennu.compose.database.model.traits.LocalStoreEntity +import com.machankura.bennu.compose.database.model.traits.SoftDeletableEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.database.model.traits.UserViewableEntity import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.Kind diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GiftWrapSeal.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/GiftWrapSeal.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GiftWrapSeal.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/GiftWrapSeal.kt index 48ac2acd..31dd52ef 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GiftWrapSeal.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/GiftWrapSeal.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -62,10 +62,10 @@ data class GiftWrapSeal( override val savedAt: Instant = Clock.System.now(), override val viewedAt: Instant? = null, override val deletedAt: Instant? = null, // Who this message should be seen by (used to derive conversationId) -): to.curare.compose.database.model.traits.TimestampedEntity, - to.curare.compose.database.model.traits.LocalStoreEntity, - to.curare.compose.database.model.traits.UserViewableEntity, - to.curare.compose.database.model.traits.SoftDeletableEntity { +): com.machankura.bennu.compose.database.model.traits.TimestampedEntity, + com.machankura.bennu.compose.database.model.traits.LocalStoreEntity, + com.machankura.bennu.compose.database.model.traits.UserViewableEntity, + com.machankura.bennu.compose.database.model.traits.SoftDeletableEntity { @Ignore private val logger = Logger.withTag("GiftWrapMessage") diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GroupKeyState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/GroupKeyState.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GroupKeyState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/GroupKeyState.kt index c6cdae78..c01143be 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GroupKeyState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/GroupKeyState.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -7,9 +7,9 @@ import androidx.room3.PrimaryKey import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlin.time.Clock import kotlin.time.Instant -import to.curare.compose.database.model.traits.LocalStoreEntity -import to.curare.compose.database.model.traits.TimestampedEntity -import to.curare.compose.managers.SharedKeyDerivation +import com.machankura.bennu.compose.database.model.traits.LocalStoreEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.managers.SharedKeyDerivation /** * Which shared key a room signs with, as the group itself has said. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GroupSignedEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/GroupSignedEvent.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GroupSignedEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/GroupSignedEvent.kt index f848c584..e53667de 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GroupSignedEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/GroupSignedEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -9,10 +9,10 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.Kind import kotlin.time.Clock import kotlin.time.Instant -import to.curare.compose.database.model.traits.LocalStoreEntity -import to.curare.compose.database.model.traits.TimestampedEntity -import to.curare.compose.managers.SharedKeyDerivation -import to.curare.compose.nostr.frost.GroupKeyStateEvent +import com.machankura.bennu.compose.database.model.traits.LocalStoreEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.managers.SharedKeyDerivation +import com.machankura.bennu.compose.nostr.frost.GroupKeyStateEvent /** * An event the group's own key put a signature to, kept as the group made it. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/InReplyToRelation.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/InReplyToRelation.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/InReplyToRelation.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/InReplyToRelation.kt index d1b68a6c..7060364d 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/InReplyToRelation.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/InReplyToRelation.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -56,7 +56,7 @@ data class InReplyToRelation( override val savedAt: Instant = Clock.System.now(), override val viewedAt: Instant? = null, override val deletedAt: Instant? = null, -): to.curare.compose.database.model.traits.TimestampedEntity, - to.curare.compose.database.model.traits.LocalStoreEntity, - to.curare.compose.database.model.traits.UserViewableEntity, - to.curare.compose.database.model.traits.SoftDeletableEntity \ No newline at end of file +): com.machankura.bennu.compose.database.model.traits.TimestampedEntity, + com.machankura.bennu.compose.database.model.traits.LocalStoreEntity, + com.machankura.bennu.compose.database.model.traits.UserViewableEntity, + com.machankura.bennu.compose.database.model.traits.SoftDeletableEntity \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraArtifact.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraArtifact.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraArtifact.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraArtifact.kt index ca01b385..db1cdfb4 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraArtifact.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraArtifact.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -8,14 +8,14 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import com.vitorpamplona.quartz.nip31Alts.AltTag -import to.curare.compose.database.model.traits.OptionalNostrEventEntity -import to.curare.compose.database.model.traits.TimestampedEntity -import to.curare.compose.nostr.nip30303.ArtifactEvent -import to.curare.compose.nostr.nip30303.tags.ArtifactVersionMetadataTag -import to.curare.compose.nostr.nip30303.tags.DialectIdTag -import to.curare.compose.nostr.nip30303.tags.LicenseTag -import to.curare.compose.nostr.nip30303.tags.UrlTag -import to.curare.compose.nostr.nip30303.tags.VisibilityTag +import com.machankura.bennu.compose.database.model.traits.OptionalNostrEventEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.nostr.nip30303.ArtifactEvent +import com.machankura.bennu.compose.nostr.nip30303.tags.ArtifactVersionMetadataTag +import com.machankura.bennu.compose.nostr.nip30303.tags.DialectIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.LicenseTag +import com.machankura.bennu.compose.nostr.nip30303.tags.UrlTag +import com.machankura.bennu.compose.nostr.nip30303.tags.VisibilityTag import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraArtifactVersion.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraArtifactVersion.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraArtifactVersion.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraArtifactVersion.kt index d451391f..b73ccb1e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraArtifactVersion.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraArtifactVersion.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -8,10 +8,10 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import com.vitorpamplona.quartz.nip31Alts.AltTag -import to.curare.compose.database.model.traits.OptionalNostrEventEntity -import to.curare.compose.database.model.traits.TimestampedEntity -import to.curare.compose.nostr.nip30303.ArtifactVersionEvent -import to.curare.compose.nostr.nip30303.tags.ArtifactIdTag +import com.machankura.bennu.compose.database.model.traits.OptionalNostrEventEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.nostr.nip30303.ArtifactVersionEvent +import com.machankura.bennu.compose.nostr.nip30303.tags.ArtifactIdTag import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraChapter.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraChapter.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraChapter.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraChapter.kt index b60937fd..4d86b31c 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraChapter.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraChapter.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -8,14 +8,14 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import com.vitorpamplona.quartz.nip31Alts.AltTag -import to.curare.compose.database.model.traits.OptionalNostrEventEntity -import to.curare.compose.database.model.traits.TimestampedEntity -import to.curare.compose.nostr.nip30303.ChapterEvent -import to.curare.compose.nostr.nip30303.tags.ArtifactVersionIdTag -import to.curare.compose.nostr.nip30303.tags.IndexTag -import to.curare.compose.nostr.nip30303.tags.NameTag -import to.curare.compose.nostr.nip30303.tags.OriginalTextTag -import to.curare.compose.nostr.nip30303.tags.WordStatisticsTag +import com.machankura.bennu.compose.database.model.traits.OptionalNostrEventEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.nostr.nip30303.ChapterEvent +import com.machankura.bennu.compose.nostr.nip30303.tags.ArtifactVersionIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.IndexTag +import com.machankura.bennu.compose.nostr.nip30303.tags.NameTag +import com.machankura.bennu.compose.nostr.nip30303.tags.OriginalTextTag +import com.machankura.bennu.compose.nostr.nip30303.tags.WordStatisticsTag import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraChunk.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraChunk.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraChunk.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraChunk.kt index 8c1ceebf..f71f451d 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraChunk.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraChunk.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -8,12 +8,12 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import com.vitorpamplona.quartz.nip31Alts.AltTag -import to.curare.compose.database.model.traits.OptionalNostrEventEntity -import to.curare.compose.database.model.traits.TimestampedEntity -import to.curare.compose.nostr.nip30303.ChunkEvent -import to.curare.compose.nostr.nip30303.tags.ChapterIdTag -import to.curare.compose.nostr.nip30303.tags.IndexTag -import to.curare.compose.nostr.nip30303.tags.WordStatisticsTag +import com.machankura.bennu.compose.database.model.traits.OptionalNostrEventEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.nostr.nip30303.ChunkEvent +import com.machankura.bennu.compose.nostr.nip30303.tags.ChapterIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.IndexTag +import com.machankura.bennu.compose.nostr.nip30303.tags.WordStatisticsTag import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraDialect.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraDialect.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraDialect.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraDialect.kt index dcf997f8..113b4b99 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraDialect.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraDialect.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -8,12 +8,12 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import com.vitorpamplona.quartz.nip31Alts.AltTag -import to.curare.compose.database.model.traits.OptionalNostrEventEntity -import to.curare.compose.database.model.traits.TimestampedEntity -import to.curare.compose.nostr.nip30303.DialectEvent -import to.curare.compose.nostr.nip30303.tags.CountryTag -import to.curare.compose.nostr.nip30303.tags.LanguageTag -import to.curare.compose.nostr.nip30303.tags.NameTag +import com.machankura.bennu.compose.database.model.traits.OptionalNostrEventEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.nostr.nip30303.DialectEvent +import com.machankura.bennu.compose.nostr.nip30303.tags.CountryTag +import com.machankura.bennu.compose.nostr.nip30303.tags.LanguageTag +import com.machankura.bennu.compose.nostr.nip30303.tags.NameTag import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslation.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslation.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslation.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslation.kt index a55002e3..31983b4f 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslation.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslation.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -6,11 +6,11 @@ import androidx.room3.PrimaryKey import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.utils.ensure -import to.curare.compose.database.model.traits.OptionalNostrEventEntity -import to.curare.compose.database.model.traits.TimestampedEntity -import to.curare.compose.nostr.nip30303.TranslationEvent -import to.curare.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag -import to.curare.compose.nostr.nip30303.tags.TranslationChunkIdTag +import com.machankura.bennu.compose.database.model.traits.OptionalNostrEventEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.nostr.nip30303.TranslationEvent +import com.machankura.bennu.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.TranslationChunkIdTag import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationArtifactVersion.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslationArtifactVersion.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationArtifactVersion.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslationArtifactVersion.kt index 85308d41..8f7c45e5 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationArtifactVersion.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslationArtifactVersion.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -8,14 +8,14 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import com.vitorpamplona.quartz.nip31Alts.AltTag -import to.curare.compose.database.model.traits.OptionalNostrEventEntity -import to.curare.compose.database.model.traits.TimestampedEntity -import to.curare.compose.nostr.nip30303.TranslationArtifactVersionEvent -import to.curare.compose.nostr.nip30303.tags.ArtifactVersionIdTag -import to.curare.compose.nostr.nip30303.tags.DialectIdTag -import to.curare.compose.nostr.nip30303.tags.LicenseTag -import to.curare.compose.nostr.nip30303.tags.NameTag -import to.curare.compose.nostr.nip30303.tags.VisibilityTag +import com.machankura.bennu.compose.database.model.traits.OptionalNostrEventEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.nostr.nip30303.TranslationArtifactVersionEvent +import com.machankura.bennu.compose.nostr.nip30303.tags.ArtifactVersionIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.DialectIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.LicenseTag +import com.machankura.bennu.compose.nostr.nip30303.tags.NameTag +import com.machankura.bennu.compose.nostr.nip30303.tags.VisibilityTag import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationArtifactVersionContributor.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslationArtifactVersionContributor.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationArtifactVersionContributor.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslationArtifactVersionContributor.kt index 5ed6d046..ae958bed 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationArtifactVersionContributor.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslationArtifactVersionContributor.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -6,11 +6,11 @@ import androidx.room3.PrimaryKey import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.utils.TimeUtils -import to.curare.compose.database.model.traits.OptionalNostrEventEntity -import to.curare.compose.database.model.traits.TimestampedEntity -import to.curare.compose.nostr.nip30303.TranslationArtifactVersionContributorListEvent -import to.curare.compose.nostr.nip30303.tags.ContributorTag -import to.curare.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag +import com.machankura.bennu.compose.database.model.traits.OptionalNostrEventEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.nostr.nip30303.TranslationArtifactVersionContributorListEvent +import com.machankura.bennu.compose.nostr.nip30303.tags.ContributorTag +import com.machankura.bennu.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChapter.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslationChapter.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChapter.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslationChapter.kt index cab8b543..5aa9475e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChapter.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslationChapter.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -8,12 +8,12 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import com.vitorpamplona.quartz.nip31Alts.AltTag -import to.curare.compose.database.model.traits.OptionalNostrEventEntity -import to.curare.compose.database.model.traits.TimestampedEntity -import to.curare.compose.nostr.nip30303.TranslationChapterEvent -import to.curare.compose.nostr.nip30303.tags.ChapterIdTag -import to.curare.compose.nostr.nip30303.tags.IndexTag -import to.curare.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag +import com.machankura.bennu.compose.database.model.traits.OptionalNostrEventEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.nostr.nip30303.TranslationChapterEvent +import com.machankura.bennu.compose.nostr.nip30303.tags.ChapterIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.IndexTag +import com.machankura.bennu.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChapterContributor.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslationChapterContributor.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChapterContributor.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslationChapterContributor.kt index 79e5c894..8a776a53 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChapterContributor.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslationChapterContributor.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -7,11 +7,11 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nipF4Podcasts.metadata.tags.AuthorTag import com.vitorpamplona.quartz.utils.TimeUtils -import to.curare.compose.database.model.traits.OptionalNostrEventEntity -import to.curare.compose.database.model.traits.TimestampedEntity -import to.curare.compose.nostr.nip30303.TranslationChapterContributorListEvent -import to.curare.compose.nostr.nip30303.tags.ContributorTag -import to.curare.compose.nostr.nip30303.tags.TranslationChapterIdTag +import com.machankura.bennu.compose.database.model.traits.OptionalNostrEventEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.nostr.nip30303.TranslationChapterContributorListEvent +import com.machankura.bennu.compose.nostr.nip30303.tags.ContributorTag +import com.machankura.bennu.compose.nostr.nip30303.tags.TranslationChapterIdTag import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChunk.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslationChunk.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChunk.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslationChunk.kt index a7404d86..ac090b51 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChunk.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslationChunk.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -8,12 +8,12 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import com.vitorpamplona.quartz.nip31Alts.AltTag -import to.curare.compose.database.model.traits.OptionalNostrEventEntity -import to.curare.compose.database.model.traits.TimestampedEntity -import to.curare.compose.nostr.nip30303.TranslationChunkEvent -import to.curare.compose.nostr.nip30303.tags.ChunkIdTag -import to.curare.compose.nostr.nip30303.tags.IndexTag -import to.curare.compose.nostr.nip30303.tags.TranslationChapterIdTag +import com.machankura.bennu.compose.database.model.traits.OptionalNostrEventEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.nostr.nip30303.TranslationChunkEvent +import com.machankura.bennu.compose.nostr.nip30303.tags.ChunkIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.IndexTag +import com.machankura.bennu.compose.nostr.nip30303.tags.TranslationChapterIdTag import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChunkProposal.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslationChunkProposal.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChunkProposal.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslationChunkProposal.kt index 21560984..68c63b74 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChunkProposal.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslationChunkProposal.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -8,12 +8,12 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import com.vitorpamplona.quartz.nip31Alts.AltTag -import to.curare.compose.database.model.traits.OptionalNostrEventEntity -import to.curare.compose.database.model.traits.TimestampedEntity -import to.curare.compose.nostr.nip30303.TranslationChunkEvent -import to.curare.compose.nostr.nip30303.tags.ChunkIdTag -import to.curare.compose.nostr.nip30303.tags.IndexTag -import to.curare.compose.nostr.nip30303.tags.TranslationChapterIdTag +import com.machankura.bennu.compose.database.model.traits.OptionalNostrEventEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.nostr.nip30303.TranslationChunkEvent +import com.machankura.bennu.compose.nostr.nip30303.tags.ChunkIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.IndexTag +import com.machankura.bennu.compose.nostr.nip30303.tags.TranslationChapterIdTag import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationContributor.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslationContributor.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationContributor.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslationContributor.kt index 235a1cfc..56ef346f 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationContributor.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslationContributor.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -8,10 +8,10 @@ import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.DTag import com.vitorpamplona.quartz.nip31Alts.alt -import to.curare.compose.database.model.traits.OptionalNostrEventEntity -import to.curare.compose.database.model.traits.TimestampedEntity -import to.curare.compose.nostr.nip30303.TranslationContributorListEvent -import to.curare.compose.nostr.nip30303.tags.ContributorTag +import com.machankura.bennu.compose.database.model.traits.OptionalNostrEventEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.nostr.nip30303.TranslationContributorListEvent +import com.machankura.bennu.compose.nostr.nip30303.tags.ContributorTag import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotCommitResult.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MarmotCommitResult.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotCommitResult.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MarmotCommitResult.kt index 441648b0..b1651406 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotCommitResult.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MarmotCommitResult.kt @@ -1,12 +1,12 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.Ignore import androidx.room3.PrimaryKey -import to.curare.compose.database.model.traits.LocalStoreEntity -import to.curare.compose.database.model.traits.SoftDeletableEntity -import to.curare.compose.database.model.traits.TimestampedEntity -import to.curare.compose.database.model.traits.UserViewableEntity +import com.machankura.bennu.compose.database.model.traits.LocalStoreEntity +import com.machankura.bennu.compose.database.model.traits.SoftDeletableEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.database.model.traits.UserViewableEntity import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.mls.messages.CommitResult import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotGroupEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MarmotGroupEvent.kt similarity index 77% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotGroupEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MarmotGroupEvent.kt index 91ceee7c..df238e09 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotGroupEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MarmotGroupEvent.kt @@ -1,12 +1,12 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.PrimaryKey -import to.curare.compose.database.model.traits.BroadcastableEntity -import to.curare.compose.database.model.traits.LocalStoreEntity -import to.curare.compose.database.model.traits.SoftDeletableEntity -import to.curare.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.database.model.traits.BroadcastableEntity +import com.machankura.bennu.compose.database.model.traits.LocalStoreEntity +import com.machankura.bennu.compose.database.model.traits.SoftDeletableEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity import com.vitorpamplona.quartz.marmot.mip03GroupMessages.GroupEvent import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlin.time.Clock diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotInnerEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MarmotInnerEvent.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotInnerEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MarmotInnerEvent.kt index 93c0241e..00ead353 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotInnerEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MarmotInnerEvent.kt @@ -1,16 +1,16 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.Ignore import androidx.room3.PrimaryKey -import to.curare.compose.database.model.traits.LocalStoreEntity -import to.curare.compose.database.model.traits.SoftDeletableEntity -import to.curare.compose.database.model.traits.TimestampedEntity -import to.curare.compose.database.model.traits.UserViewableEntity +import com.machankura.bennu.compose.database.model.traits.LocalStoreEntity +import com.machankura.bennu.compose.database.model.traits.SoftDeletableEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.database.model.traits.UserViewableEntity import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.mls.group.MlsGroup -import to.curare.compose.managers.retentionSeconds +import com.machankura.bennu.compose.managers.retentionSeconds import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.Kind import com.vitorpamplona.quartz.nipC7Chats.ChatEvent diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotKeyPackage.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MarmotKeyPackage.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotKeyPackage.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MarmotKeyPackage.kt index 68b3b8b2..f54129d4 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotKeyPackage.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MarmotKeyPackage.kt @@ -1,14 +1,14 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.PrimaryKey -import to.curare.compose.database.model.traits.BroadcastableEntity -import to.curare.compose.database.model.traits.LocalStoreEntity -import to.curare.compose.database.model.traits.SoftDeletableEntity -import to.curare.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.database.model.traits.BroadcastableEntity +import com.machankura.bennu.compose.database.model.traits.LocalStoreEntity +import com.machankura.bennu.compose.database.model.traits.SoftDeletableEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.nostr.MarmotProfile import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotKeyPackageBundle.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MarmotKeyPackageBundle.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotKeyPackageBundle.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MarmotKeyPackageBundle.kt index 59a6a5d8..f18ac2c9 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotKeyPackageBundle.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MarmotKeyPackageBundle.kt @@ -1,14 +1,14 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.Index import androidx.room3.PrimaryKey -import to.curare.compose.database.model.traits.BroadcastableEntity -import to.curare.compose.database.model.traits.LocalStoreEntity -import to.curare.compose.database.model.traits.SoftDeletableEntity -import to.curare.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.database.model.traits.BroadcastableEntity +import com.machankura.bennu.compose.database.model.traits.LocalStoreEntity +import com.machankura.bennu.compose.database.model.traits.SoftDeletableEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.nostr.MarmotProfile import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotPublishObligation.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MarmotPublishObligation.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotPublishObligation.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MarmotPublishObligation.kt index 08d8cc66..63429220 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotPublishObligation.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MarmotPublishObligation.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.PrimaryKey diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotRetainedEpochSecret.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MarmotRetainedEpochSecret.kt similarity index 81% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotRetainedEpochSecret.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MarmotRetainedEpochSecret.kt index 3d8db96f..81f4cad8 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotRetainedEpochSecret.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MarmotRetainedEpochSecret.kt @@ -1,9 +1,9 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey -import to.curare.compose.database.model.traits.LocalStoreEntity -import to.curare.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.database.model.traits.LocalStoreEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotRouting.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MarmotRouting.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotRouting.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MarmotRouting.kt index a5963e93..67c067e2 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotRouting.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MarmotRouting.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Mention.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/Mention.kt similarity index 77% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Mention.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/Mention.kt index 22e8cbd6..39793edc 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Mention.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/Mention.kt @@ -1,12 +1,12 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.PrimaryKey -import to.curare.compose.database.model.traits.BroadcastableEntity -import to.curare.compose.database.model.traits.LocalStoreEntity -import to.curare.compose.database.model.traits.SoftDeletableEntity -import to.curare.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.database.model.traits.BroadcastableEntity +import com.machankura.bennu.compose.database.model.traits.LocalStoreEntity +import com.machankura.bennu.compose.database.model.traits.SoftDeletableEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/NegentropySynchronizeRequest.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/NegentropySynchronizeRequest.kt similarity index 83% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/NegentropySynchronizeRequest.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/NegentropySynchronizeRequest.kt index 08d3e438..21dcae4e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/NegentropySynchronizeRequest.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/NegentropySynchronizeRequest.kt @@ -1,10 +1,10 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.Index import androidx.room3.PrimaryKey -import to.curare.compose.network.serialization.encodeToJsonString +import com.machankura.bennu.compose.network.serialization.encodeToJsonString import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.utils.sha256.sha256 import io.ktor.utils.io.core.toByteArray @@ -40,7 +40,7 @@ data class NegentropySynchronizeRequest( val level: Int, - val synchronizationFilter: to.curare.compose.database.model.types.SynchronizationFilter, + val synchronizationFilter: com.machankura.bennu.compose.database.model.types.SynchronizationFilter, /** The identity that asked; null for rows from before, which any identity may drain. See [SynchronizeNostrEventRequest.ownerPublicKey]. */ val ownerPublicKey: HexKey? = null, @@ -48,8 +48,8 @@ data class NegentropySynchronizeRequest( override val nostrEventId: HexKey? = null, override val createdAt: Instant = Clock.System.now(), override val updatedAt: Instant = createdAt, -): to.curare.compose.database.model.traits.OptionalNostrEventEntity, - to.curare.compose.database.model.traits.TimestampedEntity { +): com.machankura.bennu.compose.database.model.traits.OptionalNostrEventEntity, + com.machankura.bennu.compose.database.model.traits.TimestampedEntity { fun toSynchronizeNostrEventRequest(): SynchronizeNostrEventRequest { val since = synchronizationFilter.since // TODO: Update since -> until based on what we have in the local db... @@ -73,7 +73,7 @@ data class NegentropySynchronizeRequest( companion object { fun computeId( relayURL: String, - synchronizationFilter: to.curare.compose.database.model.types.SynchronizationFilter, + synchronizationFilter: com.machankura.bennu.compose.database.model.types.SynchronizationFilter, ): String { return sha256( data = relayURL.toByteArray() diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/NegentropySynchronizeResult.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/NegentropySynchronizeResult.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/NegentropySynchronizeResult.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/NegentropySynchronizeResult.kt index 494faf2b..41f4b993 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/NegentropySynchronizeResult.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/NegentropySynchronizeResult.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -29,4 +29,4 @@ data class NegentropySynchronizeResult( override val createdAt: Instant = Clock.System.now(), override val updatedAt: Instant = createdAt, -): to.curare.compose.database.model.traits.TimestampedEntity \ No newline at end of file +): com.machankura.bennu.compose.database.model.traits.TimestampedEntity \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/NostrEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/NostrEvent.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/NostrEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/NostrEvent.kt index 5dd6f9ff..a98a78ca 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/NostrEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/NostrEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.Ignore @@ -75,11 +75,11 @@ data class NostrEvent( override val savedAt: Instant = Clock.System.now(), override val deletedAt: Instant? = null, override val broadcastedAt: Instant? = null, -): to.curare.compose.database.model.traits.UnsignedNostrEventEntity, - to.curare.compose.database.model.traits.TimestampedEntity, - to.curare.compose.database.model.traits.LocalStoreEntity, - to.curare.compose.database.model.traits.BroadcastableEntity, - to.curare.compose.database.model.traits.SoftDeletableEntity { +): com.machankura.bennu.compose.database.model.traits.UnsignedNostrEventEntity, + com.machankura.bennu.compose.database.model.traits.TimestampedEntity, + com.machankura.bennu.compose.database.model.traits.LocalStoreEntity, + com.machankura.bennu.compose.database.model.traits.BroadcastableEntity, + com.machankura.bennu.compose.database.model.traits.SoftDeletableEntity { @Ignore private val logger = Logger.withTag("NostrEvent") @@ -384,8 +384,8 @@ data class NostrEvent( } } - val quotedNotes = to.curare.compose.ui.composable.widgets.content.ContentParser.parse(content.trimEnd('\n', '\r'), emptyMap(), emptyMap(), trimBlankLines = true) - .filterIsInstance() + val quotedNotes = com.machankura.bennu.compose.ui.composable.widgets.content.ContentParser.parse(content.trimEnd('\n', '\r'), emptyMap(), emptyMap(), trimBlankLines = true) + .filterIsInstance() .firstOrNull() return quotedNotes?.let { quotedNote -> diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/NostrEventRelay.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/NostrEventRelay.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/NostrEventRelay.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/NostrEventRelay.kt index ef2665d9..eedd20d2 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/NostrEventRelay.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/NostrEventRelay.kt @@ -1,10 +1,10 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.Index -import to.curare.compose.database.model.traits.NostrEventEntity -import to.curare.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.database.model.traits.NostrEventEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Participant.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/Participant.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Participant.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/Participant.kt index c30ac24b..5b9182e2 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Participant.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/Participant.kt @@ -1,14 +1,14 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.PrimaryKey -import to.curare.compose.database.model.traits.BroadcastableEntity -import to.curare.compose.database.model.traits.LocalStoreEntity -import to.curare.compose.database.model.traits.SoftDeletableEntity -import to.curare.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.database.model.traits.BroadcastableEntity +import com.machankura.bennu.compose.database.model.traits.LocalStoreEntity +import com.machankura.bennu.compose.database.model.traits.SoftDeletableEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity import com.vitorpamplona.quartz.marmot.mls.group.MlsGroup -import to.curare.compose.managers.roomRelays +import com.machankura.bennu.compose.managers.roomRelays import com.vitorpamplona.quartz.marmot.mls.tree.Credential import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.toHexKey diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Post.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/Post.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Post.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/Post.kt index c8fadace..cef3b0e5 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Post.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/Post.kt @@ -1,17 +1,17 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.Index import androidx.room3.PrimaryKey -import to.curare.compose.database.model.traits.BroadcastableEntity -import to.curare.compose.database.model.traits.LocalStoreEntity -import to.curare.compose.database.model.traits.NostrEventEntity -import to.curare.compose.database.model.traits.ProfilePublicKeyEntity -import to.curare.compose.database.model.traits.ReplyingToEntity -import to.curare.compose.database.model.traits.SoftDeletableEntity -import to.curare.compose.database.model.traits.TimestampedEntity -import to.curare.compose.database.model.traits.UserViewableEntity +import com.machankura.bennu.compose.database.model.traits.BroadcastableEntity +import com.machankura.bennu.compose.database.model.traits.LocalStoreEntity +import com.machankura.bennu.compose.database.model.traits.NostrEventEntity +import com.machankura.bennu.compose.database.model.traits.ProfilePublicKeyEntity +import com.machankura.bennu.compose.database.model.traits.ReplyingToEntity +import com.machankura.bennu.compose.database.model.traits.SoftDeletableEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.database.model.traits.UserViewableEntity import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Profile.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/Profile.kt similarity index 83% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Profile.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/Profile.kt index ae031dcc..f93e4142 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Profile.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/Profile.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -20,14 +20,14 @@ import androidx.room3.Index import androidx.room3.PrimaryKey import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip51Lists.relayLists.RelayFeedsListEvent -import to.curare.compose.ui.composable.navigation.routes.NostrEventDetailRoute -import to.curare.compose.ui.composable.widgets.profile.ProfileAvatar -import to.curare.compose.ui.composable.widgets.profile.ProfileColor -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.database.GENESIS_AT +import com.machankura.bennu.compose.ui.composable.navigation.routes.NostrEventDetailRoute +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileColor +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.database.GENESIS_AT import kotlin.time.Clock import kotlin.time.Instant -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @Entity( foreignKeys = [ @@ -67,12 +67,12 @@ data class Profile( override val viewedAt: Instant? = null, override val deletedAt: Instant? = null, override val broadcastedAt: Instant? = null, -): to.curare.compose.database.model.traits.NostrEventEntity, - to.curare.compose.database.model.traits.TimestampedEntity, - to.curare.compose.database.model.traits.LocalStoreEntity, - to.curare.compose.database.model.traits.UserViewableEntity, - to.curare.compose.database.model.traits.BroadcastableEntity, - to.curare.compose.database.model.traits.SoftDeletableEntity { +): com.machankura.bennu.compose.database.model.traits.NostrEventEntity, + com.machankura.bennu.compose.database.model.traits.TimestampedEntity, + com.machankura.bennu.compose.database.model.traits.LocalStoreEntity, + com.machankura.bennu.compose.database.model.traits.UserViewableEntity, + com.machankura.bennu.compose.database.model.traits.BroadcastableEntity, + com.machankura.bennu.compose.database.model.traits.SoftDeletableEntity { /** * Read off a kind 0, as against the "LOADING..." placeholder minted when a pubkey * is first seen (`NostrDao.indexNostrEvent`), which is stamped [GENESIS_AT] so that @@ -108,7 +108,7 @@ data class Profile( } suspend fun profilePublicRelays( - nostrRepository: to.curare.compose.repository.NostrRepository + nostrRepository: com.machankura.bennu.compose.repository.NostrRepository ): List? { val relays = nostrRepository.getNostrEvent( publicKey, @@ -136,7 +136,7 @@ data class Profile( @Composable fun RenderAsListItem( activeUserPublicKey: String, - onNavigateToEvent: (to.curare.compose.ui.composable.navigation.routes.Route) -> Unit + onNavigateToEvent: (com.machankura.bennu.compose.ui.composable.navigation.routes.Route) -> Unit ) { Card( modifier = Modifier.fillMaxWidth().padding( @@ -189,7 +189,7 @@ fun ProfileRenderAsListItemPreview() { about = "I am the stone that the builder refused.", nostrEventId = "nostrEventId" ) - CurareTheme { + BennuTheme { Surface( modifier = Modifier.padding(20.dp) ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/QuotedRelation.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/QuotedRelation.kt similarity index 77% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/QuotedRelation.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/QuotedRelation.kt index 4c73778e..46389748 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/QuotedRelation.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/QuotedRelation.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -45,8 +45,8 @@ data class QuotedRelation( override val viewedAt: Instant? = null, override val deletedAt: Instant? = null, override val broadcastedAt: Instant? = null, -): to.curare.compose.database.model.traits.TimestampedEntity, - to.curare.compose.database.model.traits.LocalStoreEntity, - to.curare.compose.database.model.traits.UserViewableEntity, - to.curare.compose.database.model.traits.BroadcastableEntity, - to.curare.compose.database.model.traits.SoftDeletableEntity \ No newline at end of file +): com.machankura.bennu.compose.database.model.traits.TimestampedEntity, + com.machankura.bennu.compose.database.model.traits.LocalStoreEntity, + com.machankura.bennu.compose.database.model.traits.UserViewableEntity, + com.machankura.bennu.compose.database.model.traits.BroadcastableEntity, + com.machankura.bennu.compose.database.model.traits.SoftDeletableEntity \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Reaction.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/Reaction.kt similarity index 71% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Reaction.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/Reaction.kt index 2e692f64..1ebcb1b8 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Reaction.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/Reaction.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -52,11 +52,11 @@ data class Reaction( override val viewedAt: Instant? = null, override val deletedAt: Instant? = null, override val broadcastedAt: Instant? = null, -): to.curare.compose.database.model.traits.NostrEventEntity, - to.curare.compose.database.model.traits.ReplyingToEntity, - to.curare.compose.database.model.traits.ProfilePublicKeyEntity, - to.curare.compose.database.model.traits.TimestampedEntity, - to.curare.compose.database.model.traits.LocalStoreEntity, - to.curare.compose.database.model.traits.UserViewableEntity, - to.curare.compose.database.model.traits.BroadcastableEntity, - to.curare.compose.database.model.traits.SoftDeletableEntity +): com.machankura.bennu.compose.database.model.traits.NostrEventEntity, + com.machankura.bennu.compose.database.model.traits.ReplyingToEntity, + com.machankura.bennu.compose.database.model.traits.ProfilePublicKeyEntity, + com.machankura.bennu.compose.database.model.traits.TimestampedEntity, + com.machankura.bennu.compose.database.model.traits.LocalStoreEntity, + com.machankura.bennu.compose.database.model.traits.UserViewableEntity, + com.machankura.bennu.compose.database.model.traits.BroadcastableEntity, + com.machankura.bennu.compose.database.model.traits.SoftDeletableEntity diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/RecentSearch.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/RecentSearch.kt similarity index 80% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/RecentSearch.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/RecentSearch.kt index 70ae4a42..2b51576a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/RecentSearch.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/RecentSearch.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.PrimaryKey @@ -10,11 +10,11 @@ data class RecentSearch( @PrimaryKey val query: String, - val synchronizationFilters: Array? = null, + val synchronizationFilters: Array? = null, override val createdAt: Instant = Clock.System.now(), override val updatedAt: Instant = createdAt, -): to.curare.compose.database.model.traits.TimestampedEntity { +): com.machankura.bennu.compose.database.model.traits.TimestampedEntity { override fun equals(other: Any?): Boolean { if (this === other) return true if (other == null || this::class != other::class) return false diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Relay.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/Relay.kt similarity index 81% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Relay.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/Relay.kt index 7c1ada2d..b181c0f7 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Relay.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/Relay.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/RepostedRelation.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/RepostedRelation.kt similarity index 77% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/RepostedRelation.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/RepostedRelation.kt index 4dd94ffc..9acb68eb 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/RepostedRelation.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/RepostedRelation.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -44,8 +44,8 @@ data class RepostedRelation( override val viewedAt: Instant? = null, override val deletedAt: Instant? = null, override val broadcastedAt: Instant? = null, -): to.curare.compose.database.model.traits.TimestampedEntity, - to.curare.compose.database.model.traits.LocalStoreEntity, - to.curare.compose.database.model.traits.UserViewableEntity, - to.curare.compose.database.model.traits.BroadcastableEntity, - to.curare.compose.database.model.traits.SoftDeletableEntity \ No newline at end of file +): com.machankura.bennu.compose.database.model.traits.TimestampedEntity, + com.machankura.bennu.compose.database.model.traits.LocalStoreEntity, + com.machankura.bennu.compose.database.model.traits.UserViewableEntity, + com.machankura.bennu.compose.database.model.traits.BroadcastableEntity, + com.machankura.bennu.compose.database.model.traits.SoftDeletableEntity \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/SynchronizeNostrEventRequest.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/SynchronizeNostrEventRequest.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/SynchronizeNostrEventRequest.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/SynchronizeNostrEventRequest.kt index 95d474d9..a1457d5d 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/SynchronizeNostrEventRequest.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/SynchronizeNostrEventRequest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -41,7 +41,7 @@ data class SynchronizeNostrEventRequest( val level: Int, - val synchronizationFilters: Array, + val synchronizationFilters: Array, /** * The identity that asked, so that only its pump answers: what a fetch brings back @@ -54,9 +54,9 @@ data class SynchronizeNostrEventRequest( override val unsignedNostrEventId: Long? = null, override val createdAt: Instant = Clock.System.now(), override val updatedAt: Instant = createdAt, -): to.curare.compose.database.model.traits.OptionalNostrEventEntity, - to.curare.compose.database.model.traits.UnsignedNostrEventEntity, - to.curare.compose.database.model.traits.TimestampedEntity { +): com.machankura.bennu.compose.database.model.traits.OptionalNostrEventEntity, + com.machankura.bennu.compose.database.model.traits.UnsignedNostrEventEntity, + com.machankura.bennu.compose.database.model.traits.TimestampedEntity { override fun equals(other: Any?): Boolean { if (this === other) return true if (other == null || this::class != other::class) return false diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/SynchronizeNostrEventResult.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/SynchronizeNostrEventResult.kt similarity index 78% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/SynchronizeNostrEventResult.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/SynchronizeNostrEventResult.kt index 15cef7df..7cdfc17f 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/SynchronizeNostrEventResult.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/SynchronizeNostrEventResult.kt @@ -1,11 +1,11 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.Index import androidx.room3.PrimaryKey -import to.curare.compose.database.model.traits.OptionalNostrEventEntity -import to.curare.compose.database.model.traits.TimestampedEntity +import com.machankura.bennu.compose.database.model.traits.OptionalNostrEventEntity +import com.machankura.bennu.compose.database.model.traits.TimestampedEntity import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/UnsignedNostrEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/UnsignedNostrEvent.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/UnsignedNostrEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/UnsignedNostrEvent.kt index 96ab86bb..29f07e87 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/UnsignedNostrEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/UnsignedNostrEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.Index @@ -31,10 +31,10 @@ data class UnsignedNostrEvent( override val savedAt: Instant = Clock.System.now(), override val deletedAt: Instant? = null, override val broadcastedAt: Instant? = null, -): to.curare.compose.database.model.traits.TimestampedEntity, - to.curare.compose.database.model.traits.LocalStoreEntity, - to.curare.compose.database.model.traits.BroadcastableEntity, - to.curare.compose.database.model.traits.SoftDeletableEntity { +): com.machankura.bennu.compose.database.model.traits.TimestampedEntity, + com.machankura.bennu.compose.database.model.traits.LocalStoreEntity, + com.machankura.bennu.compose.database.model.traits.BroadcastableEntity, + com.machankura.bennu.compose.database.model.traits.SoftDeletableEntity { override fun equals(other: Any?): Boolean { if (this === other) return true diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Zap.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/Zap.kt similarity index 79% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Zap.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/Zap.kt index 9428e7b9..c0c05846 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Zap.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/Zap.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -61,9 +61,9 @@ data class Zap( override val viewedAt: Instant? = null, override val deletedAt: Instant? = null, override val broadcastedAt: Instant? = null, -) : to.curare.compose.database.model.traits.NostrEventEntity, - to.curare.compose.database.model.traits.TimestampedEntity, - to.curare.compose.database.model.traits.LocalStoreEntity, - to.curare.compose.database.model.traits.UserViewableEntity, - to.curare.compose.database.model.traits.BroadcastableEntity, - to.curare.compose.database.model.traits.SoftDeletableEntity +) : com.machankura.bennu.compose.database.model.traits.NostrEventEntity, + com.machankura.bennu.compose.database.model.traits.TimestampedEntity, + com.machankura.bennu.compose.database.model.traits.LocalStoreEntity, + com.machankura.bennu.compose.database.model.traits.UserViewableEntity, + com.machankura.bennu.compose.database.model.traits.BroadcastableEntity, + com.machankura.bennu.compose.database.model.traits.SoftDeletableEntity diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/ChatRoomLastMessage.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/ChatRoomLastMessage.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/ChatRoomLastMessage.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/ChatRoomLastMessage.kt index 3d5e8675..98b8e48b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/ChatRoomLastMessage.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/ChatRoomLastMessage.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model.intermdiate +package com.machankura.bennu.compose.database.model.intermdiate import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlin.time.Instant @@ -6,7 +6,7 @@ import kotlin.time.Instant /** * The newest line in a room, as much of it as a chat list row can show. * - * Not the [to.curare.compose.database.model.ChatMessage] itself: embedding the entity + * Not the [com.machankura.bennu.compose.database.model.ChatMessage] itself: embedding the entity * would mean aliasing thirty-odd columns onto every chat-room query, and colliding with * the room's own `id` and its four timestamps on the way. These six are everything a * one-line preview and the clock beside it are written from. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/FrostSignerTally.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/FrostSignerTally.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/FrostSignerTally.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/FrostSignerTally.kt index cb728194..ce41d2d2 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/FrostSignerTally.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/FrostSignerTally.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model.intermdiate +package com.machankura.bennu.compose.database.model.intermdiate import com.vitorpamplona.quartz.nip01Core.core.Kind diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalAccount.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalAccount.kt new file mode 100644 index 00000000..3fb63399 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalAccount.kt @@ -0,0 +1,39 @@ +package com.machankura.bennu.compose.database.model.intermdiate + +import androidx.room3.Embedded +import androidx.room3.Relation + +data class LocalAccount( + @Embedded val unsignedNostrEvent: com.machankura.bennu.compose.database.model.UnsignedNostrEvent?, + + @Relation( + parentColumns = ["id"], + entityColumns = ["unsignedNostrEventId"] + ) + val nostrEvent: com.machankura.bennu.compose.database.model.NostrEvent?, + + @Relation( + parentColumns = ["pubKey"], + entityColumns = ["publicKey"] + ) + val profile: com.machankura.bennu.compose.database.model.Profile?, + + @Relation( + parentColumns = ["id"], + entityColumns = ["unsignedNostrEventId"] + ) + val broadcastNostrEventRequest: com.machankura.bennu.compose.database.model.BroadcastNostrEventRequest?, + + @Relation( + parentColumns = ["id"], + entityColumns = ["unsignedNostrEventId"] + ) + val broadcastNostrEventReceipt: com.machankura.bennu.compose.database.model.BroadcastNostrEventReceipt?, + + @Relation( + parentColumns = ["id"], + entityColumns = ["unsignedNostrEventId"] + ) + val synchronizeNostrEventRequests: List, + + ) diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalBroadcastNostrEventRequest.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalBroadcastNostrEventRequest.kt new file mode 100644 index 00000000..d7116a79 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalBroadcastNostrEventRequest.kt @@ -0,0 +1,14 @@ +package com.machankura.bennu.compose.database.model.intermdiate + +import androidx.room3.Embedded +import androidx.room3.Relation + +data class LocalBroadcastNostrEventRequest( + @Embedded val broadcastNostrEventRequest: com.machankura.bennu.compose.database.model.BroadcastNostrEventRequest, + + @Relation( + parentColumns = ["nostrEventId"], + entityColumns = ["id"] + ) + val nostrEvent: com.machankura.bennu.compose.database.model.NostrEvent, +) diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalChatMessage.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalChatMessage.kt new file mode 100644 index 00000000..07181e61 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalChatMessage.kt @@ -0,0 +1,34 @@ +package com.machankura.bennu.compose.database.model.intermdiate + +import androidx.room3.Embedded +import androidx.room3.Relation + +data class LocalChatMessage( + @Embedded val chatMessage: com.machankura.bennu.compose.database.model.ChatMessage, + + @Relation( + parentColumns = ["senderPublicKey"], + entityColumns = ["publicKey"] + ) + val profile: com.machankura.bennu.compose.database.model.Profile?, + + @Relation( + parentColumns = ["id"], + entityColumns = ["chatMessageId"] + ) + val chatMessageBroadcastNostrEventReceiptRelation: com.machankura.bennu.compose.database.model.ChatMessageBroadcastNostrEventReceiptRelation? = null, + + + @Relation( + parentColumns = ["id"], + entityColumns = ["chatMessageId"] + ) + val chatMessageBroadcastNostrEventRequestRelation: com.machankura.bennu.compose.database.model.ChatMessageBroadcastNostrEventRequestRelation? = null, + + + @Relation( + parentColumns = ["id"], + entityColumns = ["chatMessageId"] + ) + val chatMessageNostrEventRelation: com.machankura.bennu.compose.database.model.ChatMessageNostrEventRelation? = null, +) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalChatRoom.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalChatRoom.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalChatRoom.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalChatRoom.kt index 69e3a618..4fc0a0fb 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalChatRoom.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalChatRoom.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model.intermdiate +package com.machankura.bennu.compose.database.model.intermdiate import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -9,12 +9,12 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.withStyle import androidx.room3.Embedded import androidx.room3.Relation -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.MarmotRouting -import to.curare.compose.database.model.Participant -import to.curare.compose.extensions.memberName -import to.curare.compose.ui.composable.widgets.profile.ProfileColor +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.MarmotRouting +import com.machankura.bennu.compose.database.model.Participant +import com.machankura.bennu.compose.extensions.memberName +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileColor import com.vitorpamplona.quartz.nip01Core.core.HexKey data class LocalChatRoom( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalFrostSigningSession.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalFrostSigningSession.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalFrostSigningSession.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalFrostSigningSession.kt index f10351f4..0ff48a27 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalFrostSigningSession.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalFrostSigningSession.kt @@ -1,10 +1,10 @@ -package to.curare.compose.database.model.intermdiate +package com.machankura.bennu.compose.database.model.intermdiate import androidx.room3.Embedded import androidx.room3.Relation -import to.curare.compose.database.model.FrostSigningItem -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.FrostSigningItem +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.Profile /** * One signing session with everything a list of them has to show. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalInReplyToNostrEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalInReplyToNostrEvent.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalInReplyToNostrEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalInReplyToNostrEvent.kt index d8ca84bb..6abd0b34 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalInReplyToNostrEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalInReplyToNostrEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model.intermdiate +package com.machankura.bennu.compose.database.model.intermdiate import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -15,26 +15,26 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.room3.Embedded import androidx.room3.Relation -import to.curare.compose.extensions.toFormattedTimeAndDateString -import to.curare.compose.ui.composable.widgets.profile.ProfileAvatar +import com.machankura.bennu.compose.extensions.toFormattedTimeAndDateString +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar data class LocalInReplyToNostrEvent( - @Embedded val inReplyToRelation: to.curare.compose.database.model.InReplyToRelation, + @Embedded val inReplyToRelation: com.machankura.bennu.compose.database.model.InReplyToRelation, @Relation( parentColumns = ["inReplyToNostrEventId"], entityColumns = ["id"] ) - val nostrEvent: to.curare.compose.database.model.NostrEvent, + val nostrEvent: com.machankura.bennu.compose.database.model.NostrEvent, @Relation( parentColumns = ["inReplyToProfilePublicKey"], entityColumns = ["publicKey"] ) - val profile: to.curare.compose.database.model.Profile?, + val profile: com.machankura.bennu.compose.database.model.Profile?, @Relation( - entity = to.curare.compose.database.model.Mention::class, + entity = com.machankura.bennu.compose.database.model.Mention::class, parentColumns = ["inReplyToNostrEventId"], entityColumns = ["mentioningNostrEventId"], ) diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalMention.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalMention.kt new file mode 100644 index 00000000..e0a72e62 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalMention.kt @@ -0,0 +1,14 @@ +package com.machankura.bennu.compose.database.model.intermdiate + +import androidx.room3.Embedded +import androidx.room3.Relation + +data class LocalMention( + @Embedded val mention: com.machankura.bennu.compose.database.model.Mention, + + @Relation( + parentColumns = ["mentionedPublicKey"], + entityColumns = ["publicKey"] + ) + val profile: com.machankura.bennu.compose.database.model.Profile?, +) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalNostrEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalNostrEvent.kt similarity index 80% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalNostrEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalNostrEvent.kt index 26efdb30..ee4e92c5 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalNostrEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalNostrEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model.intermdiate +package com.machankura.bennu.compose.database.model.intermdiate import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -13,43 +13,43 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.room3.Embedded import androidx.room3.Relation -import to.curare.compose.extensions.toFormattedTimeAndDateString +import com.machankura.bennu.compose.extensions.toFormattedTimeAndDateString import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.ui.composable.widgets.content.RichContent -import to.curare.compose.ui.composable.widgets.profile.ProfileAvatar +import com.machankura.bennu.compose.ui.composable.widgets.content.RichContent +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar data class LocalNostrEvent( - @Embedded val nostrEvent: to.curare.compose.database.model.NostrEvent, + @Embedded val nostrEvent: com.machankura.bennu.compose.database.model.NostrEvent, @Relation( parentColumns = ["pubKey"], entityColumns = ["publicKey"] ) - val profile: to.curare.compose.database.model.Profile?, + val profile: com.machankura.bennu.compose.database.model.Profile?, @Relation( - entity = to.curare.compose.database.model.RepostedRelation::class, + entity = com.machankura.bennu.compose.database.model.RepostedRelation::class, parentColumns = ["id"], entityColumns = ["repostingNostrEventId"] ) val localRepostedNostrEvent: LocalRepostedNostrEvent? = null, @Relation( - entity = to.curare.compose.database.model.QuotedRelation::class, + entity = com.machankura.bennu.compose.database.model.QuotedRelation::class, parentColumns = ["id"], entityColumns = ["quotingNostrEventId"] ) val localQuotedNostrEvent: LocalQuotedNostrEvent? = null, @Relation( - entity = to.curare.compose.database.model.InReplyToRelation::class, + entity = com.machankura.bennu.compose.database.model.InReplyToRelation::class, parentColumns = ["id"], entityColumns = ["replyingNostrEventId"] ) val localInReplyToNostrEvent: LocalInReplyToNostrEvent? = null, @Relation( - entity = to.curare.compose.database.model.Mention::class, + entity = com.machankura.bennu.compose.database.model.Mention::class, parentColumns = ["id"], entityColumns = ["mentioningNostrEventId"], ) diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalParticipant.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalParticipant.kt new file mode 100644 index 00000000..725b0b2e --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalParticipant.kt @@ -0,0 +1,14 @@ +package com.machankura.bennu.compose.database.model.intermdiate + +import androidx.room3.Embedded +import androidx.room3.Relation + +data class LocalParticipant( + @Embedded val participant: com.machankura.bennu.compose.database.model.Participant, + + @Relation( + parentColumns = ["participantPublicKey"], + entityColumns = ["publicKey"] + ) + val profile: com.machankura.bennu.compose.database.model.Profile?, +) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalPost.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalPost.kt similarity index 58% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalPost.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalPost.kt index e636b124..ad7a7fa4 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalPost.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalPost.kt @@ -1,9 +1,9 @@ -package to.curare.compose.database.model.intermdiate +package com.machankura.bennu.compose.database.model.intermdiate import androidx.room3.Embedded import androidx.room3.Relation -import to.curare.compose.database.model.Post -import to.curare.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.Post +import com.machankura.bennu.compose.database.model.Profile data class LocalPost( @Embedded val post: Post, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalProfile.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalProfile.kt similarity index 57% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalProfile.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalProfile.kt index 1ab64ac4..e714a5f4 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalProfile.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalProfile.kt @@ -1,9 +1,9 @@ -package to.curare.compose.database.model.intermdiate +package com.machankura.bennu.compose.database.model.intermdiate import androidx.room3.Embedded import androidx.room3.Relation -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile data class LocalProfile( @Embedded val nostrEvent: NostrEvent, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalProfileWithFollowers.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalProfileWithFollowers.kt similarity index 55% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalProfileWithFollowers.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalProfileWithFollowers.kt index d2630a26..2bd86815 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalProfileWithFollowers.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalProfileWithFollowers.kt @@ -1,26 +1,26 @@ -package to.curare.compose.database.model.intermdiate +package com.machankura.bennu.compose.database.model.intermdiate import androidx.room3.Embedded import androidx.room3.Junction import androidx.room3.Relation data class LocalProfileWithFollowers( - @Embedded val nostrEvent: to.curare.compose.database.model.NostrEvent, + @Embedded val nostrEvent: com.machankura.bennu.compose.database.model.NostrEvent, @Relation( parentColumns = ["pubKey"], entityColumns = ["publicKey"] ) - val profile: to.curare.compose.database.model.Profile, + val profile: com.machankura.bennu.compose.database.model.Profile, @Relation( parentColumns = ["pubKey"], entityColumns = ["publicKey"], associateBy = Junction( - value = to.curare.compose.database.model.Connection::class, + value = com.machankura.bennu.compose.database.model.Connection::class, parentColumns = ["destinationPublicKey"], entityColumns = ["sourcePublicKey"] ) ) - val followers: List + val followers: List ) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalProfileWithFollowing.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalProfileWithFollowing.kt similarity index 55% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalProfileWithFollowing.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalProfileWithFollowing.kt index a62d52eb..0841fc79 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalProfileWithFollowing.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalProfileWithFollowing.kt @@ -1,26 +1,26 @@ -package to.curare.compose.database.model.intermdiate +package com.machankura.bennu.compose.database.model.intermdiate import androidx.room3.Embedded import androidx.room3.Junction import androidx.room3.Relation data class LocalProfileWithFollowing( - @Embedded val nostrEvent: to.curare.compose.database.model.NostrEvent, + @Embedded val nostrEvent: com.machankura.bennu.compose.database.model.NostrEvent, @Relation( parentColumns = ["pubKey"], entityColumns = ["publicKey"] ) - val profile: to.curare.compose.database.model.Profile, + val profile: com.machankura.bennu.compose.database.model.Profile, @Relation( parentColumns = ["pubKey"], entityColumns = ["publicKey"], associateBy = Junction( - value = to.curare.compose.database.model.Connection::class, + value = com.machankura.bennu.compose.database.model.Connection::class, parentColumns = ["sourcePublicKey"], entityColumns = ["destinationPublicKey"] ) ) - val following: List + val following: List ) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalQuotedNostrEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalQuotedNostrEvent.kt similarity index 81% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalQuotedNostrEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalQuotedNostrEvent.kt index 1c09dda7..51cee24a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalQuotedNostrEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalQuotedNostrEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model.intermdiate +package com.machankura.bennu.compose.database.model.intermdiate import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -14,33 +14,33 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.room3.Embedded import androidx.room3.Relation -import to.curare.compose.extensions.toFormattedTimeAndDateString +import com.machankura.bennu.compose.extensions.toFormattedTimeAndDateString import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.QuotedRelation -import to.curare.compose.ui.composable.widgets.content.RichContent -import to.curare.compose.ui.composable.widgets.profile.ProfileAvatar -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.QuotedRelation +import com.machankura.bennu.compose.ui.composable.widgets.content.RichContent +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.theme.ConformancePreviews data class LocalQuotedNostrEvent( - @Embedded val quotedRelation: to.curare.compose.database.model.QuotedRelation, + @Embedded val quotedRelation: com.machankura.bennu.compose.database.model.QuotedRelation, @Relation( parentColumns = ["quotedNostrEventId"], entityColumns = ["id"] ) - val nostrEvent: to.curare.compose.database.model.NostrEvent, + val nostrEvent: com.machankura.bennu.compose.database.model.NostrEvent, @Relation( parentColumns = ["quotedProfilePublicKey"], entityColumns = ["publicKey"] ) - val profile: to.curare.compose.database.model.Profile?, + val profile: com.machankura.bennu.compose.database.model.Profile?, @Relation( - entity = to.curare.compose.database.model.Mention::class, + entity = com.machankura.bennu.compose.database.model.Mention::class, parentColumns = ["quotedNostrEventId"], entityColumns = ["mentioningNostrEventId"], ) @@ -79,7 +79,7 @@ data class LocalQuotedNostrEvent( Text( text = staticIdentifier, style = MaterialTheme.typography.bodySmall, - color = to.curare.compose.ui.composable.widgets.profile.ProfileColor.fromProfile(profile) + color = com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileColor.fromProfile(profile) ) } } @@ -113,7 +113,7 @@ data class LocalQuotedNostrEvent( @ConformancePreviews @Composable private fun LocalQuotedNostrEventPreview() { - CurareTheme { + BennuTheme { Surface( modifier = Modifier.padding(20.dp) ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalRepostedNostrEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalRepostedNostrEvent.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalRepostedNostrEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalRepostedNostrEvent.kt index f5ceb57e..b5f135df 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalRepostedNostrEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/intermdiate/LocalRepostedNostrEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model.intermdiate +package com.machankura.bennu.compose.database.model.intermdiate import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -15,26 +15,26 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.room3.Embedded import androidx.room3.Relation -import to.curare.compose.extensions.toFormattedTimeAndDateString -import to.curare.compose.ui.composable.widgets.profile.ProfileAvatar +import com.machankura.bennu.compose.extensions.toFormattedTimeAndDateString +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar data class LocalRepostedNostrEvent( - @Embedded val repostedRelation: to.curare.compose.database.model.RepostedRelation, + @Embedded val repostedRelation: com.machankura.bennu.compose.database.model.RepostedRelation, @Relation( parentColumns = ["repostedNostrEventId"], entityColumns = ["id"] ) - val nostrEvent: to.curare.compose.database.model.NostrEvent, + val nostrEvent: com.machankura.bennu.compose.database.model.NostrEvent, @Relation( parentColumns = ["repostedProfilePublicKey"], entityColumns = ["publicKey"] ) - val profile: to.curare.compose.database.model.Profile?, + val profile: com.machankura.bennu.compose.database.model.Profile?, @Relation( - entity = to.curare.compose.database.model.Mention::class, + entity = com.machankura.bennu.compose.database.model.Mention::class, parentColumns = ["repostedNostrEventId"], entityColumns = ["mentioningNostrEventId"], ) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/BroadcastableEntity.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/BroadcastableEntity.kt similarity index 60% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/BroadcastableEntity.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/BroadcastableEntity.kt index 94c814f9..21278834 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/BroadcastableEntity.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/BroadcastableEntity.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model.traits +package com.machankura.bennu.compose.database.model.traits import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/LocalStoreEntity.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/LocalStoreEntity.kt similarity index 58% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/LocalStoreEntity.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/LocalStoreEntity.kt index 382c83e0..30d2102c 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/LocalStoreEntity.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/LocalStoreEntity.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model.traits +package com.machankura.bennu.compose.database.model.traits import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/NostrEventEntity.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/NostrEventEntity.kt similarity index 65% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/NostrEventEntity.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/NostrEventEntity.kt index 415b4b56..1b322a6c 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/NostrEventEntity.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/NostrEventEntity.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model.traits +package com.machankura.bennu.compose.database.model.traits import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/OptionalNostrEventEntity.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/OptionalNostrEventEntity.kt similarity index 67% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/OptionalNostrEventEntity.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/OptionalNostrEventEntity.kt index c5dfa6ba..f7540b34 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/OptionalNostrEventEntity.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/OptionalNostrEventEntity.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model.traits +package com.machankura.bennu.compose.database.model.traits import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/ProfilePublicKeyEntity.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/ProfilePublicKeyEntity.kt similarity index 67% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/ProfilePublicKeyEntity.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/ProfilePublicKeyEntity.kt index 33d4b63c..32c0783f 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/ProfilePublicKeyEntity.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/ProfilePublicKeyEntity.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model.traits +package com.machankura.bennu.compose.database.model.traits import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/ReplyingToEntity.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/ReplyingToEntity.kt similarity index 65% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/ReplyingToEntity.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/ReplyingToEntity.kt index 05d0963e..b6cb3f92 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/ReplyingToEntity.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/ReplyingToEntity.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model.traits +package com.machankura.bennu.compose.database.model.traits import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/SoftDeletableEntity.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/SoftDeletableEntity.kt similarity index 59% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/SoftDeletableEntity.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/SoftDeletableEntity.kt index 9b924f28..e496fdb5 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/SoftDeletableEntity.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/SoftDeletableEntity.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model.traits +package com.machankura.bennu.compose.database.model.traits import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/TimestampedEntity.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/TimestampedEntity.kt similarity index 65% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/TimestampedEntity.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/TimestampedEntity.kt index 16369ee6..95fe4e25 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/TimestampedEntity.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/TimestampedEntity.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model.traits +package com.machankura.bennu.compose.database.model.traits import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/UnsignedNostrEventEntity.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/UnsignedNostrEventEntity.kt similarity index 55% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/UnsignedNostrEventEntity.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/UnsignedNostrEventEntity.kt index 0977d328..e5068639 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/UnsignedNostrEventEntity.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/UnsignedNostrEventEntity.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model.traits +package com.machankura.bennu.compose.database.model.traits interface UnsignedNostrEventEntity { val unsignedNostrEventId: Long? diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/UserViewableEntity.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/UserViewableEntity.kt similarity index 59% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/UserViewableEntity.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/UserViewableEntity.kt index 4f68f15f..39b431fe 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/UserViewableEntity.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/traits/UserViewableEntity.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model.traits +package com.machankura.bennu.compose.database.model.traits import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/typealiases/HexArray.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/typealiases/HexArray.kt new file mode 100644 index 00000000..d51dd7b6 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/typealiases/HexArray.kt @@ -0,0 +1,4 @@ +package com.machankura.bennu.compose.database.model.typealiases + +typealias HexArray = Array + diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/typealiases/KindArray.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/typealiases/KindArray.kt new file mode 100644 index 00000000..8d358c02 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/typealiases/KindArray.kt @@ -0,0 +1,3 @@ +package com.machankura.bennu.compose.database.model.typealiases + +typealias KindArray = Array \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/typealiases/SynchronizationFilterArray.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/typealiases/SynchronizationFilterArray.kt new file mode 100644 index 00000000..831818e3 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/typealiases/SynchronizationFilterArray.kt @@ -0,0 +1,3 @@ +package com.machankura.bennu.compose.database.model.typealiases + +typealias SynchronizationFilterArray = Array \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/ChatRoomType.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/types/ChatRoomType.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/ChatRoomType.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/types/ChatRoomType.kt index 9ffe7ff8..3890d166 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/ChatRoomType.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/types/ChatRoomType.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model.types +package com.machankura.bennu.compose.database.model.types import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/DkgApprovalStep.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/types/DkgApprovalStep.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/DkgApprovalStep.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/types/DkgApprovalStep.kt index 6e36527d..37a4324b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/DkgApprovalStep.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/types/DkgApprovalStep.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model.types +package com.machankura.bennu.compose.database.model.types /** * One thing a ChillDKG ritual needs this device's owner to agree to before it diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/DkgRitualStage.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/types/DkgRitualStage.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/DkgRitualStage.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/types/DkgRitualStage.kt index b3f896ad..9875eb71 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/DkgRitualStage.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/types/DkgRitualStage.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model.types +package com.machankura.bennu.compose.database.model.types /** * How far a ChillDKG ritual has got, from the point of view of the device diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/FrostSigningStage.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/types/FrostSigningStage.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/FrostSigningStage.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/types/FrostSigningStage.kt index e081c750..f0029c22 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/FrostSigningStage.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/types/FrostSigningStage.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model.types +package com.machankura.bennu.compose.database.model.types /** * How far a FROST signing session has got, from the point of view of the device diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/MarmotReindexReport.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/types/MarmotReindexReport.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/MarmotReindexReport.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/types/MarmotReindexReport.kt index 0dc786e6..6dfb879d 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/MarmotReindexReport.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/types/MarmotReindexReport.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model.types +package com.machankura.bennu.compose.database.model.types /** * What a replay of a room's stored kind:445 events did. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/SynchronizationFilter.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/types/SynchronizationFilter.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/SynchronizationFilter.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/types/SynchronizationFilter.kt index 14c1f991..03f86ba3 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/SynchronizationFilter.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/types/SynchronizationFilter.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model.types +package com.machankura.bennu.compose.database.model.types import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.Kind diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/query/NostrEventFilterQuery.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/query/NostrEventFilterQuery.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/query/NostrEventFilterQuery.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/query/NostrEventFilterQuery.kt index c65c27d0..eeb574fa 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/query/NostrEventFilterQuery.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/query/NostrEventFilterQuery.kt @@ -1,8 +1,8 @@ -package to.curare.compose.database.query +package com.machankura.bennu.compose.database.query import androidx.room3.RoomRawQuery import androidx.sqlite.SQLiteStatement -import to.curare.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter import kotlinx.serialization.json.Json /** diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseChatRepository.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseChatRepository.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseChatRepository.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseChatRepository.kt index 898aa3f0..1e4f35e7 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseChatRepository.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseChatRepository.kt @@ -1,37 +1,37 @@ -package to.curare.compose.database.repository +package com.machankura.bennu.compose.database.repository -import to.curare.compose.database.GENESIS_AT -import to.curare.compose.database.CurareDatabase +import com.machankura.bennu.compose.database.GENESIS_AT +import com.machankura.bennu.compose.database.BennuDatabase import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import to.curare.compose.database.model.MarmotRouting -import to.curare.compose.nostr.MarmotProfile -import to.curare.compose.identity.Identity -import to.curare.compose.identity.toKeyPair -import to.curare.compose.database.model.GroupKeyState -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.managers.ChronicleManager -import to.curare.compose.managers.FrostSigningManager -import to.curare.compose.managers.GroupKeyStateManager -import to.curare.compose.managers.MarmotGroupCreation -import to.curare.compose.managers.SubgroupManager -import to.curare.compose.nostr.GroupNostrProfile -import to.curare.compose.nostr.GroupCuratedEntry -import to.curare.compose.nostr.GroupCuratedSchema -import to.curare.compose.nostr.GroupPost -import to.curare.compose.nostr.curated.CuratedEntryEvent -import to.curare.compose.nostr.curated.CuratedSchemaEvent -import to.curare.compose.nostr.GroupRelayList -import to.curare.compose.nostr.GroupRelaySet -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.GiftWrapPayload -import to.curare.compose.database.model.MarmotInnerEvent -import to.curare.compose.database.model.MarmotKeyPackage -import to.curare.compose.database.model.Participant -import to.curare.compose.database.model.intermdiate.LocalChatMessage -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.types.MarmotReindexReport +import com.machankura.bennu.compose.database.model.MarmotRouting +import com.machankura.bennu.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.identity.Identity +import com.machankura.bennu.compose.identity.toKeyPair +import com.machankura.bennu.compose.database.model.GroupKeyState +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.managers.ChronicleManager +import com.machankura.bennu.compose.managers.FrostSigningManager +import com.machankura.bennu.compose.managers.GroupKeyStateManager +import com.machankura.bennu.compose.managers.MarmotGroupCreation +import com.machankura.bennu.compose.managers.SubgroupManager +import com.machankura.bennu.compose.nostr.GroupNostrProfile +import com.machankura.bennu.compose.nostr.GroupCuratedEntry +import com.machankura.bennu.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.nostr.GroupPost +import com.machankura.bennu.compose.nostr.curated.CuratedEntryEvent +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaEvent +import com.machankura.bennu.compose.nostr.GroupRelayList +import com.machankura.bennu.compose.nostr.GroupRelaySet +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.GiftWrapPayload +import com.machankura.bennu.compose.database.model.MarmotInnerEvent +import com.machankura.bennu.compose.database.model.MarmotKeyPackage +import com.machankura.bennu.compose.database.model.Participant +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatMessage +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.types.MarmotReindexReport import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.mip02Welcome.WelcomeEvent import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -64,10 +64,10 @@ import kotlin.time.Instant * that has only the public key still gets a legacy room without it. */ class DatabaseChatRepository( - private val database: CurareDatabase, + private val database: BennuDatabase, private val scope: CoroutineScope, private val activeIdentity: StateFlow = MutableStateFlow(null), -): to.curare.compose.repository.ChatRepository { +): com.machankura.bennu.compose.repository.ChatRepository { val logger = Logger.withTag(TAG) override suspend fun createMarmotGroup( @@ -557,7 +557,7 @@ class DatabaseChatRepository( override fun updateChatRoomSubject( publicKey: String, subject: String - ): to.curare.compose.database.model.ChatRoom? { + ): com.machankura.bennu.compose.database.model.ChatRoom? { // TODO: Update chatRoom with subject... return null } diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseDkgRepository.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseDkgRepository.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseDkgRepository.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseDkgRepository.kt index c08da542..16015f4b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseDkgRepository.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseDkgRepository.kt @@ -1,22 +1,22 @@ -package to.curare.compose.database.repository +package com.machankura.bennu.compose.database.repository -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.model.DkgParticipantMessage -import to.curare.compose.database.model.DkgSession -import to.curare.compose.database.model.types.DkgRitualStage -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.GroupKeyState -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.intermdiate.LocalFrostSigningSession -import to.curare.compose.database.model.types.DkgApprovalStep -import to.curare.compose.managers.ChillDkgRitualManager -import to.curare.compose.managers.GroupKeyStateManager -import to.curare.compose.managers.SubgroupManager -import to.curare.compose.managers.SharedKeyDerivation -import to.curare.compose.nostr.frost.GroupKeyStateEvent -import to.curare.compose.nostr.subgroup.SubgroupBirthCertificateEvent -import to.curare.compose.repository.DkgRepository +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.model.DkgParticipantMessage +import com.machankura.bennu.compose.database.model.DkgSession +import com.machankura.bennu.compose.database.model.types.DkgRitualStage +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.GroupKeyState +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalFrostSigningSession +import com.machankura.bennu.compose.database.model.types.DkgApprovalStep +import com.machankura.bennu.compose.managers.ChillDkgRitualManager +import com.machankura.bennu.compose.managers.GroupKeyStateManager +import com.machankura.bennu.compose.managers.SubgroupManager +import com.machankura.bennu.compose.managers.SharedKeyDerivation +import com.machankura.bennu.compose.nostr.frost.GroupKeyStateEvent +import com.machankura.bennu.compose.nostr.subgroup.SubgroupBirthCertificateEvent +import com.machankura.bennu.compose.repository.DkgRepository import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.CoroutineScope @@ -24,7 +24,7 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map class DatabaseDkgRepository( - private val database: CurareDatabase, + private val database: BennuDatabase, private val scope: CoroutineScope ): DkgRepository { private val logger = Logger.withTag(TAG) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseFrostSigningRepository.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseFrostSigningRepository.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseFrostSigningRepository.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseFrostSigningRepository.kt index b098f205..3c3dfb50 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseFrostSigningRepository.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseFrostSigningRepository.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.repository +package com.machankura.bennu.compose.database.repository import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.Event @@ -8,20 +8,20 @@ import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.model.FrostSignerMessage -import to.curare.compose.database.model.FrostSigningItem -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.intermdiate.FrostSignerTally -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.intermdiate.LocalFrostSigningSession -import to.curare.compose.managers.FrostSigningManager -import to.curare.compose.nostr.dkg.DkgRitualEvents -import to.curare.compose.nostr.frost.FrostSigningEvents -import to.curare.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.model.FrostSignerMessage +import com.machankura.bennu.compose.database.model.FrostSigningItem +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.intermdiate.FrostSignerTally +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalFrostSigningSession +import com.machankura.bennu.compose.managers.FrostSigningManager +import com.machankura.bennu.compose.nostr.dkg.DkgRitualEvents +import com.machankura.bennu.compose.nostr.frost.FrostSigningEvents +import com.machankura.bennu.compose.repository.FrostSigningRepository class DatabaseFrostSigningRepository( - private val database: CurareDatabase, + private val database: BennuDatabase, private val scope: CoroutineScope ): FrostSigningRepository { private val logger = Logger.withTag(TAG) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseMantraRepository.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseMantraRepository.kt similarity index 80% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseMantraRepository.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseMantraRepository.kt index 393e95cd..28bd0e10 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseMantraRepository.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseMantraRepository.kt @@ -1,23 +1,23 @@ -package to.curare.compose.database.repository +package com.machankura.bennu.compose.database.repository import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.CoroutineScope -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.model.MantraArtifact -import to.curare.compose.database.model.MantraArtifactVersion -import to.curare.compose.database.model.MantraChapter -import to.curare.compose.database.model.MantraChunk -import to.curare.compose.database.model.MantraDialect -import to.curare.compose.database.model.MantraTranslationArtifactVersion -import to.curare.compose.database.model.MantraTranslationChapter -import to.curare.compose.database.model.MantraTranslationChunk -import to.curare.compose.database.model.MarmotInnerEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.repository.MantraRepository +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.model.MantraArtifact +import com.machankura.bennu.compose.database.model.MantraArtifactVersion +import com.machankura.bennu.compose.database.model.MantraChapter +import com.machankura.bennu.compose.database.model.MantraChunk +import com.machankura.bennu.compose.database.model.MantraDialect +import com.machankura.bennu.compose.database.model.MantraTranslationArtifactVersion +import com.machankura.bennu.compose.database.model.MantraTranslationChapter +import com.machankura.bennu.compose.database.model.MantraTranslationChunk +import com.machankura.bennu.compose.database.model.MarmotInnerEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.repository.MantraRepository class DatabaseMantraRepository( - val database: CurareDatabase, + val database: BennuDatabase, val scope: CoroutineScope ): MantraRepository { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseMarmotRepository.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseMarmotRepository.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseMarmotRepository.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseMarmotRepository.kt index 2d889d6e..9e36ebb1 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseMarmotRepository.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseMarmotRepository.kt @@ -1,13 +1,13 @@ -package to.curare.compose.database.repository +package com.machankura.bennu.compose.database.repository -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.model.MarmotInnerEvent -import to.curare.compose.database.model.MarmotKeyPackageBundle -import to.curare.compose.database.model.UnsignedNostrEvent -import to.curare.compose.exceptions.MarmotMissingChatGroupException -import to.curare.compose.extensions.toHex -import to.curare.compose.nostr.Relays -import to.curare.compose.repository.MarmotRepository +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.model.MarmotInnerEvent +import com.machankura.bennu.compose.database.model.MarmotKeyPackageBundle +import com.machankura.bennu.compose.database.model.UnsignedNostrEvent +import com.machankura.bennu.compose.exceptions.MarmotMissingChatGroupException +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.nostr.Relays +import com.machankura.bennu.compose.repository.MarmotRepository import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageEvent import com.vitorpamplona.quartz.marmot.appComponents.CurrentProfileGroupFactory @@ -15,7 +15,7 @@ import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal -import to.curare.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.nostr.MarmotProfile import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageRotationManager.Companion.KEY_PACKAGE_LIFETIME_SECONDS import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageUtils import com.vitorpamplona.quartz.marmot.mls.crypto.Ed25519 @@ -43,7 +43,7 @@ import kotlin.time.Instant * Based on MlsGroupManager in quarts... */ class DatabaseMarmotRepository( - val database: CurareDatabase, + val database: BennuDatabase, val scope: CoroutineScope ): MarmotRepository { private val logger = Logger.withTag(TAG) @@ -327,6 +327,6 @@ class DatabaseMarmotRepository( private const val TAG = "DatabaseMarmotRepository" /** The `client` tag on every kind:30443 this app publishes. */ - const val CLIENT_NAME = "curare" + const val CLIENT_NAME = "bennu" } } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseNostrRepository.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseNostrRepository.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseNostrRepository.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseNostrRepository.kt index a9104270..ccb67ad6 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseNostrRepository.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseNostrRepository.kt @@ -1,19 +1,19 @@ -package to.curare.compose.database.repository +package com.machankura.bennu.compose.database.repository -import to.curare.compose.database.model.MarmotCommitResult -import to.curare.compose.database.GENESIS_AT -import to.curare.compose.database.model.BroadcastNostrEventRequest -import to.curare.compose.database.model.BroadcastStatus -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.UnsignedNostrEvent -import to.curare.compose.database.model.intermdiate.LocalAccount -import to.curare.compose.database.model.intermdiate.LocalBroadcastNostrEventRequest -import to.curare.compose.database.model.types.SynchronizationFilter -import to.curare.compose.database.dao.NostrEventDao -import to.curare.compose.database.query.NostrEventFilterQuery -import to.curare.compose.extensions.toHex -import to.curare.compose.nostr.Relays +import com.machankura.bennu.compose.database.model.MarmotCommitResult +import com.machankura.bennu.compose.database.GENESIS_AT +import com.machankura.bennu.compose.database.model.BroadcastNostrEventRequest +import com.machankura.bennu.compose.database.model.BroadcastStatus +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.UnsignedNostrEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalAccount +import com.machankura.bennu.compose.database.model.intermdiate.LocalBroadcastNostrEventRequest +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.database.dao.NostrEventDao +import com.machankura.bennu.compose.database.query.NostrEventFilterQuery +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.nostr.Relays import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageRelayListEvent import com.vitorpamplona.quartz.marmot.mip03GroupMessages.GroupEvent @@ -56,7 +56,7 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock -import to.curare.compose.identity.Identity +import com.machankura.bennu.compose.identity.Identity import kotlin.time.Clock import kotlin.time.Instant @@ -68,10 +68,10 @@ import kotlin.time.Instant * and is what a test that has no identity gets. */ class DatabaseNostrRepository( - private val database: to.curare.compose.database.CurareDatabase, + private val database: com.machankura.bennu.compose.database.BennuDatabase, private val scope: CoroutineScope, private val activeIdentity: StateFlow = MutableStateFlow(null), -): to.curare.compose.repository.NostrRepository, to.curare.compose.repository.RelayRepository { +): com.machankura.bennu.compose.repository.NostrRepository, com.machankura.bennu.compose.repository.RelayRepository { companion object { const val TAG = "DatabaseNostrRepository" @@ -102,14 +102,14 @@ class DatabaseNostrRepository( override suspend fun observeRelation( publicKey: HexKey, activePublicKey: HexKey - ): Flow> { + ): Flow> { return database.connectionDao().observeRelation( alicePublicKey = publicKey, bobPublicKey = activePublicKey ) } - override suspend fun deleteConnection(connection: to.curare.compose.database.model.Connection) { + override suspend fun deleteConnection(connection: com.machankura.bennu.compose.database.model.Connection) { database.connectionDao().delete(connection) } @@ -121,11 +121,11 @@ class DatabaseNostrRepository( return database.broadcastNostrEventRequestDao().observeBroadcastNostrEventRequestsByStatus("pending") } - override suspend fun observePendingSynchronizeNostrEventRequests(ownerPublicKey: HexKey): Flow { + override suspend fun observePendingSynchronizeNostrEventRequests(ownerPublicKey: HexKey): Flow { return database.synchronizeNostrEventRequestDao().observeSynchronizeNostrEventRequestsByStatusFor("pending", ownerPublicKey) } - override suspend fun observePendingNegentropySynchronizeRequests(ownerPublicKey: HexKey): Flow { + override suspend fun observePendingNegentropySynchronizeRequests(ownerPublicKey: HexKey): Flow { return database.negentropySynchronizeRequestDao().observeNegentropySynchronizeRequestsByStatusFor("pending", ownerPublicKey) } @@ -306,8 +306,8 @@ class DatabaseNostrRepository( publicKey: HexKey, mentionedPublicKeys: List, textInput: String, - inReplyToNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent?, - quotedNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent?, + inReplyToNostrEvent: com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent?, + quotedNostrEvent: com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent?, onError: () -> Unit, onSuccess: () -> Unit ) { @@ -489,7 +489,7 @@ class DatabaseNostrRepository( if (status == BroadcastStatus.PUBLISHED) { val broadcastNostrEventReceiptId = database.broadcastNostrEventReceiptDao().upsert( - to.curare.compose.database.model.BroadcastNostrEventReceipt( + com.machankura.bennu.compose.database.model.BroadcastNostrEventReceipt( nostrEventId = broadcastNostrEventRequest.nostrEventId, unsignedNostrEventId = broadcastNostrEventRequest.unsignedNostrEventId, isAccepted = true, @@ -502,7 +502,7 @@ class DatabaseNostrRepository( )?.let { chatMessageBroadcastNostrEventRequestRelation -> // This is actually a chatMessage related broadcast event... database.chatMessageBroadcastNostrEventReceiptRelationDao().upsert( - to.curare.compose.database.model.ChatMessageBroadcastNostrEventReceiptRelation( + com.machankura.bennu.compose.database.model.ChatMessageBroadcastNostrEventReceiptRelation( chatMessageId = chatMessageBroadcastNostrEventRequestRelation.chatMessageId, broadcastNostrEventReceiptId = broadcastNostrEventReceiptId ) @@ -619,7 +619,7 @@ class DatabaseNostrRepository( } } - override suspend fun synchronizeNostrEventRequestProcessed(synchronizeNostrEventRequest: to.curare.compose.database.model.SynchronizeNostrEventRequest) { + override suspend fun synchronizeNostrEventRequestProcessed(synchronizeNostrEventRequest: com.machankura.bennu.compose.database.model.SynchronizeNostrEventRequest) { database.synchronizeNostrEventRequestDao().upsert( synchronizeNostrEventRequest.copy( status = "sent", @@ -628,15 +628,15 @@ class DatabaseNostrRepository( ) } - override suspend fun synchronizeNostrEventRequestCompleted(synchronizeNostrEventRequest: to.curare.compose.database.model.SynchronizeNostrEventRequest) { + override suspend fun synchronizeNostrEventRequestCompleted(synchronizeNostrEventRequest: com.machankura.bennu.compose.database.model.SynchronizeNostrEventRequest) { database.synchronizeNostrEventRequestDao().markCompleteIfSent( id = synchronizeNostrEventRequest.id, - status = to.curare.compose.nostr.SignInSync.STATUS_COMPLETE, + status = com.machankura.bennu.compose.nostr.SignInSync.STATUS_COMPLETE, updatedAt = Clock.System.now(), ) } - override suspend fun negentropySynchronizeRequestProcessed(negentropySynchronizeRequest: to.curare.compose.database.model.NegentropySynchronizeRequest) { + override suspend fun negentropySynchronizeRequestProcessed(negentropySynchronizeRequest: com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest) { database.negentropySynchronizeRequestDao().upsert( negentropySynchronizeRequest.copy( status = "sent", @@ -645,7 +645,7 @@ class DatabaseNostrRepository( ) } - override suspend fun saveBroadcastReceipt(broadcastNostrEventReceipt: to.curare.compose.database.model.BroadcastNostrEventReceipt) { + override suspend fun saveBroadcastReceipt(broadcastNostrEventReceipt: com.machankura.bennu.compose.database.model.BroadcastNostrEventReceipt) { database.broadcastNostrEventReceiptDao().upsert( broadcastNostrEventReceipt ) @@ -653,7 +653,7 @@ class DatabaseNostrRepository( override suspend fun saveNostrEvent( nostrEvent: NostrEvent, - synchronizeNostrEventRequest: to.curare.compose.database.model.SynchronizeNostrEventRequest, + synchronizeNostrEventRequest: com.machankura.bennu.compose.database.model.SynchronizeNostrEventRequest, synchronizationRelayURLs: List, activeKeyPair: KeyPair, ) { @@ -685,7 +685,7 @@ class DatabaseNostrRepository( override suspend fun saveNostrEvent( nostrEvent: NostrEvent, - negentropySynchronizeRequest: to.curare.compose.database.model.NegentropySynchronizeRequest, + negentropySynchronizeRequest: com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest, synchronizationRelayURLs: List, activeKeyPair: KeyPair ) { @@ -745,7 +745,7 @@ class DatabaseNostrRepository( * queued while nothing is active stays nobody's, which any identity may drain. */ override suspend fun queueSynchronizeNostrEvent( - synchronizeNostrEventRequests: List, + synchronizeNostrEventRequests: List, ) { val owner = activeIdentity.value?.nostrPublicKey database.synchronizeNostrEventRequestDao().insert( @@ -753,7 +753,7 @@ class DatabaseNostrRepository( ) } - override suspend fun queueNegentropySynchronizeRequest(negentropySynchronizeRequests: List) { + override suspend fun queueNegentropySynchronizeRequest(negentropySynchronizeRequests: List) { val owner = activeIdentity.value?.nostrPublicKey database.negentropySynchronizeRequestDao().insert( negentropySynchronizeRequests.map { it.copy(ownerPublicKey = it.ownerPublicKey ?: owner) } @@ -774,7 +774,7 @@ class DatabaseNostrRepository( ) } - override suspend fun observeNostrFeed(): Flow> { + override suspend fun observeNostrFeed(): Flow> { return database.nostrEventDao().observeNostrEvents( kinds = arrayOf( TextNoteEvent.KIND, @@ -785,7 +785,7 @@ class DatabaseNostrRepository( ) } - override suspend fun observeNostrFeed(synchronizationFilter: SynchronizationFilter): Flow> { + override suspend fun observeNostrFeed(synchronizationFilter: SynchronizationFilter): Flow> { return when { synchronizationFilter.kinds != null && synchronizationFilter.search != null -> { logger.d("observeFilteredNostrEvents: $synchronizationFilter") @@ -834,7 +834,7 @@ class DatabaseNostrRepository( } } - override suspend fun observeNostrEventsMatching(synchronizationFilter: SynchronizationFilter): Flow> { + override suspend fun observeNostrEventsMatching(synchronizationFilter: SynchronizationFilter): Flow> { return database.nostrEventDao().observeNostrEventsMatchingFilter( NostrEventFilterQuery.build(synchronizationFilter) ) @@ -925,50 +925,50 @@ class DatabaseNostrRepository( return if (onlyGroupEvents && nothingElseAsked) rooms.toTypedArray() else null } - override suspend fun observeLocalNostrEventById(nostrEventId: String): Flow { + override suspend fun observeLocalNostrEventById(nostrEventId: String): Flow { return database.nostrEventDao().observeNostrEventById(nostrEventId) } - override suspend fun searchableProfiles(excludingPublicKeys: Array): List { + override suspend fun searchableProfiles(excludingPublicKeys: Array): List { return database.profileDao().getAllProfilesExcludingOnesWithThesePublicKeys( excludedPublicKeys = excludingPublicKeys ) } - override suspend fun filterProfiles(searchTerm: String): List { + override suspend fun filterProfiles(searchTerm: String): List { return database.profileDao().filterProfiles(searchTerm = searchTerm) } - override suspend fun observeProfileWithFollowers(publicKey: String): Flow { + override suspend fun observeProfileWithFollowers(publicKey: String): Flow { return database.profileDao().observeProfileWithFollowersByPublicKey(publicKey) } - override suspend fun observeProfileWithFollowing(publicKey: String): Flow { + override suspend fun observeProfileWithFollowing(publicKey: String): Flow { return database.profileDao().observeProfileWithFollowingByPublicKey(publicKey) } - override suspend fun getRecentSearches(): List { + override suspend fun getRecentSearches(): List { return database.recentSearchDao().getAllRecentSearches() } - override suspend fun removeRecentSearch(recentSearch: to.curare.compose.database.model.RecentSearch) { + override suspend fun removeRecentSearch(recentSearch: com.machankura.bennu.compose.database.model.RecentSearch) { database.recentSearchDao().deleteRecentSearch(recentSearch) } override suspend fun saveSearchQuery( query: String, - synchronizationFilterArray: to.curare.compose.database.model.typealiases.SynchronizationFilterArray? + synchronizationFilterArray: com.machankura.bennu.compose.database.model.typealiases.SynchronizationFilterArray? ) { database.recentSearchDao().upsert( - to.curare.compose.database.model.RecentSearch( + com.machankura.bennu.compose.database.model.RecentSearch( query = query, synchronizationFilters = synchronizationFilterArray ) ) } - override suspend fun observePublicKeyRelays(publicKey: String): Flow> { + override suspend fun observePublicKeyRelays(publicKey: String): Flow> { return database.relayDao().observePublicKeyRelays(publicKey) } diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabasePostRepository.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabasePostRepository.kt new file mode 100644 index 00000000..f034bb99 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabasePostRepository.kt @@ -0,0 +1,5 @@ +package com.machankura.bennu.compose.database.repository + +class DatabasePostRepository( + private val database: com.machankura.bennu.compose.database.BennuDatabase +): com.machankura.bennu.compose.repository.PostRepository \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseSearchRepository.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseSearchRepository.kt new file mode 100644 index 00000000..e261bc4f --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseSearchRepository.kt @@ -0,0 +1,12 @@ +package com.machankura.bennu.compose.database.repository + +class DatabaseSearchRepository( + private val database: com.machankura.bennu.compose.database.BennuDatabase +): com.machankura.bennu.compose.repository.SearchRepository { + + override suspend fun submitSearch(synchronizeNostrEventRequests: List) { + database.synchronizeNostrEventRequestDao().insert( + synchronizeNostrEventRequests = synchronizeNostrEventRequests + ) + } +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/GiftWrapImpersonationException.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/GiftWrapImpersonationException.kt new file mode 100644 index 00000000..902d2581 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/GiftWrapImpersonationException.kt @@ -0,0 +1,3 @@ +package com.machankura.bennu.compose.exceptions + +open class GiftWrapImpersonationException(message: String? = null, cause: Throwable? = null) : Exception(message, cause) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/GiftWrapPayloadUnsupportedException.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/GiftWrapPayloadUnsupportedException.kt new file mode 100644 index 00000000..7a3afe5d --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/GiftWrapPayloadUnsupportedException.kt @@ -0,0 +1,3 @@ +package com.machankura.bennu.compose.exceptions + +open class GiftWrapPayloadUnsupportedException(message: String? = null, cause: Throwable? = null) : Exception(message, cause) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/GiftWrapSealDecryptionException.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/GiftWrapSealDecryptionException.kt new file mode 100644 index 00000000..a155359c --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/GiftWrapSealDecryptionException.kt @@ -0,0 +1,3 @@ +package com.machankura.bennu.compose.exceptions + +open class GiftWrapSealDecryptionException(message: String? = null, cause: Throwable? = null) : Exception(message, cause) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/GiftWrapUnsealException.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/GiftWrapUnsealException.kt new file mode 100644 index 00000000..19b43dc6 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/GiftWrapUnsealException.kt @@ -0,0 +1,3 @@ +package com.machankura.bennu.compose.exceptions + +open class GiftWrapUnsealException(message: String? = null, cause: Throwable? = null) : Exception(message, cause) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/InvalidNostrPrivateKeyException.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/InvalidNostrPrivateKeyException.kt new file mode 100644 index 00000000..68d97dcc --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/InvalidNostrPrivateKeyException.kt @@ -0,0 +1,3 @@ +package com.machankura.bennu.compose.exceptions + +class InvalidNostrPrivateKeyException: RuntimeException() \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotCommitPendingException.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotCommitPendingException.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotCommitPendingException.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotCommitPendingException.kt index c50254ba..9ec596ee 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotCommitPendingException.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotCommitPendingException.kt @@ -1,4 +1,4 @@ -package to.curare.compose.exceptions +package com.machankura.bennu.compose.exceptions /** * The room has a commit of its own still waiting for a relay to accept it, so no diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotConvergencePendingException.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotConvergencePendingException.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotConvergencePendingException.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotConvergencePendingException.kt index bdbec96d..aa538a15 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotConvergencePendingException.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotConvergencePendingException.kt @@ -1,4 +1,4 @@ -package to.curare.compose.exceptions +package com.machankura.bennu.compose.exceptions /** * The room is mid-way through settling a fork -- two members committed against diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotKeyPackageProfileException.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotKeyPackageProfileException.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotKeyPackageProfileException.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotKeyPackageProfileException.kt index d3adfee3..521b91b5 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotKeyPackageProfileException.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotKeyPackageProfileException.kt @@ -1,4 +1,4 @@ -package to.curare.compose.exceptions +package com.machankura.bennu.compose.exceptions /** * A peer's KeyPackage cannot join this room because its leaf is on the wrong Marmot diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingChatGroupException.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotMissingChatGroupException.kt similarity index 71% rename from composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingChatGroupException.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotMissingChatGroupException.kt index 463092db..336e1e69 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingChatGroupException.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotMissingChatGroupException.kt @@ -1,4 +1,4 @@ -package to.curare.compose.exceptions +package com.machankura.bennu.compose.exceptions class MarmotMissingChatGroupException(message: String? = null, cause: Throwable? = null) : Exception(message, cause) { } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingKeyPackageBundleException.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotMissingKeyPackageBundleException.kt similarity index 72% rename from composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingKeyPackageBundleException.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotMissingKeyPackageBundleException.kt index 75499fe8..c89b67d1 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingKeyPackageBundleException.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotMissingKeyPackageBundleException.kt @@ -1,4 +1,4 @@ -package to.curare.compose.exceptions +package com.machankura.bennu.compose.exceptions class MarmotMissingKeyPackageBundleException(message: String? = null, cause: Throwable? = null) : Exception(message, cause) { } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingKeyPackageEventIdException.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotMissingKeyPackageEventIdException.kt similarity index 72% rename from composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingKeyPackageEventIdException.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotMissingKeyPackageEventIdException.kt index 6974701d..0eced8d8 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingKeyPackageEventIdException.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotMissingKeyPackageEventIdException.kt @@ -1,4 +1,4 @@ -package to.curare.compose.exceptions +package com.machankura.bennu.compose.exceptions class MarmotMissingKeyPackageEventIdException(message: String? = null, cause: Throwable? = null) : Exception(message, cause) { } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingNostrGroupDataExtension.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotMissingNostrGroupDataExtension.kt similarity index 71% rename from composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingNostrGroupDataExtension.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotMissingNostrGroupDataExtension.kt index bc7b7095..55654b17 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingNostrGroupDataExtension.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotMissingNostrGroupDataExtension.kt @@ -1,4 +1,4 @@ -package to.curare.compose.exceptions +package com.machankura.bennu.compose.exceptions class MarmotMissingNostrGroupDataExtension(message: String? = null, cause: Throwable? = null) : Exception(message, cause) { } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingRetainedExporterSecretsException.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotMissingRetainedExporterSecretsException.kt similarity index 72% rename from composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingRetainedExporterSecretsException.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotMissingRetainedExporterSecretsException.kt index a39d1f36..082923e4 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingRetainedExporterSecretsException.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotMissingRetainedExporterSecretsException.kt @@ -1,3 +1,3 @@ -package to.curare.compose.exceptions +package com.machankura.bennu.compose.exceptions class MarmotMissingRetainedExporterSecretsException(message: String? = null, cause: Throwable? = null) : Exception(message, cause) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotNotMemberOfChatGroupException.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotNotMemberOfChatGroupException.kt similarity index 71% rename from composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotNotMemberOfChatGroupException.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotNotMemberOfChatGroupException.kt index e7631f77..304fec9b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotNotMemberOfChatGroupException.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotNotMemberOfChatGroupException.kt @@ -1,4 +1,4 @@ -package to.curare.compose.exceptions +package com.machankura.bennu.compose.exceptions class MarmotNotMemberOfChatGroupException(message: String? = null, cause: Throwable? = null) : Exception(message, cause) { } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotUnprocessableInnerEventException.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotUnprocessableInnerEventException.kt similarity index 72% rename from composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotUnprocessableInnerEventException.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotUnprocessableInnerEventException.kt index 86016f56..a7f2e3b7 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotUnprocessableInnerEventException.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotUnprocessableInnerEventException.kt @@ -1,4 +1,4 @@ -package to.curare.compose.exceptions +package com.machankura.bennu.compose.exceptions class MarmotUnprocessableInnerEventException(message: String? = null, cause: Throwable? = null) : Exception(message, cause) { } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotUnsupportedWireFormatException.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotUnsupportedWireFormatException.kt similarity index 71% rename from composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotUnsupportedWireFormatException.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotUnsupportedWireFormatException.kt index d8618bfd..c858fbe3 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotUnsupportedWireFormatException.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotUnsupportedWireFormatException.kt @@ -1,4 +1,4 @@ -package to.curare.compose.exceptions +package com.machankura.bennu.compose.exceptions class MarmotUnsupportedWireFormatException(message: String? = null, cause: Throwable? = null) : Exception(message, cause) { } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotWelcomeMismatchedGroupIdException.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotWelcomeMismatchedGroupIdException.kt similarity index 72% rename from composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotWelcomeMismatchedGroupIdException.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotWelcomeMismatchedGroupIdException.kt index b326a267..524a6419 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotWelcomeMismatchedGroupIdException.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotWelcomeMismatchedGroupIdException.kt @@ -1,4 +1,4 @@ -package to.curare.compose.exceptions +package com.machankura.bennu.compose.exceptions class MarmotWelcomeMismatchedGroupIdException(message: String? = null, cause: Throwable? = null) : Exception(message, cause) { } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotWelcomeMissingGroupIdException.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotWelcomeMissingGroupIdException.kt similarity index 71% rename from composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotWelcomeMissingGroupIdException.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotWelcomeMissingGroupIdException.kt index a115d486..e9b9f9ab 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotWelcomeMissingGroupIdException.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/MarmotWelcomeMissingGroupIdException.kt @@ -1,4 +1,4 @@ -package to.curare.compose.exceptions +package com.machankura.bennu.compose.exceptions class MarmotWelcomeMissingGroupIdException(message: String? = null, cause: Throwable? = null) : Exception(message, cause) { } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/NetworkException.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/NetworkException.kt similarity index 50% rename from composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/NetworkException.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/NetworkException.kt index 7af971a1..88d58c6a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/NetworkException.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/NetworkException.kt @@ -1,4 +1,4 @@ -package to.curare.compose.exceptions +package com.machankura.bennu.compose.exceptions class NetworkException( message: String? = null, diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/NostrNoticeException.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/NostrNoticeException.kt new file mode 100644 index 00000000..73057ebb --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/NostrNoticeException.kt @@ -0,0 +1,6 @@ +package com.machankura.bennu.compose.exceptions + +class NostrNoticeException( + val reason: String?, + val subscriptionId: String? = null +): RuntimeException("$subscriptionId: $reason") \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/NostrPublishException.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/NostrPublishException.kt similarity index 62% rename from composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/NostrPublishException.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/NostrPublishException.kt index 14cb843e..542d8ec1 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/NostrPublishException.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/NostrPublishException.kt @@ -1,4 +1,4 @@ -package to.curare.compose.exceptions +package com.machankura.bennu.compose.exceptions class NostrPublishException( override val cause: Throwable? = null, diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/SignatureException.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/SignatureException.kt new file mode 100644 index 00000000..430c3684 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/SignatureException.kt @@ -0,0 +1,3 @@ +package com.machankura.bennu.compose.exceptions + +open class SignatureException(message: String? = null, cause: Throwable? = null) : Exception(message, cause) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/SigningKeyNotFoundException.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/SigningKeyNotFoundException.kt similarity index 73% rename from composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/SigningKeyNotFoundException.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/SigningKeyNotFoundException.kt index 1650da98..2b9ba205 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/SigningKeyNotFoundException.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/SigningKeyNotFoundException.kt @@ -1,4 +1,4 @@ -package to.curare.compose.exceptions +package com.machankura.bennu.compose.exceptions class SigningKeyNotFoundException(message: String? = null, cause: Throwable? = null) : SignatureException( message, diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/SigningRejectedException.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/SigningRejectedException.kt new file mode 100644 index 00000000..5d30a02e --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/exceptions/SigningRejectedException.kt @@ -0,0 +1,3 @@ +package com.machankura.bennu.compose.exceptions + +class SigningRejectedException(message: String? = null, cause: Throwable? = null) : SignatureException(message, cause) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Credentials.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/extensions/Credentials.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Credentials.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/extensions/Credentials.kt index f4701968..3ff8230b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Credentials.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/extensions/Credentials.kt @@ -1,4 +1,4 @@ -package to.curare.compose.extensions +package com.machankura.bennu.compose.extensions import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip19Bech32.bech32.Bech32 @@ -65,6 +65,6 @@ fun String.extractKeyPairFromPrivateKeyOrThrow(): Pair { nsec to pubkey.toNpub() } catch (error: IllegalArgumentException) { Logger.withTag("String.extractKeyPairFromPrivateKeyOrThrow").w(error) { error.message ?: "" } - throw to.curare.compose.exceptions.InvalidNostrPrivateKeyException() + throw com.machankura.bennu.compose.exceptions.InvalidNostrPrivateKeyException() } } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Instant.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/extensions/Instant.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Instant.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/extensions/Instant.kt index 6e3f3ad1..26e2a598 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Instant.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/extensions/Instant.kt @@ -1,4 +1,4 @@ -package to.curare.compose.extensions +package com.machankura.bennu.compose.extensions import kotlinx.datetime.LocalDate import kotlinx.datetime.LocalDateTime diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Member.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/extensions/Member.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Member.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/extensions/Member.kt index 5c56232e..377c1f9a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Member.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/extensions/Member.kt @@ -1,6 +1,6 @@ -package to.curare.compose.extensions +package com.machankura.bennu.compose.extensions -import to.curare.compose.database.model.intermdiate.LocalParticipant +import com.machankura.bennu.compose.database.model.intermdiate.LocalParticipant import com.vitorpamplona.quartz.nip01Core.core.HexKey /** Enough of a public key to tell two members apart when neither has a profile yet. */ diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/extensions/MlsGroupExtensions.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/extensions/MlsGroupExtensions.kt similarity index 78% rename from composeApp/src/commonMain/kotlin/to/curare/compose/extensions/MlsGroupExtensions.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/extensions/MlsGroupExtensions.kt index 078af351..ba419f9a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/extensions/MlsGroupExtensions.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/extensions/MlsGroupExtensions.kt @@ -1,4 +1,4 @@ -package to.curare.compose.extensions +package com.machankura.bennu.compose.extensions import com.vitorpamplona.quartz.marmot.mls.group.MlsGroup diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Phoenix.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/extensions/Phoenix.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Phoenix.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/extensions/Phoenix.kt index bd4b8d99..6f4dc784 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Phoenix.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/extensions/Phoenix.kt @@ -1,4 +1,4 @@ -package to.curare.compose.extensions +package com.machankura.bennu.compose.extensions import fr.acinq.phoenix.PhoenixGlobal import fr.acinq.phoenix.data.StartBusinessResult diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/extensions/WalletManagerExtension.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/extensions/WalletManagerExtension.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/to/curare/compose/extensions/WalletManagerExtension.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/extensions/WalletManagerExtension.kt index 18151fd6..12a4c158 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/extensions/WalletManagerExtension.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/extensions/WalletManagerExtension.kt @@ -1,4 +1,4 @@ -package to.curare.compose.extensions +package com.machankura.bennu.compose.extensions import com.vitorpamplona.quartz.nip01Core.core.toHexKey import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/identity/CredentialParser.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/CredentialParser.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/to/curare/compose/identity/CredentialParser.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/CredentialParser.kt index f5d4c3bf..39eeb00d 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/identity/CredentialParser.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/CredentialParser.kt @@ -1,4 +1,4 @@ -package to.curare.compose.identity +package com.machankura.bennu.compose.identity import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip19Bech32.bech32.Bech32 diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/identity/ForgetIdentity.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/ForgetIdentity.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/identity/ForgetIdentity.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/ForgetIdentity.kt index cca5dddc..25bd7c2d 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/identity/ForgetIdentity.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/ForgetIdentity.kt @@ -1,6 +1,6 @@ -package to.curare.compose.identity +package com.machankura.bennu.compose.identity -import to.curare.compose.repository.NostrRepository +import com.machankura.bennu.compose.repository.NostrRepository /** * Takes an identity off the device: the credential out of the file, its preference diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/identity/Identity.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/Identity.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/to/curare/compose/identity/Identity.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/Identity.kt index 6cf9422b..0ccee996 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/identity/Identity.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/Identity.kt @@ -1,4 +1,4 @@ -package to.curare.compose.identity +package com.machankura.bennu.compose.identity import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/identity/IdentityWriter.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/IdentityWriter.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/to/curare/compose/identity/IdentityWriter.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/IdentityWriter.kt index 4d951823..f4e491e9 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/identity/IdentityWriter.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/IdentityWriter.kt @@ -1,4 +1,4 @@ -package to.curare.compose.identity +package com.machankura.bennu.compose.identity import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -25,8 +25,8 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import to.curare.compose.AppVersion -import to.curare.compose.ui.view.model.WritingSeedState +import com.machankura.bennu.compose.AppVersion +import com.machankura.bennu.compose.ui.view.model.WritingSeedState /** * Puts a new identity on disk, one function per kind, and prepares the per-identity diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/identity/NewProfileWriter.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/NewProfileWriter.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/identity/NewProfileWriter.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/NewProfileWriter.kt index 5b54f2b7..0eeae25e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/identity/NewProfileWriter.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/NewProfileWriter.kt @@ -1,4 +1,4 @@ -package to.curare.compose.identity +package com.machankura.bennu.compose.identity import com.vitorpamplona.quartz.nip01Core.core.HexKey import fr.acinq.phoenix.data.WalletId diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/identity/SeedCredentials.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/SeedCredentials.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/to/curare/compose/identity/SeedCredentials.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/SeedCredentials.kt index 4cdb0ea4..638eff6d 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/identity/SeedCredentials.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/SeedCredentials.kt @@ -1,4 +1,4 @@ -package to.curare.compose.identity +package com.machankura.bennu.compose.identity import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/identity/StoredIdentity.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/StoredIdentity.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/to/curare/compose/identity/StoredIdentity.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/StoredIdentity.kt index 8b4bf752..c343fb66 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/identity/StoredIdentity.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/StoredIdentity.kt @@ -1,4 +1,4 @@ -package to.curare.compose.identity +package com.machankura.bennu.compose.identity import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/AuxDatabaseManager.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/AuxDatabaseManager.kt new file mode 100644 index 00000000..b8343d4f --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/AuxDatabaseManager.kt @@ -0,0 +1,26 @@ +package com.machankura.bennu.compose.managers + +class AuxDatabaseManager( + bennuGlobal: com.machankura.bennu.compose.BennuGlobal +) { + val auxDatabase by lazy { + com.machankura.bennu.compose.database.builder.getRoomDatabase( + com.machankura.bennu.compose.database.builder.PlatformDatabaseBuilder.getDatabaseBuilder( + bennuGlobal.platformContext + ) + ) + } + + /** + * Dynamic data like user feeds and the likes will be in a in-memory db. + * + * We may also decide to just use the normal DB and manage what's saved better... + */ + val inMemoryAuxDatabase by lazy { + com.machankura.bennu.compose.database.builder.getRoomDatabase( + com.machankura.bennu.compose.database.builder.PlatformDatabaseBuilder.getInMemoryDatabaseBuilder( + bennuGlobal.platformContext + ) + ) + } +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/ChillDkgRitualManager.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/ChillDkgRitualManager.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/managers/ChillDkgRitualManager.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/ChillDkgRitualManager.kt index 0d326413..28cd7985 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/ChillDkgRitualManager.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/ChillDkgRitualManager.kt @@ -1,17 +1,17 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.DkgParticipantMessage -import to.curare.compose.database.model.DkgSession -import to.curare.compose.database.model.GiftWrapPayload -import to.curare.compose.database.model.MarmotInnerEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.types.ChatRoomType -import to.curare.compose.database.model.types.DkgApprovalStep -import to.curare.compose.database.model.types.DkgRitualStage -import to.curare.compose.extensions.toHex -import to.curare.compose.nostr.dkg.DkgRitualEvents +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.DkgParticipantMessage +import com.machankura.bennu.compose.database.model.DkgSession +import com.machankura.bennu.compose.database.model.GiftWrapPayload +import com.machankura.bennu.compose.database.model.MarmotInnerEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.types.ChatRoomType +import com.machankura.bennu.compose.database.model.types.DkgApprovalStep +import com.machankura.bennu.compose.database.model.types.DkgRitualStage +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.nostr.dkg.DkgRitualEvents import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -92,8 +92,8 @@ object ChillDkgRitualManager { * flaw in either can reach the other. Deriving it from the same seed keeps it * recoverable from the wallet backup without being the same key. * - * The `mantra/` prefix has now survived two rebrands on purpose -- Mantra to - * Curated, Curated to Curare. It is an input to the hash, so renaming it derives + * The `mantra/` prefix has now survived three rebrands on purpose -- Mantra to + * Curated, Curated to Curare, Curare to Bennu. It is an input to the hash, so renaming it derives * a different host key from the same seed -- * which loses the outputs of every DKG session already run, since ChillDKG needs * the host secret key to recover them. Renaming it is a protocol fork. @@ -176,7 +176,7 @@ object ChillDkgRitualManager { * user error. */ suspend fun proposeRitual( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, userPublicKey: HexKey, nostrPrivateKey: ByteArray, @@ -335,7 +335,7 @@ object ChillDkgRitualManager { * signature on the payload. */ suspend fun processRitualPayload( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, innerEvent: Event, userPublicKey: HexKey, @@ -390,7 +390,7 @@ object ChillDkgRitualManager { * session, whether it was just created or already known. */ private suspend fun acceptProposal( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, innerEvent: Event, sessionId: String, @@ -504,7 +504,7 @@ object ChillDkgRitualManager { * in the wrong one is a stall with nothing to blame it on. */ private suspend fun replayStoredMessages( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, session: DkgSession ) { @@ -563,7 +563,7 @@ object ChillDkgRitualManager { * clobber each other's columns. */ private suspend fun record( - database: CurareDatabase, + database: BennuDatabase, session: DkgSession, innerEvent: Event ): Boolean { @@ -666,7 +666,7 @@ object ChillDkgRitualManager { * message is delivered twice — repeats no work and skips none. */ private suspend fun advance( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, sessionId: String, nostrPrivateKey: ByteArray @@ -842,7 +842,7 @@ object ChillDkgRitualManager { * threshold, and hashes them into the session identity itself. */ private suspend fun hostPublicKeys( - database: CurareDatabase, + database: BennuDatabase, session: DkgSession ): List? { val hostKeys = database.dkgSessionDao().getMessagesByKind(session.id, DkgRitualEvents.HOST_KEY) @@ -917,7 +917,7 @@ object ChillDkgRitualManager { * coordinator steps require exactly `n` entries. */ private suspend fun orderedPayloads( - database: CurareDatabase, + database: BennuDatabase, session: DkgSession, kind: Kind ): List? { @@ -951,7 +951,7 @@ object ChillDkgRitualManager { /** This device's own message of [kind], if it has published one. */ private suspend fun ownMessage( - database: CurareDatabase, + database: BennuDatabase, session: DkgSession, kind: Kind ): DkgParticipantMessage? = database.dkgSessionDao().getMessage( @@ -968,7 +968,7 @@ object ChillDkgRitualManager { * copying from a stale snapshot. */ private suspend fun update( - database: CurareDatabase, + database: BennuDatabase, session: DkgSession, transform: (DkgSession) -> DkgSession ): DkgSession { @@ -989,7 +989,7 @@ object ChillDkgRitualManager { * out of order cannot walk the UI back down the ladder. */ private suspend fun moveTo( - database: CurareDatabase, + database: BennuDatabase, session: DkgSession, stage: DkgRitualStage ): DkgSession = update(database, session) { current -> @@ -999,7 +999,7 @@ object ChillDkgRitualManager { } private suspend fun fail( - database: CurareDatabase, + database: BennuDatabase, session: DkgSession, reason: String, // Whoever ended it. A member who sent FAILURE, or this device when it hit a @@ -1030,7 +1030,7 @@ object ChillDkgRitualManager { ) } - private suspend fun announceStarted(database: CurareDatabase, session: DkgSession) = announce( + private suspend fun announceStarted(database: BennuDatabase, session: DkgSession) = announce( database = database, session = session, messageType = ChatMessage.TYPE_DKG_STARTED, @@ -1065,7 +1065,7 @@ object ChillDkgRitualManager { * screen offers an approval that does nothing, or none while the ritual sits * still. */ - suspend fun pendingApproval(database: CurareDatabase, session: DkgSession): DkgApprovalStep? { + suspend fun pendingApproval(database: BennuDatabase, session: DkgSession): DkgApprovalStep? { if (session.stage == DkgRitualStage.COMPLETE || session.stage == DkgRitualStage.FAILED) return null if (session.hostKeyApprovedAt == null) return DkgApprovalStep.HOST_KEY @@ -1097,7 +1097,7 @@ object ChillDkgRitualManager { * the caller has no way to know the ritual has moved on since it was drawn. */ suspend fun approve( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, sessionId: String, step: DkgApprovalStep, @@ -1142,7 +1142,7 @@ object ChillDkgRitualManager { * one. */ private suspend fun announceApprovalNeeded( - database: CurareDatabase, + database: BennuDatabase, session: DkgSession, step: DkgApprovalStep ) { @@ -1194,7 +1194,7 @@ object ChillDkgRitualManager { * cannot. */ private suspend fun announceStep( - database: CurareDatabase, + database: BennuDatabase, session: DkgSession, kind: Kind, actor: HexKey @@ -1234,7 +1234,7 @@ object ChillDkgRitualManager { } /** The stored session, for reading a column back before overwriting it. */ - private suspend fun current(database: CurareDatabase, session: DkgSession): DkgSession = + private suspend fun current(database: BennuDatabase, session: DkgSession): DkgSession = database.dkgSessionDao().getSessionById(session.id) ?: session /** @@ -1254,7 +1254,7 @@ object ChillDkgRitualManager { * write over. Those guards are what keep the transcript honest. */ private suspend fun announce( - database: CurareDatabase, + database: BennuDatabase, session: DkgSession, messageType: String, content: String, @@ -1279,7 +1279,7 @@ object ChillDkgRitualManager { } private suspend fun publishHostKey( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, session: DkgSession ) = publishOwn(database, localChatRoom, session, DkgRitualEvents.HOST_KEY, session.hostPublicKey) @@ -1295,7 +1295,7 @@ object ChillDkgRitualManager { * group waits on forever. */ private suspend fun publishOwn( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, session: DkgSession, kind: Kind, @@ -1345,7 +1345,7 @@ object ChillDkgRitualManager { * invite the whole parent into the child's key. */ private suspend fun broadcast( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, session: DkgSession, kind: Kind, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/ChronicleManager.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/ChronicleManager.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/managers/ChronicleManager.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/ChronicleManager.kt index 6234631a..3fe5838d 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/ChronicleManager.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/ChronicleManager.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.Event @@ -8,17 +8,17 @@ import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import com.vitorpamplona.quartz.utils.RandomInstance import com.vitorpamplona.quartz.utils.TimeUtils -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.MarmotInnerEvent -import to.curare.compose.extensions.toHex +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.MarmotInnerEvent +import com.machankura.bennu.compose.extensions.toHex import kotlin.time.Clock import kotlin.time.Instant -import to.curare.compose.nostr.chronicle.ChronicleEvent -import to.curare.compose.nostr.chronicle.ChronicleRequestEvent -import to.curare.compose.nostr.frost.GroupKeyStateEvent -import to.curare.compose.nostr.nip30303.TranslationChunkEvent +import com.machankura.bennu.compose.nostr.chronicle.ChronicleEvent +import com.machankura.bennu.compose.nostr.chronicle.ChronicleRequestEvent +import com.machankura.bennu.compose.nostr.frost.GroupKeyStateEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationChunkEvent /** * Building the group's signed record into pages a member who lacks it can apply. @@ -88,7 +88,7 @@ object ChronicleManager { * is nothing. */ suspend fun assemble( - database: CurareDatabase, + database: BennuDatabase, chatRoomId: String, recipient: HexKey, chronicleId: String = RandomInstance.bytes(32).toHex(), @@ -159,7 +159,7 @@ object ChronicleManager { * into the room has processed its Welcome. */ suspend fun requestIfEmpty( - database: CurareDatabase, + database: BennuDatabase, chatRoomId: String, userPublicKey: HexKey, ): Boolean { @@ -213,7 +213,7 @@ object ChronicleManager { * would look like an answer. */ suspend fun sendTo( - database: CurareDatabase, + database: BennuDatabase, chatRoomId: String, userPublicKey: HexKey, recipient: HexKey, @@ -267,7 +267,7 @@ object ChronicleManager { * [ChatMessage.CHRONICLE_TYPES]. */ private suspend fun announce( - database: CurareDatabase, + database: BennuDatabase, chatRoomId: String, userPublicKey: HexKey, messageType: String, @@ -303,7 +303,7 @@ object ChronicleManager { * pages of a chronicle are indistinguishable from each other at this point. */ private suspend fun queue( - database: CurareDatabase, + database: BennuDatabase, chatRoomId: String, userPublicKey: HexKey, kind: Int, @@ -369,7 +369,7 @@ object ChronicleManager { * builds the list. */ suspend fun receive( - database: CurareDatabase, + database: BennuDatabase, chatRoomId: String, userPublicKey: HexKey, page: Event, @@ -418,7 +418,7 @@ object ChronicleManager { * never apply, and what is still waiting on something that has not arrived. */ suspend fun sweep( - database: CurareDatabase, + database: BennuDatabase, chatRoomId: String, userPublicKey: HexKey, ): Outcome { @@ -510,7 +510,7 @@ object ChronicleManager { * [ChronicleEvent.decodePage] for why those two are not in tension. */ private suspend fun applyPage( - database: CurareDatabase, + database: BennuDatabase, chatRoomId: String, stored: MarmotInnerEvent, ): Outcome { @@ -628,7 +628,7 @@ object ChronicleManager { * written in. */ private suspend fun signedEventsOf( - database: CurareDatabase, + database: BennuDatabase, chatRoomId: String, ): List { val recorded = database.groupSignedEventDao() @@ -750,7 +750,7 @@ object ChronicleManager { "in docs/member-chronicle.md." ) private suspend fun rebuiltEventsOf( - database: CurareDatabase, + database: BennuDatabase, chatRoomId: String, ): List = buildList { database.mantraDialectDao().getDialectsByChatRoomId(chatRoomId).forEach { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/CommitOrdering.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/CommitOrdering.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/to/curare/compose/managers/CommitOrdering.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/CommitOrdering.kt index b16a6a85..61bd8d46 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/CommitOrdering.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/CommitOrdering.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import com.vitorpamplona.quartz.marmot.mip03GroupMessages.GroupEvent import kotlinx.coroutines.sync.Mutex diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/FrostSigningManager.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/FrostSigningManager.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/managers/FrostSigningManager.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/FrostSigningManager.kt index 5b7b2b2c..69eb566a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/FrostSigningManager.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/FrostSigningManager.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.Event @@ -26,22 +26,22 @@ import kotlin.time.Duration.Companion.minutes import kotlin.time.Duration.Companion.seconds import kotlinx.coroutines.CancellationException import kotlinx.coroutines.delay -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.DkgSession -import to.curare.compose.database.model.FrostSignerMessage -import to.curare.compose.database.model.FrostSigningItem -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.GiftWrapPayload -import to.curare.compose.database.model.GroupKeyState -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.MarmotInnerEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.types.DkgRitualStage -import to.curare.compose.database.model.types.FrostSigningStage -import to.curare.compose.extensions.toHex -import to.curare.compose.nostr.dkg.DkgRitualEvents -import to.curare.compose.nostr.frost.FrostSigningEvents +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.DkgSession +import com.machankura.bennu.compose.database.model.FrostSignerMessage +import com.machankura.bennu.compose.database.model.FrostSigningItem +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.GiftWrapPayload +import com.machankura.bennu.compose.database.model.GroupKeyState +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.MarmotInnerEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.types.DkgRitualStage +import com.machankura.bennu.compose.database.model.types.FrostSigningStage +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.nostr.dkg.DkgRitualEvents +import com.machankura.bennu.compose.nostr.frost.FrostSigningEvents /** * Signs a nostr event with a group's FROST threshold key, in one of its rooms. @@ -226,7 +226,7 @@ object FrostSigningManager { * got; anything else falls back as though none was given. */ suspend fun proposeSigning( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, userPublicKey: HexKey, kind: Kind, @@ -263,7 +263,7 @@ object FrostSigningManager { * session by construction. */ suspend fun proposeSigningBatch( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, userPublicKey: HexKey, events: List>, @@ -298,7 +298,7 @@ object FrostSigningManager { * chunk row whose chapter does not exist yet is a foreign key violation. */ suspend fun proposeSigningBatch( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, userPublicKey: HexKey, lead: EventTemplate<*>, @@ -375,7 +375,7 @@ object FrostSigningManager { * and every step recomputed from stored inputs. */ suspend fun processSigningPayload( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, innerEvent: Event, userPublicKey: HexKey @@ -442,7 +442,7 @@ object FrostSigningManager { * enough to make it happen. */ private suspend fun acceptProposal( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, innerEvent: Event, sessionId: String, @@ -576,7 +576,7 @@ object FrostSigningManager { * in the wrong one is a stall with nothing to blame it on. */ private suspend fun replayStoredMessages( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, session: FrostSigningSession ) { @@ -631,7 +631,7 @@ object FrostSigningManager { * so the caller stops rather than trying to advance a dead one. */ private suspend fun record( - database: CurareDatabase, + database: BennuDatabase, session: FrostSigningSession, innerEvent: Event ): Boolean { @@ -751,7 +751,7 @@ object FrostSigningManager { * [fail]'s own guard. */ private suspend fun recordDecline( - database: CurareDatabase, + database: BennuDatabase, session: FrostSigningSession, member: HexKey, reason: String @@ -837,7 +837,7 @@ object FrostSigningManager { * message is delivered twice — repeats no work and skips none. */ private suspend fun advance( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, sessionId: String ) { @@ -1079,7 +1079,7 @@ object FrostSigningManager { * on a settled one -- so the milestone is written once by construction, * like every other line in the transcript. */ - private suspend fun complete(database: CurareDatabase, session: FrostSigningSession) { + private suspend fun complete(database: BennuDatabase, session: FrostSigningSession) { val items = database.frostSigningSessionDao().getItems(session.id) if (items.isEmpty() || items.any { !it.isSigned() }) return @@ -1151,7 +1151,7 @@ object FrostSigningManager { * this returns a boolean rather than nothing. */ private suspend fun recordSignedEvents( - database: CurareDatabase, + database: BennuDatabase, session: FrostSigningSession, signedEvents: List ): Boolean = try { @@ -1187,7 +1187,7 @@ object FrostSigningManager { * succeeded. It is logged and the session still completes. */ private suspend fun applySignedEvent( - database: CurareDatabase, + database: BennuDatabase, session: FrostSigningSession, signedEvent: Event, recorded: Boolean @@ -1271,7 +1271,7 @@ object FrostSigningManager { * set on a batch that is entirely ready. */ private suspend fun applyAggregate( - database: CurareDatabase, + database: BennuDatabase, session: FrostSigningSession, signerIds: List, aggregatedNonces: List @@ -1303,7 +1303,7 @@ object FrostSigningManager { * signature against the old ones. */ private suspend fun applySignatures( - database: CurareDatabase, + database: BennuDatabase, session: FrostSigningSession, signatures: List ): Boolean { @@ -1330,7 +1330,7 @@ object FrostSigningManager { * describes. A session with no items is not signed — it is one whose proposal * has not landed yet. */ - private suspend fun isSigned(database: CurareDatabase, session: FrostSigningSession): Boolean { + private suspend fun isSigned(database: BennuDatabase, session: FrostSigningSession): Boolean { val total = database.frostSigningSessionDao().countItems(session.id) return total > 0 && database.frostSigningSessionDao().countSignedItems(session.id) == total @@ -1349,7 +1349,7 @@ object FrostSigningManager { * aggregate. */ private suspend fun orderedNonces( - database: CurareDatabase, + database: BennuDatabase, session: FrostSigningSession, items: Int ): List>>? { @@ -1386,7 +1386,7 @@ object FrostSigningManager { * matched to the set the session was created with. */ private suspend fun orderedPartialSignatures( - database: CurareDatabase, + database: BennuDatabase, session: FrostSigningSession, signerIds: List, items: Int @@ -1440,7 +1440,7 @@ object FrostSigningManager { /** [splitPayload] against the number of events this session signs. */ private suspend fun splitForSession( - database: CurareDatabase, + database: BennuDatabase, session: FrostSigningSession, payload: String ): List? { @@ -1465,7 +1465,7 @@ object FrostSigningManager { * with the ceremony that made the key. */ private suspend fun signerIds( - database: CurareDatabase, + database: BennuDatabase, key: DkgSession ): Map { val hostKeys = database.dkgSessionDao() @@ -1480,7 +1480,7 @@ object FrostSigningManager { } private suspend fun signerIdOf( - database: CurareDatabase, + database: BennuDatabase, key: DkgSession, member: HexKey ): Int? = signerIds(database, key)[member] @@ -1528,7 +1528,7 @@ object FrostSigningManager { * runs in is the NIP-17 room the ceremony was held in, which signs nothing * else and has no key state of its own. */ - suspend fun completedKey(database: CurareDatabase, chatRoomId: String): DkgSession? { + suspend fun completedKey(database: BennuDatabase, chatRoomId: String): DkgSession? { GroupKeyStateManager.keyStateFor(database, chatRoomId)?.let { state -> database.dkgSessionDao().getSessionById(state.dkgSessionId)?.takeIf { key -> key.stage == DkgRitualStage.COMPLETE && @@ -1550,7 +1550,7 @@ object FrostSigningManager { } /** Whether this group can sign at all, read by the UI so it offers nothing that would fail. */ - suspend fun canSign(database: CurareDatabase, chatRoomId: String): Boolean = + suspend fun canSign(database: BennuDatabase, chatRoomId: String): Boolean = completedKey(database, chatRoomId) != null /** @@ -1604,7 +1604,7 @@ object FrostSigningManager { * signs as the group's threshold key, which is what it always did. */ private suspend fun signingPath( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, key: DkgSession ): List? { @@ -1692,7 +1692,7 @@ object FrostSigningManager { /** This device's own message of [kind], if it has published one. */ private suspend fun ownMessage( - database: CurareDatabase, + database: BennuDatabase, session: FrostSigningSession, kind: Kind ): FrostSignerMessage? = database.frostSigningSessionDao().getMessage( @@ -1709,7 +1709,7 @@ object FrostSigningManager { * copying from a stale snapshot. */ private suspend fun update( - database: CurareDatabase, + database: BennuDatabase, session: FrostSigningSession, transform: (FrostSigningSession) -> FrostSigningSession ): FrostSigningSession { @@ -1730,7 +1730,7 @@ object FrostSigningManager { * walk the UI back down the ladder. */ private suspend fun moveTo( - database: CurareDatabase, + database: BennuDatabase, session: FrostSigningSession, stage: FrostSigningStage ): FrostSigningSession = update(database, session) { current -> @@ -1749,7 +1749,7 @@ object FrostSigningManager { * is that a member declined, and the abandonment is the arithmetic of it. */ private suspend fun fail( - database: CurareDatabase, + database: BennuDatabase, session: FrostSigningSession, reason: String, culprit: HexKey = session.userPublicKey, @@ -1781,7 +1781,7 @@ object FrostSigningManager { /** The stored session, for reading a column back before overwriting it. */ private suspend fun current( - database: CurareDatabase, + database: BennuDatabase, session: FrostSigningSession ): FrostSigningSession = database.frostSigningSessionDao().getSessionById(session.id) ?: session @@ -1821,7 +1821,7 @@ object FrostSigningManager { * stale screen left open across a redelivery should not publish anything. */ suspend fun approve( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, sessionId: String ) { @@ -1860,7 +1860,7 @@ object FrostSigningManager { * it on the next message rather than never. */ suspend fun decline( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, sessionId: String ) { @@ -1977,7 +1977,7 @@ object FrostSigningManager { * of three" rather than claiming all of them. */ suspend fun resendAll( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, sessionIds: List ): Int { @@ -1997,7 +1997,7 @@ object FrostSigningManager { } suspend fun resend( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, sessionId: String ): Boolean { @@ -2140,7 +2140,7 @@ object FrostSigningManager { * question they have already closed. */ suspend fun membersOwing( - database: CurareDatabase, + database: BennuDatabase, session: FrostSigningSession ): Set { val key = database.dkgSessionDao().getSessionById(session.dkgSessionId) ?: return emptySet() @@ -2200,7 +2200,7 @@ object FrostSigningManager { * than leaving the group waiting on a member who has already made up their * mind. */ - suspend fun resumeAnswered(database: CurareDatabase, localChatRoom: LocalChatRoom) { + suspend fun resumeAnswered(database: BennuDatabase, localChatRoom: LocalChatRoom) { val answered = database.frostSigningSessionDao() .getSessionsForChatRoom(localChatRoom.chatRoom.id) .filter { session -> @@ -2252,7 +2252,7 @@ object FrostSigningManager { * is not a trigger to leave lying around. */ private suspend fun republishOwn( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, session: FrostSigningSession ) { @@ -2281,7 +2281,7 @@ object FrostSigningManager { } private suspend fun publishDecline( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, session: FrostSigningSession ) { @@ -2316,7 +2316,7 @@ object FrostSigningManager { * nobody reads. */ private suspend fun announceResent( - database: CurareDatabase, + database: BennuDatabase, session: FrostSigningSession, owed: Int ) { @@ -2342,7 +2342,7 @@ object FrostSigningManager { ) } - private suspend fun announceStarted(database: CurareDatabase, session: FrostSigningSession) { + private suspend fun announceStarted(database: BennuDatabase, session: FrostSigningSession) { val count = database.frostSigningSessionDao().countItems(session.id) announce( @@ -2365,7 +2365,7 @@ object FrostSigningManager { * each one. */ private suspend fun announceApprovalNeeded( - database: CurareDatabase, + database: BennuDatabase, session: FrostSigningSession ) { if (current(database, session).approvalRequestedAt != null) return @@ -2394,7 +2394,7 @@ object FrostSigningManager { * than what it is called. */ private suspend fun announceStep( - database: CurareDatabase, + database: BennuDatabase, session: FrostSigningSession, kind: Kind, actor: HexKey @@ -2452,7 +2452,7 @@ object FrostSigningManager { * see [ChatMessage.frostSigningSessionId]. */ private suspend fun announce( - database: CurareDatabase, + database: BennuDatabase, session: FrostSigningSession, messageType: String, content: String, @@ -2488,7 +2488,7 @@ object FrostSigningManager { * again. */ private suspend fun publishOwn( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, session: FrostSigningSession, kind: Kind, @@ -2538,7 +2538,7 @@ object FrostSigningManager { * failing to tag somebody only stops them hearing. */ private suspend fun broadcast( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, session: FrostSigningSession, kind: Kind, @@ -2643,7 +2643,7 @@ object FrostSigningManager { /** Whether this id is already an outbound row on the room's transport. */ private suspend fun isQueued( - database: CurareDatabase, + database: BennuDatabase, isMarmotRoom: Boolean, id: HexKey ): Boolean = if (isMarmotRoom) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/GroupKeyStateManager.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/GroupKeyStateManager.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/managers/GroupKeyStateManager.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/GroupKeyStateManager.kt index 6e5085fb..181b8fe8 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/GroupKeyStateManager.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/GroupKeyStateManager.kt @@ -1,19 +1,19 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlin.time.Clock import kotlin.time.Instant -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.model.DkgSession -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.GroupKeyState -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.frost.GroupKeyStateEvent -import to.curare.compose.nostr.subgroup.SubgroupBirthCertificateEvent -import to.curare.compose.nostr.subgroup.SubgroupParentage +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.model.DkgSession +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.GroupKeyState +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.frost.GroupKeyStateEvent +import com.machankura.bennu.compose.nostr.subgroup.SubgroupBirthCertificateEvent +import com.machankura.bennu.compose.nostr.subgroup.SubgroupParentage /** * Puts what key a room signs with to the group, and files what the group says. @@ -68,7 +68,7 @@ object GroupKeyStateManager { private val logger = Logger.withTag(TAG) /** The key state a room signs under, or null while it has none. */ - suspend fun keyStateFor(database: CurareDatabase, chatRoomId: String): GroupKeyState? = + suspend fun keyStateFor(database: BennuDatabase, chatRoomId: String): GroupKeyState? = database.groupKeyStateDao().getByChatRoomId(chatRoomId) /** @@ -107,7 +107,7 @@ object GroupKeyStateManager { * that dialect's aggregation succeeding. */ suspend fun propose( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, userPublicKey: HexKey, key: DkgSession, @@ -198,7 +198,7 @@ object GroupKeyStateManager { * signed event waits on file in the meantime. */ suspend fun record( - database: CurareDatabase, + database: BennuDatabase, chatRoomId: String, innerEvent: Event ): GroupKeyState? { @@ -235,7 +235,7 @@ object GroupKeyStateManager { * Idempotent: `replace` keeps the newest state per room, so adopting twice * settles on the same row. */ - suspend fun adopt(database: CurareDatabase, chatRoomId: String): GroupKeyState? { + suspend fun adopt(database: BennuDatabase, chatRoomId: String): GroupKeyState? { val state = signedStateFor(database, chatRoomId) ?: return null logger.i("Room $chatRoomId adopts the key state its group signed at ${state.announcedAt}") @@ -253,7 +253,7 @@ object GroupKeyStateManager { * the ritual screen gates the "create the room" button on, and what [adopt] * files once there is a room to file it against. */ - suspend fun signedStateFor(database: CurareDatabase, chatRoomId: String): GroupKeyState? = + suspend fun signedStateFor(database: BennuDatabase, chatRoomId: String): GroupKeyState? = stateAmong(database.groupSignedEventDao().getByKind(GroupKeyStateEvent.KIND), chatRoomId) /** @@ -268,7 +268,7 @@ object GroupKeyStateManager { * room its ceremony ran in. */ suspend fun signedEventFor( - database: CurareDatabase, + database: BennuDatabase, chatRoomId: String ): GroupSignedEvent? = signedAmong(database.groupSignedEventDao().getByKind(GroupKeyStateEvent.KIND), chatRoomId) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/LiveSubscriptionManager.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/LiveSubscriptionManager.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/managers/LiveSubscriptionManager.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/LiveSubscriptionManager.kt index f07e5f02..43a200d4 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/LiveSubscriptionManager.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/LiveSubscriptionManager.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.mip03GroupMessages.GroupEvent @@ -26,19 +26,19 @@ import kotlinx.coroutines.flow.transformWhile import kotlinx.coroutines.isActive import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import to.curare.compose.database.model.NegentropySynchronizeRequest -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.types.SynchronizationFilter -import to.curare.compose.network.relays.LiveSubscriptionTransport -import to.curare.compose.network.relays.isRelayBackPressure -import to.curare.compose.network.sockets.NostrIncomingMessage -import to.curare.compose.network.sockets.endsLiveSubscription -import to.curare.compose.nostr.MemberProfileSync -import to.curare.compose.nostr.Nip17Filters -import to.curare.compose.nostr.Relays -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.NostrRepository +import com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.network.relays.LiveSubscriptionTransport +import com.machankura.bennu.compose.network.relays.isRelayBackPressure +import com.machankura.bennu.compose.network.sockets.NostrIncomingMessage +import com.machankura.bennu.compose.network.sockets.endsLiveSubscription +import com.machankura.bennu.compose.nostr.MemberProfileSync +import com.machankura.bennu.compose.nostr.Nip17Filters +import com.machankura.bennu.compose.nostr.Relays +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.NostrRepository import kotlin.concurrent.Volatile import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.minutes diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotEngine.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MarmotEngine.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotEngine.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MarmotEngine.kt index 87152b61..1a3c4890 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotEngine.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MarmotEngine.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.GroupEventResult @@ -19,8 +19,8 @@ import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock -import to.curare.compose.database.CurareDatabase -import to.curare.compose.exceptions.MarmotConvergencePendingException +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.exceptions.MarmotConvergencePendingException /** * quartz's Marmot engine, over this database, for the rooms on the current profile. @@ -41,7 +41,7 @@ import to.curare.compose.exceptions.MarmotConvergencePendingException * processor also has no carve-out for the bare gift wrap a legacy room carries a * direct message in, which is the other reason legacy rooms stay where they are. * - * One engine per database, owned by it ([CurareDatabase.marmotEngine]): the manager + * One engine per database, owned by it ([BennuDatabase.marmotEngine]): the manager * keys groups by routing address, which is unique across identities, and a room row * belongs to one identity anyway. * @@ -59,7 +59,7 @@ import to.curare.compose.exceptions.MarmotConvergencePendingException * within a process, exactly as `MlsGroupCache` did, and no further. */ class MarmotEngine( - private val database: CurareDatabase, + private val database: BennuDatabase, private val scope: CoroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default), ) { private val logger = Logger.withTag("MarmotEngine") diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotGroupCreation.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MarmotGroupCreation.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotGroupCreation.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MarmotGroupCreation.kt index 05f10044..fd1dc7b1 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotGroupCreation.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MarmotGroupCreation.kt @@ -1,7 +1,7 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import co.touchlab.kermit.Logger -import to.curare.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.nostr.MarmotProfile import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import kotlinx.coroutines.async @@ -11,12 +11,12 @@ import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.first import kotlin.time.Clock import kotlinx.coroutines.withTimeoutOrNull -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.model.MarmotKeyPackage -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.extensions.toHex -import to.curare.compose.nostr.Relays -import to.curare.compose.repository.ChatRepository +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.model.MarmotKeyPackage +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.nostr.Relays +import com.machankura.bennu.compose.repository.ChatRepository /** * Creating a Marmot room at an id the group's key derives, once, for every flow @@ -101,7 +101,7 @@ object MarmotGroupCreation { * convention cannot be forgotten. */ suspend fun create( - database: CurareDatabase, + database: BennuDatabase, chatRepository: ChatRepository, groupId: String, name: String, @@ -225,7 +225,7 @@ object MarmotGroupCreation { * anything being wrong. */ private suspend fun stampAdmins( - database: CurareDatabase, + database: BennuDatabase, groupId: String, adminPublicKeys: Set ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotGroupFactory.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MarmotGroupFactory.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotGroupFactory.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MarmotGroupFactory.kt index d6909eae..23cf5b31 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotGroupFactory.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MarmotGroupFactory.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import com.vitorpamplona.quartz.marmot.appComponents.CurrentProfileGroupFactory import com.vitorpamplona.quartz.marmot.appComponents.GroupProfileV1 @@ -13,7 +13,7 @@ import com.vitorpamplona.quartz.nip01Core.core.toHexKey import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal import com.vitorpamplona.quartz.utils.RandomInstance -import to.curare.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.nostr.MarmotProfile /** * The one place a Marmot group is minted, on whichever profile new rooms are on. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotGroupName.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MarmotGroupName.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotGroupName.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MarmotGroupName.kt index 0bbf7825..b317da99 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotGroupName.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MarmotGroupName.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers /** * What a Marmot room is called: a `#`, then the name. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotInboundManager.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MarmotInboundManager.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotInboundManager.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MarmotInboundManager.kt index 250806b9..858c1b18 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotInboundManager.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MarmotInboundManager.kt @@ -1,13 +1,13 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.Participant -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.exceptions.MarmotMissingChatGroupException -import to.curare.compose.exceptions.MarmotUnsupportedWireFormatException -import to.curare.compose.extensions.exporterSecret -import to.curare.compose.extensions.toHex +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.Participant +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.exceptions.MarmotMissingChatGroupException +import com.machankura.bennu.compose.exceptions.MarmotUnsupportedWireFormatException +import com.machankura.bennu.compose.extensions.exporterSecret +import com.machankura.bennu.compose.extensions.toHex import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.GroupEventResult import com.vitorpamplona.quartz.marmot.foundation.appEvents.MarmotAppEvent @@ -35,12 +35,12 @@ import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip17Dm.settings.ChatMessageRelayListEvent import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent import com.vitorpamplona.quartz.nip59Giftwrap.wraps.GiftWrapEvent -import to.curare.compose.database.GENESIS_AT -import to.curare.compose.database.model.NegentropySynchronizeRequest -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.types.SynchronizationFilter -import to.curare.compose.nostr.MarmotDirectMessage -import to.curare.compose.nostr.Relays +import com.machankura.bennu.compose.database.GENESIS_AT +import com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.nostr.MarmotDirectMessage +import com.machankura.bennu.compose.nostr.Relays import kotlin.time.Clock object MarmotInboundManager { @@ -128,7 +128,7 @@ object MarmotInboundManager { * later event -- so nothing is lost by closing here. */ suspend fun processGroupMembershipChanges( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, mlsGroup: MlsGroup, announceAdditions: Boolean = true, @@ -277,13 +277,13 @@ object MarmotInboundManager { } } - private suspend fun memberName(database: CurareDatabase, publicKey: HexKey): String = + private suspend fun memberName(database: BennuDatabase, publicKey: HexKey): String = database.profileDao().getProfileByPublicKey(publicKey)?.humanReadableNameOrPubkey() ?: publicKey.take(8) /** A membership caption, this device's own account of what the group's state said. */ private suspend fun announceLine( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, messageType: String, content: String, @@ -303,7 +303,7 @@ object MarmotInboundManager { } suspend fun processGroupEvent( - database: CurareDatabase, + database: BennuDatabase, activeKeyPair: KeyPair, localChatRoom: LocalChatRoom, mlsGroup: MlsGroup, @@ -370,7 +370,7 @@ object MarmotInboundManager { suspend fun processPrivateMessage( - database: CurareDatabase, + database: BennuDatabase, mlsGroup: MlsGroup, mlsMessage: MlsMessage, groupEvent: GroupEvent @@ -447,7 +447,7 @@ object MarmotInboundManager { } private suspend fun decryptMessageBytes( - database: CurareDatabase, + database: BennuDatabase, mlsGroup: MlsGroup, messageBytes: ByteArray, ): DecryptedMessage { @@ -493,7 +493,7 @@ object MarmotInboundManager { } public suspend fun processPublicMessage( - database: CurareDatabase, + database: BennuDatabase, mlsGroup: MlsGroup, mlsMessage: MlsMessage, groupEvent: GroupEvent @@ -537,7 +537,7 @@ object MarmotInboundManager { } private suspend fun handleCommitEvent( - database: CurareDatabase, + database: BennuDatabase, mlsGroup: MlsGroup, groupEvent: GroupEvent ): GroupEventResult { @@ -588,7 +588,7 @@ object MarmotInboundManager { } private suspend fun applyCommit( - database: CurareDatabase, + database: BennuDatabase, mlsGroup: MlsGroup, commitEvent: GroupEvent, ): GroupEventResult = @@ -729,7 +729,7 @@ object MarmotInboundManager { * @param confirmationTag optional confirmation tag for verification */ suspend fun processCommit( - database: CurareDatabase, + database: BennuDatabase, mlsGroup: MlsGroup, commitBytes: ByteArray, senderLeafIndex: Int, @@ -802,7 +802,7 @@ object MarmotInboundManager { } private suspend fun persistGroup( - database: CurareDatabase, + database: BennuDatabase, mlsGroup: MlsGroup ) { val nostrGroupId = mlsGroup.roomId() diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotReindexSweep.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MarmotReindexSweep.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotReindexSweep.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MarmotReindexSweep.kt index d834bf32..f5eefaa3 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotReindexSweep.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MarmotReindexSweep.kt @@ -1,8 +1,8 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import co.touchlab.kermit.Logger import kotlinx.coroutines.CancellationException -import to.curare.compose.database.model.types.MarmotReindexReport +import com.machankura.bennu.compose.database.model.types.MarmotReindexReport /** * Reads a backlog of group events again, repeatedly, until repeating stops helping. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotRoomIdentity.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MarmotRoomIdentity.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotRoomIdentity.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MarmotRoomIdentity.kt index b10cf5c1..fb01215b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotRoomIdentity.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MarmotRoomIdentity.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MlsGroupCache.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MlsGroupCache.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/to/curare/compose/managers/MlsGroupCache.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MlsGroupCache.kt index 12b96f8c..209b2515 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MlsGroupCache.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MlsGroupCache.kt @@ -1,8 +1,8 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.mls.group.MlsGroup -import to.curare.compose.extensions.toHex +import com.machankura.bennu.compose.extensions.toHex import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MlsGroupProfile.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MlsGroupProfile.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/managers/MlsGroupProfile.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MlsGroupProfile.kt index fe27ce78..ba682006 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MlsGroupProfile.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MlsGroupProfile.kt @@ -1,8 +1,8 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import com.vitorpamplona.quartz.marmot.mls.group.MlsGroup import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.extensions.toHex +import com.machankura.bennu.compose.extensions.toHex /** * The fields of a group's Marmot state, read from whichever profile the group is on. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/RoomMlsGroupStateStore.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/RoomMlsGroupStateStore.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/managers/RoomMlsGroupStateStore.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/RoomMlsGroupStateStore.kt index 2d86afc4..1879993f 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/RoomMlsGroupStateStore.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/RoomMlsGroupStateStore.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.mls.codec.TlsReader @@ -6,9 +6,9 @@ import com.vitorpamplona.quartz.marmot.mls.codec.TlsWriter import com.vitorpamplona.quartz.marmot.mls.group.MlsGroupStateStore import com.vitorpamplona.quartz.marmot.mls.group.RetainedEpochSecrets import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.model.MarmotRetainedEpochSecret -import to.curare.compose.extensions.toHex +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.model.MarmotRetainedEpochSecret +import com.machankura.bennu.compose.extensions.toHex /** * quartz's group state store over the app's own tables. @@ -32,7 +32,7 @@ import to.curare.compose.extensions.toHex * See docs/marmot-v2.md, Phase 5. */ class RoomMlsGroupStateStore( - private val database: CurareDatabase, + private val database: BennuDatabase, ) : MlsGroupStateStore { private val logger = Logger.withTag("RoomMlsGroupStateStore") diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/RoomPublishObligationStore.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/RoomPublishObligationStore.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/to/curare/compose/managers/RoomPublishObligationStore.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/RoomPublishObligationStore.kt index 4a97aca6..8eb1c3ca 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/RoomPublishObligationStore.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/RoomPublishObligationStore.kt @@ -1,17 +1,17 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import com.vitorpamplona.quartz.marmot.protocolCore.MarmotPublishObligationStore import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.model.MarmotOutboundGate -import to.curare.compose.database.model.MarmotPublishObligation +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.model.MarmotOutboundGate +import com.machankura.bennu.compose.database.model.MarmotPublishObligation /** * The publish gate's durable half, over the app's tables. See - * [to.curare.compose.database.model.MarmotPublishObligation]. + * [com.machankura.bennu.compose.database.model.MarmotPublishObligation]. */ class RoomPublishObligationStore( - private val database: CurareDatabase, + private val database: BennuDatabase, ) : MarmotPublishObligationStore { override suspend fun save(obligationId: HexKey, bytes: ByteArray) { database.marmotPublishObligationDao().upsert(MarmotPublishObligation(obligationId, bytes)) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/SharedKeyDerivation.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/SharedKeyDerivation.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/managers/SharedKeyDerivation.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/SharedKeyDerivation.kt index 237d0445..faf8d7ae 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/SharedKeyDerivation.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/SharedKeyDerivation.kt @@ -1,6 +1,6 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers -import to.curare.compose.extensions.toHex +import com.machankura.bennu.compose.extensions.toHex import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray import fr.acinq.bitcoin.ByteVector @@ -62,11 +62,11 @@ object SharedKeyDerivation { * coexist with keys already derived under this one, and distinct from any other * use of the same threshold key. * - * The `mantra/` prefix has now survived two rebrands on purpose -- Mantra to - * Curated, Curated to Curare -- for the same reason [MARMOT_ADMIN_GROUP_PATH] has + * The `mantra/` prefix has now survived three rebrands on purpose -- Mantra to + * Curated, Curated to Curare, Curare to Bennu -- for the same reason [MARMOT_ADMIN_GROUP_PATH] has * to stay put: this string is an input to the derivation, so changing it changes * every key derived under it. That would orphan every room already created, and - * split Curare off from any peer still running either older build -- the two would + * split Bennu off from any peer still running an older build -- the two would * derive different keys from the same threshold key and their partial signatures * would aggregate to nothing that verifies. * Renaming it is a protocol fork, and belongs in a `v2` tag if it is ever wanted. @@ -134,7 +134,7 @@ object SharedKeyDerivation { * A bare `m/9420/0/0` as indices, or null if it is not one. * * Split out from [parsePath] because a path also travels on its own, in a - * `GroupKeyStateEvent`'s [to.curare.compose.nostr.frost.tags.FrostDerivationPathTag], + * `GroupKeyStateEvent`'s [com.machankura.bennu.compose.nostr.frost.tags.FrostDerivationPathTag], * where there is no description to dig it out of. Both spellings have to * agree on what a path is, so there is only one reader of one. * diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/SubgroupManager.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/SubgroupManager.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/managers/SubgroupManager.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/SubgroupManager.kt index 1bc854ec..c6bee971 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/SubgroupManager.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/SubgroupManager.kt @@ -1,17 +1,17 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.model.DkgSession -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.GroupKeyState -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.types.DkgRitualStage -import to.curare.compose.nostr.subgroup.SubgroupBirthCertificateEvent -import to.curare.compose.nostr.subgroup.SubgroupParentage +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.model.DkgSession +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.GroupKeyState +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.types.DkgRitualStage +import com.machankura.bennu.compose.nostr.subgroup.SubgroupBirthCertificateEvent +import com.machankura.bennu.compose.nostr.subgroup.SubgroupParentage /** * A group making another group, and the four steps that take. @@ -60,7 +60,7 @@ object SubgroupManager { /** * The fewest admins a subgroup can be run by, the coordinator included. * - * The same floor [to.curare.compose.database.model.types.ChatRoomType.MINIMUM_ROBUST_GROUP_SIZE] + * The same floor [com.machankura.bennu.compose.database.model.types.ChatRoomType.MINIMUM_ROBUST_GROUP_SIZE] * states and for the same reason: below three a quorum is not a check, since * two admins means every decision needs both of them and one means the * coordinator is deciding alone. @@ -82,7 +82,7 @@ object SubgroupManager { * wrong. */ suspend fun refuseSubgroup( - database: CurareDatabase, + database: BennuDatabase, parentRoom: LocalChatRoom, adminPublicKeys: Set, coordinatorPublicKey: HexKey @@ -195,7 +195,7 @@ object SubgroupManager { * this depends on it. */ suspend fun proposeBirthCertificate( - database: CurareDatabase, + database: BennuDatabase, parentRoom: LocalChatRoom, userPublicKey: HexKey, key: DkgSession, @@ -262,7 +262,7 @@ object SubgroupManager { * than an accumulation, which is what it is for. */ suspend fun certificateFor( - database: CurareDatabase, + database: BennuDatabase, subgroupChatRoomId: String, parentChatRoomId: String ): GroupSignedEvent? = @@ -297,7 +297,7 @@ object SubgroupManager { * a statement nobody will keep. */ suspend fun proposeSubgroupKeyState( - database: CurareDatabase, + database: BennuDatabase, ceremonyRoom: LocalChatRoom, userPublicKey: HexKey, key: DkgSession, @@ -372,7 +372,7 @@ object SubgroupManager { * child replaces the first rather than standing beside it. */ suspend fun subgroupsOf( - database: CurareDatabase, + database: BennuDatabase, parentChatRoomId: String ): List = database.groupSignedEventDao() @@ -418,7 +418,7 @@ object SubgroupManager { * unverified hint in the room's own description is the most they get, and it * must never be written here. */ - suspend fun parentOf(database: CurareDatabase, chatRoomId: String): HexKey? = + suspend fun parentOf(database: BennuDatabase, chatRoomId: String): HexKey? = database.groupKeyStateDao().getByChatRoomId(chatRoomId)?.parentChatRoomId /** @@ -437,7 +437,7 @@ object SubgroupManager { * refusal. */ suspend fun record( - database: CurareDatabase, + database: BennuDatabase, chatRoomId: String, innerEvent: Event ): GroupSignedEvent? { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/TranslationScaffold.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/TranslationScaffold.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/managers/TranslationScaffold.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/TranslationScaffold.kt index 2d7ea0ad..83081bf8 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/TranslationScaffold.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/TranslationScaffold.kt @@ -1,10 +1,10 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate -import to.curare.compose.database.model.MantraChapter -import to.curare.compose.database.model.MantraTranslationChapter -import to.curare.compose.nostr.nip30303.TranslationChapterEvent +import com.machankura.bennu.compose.database.model.MantraChapter +import com.machankura.bennu.compose.database.model.MantraTranslationChapter +import com.machankura.bennu.compose.nostr.nip30303.TranslationChapterEvent /** * The rows that join a translation to the chapters it is a translation of. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/WelcomeBundleMatch.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/WelcomeBundleMatch.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/to/curare/compose/managers/WelcomeBundleMatch.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/WelcomeBundleMatch.kt index 4b126200..a9b5c929 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/WelcomeBundleMatch.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/WelcomeBundleMatch.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageUtils import com.vitorpamplona.quartz.marmot.mls.codec.TlsReader diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/network/PlatformHttpClientEngine.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/PlatformHttpClientEngine.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/network/PlatformHttpClientEngine.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/PlatformHttpClientEngine.kt index b41e3539..0d9b4ecf 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/network/PlatformHttpClientEngine.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/PlatformHttpClientEngine.kt @@ -1,4 +1,4 @@ -package to.curare.compose.network +package com.machankura.bennu.compose.network import io.ktor.client.engine.HttpClientEngineFactory diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/UserAgent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/UserAgent.kt new file mode 100644 index 00000000..8c764955 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/UserAgent.kt @@ -0,0 +1,11 @@ +package com.machankura.bennu.compose.network + +object UserAgent { + const val APP_NAME = "Bennu" + const val CLIENT_NAME = "Bennu" +} + +fun String.asClientTag(): Array = arrayOf( + "client", + this +) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/network/dto/RelayDTO.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/dto/RelayDTO.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/to/curare/compose/network/dto/RelayDTO.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/dto/RelayDTO.kt index 5e96970d..03e0c3cc 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/network/dto/RelayDTO.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/dto/RelayDTO.kt @@ -1,4 +1,4 @@ -package to.curare.compose.network.dto +package com.machankura.bennu.compose.network.dto import kotlinx.serialization.Serializable @@ -29,7 +29,7 @@ data class RelayDTO( } } -fun to.curare.compose.database.model.Relay.mapToRelayDTO() = +fun com.machankura.bennu.compose.database.model.Relay.mapToRelayDTO() = RelayDTO( url = this.url, read = this.read, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/EventPublishTransport.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/EventPublishTransport.kt similarity index 80% rename from composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/EventPublishTransport.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/EventPublishTransport.kt index a0bd913d..a6a8fd2b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/EventPublishTransport.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/EventPublishTransport.kt @@ -1,8 +1,8 @@ -package to.curare.compose.network.relays +package com.machankura.bennu.compose.network.relays import kotlinx.coroutines.flow.Flow -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.network.dto.RelayDTO +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.network.dto.RelayDTO /** * The slice of the relay layer a one-off publish needs. @@ -28,6 +28,6 @@ interface EventPublishTransport { * * @see RelayPool.publishEvent */ - @Throws(to.curare.compose.exceptions.NostrPublishException::class, kotlin.coroutines.cancellation.CancellationException::class) + @Throws(com.machankura.bennu.compose.exceptions.NostrPublishException::class, kotlin.coroutines.cancellation.CancellationException::class) suspend fun publishEvent(nostrEvent: NostrEvent, relays: Set): Flow } diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/FallbackRelays.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/FallbackRelays.kt similarity index 70% rename from composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/FallbackRelays.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/FallbackRelays.kt index 48a6e24c..7ed51998 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/FallbackRelays.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/FallbackRelays.kt @@ -1,6 +1,6 @@ -package to.curare.compose.network.relays +package com.machankura.bennu.compose.network.relays -import to.curare.compose.network.dto.toRelayDTO +import com.machankura.bennu.compose.network.dto.toRelayDTO val FALLBACK_RELAYS = listOf( "wss://relay.primal.net", diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/LiveSubscriptionTransport.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/LiveSubscriptionTransport.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/LiveSubscriptionTransport.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/LiveSubscriptionTransport.kt index c2ec67a8..82690878 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/LiveSubscriptionTransport.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/LiveSubscriptionTransport.kt @@ -1,8 +1,8 @@ -package to.curare.compose.network.relays +package com.machankura.bennu.compose.network.relays import com.vitorpamplona.quartz.nip01Core.relay.commands.toRelay.ReqCmd import kotlinx.coroutines.flow.Flow -import to.curare.compose.network.sockets.NostrIncomingMessage +import com.machankura.bennu.compose.network.sockets.NostrIncomingMessage /** * The slice of the relay layer a subscription that stays open needs. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/NostrPublishResult.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/NostrPublishResult.kt similarity index 53% rename from composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/NostrPublishResult.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/NostrPublishResult.kt index ee82313e..ca9be948 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/NostrPublishResult.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/NostrPublishResult.kt @@ -1,6 +1,6 @@ -package to.curare.compose.network.relays +package com.machankura.bennu.compose.network.relays -import to.curare.compose.network.sockets.NostrIncomingMessage +import com.machankura.bennu.compose.network.sockets.NostrIncomingMessage data class NostrPublishResult( val result: NostrIncomingMessage? = null, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelayBackPressure.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/RelayBackPressure.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelayBackPressure.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/RelayBackPressure.kt index 3827e952..0799fa66 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelayBackPressure.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/RelayBackPressure.kt @@ -1,4 +1,4 @@ -package to.curare.compose.network.relays +package com.machankura.bennu.compose.network.relays /** * Whether a relay's CLOSED/NOTICE reason means "you are asking for too much" rather than diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelayPool.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/RelayPool.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelayPool.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/RelayPool.kt index 812ed661..6d825255 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelayPool.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/RelayPool.kt @@ -1,10 +1,10 @@ -package to.curare.compose.network.relays +package com.machankura.bennu.compose.network.relays import androidx.annotation.VisibleForTesting -import to.curare.compose.network.dto.toRelayDTO -import to.curare.compose.network.sockets.filterByEventId -import to.curare.compose.network.sockets.filterBySubscriptionId -import to.curare.compose.network.sockets.completeOnSubscriptionEnd +import com.machankura.bennu.compose.network.dto.toRelayDTO +import com.machankura.bennu.compose.network.sockets.filterByEventId +import com.machankura.bennu.compose.network.sockets.filterBySubscriptionId +import com.machankura.bennu.compose.network.sockets.completeOnSubscriptionEnd import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.OptimizedJsonMapper import com.vitorpamplona.quartz.nip01Core.relay.commands.toRelay.CloseCmd @@ -40,8 +40,8 @@ import kotlin.time.Duration.Companion.milliseconds * https://github.com/PrimalHQ/primal-android-app/blob/8a912053131764c39711cd0dc5012645498c9a4f/app/src/main/kotlin/net/primal/android/networking/relays/RelayPool.kt */ class RelayPool( - private val nostrSocketClientFactory: to.curare.compose.network.sockets.NostrSocketClientFactory, - private val cachingImportRepository: to.curare.compose.repository.CachingImportRepository, + private val nostrSocketClientFactory: com.machankura.bennu.compose.network.sockets.NostrSocketClientFactory, + private val cachingImportRepository: com.machankura.bennu.compose.repository.CachingImportRepository, /** * Where this pool's own fire-and-forget work runs: status updates, the socket closes that * a relay-list change triggers, and the subscription replay a reconnect triggers. @@ -55,7 +55,7 @@ class RelayPool( const val PUBLISH_TIMEOUT = 30_000 } - val relays: MutableSet = mutableSetOf() + val relays: MutableSet = mutableSetOf() private val relayMutex = Mutex() @@ -74,7 +74,7 @@ class RelayPool( private val retainedRequestsMutex = Mutex() @VisibleForTesting - var socketClients = setOf() + var socketClients = setOf() private val _relayPoolStatus = MutableStateFlow(mapOf()) val relayPoolStatus = _relayPoolStatus.asStateFlow() @@ -85,19 +85,19 @@ class RelayPool( } } - private val onSocketConnectionOpenedCallback: to.curare.compose.network.sockets.SocketConnectionOpenedCallback = { url -> + private val onSocketConnectionOpenedCallback: com.machankura.bennu.compose.network.sockets.SocketConnectionOpenedCallback = { url -> updateRelayStatus(url = url, connected = true) } - private val onSocketConnectionClosedCallback: to.curare.compose.network.sockets.SocketConnectionClosedCallback = { url, _ -> + private val onSocketConnectionClosedCallback: com.machankura.bennu.compose.network.sockets.SocketConnectionClosedCallback = { url, _ -> updateRelayStatus(url = url, connected = false) } - private val onSocketConnectionReopenedCallback: to.curare.compose.network.sockets.SocketConnectionReopenedCallback = { url -> + private val onSocketConnectionReopenedCallback: com.machankura.bennu.compose.network.sockets.SocketConnectionReopenedCallback = { url -> scope.launch { replayRetainedRequests(url) } } - fun changeRelays(relays: List) { + fun changeRelays(relays: List) { val existingRelayUrls = socketClients.map { it.socketUrl } val newRelayUrls = relays.map { it.url } @@ -120,7 +120,7 @@ class RelayPool( this.relays.addAll(relays) } - fun removeRelays(relays: Set) { + fun removeRelays(relays: Set) { val relayUrls = relays.map { it.url } val toRemoveSocketClients = socketClients.filter { it.socketUrl in relayUrls } @@ -138,7 +138,7 @@ class RelayPool( this.relays.removeAll(relays) } - suspend fun addRelaysIfMissing(relays: Set) { + suspend fun addRelaysIfMissing(relays: Set) { relayMutex.withLock { val existingRelayUrls = socketClients.map { NormalizedRelayUrl(it.socketUrl).displayUrl() } val newRelayUrls = relays.map { it.url } @@ -197,7 +197,7 @@ class RelayPool( } } - private fun socketClientFor(relayUrl: String): to.curare.compose.network.sockets.NostrSocketClient? { + private fun socketClientFor(relayUrl: String): com.machankura.bennu.compose.network.sockets.NostrSocketClient? { val wanted = NormalizedRelayUrl(relayUrl).displayUrl() return socketClients.find { NormalizedRelayUrl(it.socketUrl).displayUrl() == wanted } @@ -276,7 +276,7 @@ class RelayPool( } } - private fun List.mapAsNostrSocketClient() = + private fun List.mapAsNostrSocketClient() = this.map { nostrSocketClientFactory.create( wssUrl = it.url, @@ -286,8 +286,8 @@ class RelayPool( ) } - @Throws(to.curare.compose.exceptions.NostrPublishException::class, kotlin.coroutines.cancellation.CancellationException::class) - suspend fun publishEvent(nostrEvent: to.curare.compose.database.model.NostrEvent, relays: Set = emptySet()): Flow { + @Throws(com.machankura.bennu.compose.exceptions.NostrPublishException::class, kotlin.coroutines.cancellation.CancellationException::class) + suspend fun publishEvent(nostrEvent: com.machankura.bennu.compose.database.model.NostrEvent, relays: Set = emptySet()): Flow { val relayUrls = relays.map { NormalizedRelayUrl(it.url).displayUrl() } return if (relayUrls.isEmpty()) { @@ -304,7 +304,7 @@ class RelayPool( } } - suspend fun query(reqCommand: ReqCmd, relayUrl: String): Flow { + suspend fun query(reqCommand: ReqCmd, relayUrl: String): Flow { addRelaysIfMissing( setOf( NormalizedRelayUrl(relayUrl).url.toRelayDTO() @@ -317,7 +317,7 @@ class RelayPool( val filterRequest = OptimizedJsonMapper.toJson(reqCommand) if (nostrSocketClient == null) { - throw to.curare.compose.exceptions.NetworkException("$relayUrl is not connected") + throw com.machankura.bennu.compose.exceptions.NetworkException("$relayUrl is not connected") } // Retained BEFORE the send, so a socket that dies between here and the relay's @@ -349,7 +349,7 @@ class RelayPool( * so it survives a drop: the socket reconnects, [replayRetainedRequests] re-sends this * REQ, and the same collector starts receiving again without anything being rebuilt. */ - suspend fun openLiveSubscription(reqCommand: ReqCmd, relayUrl: String): Flow { + suspend fun openLiveSubscription(reqCommand: ReqCmd, relayUrl: String): Flow { addRelaysIfMissing( setOf( NormalizedRelayUrl(relayUrl).url.toRelayDTO() @@ -357,7 +357,7 @@ class RelayPool( ) val nostrSocketClient = socketClientFor(relayUrl) - ?: throw to.curare.compose.exceptions.NetworkException("$relayUrl is not connected") + ?: throw com.machankura.bennu.compose.exceptions.NetworkException("$relayUrl is not connected") val filterRequest = OptimizedJsonMapper.toJson(reqCommand) @@ -402,7 +402,7 @@ class RelayPool( suspend fun closeLiveSubscription(subId: String, relayUrl: String) = closeQuery(CloseCmd(subId = subId), relayUrl) - suspend fun negentropySync(negOpenCmd: NegOpenCmd, relayUrl: String): Flow { + suspend fun negentropySync(negOpenCmd: NegOpenCmd, relayUrl: String): Flow { addRelaysIfMissing( setOf( NormalizedRelayUrl(relayUrl).url.toRelayDTO() @@ -415,7 +415,7 @@ class RelayPool( val negentropySyncRequest = OptimizedJsonMapper.toJson(negOpenCmd) if (nostrSocketClient == null) { - throw to.curare.compose.exceptions.NetworkException("$relayUrl is not connected") + throw com.machankura.bennu.compose.exceptions.NetworkException("$relayUrl is not connected") } return coroutineScope { val eventFlow = nostrSocketClient.queryAsFlow(negOpenCmd.subId) @@ -433,7 +433,7 @@ class RelayPool( */ suspend fun sendNegentropyMessage(negMsgCmd: NegMsgCmd, relayUrl: String) { val nostrSocketClient = socketClientFor(relayUrl) - ?: throw to.curare.compose.exceptions.NetworkException("$relayUrl is not connected") + ?: throw com.machankura.bennu.compose.exceptions.NetworkException("$relayUrl is not connected") nostrSocketClient.sendMESSAGE(OptimizedJsonMapper.toJson(negMsgCmd)) } @@ -452,7 +452,7 @@ class RelayPool( val closeSubscription = OptimizedJsonMapper.toJson(closeCmd) if (nostrSocketClient == null) { - throw to.curare.compose.exceptions.NetworkException("$relayUrl is not connected") + throw com.machankura.bennu.compose.exceptions.NetworkException("$relayUrl is not connected") } coroutineScope { with(nostrSocketClient) { @@ -474,7 +474,7 @@ class RelayPool( val closeNegentropySubscription = OptimizedJsonMapper.toJson(negCloseCmd) if (nostrSocketClient == null) { - throw to.curare.compose.exceptions.NetworkException("$relayUrl is not connected") + throw com.machankura.bennu.compose.exceptions.NetworkException("$relayUrl is not connected") } coroutineScope { with(nostrSocketClient) { @@ -483,14 +483,14 @@ class RelayPool( } } - private fun Flow.transformWhileEventsAreIncoming() = + private fun Flow.transformWhileEventsAreIncoming() = transformWhile { emit(it) - it is to.curare.compose.network.sockets.NostrIncomingMessage.EventMessage || it is to.curare.compose.network.sockets.NostrIncomingMessage.EventsMessage + it is com.machankura.bennu.compose.network.sockets.NostrIncomingMessage.EventMessage || it is com.machankura.bennu.compose.network.sockets.NostrIncomingMessage.EventsMessage } @OptIn(FlowPreview::class) - private suspend fun to.curare.compose.network.sockets.NostrSocketClient.queryAsFlow(subscriptionId: String): Flow { + private suspend fun com.machankura.bennu.compose.network.sockets.NostrSocketClient.queryAsFlow(subscriptionId: String): Flow { return this.incomingMessages .filterBySubscriptionId(id = subscriptionId) // The socket's incomingMessages is a hot flow, so a filtered view of it @@ -501,7 +501,7 @@ class RelayPool( } @OptIn(FlowPreview::class) - private suspend fun handlePublishEventToRelays(relayConnections: Set, nostrEvent: to.curare.compose.database.model.NostrEvent): Flow { + private suspend fun handlePublishEventToRelays(relayConnections: Set, nostrEvent: com.machankura.bennu.compose.database.model.NostrEvent): Flow { val responseFlow = MutableSharedFlow() relayConnections.forEach { nostrSocketClient -> scope.launch { @@ -517,7 +517,7 @@ class RelayPool( // an event that was never stored, and preserves the relay's reason. val rejection = if (!it.success) { logger.w { "relay $socketUrl rejected ${nostrEvent.id}: ${it.message}" } - to.curare.compose.exceptions.NostrPublishException( + com.machankura.bennu.compose.exceptions.NostrPublishException( message = it.message ?: "rejected by $socketUrl" ) } else { @@ -562,15 +562,15 @@ class RelayPool( } @FlowPreview - private suspend fun to.curare.compose.network.sockets.NostrSocketClient.collectPublishResponse(eventId: String): to.curare.compose.network.sockets.NostrIncomingMessage.OkMessage { + private suspend fun com.machankura.bennu.compose.network.sockets.NostrSocketClient.collectPublishResponse(eventId: String): com.machankura.bennu.compose.network.sockets.NostrIncomingMessage.OkMessage { return incomingMessages .filterByEventId(id = eventId) - .filterIsInstance() + .filterIsInstance() .timeout(PUBLISH_TIMEOUT.milliseconds) .first() } private fun NostrPublishResult.isSuccessful(): Boolean { - return result is to.curare.compose.network.sockets.NostrIncomingMessage.OkMessage && result.success + return result is com.machankura.bennu.compose.network.sockets.NostrIncomingMessage.OkMessage && result.success } } diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelaysSocketManager.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/RelaysSocketManager.kt similarity index 80% rename from composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelaysSocketManager.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/RelaysSocketManager.kt index 025e9b9a..1c85c200 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelaysSocketManager.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/RelaysSocketManager.kt @@ -1,13 +1,13 @@ -package to.curare.compose.network.relays +package com.machankura.bennu.compose.network.relays -import to.curare.compose.network.dto.mapToRelayDTO +import com.machankura.bennu.compose.network.dto.mapToRelayDTO import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.relay.commands.toRelay.CloseCmd import com.vitorpamplona.quartz.nip01Core.relay.commands.toRelay.ReqCmd import com.vitorpamplona.quartz.nip77Negentropy.NegCloseCmd import com.vitorpamplona.quartz.nip77Negentropy.NegMsgCmd import com.vitorpamplona.quartz.nip77Negentropy.NegOpenCmd -import to.curare.compose.identity.Identity +import com.machankura.bennu.compose.identity.Identity import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -27,9 +27,9 @@ import kotlinx.coroutines.sync.withLock */ class RelaysSocketManager( private val activeIdentityStateFlow: StateFlow, - private val nostrSocketClientFactory: to.curare.compose.network.sockets.NostrSocketClientFactory, - private val cachingImportRepository: to.curare.compose.repository.CachingImportRepository, - private val relayRepository: to.curare.compose.repository.RelayRepository, + private val nostrSocketClientFactory: com.machankura.bennu.compose.network.sockets.NostrSocketClientFactory, + private val cachingImportRepository: com.machankura.bennu.compose.repository.CachingImportRepository, + private val relayRepository: com.machankura.bennu.compose.repository.RelayRepository, /** Injectable so that a test can drive the identity observer on a dispatcher it controls. */ private val scope: CoroutineScope = CoroutineScope(Dispatchers.IO), ) : LiveSubscriptionTransport, EventPublishTransport { @@ -47,7 +47,7 @@ class RelaysSocketManager( /** * Logical relayPool */ - private val userRelays = mutableSetOf() + private val userRelays = mutableSetOf() val userRelayPoolStatus = relayPool.relayPoolStatus @@ -86,7 +86,7 @@ class RelaysSocketManager( /** The urls the pool currently holds. For the switch test; nothing in the app reads it. */ val relayUrls: Set get() = relayPool.relays.map { it.url }.toSet() - private suspend fun updateRelayPools(regularRelays: List?) { + private suspend fun updateRelayPools(regularRelays: List?) { relayPoolsMutex.withLock { val userRelaysChanged = relayPool.relays != regularRelays if (userRelaysChanged && !regularRelays.isNullOrEmpty()) { @@ -100,8 +100,8 @@ class RelaysSocketManager( relayPool.closePool() } - @Throws(to.curare.compose.exceptions.NostrPublishException::class, kotlin.coroutines.cancellation.CancellationException::class) - suspend fun publishEvent(nostrEvent: to.curare.compose.database.model.NostrEvent): Flow { + @Throws(com.machankura.bennu.compose.exceptions.NostrPublishException::class, kotlin.coroutines.cancellation.CancellationException::class) + suspend fun publishEvent(nostrEvent: com.machankura.bennu.compose.database.model.NostrEvent): Flow { return if (userRelays.isNotEmpty()) { relayPool.publishEvent( nostrEvent = nostrEvent, @@ -115,8 +115,8 @@ class RelaysSocketManager( } } - @Throws(to.curare.compose.exceptions.NostrPublishException::class, kotlin.coroutines.cancellation.CancellationException::class) - override suspend fun publishEvent(nostrEvent: to.curare.compose.database.model.NostrEvent, relays: Set): Flow { + @Throws(com.machankura.bennu.compose.exceptions.NostrPublishException::class, kotlin.coroutines.cancellation.CancellationException::class) + override suspend fun publishEvent(nostrEvent: com.machankura.bennu.compose.database.model.NostrEvent, relays: Set): Flow { logger.d("publishEvent: $nostrEvent") return relayPool.publishEvent( nostrEvent = nostrEvent, @@ -136,7 +136,7 @@ class RelaysSocketManager( // suspend fun tryConnectingToUserRelay(url: String) = relayPool.tryConnectingToRelay(url) - suspend fun query(reqCommand: ReqCmd, relayUrl: String): Flow { + suspend fun query(reqCommand: ReqCmd, relayUrl: String): Flow { return relayPool.query( reqCommand = reqCommand, relayUrl = relayUrl @@ -144,7 +144,7 @@ class RelaysSocketManager( } - override suspend fun openLiveSubscription(reqCommand: ReqCmd, relayUrl: String): Flow { + override suspend fun openLiveSubscription(reqCommand: ReqCmd, relayUrl: String): Flow { return relayPool.openLiveSubscription( reqCommand = reqCommand, relayUrl = relayUrl @@ -172,7 +172,7 @@ class RelaysSocketManager( ) } - suspend fun negentropySync(negOpenCmd: NegOpenCmd, relayUrl: String): Flow { + suspend fun negentropySync(negOpenCmd: NegOpenCmd, relayUrl: String): Flow { return relayPool.negentropySync( negOpenCmd = negOpenCmd, relayUrl = relayUrl diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/broadcast/BroadcastEventResponse.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/broadcast/BroadcastEventResponse.kt similarity index 79% rename from composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/broadcast/BroadcastEventResponse.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/broadcast/BroadcastEventResponse.kt index 35fa0078..e22c5bde 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/broadcast/BroadcastEventResponse.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/broadcast/BroadcastEventResponse.kt @@ -1,4 +1,4 @@ -package to.curare.compose.network.relays.broadcast +package com.machankura.bennu.compose.network.relays.broadcast import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/broadcast/BroadcastRequestBody.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/broadcast/BroadcastRequestBody.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/broadcast/BroadcastRequestBody.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/broadcast/BroadcastRequestBody.kt index 6723aba5..25cda809 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/broadcast/BroadcastRequestBody.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/broadcast/BroadcastRequestBody.kt @@ -1,4 +1,4 @@ -package to.curare.compose.network.relays.broadcast +package com.machankura.bennu.compose.network.relays.broadcast import com.vitorpamplona.quartz.nip01Core.core.Event import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/network/serialization/CommonJson.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/serialization/CommonJson.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/network/serialization/CommonJson.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/serialization/CommonJson.kt index 004705fb..492cbd02 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/network/serialization/CommonJson.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/serialization/CommonJson.kt @@ -1,4 +1,4 @@ -package to.curare.compose.network.serialization +package com.machankura.bennu.compose.network.serialization import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonBuilder diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/network/serialization/SocketsJson.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/serialization/SocketsJson.kt similarity index 78% rename from composeApp/src/commonMain/kotlin/to/curare/compose/network/serialization/SocketsJson.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/serialization/SocketsJson.kt index 01c3cfe7..e6a3cb24 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/network/serialization/SocketsJson.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/serialization/SocketsJson.kt @@ -1,4 +1,4 @@ -package to.curare.compose.network.serialization +package com.machankura.bennu.compose.network.serialization import co.touchlab.kermit.Logger import kotlinx.serialization.json.JsonObject @@ -7,7 +7,7 @@ import kotlinx.serialization.json.decodeFromJsonElement internal val SocketsJson = CommonJson -fun JsonObject?.asNostrEventOrNull(): to.curare.compose.database.model.NostrEvent? { +fun JsonObject?.asNostrEventOrNull(): com.machankura.bennu.compose.database.model.NostrEvent? { return try { if (this != null) SocketsJson.decodeFromJsonElement(this) else null } catch (error: IllegalArgumentException) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrIncomingMessage.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrIncomingMessage.kt similarity index 80% rename from composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrIncomingMessage.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrIncomingMessage.kt index 234e0bb7..79da6ea7 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrIncomingMessage.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrIncomingMessage.kt @@ -1,10 +1,10 @@ -package to.curare.compose.network.sockets +package com.machankura.bennu.compose.network.sockets sealed class NostrIncomingMessage { data class EventMessage( val subscriptionId: String, - val nostrEvent: to.curare.compose.database.model.NostrEvent? = null, + val nostrEvent: com.machankura.bennu.compose.database.model.NostrEvent? = null, ) : NostrIncomingMessage() data class EoseMessage( @@ -42,7 +42,7 @@ sealed class NostrIncomingMessage { data class EventsMessage( val subscriptionId: String, - val nostrEvents: List = emptyList(), + val nostrEvents: List = emptyList(), ) : NostrIncomingMessage() data class NegentropyMessage( @@ -58,11 +58,11 @@ sealed class NostrIncomingMessage { fun NostrIncomingMessage?.verifyOrThrow(subscriptionId: String) { if (this == null) { - throw to.curare.compose.exceptions.NetworkException("No messages received.") + throw com.machankura.bennu.compose.exceptions.NetworkException("No messages received.") } if (this is NostrIncomingMessage.NoticeMessage) { - throw to.curare.compose.exceptions.NostrNoticeException( + throw com.machankura.bennu.compose.exceptions.NostrNoticeException( reason = this.message, subscriptionId = subscriptionId, ) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrIncomingMessageExt.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrIncomingMessageExt.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrIncomingMessageExt.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrIncomingMessageExt.kt index 31639bc7..280ca80e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrIncomingMessageExt.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrIncomingMessageExt.kt @@ -1,4 +1,4 @@ -package to.curare.compose.network.sockets +package com.machankura.bennu.compose.network.sockets import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filter diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrIncomingMessageParser.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrIncomingMessageParser.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrIncomingMessageParser.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrIncomingMessageParser.kt index d09d10a5..44e93e97 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrIncomingMessageParser.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrIncomingMessageParser.kt @@ -1,6 +1,6 @@ -package to.curare.compose.network.sockets +package com.machankura.bennu.compose.network.sockets -import to.curare.compose.network.serialization.decodeFromStringOrNull +import com.machankura.bennu.compose.network.serialization.decodeFromStringOrNull import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.Kind @@ -14,7 +14,7 @@ import kotlinx.serialization.json.jsonObject import kotlinx.serialization.json.jsonPrimitive fun String.parseIncomingMessage(): NostrIncomingMessage? { - val jsonArray = to.curare.compose.network.serialization.SocketsJson.decodeFromStringOrNull(this) + val jsonArray = com.machankura.bennu.compose.network.serialization.SocketsJson.decodeFromStringOrNull(this) val verbElement = jsonArray?.elementAtOrNull(0) ?: return null return try { @@ -75,7 +75,7 @@ private fun JsonArray.takeAsEventIncomingMessage(): NostrIncomingMessage? { if (subscriptionId == null || kind == null) return null - val nostrEvent = to.curare.compose.database.model.NostrEvent.fromEvent( + val nostrEvent = com.machankura.bennu.compose.database.model.NostrEvent.fromEvent( Event.fromJson( event.toString() ) @@ -93,10 +93,10 @@ private fun JsonArray.takeAsEventsIncomingMessage(): NostrIncomingMessage? { if (subscriptionId == null || events == null) return null - val nostrEvents = mutableListOf() + val nostrEvents = mutableListOf() events.map { it.jsonObject }.forEach { jsonEvent -> - to.curare.compose.database.model.NostrEvent.fromEvent( + com.machankura.bennu.compose.database.model.NostrEvent.fromEvent( Event.fromJson( jsonEvent.toString() ) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrOutgoingMessageBuilder.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrOutgoingMessageBuilder.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrOutgoingMessageBuilder.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrOutgoingMessageBuilder.kt index 2a6fcdfe..d6b79b1f 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrOutgoingMessageBuilder.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrOutgoingMessageBuilder.kt @@ -1,4 +1,4 @@ -package to.curare.compose.network.sockets +package com.machankura.bennu.compose.network.sockets import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.add diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClient.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrSocketClient.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClient.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrSocketClient.kt index f52b7543..464663a0 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClient.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrSocketClient.kt @@ -1,4 +1,4 @@ -package to.curare.compose.network.sockets +package com.machankura.bennu.compose.network.sockets import kotlinx.coroutines.flow.SharedFlow import kotlinx.serialization.json.JsonObject diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClientFactory.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrSocketClientFactory.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClientFactory.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrSocketClientFactory.kt index 1ebc22a4..287b468d 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClientFactory.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrSocketClientFactory.kt @@ -1,10 +1,10 @@ -package to.curare.compose.network.sockets +package com.machankura.bennu.compose.network.sockets import io.ktor.client.HttpClient import io.ktor.client.plugins.websocket.WebSockets import io.ktor.serialization.kotlinx.KotlinxWebsocketSerializationConverter import kotlinx.serialization.json.Json -import to.curare.compose.network.platformHttpClientEngineFactory +import com.machankura.bennu.compose.network.platformHttpClientEngineFactory internal val defaultSocketsHttpClient by lazy { @@ -21,7 +21,7 @@ internal val defaultSocketsHttpClient by lazy { /** - * How [to.curare.compose.network.relays.RelayPool] gets a socket for a relay. + * How [com.machankura.bennu.compose.network.relays.RelayPool] gets a socket for a relay. * * An interface rather than the object directly, so the pool's subscription bookkeeping — what * it retains, when it replays, when it lets a socket stop reconnecting — can be exercised diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClientImpl.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrSocketClientImpl.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClientImpl.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrSocketClientImpl.kt index 3c08027b..dd68bffb 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClientImpl.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrSocketClientImpl.kt @@ -1,4 +1,4 @@ -package to.curare.compose.network.sockets +package com.machankura.bennu.compose.network.sockets import co.touchlab.kermit.Logger import io.ktor.client.HttpClient @@ -165,7 +165,7 @@ internal class NostrSocketClientImpl( wsSession = null onSocketConnectionClosed?.invoke(socketUrl, error) scheduleReconnect() - throw to.curare.compose.exceptions.NetworkException(cause = error) + throw com.machankura.bennu.compose.exceptions.NetworkException(cause = error) } } diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrVerb.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrVerb.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrVerb.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrVerb.kt index 1e7b7476..ac619d5a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrVerb.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrVerb.kt @@ -1,4 +1,4 @@ -package to.curare.compose.network.sockets +package com.machankura.bennu.compose.network.sockets import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/ReconnectBackoff.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/ReconnectBackoff.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/ReconnectBackoff.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/ReconnectBackoff.kt index 0f533d33..48f50a92 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/ReconnectBackoff.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/ReconnectBackoff.kt @@ -1,4 +1,4 @@ -package to.curare.compose.network.sockets +package com.machankura.bennu.compose.network.sockets import kotlin.math.min import kotlin.math.pow diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/SocketConnectionCallbacks.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/SocketConnectionCallbacks.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/SocketConnectionCallbacks.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/SocketConnectionCallbacks.kt index 0cccd156..a85aaf79 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/SocketConnectionCallbacks.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/SocketConnectionCallbacks.kt @@ -1,4 +1,4 @@ -package to.curare.compose.network.sockets +package com.machankura.bennu.compose.network.sockets typealias SocketConnectionOpenedCallback = (url: String) -> Unit typealias SocketConnectionClosedCallback = (url: String, error: Throwable?) -> Unit diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/CuratedSuggestion.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/CuratedSuggestion.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/CuratedSuggestion.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/CuratedSuggestion.kt index 80a99e0a..cfe3a422 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/CuratedSuggestion.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/CuratedSuggestion.kt @@ -1,12 +1,12 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr -import to.curare.compose.database.GENESIS_AT -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalNostrEvent -import to.curare.compose.extensions.shortened -import to.curare.compose.nostr.curated.CuratedEntry -import to.curare.compose.nostr.curated.CuratedEntryEvent +import com.machankura.bennu.compose.database.GENESIS_AT +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent +import com.machankura.bennu.compose.extensions.shortened +import com.machankura.bennu.compose.nostr.curated.CuratedEntry +import com.machankura.bennu.compose.nostr.curated.CuratedEntryEvent import kotlin.time.Instant /** diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/DirectMessagePeerSync.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/DirectMessagePeerSync.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/DirectMessagePeerSync.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/DirectMessagePeerSync.kt index 0ec1dbaf..6eda58f1 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/DirectMessagePeerSync.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/DirectMessagePeerSync.kt @@ -1,13 +1,13 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageEvent import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip17Dm.settings.ChatMessageRelayListEvent import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent -import to.curare.compose.database.model.NegentropySynchronizeRequest -import to.curare.compose.database.model.SynchronizeNostrEventRequest -import to.curare.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest +import com.machankura.bennu.compose.database.model.SynchronizeNostrEventRequest +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter /** * Asking the relays for what a direct message with one person needs. @@ -16,7 +16,7 @@ import to.curare.compose.database.model.types.SynchronizationFilter * hold the key package and the DM relay list, and the kind 0 of anyone who has * published one here; the indexer relays hold everyone's kind 0 and nothing else a * chat needs. A three-kind filter to the indexers comes back with the kind 0 alone; - * a kind-0-only filter to our relay finds a person who has never opened Curare + * a kind-0-only filter to our relay finds a person who has never opened Bennu * nowhere. * * Both at level 0, for the reason `MemberProfileSync` gives: it marks a request as diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupCuratedEntry.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/GroupCuratedEntry.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupCuratedEntry.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/GroupCuratedEntry.kt index 4084e7bb..6101b5ed 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupCuratedEntry.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/GroupCuratedEntry.kt @@ -1,9 +1,9 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.nostr.curated.CuratedEntry -import to.curare.compose.nostr.curated.CuratedEntryEvent +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.nostr.curated.CuratedEntry +import com.machankura.bennu.compose.nostr.curated.CuratedEntryEvent import kotlin.time.Instant /** diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupCuratedSchema.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/GroupCuratedSchema.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupCuratedSchema.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/GroupCuratedSchema.kt index 4ff20a7f..bca0ad8d 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupCuratedSchema.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/GroupCuratedSchema.kt @@ -1,12 +1,12 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.types.SynchronizationFilter -import to.curare.compose.nostr.curated.CuratedEntryEvent -import to.curare.compose.nostr.curated.CuratedEntryProblem -import to.curare.compose.nostr.curated.CuratedSchema -import to.curare.compose.nostr.curated.CuratedSchemaEvent -import to.curare.compose.nostr.curated.CuratedSuggestionRef +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.nostr.curated.CuratedEntryEvent +import com.machankura.bennu.compose.nostr.curated.CuratedEntryProblem +import com.machankura.bennu.compose.nostr.curated.CuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaEvent +import com.machankura.bennu.compose.nostr.curated.CuratedSuggestionRef import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupEventProposal.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/GroupEventProposal.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupEventProposal.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/GroupEventProposal.kt index cffe909a..148894a0 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupEventProposal.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/GroupEventProposal.kt @@ -1,8 +1,8 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr -import to.curare.compose.network.serialization.CommonJson -import to.curare.compose.nostr.curated.CuratedSchemaEvent -import to.curare.compose.nostr.curated.CuratedSchemaProblem +import com.machankura.bennu.compose.network.serialization.CommonJson +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaEvent +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaProblem import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.Kind import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupNostrProfile.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/GroupNostrProfile.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupNostrProfile.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/GroupNostrProfile.kt index 252448fa..011964df 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupNostrProfile.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/GroupNostrProfile.kt @@ -1,6 +1,6 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr -import to.curare.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.GroupSignedEvent import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip01Core.metadata.UserMetadata diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupPost.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/GroupPost.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupPost.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/GroupPost.kt index 3d60a7fd..a21ad3c8 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupPost.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/GroupPost.kt @@ -1,6 +1,6 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr -import to.curare.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.GroupSignedEvent import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupRelayList.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/GroupRelayList.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupRelayList.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/GroupRelayList.kt index c042963f..ec817e28 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupRelayList.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/GroupRelayList.kt @@ -1,6 +1,6 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr -import to.curare.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.GroupSignedEvent import com.vitorpamplona.quartz.nip01Core.core.Kind import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/MarmotDelivery.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/MarmotDelivery.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/MarmotDelivery.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/MarmotDelivery.kt index aa633e9b..f0d78d77 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/MarmotDelivery.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/MarmotDelivery.kt @@ -1,9 +1,9 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl -import to.curare.compose.database.model.BroadcastNostrEventRequest -import to.curare.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.BroadcastNostrEventRequest +import com.machankura.bennu.compose.database.model.ChatMessage /** * What has to be written once a queued inner event has been encrypted into a @@ -15,8 +15,8 @@ import to.curare.compose.database.model.ChatMessage * Letting the second decide the first is what silenced FROST signing: the * broadcast rows were written inside `chatMessageOrNull?.let { }`, and protocol * traffic has no ChatMessage -- `ChatMessage.applyInnerEvent` returns null for - * every [to.curare.compose.nostr.frost.FrostSigningEvents] kind and for - * [to.curare.compose.nostr.frost.GroupKeyStateEvent], and + * every [com.machankura.bennu.compose.nostr.frost.FrostSigningEvents] kind and for + * [com.machankura.bennu.compose.nostr.frost.GroupKeyStateEvent], and * `FrostSigningManager` queues its messages without one. So every signing * proposal was MLS-encrypted, wrapped, persisted and marked processed, and then * never sent to a relay. Nothing failed; the other participants simply never saw diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/MarmotDirectMessage.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/MarmotDirectMessage.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/MarmotDirectMessage.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/MarmotDirectMessage.kt index 3e8e25bc..57893f54 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/MarmotDirectMessage.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/MarmotDirectMessage.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr import com.vitorpamplona.quartz.marmot.foundation.appEvents.MarmotAppEvent import com.vitorpamplona.quartz.nip01Core.core.Event diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/MarmotProfile.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/MarmotProfile.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/MarmotProfile.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/MarmotProfile.kt index 9089ae64..da2c4694 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/MarmotProfile.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/MarmotProfile.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr /** * Which Marmot profile a group, a KeyPackage or a bundle is on. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/MemberProfileSync.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/MemberProfileSync.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/MemberProfileSync.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/MemberProfileSync.kt index 4da5a881..e0c7ca7d 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/MemberProfileSync.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/MemberProfileSync.kt @@ -1,10 +1,10 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent -import to.curare.compose.database.model.NegentropySynchronizeRequest -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter /** * Asking the relays who a room's members are, for the members this device cannot name. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/Nip17Filters.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/Nip17Filters.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/Nip17Filters.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/Nip17Filters.kt index 01f0d33b..f0a92afe 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/Nip17Filters.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/Nip17Filters.kt @@ -1,9 +1,9 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip59Giftwrap.wraps.GiftWrapEvent -import to.curare.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter /** * The one filter shape that can return a NIP-17 message we are able to read. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/Relays.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/Relays.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/Relays.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/Relays.kt index 05963c57..b002ca7b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/Relays.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/Relays.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer import com.vitorpamplona.quartz.nip28PublicChat.list.tags.ChannelTag @@ -6,10 +6,10 @@ import com.vitorpamplona.quartz.nip65RelayList.tags.AdvertisedRelayInfo import com.vitorpamplona.quartz.nip65RelayList.tags.AdvertisedRelayType object Relays { - // Still on the mantra.press host two rebrands later -- Mantra to Curated, Curated - // to Curare -- because this is a running relay, not a brand string. It is in the + // Still on the mantra.press host three rebrands later -- Mantra to Curated, Curated + // to Curare, Curare to Bennu -- because this is a running relay, not a brand string. It is in the // bootstrap, publish, finder and DM sets, so pointing it at a name nobody has stood - // up yet would take the app off the network. Swap it when a Curare relay exists to + // up yet would take the app off the network. Swap it when a Bennu relay exists to // swap it for. val ephemeral = RelayUrlNormalizer.normalize("wss://ephemeral.mantra.press") diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/SignInSync.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/SignInSync.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/SignInSync.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/SignInSync.kt index 30a49291..b0e1d41b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/SignInSync.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/SignInSync.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent @@ -11,8 +11,8 @@ import com.vitorpamplona.quartz.nip50Search.SearchRelayListEvent import com.vitorpamplona.quartz.nip51Lists.relayLists.IndexerRelayListEvent import com.vitorpamplona.quartz.nip51Lists.relayLists.RelayFeedsListEvent import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent -import to.curare.compose.database.model.SynchronizeNostrEventRequest -import to.curare.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.database.model.SynchronizeNostrEventRequest +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter /** * The sync that finds an existing identity's profile: what it asks for, whom it asks, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/ChronicleEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/chronicle/ChronicleEvent.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/ChronicleEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/chronicle/ChronicleEvent.kt index 75efd332..c6e7c1ce 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/ChronicleEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/chronicle/ChronicleEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.chronicle +package com.machankura.bennu.compose.nostr.chronicle import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Event @@ -10,18 +10,18 @@ import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils import kotlinx.serialization.json.jsonArray -import to.curare.compose.network.serialization.CommonJson -import to.curare.compose.nostr.chronicle.tags.ChronicleIdTag -import to.curare.compose.nostr.chronicle.tags.ChroniclePageTag -import to.curare.compose.nostr.chronicle.tags.ChronicleRecipientTag -import to.curare.compose.nostr.nip30303.ArtifactEvent -import to.curare.compose.nostr.nip30303.ArtifactVersionEvent -import to.curare.compose.nostr.nip30303.ChapterEvent -import to.curare.compose.nostr.nip30303.ChunkEvent -import to.curare.compose.nostr.nip30303.DialectEvent -import to.curare.compose.nostr.nip30303.TranslationArtifactVersionEvent -import to.curare.compose.nostr.nip30303.TranslationChapterEvent -import to.curare.compose.nostr.nip30303.TranslationChunkEvent +import com.machankura.bennu.compose.network.serialization.CommonJson +import com.machankura.bennu.compose.nostr.chronicle.tags.ChronicleIdTag +import com.machankura.bennu.compose.nostr.chronicle.tags.ChroniclePageTag +import com.machankura.bennu.compose.nostr.chronicle.tags.ChronicleRecipientTag +import com.machankura.bennu.compose.nostr.nip30303.ArtifactEvent +import com.machankura.bennu.compose.nostr.nip30303.ArtifactVersionEvent +import com.machankura.bennu.compose.nostr.nip30303.ChapterEvent +import com.machankura.bennu.compose.nostr.nip30303.ChunkEvent +import com.machankura.bennu.compose.nostr.nip30303.DialectEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationArtifactVersionEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationChapterEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationChunkEvent /** * 30327 @@ -45,7 +45,7 @@ import to.curare.compose.nostr.nip30303.TranslationChunkEvent * deliberately does not do: it never carries the chat, and it cannot make its * recipient able to *sign* anything. * - * ### Why not a [to.curare.compose.nostr.nip30303.SubmissionEvent] each + * ### Why not a [com.machankura.bennu.compose.nostr.nip30303.SubmissionEvent] each * * The envelope fits and the meaning does not. A submission is an *act* -- this * member is putting this event in front of this group -- and a chronicle asserts diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/ChronicleRequestEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/chronicle/ChronicleRequestEvent.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/ChronicleRequestEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/chronicle/ChronicleRequestEvent.kt index f8264b87..62f6b362 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/ChronicleRequestEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/chronicle/ChronicleRequestEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.chronicle +package com.machankura.bennu.compose.nostr.chronicle import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Event diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/tags/ChronicleIdTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/chronicle/tags/ChronicleIdTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/tags/ChronicleIdTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/chronicle/tags/ChronicleIdTag.kt index 114382de..9ddadcc4 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/tags/ChronicleIdTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/chronicle/tags/ChronicleIdTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.chronicle.tags +package com.machankura.bennu.compose.nostr.chronicle.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/tags/ChroniclePageTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/chronicle/tags/ChroniclePageTag.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/tags/ChroniclePageTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/chronicle/tags/ChroniclePageTag.kt index 179757a5..345fc2ec 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/tags/ChroniclePageTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/chronicle/tags/ChroniclePageTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.chronicle.tags +package com.machankura.bennu.compose.nostr.chronicle.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/tags/ChronicleRecipientTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/chronicle/tags/ChronicleRecipientTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/tags/ChronicleRecipientTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/chronicle/tags/ChronicleRecipientTag.kt index 01e4079f..88e99071 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/tags/ChronicleRecipientTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/chronicle/tags/ChronicleRecipientTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.chronicle.tags +package com.machankura.bennu.compose.nostr.chronicle.tags import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.has diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/curated/CuratedEntryEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/curated/CuratedEntryEvent.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/curated/CuratedEntryEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/curated/CuratedEntryEvent.kt index 4c46ccf6..bea4cf30 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/curated/CuratedEntryEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/curated/CuratedEntryEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.curated +package com.machankura.bennu.compose.nostr.curated import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/curated/CuratedSchema.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/curated/CuratedSchema.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/curated/CuratedSchema.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/curated/CuratedSchema.kt index 74d48ca1..63ea271b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/curated/CuratedSchema.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/curated/CuratedSchema.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.curated +package com.machankura.bennu.compose.nostr.curated import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.Kind @@ -12,7 +12,7 @@ import kotlinx.serialization.json.contentOrNull import kotlinx.serialization.json.jsonPrimitive import kotlinx.serialization.json.longOrNull import kotlinx.serialization.json.put -import to.curare.compose.network.serialization.CommonJson +import com.machankura.bennu.compose.network.serialization.CommonJson /** * The definition of a curated list: what an entry may contain, who may suggest diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/curated/CuratedSchemaEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/curated/CuratedSchemaEvent.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/curated/CuratedSchemaEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/curated/CuratedSchemaEvent.kt index 89abfdbf..c9dca2a0 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/curated/CuratedSchemaEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/curated/CuratedSchemaEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.curated +package com.machankura.bennu.compose.nostr.curated import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/curated/CuratedSchemaTemplate.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/curated/CuratedSchemaTemplate.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/curated/CuratedSchemaTemplate.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/curated/CuratedSchemaTemplate.kt index 3ed558c7..9eaf3100 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/curated/CuratedSchemaTemplate.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/curated/CuratedSchemaTemplate.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.curated +package com.machankura.bennu.compose.nostr.curated /** * How a client works an entry's `d` out of the entry itself. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/dkg/DkgRitualEvents.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/dkg/DkgRitualEvents.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/dkg/DkgRitualEvents.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/dkg/DkgRitualEvents.kt index dfd1328e..7df3a943 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/dkg/DkgRitualEvents.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/dkg/DkgRitualEvents.kt @@ -1,10 +1,10 @@ -package to.curare.compose.nostr.dkg +package com.machankura.bennu.compose.nostr.dkg -import to.curare.compose.nostr.dkg.tags.DkgSessionIdTag -import to.curare.compose.nostr.dkg.tags.DkgThresholdTag +import com.machankura.bennu.compose.nostr.dkg.tags.DkgSessionIdTag +import com.machankura.bennu.compose.nostr.dkg.tags.DkgThresholdTag import com.vitorpamplona.quartz.nip01Core.core.Kind import com.vitorpamplona.quartz.nip14Subject.SubjectTag -import to.curare.compose.nostr.subgroup.tags.SubgroupParentTag +import com.machankura.bennu.compose.nostr.subgroup.tags.SubgroupParentTag /** * The nostr kinds a ChillDKG ritual is carried on. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/dkg/tags/DkgSessionIdTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/dkg/tags/DkgSessionIdTag.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/dkg/tags/DkgSessionIdTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/dkg/tags/DkgSessionIdTag.kt index 1f037b52..fbec31ac 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/dkg/tags/DkgSessionIdTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/dkg/tags/DkgSessionIdTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.dkg.tags +package com.machankura.bennu.compose.nostr.dkg.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/dkg/tags/DkgThresholdTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/dkg/tags/DkgThresholdTag.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/dkg/tags/DkgThresholdTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/dkg/tags/DkgThresholdTag.kt index 73f1d764..04832c22 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/dkg/tags/DkgThresholdTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/dkg/tags/DkgThresholdTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.dkg.tags +package com.machankura.bennu.compose.nostr.dkg.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/FrostSigningEvents.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/frost/FrostSigningEvents.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/FrostSigningEvents.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/frost/FrostSigningEvents.kt index 5dc55b0a..ae67395c 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/FrostSigningEvents.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/frost/FrostSigningEvents.kt @@ -1,14 +1,14 @@ -package to.curare.compose.nostr.frost +package com.machankura.bennu.compose.nostr.frost import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.Kind import kotlinx.serialization.json.jsonArray -import to.curare.compose.network.serialization.CommonJson -import to.curare.compose.nostr.frost.tags.FrostKeyTag -import to.curare.compose.nostr.frost.tags.FrostSessionIdTag -import to.curare.compose.nostr.frost.tags.FrostSignerIdsTag -import to.curare.compose.nostr.frost.tags.FrostSilentMembersTag +import com.machankura.bennu.compose.network.serialization.CommonJson +import com.machankura.bennu.compose.nostr.frost.tags.FrostKeyTag +import com.machankura.bennu.compose.nostr.frost.tags.FrostSessionIdTag +import com.machankura.bennu.compose.nostr.frost.tags.FrostSignerIdsTag +import com.machankura.bennu.compose.nostr.frost.tags.FrostSilentMembersTag /** * The nostr kinds a FROST signing session is carried on. @@ -52,7 +52,7 @@ import to.curare.compose.nostr.frost.tags.FrostSilentMembersTag * ### Why 3032x * * These share the inner-event space with the nip30303 document kinds, which run - * 30300 up to [to.curare.compose.nostr.nip30303.SubmissionEvent] at 30312 -- + * 30300 up to [com.machankura.bennu.compose.nostr.nip30303.SubmissionEvent] at 30312 -- * the same space, because both are Marmot inner events and both are dispatched * on kind by the same inbound path. Starting at 30320 leaves that family room to * grow into. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/GroupKeyStateEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/frost/GroupKeyStateEvent.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/GroupKeyStateEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/frost/GroupKeyStateEvent.kt index 64a5d4f3..c45df42a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/GroupKeyStateEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/frost/GroupKeyStateEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.frost +package com.machankura.bennu.compose.nostr.frost import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -7,13 +7,13 @@ import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher import com.vitorpamplona.quartz.nip01Core.crypto.Nip01Crypto import com.vitorpamplona.quartz.nip01Core.tags.dTag.DTag -import to.curare.compose.managers.SharedKeyDerivation -import to.curare.compose.nostr.frost.tags.FrostDerivationPathTag -import to.curare.compose.nostr.frost.tags.FrostKeyTag -import to.curare.compose.nostr.subgroup.SubgroupBirthCertificateEvent -import to.curare.compose.nostr.subgroup.SubgroupParentage -import to.curare.compose.nostr.subgroup.tags.SubgroupBirthCertificateTag -import to.curare.compose.nostr.subgroup.tags.SubgroupParentTag +import com.machankura.bennu.compose.managers.SharedKeyDerivation +import com.machankura.bennu.compose.nostr.frost.tags.FrostDerivationPathTag +import com.machankura.bennu.compose.nostr.frost.tags.FrostKeyTag +import com.machankura.bennu.compose.nostr.subgroup.SubgroupBirthCertificateEvent +import com.machankura.bennu.compose.nostr.subgroup.SubgroupParentage +import com.machankura.bennu.compose.nostr.subgroup.tags.SubgroupBirthCertificateTag +import com.machankura.bennu.compose.nostr.subgroup.tags.SubgroupParentTag /** * What key a Marmot room signs with, signed by the group whose key it is. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostDerivationPathTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/frost/tags/FrostDerivationPathTag.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostDerivationPathTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/frost/tags/FrostDerivationPathTag.kt index 61624cef..3b3a096f 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostDerivationPathTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/frost/tags/FrostDerivationPathTag.kt @@ -1,8 +1,8 @@ -package to.curare.compose.nostr.frost.tags +package com.machankura.bennu.compose.nostr.frost.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure -import to.curare.compose.managers.SharedKeyDerivation +import com.machankura.bennu.compose.managers.SharedKeyDerivation /** * The path the room's id was derived at, `m/9420/0/0` style. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostKeyTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/frost/tags/FrostKeyTag.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostKeyTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/frost/tags/FrostKeyTag.kt index 4b02439e..ac267aa9 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostKeyTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/frost/tags/FrostKeyTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.frost.tags +package com.machankura.bennu.compose.nostr.frost.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostSessionIdTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/frost/tags/FrostSessionIdTag.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostSessionIdTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/frost/tags/FrostSessionIdTag.kt index 2551a739..185d6fc1 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostSessionIdTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/frost/tags/FrostSessionIdTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.frost.tags +package com.machankura.bennu.compose.nostr.frost.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostSignerIdsTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/frost/tags/FrostSignerIdsTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostSignerIdsTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/frost/tags/FrostSignerIdsTag.kt index 87f50d44..ad1a5ff2 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostSignerIdsTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/frost/tags/FrostSignerIdsTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.frost.tags +package com.machankura.bennu.compose.nostr.frost.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostSilentMembersTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/frost/tags/FrostSilentMembersTag.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostSilentMembersTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/frost/tags/FrostSilentMembersTag.kt index e2638d0c..14fc1bfd 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostSilentMembersTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/frost/tags/FrostSilentMembersTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.frost.tags +package com.machankura.bennu.compose.nostr.frost.tags import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.has diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/ArtifactEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/ArtifactEvent.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/ArtifactEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/ArtifactEvent.kt index b67c94d7..77d21318 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/ArtifactEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/ArtifactEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303 +package com.machankura.bennu.compose.nostr.nip30303 import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Event @@ -9,11 +9,11 @@ import com.vitorpamplona.quartz.nip22Comments.RootScope import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils -import to.curare.compose.nostr.nip30303.tags.ArtifactVersionMetadataTag -import to.curare.compose.nostr.nip30303.tags.DialectIdTag -import to.curare.compose.nostr.nip30303.tags.LicenseTag -import to.curare.compose.nostr.nip30303.tags.UrlTag -import to.curare.compose.nostr.nip30303.tags.VisibilityTag +import com.machankura.bennu.compose.nostr.nip30303.tags.ArtifactVersionMetadataTag +import com.machankura.bennu.compose.nostr.nip30303.tags.DialectIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.LicenseTag +import com.machankura.bennu.compose.nostr.nip30303.tags.UrlTag +import com.machankura.bennu.compose.nostr.nip30303.tags.VisibilityTag @Immutable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/ArtifactVersionEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/ArtifactVersionEvent.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/ArtifactVersionEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/ArtifactVersionEvent.kt index 07edae4f..541a1616 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/ArtifactVersionEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/ArtifactVersionEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303 +package com.machankura.bennu.compose.nostr.nip30303 import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Event @@ -10,8 +10,8 @@ import com.vitorpamplona.quartz.nip22Comments.RootScope import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils -import to.curare.compose.nostr.nip30303.tags.ArtifactIdTag -import to.curare.compose.nostr.nip30303.tags.ArtifactVersionMetadataTag +import com.machankura.bennu.compose.nostr.nip30303.tags.ArtifactIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.ArtifactVersionMetadataTag @Immutable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/ChapterEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/ChapterEvent.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/ChapterEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/ChapterEvent.kt index 9d2b7fd8..933e1c38 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/ChapterEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/ChapterEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303 +package com.machankura.bennu.compose.nostr.nip30303 import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Event @@ -7,11 +7,11 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils -import to.curare.compose.nostr.nip30303.tags.ArtifactVersionIdTag -import to.curare.compose.nostr.nip30303.tags.IndexTag -import to.curare.compose.nostr.nip30303.tags.NameTag -import to.curare.compose.nostr.nip30303.tags.OriginalTextTag -import to.curare.compose.nostr.nip30303.tags.WordStatisticsTag +import com.machankura.bennu.compose.nostr.nip30303.tags.ArtifactVersionIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.IndexTag +import com.machankura.bennu.compose.nostr.nip30303.tags.NameTag +import com.machankura.bennu.compose.nostr.nip30303.tags.OriginalTextTag +import com.machankura.bennu.compose.nostr.nip30303.tags.WordStatisticsTag @Immutable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/ChunkEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/ChunkEvent.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/ChunkEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/ChunkEvent.kt index af4d5e5f..8a9004be 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/ChunkEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/ChunkEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303 +package com.machankura.bennu.compose.nostr.nip30303 import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Event @@ -10,10 +10,10 @@ import com.vitorpamplona.quartz.nip22Comments.RootScope import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils -import to.curare.compose.nostr.nip30303.tags.ChapterIdTag -import to.curare.compose.nostr.nip30303.tags.IndexTag -import to.curare.compose.nostr.nip30303.tags.WordStatisticsTag -import to.curare.compose.text.Markdown +import com.machankura.bennu.compose.nostr.nip30303.tags.ChapterIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.IndexTag +import com.machankura.bennu.compose.nostr.nip30303.tags.WordStatisticsTag +import com.machankura.bennu.compose.text.Markdown @Immutable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/DialectEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/DialectEvent.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/DialectEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/DialectEvent.kt index c22391b0..e8fcae4c 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/DialectEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/DialectEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303 +package com.machankura.bennu.compose.nostr.nip30303 import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Event @@ -9,9 +9,9 @@ import com.vitorpamplona.quartz.nip22Comments.RootScope import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils -import to.curare.compose.nostr.nip30303.tags.CountryTag -import to.curare.compose.nostr.nip30303.tags.LanguageTag -import to.curare.compose.nostr.nip30303.tags.NameTag +import com.machankura.bennu.compose.nostr.nip30303.tags.CountryTag +import com.machankura.bennu.compose.nostr.nip30303.tags.LanguageTag +import com.machankura.bennu.compose.nostr.nip30303.tags.NameTag @Immutable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/SubmissionEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/SubmissionEvent.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/SubmissionEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/SubmissionEvent.kt index 94598747..4d458ac4 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/SubmissionEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/SubmissionEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303 +package com.machankura.bennu.compose.nostr.nip30303 import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Event @@ -7,8 +7,8 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils -import to.curare.compose.nostr.nip30303.tags.PayloadIdTag -import to.curare.compose.nostr.nip30303.tags.PayloadKindTag +import com.machankura.bennu.compose.nostr.nip30303.tags.PayloadIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.PayloadKindTag /** * 30312 diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationArtifactVersionContributorListEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/TranslationArtifactVersionContributorListEvent.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationArtifactVersionContributorListEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/TranslationArtifactVersionContributorListEvent.kt index 937afce2..4c6c049b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationArtifactVersionContributorListEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/TranslationArtifactVersionContributorListEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303 +package com.machankura.bennu.compose.nostr.nip30303 import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Event diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationArtifactVersionEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/TranslationArtifactVersionEvent.kt similarity index 83% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationArtifactVersionEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/TranslationArtifactVersionEvent.kt index c398ebca..ac851170 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationArtifactVersionEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/TranslationArtifactVersionEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303 +package com.machankura.bennu.compose.nostr.nip30303 import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Event @@ -7,11 +7,11 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils -import to.curare.compose.nostr.nip30303.tags.ArtifactVersionIdTag -import to.curare.compose.nostr.nip30303.tags.DialectIdTag -import to.curare.compose.nostr.nip30303.tags.LicenseTag -import to.curare.compose.nostr.nip30303.tags.NameTag -import to.curare.compose.nostr.nip30303.tags.VisibilityTag +import com.machankura.bennu.compose.nostr.nip30303.tags.ArtifactVersionIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.DialectIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.LicenseTag +import com.machankura.bennu.compose.nostr.nip30303.tags.NameTag +import com.machankura.bennu.compose.nostr.nip30303.tags.VisibilityTag @Immutable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationChapterContributorListEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/TranslationChapterContributorListEvent.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationChapterContributorListEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/TranslationChapterContributorListEvent.kt index a517177e..62ce9b9a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationChapterContributorListEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/TranslationChapterContributorListEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303 +package com.machankura.bennu.compose.nostr.nip30303 import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Event diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationChapterEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/TranslationChapterEvent.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationChapterEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/TranslationChapterEvent.kt index 665a0a5a..d37c9bfc 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationChapterEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/TranslationChapterEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303 +package com.machankura.bennu.compose.nostr.nip30303 import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Event @@ -9,9 +9,9 @@ import com.vitorpamplona.quartz.nip22Comments.RootScope import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils -import to.curare.compose.nostr.nip30303.tags.ChapterIdTag -import to.curare.compose.nostr.nip30303.tags.IndexTag -import to.curare.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.ChapterIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.IndexTag +import com.machankura.bennu.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag @Immutable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationChunkEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/TranslationChunkEvent.kt similarity index 83% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationChunkEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/TranslationChunkEvent.kt index d64cc0b7..725d5421 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationChunkEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/TranslationChunkEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303 +package com.machankura.bennu.compose.nostr.nip30303 import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Event @@ -9,10 +9,10 @@ import com.vitorpamplona.quartz.nip22Comments.RootScope import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils -import to.curare.compose.nostr.nip30303.tags.ChunkIdTag -import to.curare.compose.nostr.nip30303.tags.IndexTag -import to.curare.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag -import to.curare.compose.nostr.nip30303.tags.TranslationChapterIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.ChunkIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.IndexTag +import com.machankura.bennu.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.TranslationChapterIdTag @Immutable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationChunkProposalEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/TranslationChunkProposalEvent.kt similarity index 83% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationChunkProposalEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/TranslationChunkProposalEvent.kt index 98eef07b..2032dbe6 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationChunkProposalEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/TranslationChunkProposalEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303 +package com.machankura.bennu.compose.nostr.nip30303 import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Event @@ -9,10 +9,10 @@ import com.vitorpamplona.quartz.nip22Comments.RootScope import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils -import to.curare.compose.nostr.nip30303.tags.ChunkIdTag -import to.curare.compose.nostr.nip30303.tags.IndexTag -import to.curare.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag -import to.curare.compose.nostr.nip30303.tags.TranslationChapterIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.ChunkIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.IndexTag +import com.machankura.bennu.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.TranslationChapterIdTag @Immutable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationContributorListEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/TranslationContributorListEvent.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationContributorListEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/TranslationContributorListEvent.kt index e9c51901..ac186cef 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationContributorListEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/TranslationContributorListEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303 +package com.machankura.bennu.compose.nostr.nip30303 import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Event diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/TranslationEvent.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/TranslationEvent.kt index b09b315f..978f0eea 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/TranslationEvent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303 +package com.machankura.bennu.compose.nostr.nip30303 import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Event @@ -9,8 +9,8 @@ import com.vitorpamplona.quartz.nip22Comments.RootScope import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils -import to.curare.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag -import to.curare.compose.nostr.nip30303.tags.TranslationChunkIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.TranslationChunkIdTag @Immutable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ArtifactIdTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/ArtifactIdTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ArtifactIdTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/ArtifactIdTag.kt index 2523ba42..05679d22 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ArtifactIdTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/ArtifactIdTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303.tags +package com.machankura.bennu.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.has diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ArtifactVersionIdTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/ArtifactVersionIdTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ArtifactVersionIdTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/ArtifactVersionIdTag.kt index 8ae76e74..ceed58a3 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ArtifactVersionIdTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/ArtifactVersionIdTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303.tags +package com.machankura.bennu.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.has diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ArtifactVersionMetadataTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/ArtifactVersionMetadataTag.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ArtifactVersionMetadataTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/ArtifactVersionMetadataTag.kt index 560abb5b..ebb206d9 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ArtifactVersionMetadataTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/ArtifactVersionMetadataTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303.tags +package com.machankura.bennu.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ChapterIdTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/ChapterIdTag.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ChapterIdTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/ChapterIdTag.kt index 4417ed81..898388c2 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ChapterIdTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/ChapterIdTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303.tags +package com.machankura.bennu.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.has diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ChunkIdTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/ChunkIdTag.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ChunkIdTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/ChunkIdTag.kt index 45ea0e8b..0ef01f08 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ChunkIdTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/ChunkIdTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303.tags +package com.machankura.bennu.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.has diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ContributorTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/ContributorTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ContributorTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/ContributorTag.kt index fc329aab..71ebe987 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ContributorTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/ContributorTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303.tags +package com.machankura.bennu.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.has diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/CountryTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/CountryTag.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/CountryTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/CountryTag.kt index b144a38f..07b578fd 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/CountryTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/CountryTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303.tags +package com.machankura.bennu.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/DialectIdTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/DialectIdTag.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/DialectIdTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/DialectIdTag.kt index f1b2c7c1..7b544d8e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/DialectIdTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/DialectIdTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303.tags +package com.machankura.bennu.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.has diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/IndexTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/IndexTag.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/IndexTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/IndexTag.kt index 75b5406e..10833c25 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/IndexTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/IndexTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303.tags +package com.machankura.bennu.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/LanguageTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/LanguageTag.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/LanguageTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/LanguageTag.kt index 81a11baf..3060d6c6 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/LanguageTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/LanguageTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303.tags +package com.machankura.bennu.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/LicenseTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/LicenseTag.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/LicenseTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/LicenseTag.kt index 3f2ed738..3bf5a07b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/LicenseTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/LicenseTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303.tags +package com.machankura.bennu.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/NameTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/NameTag.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/NameTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/NameTag.kt index 0257751b..d467590c 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/NameTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/NameTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303.tags +package com.machankura.bennu.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/OriginalTextTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/OriginalTextTag.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/OriginalTextTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/OriginalTextTag.kt index c9df8b4b..29c06d83 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/OriginalTextTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/OriginalTextTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303.tags +package com.machankura.bennu.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/PayloadIdTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/PayloadIdTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/PayloadIdTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/PayloadIdTag.kt index c7fe7745..b8f9a4a0 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/PayloadIdTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/PayloadIdTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303.tags +package com.machankura.bennu.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.has diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/PayloadKindTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/PayloadKindTag.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/PayloadKindTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/PayloadKindTag.kt index 20f57d4a..4ab55914 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/PayloadKindTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/PayloadKindTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303.tags +package com.machankura.bennu.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/TranslationArtifactVersionIdTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/TranslationArtifactVersionIdTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/TranslationArtifactVersionIdTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/TranslationArtifactVersionIdTag.kt index f1883350..2cb6e164 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/TranslationArtifactVersionIdTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/TranslationArtifactVersionIdTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303.tags +package com.machankura.bennu.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.has diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/TranslationChapterIdTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/TranslationChapterIdTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/TranslationChapterIdTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/TranslationChapterIdTag.kt index 8e6b5c86..0bd306ac 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/TranslationChapterIdTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/TranslationChapterIdTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303.tags +package com.machankura.bennu.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.has diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/TranslationChunkIdTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/TranslationChunkIdTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/TranslationChunkIdTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/TranslationChunkIdTag.kt index 3c7e879b..7d448c61 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/TranslationChunkIdTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/TranslationChunkIdTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303.tags +package com.machankura.bennu.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.has diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/TranslationIdTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/TranslationIdTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/TranslationIdTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/TranslationIdTag.kt index 2ee05db2..ba7361d6 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/TranslationIdTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/TranslationIdTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303.tags +package com.machankura.bennu.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.has diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/UrlTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/UrlTag.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/UrlTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/UrlTag.kt index 3bc57751..c0f1b10a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/UrlTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/UrlTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303.tags +package com.machankura.bennu.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/VisibilityTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/VisibilityTag.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/VisibilityTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/VisibilityTag.kt index a1526d30..267551c2 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/VisibilityTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/VisibilityTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303.tags +package com.machankura.bennu.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/WordStatisticsTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/WordStatisticsTag.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/WordStatisticsTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/WordStatisticsTag.kt index c3758f86..9728424e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/WordStatisticsTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/nip30303/tags/WordStatisticsTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303.tags +package com.machankura.bennu.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/SubgroupBirthCertificateEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/subgroup/SubgroupBirthCertificateEvent.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/SubgroupBirthCertificateEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/subgroup/SubgroupBirthCertificateEvent.kt index a13d0c9c..3a37c245 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/SubgroupBirthCertificateEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/subgroup/SubgroupBirthCertificateEvent.kt @@ -1,15 +1,15 @@ -package to.curare.compose.nostr.subgroup +package com.machankura.bennu.compose.nostr.subgroup import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.Kind import com.vitorpamplona.quartz.nip01Core.tags.dTag.DTag import com.vitorpamplona.quartz.nip01Core.tags.people.PTag -import to.curare.compose.managers.SharedKeyDerivation -import to.curare.compose.nostr.frost.GroupKeyStateEvent -import to.curare.compose.nostr.frost.tags.FrostDerivationPathTag -import to.curare.compose.nostr.subgroup.tags.SubgroupKeyTag -import to.curare.compose.nostr.subgroup.tags.SubgroupParentTag +import com.machankura.bennu.compose.managers.SharedKeyDerivation +import com.machankura.bennu.compose.nostr.frost.GroupKeyStateEvent +import com.machankura.bennu.compose.nostr.frost.tags.FrostDerivationPathTag +import com.machankura.bennu.compose.nostr.subgroup.tags.SubgroupKeyTag +import com.machankura.bennu.compose.nostr.subgroup.tags.SubgroupParentTag /** * A group saying, with a quorum, that another group is its child. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/SubgroupParentage.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/subgroup/SubgroupParentage.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/SubgroupParentage.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/subgroup/SubgroupParentage.kt index f2ba0b59..6344bdb8 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/SubgroupParentage.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/subgroup/SubgroupParentage.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.subgroup +package com.machankura.bennu.compose.nostr.subgroup import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/tags/SubgroupBirthCertificateTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/subgroup/tags/SubgroupBirthCertificateTag.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/tags/SubgroupBirthCertificateTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/subgroup/tags/SubgroupBirthCertificateTag.kt index 87c1c25c..daa687ab 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/tags/SubgroupBirthCertificateTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/subgroup/tags/SubgroupBirthCertificateTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.subgroup.tags +package com.machankura.bennu.compose.nostr.subgroup.tags import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.has diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/tags/SubgroupKeyTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/subgroup/tags/SubgroupKeyTag.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/tags/SubgroupKeyTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/subgroup/tags/SubgroupKeyTag.kt index 670d9971..1eacd782 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/tags/SubgroupKeyTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/subgroup/tags/SubgroupKeyTag.kt @@ -1,9 +1,9 @@ -package to.curare.compose.nostr.subgroup.tags +package com.machankura.bennu.compose.nostr.subgroup.tags import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure -import to.curare.compose.nostr.frost.GroupKeyStateEvent +import com.machankura.bennu.compose.nostr.frost.GroupKeyStateEvent /** * The subgroup's own ChillDKG threshold public key, 33-byte compressed hex. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/tags/SubgroupParentTag.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/subgroup/tags/SubgroupParentTag.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/tags/SubgroupParentTag.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/subgroup/tags/SubgroupParentTag.kt index 753d5738..19f46465 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/tags/SubgroupParentTag.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/subgroup/tags/SubgroupParentTag.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.subgroup.tags +package com.machankura.bennu.compose.nostr.subgroup.tags import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.has diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/CachingImportRepository.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/CachingImportRepository.kt new file mode 100644 index 00000000..c734a142 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/CachingImportRepository.kt @@ -0,0 +1,40 @@ +package com.machankura.bennu.compose.repository + +/** + * As seen in Primal + * + * https://github.com/PrimalHQ/primal-android-app/blob/a7e32e2203555d27e60a749238175cd1ee0fa2af/domain/primal/src/commonMain/kotlin/net/primal/domain/global/CachingImportRepository.kt + * + */ +interface CachingImportRepository { + suspend fun cacheNostrEvents(vararg events: com.machankura.bennu.compose.database.model.NostrEvent) + suspend fun cacheNostrEvents(events: List) + + suspend fun importEvents(events: List): Boolean + suspend fun broadcastEvents(events: List, relays: List): Result> + + companion object { + val NO_OP_CACHING_IMPORT_REPOSITORY = object : CachingImportRepository { + override suspend fun cacheNostrEvents(vararg events: com.machankura.bennu.compose.database.model.NostrEvent) { + } + + override suspend fun cacheNostrEvents(events: List) { + + } + + override suspend fun importEvents(events: List): Boolean { + return true + } + + override suspend fun broadcastEvents( + events: List, + relays: List + ): Result> { + return Result.success( + emptyList() + ) + } + + } + } +} diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/ChatRepository.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/ChatRepository.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/repository/ChatRepository.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/ChatRepository.kt index 39b8e8c6..32c412e0 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/ChatRepository.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/ChatRepository.kt @@ -1,24 +1,24 @@ -package to.curare.compose.repository +package com.machankura.bennu.compose.repository -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.GiftWrapPayload -import to.curare.compose.database.model.GroupKeyState -import to.curare.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.GiftWrapPayload +import com.machankura.bennu.compose.database.model.GroupKeyState +import com.machankura.bennu.compose.database.model.GroupSignedEvent import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair -import to.curare.compose.database.model.MarmotKeyPackage -import to.curare.compose.nostr.MarmotProfile -import to.curare.compose.managers.SharedKeyDerivation -import to.curare.compose.managers.MarmotGroupCreation -import to.curare.compose.managers.SubgroupManager -import to.curare.compose.nostr.GroupNostrProfile -import to.curare.compose.nostr.GroupCuratedEntry -import to.curare.compose.nostr.GroupCuratedSchema -import to.curare.compose.nostr.GroupPost -import to.curare.compose.nostr.GroupRelayList -import to.curare.compose.database.model.Participant -import to.curare.compose.database.model.intermdiate.LocalChatMessage -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.types.MarmotReindexReport +import com.machankura.bennu.compose.database.model.MarmotKeyPackage +import com.machankura.bennu.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.managers.SharedKeyDerivation +import com.machankura.bennu.compose.managers.MarmotGroupCreation +import com.machankura.bennu.compose.managers.SubgroupManager +import com.machankura.bennu.compose.nostr.GroupNostrProfile +import com.machankura.bennu.compose.nostr.GroupCuratedEntry +import com.machankura.bennu.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.nostr.GroupPost +import com.machankura.bennu.compose.nostr.GroupRelayList +import com.machankura.bennu.compose.database.model.Participant +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatMessage +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.types.MarmotReindexReport import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.Kind import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/DkgRepository.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/DkgRepository.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/repository/DkgRepository.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/DkgRepository.kt index 30387290..3857ff5b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/DkgRepository.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/DkgRepository.kt @@ -1,13 +1,13 @@ -package to.curare.compose.repository +package com.machankura.bennu.compose.repository -import to.curare.compose.database.model.DkgParticipantMessage -import to.curare.compose.database.model.DkgSession -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.GroupKeyState -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.intermdiate.LocalFrostSigningSession -import to.curare.compose.database.model.types.DkgApprovalStep +import com.machankura.bennu.compose.database.model.DkgParticipantMessage +import com.machankura.bennu.compose.database.model.DkgSession +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.GroupKeyState +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalFrostSigningSession +import com.machankura.bennu.compose.database.model.types.DkgApprovalStep import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/FrostSigningRepository.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/FrostSigningRepository.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/repository/FrostSigningRepository.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/FrostSigningRepository.kt index e34e7392..fde049c4 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/FrostSigningRepository.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/FrostSigningRepository.kt @@ -1,4 +1,4 @@ -package to.curare.compose.repository +package com.machankura.bennu.compose.repository import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -6,12 +6,12 @@ import com.vitorpamplona.quartz.nip01Core.core.Kind import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf -import to.curare.compose.database.model.FrostSignerMessage -import to.curare.compose.database.model.FrostSigningItem -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.intermdiate.FrostSignerTally -import to.curare.compose.database.model.intermdiate.LocalFrostSigningSession +import com.machankura.bennu.compose.database.model.FrostSignerMessage +import com.machankura.bennu.compose.database.model.FrostSigningItem +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.FrostSignerTally +import com.machankura.bennu.compose.database.model.intermdiate.LocalFrostSigningSession /** * Reads, opens and answers FROST signing sessions. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/MantraRepository.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/MantraRepository.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/to/curare/compose/repository/MantraRepository.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/MantraRepository.kt index 7292596e..6c7912ea 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/MantraRepository.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/MantraRepository.kt @@ -1,15 +1,15 @@ -package to.curare.compose.repository +package com.machankura.bennu.compose.repository import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.database.model.MantraArtifact -import to.curare.compose.database.model.MantraArtifactVersion -import to.curare.compose.database.model.MantraChapter -import to.curare.compose.database.model.MantraChunk -import to.curare.compose.database.model.MantraDialect -import to.curare.compose.database.model.MantraTranslationArtifactVersion -import to.curare.compose.database.model.MantraTranslationChapter -import to.curare.compose.database.model.MantraTranslationChunk -import to.curare.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.MantraArtifact +import com.machankura.bennu.compose.database.model.MantraArtifactVersion +import com.machankura.bennu.compose.database.model.MantraChapter +import com.machankura.bennu.compose.database.model.MantraChunk +import com.machankura.bennu.compose.database.model.MantraDialect +import com.machankura.bennu.compose.database.model.MantraTranslationArtifactVersion +import com.machankura.bennu.compose.database.model.MantraTranslationChapter +import com.machankura.bennu.compose.database.model.MantraTranslationChunk +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom interface MantraRepository { suspend fun getArtifacts(chatRoomId: String): List diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/MarmotRepository.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/MarmotRepository.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/repository/MarmotRepository.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/MarmotRepository.kt index 68130dc5..9ece000d 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/MarmotRepository.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/MarmotRepository.kt @@ -1,10 +1,10 @@ -package to.curare.compose.repository +package com.machankura.bennu.compose.repository -import to.curare.compose.database.model.MarmotInnerEvent -import to.curare.compose.database.model.MarmotKeyPackageBundle +import com.machankura.bennu.compose.database.model.MarmotInnerEvent +import com.machankura.bennu.compose.database.model.MarmotKeyPackageBundle import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair -import to.curare.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.nostr.MarmotProfile import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync import kotlinx.coroutines.flow.Flow diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/NostrNotaryRepository.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/NostrNotaryRepository.kt similarity index 64% rename from composeApp/src/commonMain/kotlin/to/curare/compose/repository/NostrNotaryRepository.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/NostrNotaryRepository.kt index 9dbc0294..74668a69 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/NostrNotaryRepository.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/NostrNotaryRepository.kt @@ -1,11 +1,11 @@ -package to.curare.compose.repository +package com.machankura.bennu.compose.repository -import to.curare.compose.cryptography.signOrThrow -import to.curare.compose.network.asClientTag +import com.machankura.bennu.compose.cryptography.signOrThrow +import com.machankura.bennu.compose.network.asClientTag import com.vitorpamplona.quartz.nip19Bech32.toNsec import com.vitorpamplona.quartz.nip51Lists.relayLists.RelayFeedsListEvent import kotlinx.coroutines.flow.StateFlow -import to.curare.compose.identity.Identity +import com.machankura.bennu.compose.identity.Identity import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.channels.Channel @@ -36,10 +36,10 @@ class NostrNotaryRepository( private val _responses = Channel() private fun setResponse(response: SignResult) = scope.launch { _responses.send(response) } - suspend fun signNostrEvent(unsignedNostrEvent: to.curare.compose.database.model.UnsignedNostrEvent): SignResult { + suspend fun signNostrEvent(unsignedNostrEvent: com.machankura.bennu.compose.database.model.UnsignedNostrEvent): SignResult { val result = try { signNostrEvent(publicKey = unsignedNostrEvent.pubKey, event = unsignedNostrEvent) - } catch (error: to.curare.compose.exceptions.SignatureException) { + } catch (error: com.machankura.bennu.compose.exceptions.SignatureException) { return SignResult.Rejected(error) } @@ -53,24 +53,24 @@ class NostrNotaryRepository( } } - fun verifySignature(nostrEvent: to.curare.compose.database.model.NostrEvent): Boolean { + fun verifySignature(nostrEvent: com.machankura.bennu.compose.database.model.NostrEvent): Boolean { throw NotImplementedError() } - fun onSuccess(nostrEvent: to.curare.compose.database.model.NostrEvent) { + fun onSuccess(nostrEvent: com.machankura.bennu.compose.database.model.NostrEvent) { setResponse(SignResult.Signed(nostrEvent)) } fun onFailure() { - setResponse(SignResult.Rejected(to.curare.compose.exceptions.SigningRejectedException())) + setResponse(SignResult.Rejected(com.machankura.bennu.compose.exceptions.SigningRejectedException())) } private fun findNsecOrThrow(activeUserPublicKey: String): String = runCatching { activeIdentityStateFlow.value?.nostrPrivateKey?.value?.toByteArray()?.toNsec() - }.getOrNull() ?: throw to.curare.compose.exceptions.SigningKeyNotFoundException() + }.getOrNull() ?: throw com.machankura.bennu.compose.exceptions.SigningKeyNotFoundException() - private fun signNostrEvent(publicKey: String, event: to.curare.compose.database.model.UnsignedNostrEvent): to.curare.compose.database.model.NostrEvent { + private fun signNostrEvent(publicKey: String, event: com.machankura.bennu.compose.database.model.UnsignedNostrEvent): com.machankura.bennu.compose.database.model.NostrEvent { val isExternalSignerLogin = runCatching { // credentialsStore.isExternalSignerCredential(npub = publicKey.hexToNpubHrp()) false @@ -83,9 +83,9 @@ class NostrNotaryRepository( return event.signOrThrow(nsec = findNsecOrThrow(publicKey)) } - suspend fun signRelayListMetadata(userId: String, relays: List): SignResult { + suspend fun signRelayListMetadata(userId: String, relays: List): SignResult { return signNostrEvent( - unsignedNostrEvent = to.curare.compose.database.model.UnsignedNostrEvent( + unsignedNostrEvent = com.machankura.bennu.compose.database.model.UnsignedNostrEvent( pubKey = userId, content = "", kind = RelayFeedsListEvent.KIND, @@ -100,20 +100,20 @@ class NostrNotaryRepository( } ) } - .toTypedArray() + listOf(to.curare.compose.network.UserAgent.CLIENT_NAME.asClientTag()), + .toTypedArray() + listOf(com.machankura.bennu.compose.network.UserAgent.CLIENT_NAME.asClientTag()), ), ) } sealed class NotarySideEffect { - data class RequestSignature(val unsignedEvent: to.curare.compose.database.model.UnsignedNostrEvent) : NotarySideEffect() + data class RequestSignature(val unsignedEvent: com.machankura.bennu.compose.database.model.UnsignedNostrEvent) : NotarySideEffect() } sealed class SignResult { - data class Signed(val event: to.curare.compose.database.model.NostrEvent) : SignResult() - data class Rejected(val error: to.curare.compose.exceptions.SignatureException) : SignResult() + data class Signed(val event: com.machankura.bennu.compose.database.model.NostrEvent) : SignResult() + data class Rejected(val error: com.machankura.bennu.compose.exceptions.SignatureException) : SignResult() - fun unwrapOrThrow(onFailure: ((to.curare.compose.exceptions.SignatureException) -> Unit)? = null): to.curare.compose.database.model.NostrEvent = + fun unwrapOrThrow(onFailure: ((com.machankura.bennu.compose.exceptions.SignatureException) -> Unit)? = null): com.machankura.bennu.compose.database.model.NostrEvent = when (this) { is Rejected -> { onFailure?.invoke(this.error) @@ -125,7 +125,7 @@ class NostrNotaryRepository( } } - fun getOrNull(onFailure: ((to.curare.compose.exceptions.SignatureException) -> Unit)? = null): to.curare.compose.database.model.NostrEvent? = + fun getOrNull(onFailure: ((com.machankura.bennu.compose.exceptions.SignatureException) -> Unit)? = null): com.machankura.bennu.compose.database.model.NostrEvent? = when (this) { is Rejected -> { onFailure?.invoke(this.error) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/NostrPublisherRepository.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/NostrPublisherRepository.kt similarity index 64% rename from composeApp/src/commonMain/kotlin/to/curare/compose/repository/NostrPublisherRepository.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/NostrPublisherRepository.kt index d6bf1cc5..2d8d621a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/NostrPublisherRepository.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/NostrPublisherRepository.kt @@ -1,4 +1,4 @@ -package to.curare.compose.repository +package com.machankura.bennu.compose.repository import co.touchlab.kermit.Logger import kotlinx.coroutines.CoroutineScope @@ -13,14 +13,14 @@ import kotlinx.coroutines.launch * https://github.com/PrimalHQ/primal-android-app/blob/ec22916b4e3472a20bade82d53957a7ef9b708b0/app/src/main/kotlin/net/primal/android/nostr/publish/NostrPublisher.kt#L20 */ class NostrPublisherRepository( - private val relaysSocketManager: to.curare.compose.network.relays.RelaysSocketManager, + private val relaysSocketManager: com.machankura.bennu.compose.network.relays.RelaysSocketManager, private val nostrNotary: NostrNotaryRepository, private val cachingImportRepository: CachingImportRepository, ) { val logger = Logger.withTag("NostrPublisherRepository") private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) - private fun importEvent(event: to.curare.compose.database.model.NostrEvent) { + private fun importEvent(event: com.machankura.bennu.compose.database.model.NostrEvent) { scope.launch { runCatching { cachingImportRepository.importEvents(events = listOf(event)) @@ -30,8 +30,8 @@ class NostrPublisherRepository( } } - @Throws(to.curare.compose.exceptions.NostrPublishException::class, kotlin.coroutines.cancellation.CancellationException::class) - private suspend fun publishAndImportEvent(signedNostrEvent: to.curare.compose.database.model.NostrEvent, outboxRelays: List = emptyList()) { + @Throws(com.machankura.bennu.compose.exceptions.NostrPublishException::class, kotlin.coroutines.cancellation.CancellationException::class) + private suspend fun publishAndImportEvent(signedNostrEvent: com.machankura.bennu.compose.database.model.NostrEvent, outboxRelays: List = emptyList()) { relaysSocketManager.publishEvent(signedNostrEvent) importEvent(signedNostrEvent) if (outboxRelays.isNotEmpty()) { @@ -39,7 +39,7 @@ class NostrPublisherRepository( relaysSocketManager.publishEvent( nostrEvent = signedNostrEvent, relays = outboxRelays.map { - to.curare.compose.network.dto.RelayDTO( + com.machankura.bennu.compose.network.dto.RelayDTO( url = it, read = false, write = true @@ -52,19 +52,19 @@ class NostrPublisherRepository( } } - @Throws(to.curare.compose.exceptions.NostrPublishException::class, to.curare.compose.exceptions.SignatureException::class, kotlin.coroutines.cancellation.CancellationException::class) + @Throws(com.machankura.bennu.compose.exceptions.NostrPublishException::class, com.machankura.bennu.compose.exceptions.SignatureException::class, kotlin.coroutines.cancellation.CancellationException::class) suspend fun signPublishImportNostrEvent( - unsignedNostrEvent: to.curare.compose.database.model.UnsignedNostrEvent, + unsignedNostrEvent: com.machankura.bennu.compose.database.model.UnsignedNostrEvent, outboxRelays: List, - ): to.curare.compose.database.model.NostrEvent { + ): com.machankura.bennu.compose.database.model.NostrEvent { val signedNostrEvent = nostrNotary.signNostrEvent(unsignedNostrEvent = unsignedNostrEvent).unwrapOrThrow() publishAndImportEvent(signedNostrEvent = signedNostrEvent, outboxRelays = outboxRelays) return signedNostrEvent } - @Throws(to.curare.compose.exceptions.NostrPublishException::class, to.curare.compose.exceptions.SignatureException::class, kotlin.coroutines.cancellation.CancellationException::class) - suspend fun publishRelayList(userId: String, relays: List): to.curare.compose.database.model.NostrEvent { + @Throws(com.machankura.bennu.compose.exceptions.NostrPublishException::class, com.machankura.bennu.compose.exceptions.SignatureException::class, kotlin.coroutines.cancellation.CancellationException::class) + suspend fun publishRelayList(userId: String, relays: List): com.machankura.bennu.compose.database.model.NostrEvent { val signedNostrEvent = nostrNotary.signRelayListMetadata(userId = userId, relays = relays).unwrapOrThrow() relaysSocketManager.publishEvent(nostrEvent = signedNostrEvent, relays = relays.toSet()) importEvent(signedNostrEvent) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/NostrRepository.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/NostrRepository.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/to/curare/compose/repository/NostrRepository.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/NostrRepository.kt index bc61415f..c71d5bcf 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/NostrRepository.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/NostrRepository.kt @@ -1,21 +1,21 @@ -package to.curare.compose.repository +package com.machankura.bennu.compose.repository -import to.curare.compose.database.model.BroadcastNostrEventReceipt -import to.curare.compose.database.model.BroadcastNostrEventRequest -import to.curare.compose.database.model.Connection -import to.curare.compose.database.model.NegentropySynchronizeRequest -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.RecentSearch -import to.curare.compose.database.model.SynchronizeNostrEventRequest -import to.curare.compose.database.model.UnsignedNostrEvent -import to.curare.compose.database.model.intermdiate.LocalAccount -import to.curare.compose.database.model.intermdiate.LocalBroadcastNostrEventRequest -import to.curare.compose.database.model.intermdiate.LocalNostrEvent -import to.curare.compose.database.model.intermdiate.LocalProfile -import to.curare.compose.database.model.intermdiate.LocalProfileWithFollowers -import to.curare.compose.database.model.intermdiate.LocalProfileWithFollowing -import to.curare.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.database.model.BroadcastNostrEventReceipt +import com.machankura.bennu.compose.database.model.BroadcastNostrEventRequest +import com.machankura.bennu.compose.database.model.Connection +import com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.RecentSearch +import com.machankura.bennu.compose.database.model.SynchronizeNostrEventRequest +import com.machankura.bennu.compose.database.model.UnsignedNostrEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalAccount +import com.machankura.bennu.compose.database.model.intermdiate.LocalBroadcastNostrEventRequest +import com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalProfile +import com.machankura.bennu.compose.database.model.intermdiate.LocalProfileWithFollowers +import com.machankura.bennu.compose.database.model.intermdiate.LocalProfileWithFollowing +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.Kind import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair @@ -222,7 +222,7 @@ interface NostrRepository { suspend fun removeRecentSearch(recentSearch: RecentSearch) - suspend fun saveSearchQuery(query: String, synchronizationFilterArray: to.curare.compose.database.model.typealiases.SynchronizationFilterArray? = null) + suspend fun saveSearchQuery(query: String, synchronizationFilterArray: com.machankura.bennu.compose.database.model.typealiases.SynchronizationFilterArray? = null) suspend fun rescheduleBroadcastNostrEventRequests(broadcastNostrEventRequests: List) @@ -455,7 +455,7 @@ interface NostrRepository { override suspend fun saveSearchQuery( query: String, - synchronizationFilterArray: to.curare.compose.database.model.typealiases.SynchronizationFilterArray? + synchronizationFilterArray: com.machankura.bennu.compose.database.model.typealiases.SynchronizationFilterArray? ) { TODO("Not yet implemented") } diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/PostRepository.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/PostRepository.kt new file mode 100644 index 00000000..49ede9b2 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/PostRepository.kt @@ -0,0 +1,3 @@ +package com.machankura.bennu.compose.repository + +interface PostRepository \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/ProfilesOf.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/ProfilesOf.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/to/curare/compose/repository/ProfilesOf.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/ProfilesOf.kt index 07efef1e..ba4d1601 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/ProfilesOf.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/ProfilesOf.kt @@ -1,4 +1,4 @@ -package to.curare.compose.repository +package com.machankura.bennu.compose.repository import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.flow.Flow @@ -6,7 +6,7 @@ import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.emitAll import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flowOf -import to.curare.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.Profile /** * The nostr profile of each of [publicKeys], as one map that moves when any of them diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/RelayRepository.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/RelayRepository.kt similarity index 55% rename from composeApp/src/commonMain/kotlin/to/curare/compose/repository/RelayRepository.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/RelayRepository.kt index d5015510..9cde2ac8 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/RelayRepository.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/RelayRepository.kt @@ -1,7 +1,7 @@ -package to.curare.compose.repository +package com.machankura.bennu.compose.repository import kotlinx.coroutines.flow.Flow interface RelayRepository { - suspend fun observePublicKeyRelays(publicKey: String): Flow> + suspend fun observePublicKeyRelays(publicKey: String): Flow> } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/SearchRepository.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/SearchRepository.kt similarity index 52% rename from composeApp/src/commonMain/kotlin/to/curare/compose/repository/SearchRepository.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/SearchRepository.kt index 8b6bf14e..04c3f495 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/SearchRepository.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/SearchRepository.kt @@ -1,14 +1,14 @@ -package to.curare.compose.repository +package com.machankura.bennu.compose.repository interface SearchRepository { suspend fun submitSearch( - synchronizeNostrEventRequests: List, + synchronizeNostrEventRequests: List, ) companion object { val NO_OP_SEARCH_REPOSITORY = object: SearchRepository { - override suspend fun submitSearch(synchronizeNostrEventRequests: List) { + override suspend fun submitSearch(synchronizeNostrEventRequests: List) { TODO("Not yet implemented") } } diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/text/Markdown.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/text/Markdown.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/text/Markdown.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/text/Markdown.kt index 3c3752b0..b9f07412 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/text/Markdown.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/text/Markdown.kt @@ -1,4 +1,4 @@ -package to.curare.compose.text +package com.machankura.bennu.compose.text /** * Lightweight helpers for the markdown original text of chapters/chunks. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/text/ProposedEvent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/text/ProposedEvent.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/to/curare/compose/text/ProposedEvent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/text/ProposedEvent.kt index 42af1005..96759804 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/text/ProposedEvent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/text/ProposedEvent.kt @@ -1,22 +1,22 @@ -package to.curare.compose.text +package com.machankura.bennu.compose.text import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent -import to.curare.compose.extensions.shortened -import to.curare.compose.managers.SharedKeyDerivation -import to.curare.compose.nostr.GroupRelaySet -import to.curare.compose.nostr.curated.CuratedEntryEvent -import to.curare.compose.nostr.curated.CuratedSchemaEvent -import to.curare.compose.nostr.frost.GroupKeyStateEvent -import to.curare.compose.nostr.subgroup.SubgroupBirthCertificateEvent -import to.curare.compose.nostr.nip30303.ArtifactEvent -import to.curare.compose.nostr.nip30303.ArtifactVersionEvent -import to.curare.compose.nostr.nip30303.ChapterEvent -import to.curare.compose.nostr.nip30303.DialectEvent -import to.curare.compose.nostr.nip30303.TranslationArtifactVersionEvent -import to.curare.compose.nostr.nip30303.TranslationChapterEvent -import to.curare.compose.nostr.nip30303.TranslationChunkEvent +import com.machankura.bennu.compose.extensions.shortened +import com.machankura.bennu.compose.managers.SharedKeyDerivation +import com.machankura.bennu.compose.nostr.GroupRelaySet +import com.machankura.bennu.compose.nostr.curated.CuratedEntryEvent +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaEvent +import com.machankura.bennu.compose.nostr.frost.GroupKeyStateEvent +import com.machankura.bennu.compose.nostr.subgroup.SubgroupBirthCertificateEvent +import com.machankura.bennu.compose.nostr.nip30303.ArtifactEvent +import com.machankura.bennu.compose.nostr.nip30303.ArtifactVersionEvent +import com.machankura.bennu.compose.nostr.nip30303.ChapterEvent +import com.machankura.bennu.compose.nostr.nip30303.DialectEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationArtifactVersionEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationChapterEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationChunkEvent /** * An event a group is being asked to sign, said in words. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/BlurHashDecoder.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/BlurHashDecoder.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/BlurHashDecoder.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/BlurHashDecoder.kt index 12f825cb..357c766a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/BlurHashDecoder.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/BlurHashDecoder.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui +package com.machankura.bennu.compose.ui import coil3.Bitmap import kotlin.math.pow diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AcceptCuratedSuggestionScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/AcceptCuratedSuggestionScreen.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AcceptCuratedSuggestionScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/AcceptCuratedSuggestionScreen.kt index 9cea276d..f7d44f1c 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AcceptCuratedSuggestionScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/AcceptCuratedSuggestionScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -52,72 +52,72 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.lifecycle.viewmodel.compose.viewModel import com.vitorpamplona.quartz.nip01Core.core.HexKey -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.a_date_as_yyyy_yyyy_mm_or_yyyy_mm_dd -import curare.composeapp.generated.resources.a_whole_number -import curare.composeapp.generated.resources.add_another -import curare.composeapp.generated.resources.at_least_n -import curare.composeapp.generated.resources.at_least_one_of_these_is_needed -import curare.composeapp.generated.resources.at_most_n -import curare.composeapp.generated.resources.at_most_n_characters -import curare.composeapp.generated.resources.could_not_ask_the_group_to_sign_this_entry -import curare.composeapp.generated.resources.field_and_problem -import curare.composeapp.generated.resources.filled_in_by_the_suggester_s_app_and_kept -import curare.composeapp.generated.resources.kept_from_the_suggestion -import curare.composeapp.generated.resources.more_than_zero -import curare.composeapp.generated.resources.must_match_the_pattern -import curare.composeapp.generated.resources.n_or_earlier -import curare.composeapp.generated.resources.n_or_later -import curare.composeapp.generated.resources.one_word_without_spaces -import curare.composeapp.generated.resources.only_one_value_for_this_field -import curare.composeapp.generated.resources.pick_one_of_the_options -import curare.composeapp.generated.resources.propose_entry -import curare.composeapp.generated.resources.suggested_by_on -import curare.composeapp.generated.resources.take_this_suggestion_into_the_list -import curare.composeapp.generated.resources.that_is_not_a_web_address -import curare.composeapp.generated.resources.that_must_be_an_https_address -import curare.composeapp.generated.resources.the_entry_cannot_be_signed_as_it_is -import curare.composeapp.generated.resources.the_group_already_has_an_entry_for_this -import curare.composeapp.generated.resources.the_group_signs_an_entry_so_it_takes_a_quorum -import curare.composeapp.generated.resources.this_entry_cannot_be_signed_as_it_is -import curare.composeapp.generated.resources.this_field_is_required -import curare.composeapp.generated.resources.this_group_has_no_shared_key_to_sign_an_entry -import curare.composeapp.generated.resources.this_list_uses_a_field_type_this_app_does_not_support +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.a_date_as_yyyy_yyyy_mm_or_yyyy_mm_dd +import bennu.composeapp.generated.resources.a_whole_number +import bennu.composeapp.generated.resources.add_another +import bennu.composeapp.generated.resources.at_least_n +import bennu.composeapp.generated.resources.at_least_one_of_these_is_needed +import bennu.composeapp.generated.resources.at_most_n +import bennu.composeapp.generated.resources.at_most_n_characters +import bennu.composeapp.generated.resources.could_not_ask_the_group_to_sign_this_entry +import bennu.composeapp.generated.resources.field_and_problem +import bennu.composeapp.generated.resources.filled_in_by_the_suggester_s_app_and_kept +import bennu.composeapp.generated.resources.kept_from_the_suggestion +import bennu.composeapp.generated.resources.more_than_zero +import bennu.composeapp.generated.resources.must_match_the_pattern +import bennu.composeapp.generated.resources.n_or_earlier +import bennu.composeapp.generated.resources.n_or_later +import bennu.composeapp.generated.resources.one_word_without_spaces +import bennu.composeapp.generated.resources.only_one_value_for_this_field +import bennu.composeapp.generated.resources.pick_one_of_the_options +import bennu.composeapp.generated.resources.propose_entry +import bennu.composeapp.generated.resources.suggested_by_on +import bennu.composeapp.generated.resources.take_this_suggestion_into_the_list +import bennu.composeapp.generated.resources.that_is_not_a_web_address +import bennu.composeapp.generated.resources.that_must_be_an_https_address +import bennu.composeapp.generated.resources.the_entry_cannot_be_signed_as_it_is +import bennu.composeapp.generated.resources.the_group_already_has_an_entry_for_this +import bennu.composeapp.generated.resources.the_group_signs_an_entry_so_it_takes_a_quorum +import bennu.composeapp.generated.resources.this_entry_cannot_be_signed_as_it_is +import bennu.composeapp.generated.resources.this_field_is_required +import bennu.composeapp.generated.resources.this_group_has_no_shared_key_to_sign_an_entry +import bennu.composeapp.generated.resources.this_list_uses_a_field_type_this_app_does_not_support import org.jetbrains.compose.resources.stringResource -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.extensions.toFormattedTimeAndDateString -import to.curare.compose.nostr.CuratedSuggestion -import to.curare.compose.nostr.GroupCuratedSchema -import to.curare.compose.nostr.curated.CuratedEntry -import to.curare.compose.nostr.curated.CuratedEntryProblem -import to.curare.compose.nostr.curated.CuratedField -import to.curare.compose.nostr.curated.CuratedFieldConfig -import to.curare.compose.nostr.curated.CuratedFieldType -import to.curare.compose.nostr.curated.CuratedSchema -import to.curare.compose.nostr.curated.CuratedSchemaEvent -import to.curare.compose.nostr.curated.CuratedVisibility -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.navigation.routes.FrostSigningRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.composable.widgets.ErrorState -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.buttons.ExtendedFab -import to.curare.compose.ui.composable.widgets.rememberNotifier -import to.curare.compose.ui.theme.ConformancePreviews -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.view.model.AcceptCuratedSuggestionViewModel -import to.curare.compose.ui.view.state.AcceptCuratedSuggestionUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.extensions.toFormattedTimeAndDateString +import com.machankura.bennu.compose.nostr.CuratedSuggestion +import com.machankura.bennu.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedEntry +import com.machankura.bennu.compose.nostr.curated.CuratedEntryProblem +import com.machankura.bennu.compose.nostr.curated.CuratedField +import com.machankura.bennu.compose.nostr.curated.CuratedFieldConfig +import com.machankura.bennu.compose.nostr.curated.CuratedFieldType +import com.machankura.bennu.compose.nostr.curated.CuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaEvent +import com.machankura.bennu.compose.nostr.curated.CuratedVisibility +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.FrostSigningRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.buttons.ExtendedFab +import com.machankura.bennu.compose.ui.composable.widgets.rememberNotifier +import com.machankura.bennu.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.view.model.AcceptCuratedSuggestionViewModel +import com.machankura.bennu.compose.ui.view.state.AcceptCuratedSuggestionUIState import kotlin.time.Instant /** @@ -798,7 +798,7 @@ private fun AcceptCuratedSuggestionScreenPreview() { isCurated = false ) - CurareTheme { + BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { AcceptCuratedSuggestionScreen( activeUserPublicKey = "u".repeat(64), diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ActiveProfileScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ActiveProfileScreen.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ActiveProfileScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ActiveProfileScreen.kt index 8db57401..4017c0ef 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ActiveProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ActiveProfileScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -34,56 +34,56 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.intermdiate.LocalNostrEvent -import to.curare.compose.extensions.hexToNpubHrp -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import to.curare.compose.ui.composable.navigation.routes.KeyPackageManagementRoute -import to.curare.compose.ui.composable.navigation.routes.KeyRecoveryRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.navigation.routes.ShareProfileRoute -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.profile.ProfileAvatar -import to.curare.compose.ui.view.model.ActiveProfileViewModel -import to.curare.compose.ui.view.state.ActiveProfileUIState +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent +import com.machankura.bennu.compose.extensions.hexToNpubHrp +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.ImplementationPendingRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.KeyPackageManagementRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.KeyRecoveryRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.navigation.routes.ShareProfileRoute +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar +import com.machankura.bennu.compose.ui.view.model.ActiveProfileViewModel +import com.machankura.bennu.compose.ui.view.state.ActiveProfileUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent -import to.curare.compose.ui.composable.widgets.LocalCanSign -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.composable.widgets.LocalCanSign +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.edit_profile -import curare.composeapp.generated.resources.key_package_management -import curare.composeapp.generated.resources.network_relays -import curare.composeapp.generated.resources.profile -import curare.composeapp.generated.resources.key_recovery -import curare.composeapp.generated.resources.share_profile -import curare.composeapp.generated.resources.sign_out -import curare.composeapp.generated.resources.switch_profile -import to.curare.compose.ui.composable.navigation.routes.ProfilesRoute -import curare.composeapp.generated.resources.sign_out_of_this_profile_question -import curare.composeapp.generated.resources.could_not_sign_out_please_try_again -import to.curare.compose.identity.Identity -import to.curare.compose.identity.IdentityWriter -import to.curare.compose.ui.composable.widgets.dialogs.SignOutOfReadOnlyDialog -import to.curare.compose.ui.composable.widgets.rememberNotifier -import to.curare.compose.ui.view.model.SignOutViewModel +import bennu.composeapp.generated.resources.edit_profile +import bennu.composeapp.generated.resources.key_package_management +import bennu.composeapp.generated.resources.network_relays +import bennu.composeapp.generated.resources.profile +import bennu.composeapp.generated.resources.key_recovery +import bennu.composeapp.generated.resources.share_profile +import bennu.composeapp.generated.resources.sign_out +import bennu.composeapp.generated.resources.switch_profile +import com.machankura.bennu.compose.ui.composable.navigation.routes.ProfilesRoute +import bennu.composeapp.generated.resources.sign_out_of_this_profile_question +import bennu.composeapp.generated.resources.could_not_sign_out_please_try_again +import com.machankura.bennu.compose.identity.Identity +import com.machankura.bennu.compose.identity.IdentityWriter +import com.machankura.bennu.compose.ui.composable.widgets.dialogs.SignOutOfReadOnlyDialog +import com.machankura.bennu.compose.ui.composable.widgets.rememberNotifier +import com.machankura.bennu.compose.ui.view.model.SignOutViewModel import kotlinx.coroutines.flow.StateFlow import androidx.compose.runtime.collectAsState import androidx.compose.runtime.rememberCoroutineScope -import curare.composeapp.generated.resources.something_went_wrong -import curare.composeapp.generated.resources.we_couldn_t_find_the_local_profile_please -import to.curare.compose.ui.composable.widgets.ErrorState +import bennu.composeapp.generated.resources.something_went_wrong +import bennu.composeapp.generated.resources.we_couldn_t_find_the_local_profile_please +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState import androidx.compose.material3.FilledTonalButton import androidx.compose.material3.ButtonDefaults -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class) @Composable @@ -457,7 +457,7 @@ class SignOutDependencies( @ConformancePreviews @Composable private fun UnannouncedProfileScreenPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { @@ -476,7 +476,7 @@ It has survived not only five centuries, but also the leap into electronic types sig = "", kind = MetadataEvent.KIND ), - profile = to.curare.compose.database.model.Profile( + profile = com.machankura.bennu.compose.database.model.Profile( publicKey = "84dee6e676e5bb67b4ad4e042cf70cbd8681155db535942fcc6a0533858a7240", displayName = "John Doe", nostrEventId = "nostrEventId", diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddArtifactScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/AddArtifactScreen.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddArtifactScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/AddArtifactScreen.kt index 2534ade5..0e84f739 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddArtifactScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/AddArtifactScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -45,44 +45,44 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.navigation.routes.ChatRoomDetailRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.state.ChatRoomMessagingUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.ChatRoomDetailRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.state.ChatRoomMessagingUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.repository.MantraRepository -import to.curare.compose.ui.composable.navigation.routes.FrostSigningRoute -import to.curare.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import to.curare.compose.ui.view.model.AddArtifactViewModel -import to.curare.compose.ui.view.state.AddArtifactUIState -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.repository.MantraRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.FrostSigningRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ImplementationPendingRoute +import com.machankura.bennu.compose.ui.view.model.AddArtifactViewModel +import com.machankura.bennu.compose.ui.view.state.AddArtifactUIState +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.add_artifact_to_the_group_library -import curare.composeapp.generated.resources.direct_message_detail -import curare.composeapp.generated.resources.direct_message_functionality_will_be_here -import curare.composeapp.generated.resources.eg_first_edition -import curare.composeapp.generated.resources.eg_https_harper_com_2_kill_bird -import curare.composeapp.generated.resources.eg_to_kill_a_mocking_bird -import curare.composeapp.generated.resources.initial_version_label -import curare.composeapp.generated.resources.name_of_artifact -import curare.composeapp.generated.resources.no_dialects_have_been_defined_in_this_group -import curare.composeapp.generated.resources.propose_artifact -import curare.composeapp.generated.resources.source_dialect -import curare.composeapp.generated.resources.url +import bennu.composeapp.generated.resources.add_artifact_to_the_group_library +import bennu.composeapp.generated.resources.direct_message_detail +import bennu.composeapp.generated.resources.direct_message_functionality_will_be_here +import bennu.composeapp.generated.resources.eg_first_edition +import bennu.composeapp.generated.resources.eg_https_harper_com_2_kill_bird +import bennu.composeapp.generated.resources.eg_to_kill_a_mocking_bird +import bennu.composeapp.generated.resources.initial_version_label +import bennu.composeapp.generated.resources.name_of_artifact +import bennu.composeapp.generated.resources.no_dialects_have_been_defined_in_this_group +import bennu.composeapp.generated.resources.propose_artifact +import bennu.composeapp.generated.resources.source_dialect +import bennu.composeapp.generated.resources.url import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.buttons.ExtendedFab -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.buttons.ExtendedFab +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class) @Composable @@ -373,7 +373,7 @@ fun AddArtifactScreen( @ConformancePreviews @Composable private fun AddArtifactScreenPreview() { - CurareTheme { + BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddChapterScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/AddChapterScreen.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddChapterScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/AddChapterScreen.kt index dd7682c6..f5fdd087 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddChapterScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/AddChapterScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -29,39 +29,39 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.MantraArtifact -import to.curare.compose.database.model.MantraArtifactVersion -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.repository.MantraRepository -import to.curare.compose.text.Markdown -import to.curare.compose.ui.composable.navigation.routes.FrostSigningRoute -import to.curare.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.model.AddChapterViewModel -import to.curare.compose.ui.view.state.AddChapterUIState -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.MantraArtifact +import com.machankura.bennu.compose.database.model.MantraArtifactVersion +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.repository.MantraRepository +import com.machankura.bennu.compose.text.Markdown +import com.machankura.bennu.compose.ui.composable.navigation.routes.FrostSigningRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ImplementationPendingRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.model.AddChapterViewModel +import com.machankura.bennu.compose.ui.view.state.AddChapterUIState +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.add_chapter -import curare.composeapp.generated.resources.chapter_name -import curare.composeapp.generated.resources.eg_chapter_1_the_beginning -import curare.composeapp.generated.resources.original_text_markdown -import curare.composeapp.generated.resources.paste_the_chapter_s_markdown_blank_lines -import curare.composeapp.generated.resources.propose_chapter -import curare.composeapp.generated.resources.this_artifact_has_no_version_for_a_chapter -import curare.composeapp.generated.resources.add_chapter_to +import bennu.composeapp.generated.resources.add_chapter +import bennu.composeapp.generated.resources.chapter_name +import bennu.composeapp.generated.resources.eg_chapter_1_the_beginning +import bennu.composeapp.generated.resources.original_text_markdown +import bennu.composeapp.generated.resources.paste_the_chapter_s_markdown_blank_lines +import bennu.composeapp.generated.resources.propose_chapter +import bennu.composeapp.generated.resources.this_artifact_has_no_version_for_a_chapter +import bennu.composeapp.generated.resources.add_chapter_to import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.composable.widgets.buttons.ExtendedFab -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.composable.widgets.buttons.ExtendedFab +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -275,7 +275,7 @@ fun AddChapterScreen( @ConformancePreviews @Composable private fun AddChapterScreenPreview() { - CurareTheme { + BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { AddChapterScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddDialectScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/AddDialectScreen.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddDialectScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/AddDialectScreen.kt index 91213968..137b9e39 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddDialectScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/AddDialectScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -36,37 +36,37 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.navigation.routes.FrostSigningRoute -import to.curare.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.model.AddDialectViewModel -import to.curare.compose.ui.view.state.AddDialectUIState -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.FrostSigningRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ImplementationPendingRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.model.AddDialectViewModel +import com.machankura.bennu.compose.ui.view.state.AddDialectUIState +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.add_a_dialect_the_group_can_translate_into -import curare.composeapp.generated.resources.add_dialect -import curare.composeapp.generated.resources.country -import curare.composeapp.generated.resources.dialect_name -import curare.composeapp.generated.resources.eg_lesotho -import curare.composeapp.generated.resources.eg_sesotho -import curare.composeapp.generated.resources.eg_st -import curare.composeapp.generated.resources.language -import curare.composeapp.generated.resources.propose_dialect +import bennu.composeapp.generated.resources.add_a_dialect_the_group_can_translate_into +import bennu.composeapp.generated.resources.add_dialect +import bennu.composeapp.generated.resources.country +import bennu.composeapp.generated.resources.dialect_name +import bennu.composeapp.generated.resources.eg_lesotho +import bennu.composeapp.generated.resources.eg_sesotho +import bennu.composeapp.generated.resources.eg_st +import bennu.composeapp.generated.resources.language +import bennu.composeapp.generated.resources.propose_dialect import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.buttons.ExtendedFab -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.buttons.ExtendedFab +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class) @Composable @@ -310,7 +310,7 @@ fun AddDialectScreen( @ConformancePreviews @Composable private fun AddDialectScreenPreview() { - CurareTheme { + BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddGroupPostScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/AddGroupPostScreen.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddGroupPostScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/AddGroupPostScreen.kt index a11cc5b5..4db17762 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddGroupPostScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/AddGroupPostScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -37,35 +37,35 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.ui.composable.navigation.routes.FrostSigningRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.ErrorState -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.buttons.ExtendedFab -import to.curare.compose.ui.composable.widgets.profile.ProfileAvatar -import to.curare.compose.ui.composable.widgets.rememberNotifier -import to.curare.compose.ui.theme.ConformancePreviews -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.view.model.AddGroupPostViewModel -import to.curare.compose.ui.view.state.AddGroupPostUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.FrostSigningRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.buttons.ExtendedFab +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar +import com.machankura.bennu.compose.ui.composable.widgets.rememberNotifier +import com.machankura.bennu.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.view.model.AddGroupPostViewModel +import com.machankura.bennu.compose.ui.view.state.AddGroupPostUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.a_post_needs_something_to_say -import curare.composeapp.generated.resources.add_post -import curare.composeapp.generated.resources.could_not_ask_the_group_to_sign_this_post -import curare.composeapp.generated.resources.propose_post -import curare.composeapp.generated.resources.the_group_signs_a_post_so_it_takes_a_quorum -import curare.composeapp.generated.resources.this_group_has_no_shared_key_to_sign_a_post -import curare.composeapp.generated.resources.what_should_the_group_say +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.a_post_needs_something_to_say +import bennu.composeapp.generated.resources.add_post +import bennu.composeapp.generated.resources.could_not_ask_the_group_to_sign_this_post +import bennu.composeapp.generated.resources.propose_post +import bennu.composeapp.generated.resources.the_group_signs_a_post_so_it_takes_a_quorum +import bennu.composeapp.generated.resources.this_group_has_no_shared_key_to_sign_a_post +import bennu.composeapp.generated.resources.what_should_the_group_say import org.jetbrains.compose.resources.stringResource /** @@ -279,7 +279,7 @@ fun AddGroupPostScreen( @ConformancePreviews @Composable private fun AddGroupPostScreenPreview() { - CurareTheme { + BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { AddGroupPostScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt index 209a720a..bb1cdd50 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -25,34 +25,34 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.MarmotKeyPackage -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.model.AddMemberToChatRoomConfirmationViewModel -import to.curare.compose.ui.view.state.AddMemberToChatRoomConfirmationUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.MarmotKeyPackage +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.model.AddMemberToChatRoomConfirmationViewModel +import com.machankura.bennu.compose.ui.view.state.AddMemberToChatRoomConfirmationUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.direct_message_detail -import curare.composeapp.generated.resources.direct_message_functionality_will_be_here -import curare.composeapp.generated.resources.invite -import curare.composeapp.generated.resources.invite_2 -import curare.composeapp.generated.resources.invite_new_member -import curare.composeapp.generated.resources.once_invited_will_be_able_to_receive_and -import curare.composeapp.generated.resources.to_join_the_chat_room +import bennu.composeapp.generated.resources.direct_message_detail +import bennu.composeapp.generated.resources.direct_message_functionality_will_be_here +import bennu.composeapp.generated.resources.invite +import bennu.composeapp.generated.resources.invite_2 +import bennu.composeapp.generated.resources.invite_new_member +import bennu.composeapp.generated.resources.once_invited_will_be_able_to_receive_and +import bennu.composeapp.generated.resources.to_join_the_chat_room import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.buttons.ExtendedFab -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.buttons.ExtendedFab +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class) @Composable @@ -211,7 +211,7 @@ fun AddMemberToChatRoomConfirmationScreen( @ConformancePreviews @Composable private fun ChatRoomDetailScreenPreview() { - CurareTheme { + BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { @@ -221,7 +221,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 Curare."), +// AddMemberToChatRoomConfirmationUIState.Error("Profile missing key package event.\n\nTry again later or tell Person to use Bennu."), AddMemberToChatRoomConfirmationUIState.Loaded( localChatRoom = LocalChatRoom( chatRoom = ChatRoom( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddTranslationArtifactVersionScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/AddTranslationArtifactVersionScreen.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddTranslationArtifactVersionScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/AddTranslationArtifactVersionScreen.kt index 2ee13c8d..b55fac5b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddTranslationArtifactVersionScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/AddTranslationArtifactVersionScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -32,37 +32,37 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.MantraArtifact -import to.curare.compose.database.model.MantraArtifactVersion -import to.curare.compose.database.model.MantraDialect -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.managers.FrostSigningManager -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.repository.MantraRepository -import to.curare.compose.ui.composable.navigation.routes.FrostSigningRoute -import to.curare.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.model.AddTranslationArtifactVersionViewModel -import to.curare.compose.ui.view.state.AddTranslationArtifactVersionUIState -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.MantraArtifact +import com.machankura.bennu.compose.database.model.MantraArtifactVersion +import com.machankura.bennu.compose.database.model.MantraDialect +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.managers.FrostSigningManager +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.repository.MantraRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.FrostSigningRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ImplementationPendingRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.model.AddTranslationArtifactVersionViewModel +import com.machankura.bennu.compose.ui.view.state.AddTranslationArtifactVersionUIState +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.add_translation -import curare.composeapp.generated.resources.propose_translation -import curare.composeapp.generated.resources.this_artifact_has_no_version_for_a -import curare.composeapp.generated.resources.translate_into_which_dialect -import curare.composeapp.generated.resources.translate +import bennu.composeapp.generated.resources.add_translation +import bennu.composeapp.generated.resources.propose_translation +import bennu.composeapp.generated.resources.this_artifact_has_no_version_for_a +import bennu.composeapp.generated.resources.translate_into_which_dialect +import bennu.composeapp.generated.resources.translate import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.composable.widgets.buttons.ExtendedFab -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.composable.widgets.buttons.ExtendedFab +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class) @Composable @@ -279,7 +279,7 @@ fun AddTranslationArtifactVersionScreen( @ConformancePreviews @Composable private fun AddTranslationArtifactVersionScreenPreview() { - CurareTheme { + BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { AddTranslationArtifactVersionScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ArtifactDetailScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ArtifactDetailScreen.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ArtifactDetailScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ArtifactDetailScreen.kt index 8b95f5ff..ce39a59a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ArtifactDetailScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ArtifactDetailScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -33,40 +33,40 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.database.model.MantraArtifact -import to.curare.compose.repository.MantraRepository -import to.curare.compose.ui.composable.widgets.DetailRow -import to.curare.compose.ui.composable.navigation.routes.AddChapterRoute -import to.curare.compose.ui.composable.navigation.routes.AddTranslationRoute -import to.curare.compose.ui.composable.navigation.routes.ChapterDetailRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.navigation.routes.TranslationArtifactVersionDetailRoute -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.model.ArtifactDetailViewModel -import to.curare.compose.ui.view.state.ArtifactDetailUIState -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.database.model.MantraArtifact +import com.machankura.bennu.compose.repository.MantraRepository +import com.machankura.bennu.compose.ui.composable.widgets.DetailRow +import com.machankura.bennu.compose.ui.composable.navigation.routes.AddChapterRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.AddTranslationRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ChapterDetailRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.navigation.routes.TranslationArtifactVersionDetailRoute +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.model.ArtifactDetailViewModel +import com.machankura.bennu.compose.ui.view.state.ArtifactDetailUIState +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.add_chapter -import curare.composeapp.generated.resources.add_translation -import curare.composeapp.generated.resources.artifact_detail -import curare.composeapp.generated.resources.chapters -import curare.composeapp.generated.resources.details -import curare.composeapp.generated.resources.no_chapters_yet -import curare.composeapp.generated.resources.no_translations_yet -import curare.composeapp.generated.resources.no_versions -import curare.composeapp.generated.resources.translations -import curare.composeapp.generated.resources.version -import curare.composeapp.generated.resources.versions -import curare.composeapp.generated.resources.chapter -import curare.composeapp.generated.resources.words_characters +import bennu.composeapp.generated.resources.add_chapter +import bennu.composeapp.generated.resources.add_translation +import bennu.composeapp.generated.resources.artifact_detail +import bennu.composeapp.generated.resources.chapters +import bennu.composeapp.generated.resources.details +import bennu.composeapp.generated.resources.no_chapters_yet +import bennu.composeapp.generated.resources.no_translations_yet +import bennu.composeapp.generated.resources.no_versions +import bennu.composeapp.generated.resources.translations +import bennu.composeapp.generated.resources.version +import bennu.composeapp.generated.resources.versions +import bennu.composeapp.generated.resources.chapter +import bennu.composeapp.generated.resources.words_characters import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -325,7 +325,7 @@ fun ArtifactDetailScreen( @ConformancePreviews @Composable private fun ArtifactDetailScreenPreview() { - CurareTheme { + BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { ArtifactDetailScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/BroadcastGroupSignedEventScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/BroadcastGroupSignedEventScreen.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/BroadcastGroupSignedEventScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/BroadcastGroupSignedEventScreen.kt index cc12999e..b75242e5 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/BroadcastGroupSignedEventScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/BroadcastGroupSignedEventScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -56,49 +56,49 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.relay.normalizer.displayUrl import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.accepted_by_n_of_m_relays -import curare.composeapp.generated.resources.add_a_relay_to_broadcast_to -import curare.composeapp.generated.resources.add_relay -import curare.composeapp.generated.resources.broadcast -import curare.composeapp.generated.resources.copied_the_raw_json -import curare.composeapp.generated.resources.copy_raw_json -import curare.composeapp.generated.resources.eg_wss_relay_example_com -import curare.composeapp.generated.resources.no_relays_to_broadcast_to -import curare.composeapp.generated.resources.relay_url -import curare.composeapp.generated.resources.relays -import curare.composeapp.generated.resources.sends_the_event_exactly_as_the_group_signed_it -import curare.composeapp.generated.resources.signed_by_the_group_on -import curare.composeapp.generated.resources.that_is_not_a_relay_address -import curare.composeapp.generated.resources.that_relay_is_already_in_this_list -import curare.composeapp.generated.resources.the_signed_event -import curare.composeapp.generated.resources.where_the_group_has_said_it_lives_is_filled_in +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.accepted_by_n_of_m_relays +import bennu.composeapp.generated.resources.add_a_relay_to_broadcast_to +import bennu.composeapp.generated.resources.add_relay +import bennu.composeapp.generated.resources.broadcast +import bennu.composeapp.generated.resources.copied_the_raw_json +import bennu.composeapp.generated.resources.copy_raw_json +import bennu.composeapp.generated.resources.eg_wss_relay_example_com +import bennu.composeapp.generated.resources.no_relays_to_broadcast_to +import bennu.composeapp.generated.resources.relay_url +import bennu.composeapp.generated.resources.relays +import bennu.composeapp.generated.resources.sends_the_event_exactly_as_the_group_signed_it +import bennu.composeapp.generated.resources.signed_by_the_group_on +import bennu.composeapp.generated.resources.that_is_not_a_relay_address +import bennu.composeapp.generated.resources.that_relay_is_already_in_this_list +import bennu.composeapp.generated.resources.the_signed_event +import bennu.composeapp.generated.resources.where_the_group_has_said_it_lives_is_filled_in import org.jetbrains.compose.resources.stringResource -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.network.relays.EventPublishTransport -import to.curare.compose.nostr.GroupRelayList -import to.curare.compose.repository.ChatRepository -import to.curare.compose.text.ProposedEvent -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.composable.widgets.EmptyState -import to.curare.compose.ui.composable.widgets.ErrorState -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.label -import to.curare.compose.ui.composable.widgets.rememberNotifier -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.ConformancePreviews -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.view.model.BroadcastGroupSignedEventViewModel -import to.curare.compose.ui.view.model.BroadcastGroupSignedEventViewModel.RelayOutcome -import to.curare.compose.ui.view.state.BroadcastGroupSignedEventUIState -import to.curare.compose.extensions.toFormattedTimeAndDateString -import to.curare.compose.ui.composable.widgets.buttons.ExtendedFab +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.network.relays.EventPublishTransport +import com.machankura.bennu.compose.nostr.GroupRelayList +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.text.ProposedEvent +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.composable.widgets.EmptyState +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.label +import com.machankura.bennu.compose.ui.composable.widgets.rememberNotifier +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.view.model.BroadcastGroupSignedEventViewModel +import com.machankura.bennu.compose.ui.view.model.BroadcastGroupSignedEventViewModel.RelayOutcome +import com.machankura.bennu.compose.ui.view.state.BroadcastGroupSignedEventUIState +import com.machankura.bennu.compose.extensions.toFormattedTimeAndDateString +import com.machankura.bennu.compose.ui.composable.widgets.buttons.ExtendedFab import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow import kotlin.time.Instant @@ -538,7 +538,7 @@ private fun BroadcastRelayRow( private fun BroadcastGroupSignedEventScreenPreview() { val chatRoomId = "d4c3b2a1".repeat(8) - CurareTheme { + BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { BroadcastGroupSignedEventScreen( activeUserPublicKey = "", @@ -574,9 +574,9 @@ private fun BroadcastGroupSignedEventScreenPreview() { chatRepository = ChatRepository.NO_OP_CHAT_REPOSITORY, publishTransport = object : EventPublishTransport { override suspend fun publishEvent( - nostrEvent: to.curare.compose.database.model.NostrEvent, - relays: Set - ): Flow = emptyFlow() + nostrEvent: com.machankura.bennu.compose.database.model.NostrEvent, + relays: Set + ): Flow = emptyFlow() }, onNavigateBack = {} ) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ChapterDetailScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ChapterDetailScreen.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ChapterDetailScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ChapterDetailScreen.kt index 0cb81f7b..cdb12652 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ChapterDetailScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ChapterDetailScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -29,28 +29,28 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.database.model.MantraChapter -import to.curare.compose.repository.MantraRepository -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.model.ChapterDetailViewModel -import to.curare.compose.ui.view.state.ChapterDetailUIState -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.database.model.MantraChapter +import com.machankura.bennu.compose.repository.MantraRepository +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.model.ChapterDetailViewModel +import com.machankura.bennu.compose.ui.view.state.ChapterDetailUIState +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.chapter_detail -import curare.composeapp.generated.resources.no_chunks -import curare.composeapp.generated.resources.original_text -import curare.composeapp.generated.resources.chapter_words_characters -import curare.composeapp.generated.resources.chunk -import curare.composeapp.generated.resources.chunks -import curare.composeapp.generated.resources.words_characters +import bennu.composeapp.generated.resources.chapter_detail +import bennu.composeapp.generated.resources.no_chunks +import bennu.composeapp.generated.resources.original_text +import bennu.composeapp.generated.resources.chapter_words_characters +import bennu.composeapp.generated.resources.chunk +import bennu.composeapp.generated.resources.chunks +import bennu.composeapp.generated.resources.words_characters import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -191,7 +191,7 @@ fun ChapterDetailScreen( @ConformancePreviews @Composable private fun ChapterDetailScreenPreview() { - CurareTheme { + BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { ChapterDetailScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ChatRoomCreationScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ChatRoomCreationScreen.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ChatRoomCreationScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ChatRoomCreationScreen.kt index 94b22dd8..df38c1e5 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ChatRoomCreationScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ChatRoomCreationScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -26,25 +26,25 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.view.model.ChatRoomCreationViewModel +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.view.model.ChatRoomCreationViewModel import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.choose_who_to_chat_with -import curare.composeapp.generated.resources.enter_the_name_you_want_to_use_for_your -import curare.composeapp.generated.resources.name_eg_group_discussions -import curare.composeapp.generated.resources.new_chat -import curare.composeapp.generated.resources.this_will_be_shown_when_people_open_the_chat -import curare.composeapp.generated.resources.this_will_be_the_display_name_for_this_chat -import curare.composeapp.generated.resources.what_should_people_know_about_you -import curare.composeapp.generated.resources.what_will_be_discussed_in_this_chat_room +import bennu.composeapp.generated.resources.choose_who_to_chat_with +import bennu.composeapp.generated.resources.enter_the_name_you_want_to_use_for_your +import bennu.composeapp.generated.resources.name_eg_group_discussions +import bennu.composeapp.generated.resources.new_chat +import bennu.composeapp.generated.resources.this_will_be_shown_when_people_open_the_chat +import bennu.composeapp.generated.resources.this_will_be_the_display_name_for_this_chat +import bennu.composeapp.generated.resources.what_should_people_know_about_you +import bennu.composeapp.generated.resources.what_will_be_discussed_in_this_chat_room import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -190,7 +190,7 @@ fun ChatRoomCreationScreen( @ConformancePreviews @Composable private fun LoadingScreenPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ChatRoomDetailScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ChatRoomDetailScreen.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ChatRoomDetailScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ChatRoomDetailScreen.kt index 41e5c19b..f27ac274 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ChatRoomDetailScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ChatRoomDetailScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -63,109 +63,109 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.GroupKeyState -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.Participant -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.intermdiate.LocalParticipant -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.MantraRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.navigation.routes.ProfilePreviewRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.navigation.routes.DkgRitualRoute -import to.curare.compose.ui.composable.navigation.routes.ProposeGroupEventRoute -import to.curare.compose.ui.composable.navigation.routes.GroupNostrProfileRoute -import to.curare.compose.ui.composable.navigation.routes.GroupRelaysRoute -import to.curare.compose.ui.composable.navigation.routes.GroupPostsRoute -import to.curare.compose.ui.composable.navigation.routes.GroupCuratedSchemasRoute -import to.curare.compose.ui.composable.navigation.routes.GroupCuratedEntriesRoute -import to.curare.compose.ui.composable.navigation.routes.ProposalListRoute -import to.curare.compose.ui.composable.navigation.routes.SearchMemberToAddToChatRoomRoute -import to.curare.compose.extensions.inComparableGroups -import to.curare.compose.extensions.toFormattedTimeAndDateString -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.dialogs.ModalBottomSheet -import to.curare.compose.ui.composable.widgets.rememberNotifier -import to.curare.compose.ui.composable.widgets.profile.ProfileAvatar -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.model.ChatRoomDetailViewModel -import to.curare.compose.ui.view.state.ChatRoomDetailUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.GroupKeyState +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.Participant +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalParticipant +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.MantraRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.ProfilePreviewRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.navigation.routes.DkgRitualRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ProposeGroupEventRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.GroupNostrProfileRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.GroupRelaysRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.GroupPostsRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.GroupCuratedSchemasRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.GroupCuratedEntriesRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ProposalListRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.SearchMemberToAddToChatRoomRoute +import com.machankura.bennu.compose.extensions.inComparableGroups +import com.machankura.bennu.compose.extensions.toFormattedTimeAndDateString +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.dialogs.ModalBottomSheet +import com.machankura.bennu.compose.ui.composable.widgets.rememberNotifier +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.model.ChatRoomDetailViewModel +import com.machankura.bennu.compose.ui.view.state.ChatRoomDetailUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip01Core.metadata.UserMetadata -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.run_by_members -import curare.composeapp.generated.resources.nostr_profile -import curare.composeapp.generated.resources.relays -import curare.composeapp.generated.resources.posts -import curare.composeapp.generated.resources.curated_entries -import curare.composeapp.generated.resources.curated_schemas -import curare.composeapp.generated.resources.not_described_yet -import curare.composeapp.generated.resources.n_of_m_relay_lists_agreed -import curare.composeapp.generated.resources.no_posts_yet -import curare.composeapp.generated.resources.one_post -import curare.composeapp.generated.resources.n_posts -import curare.composeapp.generated.resources.no_schemas_yet -import curare.composeapp.generated.resources.one_schema -import curare.composeapp.generated.resources.n_schemas -import curare.composeapp.generated.resources.no_entries_yet -import curare.composeapp.generated.resources.one_entry -import curare.composeapp.generated.resources.n_entries -import curare.composeapp.generated.resources.propose_event -import curare.composeapp.generated.resources.no_name_on_this_profile -import curare.composeapp.generated.resources.parent_group -import curare.composeapp.generated.resources.a_subgroup -import curare.composeapp.generated.resources.created_you_are_not_a_member -import curare.composeapp.generated.resources.certified_not_yet_created -import curare.composeapp.generated.resources.no_subgroups_have_been_made_by_this_group -import curare.composeapp.generated.resources.add_subgroup -import curare.composeapp.generated.resources.subgroups -import to.curare.compose.ui.composable.navigation.routes.SelectSubgroupAdminsRoute -import to.curare.compose.ui.composable.navigation.routes.NostrEventDetailRoute -import to.curare.compose.ui.composable.navigation.routes.ChatRoomDetailRoute -import to.curare.compose.managers.SubgroupManager -import to.curare.compose.nostr.GroupNostrProfile -import to.curare.compose.nostr.GroupRelaySet -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.run_by_members +import bennu.composeapp.generated.resources.nostr_profile +import bennu.composeapp.generated.resources.relays +import bennu.composeapp.generated.resources.posts +import bennu.composeapp.generated.resources.curated_entries +import bennu.composeapp.generated.resources.curated_schemas +import bennu.composeapp.generated.resources.not_described_yet +import bennu.composeapp.generated.resources.n_of_m_relay_lists_agreed +import bennu.composeapp.generated.resources.no_posts_yet +import bennu.composeapp.generated.resources.one_post +import bennu.composeapp.generated.resources.n_posts +import bennu.composeapp.generated.resources.no_schemas_yet +import bennu.composeapp.generated.resources.one_schema +import bennu.composeapp.generated.resources.n_schemas +import bennu.composeapp.generated.resources.no_entries_yet +import bennu.composeapp.generated.resources.one_entry +import bennu.composeapp.generated.resources.n_entries +import bennu.composeapp.generated.resources.propose_event +import bennu.composeapp.generated.resources.no_name_on_this_profile +import bennu.composeapp.generated.resources.parent_group +import bennu.composeapp.generated.resources.a_subgroup +import bennu.composeapp.generated.resources.created_you_are_not_a_member +import bennu.composeapp.generated.resources.certified_not_yet_created +import bennu.composeapp.generated.resources.no_subgroups_have_been_made_by_this_group +import bennu.composeapp.generated.resources.add_subgroup +import bennu.composeapp.generated.resources.subgroups +import com.machankura.bennu.compose.ui.composable.navigation.routes.SelectSubgroupAdminsRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.NostrEventDetailRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ChatRoomDetailRoute +import com.machankura.bennu.compose.managers.SubgroupManager +import com.machankura.bennu.compose.nostr.GroupNostrProfile +import com.machankura.bennu.compose.nostr.GroupRelaySet +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.delete_group -import curare.composeapp.generated.resources.direct_message_detail -import curare.composeapp.generated.resources.direct_message_functionality_will_be_here -import curare.composeapp.generated.resources.invite_new_member -import curare.composeapp.generated.resources.leave_group -import curare.composeapp.generated.resources.remove_from_group -import curare.composeapp.generated.resources.disband_group -import curare.composeapp.generated.resources.disband_group_explainer -import curare.composeapp.generated.resources.group_disbanded -import curare.composeapp.generated.resources.member_removal_requested -import curare.composeapp.generated.resources.members_2 -import curare.composeapp.generated.resources.proposals -import curare.composeapp.generated.resources.reindex_events -import curare.composeapp.generated.resources.shared_key -import curare.composeapp.generated.resources.signing_key -import curare.composeapp.generated.resources.the_key_this_room_signs_as -import curare.composeapp.generated.resources.what_the_group_signed -import curare.composeapp.generated.resources.this_room_signs_as -import curare.composeapp.generated.resources.derivation_path -import curare.composeapp.generated.resources.key_ceremony -import curare.composeapp.generated.resources.agreed_on -import curare.composeapp.generated.resources.the_signed_event -import curare.composeapp.generated.resources.copy_the_signed_event -import curare.composeapp.generated.resources.copied_the_signed_event -import curare.composeapp.generated.resources.this_device_does_not_hold_the_event -import curare.composeapp.generated.resources.event_s_still_unreadable -import curare.composeapp.generated.resources.recovered_of_event_s -import curare.composeapp.generated.resources.recovered_of_still_unreadable +import bennu.composeapp.generated.resources.delete_group +import bennu.composeapp.generated.resources.direct_message_detail +import bennu.composeapp.generated.resources.direct_message_functionality_will_be_here +import bennu.composeapp.generated.resources.invite_new_member +import bennu.composeapp.generated.resources.leave_group +import bennu.composeapp.generated.resources.remove_from_group +import bennu.composeapp.generated.resources.disband_group +import bennu.composeapp.generated.resources.disband_group_explainer +import bennu.composeapp.generated.resources.group_disbanded +import bennu.composeapp.generated.resources.member_removal_requested +import bennu.composeapp.generated.resources.members_2 +import bennu.composeapp.generated.resources.proposals +import bennu.composeapp.generated.resources.reindex_events +import bennu.composeapp.generated.resources.shared_key +import bennu.composeapp.generated.resources.signing_key +import bennu.composeapp.generated.resources.the_key_this_room_signs_as +import bennu.composeapp.generated.resources.what_the_group_signed +import bennu.composeapp.generated.resources.this_room_signs_as +import bennu.composeapp.generated.resources.derivation_path +import bennu.composeapp.generated.resources.key_ceremony +import bennu.composeapp.generated.resources.agreed_on +import bennu.composeapp.generated.resources.the_signed_event +import bennu.composeapp.generated.resources.copy_the_signed_event +import bennu.composeapp.generated.resources.copied_the_signed_event +import bennu.composeapp.generated.resources.this_device_does_not_hold_the_event +import bennu.composeapp.generated.resources.event_s_still_unreadable +import bennu.composeapp.generated.resources.recovered_of_event_s +import bennu.composeapp.generated.resources.recovered_of_still_unreadable import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.theme.ConformancePreviews import kotlin.time.Instant @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class) @@ -1377,7 +1377,7 @@ private fun ReindexMarmotGroupEventsButton( @ConformancePreviews @Composable private fun ChatRoomMessagingScreenPreview() { - CurareTheme { + BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ChatRoomMessagingScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ChatRoomMessagingScreen.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ChatRoomMessagingScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ChatRoomMessagingScreen.kt index 7bd8229c..46e20351 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ChatRoomMessagingScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ChatRoomMessagingScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -40,41 +40,41 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.DkgRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.navigation.routes.ChatRoomDetailRoute -import to.curare.compose.ui.composable.navigation.routes.DkgRitualRoute -import to.curare.compose.ui.composable.navigation.routes.FrostSigningRoute -import to.curare.compose.ui.composable.navigation.routes.ProposalListRoute -import to.curare.compose.ui.composable.navigation.routes.proposalDestination -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.model.ChatRoomMessagingViewModel -import to.curare.compose.ui.view.state.ChatRoomMessagingUIState -import to.curare.compose.ui.view.state.ProposalFilter +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.DkgRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.ChatRoomDetailRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.DkgRitualRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.FrostSigningRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ProposalListRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.proposalDestination +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.model.ChatRoomMessagingViewModel +import com.machankura.bennu.compose.ui.view.state.ChatRoomMessagingUIState +import com.machankura.bennu.compose.ui.view.state.ProposalFilter import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.ui.composable.widgets.chat.ChatTranscript -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.composable.widgets.Decorative -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.composable.widgets.chat.ChatTranscript +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.creating_new_chat -import curare.composeapp.generated.resources.direct_message_detail -import curare.composeapp.generated.resources.direct_message_functionality_will_be_here -import curare.composeapp.generated.resources.say_what_now -import curare.composeapp.generated.resources.private_message_to -import curare.composeapp.generated.resources.private_to +import bennu.composeapp.generated.resources.creating_new_chat +import bennu.composeapp.generated.resources.direct_message_detail +import bennu.composeapp.generated.resources.direct_message_functionality_will_be_here +import bennu.composeapp.generated.resources.say_what_now +import bennu.composeapp.generated.resources.private_message_to +import bennu.composeapp.generated.resources.private_to import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class) @Composable @@ -126,8 +126,8 @@ fun ChatRoomMessagingScreen( is ChatRoomMessagingUIState.Loaded -> { val textFieldState = rememberTextFieldState() - val chatMessageListViewModel: to.curare.compose.ui.view.model.ChatMessageListViewModel = viewModel( - factory = to.curare.compose.ui.view.model.ChatMessageListViewModel.factory( + val chatMessageListViewModel: com.machankura.bennu.compose.ui.view.model.ChatMessageListViewModel = viewModel( + factory = com.machankura.bennu.compose.ui.view.model.ChatMessageListViewModel.factory( localChatRoom = chatRoomDetailUIState.localChatRoom, nostrRepository = nostrRepository, chatRepository = chatRepository, @@ -467,7 +467,7 @@ fun ChatRoomMessagingScreen( @ConformancePreviews @Composable private fun ChatRoomMessagingScreenPreview() { - CurareTheme { + BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/CreateProfileScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/CreateProfileScreen.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/CreateProfileScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/CreateProfileScreen.kt index 7eafc009..4ae72162 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/CreateProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/CreateProfileScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -32,46 +32,46 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.repository.MarmotRepository -import to.curare.compose.identity.NewProfileWriter +import com.machankura.bennu.compose.repository.MarmotRepository +import com.machankura.bennu.compose.identity.NewProfileWriter import fr.acinq.phoenix.data.WalletId -import to.curare.compose.ui.theme.LocalExtendedColors -import to.curare.compose.ui.view.model.CreateProfileViewModel -import to.curare.compose.ui.view.state.CreateProfileUIState -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.LocalExtendedColors +import com.machankura.bennu.compose.ui.view.model.CreateProfileViewModel +import com.machankura.bennu.compose.ui.view.state.CreateProfileUIState +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.after_this_there_is_no_turning_back -import curare.composeapp.generated.resources.bio -import curare.composeapp.generated.resources.create_profile -import curare.composeapp.generated.resources.enter_the_name_you_want_to_use_for_your_2 -import curare.composeapp.generated.resources.introduce_yourself -import curare.composeapp.generated.resources.it_is_cryptographical_secure_and -import curare.composeapp.generated.resources.name -import curare.composeapp.generated.resources.name_eg_alan_turing -import curare.composeapp.generated.resources.next -import curare.composeapp.generated.resources.profile_is_ready -import curare.composeapp.generated.resources.see_how_deep_the_rabbit_hole_goes -import curare.composeapp.generated.resources.something_went_wrong_and_we_were_unable_to_2 -import curare.composeapp.generated.resources.start -import curare.composeapp.generated.resources.the_above_will_be_your_profile -import curare.composeapp.generated.resources.this_will_be_shown_when_people_open_your -import curare.composeapp.generated.resources.this_will_be_the_display_name_for_your -import curare.composeapp.generated.resources.what_should_people_know_about_you -import curare.composeapp.generated.resources.you_are_about_to_create_a_nostr_profile -import curare.composeapp.generated.resources.you_will_be_in_full_control_of_this_profile +import bennu.composeapp.generated.resources.after_this_there_is_no_turning_back +import bennu.composeapp.generated.resources.bio +import bennu.composeapp.generated.resources.create_profile +import bennu.composeapp.generated.resources.enter_the_name_you_want_to_use_for_your_2 +import bennu.composeapp.generated.resources.introduce_yourself +import bennu.composeapp.generated.resources.it_is_cryptographical_secure_and +import bennu.composeapp.generated.resources.name +import bennu.composeapp.generated.resources.name_eg_alan_turing +import bennu.composeapp.generated.resources.next +import bennu.composeapp.generated.resources.profile_is_ready +import bennu.composeapp.generated.resources.see_how_deep_the_rabbit_hole_goes +import bennu.composeapp.generated.resources.something_went_wrong_and_we_were_unable_to_2 +import bennu.composeapp.generated.resources.start +import bennu.composeapp.generated.resources.the_above_will_be_your_profile +import bennu.composeapp.generated.resources.this_will_be_shown_when_people_open_your +import bennu.composeapp.generated.resources.this_will_be_the_display_name_for_your +import bennu.composeapp.generated.resources.what_should_people_know_about_you +import bennu.composeapp.generated.resources.you_are_about_to_create_a_nostr_profile +import bennu.composeapp.generated.resources.you_will_be_in_full_control_of_this_profile import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class) @Composable fun CreateProfileScreen( initialCreateProfileUIState: CreateProfileUIState = CreateProfileUIState.Declaration, onNavigateBack: () -> Unit, - nostrRepository: to.curare.compose.repository.NostrRepository, + nostrRepository: com.machankura.bennu.compose.repository.NostrRepository, marmotRepository: MarmotRepository, /** Which secret the profile is made of -- a seed from Landing, a bare key from the switcher. The screen does not know which. */ newProfile: NewProfileWriter, @@ -386,7 +386,7 @@ fun CreateProfileScreen( @ConformancePreviews @Composable fun CreateAccountScreenPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { @@ -419,8 +419,8 @@ fun CreateAccountScreenPreview() { // name = "Alan Turing", // bio = "Polyglot: Math... is my middle name, computer scientist. cryptographer, and gold hider." // ), -// to.curare.compose.ui.view.state.CreateProfileUIState.ProfileReady( -// profile = to.curare.compose.database.model.Profile( +// com.machankura.bennu.compose.ui.view.state.CreateProfileUIState.ProfileReady( +// profile = com.machankura.bennu.compose.database.model.Profile( // publicKey = "", // nostrEventId = "", // displayName = "Alan Turing", @@ -430,7 +430,7 @@ fun CreateAccountScreenPreview() { onNavigateBack = {}, newProfile = NewProfileWriter { Result.failure(IllegalStateException("a preview")) }, onProfileCreated = {}, - nostrRepository = to.curare.compose.repository.NostrRepository.NO_OP_NOSTR_REPOSITORY, + nostrRepository = com.machankura.bennu.compose.repository.NostrRepository.NO_OP_NOSTR_REPOSITORY, marmotRepository = MarmotRepository.NO_OP_MARMOT_KEY_PACKAGE_BUNDLE ) } diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/CuratedSuggestionListScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/CuratedSuggestionListScreen.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/CuratedSuggestionListScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/CuratedSuggestionListScreen.kt index 5d4f1db9..099cf666 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/CuratedSuggestionListScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/CuratedSuggestionListScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -41,55 +41,55 @@ import androidx.lifecycle.viewmodel.compose.viewModel import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer import com.vitorpamplona.quartz.nip01Core.relay.normalizer.displayUrl -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.accept_this_suggestion -import curare.composeapp.generated.resources.ask_again -import curare.composeapp.generated.resources.asking_the_list_s_relays -import curare.composeapp.generated.resources.curated -import curare.composeapp.generated.resources.everything_anyone_has_suggested_to_this_list -import curare.composeapp.generated.resources.n_curated -import curare.composeapp.generated.resources.n_suggestions -import curare.composeapp.generated.resources.nobody_has_suggested_anything_to_this_list_yet -import curare.composeapp.generated.resources.one_suggestion -import curare.composeapp.generated.resources.read_from_relays -import curare.composeapp.generated.resources.revise_the_list_s_entry -import curare.composeapp.generated.resources.suggested_by_on -import curare.composeapp.generated.resources.suggestions -import curare.composeapp.generated.resources.taken_up_by_the_group_into_the_list +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.accept_this_suggestion +import bennu.composeapp.generated.resources.ask_again +import bennu.composeapp.generated.resources.asking_the_list_s_relays +import bennu.composeapp.generated.resources.curated +import bennu.composeapp.generated.resources.everything_anyone_has_suggested_to_this_list +import bennu.composeapp.generated.resources.n_curated +import bennu.composeapp.generated.resources.n_suggestions +import bennu.composeapp.generated.resources.nobody_has_suggested_anything_to_this_list_yet +import bennu.composeapp.generated.resources.one_suggestion +import bennu.composeapp.generated.resources.read_from_relays +import bennu.composeapp.generated.resources.revise_the_list_s_entry +import bennu.composeapp.generated.resources.suggested_by_on +import bennu.composeapp.generated.resources.suggestions +import bennu.composeapp.generated.resources.taken_up_by_the_group_into_the_list import org.jetbrains.compose.resources.stringResource -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.extensions.toFormattedTimeAndDateString -import to.curare.compose.nostr.CuratedSuggestion -import to.curare.compose.nostr.GroupCuratedSchema -import to.curare.compose.nostr.curated.CuratedEntry -import to.curare.compose.nostr.curated.CuratedField -import to.curare.compose.nostr.curated.CuratedFieldConfig -import to.curare.compose.nostr.curated.CuratedFieldType -import to.curare.compose.nostr.curated.CuratedSchema -import to.curare.compose.nostr.curated.CuratedSchemaEvent -import to.curare.compose.nostr.curated.CuratedVisibility -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.navigation.routes.AcceptCuratedSuggestionRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.composable.widgets.EmptyState -import to.curare.compose.ui.composable.widgets.ErrorState -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.dialogs.ModalBottomSheet -import to.curare.compose.ui.composable.widgets.profile.ProfileAvatar -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.ConformancePreviews -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.view.model.CuratedSuggestionListViewModel -import to.curare.compose.ui.view.state.CuratedSuggestionListUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.extensions.toFormattedTimeAndDateString +import com.machankura.bennu.compose.nostr.CuratedSuggestion +import com.machankura.bennu.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedEntry +import com.machankura.bennu.compose.nostr.curated.CuratedField +import com.machankura.bennu.compose.nostr.curated.CuratedFieldConfig +import com.machankura.bennu.compose.nostr.curated.CuratedFieldType +import com.machankura.bennu.compose.nostr.curated.CuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaEvent +import com.machankura.bennu.compose.nostr.curated.CuratedVisibility +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.AcceptCuratedSuggestionRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.composable.widgets.EmptyState +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.dialogs.ModalBottomSheet +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.view.model.CuratedSuggestionListViewModel +import com.machankura.bennu.compose.ui.view.state.CuratedSuggestionListUIState import kotlin.time.Instant /** @@ -640,7 +640,7 @@ private fun CuratedSuggestionListScreenPreview() { isCurated = isCurated ) - CurareTheme { + BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { CuratedSuggestionListScreen( activeUserPublicKey = "u".repeat(64), diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgApprovalScaffold.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/DkgApprovalScaffold.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgApprovalScaffold.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/DkgApprovalScaffold.kt index 7ed627a1..ebc36d6b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgApprovalScaffold.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/DkgApprovalScaffold.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -29,24 +29,24 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.database.model.types.DkgApprovalStep -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.DkgRepository -import to.curare.compose.ui.view.model.DkgRitualViewModel -import to.curare.compose.ui.view.state.DkgRitualUIState +import com.machankura.bennu.compose.database.model.types.DkgApprovalStep +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.DkgRepository +import com.machankura.bennu.compose.ui.view.model.DkgRitualViewModel +import com.machankura.bennu.compose.ui.view.state.DkgRitualUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.identity.Identity +import com.machankura.bennu.compose.identity.Identity import kotlinx.coroutines.flow.StateFlow -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.composable.widgets.Decorative -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.back -import curare.composeapp.generated.resources.not_now +import bennu.composeapp.generated.resources.back +import bennu.composeapp.generated.resources.not_now import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.readableContent /** * The frame every ChillDKG approval screen sits in: the view model, the states diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgJoinApprovalScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/DkgJoinApprovalScreen.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgJoinApprovalScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/DkgJoinApprovalScreen.kt index 12ef643b..a3c9c9d0 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgJoinApprovalScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/DkgJoinApprovalScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -8,13 +8,13 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import to.curare.compose.database.model.types.DkgApprovalStep -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.DkgRepository +import com.machankura.bennu.compose.database.model.types.DkgApprovalStep +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.DkgRepository import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.identity.Identity +import com.machankura.bennu.compose.identity.Identity import kotlinx.coroutines.flow.StateFlow -import to.curare.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.theme.spacing /** * Asks whether to join a shared key ceremony somebody else opened. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgRitualScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/DkgRitualScreen.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgRitualScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/DkgRitualScreen.kt index 100e4758..e77f5151 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgRitualScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/DkgRitualScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -50,74 +50,74 @@ import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.DkgSession -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.intermdiate.LocalParticipant -import to.curare.compose.database.model.types.DkgRitualStage -import to.curare.compose.database.model.types.FrostSigningStage -import to.curare.compose.extensions.memberName -import to.curare.compose.managers.ChillDkgRitualManager -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.DkgRepository -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.profile.ProfileColor -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.database.model.types.DkgApprovalStep -import to.curare.compose.ui.composable.navigation.routes.DkgJoinApprovalRoute -import to.curare.compose.ui.composable.navigation.routes.DkgRound1ApprovalRoute -import to.curare.compose.ui.composable.navigation.routes.DkgRound2ApprovalRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.view.model.DkgRitualViewModel -import to.curare.compose.ui.view.state.DkgRitualUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.DkgSession +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalParticipant +import com.machankura.bennu.compose.database.model.types.DkgRitualStage +import com.machankura.bennu.compose.database.model.types.FrostSigningStage +import com.machankura.bennu.compose.extensions.memberName +import com.machankura.bennu.compose.managers.ChillDkgRitualManager +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.DkgRepository +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileColor +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.database.model.types.DkgApprovalStep +import com.machankura.bennu.compose.ui.composable.navigation.routes.DkgJoinApprovalRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.DkgRound1ApprovalRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.DkgRound2ApprovalRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.view.model.DkgRitualViewModel +import com.machankura.bennu.compose.ui.view.state.DkgRitualUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.identity.Identity +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.identity.Identity import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.composable.widgets.Decorative -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.create_the_admin_room +import bennu.composeapp.generated.resources.create_the_admin_room import androidx.compose.material.icons.filled.AccountTree -import curare.composeapp.generated.resources.create_the_subgroup -import curare.composeapp.generated.resources.ask_the_parent_group_to_certify -import curare.composeapp.generated.resources.before_the_subgroup_exists_its_parent_signs -import curare.composeapp.generated.resources.the_parent_group_is_certifying_this_subgroup -import curare.composeapp.generated.resources.the_parent_group_could_not_certify_this_subgroup -import curare.composeapp.generated.resources.the_parent_group_has_certified_this_subgroup -import curare.composeapp.generated.resources.how_many_members_will_it_take_to_sign -import curare.composeapp.generated.resources.key -import curare.composeapp.generated.resources.members -import curare.composeapp.generated.resources.nothing_was_created_and_no_key_exists_it_is -import curare.composeapp.generated.resources.review_and_confirm -import curare.composeapp.generated.resources.review_and_contribute -import curare.composeapp.generated.resources.review_and_join -import curare.composeapp.generated.resources.shared_key -import curare.composeapp.generated.resources.start_key_ceremony -import curare.composeapp.generated.resources.the_ceremony_was_abandoned -import curare.composeapp.generated.resources.the_group_can_hold_one_key_together_split_so -import curare.composeapp.generated.resources.the_group_has_a_shared_key -import curare.composeapp.generated.resources.the_group_has_agreed_what_the_admin_room -import curare.composeapp.generated.resources.the_group_could_not_agree_what_the_admin -import curare.composeapp.generated.resources.the_group_is_agreeing_what_the_admin_room -import curare.composeapp.generated.resources.agree_the_groups_signing_key -import curare.composeapp.generated.resources.before_the_room_exists_the_group_signs -import curare.composeapp.generated.resources.this_is_fixed_once_the_ceremony_runs -import curare.composeapp.generated.resources.try_again -import curare.composeapp.generated.resources.your_share_of_it_is_on_this_device_only_your -import curare.composeapp.generated.resources.everyone_has_to_be_online_at_the_same_time -import curare.composeapp.generated.resources.of -import curare.composeapp.generated.resources.of_members_will_be_needed_to_sign_with_this -import curare.composeapp.generated.resources.shared_key_for +import bennu.composeapp.generated.resources.create_the_subgroup +import bennu.composeapp.generated.resources.ask_the_parent_group_to_certify +import bennu.composeapp.generated.resources.before_the_subgroup_exists_its_parent_signs +import bennu.composeapp.generated.resources.the_parent_group_is_certifying_this_subgroup +import bennu.composeapp.generated.resources.the_parent_group_could_not_certify_this_subgroup +import bennu.composeapp.generated.resources.the_parent_group_has_certified_this_subgroup +import bennu.composeapp.generated.resources.how_many_members_will_it_take_to_sign +import bennu.composeapp.generated.resources.key +import bennu.composeapp.generated.resources.members +import bennu.composeapp.generated.resources.nothing_was_created_and_no_key_exists_it_is +import bennu.composeapp.generated.resources.review_and_confirm +import bennu.composeapp.generated.resources.review_and_contribute +import bennu.composeapp.generated.resources.review_and_join +import bennu.composeapp.generated.resources.shared_key +import bennu.composeapp.generated.resources.start_key_ceremony +import bennu.composeapp.generated.resources.the_ceremony_was_abandoned +import bennu.composeapp.generated.resources.the_group_can_hold_one_key_together_split_so +import bennu.composeapp.generated.resources.the_group_has_a_shared_key +import bennu.composeapp.generated.resources.the_group_has_agreed_what_the_admin_room +import bennu.composeapp.generated.resources.the_group_could_not_agree_what_the_admin +import bennu.composeapp.generated.resources.the_group_is_agreeing_what_the_admin_room +import bennu.composeapp.generated.resources.agree_the_groups_signing_key +import bennu.composeapp.generated.resources.before_the_room_exists_the_group_signs +import bennu.composeapp.generated.resources.this_is_fixed_once_the_ceremony_runs +import bennu.composeapp.generated.resources.try_again +import bennu.composeapp.generated.resources.your_share_of_it_is_on_this_device_only_your +import bennu.composeapp.generated.resources.everyone_has_to_be_online_at_the_same_time +import bennu.composeapp.generated.resources.of +import bennu.composeapp.generated.resources.of_members_will_be_needed_to_sign_with_this +import bennu.composeapp.generated.resources.shared_key_for import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.buttons.ExtendedFab -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.buttons.ExtendedFab +import com.machankura.bennu.compose.ui.theme.ConformancePreviews /** * The shared-key ceremony: a ChillDKG ritual run across the group's NIP-17 @@ -867,7 +867,7 @@ private fun QuorumStepper( @ConformancePreviews @Composable private fun DkgRitualScreenPreview() { - CurareTheme { + BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { DkgRitualScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgRound1ApprovalScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/DkgRound1ApprovalScreen.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgRound1ApprovalScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/DkgRound1ApprovalScreen.kt index 31dd478a..6c8d9259 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgRound1ApprovalScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/DkgRound1ApprovalScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -8,17 +8,17 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import to.curare.compose.database.model.types.DkgApprovalStep -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.DkgRepository +import com.machankura.bennu.compose.database.model.types.DkgApprovalStep +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.DkgRepository import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.identity.Identity +import com.machankura.bennu.compose.identity.Identity import kotlinx.coroutines.flow.StateFlow -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.taking_part_with_these_members -import curare.composeapp.generated.resources.you +import bennu.composeapp.generated.resources.taking_part_with_these_members +import bennu.composeapp.generated.resources.you /** * Asks whether to contribute to the key itself. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgRound2ApprovalScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/DkgRound2ApprovalScreen.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgRound2ApprovalScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/DkgRound2ApprovalScreen.kt index 29a11093..1e0def45 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgRound2ApprovalScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/DkgRound2ApprovalScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -8,16 +8,16 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import to.curare.compose.database.model.types.DkgApprovalStep -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.DkgRepository +import com.machankura.bennu.compose.database.model.types.DkgApprovalStep +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.DkgRepository import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.identity.Identity +import com.machankura.bennu.compose.identity.Identity import kotlinx.coroutines.flow.StateFlow -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.this_is_the_last_thing_the_ceremony_needs +import bennu.composeapp.generated.resources.this_is_the_last_thing_the_ceremony_needs /** * Asks whether to confirm the combined result. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/EditGroupCuratedSchemaScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/EditGroupCuratedSchemaScreen.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/EditGroupCuratedSchemaScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/EditGroupCuratedSchemaScreen.kt index c64103f3..174b046f 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/EditGroupCuratedSchemaScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/EditGroupCuratedSchemaScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -85,150 +85,150 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.extensions.hexToNpubHrp -import to.curare.compose.nostr.curated.CuratedField -import to.curare.compose.nostr.curated.CuratedFieldType -import to.curare.compose.nostr.curated.CuratedSchemaEvent -import to.curare.compose.nostr.curated.CuratedSchemaProblem -import to.curare.compose.nostr.curated.CuratedSchemaTemplate -import to.curare.compose.nostr.curated.CuratedVisibility -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.ui.composable.navigation.routes.FrostSigningRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.composable.widgets.ErrorState -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.buttons.ExtendedFab -import to.curare.compose.ui.composable.widgets.dialogs.ModalBottomSheet -import to.curare.compose.ui.composable.widgets.rememberNotifier -import to.curare.compose.ui.theme.ConformancePreviews -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.view.model.EditGroupCuratedSchemaViewModel -import to.curare.compose.ui.view.model.EditGroupCuratedSchemaViewModel.AddRelayFailure -import to.curare.compose.ui.view.model.EditGroupCuratedSchemaViewModel.AddSuggesterFailure -import to.curare.compose.ui.view.model.EditGroupCuratedSchemaViewModel.FieldEdit -import to.curare.compose.ui.view.model.EditGroupCuratedSchemaViewModel.FieldProblem -import to.curare.compose.ui.view.state.EditGroupCuratedSchemaUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.extensions.hexToNpubHrp +import com.machankura.bennu.compose.nostr.curated.CuratedField +import com.machankura.bennu.compose.nostr.curated.CuratedFieldType +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaEvent +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaProblem +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaTemplate +import com.machankura.bennu.compose.nostr.curated.CuratedVisibility +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.FrostSigningRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.buttons.ExtendedFab +import com.machankura.bennu.compose.ui.composable.widgets.dialogs.ModalBottomSheet +import com.machankura.bennu.compose.ui.composable.widgets.rememberNotifier +import com.machankura.bennu.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.view.model.EditGroupCuratedSchemaViewModel +import com.machankura.bennu.compose.ui.view.model.EditGroupCuratedSchemaViewModel.AddRelayFailure +import com.machankura.bennu.compose.ui.view.model.EditGroupCuratedSchemaViewModel.AddSuggesterFailure +import com.machankura.bennu.compose.ui.view.model.EditGroupCuratedSchemaViewModel.FieldEdit +import com.machankura.bennu.compose.ui.view.model.EditGroupCuratedSchemaViewModel.FieldProblem +import com.machankura.bennu.compose.ui.view.state.EditGroupCuratedSchemaUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.a_description_is_required -import curare.composeapp.generated.resources.a_domain_replaces_the_name_wherever_the_list_is_shown -import curare.composeapp.generated.resources.a_field_name_is_one_word -import curare.composeapp.generated.resources.a_field_named_that_already_exists -import curare.composeapp.generated.resources.a_field_needs_a_name -import curare.composeapp.generated.resources.a_name_is_required -import curare.composeapp.generated.resources.a_regular_expression_the_whole_value_must_match -import curare.composeapp.generated.resources.a_schema_needs_at_least_one_field -import curare.composeapp.generated.resources.a_title_is_required -import curare.composeapp.generated.resources.add_field -import curare.composeapp.generated.resources.add_rule -import curare.composeapp.generated.resources.add_schema -import curare.composeapp.generated.resources.an_entry_must_have_this_field -import curare.composeapp.generated.resources.an_identifier_is_required -import curare.composeapp.generated.resources.at_least_one_of -import curare.composeapp.generated.resources.could_not_ask_the_group_to_sign_this_schema -import curare.composeapp.generated.resources.defaults_to_the_field_name_content_means_the_body -import curare.composeapp.generated.resources.derived -import curare.composeapp.generated.resources.description -import curare.composeapp.generated.resources.domain -import curare.composeapp.generated.resources.done -import curare.composeapp.generated.resources.edit_field -import curare.composeapp.generated.resources.edit_schema -import curare.composeapp.generated.resources.earliest_year -import curare.composeapp.generated.resources.eg_1900 -import curare.composeapp.generated.resources.eg_200 -import curare.composeapp.generated.resources.eg_2100 -import curare.composeapp.generated.resources.eg_a_za_z_2_8 -import curare.composeapp.generated.resources.eg_bitcoin_mov -import curare.composeapp.generated.resources.eg_movie_documentary_short -import curare.composeapp.generated.resources.eg_bitcoin_mov_suggestion -import curare.composeapp.generated.resources.eg_example_com -import curare.composeapp.generated.resources.eg_fields_for_a_bitcoin_mov_entry -import curare.composeapp.generated.resources.eg_https_example_com_group_png -import curare.composeapp.generated.resources.eg_https_youtube_com_watch -import curare.composeapp.generated.resources.eg_watch -import curare.composeapp.generated.resources.eg_watch_reference_url -import curare.composeapp.generated.resources.eg_watchurl -import curare.composeapp.generated.resources.eg_wss_relay_example_com -import curare.composeapp.generated.resources.field_name -import curare.composeapp.generated.resources.field_type_date -import curare.composeapp.generated.resources.field_type_duration -import curare.composeapp.generated.resources.field_type_enum -import curare.composeapp.generated.resources.field_type_image -import curare.composeapp.generated.resources.field_type_longtext -import curare.composeapp.generated.resources.field_type_number -import curare.composeapp.generated.resources.field_type_text -import curare.composeapp.generated.resources.field_type_token -import curare.composeapp.generated.resources.field_type_url -import curare.composeapp.generated.resources.field_type_year -import curare.composeapp.generated.resources.fields -import curare.composeapp.generated.resources.filled_in_by_the_app_never_asked_for -import curare.composeapp.generated.resources.helper_text_under_the_input -import curare.composeapp.generated.resources.hint -import curare.composeapp.generated.resources.https_only -import curare.composeapp.generated.resources.identifier -import curare.composeapp.generated.resources.label -import curare.composeapp.generated.resources.latest_year -import curare.composeapp.generated.resources.marker -import curare.composeapp.generated.resources.maximum_characters -import curare.composeapp.generated.resources.maximum_value -import curare.composeapp.generated.resources.may_appear_more_than_once -import curare.composeapp.generated.resources.minimum_value -import curare.composeapp.generated.resources.name -import curare.composeapp.generated.resources.new_field -import curare.composeapp.generated.resources.no_relays_named_so_a_client_will_pick_its_own -import curare.composeapp.generated.resources.nothing_has_changed_to_propose -import curare.composeapp.generated.resources.npub_or_hex_pubkey -import curare.composeapp.generated.resources.one_of_the_relays_is_not_a_relay_address -import curare.composeapp.generated.resources.one_per_line_or_separated_by_commas -import curare.composeapp.generated.resources.optional -import curare.composeapp.generated.resources.options -import curare.composeapp.generated.resources.pattern -import curare.composeapp.generated.resources.pick_two_or_more_fields_at_least_one_of_which_an_entry_must_have -import curare.composeapp.generated.resources.picture_url -import curare.composeapp.generated.resources.placeholder -import curare.composeapp.generated.resources.propose_schema -import curare.composeapp.generated.resources.pubkeys_besides_the_group_that_may_suggest_to_this_list -import curare.composeapp.generated.resources.relay_url -import curare.composeapp.generated.resources.relays -import curare.composeapp.generated.resources.remove_field -import curare.composeapp.generated.resources.required -import curare.composeapp.generated.resources.say_who_may_suggest_to_this_list -import curare.composeapp.generated.resources.suggesters -import curare.composeapp.generated.resources.that_is_not_a_domain_name -import curare.composeapp.generated.resources.that_is_not_a_pubkey -import curare.composeapp.generated.resources.that_is_not_a_relay_address -import curare.composeapp.generated.resources.that_pubkey_is_already_a_suggester -import curare.composeapp.generated.resources.that_relay_is_already_in_this_list -import curare.composeapp.generated.resources.the_description_must_be_at_most_n_characters -import curare.composeapp.generated.resources.the_group_signs_a_schema_so_it_takes_a_quorum -import curare.composeapp.generated.resources.the_identifier_must_be_at_most_n_characters -import curare.composeapp.generated.resources.the_identifier_names_this_list_in_every_reply -import curare.composeapp.generated.resources.the_name_must_be_at_most_n_characters -import curare.composeapp.generated.resources.the_picture_must_be_an_https_url -import curare.composeapp.generated.resources.the_tag_s_third_element_which_tells_fields_sharing_a_tag_apart -import curare.composeapp.generated.resources.the_title_must_be_at_most_n_characters -import curare.composeapp.generated.resources.this_group_has_no_shared_key_to_sign_a_schema -import curare.composeapp.generated.resources.title -import curare.composeapp.generated.resources.type -import curare.composeapp.generated.resources.visibility -import curare.composeapp.generated.resources.visibility_closed -import curare.composeapp.generated.resources.visibility_closed_purpose -import curare.composeapp.generated.resources.visibility_private -import curare.composeapp.generated.resources.visibility_private_purpose -import curare.composeapp.generated.resources.visibility_public -import curare.composeapp.generated.resources.visibility_public_purpose -import curare.composeapp.generated.resources.what_an_entry_in_this_list_may_contain -import curare.composeapp.generated.resources.where_suggestions_to_this_list_are_published -import curare.composeapp.generated.resources.writes_to_tag +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.a_description_is_required +import bennu.composeapp.generated.resources.a_domain_replaces_the_name_wherever_the_list_is_shown +import bennu.composeapp.generated.resources.a_field_name_is_one_word +import bennu.composeapp.generated.resources.a_field_named_that_already_exists +import bennu.composeapp.generated.resources.a_field_needs_a_name +import bennu.composeapp.generated.resources.a_name_is_required +import bennu.composeapp.generated.resources.a_regular_expression_the_whole_value_must_match +import bennu.composeapp.generated.resources.a_schema_needs_at_least_one_field +import bennu.composeapp.generated.resources.a_title_is_required +import bennu.composeapp.generated.resources.add_field +import bennu.composeapp.generated.resources.add_rule +import bennu.composeapp.generated.resources.add_schema +import bennu.composeapp.generated.resources.an_entry_must_have_this_field +import bennu.composeapp.generated.resources.an_identifier_is_required +import bennu.composeapp.generated.resources.at_least_one_of +import bennu.composeapp.generated.resources.could_not_ask_the_group_to_sign_this_schema +import bennu.composeapp.generated.resources.defaults_to_the_field_name_content_means_the_body +import bennu.composeapp.generated.resources.derived +import bennu.composeapp.generated.resources.description +import bennu.composeapp.generated.resources.domain +import bennu.composeapp.generated.resources.done +import bennu.composeapp.generated.resources.edit_field +import bennu.composeapp.generated.resources.edit_schema +import bennu.composeapp.generated.resources.earliest_year +import bennu.composeapp.generated.resources.eg_1900 +import bennu.composeapp.generated.resources.eg_200 +import bennu.composeapp.generated.resources.eg_2100 +import bennu.composeapp.generated.resources.eg_a_za_z_2_8 +import bennu.composeapp.generated.resources.eg_bitcoin_mov +import bennu.composeapp.generated.resources.eg_movie_documentary_short +import bennu.composeapp.generated.resources.eg_bitcoin_mov_suggestion +import bennu.composeapp.generated.resources.eg_example_com +import bennu.composeapp.generated.resources.eg_fields_for_a_bitcoin_mov_entry +import bennu.composeapp.generated.resources.eg_https_example_com_group_png +import bennu.composeapp.generated.resources.eg_https_youtube_com_watch +import bennu.composeapp.generated.resources.eg_watch +import bennu.composeapp.generated.resources.eg_watch_reference_url +import bennu.composeapp.generated.resources.eg_watchurl +import bennu.composeapp.generated.resources.eg_wss_relay_example_com +import bennu.composeapp.generated.resources.field_name +import bennu.composeapp.generated.resources.field_type_date +import bennu.composeapp.generated.resources.field_type_duration +import bennu.composeapp.generated.resources.field_type_enum +import bennu.composeapp.generated.resources.field_type_image +import bennu.composeapp.generated.resources.field_type_longtext +import bennu.composeapp.generated.resources.field_type_number +import bennu.composeapp.generated.resources.field_type_text +import bennu.composeapp.generated.resources.field_type_token +import bennu.composeapp.generated.resources.field_type_url +import bennu.composeapp.generated.resources.field_type_year +import bennu.composeapp.generated.resources.fields +import bennu.composeapp.generated.resources.filled_in_by_the_app_never_asked_for +import bennu.composeapp.generated.resources.helper_text_under_the_input +import bennu.composeapp.generated.resources.hint +import bennu.composeapp.generated.resources.https_only +import bennu.composeapp.generated.resources.identifier +import bennu.composeapp.generated.resources.label +import bennu.composeapp.generated.resources.latest_year +import bennu.composeapp.generated.resources.marker +import bennu.composeapp.generated.resources.maximum_characters +import bennu.composeapp.generated.resources.maximum_value +import bennu.composeapp.generated.resources.may_appear_more_than_once +import bennu.composeapp.generated.resources.minimum_value +import bennu.composeapp.generated.resources.name +import bennu.composeapp.generated.resources.new_field +import bennu.composeapp.generated.resources.no_relays_named_so_a_client_will_pick_its_own +import bennu.composeapp.generated.resources.nothing_has_changed_to_propose +import bennu.composeapp.generated.resources.npub_or_hex_pubkey +import bennu.composeapp.generated.resources.one_of_the_relays_is_not_a_relay_address +import bennu.composeapp.generated.resources.one_per_line_or_separated_by_commas +import bennu.composeapp.generated.resources.optional +import bennu.composeapp.generated.resources.options +import bennu.composeapp.generated.resources.pattern +import bennu.composeapp.generated.resources.pick_two_or_more_fields_at_least_one_of_which_an_entry_must_have +import bennu.composeapp.generated.resources.picture_url +import bennu.composeapp.generated.resources.placeholder +import bennu.composeapp.generated.resources.propose_schema +import bennu.composeapp.generated.resources.pubkeys_besides_the_group_that_may_suggest_to_this_list +import bennu.composeapp.generated.resources.relay_url +import bennu.composeapp.generated.resources.relays +import bennu.composeapp.generated.resources.remove_field +import bennu.composeapp.generated.resources.required +import bennu.composeapp.generated.resources.say_who_may_suggest_to_this_list +import bennu.composeapp.generated.resources.suggesters +import bennu.composeapp.generated.resources.that_is_not_a_domain_name +import bennu.composeapp.generated.resources.that_is_not_a_pubkey +import bennu.composeapp.generated.resources.that_is_not_a_relay_address +import bennu.composeapp.generated.resources.that_pubkey_is_already_a_suggester +import bennu.composeapp.generated.resources.that_relay_is_already_in_this_list +import bennu.composeapp.generated.resources.the_description_must_be_at_most_n_characters +import bennu.composeapp.generated.resources.the_group_signs_a_schema_so_it_takes_a_quorum +import bennu.composeapp.generated.resources.the_identifier_must_be_at_most_n_characters +import bennu.composeapp.generated.resources.the_identifier_names_this_list_in_every_reply +import bennu.composeapp.generated.resources.the_name_must_be_at_most_n_characters +import bennu.composeapp.generated.resources.the_picture_must_be_an_https_url +import bennu.composeapp.generated.resources.the_tag_s_third_element_which_tells_fields_sharing_a_tag_apart +import bennu.composeapp.generated.resources.the_title_must_be_at_most_n_characters +import bennu.composeapp.generated.resources.this_group_has_no_shared_key_to_sign_a_schema +import bennu.composeapp.generated.resources.title +import bennu.composeapp.generated.resources.type +import bennu.composeapp.generated.resources.visibility +import bennu.composeapp.generated.resources.visibility_closed +import bennu.composeapp.generated.resources.visibility_closed_purpose +import bennu.composeapp.generated.resources.visibility_private +import bennu.composeapp.generated.resources.visibility_private_purpose +import bennu.composeapp.generated.resources.visibility_public +import bennu.composeapp.generated.resources.visibility_public_purpose +import bennu.composeapp.generated.resources.what_an_entry_in_this_list_may_contain +import bennu.composeapp.generated.resources.where_suggestions_to_this_list_are_published +import bennu.composeapp.generated.resources.writes_to_tag import org.jetbrains.compose.resources.StringResource import org.jetbrains.compose.resources.stringResource @@ -1486,7 +1486,7 @@ private fun SwitchRow( @ConformancePreviews @Composable private fun EditGroupCuratedSchemaScreenPreview() { - CurareTheme { + BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { EditGroupCuratedSchemaScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/EditGroupNostrProfileScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/EditGroupNostrProfileScreen.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/EditGroupNostrProfileScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/EditGroupNostrProfileScreen.kt index 93cd396e..ff5fe6c9 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/EditGroupNostrProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/EditGroupNostrProfileScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -44,45 +44,45 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.text.style.TextAlign import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.ui.composable.navigation.routes.FrostSigningRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.ErrorState -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.buttons.ExtendedFab -import to.curare.compose.ui.composable.widgets.rememberNotifier -import to.curare.compose.ui.theme.ConformancePreviews -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.view.model.EditGroupNostrProfileViewModel -import to.curare.compose.ui.view.state.EditGroupNostrProfileUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.FrostSigningRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.buttons.ExtendedFab +import com.machankura.bennu.compose.ui.composable.widgets.rememberNotifier +import com.machankura.bennu.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.view.model.EditGroupNostrProfileViewModel +import com.machankura.bennu.compose.ui.view.state.EditGroupNostrProfileUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.about -import curare.composeapp.generated.resources.could_not_ask_the_group_to_sign_this_profile -import curare.composeapp.generated.resources.edit_nostr_profile -import curare.composeapp.generated.resources.eg_a_group_translating_hard_books -import curare.composeapp.generated.resources.eg_group_example_com -import curare.composeapp.generated.resources.eg_group_getalby_com -import curare.composeapp.generated.resources.eg_https_example_com -import curare.composeapp.generated.resources.eg_https_example_com_group_png -import curare.composeapp.generated.resources.eg_translation_collective -import curare.composeapp.generated.resources.lightning_address -import curare.composeapp.generated.resources.name -import curare.composeapp.generated.resources.nostr_address -import curare.composeapp.generated.resources.picture_url -import curare.composeapp.generated.resources.propose_nostr_profile -import curare.composeapp.generated.resources.the_group_signs_its_profile_so_it_takes_a_quorum -import curare.composeapp.generated.resources.this_group_has_no_shared_key_to_sign_a_profile -import curare.composeapp.generated.resources.website -import curare.composeapp.generated.resources.what_the_group_says_about_itself_on_nostr +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.about +import bennu.composeapp.generated.resources.could_not_ask_the_group_to_sign_this_profile +import bennu.composeapp.generated.resources.edit_nostr_profile +import bennu.composeapp.generated.resources.eg_a_group_translating_hard_books +import bennu.composeapp.generated.resources.eg_group_example_com +import bennu.composeapp.generated.resources.eg_group_getalby_com +import bennu.composeapp.generated.resources.eg_https_example_com +import bennu.composeapp.generated.resources.eg_https_example_com_group_png +import bennu.composeapp.generated.resources.eg_translation_collective +import bennu.composeapp.generated.resources.lightning_address +import bennu.composeapp.generated.resources.name +import bennu.composeapp.generated.resources.nostr_address +import bennu.composeapp.generated.resources.picture_url +import bennu.composeapp.generated.resources.propose_nostr_profile +import bennu.composeapp.generated.resources.the_group_signs_its_profile_so_it_takes_a_quorum +import bennu.composeapp.generated.resources.this_group_has_no_shared_key_to_sign_a_profile +import bennu.composeapp.generated.resources.website +import bennu.composeapp.generated.resources.what_the_group_says_about_itself_on_nostr import org.jetbrains.compose.resources.stringResource /** @@ -365,7 +365,7 @@ private fun NostrProfileField( @ConformancePreviews @Composable private fun EditGroupNostrProfileScreenPreview() { - CurareTheme { + BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/EditGroupRelaysScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/EditGroupRelaysScreen.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/EditGroupRelaysScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/EditGroupRelaysScreen.kt index 307254fd..a3c9eaec 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/EditGroupRelaysScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/EditGroupRelaysScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -48,56 +48,56 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.GroupRelay -import to.curare.compose.nostr.GroupRelayList -import to.curare.compose.nostr.GroupRelaySet -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.ui.composable.navigation.routes.FrostSigningRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.composable.widgets.EmptyState -import to.curare.compose.ui.composable.widgets.ErrorState -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.buttons.ExtendedFab -import to.curare.compose.ui.composable.widgets.rememberNotifier -import to.curare.compose.ui.theme.ConformancePreviews -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.view.model.EditGroupRelaysViewModel -import to.curare.compose.ui.view.state.EditGroupRelaysUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.GroupRelay +import com.machankura.bennu.compose.nostr.GroupRelayList +import com.machankura.bennu.compose.nostr.GroupRelaySet +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.FrostSigningRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.composable.widgets.EmptyState +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.buttons.ExtendedFab +import com.machankura.bennu.compose.ui.composable.widgets.rememberNotifier +import com.machankura.bennu.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.view.model.EditGroupRelaysViewModel +import com.machankura.bennu.compose.ui.view.state.EditGroupRelaysUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.add_relay -import curare.composeapp.generated.resources.could_not_ask_the_group_to_sign_these_relays -import curare.composeapp.generated.resources.edit_relays -import curare.composeapp.generated.resources.eg_wss_relay_example_com -import curare.composeapp.generated.resources.no_relays_in_this_list -import curare.composeapp.generated.resources.nothing_has_changed_to_propose -import curare.composeapp.generated.resources.propose_relays -import curare.composeapp.generated.resources.relay_read -import curare.composeapp.generated.resources.relay_set_blocked -import curare.composeapp.generated.resources.relay_set_blocked_purpose -import curare.composeapp.generated.resources.relay_set_general -import curare.composeapp.generated.resources.relay_set_general_purpose -import curare.composeapp.generated.resources.relay_set_messages -import curare.composeapp.generated.resources.relay_set_messages_purpose -import curare.composeapp.generated.resources.relay_set_search -import curare.composeapp.generated.resources.relay_set_search_purpose -import curare.composeapp.generated.resources.relay_url -import curare.composeapp.generated.resources.relay_write -import curare.composeapp.generated.resources.relays_are_public_a_group_cannot_encrypt -import curare.composeapp.generated.resources.that_is_not_a_relay_address -import curare.composeapp.generated.resources.that_relay_is_already_in_this_list -import curare.composeapp.generated.resources.the_group_signs_each_list_so_it_takes_a_quorum -import curare.composeapp.generated.resources.this_group_has_no_shared_key_to_sign_relays -import curare.composeapp.generated.resources.where_the_group_lives_on_nostr +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.add_relay +import bennu.composeapp.generated.resources.could_not_ask_the_group_to_sign_these_relays +import bennu.composeapp.generated.resources.edit_relays +import bennu.composeapp.generated.resources.eg_wss_relay_example_com +import bennu.composeapp.generated.resources.no_relays_in_this_list +import bennu.composeapp.generated.resources.nothing_has_changed_to_propose +import bennu.composeapp.generated.resources.propose_relays +import bennu.composeapp.generated.resources.relay_read +import bennu.composeapp.generated.resources.relay_set_blocked +import bennu.composeapp.generated.resources.relay_set_blocked_purpose +import bennu.composeapp.generated.resources.relay_set_general +import bennu.composeapp.generated.resources.relay_set_general_purpose +import bennu.composeapp.generated.resources.relay_set_messages +import bennu.composeapp.generated.resources.relay_set_messages_purpose +import bennu.composeapp.generated.resources.relay_set_search +import bennu.composeapp.generated.resources.relay_set_search_purpose +import bennu.composeapp.generated.resources.relay_url +import bennu.composeapp.generated.resources.relay_write +import bennu.composeapp.generated.resources.relays_are_public_a_group_cannot_encrypt +import bennu.composeapp.generated.resources.that_is_not_a_relay_address +import bennu.composeapp.generated.resources.that_relay_is_already_in_this_list +import bennu.composeapp.generated.resources.the_group_signs_each_list_so_it_takes_a_quorum +import bennu.composeapp.generated.resources.this_group_has_no_shared_key_to_sign_relays +import bennu.composeapp.generated.resources.where_the_group_lives_on_nostr import org.jetbrains.compose.resources.StringResource import org.jetbrains.compose.resources.stringResource @@ -515,7 +515,7 @@ private fun RelayRow( @ConformancePreviews @Composable private fun EditGroupRelaysScreenPreview() { - CurareTheme { + BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { EditGroupRelaysScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/FrostSigningScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/FrostSigningScreen.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/FrostSigningScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/FrostSigningScreen.kt index fd37bd5c..f434c8e2 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/FrostSigningScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/FrostSigningScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -44,48 +44,48 @@ import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.types.FrostSigningStage -import to.curare.compose.managers.FrostSigningManager -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.text.ProposedEvent -import to.curare.compose.ui.composable.widgets.profile.ProfileAvatar -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.model.FrostSigningViewModel -import to.curare.compose.ui.view.state.FrostSigningUIState -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.composable.widgets.Decorative -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.types.FrostSigningStage +import com.machankura.bennu.compose.managers.FrostSigningManager +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.text.ProposedEvent +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.model.FrostSigningViewModel +import com.machankura.bennu.compose.ui.view.state.FrostSigningUIState +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.ask_again -import curare.composeapp.generated.resources.asked_again -import curare.composeapp.generated.resources.asked_again_recently -import curare.composeapp.generated.resources.asked_again_to_sign -import curare.composeapp.generated.resources.declined_to_sign -import curare.composeapp.generated.resources.everyone_has_answered_this_session -import curare.composeapp.generated.resources.everyone_has_signed_this_session -import curare.composeapp.generated.resources.members_have_not_answered -import curare.composeapp.generated.resources.one_member_has_not_answered -import curare.composeapp.generated.resources.one_signer_has_not_signed -import curare.composeapp.generated.resources.signers_have_not_signed -import curare.composeapp.generated.resources.don_t_sign -import curare.composeapp.generated.resources.has_not_taken_part_yet -import curare.composeapp.generated.resources.members -import curare.composeapp.generated.resources.read_to_the_end_of_the_list_to_sign -import curare.composeapp.generated.resources.ready_to_sign -import curare.composeapp.generated.resources.sign -import curare.composeapp.generated.resources.sign_with_the_group_s_key -import curare.composeapp.generated.resources.signed_their_part -import curare.composeapp.generated.resources.events_signed_together +import bennu.composeapp.generated.resources.ask_again +import bennu.composeapp.generated.resources.asked_again +import bennu.composeapp.generated.resources.asked_again_recently +import bennu.composeapp.generated.resources.asked_again_to_sign +import bennu.composeapp.generated.resources.declined_to_sign +import bennu.composeapp.generated.resources.everyone_has_answered_this_session +import bennu.composeapp.generated.resources.everyone_has_signed_this_session +import bennu.composeapp.generated.resources.members_have_not_answered +import bennu.composeapp.generated.resources.one_member_has_not_answered +import bennu.composeapp.generated.resources.one_signer_has_not_signed +import bennu.composeapp.generated.resources.signers_have_not_signed +import bennu.composeapp.generated.resources.don_t_sign +import bennu.composeapp.generated.resources.has_not_taken_part_yet +import bennu.composeapp.generated.resources.members +import bennu.composeapp.generated.resources.read_to_the_end_of_the_list_to_sign +import bennu.composeapp.generated.resources.ready_to_sign +import bennu.composeapp.generated.resources.sign +import bennu.composeapp.generated.resources.sign_with_the_group_s_key +import bennu.composeapp.generated.resources.signed_their_part +import bennu.composeapp.generated.resources.events_signed_together import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.rememberNotifier -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.rememberNotifier +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.ConformancePreviews /** * One signing session, and the member's decision about it. @@ -543,7 +543,7 @@ private fun statusOf(session: FrostSigningSession, declined: Int): String { @ConformancePreviews @Composable private fun FrostSigningScreenPreview() { - CurareTheme { + BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { FrostSigningScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/GroupCuratedEntriesScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/GroupCuratedEntriesScreen.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/GroupCuratedEntriesScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/GroupCuratedEntriesScreen.kt index 0a115ced..fa125470 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/GroupCuratedEntriesScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/GroupCuratedEntriesScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -32,60 +32,60 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.lifecycle.viewmodel.compose.viewModel import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.relay.normalizer.displayUrl -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.accepted_by_every_relay_for_n_of_m_entries -import curare.composeapp.generated.resources.accepted_by_n_of_m_relays -import curare.composeapp.generated.resources.broadcast_all -import curare.composeapp.generated.resources.curated_entries -import curare.composeapp.generated.resources.in_list -import curare.composeapp.generated.resources.no_relays_to_send_it_to -import curare.composeapp.generated.resources.relay_and_answer -import curare.composeapp.generated.resources.relay_sending -import curare.composeapp.generated.resources.sending_entry_n_of_m -import curare.composeapp.generated.resources.signed_by_the_group_on -import curare.composeapp.generated.resources.suggested_by -import curare.composeapp.generated.resources.this_group_has_not_accepted_anything_into_a_list_yet +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.accepted_by_every_relay_for_n_of_m_entries +import bennu.composeapp.generated.resources.accepted_by_n_of_m_relays +import bennu.composeapp.generated.resources.broadcast_all +import bennu.composeapp.generated.resources.curated_entries +import bennu.composeapp.generated.resources.in_list +import bennu.composeapp.generated.resources.no_relays_to_send_it_to +import bennu.composeapp.generated.resources.relay_and_answer +import bennu.composeapp.generated.resources.relay_sending +import bennu.composeapp.generated.resources.sending_entry_n_of_m +import bennu.composeapp.generated.resources.signed_by_the_group_on +import bennu.composeapp.generated.resources.suggested_by +import bennu.composeapp.generated.resources.this_group_has_not_accepted_anything_into_a_list_yet import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow import org.jetbrains.compose.resources.stringResource -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.extensions.shortened -import to.curare.compose.extensions.toFormattedTimeAndDateString -import to.curare.compose.network.dto.RelayDTO -import to.curare.compose.network.relays.EventPublishTransport -import to.curare.compose.network.relays.NostrPublishResult -import to.curare.compose.nostr.GroupCuratedEntry -import to.curare.compose.nostr.GroupCuratedSchema -import to.curare.compose.nostr.curated.CuratedEntry -import to.curare.compose.nostr.curated.CuratedEntryEvent -import to.curare.compose.nostr.curated.CuratedField -import to.curare.compose.nostr.curated.CuratedSchema -import to.curare.compose.nostr.curated.CuratedSchemaEvent -import to.curare.compose.nostr.curated.CuratedVisibility -import to.curare.compose.repository.ChatRepository -import to.curare.compose.ui.composable.navigation.routes.BroadcastGroupSignedEventRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.composable.widgets.EmptyState -import to.curare.compose.ui.composable.widgets.ErrorState -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.buttons.BroadcastButton -import to.curare.compose.ui.composable.widgets.buttons.ExtendedFab -import to.curare.compose.ui.composable.widgets.label -import to.curare.compose.ui.theme.ConformancePreviews -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.view.model.GroupCuratedEntriesViewModel -import to.curare.compose.ui.view.model.GroupCuratedEntriesViewModel.BroadcastAllProgress -import to.curare.compose.ui.view.model.GroupCuratedEntriesViewModel.EntryBroadcast -import to.curare.compose.ui.view.state.GroupCuratedEntriesUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.extensions.shortened +import com.machankura.bennu.compose.extensions.toFormattedTimeAndDateString +import com.machankura.bennu.compose.network.dto.RelayDTO +import com.machankura.bennu.compose.network.relays.EventPublishTransport +import com.machankura.bennu.compose.network.relays.NostrPublishResult +import com.machankura.bennu.compose.nostr.GroupCuratedEntry +import com.machankura.bennu.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedEntry +import com.machankura.bennu.compose.nostr.curated.CuratedEntryEvent +import com.machankura.bennu.compose.nostr.curated.CuratedField +import com.machankura.bennu.compose.nostr.curated.CuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaEvent +import com.machankura.bennu.compose.nostr.curated.CuratedVisibility +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.BroadcastGroupSignedEventRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.composable.widgets.EmptyState +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.buttons.BroadcastButton +import com.machankura.bennu.compose.ui.composable.widgets.buttons.ExtendedFab +import com.machankura.bennu.compose.ui.composable.widgets.label +import com.machankura.bennu.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.view.model.GroupCuratedEntriesViewModel +import com.machankura.bennu.compose.ui.view.model.GroupCuratedEntriesViewModel.BroadcastAllProgress +import com.machankura.bennu.compose.ui.view.model.GroupCuratedEntriesViewModel.EntryBroadcast +import com.machankura.bennu.compose.ui.view.state.GroupCuratedEntriesUIState import kotlin.time.Instant /** @@ -480,7 +480,7 @@ private fun GroupCuratedEntriesScreenPreview() { ) ) - CurareTheme { + BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { GroupCuratedEntriesScreen( activeUserPublicKey = "a".repeat(64), diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/GroupCuratedSchemasScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/GroupCuratedSchemasScreen.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/GroupCuratedSchemasScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/GroupCuratedSchemasScreen.kt index a5c8c24e..0edfc8df 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/GroupCuratedSchemasScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/GroupCuratedSchemasScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -35,43 +35,43 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextOverflow import androidx.lifecycle.viewmodel.compose.viewModel import com.vitorpamplona.quartz.nip01Core.core.HexKey -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.add_schema -import curare.composeapp.generated.resources.curated_schemas -import curare.composeapp.generated.resources.fields_colon -import curare.composeapp.generated.resources.signed_by_the_group_on -import curare.composeapp.generated.resources.this_group_has_not_published_a_curated_schema_yet -import curare.composeapp.generated.resources.view_suggestions +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.add_schema +import bennu.composeapp.generated.resources.curated_schemas +import bennu.composeapp.generated.resources.fields_colon +import bennu.composeapp.generated.resources.signed_by_the_group_on +import bennu.composeapp.generated.resources.this_group_has_not_published_a_curated_schema_yet +import bennu.composeapp.generated.resources.view_suggestions import org.jetbrains.compose.resources.stringResource -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.extensions.toFormattedTimeAndDateString -import to.curare.compose.nostr.GroupCuratedSchema -import to.curare.compose.nostr.curated.CuratedField -import to.curare.compose.nostr.curated.CuratedSchema -import to.curare.compose.nostr.curated.CuratedSchemaEvent -import to.curare.compose.nostr.curated.CuratedVisibility -import to.curare.compose.repository.ChatRepository -import to.curare.compose.ui.composable.navigation.routes.BroadcastGroupSignedEventRoute -import to.curare.compose.ui.composable.navigation.routes.CuratedSuggestionListRoute -import to.curare.compose.ui.composable.navigation.routes.EditGroupCuratedSchemaRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.navigation.routes.SelectCuratedSchemaTemplateRoute -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.composable.widgets.EmptyState -import to.curare.compose.ui.composable.widgets.ErrorState -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.buttons.BroadcastButton -import to.curare.compose.ui.theme.ConformancePreviews -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.view.model.GroupCuratedSchemasViewModel -import to.curare.compose.ui.view.state.GroupCuratedSchemasUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.extensions.toFormattedTimeAndDateString +import com.machankura.bennu.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedField +import com.machankura.bennu.compose.nostr.curated.CuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaEvent +import com.machankura.bennu.compose.nostr.curated.CuratedVisibility +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.BroadcastGroupSignedEventRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.CuratedSuggestionListRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.EditGroupCuratedSchemaRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.navigation.routes.SelectCuratedSchemaTemplateRoute +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.composable.widgets.EmptyState +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.buttons.BroadcastButton +import com.machankura.bennu.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.view.model.GroupCuratedSchemasViewModel +import com.machankura.bennu.compose.ui.view.state.GroupCuratedSchemasUIState import kotlin.time.Instant /** @@ -405,7 +405,7 @@ private fun AddSchemaButton(onClick: () -> Unit) { private fun GroupCuratedSchemasScreenPreview() { val chatRoomId = "d".repeat(64) - CurareTheme { + BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { GroupCuratedSchemasScreen( activeUserPublicKey = "a".repeat(64), diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/GroupNostrProfileScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/GroupNostrProfileScreen.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/GroupNostrProfileScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/GroupNostrProfileScreen.kt index 7bc7a5cd..86d51191 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/GroupNostrProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/GroupNostrProfileScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -31,37 +31,37 @@ import androidx.lifecycle.viewmodel.compose.viewModel import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip01Core.metadata.UserMetadata -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.edit_nostr_profile -import curare.composeapp.generated.resources.no_name_on_this_profile -import curare.composeapp.generated.resources.nostr_profile -import curare.composeapp.generated.resources.signed_by_the_group_on -import curare.composeapp.generated.resources.this_group_has_not_said_anything_about_itself +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.edit_nostr_profile +import bennu.composeapp.generated.resources.no_name_on_this_profile +import bennu.composeapp.generated.resources.nostr_profile +import bennu.composeapp.generated.resources.signed_by_the_group_on +import bennu.composeapp.generated.resources.this_group_has_not_said_anything_about_itself import org.jetbrains.compose.resources.stringResource -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.extensions.toFormattedTimeAndDateString -import to.curare.compose.nostr.GroupNostrProfile -import to.curare.compose.repository.ChatRepository -import to.curare.compose.ui.composable.navigation.routes.BroadcastGroupSignedEventRoute -import to.curare.compose.ui.composable.navigation.routes.EditGroupNostrProfileRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.composable.widgets.EmptyState -import to.curare.compose.ui.composable.widgets.ErrorState -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.buttons.BroadcastButton -import to.curare.compose.ui.composable.widgets.profile.ProfileAvatar -import to.curare.compose.ui.theme.ConformancePreviews -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.view.model.GroupNostrProfileViewModel -import to.curare.compose.ui.view.state.GroupNostrProfileUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.extensions.toFormattedTimeAndDateString +import com.machankura.bennu.compose.nostr.GroupNostrProfile +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.BroadcastGroupSignedEventRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.EditGroupNostrProfileRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.composable.widgets.EmptyState +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.buttons.BroadcastButton +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar +import com.machankura.bennu.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.view.model.GroupNostrProfileViewModel +import com.machankura.bennu.compose.ui.view.state.GroupNostrProfileUIState import kotlin.time.Instant /** @@ -306,7 +306,7 @@ private fun EditNostrProfileButton(onClick: () -> Unit) { @ConformancePreviews @Composable private fun GroupNostrProfileScreenPreview() { - CurareTheme { + BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { GroupNostrProfileScreen( activeUserPublicKey = "a".repeat(64), diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/GroupPostsScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/GroupPostsScreen.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/GroupPostsScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/GroupPostsScreen.kt index 232e56ce..c3857ca0 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/GroupPostsScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/GroupPostsScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -31,39 +31,39 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.lifecycle.viewmodel.compose.viewModel import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.a_reply -import curare.composeapp.generated.resources.add_post -import curare.composeapp.generated.resources.posted_on -import curare.composeapp.generated.resources.posts -import curare.composeapp.generated.resources.this_group_has_not_posted_anything_yet +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.a_reply +import bennu.composeapp.generated.resources.add_post +import bennu.composeapp.generated.resources.posted_on +import bennu.composeapp.generated.resources.posts +import bennu.composeapp.generated.resources.this_group_has_not_posted_anything_yet import org.jetbrains.compose.resources.stringResource -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.extensions.inComparableGroups -import to.curare.compose.extensions.toFormattedTimeAndDateString -import to.curare.compose.nostr.GroupNostrProfile -import to.curare.compose.nostr.GroupPost -import to.curare.compose.repository.ChatRepository -import to.curare.compose.ui.composable.navigation.routes.AddGroupPostRoute -import to.curare.compose.ui.composable.navigation.routes.BroadcastGroupSignedEventRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.composable.widgets.EmptyState -import to.curare.compose.ui.composable.widgets.ErrorState -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.buttons.BroadcastButton -import to.curare.compose.ui.composable.widgets.profile.ProfileAvatar -import to.curare.compose.ui.theme.ConformancePreviews -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.view.model.GroupPostsViewModel -import to.curare.compose.ui.view.state.GroupPostsUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.extensions.inComparableGroups +import com.machankura.bennu.compose.extensions.toFormattedTimeAndDateString +import com.machankura.bennu.compose.nostr.GroupNostrProfile +import com.machankura.bennu.compose.nostr.GroupPost +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.AddGroupPostRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.BroadcastGroupSignedEventRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.composable.widgets.EmptyState +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.buttons.BroadcastButton +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar +import com.machankura.bennu.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.view.model.GroupPostsViewModel +import com.machankura.bennu.compose.ui.view.state.GroupPostsUIState import kotlin.time.Instant /** @@ -310,7 +310,7 @@ private fun AddPostButton(onClick: () -> Unit) { private fun GroupPostsScreenPreview() { val chatRoomId = "d".repeat(64) - CurareTheme { + BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { GroupPostsScreen( activeUserPublicKey = "a".repeat(64), diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/GroupRelaysScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/GroupRelaysScreen.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/GroupRelaysScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/GroupRelaysScreen.kt index 03b80a5b..7fe9eb63 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/GroupRelaysScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/GroupRelaysScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -31,39 +31,39 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.lifecycle.viewmodel.compose.viewModel import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.edit_relays -import curare.composeapp.generated.resources.no_relays_in_this_list -import curare.composeapp.generated.resources.not_set_yet -import curare.composeapp.generated.resources.relay_set_blocked -import curare.composeapp.generated.resources.relay_set_general -import curare.composeapp.generated.resources.relay_set_messages -import curare.composeapp.generated.resources.relay_set_search -import curare.composeapp.generated.resources.relays +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.edit_relays +import bennu.composeapp.generated.resources.no_relays_in_this_list +import bennu.composeapp.generated.resources.not_set_yet +import bennu.composeapp.generated.resources.relay_set_blocked +import bennu.composeapp.generated.resources.relay_set_general +import bennu.composeapp.generated.resources.relay_set_messages +import bennu.composeapp.generated.resources.relay_set_search +import bennu.composeapp.generated.resources.relays import org.jetbrains.compose.resources.stringResource -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.GroupRelay -import to.curare.compose.nostr.GroupRelayList -import to.curare.compose.nostr.GroupRelaySet -import to.curare.compose.repository.ChatRepository -import to.curare.compose.ui.composable.navigation.routes.BroadcastGroupSignedEventRoute -import to.curare.compose.ui.composable.navigation.routes.EditGroupRelaysRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.composable.widgets.ErrorState -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.buttons.BroadcastButton -import to.curare.compose.ui.theme.ConformancePreviews -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.view.model.GroupRelaysViewModel -import to.curare.compose.ui.view.state.GroupRelaysUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.GroupRelay +import com.machankura.bennu.compose.nostr.GroupRelayList +import com.machankura.bennu.compose.nostr.GroupRelaySet +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.BroadcastGroupSignedEventRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.EditGroupRelaysRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.buttons.BroadcastButton +import com.machankura.bennu.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.view.model.GroupRelaysViewModel +import com.machankura.bennu.compose.ui.view.state.GroupRelaysUIState import kotlin.time.Instant /** @@ -275,7 +275,7 @@ private fun GroupRelaySet.summaryLabel() = when (this) { private fun GroupRelaysScreenPreview() { val chatRoomId = "d".repeat(64) - CurareTheme { + BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { GroupRelaysScreen( activeUserPublicKey = "a".repeat(64), diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/HomeScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/HomeScreen.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/HomeScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/HomeScreen.kt index 6aca34e8..e056d4f8 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/HomeScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/HomeScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -43,48 +43,48 @@ import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner import androidx.lifecycle.viewmodel.compose.rememberViewModelStoreOwner import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalProfileWithFollowing -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.navigation.routes.SignInRoute -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.dialogs.NewChatBottomSheetDialog -import to.curare.compose.ui.composable.widgets.dialogs.StartDirectMessageToNpubOrNip05Dialog -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.model.ChatRoomListViewModel -import to.curare.compose.ui.view.model.HomeScreenType -import to.curare.compose.ui.view.model.HomeViewModel -import to.curare.compose.ui.view.state.HomeScreenUIState +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalProfileWithFollowing +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.navigation.routes.SignInRoute +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.dialogs.NewChatBottomSheetDialog +import com.machankura.bennu.compose.ui.composable.widgets.dialogs.StartDirectMessageToNpubOrNip05Dialog +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.model.ChatRoomListViewModel +import com.machankura.bennu.compose.ui.view.model.HomeScreenType +import com.machankura.bennu.compose.ui.view.model.HomeViewModel +import com.machankura.bennu.compose.ui.view.state.HomeScreenUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent import kotlinx.coroutines.launch -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.curare -import curare.composeapp.generated.resources.new_chat -import to.curare.compose.ui.composable.widgets.ErrorState +import bennu.composeapp.generated.resources.bennu +import bennu.composeapp.generated.resources.new_chat +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState import androidx.compose.ui.Alignment -import to.curare.compose.repository.DkgRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.composable.widgets.EmptyState -import to.curare.compose.ui.theme.breakpoint -import to.curare.compose.ui.theme.listPaneWidthFor -import to.curare.compose.ui.theme.readableContent -import curare.composeapp.generated.resources.pick_a_conversation_to_read_it_here -import curare.composeapp.generated.resources.messages_need_the_secret_key_this_profile -import curare.composeapp.generated.resources.sign_in_with_the_nsec -import to.curare.compose.ui.composable.widgets.LocalCanSign -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.buttons.ExtendedFab -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.repository.DkgRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.composable.widgets.EmptyState +import com.machankura.bennu.compose.ui.theme.breakpoint +import com.machankura.bennu.compose.ui.theme.listPaneWidthFor +import com.machankura.bennu.compose.ui.theme.readableContent +import bennu.composeapp.generated.resources.pick_a_conversation_to_read_it_here +import bennu.composeapp.generated.resources.messages_need_the_secret_key_this_profile +import bennu.composeapp.generated.resources.sign_in_with_the_nsec +import com.machankura.bennu.compose.ui.composable.widgets.LocalCanSign +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.buttons.ExtendedFab +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class) @Composable @@ -165,14 +165,14 @@ fun HomeScreen( // default is `surface`/`onSurface` and needs no help. TopAppBar( title = { - // "Curare". The launcher label, the desktop window title, the + // "Bennu". The launcher label, the desktop window title, the // landing screen and the package name all say so, and since the // rebrand so does `UserAgent.CLIENT_NAME` -- the one that goes on - // the wire, as the `client` tag on a published relay list. The two + // the wire, as the `client` tag on a published relay list. The three // brands before it are gone from live code too -- what was - // `TorchTheme`, then `CuratedTheme`, is `CurareTheme`, and no - // error string names either. - Text(stringResource(Res.string.curare)) + // `TorchTheme`, then `CuratedTheme`, then `CurareTheme`, is + // `BennuTheme`, and no error string names any of them. + Text(stringResource(Res.string.bennu)) }, // No navigation icon and no actions. The avatar in the leading // slot and the search icon in the trailing one were the app's only @@ -235,7 +235,7 @@ fun HomeScreen( val chatRoomListViewModel: ChatRoomListViewModel = viewModel( key = homeScreenTypeType.name, factory = ChatRoomListViewModel.factory( - initialChatRoomListUIState = to.curare.compose.ui.view.state.ChatRoomListUIState.Loading, + initialChatRoomListUIState = com.machankura.bennu.compose.ui.view.state.ChatRoomListUIState.Loading, publicKey = homeScreenUIState.profileWithFollowing.profile.publicKey, nostrRepository = nostrRepository, chatRepository = chatRepository @@ -408,7 +408,7 @@ fun HomeScreen( @ConformancePreviews @Composable private fun HomeScreenPreview() { - CurareTheme { + BennuTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ImplementationPendingScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ImplementationPendingScreen.kt similarity index 81% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ImplementationPendingScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ImplementationPendingScreen.kt index 86929432..9b275c67 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ImplementationPendingScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ImplementationPendingScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -14,15 +14,15 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.functionality_coming_soon_2 +import bennu.composeapp.generated.resources.functionality_coming_soon_2 import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.ConformancePreviews /** * @param onNavigateBack `null` when this screen is the root of the stack, which it is @@ -69,7 +69,7 @@ fun ImplementationPendingScreen( @ConformancePreviews @Composable private fun ImplementationPendingScreenPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/KeyPackageManagementScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/KeyPackageManagementScreen.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/KeyPackageManagementScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/KeyPackageManagementScreen.kt index 2e13029c..8787fa47 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/KeyPackageManagementScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/KeyPackageManagementScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -33,36 +33,36 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.database.model.MarmotKeyPackageBundle -import to.curare.compose.extensions.toFormattedTimeAndDateString -import to.curare.compose.repository.MarmotRepository -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.view.model.KeyPackageManagementViewModel -import to.curare.compose.identity.Identity +import com.machankura.bennu.compose.database.model.MarmotKeyPackageBundle +import com.machankura.bennu.compose.extensions.toFormattedTimeAndDateString +import com.machankura.bennu.compose.repository.MarmotRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.view.model.KeyPackageManagementViewModel +import com.machankura.bennu.compose.identity.Identity import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import to.curare.compose.ui.view.state.KeyPackageManagementUIState +import com.machankura.bennu.compose.ui.view.state.KeyPackageManagementUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.key_package_management -import curare.composeapp.generated.resources.publish_new_key_package -import curare.composeapp.generated.resources.something_went_wrong -import curare.composeapp.generated.resources.we_couldn_t_find_the_local_profile_please -import curare.composeapp.generated.resources.key_packages -import to.curare.compose.ui.composable.widgets.ErrorState +import bennu.composeapp.generated.resources.key_package_management +import bennu.composeapp.generated.resources.publish_new_key_package +import bennu.composeapp.generated.resources.something_went_wrong +import bennu.composeapp.generated.resources.we_couldn_t_find_the_local_profile_please +import bennu.composeapp.generated.resources.key_packages +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState import androidx.compose.runtime.rememberCoroutineScope -import to.curare.compose.ui.composable.widgets.rememberNotifier -import curare.composeapp.generated.resources.key_package_published -import curare.composeapp.generated.resources.key_package_rotated -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.rememberNotifier +import bennu.composeapp.generated.resources.key_package_published +import bennu.composeapp.generated.resources.key_package_rotated +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class) @Composable @@ -240,7 +240,7 @@ fun KeyPackageManagementScreen( @ConformancePreviews @Composable private fun UnannouncedProfileScreenPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/KeyRecoveryScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/KeyRecoveryScreen.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/KeyRecoveryScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/KeyRecoveryScreen.kt index 8fc097e6..6d262a2f 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/KeyRecoveryScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/KeyRecoveryScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -40,44 +40,44 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.identity.Identity -import to.curare.compose.identity.IdentityKind +import com.machankura.bennu.compose.identity.Identity +import com.machankura.bennu.compose.identity.IdentityKind import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.flowOf -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.cloud_backup -import curare.composeapp.generated.resources.download_and_securely_store_everything -import curare.composeapp.generated.resources.emergency_kit -import curare.composeapp.generated.resources.encrypt_and_back_your_recovery_information -import curare.composeapp.generated.resources.key_recovery -import curare.composeapp.generated.resources.not_backed_up_yet -import curare.composeapp.generated.resources.nostr_secret_key -import curare.composeapp.generated.resources.recovery_phrase -import curare.composeapp.generated.resources.store_the_nsec_that_signs_as_this_profile -import curare.composeapp.generated.resources.these_are_your_keys_keep_them_safe_no_wallet -import curare.composeapp.generated.resources.you_said_you_stored_it -import curare.composeapp.generated.resources.these_are_your_keys_keep_them_safe_so_they -import curare.composeapp.generated.resources.write_down_and_secure_the_12_word_phrase -import curare.composeapp.generated.resources.yolo -import curare.composeapp.generated.resources.you_only_live_once_lose_this_phone_and_the -import curare.composeapp.generated.resources.you_said_you_wrote_it_down +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.cloud_backup +import bennu.composeapp.generated.resources.download_and_securely_store_everything +import bennu.composeapp.generated.resources.emergency_kit +import bennu.composeapp.generated.resources.encrypt_and_back_your_recovery_information +import bennu.composeapp.generated.resources.key_recovery +import bennu.composeapp.generated.resources.not_backed_up_yet +import bennu.composeapp.generated.resources.nostr_secret_key +import bennu.composeapp.generated.resources.recovery_phrase +import bennu.composeapp.generated.resources.store_the_nsec_that_signs_as_this_profile +import bennu.composeapp.generated.resources.these_are_your_keys_keep_them_safe_no_wallet +import bennu.composeapp.generated.resources.you_said_you_stored_it +import bennu.composeapp.generated.resources.these_are_your_keys_keep_them_safe_so_they +import bennu.composeapp.generated.resources.write_down_and_secure_the_12_word_phrase +import bennu.composeapp.generated.resources.yolo +import bennu.composeapp.generated.resources.you_only_live_once_lose_this_phone_and_the +import bennu.composeapp.generated.resources.you_said_you_wrote_it_down import org.jetbrains.compose.resources.stringResource -import to.curare.compose.extensions.hexToNpubHrp -import to.curare.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import to.curare.compose.ui.composable.navigation.routes.NostrSecretRoute -import to.curare.compose.ui.composable.navigation.routes.RecoveryPhraseRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.ConformancePreviews -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.spacing +import com.machankura.bennu.compose.extensions.hexToNpubHrp +import com.machankura.bennu.compose.ui.composable.navigation.routes.ImplementationPendingRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.NostrSecretRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.RecoveryPhraseRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.spacing /** * Everything that can put this profile back on another phone. * - * A Curare profile is its key: the npub that signs and, for a wallet, the coins + * A Bennu profile is its key: the npub that signs and, for a wallet, the coins * it holds, both come out of one secret that never leaves the device -- twelve * words, or a bare nostr key that was signed in with. There is no account to * reset, so this screen is the only thing standing between a lost phone and a @@ -341,7 +341,7 @@ private fun KeyRecoveryOption( @ConformancePreviews @Composable private fun KeyRecoveryScreenPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/LandingScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/LandingScreen.kt similarity index 80% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/LandingScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/LandingScreen.kt index 0f71ce04..65622b60 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/LandingScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/LandingScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -18,20 +18,20 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.create_profile -import curare.composeapp.generated.resources.if_you_are_new_to_torch_or_just_want_to -import curare.composeapp.generated.resources.keep_the_feed_alive -import curare.composeapp.generated.resources.learn_more -import curare.composeapp.generated.resources.curare -import curare.composeapp.generated.resources.sign_in -import curare.composeapp.generated.resources.sign_in_with_a_recovery_phrase_an_nsec_or +import bennu.composeapp.generated.resources.create_profile +import bennu.composeapp.generated.resources.if_you_are_new_to_torch_or_just_want_to +import bennu.composeapp.generated.resources.keep_the_feed_alive +import bennu.composeapp.generated.resources.learn_more +import bennu.composeapp.generated.resources.bennu +import bennu.composeapp.generated.resources.sign_in +import bennu.composeapp.generated.resources.sign_in_with_a_recovery_phrase_an_nsec_or import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @Composable fun LandingScreen( @@ -50,7 +50,7 @@ fun LandingScreen( horizontalAlignment = Alignment.CenterHorizontally ) { Text( - text = stringResource(Res.string.curare), + text = stringResource(Res.string.bennu), style = MaterialTheme.typography.headlineLarge ) @@ -115,7 +115,7 @@ fun LandingScreen( @ConformancePreviews @Composable private fun LandingScreenPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/LoadingScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/LoadingScreen.kt similarity index 70% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/LoadingScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/LoadingScreen.kt index a4a6c6f9..c0dee620 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/LoadingScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/LoadingScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize @@ -8,9 +8,9 @@ import androidx.compose.material3.Surface import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @Composable fun LoadingScreen( @@ -21,7 +21,7 @@ fun LoadingScreen( modifier = Modifier.padding(innerPadding) .readableContent() ) { - to.curare.compose.ui.composable.widgets.LoadingDataIndicator( + com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator( text = text ) } @@ -31,7 +31,7 @@ fun LoadingScreen( @ConformancePreviews @Composable private fun LoadingScreenPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/NostrEventDetailScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/NostrEventDetailScreen.kt similarity index 83% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/NostrEventDetailScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/NostrEventDetailScreen.kt index c7fc31ba..9c09bb14 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/NostrEventDetailScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/NostrEventDetailScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -16,36 +16,36 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalNostrEvent -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.detail.MetadataEventDetail -import to.curare.compose.ui.composable.widgets.detail.TextNoteEventDetail -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.model.NostrEventDetailViewModel -import to.curare.compose.ui.view.state.NostrEventDetailUIState +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.detail.MetadataEventDetail +import com.machankura.bennu.compose.ui.composable.widgets.detail.TextNoteEventDetail +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.model.NostrEventDetailViewModel +import com.machankura.bennu.compose.ui.view.state.NostrEventDetailUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent import com.vitorpamplona.quartz.nip18Reposts.RepostEvent -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.functionality_coming_soon -import curare.composeapp.generated.resources.post -import curare.composeapp.generated.resources.post_functionality_coming_soon -import curare.composeapp.generated.resources.something_went_wrong -import curare.composeapp.generated.resources.we_couldn_t_find_your_nostr_event_please_try -import to.curare.compose.ui.composable.widgets.ErrorState +import bennu.composeapp.generated.resources.functionality_coming_soon +import bennu.composeapp.generated.resources.post +import bennu.composeapp.generated.resources.post_functionality_coming_soon +import bennu.composeapp.generated.resources.something_went_wrong +import bennu.composeapp.generated.resources.we_couldn_t_find_your_nostr_event_please_try +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -173,7 +173,7 @@ fun NostrEventDetailScreen( @ConformancePreviews @Composable private fun NostrEventDetailScreenPreview() { - CurareTheme { + BennuTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/NostrSecretScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/NostrSecretScreen.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/NostrSecretScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/NostrSecretScreen.kt index 761962ed..54f25b34 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/NostrSecretScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/NostrSecretScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -45,50 +45,50 @@ import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.style.TextAlign import androidx.lifecycle.viewmodel.compose.viewModel -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.backup_confirmation -import curare.composeapp.generated.resources.cancel -import curare.composeapp.generated.resources.copied_the_nsec -import curare.composeapp.generated.resources.copy_nsec -import curare.composeapp.generated.resources.could_not_forget_the_key_please_try_again -import curare.composeapp.generated.resources.could_not_unlock_your_key_please_try -import curare.composeapp.generated.resources.curare_will_delete_the_nsec_for_s_from_this -import curare.composeapp.generated.resources.display_nostr_secret_key -import curare.composeapp.generated.resources.forget -import curare.composeapp.generated.resources.forget_this_key -import curare.composeapp.generated.resources.forget_this_key_question -import curare.composeapp.generated.resources.hide -import curare.composeapp.generated.resources.i_have_saved_my_nostr_secret_key_somewhere -import curare.composeapp.generated.resources.i_understand_that_if_i_lose_this_phone_and_my_key -import curare.composeapp.generated.resources.keep_this_key_safe_do_not_share_it -import curare.composeapp.generated.resources.key_forgotten -import curare.composeapp.generated.resources.loading_preferences -import curare.composeapp.generated.resources.lose_this_phone_before_you_do_and_the -import curare.composeapp.generated.resources.no_identity_is_open_on_this_device_so_there -import curare.composeapp.generated.resources.nostr_secret_key -import curare.composeapp.generated.resources.remove_the_key_from_this_device_the_profile -import curare.composeapp.generated.resources.the_nsec_is_the_key_that_signs_as_you_this -import curare.composeapp.generated.resources.this_device_holds_no_key_for_the_profile -import curare.composeapp.generated.resources.unlocking_your_key -import curare.composeapp.generated.resources.you_have_not_backed_up_your_nostr_secret_key +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.backup_confirmation +import bennu.composeapp.generated.resources.cancel +import bennu.composeapp.generated.resources.copied_the_nsec +import bennu.composeapp.generated.resources.copy_nsec +import bennu.composeapp.generated.resources.could_not_forget_the_key_please_try_again +import bennu.composeapp.generated.resources.could_not_unlock_your_key_please_try +import bennu.composeapp.generated.resources.bennu_will_delete_the_nsec_for_s_from_this +import bennu.composeapp.generated.resources.display_nostr_secret_key +import bennu.composeapp.generated.resources.forget +import bennu.composeapp.generated.resources.forget_this_key +import bennu.composeapp.generated.resources.forget_this_key_question +import bennu.composeapp.generated.resources.hide +import bennu.composeapp.generated.resources.i_have_saved_my_nostr_secret_key_somewhere +import bennu.composeapp.generated.resources.i_understand_that_if_i_lose_this_phone_and_my_key +import bennu.composeapp.generated.resources.keep_this_key_safe_do_not_share_it +import bennu.composeapp.generated.resources.key_forgotten +import bennu.composeapp.generated.resources.loading_preferences +import bennu.composeapp.generated.resources.lose_this_phone_before_you_do_and_the +import bennu.composeapp.generated.resources.no_identity_is_open_on_this_device_so_there +import bennu.composeapp.generated.resources.nostr_secret_key +import bennu.composeapp.generated.resources.remove_the_key_from_this_device_the_profile +import bennu.composeapp.generated.resources.the_nsec_is_the_key_that_signs_as_you_this +import bennu.composeapp.generated.resources.this_device_holds_no_key_for_the_profile +import bennu.composeapp.generated.resources.unlocking_your_key +import bennu.composeapp.generated.resources.you_have_not_backed_up_your_nostr_secret_key import fr.acinq.phoenix.PhoenixGlobal import kotlinx.coroutines.flow.StateFlow import org.jetbrains.compose.resources.stringResource -import to.curare.compose.extensions.hexToNpubHrp -import to.curare.compose.identity.Identity -import to.curare.compose.identity.IdentityWriter -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.composable.widgets.ErrorState -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.rememberNotifier -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.ConformancePreviews -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.view.model.NostrSecretViewModel -import to.curare.compose.ui.view.state.NostrSecretUIState +import com.machankura.bennu.compose.extensions.hexToNpubHrp +import com.machankura.bennu.compose.identity.Identity +import com.machankura.bennu.compose.identity.IdentityWriter +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.rememberNotifier +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.view.model.NostrSecretViewModel +import com.machankura.bennu.compose.ui.view.state.NostrSecretUIState /** * The nostr secret key behind a bare-key identity, shown once and on request. @@ -184,7 +184,7 @@ private fun NostrSecretContent( onDismissRequest = onCancelForget, icon = { Icon(Icons.Default.DeleteForever, contentDescription = Decorative) }, title = { Text(stringResource(Res.string.forget_this_key_question)) }, - text = { Text(stringResource(Res.string.curare_will_delete_the_nsec_for_s_from_this, npub ?: "")) }, + text = { Text(stringResource(Res.string.bennu_will_delete_the_nsec_for_s_from_this, npub ?: "")) }, confirmButton = { TextButton(onClick = onForget) { Text(stringResource(Res.string.forget)) } }, @@ -457,7 +457,7 @@ private fun BackupCheckbox( @ConformancePreviews @Composable private fun NostrSecretScreenPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { NostrSecretContent( uiState = NostrSecretUIState.Revealed("nsec1" + "q".repeat(58)), diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ProfilePreviewScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ProfilePreviewScreen.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ProfilePreviewScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ProfilePreviewScreen.kt index 5677ce49..087150f4 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ProfilePreviewScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ProfilePreviewScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -29,40 +29,40 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import com.vitorpamplona.quartz.nip01Core.core.HexKey -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.checking_whether_s_can_receive_messages_here -import curare.composeapp.generated.resources.looking_for_this_profile_on_the_relays -import curare.composeapp.generated.resources.open_chat -import curare.composeapp.generated.resources.profile -import curare.composeapp.generated.resources.s_hasn_t_set_up_messaging_on_curare_yet -import curare.composeapp.generated.resources.start_new_chat -import curare.composeapp.generated.resources.try_again -import curare.composeapp.generated.resources.we_could_not_find_a_profile_for_this_key -import curare.composeapp.generated.resources.you_already_have_a_chat_with_s +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.checking_whether_s_can_receive_messages_here +import bennu.composeapp.generated.resources.looking_for_this_profile_on_the_relays +import bennu.composeapp.generated.resources.open_chat +import bennu.composeapp.generated.resources.profile +import bennu.composeapp.generated.resources.s_hasn_t_set_up_messaging_on_bennu_yet +import bennu.composeapp.generated.resources.start_new_chat +import bennu.composeapp.generated.resources.try_again +import bennu.composeapp.generated.resources.we_could_not_find_a_profile_for_this_key +import bennu.composeapp.generated.resources.you_already_have_a_chat_with_s import org.jetbrains.compose.resources.stringResource -import to.curare.compose.database.model.Profile -import to.curare.compose.extensions.hexToNpubHrp -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.composable.widgets.EmptyState -import to.curare.compose.ui.composable.widgets.ErrorState -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.LocalCanSign -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.buttons.ExtendedFab -import to.curare.compose.ui.composable.widgets.profile.ProfileAvatar -import to.curare.compose.ui.theme.ConformancePreviews -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.view.model.ProfilePreviewViewModel -import to.curare.compose.ui.view.state.ProfilePreviewUIState -import to.curare.compose.ui.view.state.ProfilePreviewUIState.Readiness +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.extensions.hexToNpubHrp +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.composable.widgets.EmptyState +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.LocalCanSign +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.buttons.ExtendedFab +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar +import com.machankura.bennu.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.view.model.ProfilePreviewViewModel +import com.machankura.bennu.compose.ui.view.state.ProfilePreviewUIState +import com.machankura.bennu.compose.ui.view.state.ProfilePreviewUIState.Readiness /** * The person behind a pasted npub, and the one thing to do about them. @@ -336,9 +336,9 @@ private fun ReadinessLine( is Readiness.ExistingChat -> SupportingLine(stringResource(Res.string.you_already_have_a_chat_with_s, name)) Readiness.CanStartChat -> Unit Readiness.Checking -> SupportingLine(stringResource(Res.string.checking_whether_s_can_receive_messages_here, name)) - Readiness.NotYetOnCurare -> { + Readiness.NotYetOnBennu -> { Column(verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.relatedGap)) { - SupportingLine(stringResource(Res.string.s_hasn_t_set_up_messaging_on_curare_yet, name)) + SupportingLine(stringResource(Res.string.s_hasn_t_set_up_messaging_on_bennu_yet, name)) TextButton(onClick = onRetry) { Text(stringResource(Res.string.try_again)) } @@ -359,7 +359,7 @@ private fun SupportingLine(text: String) { @ConformancePreviews @Composable private fun ProfilePreviewScreenPreview() { - CurareTheme { + BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { ProfilePreviewScreen( activeUserPublicKey = "a".repeat(64), diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ProfilesScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ProfilesScreen.kt similarity index 77% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ProfilesScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ProfilesScreen.kt index 291e1b64..85176fcd 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ProfilesScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ProfilesScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize @@ -13,22 +13,22 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.loading_profiles -import curare.composeapp.generated.resources.profiles +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.loading_profiles +import bennu.composeapp.generated.resources.profiles import fr.acinq.phoenix.data.WalletId import org.jetbrains.compose.resources.stringResource -import to.curare.compose.ui.composable.widgets.ErrorState -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.wallet.AddProfileRows -import to.curare.compose.ui.composable.widgets.wallet.WalletsSelector -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.view.model.ProfilesViewModel -import to.curare.compose.ui.view.state.ProfilesUIState +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.wallet.AddProfileRows +import com.machankura.bennu.compose.ui.composable.widgets.wallet.WalletsSelector +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.view.model.ProfilesViewModel +import com.machankura.bennu.compose.ui.view.state.ProfilesUIState /** * The profiles on this device -- the one that is open above a divider, the others diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ProposalListScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ProposalListScreen.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ProposalListScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ProposalListScreen.kt index ad9e3ca4..b7690a67 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ProposalListScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ProposalListScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.Arrangement @@ -46,70 +46,70 @@ import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import kotlin.time.Clock import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.types.FrostSigningStage -import to.curare.compose.extensions.toFormattedTimeAndDateString -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.text.ProposedEvent -import to.curare.compose.ui.composable.navigation.routes.FrostSigningRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.model.ProposalListViewModel -import to.curare.compose.ui.view.state.ProposalFilter -import to.curare.compose.ui.view.state.ProposalListUIState -import to.curare.compose.ui.view.state.ProposalState -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.types.FrostSigningStage +import com.machankura.bennu.compose.extensions.toFormattedTimeAndDateString +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.text.ProposedEvent +import com.machankura.bennu.compose.ui.composable.navigation.routes.FrostSigningRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.model.ProposalListViewModel +import com.machankura.bennu.compose.ui.view.state.ProposalFilter +import com.machankura.bennu.compose.ui.view.state.ProposalListUIState +import com.machankura.bennu.compose.ui.view.state.ProposalState +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.abandoned -import curare.composeapp.generated.resources.some_proposals_had_already_settled -import curare.composeapp.generated.resources.asked_again_about_all -import curare.composeapp.generated.resources.ask_all_again -import curare.composeapp.generated.resources.everyone_has_signed_this_session -import curare.composeapp.generated.resources.asked_again_to_sign -import curare.composeapp.generated.resources.asked_again_recently -import curare.composeapp.generated.resources.asked_again -import curare.composeapp.generated.resources.ask_again -import curare.composeapp.generated.resources.you_declined -import curare.composeapp.generated.resources.you_are_signing -import curare.composeapp.generated.resources.you_agreed -import curare.composeapp.generated.resources.signed_by_the_group -import curare.composeapp.generated.resources.of_signatures_are_in -import curare.composeapp.generated.resources.of_members_have_offered_to_sign -import curare.composeapp.generated.resources.needs_your_review -import curare.composeapp.generated.resources.enough_members_took_part_without_you -import curare.composeapp.generated.resources.abandoned_nothing_was_signed -import curare.composeapp.generated.resources.everything_else -import curare.composeapp.generated.resources.filter_all -import curare.composeapp.generated.resources.filter_and_count -import curare.composeapp.generated.resources.being_signed -import curare.composeapp.generated.resources.needs_you -import curare.composeapp.generated.resources.no_proposal_has_been_abandoned -import curare.composeapp.generated.resources.no_proposal_is_being_signed -import curare.composeapp.generated.resources.no_proposal_is_waiting_on_members -import curare.composeapp.generated.resources.nothing_is_waiting_for_your_signature -import curare.composeapp.generated.resources.signed -import curare.composeapp.generated.resources.this_group_has_not_signed_anything_yet -import curare.composeapp.generated.resources.waiting_on_members -import curare.composeapp.generated.resources.proposals -import curare.composeapp.generated.resources.review -import curare.composeapp.generated.resources.this_group_has_not_been_asked_to_sign -import curare.composeapp.generated.resources.waiting_for_you -import curare.composeapp.generated.resources.of_them_could_not_be_read +import bennu.composeapp.generated.resources.abandoned +import bennu.composeapp.generated.resources.some_proposals_had_already_settled +import bennu.composeapp.generated.resources.asked_again_about_all +import bennu.composeapp.generated.resources.ask_all_again +import bennu.composeapp.generated.resources.everyone_has_signed_this_session +import bennu.composeapp.generated.resources.asked_again_to_sign +import bennu.composeapp.generated.resources.asked_again_recently +import bennu.composeapp.generated.resources.asked_again +import bennu.composeapp.generated.resources.ask_again +import bennu.composeapp.generated.resources.you_declined +import bennu.composeapp.generated.resources.you_are_signing +import bennu.composeapp.generated.resources.you_agreed +import bennu.composeapp.generated.resources.signed_by_the_group +import bennu.composeapp.generated.resources.of_signatures_are_in +import bennu.composeapp.generated.resources.of_members_have_offered_to_sign +import bennu.composeapp.generated.resources.needs_your_review +import bennu.composeapp.generated.resources.enough_members_took_part_without_you +import bennu.composeapp.generated.resources.abandoned_nothing_was_signed +import bennu.composeapp.generated.resources.everything_else +import bennu.composeapp.generated.resources.filter_all +import bennu.composeapp.generated.resources.filter_and_count +import bennu.composeapp.generated.resources.being_signed +import bennu.composeapp.generated.resources.needs_you +import bennu.composeapp.generated.resources.no_proposal_has_been_abandoned +import bennu.composeapp.generated.resources.no_proposal_is_being_signed +import bennu.composeapp.generated.resources.no_proposal_is_waiting_on_members +import bennu.composeapp.generated.resources.nothing_is_waiting_for_your_signature +import bennu.composeapp.generated.resources.signed +import bennu.composeapp.generated.resources.this_group_has_not_signed_anything_yet +import bennu.composeapp.generated.resources.waiting_on_members +import bennu.composeapp.generated.resources.proposals +import bennu.composeapp.generated.resources.review +import bennu.composeapp.generated.resources.this_group_has_not_been_asked_to_sign +import bennu.composeapp.generated.resources.waiting_for_you +import bennu.composeapp.generated.resources.of_them_could_not_be_read import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.EmptyState -import to.curare.compose.ui.composable.widgets.ErrorState -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.composable.widgets.rememberNotifier -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.EmptyState +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.composable.widgets.rememberNotifier +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.ConformancePreviews /** * Everything the group has asked its shared key to sign. @@ -819,7 +819,7 @@ private fun ProposalListScreenPreview() { signerId = 1 ) - CurareTheme { + BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { ProposalListScreen( activeUserPublicKey = "u".repeat(64), diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ProposeGroupEventScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ProposeGroupEventScreen.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ProposeGroupEventScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ProposeGroupEventScreen.kt index 310d3743..488eabfc 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ProposeGroupEventScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ProposeGroupEventScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -41,48 +41,48 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.GroupEventProposal -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.text.ProposedEvent -import to.curare.compose.ui.composable.navigation.routes.FrostSigningRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.ErrorState -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.buttons.ExtendedFab -import to.curare.compose.ui.composable.widgets.profile.ProfileAvatar -import to.curare.compose.ui.composable.widgets.rememberNotifier -import to.curare.compose.ui.theme.ConformancePreviews -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.view.model.ProposeGroupEventViewModel -import to.curare.compose.ui.view.state.ProposeGroupEventUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.GroupEventProposal +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.text.ProposedEvent +import com.machankura.bennu.compose.ui.composable.navigation.routes.FrostSigningRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.buttons.ExtendedFab +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar +import com.machankura.bennu.compose.ui.composable.widgets.rememberNotifier +import com.machankura.bennu.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.view.model.ProposeGroupEventViewModel +import com.machankura.bennu.compose.ui.view.state.ProposeGroupEventUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.a_post_needs_something_to_say -import curare.composeapp.generated.resources.an_event_is_a_json_object -import curare.composeapp.generated.resources.an_event_needs_a_kind -import curare.composeapp.generated.resources.content_must_be_text -import curare.composeapp.generated.resources.could_not_ask_the_group_to_sign_this_event -import curare.composeapp.generated.resources.eg_kind_1_tags_content -import curare.composeapp.generated.resources.kind_n -import curare.composeapp.generated.resources.kind_n_has_nowhere_to_go_on_this_screen -import curare.composeapp.generated.resources.paste_an_unsigned_event_for_the_group_to_sign -import curare.composeapp.generated.resources.propose_event -import curare.composeapp.generated.resources.tags_must_be_a_list_of_lists_of_strings -import curare.composeapp.generated.resources.that_is_not_json -import curare.composeapp.generated.resources.the_content_is_not_a_profile -import curare.composeapp.generated.resources.the_group_signs_an_event_so_it_takes_a_quorum -import curare.composeapp.generated.resources.this_group_has_no_shared_key_to_sign_an_event -import curare.composeapp.generated.resources.this_schema_cannot_be_signed_as_it_is -import curare.composeapp.generated.resources.unsigned_event -import curare.composeapp.generated.resources.what_the_group_would_sign +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.a_post_needs_something_to_say +import bennu.composeapp.generated.resources.an_event_is_a_json_object +import bennu.composeapp.generated.resources.an_event_needs_a_kind +import bennu.composeapp.generated.resources.content_must_be_text +import bennu.composeapp.generated.resources.could_not_ask_the_group_to_sign_this_event +import bennu.composeapp.generated.resources.eg_kind_1_tags_content +import bennu.composeapp.generated.resources.kind_n +import bennu.composeapp.generated.resources.kind_n_has_nowhere_to_go_on_this_screen +import bennu.composeapp.generated.resources.paste_an_unsigned_event_for_the_group_to_sign +import bennu.composeapp.generated.resources.propose_event +import bennu.composeapp.generated.resources.tags_must_be_a_list_of_lists_of_strings +import bennu.composeapp.generated.resources.that_is_not_json +import bennu.composeapp.generated.resources.the_content_is_not_a_profile +import bennu.composeapp.generated.resources.the_group_signs_an_event_so_it_takes_a_quorum +import bennu.composeapp.generated.resources.this_group_has_no_shared_key_to_sign_an_event +import bennu.composeapp.generated.resources.this_schema_cannot_be_signed_as_it_is +import bennu.composeapp.generated.resources.unsigned_event +import bennu.composeapp.generated.resources.what_the_group_would_sign import org.jetbrains.compose.resources.stringResource /** @@ -411,7 +411,7 @@ private fun RefusalNotice(refused: GroupEventProposal.Refused) { @ConformancePreviews @Composable private fun ProposeGroupEventScreenPreview() { - CurareTheme { + BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { ProposeGroupEventScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/RecoveryPhraseScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/RecoveryPhraseScreen.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/RecoveryPhraseScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/RecoveryPhraseScreen.kt index 55686505..cf348bb1 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/RecoveryPhraseScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/RecoveryPhraseScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -40,36 +40,36 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import fr.acinq.phoenix.PhoenixGlobal -import to.curare.compose.identity.Identity +import com.machankura.bennu.compose.identity.Identity import kotlinx.coroutines.flow.StateFlow -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.backup_confirmation -import curare.composeapp.generated.resources.bip39_seed_with_the_standard_bip84 -import curare.composeapp.generated.resources.could_not_unlock_your_phrase_please_try -import curare.composeapp.generated.resources.display_recovery_phrase -import curare.composeapp.generated.resources.hide -import curare.composeapp.generated.resources.i_have_saved_my_recovery_phrase_somewhere -import curare.composeapp.generated.resources.i_understand_that_if_i_lose_this_phone_and -import curare.composeapp.generated.resources.keep_this_phrase_safe_do_not_share_it -import curare.composeapp.generated.resources.loading_preferences -import curare.composeapp.generated.resources.lose_this_phone_before_you_do_and_the -import curare.composeapp.generated.resources.no_wallet_is_open_on_this_device_so_there -import curare.composeapp.generated.resources.recovery_phrase -import curare.composeapp.generated.resources.the_recovery_phrase_sometimes_called_a_seed -import curare.composeapp.generated.resources.this_device_holds_no_phrase_for_the_profile -import curare.composeapp.generated.resources.unlocking_your_phrase -import curare.composeapp.generated.resources.word_position -import curare.composeapp.generated.resources.you_have_not_backed_up_your_recovery_phrase +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.backup_confirmation +import bennu.composeapp.generated.resources.bip39_seed_with_the_standard_bip84 +import bennu.composeapp.generated.resources.could_not_unlock_your_phrase_please_try +import bennu.composeapp.generated.resources.display_recovery_phrase +import bennu.composeapp.generated.resources.hide +import bennu.composeapp.generated.resources.i_have_saved_my_recovery_phrase_somewhere +import bennu.composeapp.generated.resources.i_understand_that_if_i_lose_this_phone_and +import bennu.composeapp.generated.resources.keep_this_phrase_safe_do_not_share_it +import bennu.composeapp.generated.resources.loading_preferences +import bennu.composeapp.generated.resources.lose_this_phone_before_you_do_and_the +import bennu.composeapp.generated.resources.no_wallet_is_open_on_this_device_so_there +import bennu.composeapp.generated.resources.recovery_phrase +import bennu.composeapp.generated.resources.the_recovery_phrase_sometimes_called_a_seed +import bennu.composeapp.generated.resources.this_device_holds_no_phrase_for_the_profile +import bennu.composeapp.generated.resources.unlocking_your_phrase +import bennu.composeapp.generated.resources.word_position +import bennu.composeapp.generated.resources.you_have_not_backed_up_your_recovery_phrase import org.jetbrains.compose.resources.stringResource -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.composable.widgets.ErrorState -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.ConformancePreviews -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.view.model.RecoveryPhraseViewModel -import to.curare.compose.ui.view.state.RecoveryPhraseUIState +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.view.model.RecoveryPhraseViewModel +import com.machankura.bennu.compose.ui.view.state.RecoveryPhraseUIState /** * The twelve words behind this profile, shown once and on request. @@ -448,7 +448,7 @@ private fun RecoveryPhraseCheckbox( @ConformancePreviews @Composable private fun RecoveryPhraseScreenPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { @@ -475,7 +475,7 @@ private fun RecoveryPhraseScreenPreview() { @ConformancePreviews @Composable private fun RecoveryPhraseScreenHiddenPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt index 8a082f06..7e053606 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -26,31 +26,31 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.navigation.routes.AddMemberToChatRoomConfirmationRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.profile.ProfileAvatar -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.model.SearchMemberToAddToChatRoomViewModel -import to.curare.compose.ui.view.state.SearchMemberToAddToChatRoomUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.AddMemberToChatRoomConfirmationRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.model.SearchMemberToAddToChatRoomViewModel +import com.machankura.bennu.compose.ui.view.state.SearchMemberToAddToChatRoomUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.currently_no_contacts_please_search_and_chat -import curare.composeapp.generated.resources.search_member_functionality -import curare.composeapp.generated.resources.search_message_functionality_will_be_here +import bennu.composeapp.generated.resources.currently_no_contacts_please_search_and_chat +import bennu.composeapp.generated.resources.search_member_functionality +import bennu.composeapp.generated.resources.search_message_functionality_will_be_here import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class) @Composable @@ -229,7 +229,7 @@ fun SearchMemberToAddToChatRoomScreen( @ConformancePreviews @Composable private fun ChatRoomDetailScreenPreview() { - CurareTheme { + BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SearchResultScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SearchResultScreen.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SearchResultScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SearchResultScreen.kt index 53a14f4f..f6013331 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SearchResultScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SearchResultScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -48,34 +48,34 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.ui.composable.widgets.feed.ListView -import to.curare.compose.ui.view.model.SearchResultType -import to.curare.compose.ui.view.model.SearchResultViewModel -import to.curare.compose.ui.view.state.SearchResultListUIState +import com.machankura.bennu.compose.ui.composable.widgets.feed.ListView +import com.machankura.bennu.compose.ui.view.model.SearchResultType +import com.machankura.bennu.compose.ui.view.model.SearchResultViewModel +import com.machankura.bennu.compose.ui.view.state.SearchResultListUIState import kotlinx.coroutines.launch -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.profiles -import curare.composeapp.generated.resources.search -import curare.composeapp.generated.resources.something_went_wrong -import curare.composeapp.generated.resources.searching_for_on -import curare.composeapp.generated.resources.nothing_matched_that_search -import to.curare.compose.ui.composable.widgets.ErrorState -import to.curare.compose.ui.composable.widgets.EmptyState +import bennu.composeapp.generated.resources.profiles +import bennu.composeapp.generated.resources.search +import bennu.composeapp.generated.resources.something_went_wrong +import bennu.composeapp.generated.resources.searching_for_on +import bennu.composeapp.generated.resources.nothing_matched_that_search +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState +import com.machankura.bennu.compose.ui.composable.widgets.EmptyState import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class) @Composable fun SearchResultScreen( activeUserPublicKey: String, searchQuery: String, - nostrRepository: to.curare.compose.repository.NostrRepository, - searchRepository: to.curare.compose.repository.SearchRepository, + nostrRepository: com.machankura.bennu.compose.repository.NostrRepository, + searchRepository: com.machankura.bennu.compose.repository.SearchRepository, onNavigateBack: () -> Unit, - onNavigateToEvent: (to.curare.compose.ui.composable.navigation.routes.Route) -> Unit + onNavigateToEvent: (com.machankura.bennu.compose.ui.composable.navigation.routes.Route) -> Unit ) { val scope = rememberCoroutineScope() @@ -237,7 +237,7 @@ fun SearchResultScreen( localNostrEvent.ListView( onNavigateToEvent = { nostrEventId -> onNavigateToEvent.invoke( - to.curare.compose.ui.composable.navigation.routes.NostrEventDetailRoute( + com.machankura.bennu.compose.ui.composable.navigation.routes.NostrEventDetailRoute( activeUserPublicKey = activeUserPublicKey, nostrEventId = nostrEventId ) @@ -284,15 +284,15 @@ fun SearchResultScreen( @ConformancePreviews @Composable private fun SearchResultScreenPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { SearchResultScreen( activeUserPublicKey = "", searchQuery = "What happened...", - nostrRepository = to.curare.compose.repository.NostrRepository.NO_OP_NOSTR_REPOSITORY, - searchRepository = to.curare.compose.repository.SearchRepository.NO_OP_SEARCH_REPOSITORY, + nostrRepository = com.machankura.bennu.compose.repository.NostrRepository.NO_OP_NOSTR_REPOSITORY, + searchRepository = com.machankura.bennu.compose.repository.SearchRepository.NO_OP_SEARCH_REPOSITORY, onNavigateBack = {}, onNavigateToEvent = {} ) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SearchScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SearchScreen.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SearchScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SearchScreen.kt index d0ee9312..642a85e3 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SearchScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SearchScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -51,27 +51,27 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.repository.NostrRepository -import to.curare.compose.repository.SearchRepository -import to.curare.compose.ui.composable.navigation.routes.NostrEventDetailRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.navigation.routes.SearchResultRoute -import to.curare.compose.ui.composable.widgets.profile.ProfileAvatar -import to.curare.compose.ui.composable.widgets.profile.ProfileColor -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.model.SearchViewModel -import to.curare.compose.ui.view.state.SearchUIState -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.repository.SearchRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.NostrEventDetailRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.navigation.routes.SearchResultRoute +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileColor +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.model.SearchViewModel +import com.machankura.bennu.compose.ui.view.state.SearchUIState +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.profiles -import curare.composeapp.generated.resources.recents -import curare.composeapp.generated.resources.search -import curare.composeapp.generated.resources.search_hashtags -import curare.composeapp.generated.resources.trending_notes_functionality_coming_soon_in +import bennu.composeapp.generated.resources.profiles +import bennu.composeapp.generated.resources.recents +import bennu.composeapp.generated.resources.search +import bennu.composeapp.generated.resources.search_hashtags +import bennu.composeapp.generated.resources.trending_notes_functionality_coming_soon_in import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class) @Composable @@ -426,7 +426,7 @@ fun SearchScreen( @ConformancePreviews @Composable private fun SearchScreenPreview() { - CurareTheme { + BennuTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SelectChatRoomMembersScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SelectChatRoomMembersScreen.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SelectChatRoomMembersScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SelectChatRoomMembersScreen.kt index bd774536..309972bb 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SelectChatRoomMembersScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SelectChatRoomMembersScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -31,33 +31,33 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.database.model.Profile -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.profile.ProfileAvatar -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.model.SelectChatRoomMembersViewModel -import to.curare.compose.ui.view.state.SelectChatRoomMembersUIState +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.model.SelectChatRoomMembersViewModel +import com.machankura.bennu.compose.ui.view.state.SelectChatRoomMembersUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.next -import curare.composeapp.generated.resources.no_one_selected_yet -import curare.composeapp.generated.resources.no_one_to_add_yet -import curare.composeapp.generated.resources.search_for_people_and_chat_with_them_first -import curare.composeapp.generated.resources.you_can_still_carry_on_and_invite_people -import curare.composeapp.generated.resources.add_people_to -import curare.composeapp.generated.resources.next_with -import curare.composeapp.generated.resources.selected +import bennu.composeapp.generated.resources.next +import bennu.composeapp.generated.resources.no_one_selected_yet +import bennu.composeapp.generated.resources.no_one_to_add_yet +import bennu.composeapp.generated.resources.search_for_people_and_chat_with_them_first +import bennu.composeapp.generated.resources.you_can_still_carry_on_and_invite_people +import bennu.composeapp.generated.resources.add_people_to +import bennu.composeapp.generated.resources.next_with +import bennu.composeapp.generated.resources.selected import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.buttons.ExtendedFab -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.buttons.ExtendedFab +import com.machankura.bennu.compose.ui.theme.ConformancePreviews /** * Second step of group creation: pick who is in the group. @@ -281,7 +281,7 @@ fun SelectChatRoomMembersScreen( @ConformancePreviews @Composable private fun SelectChatRoomMembersScreenPreview() { - CurareTheme { + BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SelectChatRoomTypeScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SelectChatRoomTypeScreen.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SelectChatRoomTypeScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SelectChatRoomTypeScreen.kt index 134bf65c..6b5de38e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SelectChatRoomTypeScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SelectChatRoomTypeScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -39,42 +39,42 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.types.ChatRoomType -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.DkgRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.model.SelectChatRoomTypeViewModel -import to.curare.compose.ui.view.state.SelectChatRoomTypeUIState +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.types.ChatRoomType +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.DkgRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.model.SelectChatRoomTypeViewModel +import com.machankura.bennu.compose.ui.view.state.SelectChatRoomTypeUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.identity.Identity +import com.machankura.bennu.compose.identity.Identity import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.composable.widgets.Decorative -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.create_chat -import curare.composeapp.generated.resources.how_many_admins_have_to_approve_a_change -import curare.composeapp.generated.resources.just_you_for_now -import curare.composeapp.generated.resources.open_chat -import curare.composeapp.generated.resources.this_decides_who_can_change_the_group_later -import curare.composeapp.generated.resources.you_and_1_other -import curare.composeapp.generated.resources.how_should_be_run -import curare.composeapp.generated.resources.of -import curare.composeapp.generated.resources.was_created_but_couldn_t_be_added_yet_invite -import curare.composeapp.generated.resources.was_created_but_its_shared_key_ceremony -import curare.composeapp.generated.resources.you_and_others +import bennu.composeapp.generated.resources.create_chat +import bennu.composeapp.generated.resources.how_many_admins_have_to_approve_a_change +import bennu.composeapp.generated.resources.just_you_for_now +import bennu.composeapp.generated.resources.open_chat +import bennu.composeapp.generated.resources.this_decides_who_can_change_the_group_later +import bennu.composeapp.generated.resources.you_and_1_other +import bennu.composeapp.generated.resources.how_should_be_run +import bennu.composeapp.generated.resources.of +import bennu.composeapp.generated.resources.was_created_but_couldn_t_be_added_yet_invite +import bennu.composeapp.generated.resources.was_created_but_its_shared_key_ceremony +import bennu.composeapp.generated.resources.you_and_others import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.buttons.ExtendedFab -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.buttons.ExtendedFab +import com.machankura.bennu.compose.ui.theme.ConformancePreviews /** * Last step of group creation: convenient (one admin) or robust (everyone @@ -461,7 +461,7 @@ private fun QuorumPicker( @ConformancePreviews @Composable private fun SelectChatRoomTypeScreenPreview() { - CurareTheme { + BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SelectCuratedSchemaTemplateScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SelectCuratedSchemaTemplateScreen.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SelectCuratedSchemaTemplateScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SelectCuratedSchemaTemplateScreen.kt index 1bc26fb9..de2b014e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SelectCuratedSchemaTemplateScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SelectCuratedSchemaTemplateScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -28,31 +28,31 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.text.style.TextOverflow import com.vitorpamplona.quartz.nip01Core.core.HexKey -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.a_list_is_a_schema_what_an_entry_may_contain -import curare.composeapp.generated.resources.fields_colon -import curare.composeapp.generated.resources.pick_a_shape_to_start_from -import curare.composeapp.generated.resources.start_a_list -import curare.composeapp.generated.resources.template_catalogue -import curare.composeapp.generated.resources.template_catalogue_description -import curare.composeapp.generated.resources.template_custom -import curare.composeapp.generated.resources.template_custom_description -import curare.composeapp.generated.resources.template_discussion -import curare.composeapp.generated.resources.template_discussion_description -import curare.composeapp.generated.resources.template_links -import curare.composeapp.generated.resources.template_links_description +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.a_list_is_a_schema_what_an_entry_may_contain +import bennu.composeapp.generated.resources.fields_colon +import bennu.composeapp.generated.resources.pick_a_shape_to_start_from +import bennu.composeapp.generated.resources.start_a_list +import bennu.composeapp.generated.resources.template_catalogue +import bennu.composeapp.generated.resources.template_catalogue_description +import bennu.composeapp.generated.resources.template_custom +import bennu.composeapp.generated.resources.template_custom_description +import bennu.composeapp.generated.resources.template_discussion +import bennu.composeapp.generated.resources.template_discussion_description +import bennu.composeapp.generated.resources.template_links +import bennu.composeapp.generated.resources.template_links_description import org.jetbrains.compose.resources.StringResource import org.jetbrains.compose.resources.stringResource -import to.curare.compose.nostr.curated.CuratedSchemaTemplate -import to.curare.compose.ui.composable.navigation.routes.EditGroupCuratedSchemaRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.ConformancePreviews -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.spacing +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaTemplate +import com.machankura.bennu.compose.ui.composable.navigation.routes.EditGroupCuratedSchemaRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.spacing /** * The first step of adding a curated schema: which shape the list starts from. @@ -234,7 +234,7 @@ private fun CuratedSchemaTemplate.icon(): ImageVector = when (this) { @ConformancePreviews @Composable private fun SelectCuratedSchemaTemplateScreenPreview() { - CurareTheme { + BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { SelectCuratedSchemaTemplateScreen( activeUserPublicKey = "a".repeat(64), diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SelectSubgroupAdminsScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SelectSubgroupAdminsScreen.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SelectSubgroupAdminsScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SelectSubgroupAdminsScreen.kt index 7845ae71..8eebdb79 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SelectSubgroupAdminsScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SelectSubgroupAdminsScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -34,40 +34,40 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextOverflow import androidx.lifecycle.viewmodel.compose.viewModel import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.identity.Identity +import com.machankura.bennu.compose.identity.Identity import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.a_subgroup_needs_at_least_three_admins -import curare.composeapp.generated.resources.admin_of_this_group -import curare.composeapp.generated.resources.anyone_in_this_group_can_run_a_subgroup -import curare.composeapp.generated.resources.has_no_key_package_yet -import curare.composeapp.generated.resources.how_many_admins_have_to_approve_a_change -import curare.composeapp.generated.resources.new_subgroup -import curare.composeapp.generated.resources.of -import curare.composeapp.generated.resources.start_the_key_ceremony -import curare.composeapp.generated.resources.what_is_the_subgroup_called -import curare.composeapp.generated.resources.who_runs_the_subgroup -import curare.composeapp.generated.resources.you_coordinate_this_subgroup +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.a_subgroup_needs_at_least_three_admins +import bennu.composeapp.generated.resources.admin_of_this_group +import bennu.composeapp.generated.resources.anyone_in_this_group_can_run_a_subgroup +import bennu.composeapp.generated.resources.has_no_key_package_yet +import bennu.composeapp.generated.resources.how_many_admins_have_to_approve_a_change +import bennu.composeapp.generated.resources.new_subgroup +import bennu.composeapp.generated.resources.of +import bennu.composeapp.generated.resources.start_the_key_ceremony +import bennu.composeapp.generated.resources.what_is_the_subgroup_called +import bennu.composeapp.generated.resources.who_runs_the_subgroup +import bennu.composeapp.generated.resources.you_coordinate_this_subgroup import org.jetbrains.compose.resources.stringResource -import to.curare.compose.managers.MarmotGroupName -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.DkgRepository -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.composable.widgets.ErrorState -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.buttons.ExtendedFab -import to.curare.compose.ui.composable.widgets.profile.ProfileAvatar -import to.curare.compose.ui.theme.ConformancePreviews -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.view.model.SelectSubgroupAdminsViewModel -import to.curare.compose.ui.view.state.SelectSubgroupAdminsUIState +import com.machankura.bennu.compose.managers.MarmotGroupName +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.DkgRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.buttons.ExtendedFab +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar +import com.machankura.bennu.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.view.model.SelectSubgroupAdminsViewModel +import com.machankura.bennu.compose.ui.view.state.SelectSubgroupAdminsUIState /** * Picks who runs a subgroup, what it is called, and on what quorum. @@ -331,7 +331,7 @@ private fun QuorumStepper( @ConformancePreviews @Composable private fun SelectSubgroupAdminsScreenPreview() { - CurareTheme { + BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { SelectSubgroupAdminsScreen( activeUserPublicKey = "a".repeat(64), diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ShareProfileScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ShareProfileScreen.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ShareProfileScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ShareProfileScreen.kt index 1a09baee..0f603a00 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ShareProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ShareProfileScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -29,33 +29,33 @@ import androidx.compose.ui.platform.LocalClipboardManager import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.intermdiate.LocalNostrEvent -import to.curare.compose.extensions.hexToNpubHrp -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.QRCodeView -import to.curare.compose.ui.composable.widgets.profile.ProfileAvatar -import to.curare.compose.ui.view.model.ShareProfileViewModel -import to.curare.compose.ui.view.state.ShareProfileUIState +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent +import com.machankura.bennu.compose.extensions.hexToNpubHrp +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.QRCodeView +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar +import com.machankura.bennu.compose.ui.view.model.ShareProfileViewModel +import com.machankura.bennu.compose.ui.view.state.ShareProfileUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent -import to.curare.compose.ui.composable.widgets.LocalCanSign -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.composable.widgets.LocalCanSign +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.profile -import curare.composeapp.generated.resources.re_broadcast -import curare.composeapp.generated.resources.something_went_wrong -import curare.composeapp.generated.resources.we_couldn_t_find_the_local_profile_please -import to.curare.compose.ui.composable.widgets.ErrorState +import bennu.composeapp.generated.resources.profile +import bennu.composeapp.generated.resources.re_broadcast +import bennu.composeapp.generated.resources.something_went_wrong +import bennu.composeapp.generated.resources.we_couldn_t_find_the_local_profile_please +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class) @Composable @@ -223,7 +223,7 @@ fun ShareProfileScreen( @ConformancePreviews @Composable private fun UnannouncedProfileScreenPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { @@ -242,7 +242,7 @@ It has survived not only five centuries, but also the leap into electronic types sig = "", kind = MetadataEvent.KIND ), - profile = to.curare.compose.database.model.Profile( + profile = com.machankura.bennu.compose.database.model.Profile( publicKey = "84dee6e676e5bb67b4ad4e042cf70cbd8681155db535942fcc6a0533858a7240", displayName = "John Doe", nostrEventId = "nostrEventId", diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SignInScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SignInScreen.kt similarity index 81% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SignInScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SignInScreen.kt index 4d17e1b2..701f83ee 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SignInScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SignInScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -37,50 +37,50 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.input.KeyboardCapitalization import androidx.compose.ui.text.input.KeyboardType import androidx.lifecycle.viewmodel.compose.viewModel -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.a_password_protected_key_ncryptsec_is_not -import curare.composeapp.generated.resources.enter_a_recovery_phrase_or_an_nsec_to_sign_in -import curare.composeapp.generated.resources.next -import curare.composeapp.generated.resources.paste -import curare.composeapp.generated.resources.recognised_as_a_nostr_secret_key_no_wallet -import curare.composeapp.generated.resources.recognised_as_a_public_key_you_will_see -import curare.composeapp.generated.resources.recognised_as_a_recovery_phrase_it_also -import curare.composeapp.generated.resources.recovery_phrase_nsec_or_npub -import curare.composeapp.generated.resources.sign_in -import curare.composeapp.generated.resources.signed_in -import curare.composeapp.generated.resources.switch_to_it -import curare.composeapp.generated.resources.signing_you_in -import curare.composeapp.generated.resources.that_is_not_a_recovery_phrase_or_a_nostr_key -import curare.composeapp.generated.resources.that_nostr_secret_key_is_not_valid -import curare.composeapp.generated.resources.that_recovery_phrase_is_not_valid_check -import curare.composeapp.generated.resources.the_key_could_not_be_saved_on_this_device -import curare.composeapp.generated.resources.the_words_or_the_key_never_leave_this_device -import curare.composeapp.generated.resources.this_key_is_already_on_this_device -import curare.composeapp.generated.resources.twelve_words_nsec1_or_npub1 -import curare.composeapp.generated.resources.use_a_different_key -import curare.composeapp.generated.resources.you_are_signing_in_as +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.a_password_protected_key_ncryptsec_is_not +import bennu.composeapp.generated.resources.enter_a_recovery_phrase_or_an_nsec_to_sign_in +import bennu.composeapp.generated.resources.next +import bennu.composeapp.generated.resources.paste +import bennu.composeapp.generated.resources.recognised_as_a_nostr_secret_key_no_wallet +import bennu.composeapp.generated.resources.recognised_as_a_public_key_you_will_see +import bennu.composeapp.generated.resources.recognised_as_a_recovery_phrase_it_also +import bennu.composeapp.generated.resources.recovery_phrase_nsec_or_npub +import bennu.composeapp.generated.resources.sign_in +import bennu.composeapp.generated.resources.signed_in +import bennu.composeapp.generated.resources.switch_to_it +import bennu.composeapp.generated.resources.signing_you_in +import bennu.composeapp.generated.resources.that_is_not_a_recovery_phrase_or_a_nostr_key +import bennu.composeapp.generated.resources.that_nostr_secret_key_is_not_valid +import bennu.composeapp.generated.resources.that_recovery_phrase_is_not_valid_check +import bennu.composeapp.generated.resources.the_key_could_not_be_saved_on_this_device +import bennu.composeapp.generated.resources.the_words_or_the_key_never_leave_this_device +import bennu.composeapp.generated.resources.this_key_is_already_on_this_device +import bennu.composeapp.generated.resources.twelve_words_nsec1_or_npub1 +import bennu.composeapp.generated.resources.use_a_different_key +import bennu.composeapp.generated.resources.you_are_signing_in_as import com.vitorpamplona.quartz.nip01Core.core.HexKey import fr.acinq.bitcoin.PrivateKey import fr.acinq.phoenix.data.WalletId import org.jetbrains.compose.resources.stringResource -import to.curare.compose.extensions.hexToNpubHrp -import to.curare.compose.identity.CredentialProblem -import to.curare.compose.identity.IdentityWriter -import to.curare.compose.identity.SignInCredential -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.composable.widgets.ErrorState -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.rememberNotifier -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.ConformancePreviews -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.view.model.SignInToProfileViewModel -import to.curare.compose.ui.view.model.WritingSeedState -import to.curare.compose.ui.view.state.SignInToProfileUIState +import com.machankura.bennu.compose.extensions.hexToNpubHrp +import com.machankura.bennu.compose.identity.CredentialProblem +import com.machankura.bennu.compose.identity.IdentityWriter +import com.machankura.bennu.compose.identity.SignInCredential +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.rememberNotifier +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.view.model.SignInToProfileViewModel +import com.machankura.bennu.compose.ui.view.model.WritingSeedState +import com.machankura.bennu.compose.ui.view.state.SignInToProfileUIState /** * Signing in with a secret the user already has. @@ -325,7 +325,7 @@ private fun problemMessage(problem: CredentialProblem): String = stringResource( @ConformancePreviews @Composable private fun SignInToProfileScreenPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SocialPreconditionScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SocialPreconditionScreen.kt similarity index 81% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SocialPreconditionScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SocialPreconditionScreen.kt index 68cc1fd1..968dc9d8 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SocialPreconditionScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SocialPreconditionScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -20,21 +20,21 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import to.curare.compose.ui.composable.widgets.LocalCanSign -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.composable.widgets.LocalCanSign +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.invite_a_friend -import curare.composeapp.generated.resources.skip_for_now -import curare.composeapp.generated.resources.tell_friends_to_join_you_so_your_feed_stays -import curare.composeapp.generated.resources.view_and_accept_invites_you_may_have -import curare.composeapp.generated.resources.view_invites -import curare.composeapp.generated.resources.who_will_you_be_passing_the_aux_to +import bennu.composeapp.generated.resources.invite_a_friend +import bennu.composeapp.generated.resources.skip_for_now +import bennu.composeapp.generated.resources.tell_friends_to_join_you_so_your_feed_stays +import bennu.composeapp.generated.resources.view_and_accept_invites_you_may_have +import bennu.composeapp.generated.resources.view_invites +import bennu.composeapp.generated.resources.who_will_you_be_passing_the_aux_to import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.buttons.ExtendedFab -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.buttons.ExtendedFab +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @Composable fun SocialPreconditionScreen( @@ -124,7 +124,7 @@ fun SocialPreconditionScreen( @ConformancePreviews @Composable private fun SocialPreconditionScreenPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SovereignWalletStartupScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SovereignWalletStartupScreen.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SovereignWalletStartupScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SovereignWalletStartupScreen.kt index b97966f1..edab641a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SovereignWalletStartupScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SovereignWalletStartupScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.* import androidx.compose.material3.HorizontalDivider @@ -16,7 +16,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator import fr.acinq.phoenix.data.ListWalletState import fr.acinq.phoenix.data.WalletId import fr.acinq.phoenix.managers.DataStoreManager @@ -25,30 +25,30 @@ import fr.acinq.phoenix.utils.preferences.UserPrefs import fr.acinq.phoenix.utils.preferences.UserWalletMetadata import fr.acinq.phoenix.utils.preferences.getByWalletIdOrDefault import kotlinx.coroutines.flow.first -import to.curare.compose.identity.Identity -import to.curare.compose.identity.IdentityKind -import to.curare.compose.identity.StoredIdentity -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.widgets.wallet.AddProfileRows -import to.curare.compose.ui.composable.widgets.wallet.rememberProfilesOf -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.identity.Identity +import com.machankura.bennu.compose.identity.IdentityKind +import com.machankura.bennu.compose.identity.StoredIdentity +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.widgets.wallet.AddProfileRows +import com.machankura.bennu.compose.ui.composable.widgets.wallet.rememberProfilesOf +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.choose_a_profile -import curare.composeapp.generated.resources.could_not_load_the_profiles_on_this_device -import curare.composeapp.generated.resources.decrypting -import curare.composeapp.generated.resources.loading_preferences -import curare.composeapp.generated.resources.lock_prompt_coming_soon -import curare.composeapp.generated.resources.opening_profile -import curare.composeapp.generated.resources.preparing_profiles -import curare.composeapp.generated.resources.starting_wallet -import curare.composeapp.generated.resources.startup_error -import curare.composeapp.generated.resources.unlock_to_continue -import to.curare.compose.ui.view.state.StartupChoice +import bennu.composeapp.generated.resources.choose_a_profile +import bennu.composeapp.generated.resources.could_not_load_the_profiles_on_this_device +import bennu.composeapp.generated.resources.decrypting +import bennu.composeapp.generated.resources.loading_preferences +import bennu.composeapp.generated.resources.lock_prompt_coming_soon +import bennu.composeapp.generated.resources.opening_profile +import bennu.composeapp.generated.resources.preparing_profiles +import bennu.composeapp.generated.resources.starting_wallet +import bennu.composeapp.generated.resources.startup_error +import bennu.composeapp.generated.resources.unlock_to_continue +import com.machankura.bennu.compose.ui.view.state.StartupChoice @Composable fun SovereignWalletStartupScreen( - sovereignWalletViewModel: to.curare.compose.ui.view.model.SovereignWalletViewModel, + sovereignWalletViewModel: com.machankura.bennu.compose.ui.view.model.SovereignWalletViewModel, /** For the selector's rows: the nostr profile of each listed key, where the device has one. */ nostrRepository: NostrRepository, onNavigateToWalletLandingPage: () -> Unit, @@ -58,8 +58,8 @@ fun SovereignWalletStartupScreen( onNavigateToCreateProfile: () -> Unit, forceWalletId: WalletId?, ) { - val sovereignWalletStartupViewModel = viewModel( - factory = to.curare.compose.ui.view.model.SovereignWalletStartupViewModel.factory( + val sovereignWalletStartupViewModel = viewModel( + factory = com.machankura.bennu.compose.ui.view.model.SovereignWalletStartupViewModel.factory( phoenixGlobal = sovereignWalletViewModel.phoenixGlobal, ) ) @@ -130,7 +130,7 @@ fun SovereignWalletStartupScreen( } else -> { when (val startupState = sovereignWalletStartupViewModel.state.value) { - is to.curare.compose.ui.view.model.StartupViewState.Init -> { + is com.machankura.bennu.compose.ui.view.model.StartupViewState.Init -> { // The table is StartupChoice's, where it can be read and // tested; the one thing decided here is that the saved default // is only a default when it names a wallet. @@ -151,7 +151,7 @@ fun SovereignWalletStartupScreen( publicKeys = availableIdentities.values.map { it.nostrPublicKey }, nostrRepository = nostrRepository, ) - to.curare.compose.ui.composable.widgets.wallet.WalletsSelector( + com.machankura.bennu.compose.ui.composable.widgets.wallet.WalletsSelector( wallets = availableIdentities, walletsMetadata = availableWalletMetadata, activeWalletId = null, @@ -255,7 +255,7 @@ fun SovereignWalletStartupScreen( } } } - is to.curare.compose.ui.view.model.StartupViewState.StartingBusiness -> { + is com.machankura.bennu.compose.ui.view.model.StartupViewState.StartingBusiness -> { // The one place the word "wallet" stays: only the branch with // a wallet attached reaches this state, and what is starting is // a Lightning node. A bare-key profile never sees it. @@ -263,12 +263,12 @@ fun SovereignWalletStartupScreen( text = stringResource(Res.string.starting_wallet) ) } - is to.curare.compose.ui.view.model.StartupViewState.BusinessActive -> { + is com.machankura.bennu.compose.ui.view.model.StartupViewState.BusinessActive -> { LoadingDataIndicator( text = stringResource(Res.string.opening_profile) ) } - is to.curare.compose.ui.view.model.StartupViewState.Error -> { + is com.machankura.bennu.compose.ui.view.model.StartupViewState.Error -> { Column(horizontalAlignment = Alignment.CenterHorizontally) { Text( @@ -276,7 +276,7 @@ fun SovereignWalletStartupScreen( ) when (startupState) { - is to.curare.compose.ui.view.model.StartupViewState.Error.Generic -> { + is com.machankura.bennu.compose.ui.view.model.StartupViewState.Error.Generic -> { startupState.cause?.message?.let { message -> Text( text = message, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/TranslateChunkScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/TranslateChunkScreen.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/TranslateChunkScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/TranslateChunkScreen.kt index b68173aa..d6c751fb 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/TranslateChunkScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/TranslateChunkScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -31,35 +31,35 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.MantraChunk -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.repository.MantraRepository -import to.curare.compose.ui.composable.navigation.routes.FrostSigningRoute -import to.curare.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.model.TranslateChunkViewModel -import to.curare.compose.ui.view.state.TranslateChunkUIState -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.MantraChunk +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.repository.MantraRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.FrostSigningRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ImplementationPendingRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.model.TranslateChunkViewModel +import com.machankura.bennu.compose.ui.view.state.TranslateChunkUIState +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.enter_the_translation_for_this_chunk -import curare.composeapp.generated.resources.original -import curare.composeapp.generated.resources.propose_translation -import curare.composeapp.generated.resources.translate_chunk -import curare.composeapp.generated.resources.translated_text -import curare.composeapp.generated.resources.translation +import bennu.composeapp.generated.resources.enter_the_translation_for_this_chunk +import bennu.composeapp.generated.resources.original +import bennu.composeapp.generated.resources.propose_translation +import bennu.composeapp.generated.resources.translate_chunk +import bennu.composeapp.generated.resources.translated_text +import bennu.composeapp.generated.resources.translation import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.composable.widgets.buttons.ExtendedFab -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.composable.widgets.buttons.ExtendedFab +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -230,7 +230,7 @@ fun TranslateChunkScreen( @ConformancePreviews @Composable private fun TranslateChunkScreenPreview() { - CurareTheme { + BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { TranslateChunkScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/TranslationArtifactVersionDetailScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/TranslationArtifactVersionDetailScreen.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/TranslationArtifactVersionDetailScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/TranslationArtifactVersionDetailScreen.kt index fd6e5f4c..2e04ac4e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/TranslationArtifactVersionDetailScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/TranslationArtifactVersionDetailScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -31,35 +31,35 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.database.model.MantraTranslationArtifactVersion -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.repository.MantraRepository -import to.curare.compose.ui.composable.navigation.routes.FrostSigningRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.navigation.routes.TranslationChapterRoute -import to.curare.compose.ui.composable.widgets.DetailRow -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.model.TranslationArtifactVersionDetailViewModel -import to.curare.compose.ui.view.state.TranslationArtifactVersionDetailUIState -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.database.model.MantraTranslationArtifactVersion +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.repository.MantraRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.FrostSigningRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.navigation.routes.TranslationChapterRoute +import com.machankura.bennu.compose.ui.composable.widgets.DetailRow +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.model.TranslationArtifactVersionDetailViewModel +import com.machankura.bennu.compose.ui.view.state.TranslationArtifactVersionDetailUIState +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.chapters -import curare.composeapp.generated.resources.details -import curare.composeapp.generated.resources.no_chapters -import curare.composeapp.generated.resources.propose -import curare.composeapp.generated.resources.this_group_has_no_shared_key_so_it_cannot -import curare.composeapp.generated.resources.translation_detail -import curare.composeapp.generated.resources.chapter -import curare.composeapp.generated.resources.chunks_translated +import bennu.composeapp.generated.resources.chapters +import bennu.composeapp.generated.resources.details +import bennu.composeapp.generated.resources.no_chapters +import bennu.composeapp.generated.resources.propose +import bennu.composeapp.generated.resources.this_group_has_no_shared_key_so_it_cannot +import bennu.composeapp.generated.resources.translation_detail +import bennu.composeapp.generated.resources.chapter +import bennu.composeapp.generated.resources.chunks_translated import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -279,7 +279,7 @@ fun TranslationArtifactVersionDetailScreen( @ConformancePreviews @Composable private fun TranslationArtifactVersionDetailScreenPreview() { - CurareTheme { + BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { TranslationArtifactVersionDetailScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/TranslationChapterScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/TranslationChapterScreen.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/TranslationChapterScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/TranslationChapterScreen.kt index bb92ae24..2c1a0b88 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/TranslationChapterScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/TranslationChapterScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -35,26 +35,26 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.database.model.MantraChunk -import to.curare.compose.repository.MantraRepository -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.navigation.routes.TranslateChunkRoute -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.model.TranslationChapterViewModel -import to.curare.compose.ui.view.state.ChunkTranslationPair -import to.curare.compose.ui.view.state.TranslationChapterUIState -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.database.model.MantraChunk +import com.machankura.bennu.compose.repository.MantraRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.navigation.routes.TranslateChunkRoute +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.model.TranslationChapterViewModel +import com.machankura.bennu.compose.ui.view.state.ChunkTranslationPair +import com.machankura.bennu.compose.ui.view.state.TranslationChapterUIState +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.chapter_translation -import curare.composeapp.generated.resources.this_chapter_has_no_chunks +import bennu.composeapp.generated.resources.chapter_translation +import bennu.composeapp.generated.resources.this_chapter_has_no_chunks import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -237,7 +237,7 @@ private fun TableRow( @ConformancePreviews @Composable private fun TranslationChapterScreenPreview() { - CurareTheme { + BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { TranslationChapterScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnannouncedProfileScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/UnannouncedProfileScreen.kt similarity index 79% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnannouncedProfileScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/UnannouncedProfileScreen.kt index 6d185bc5..56f181e9 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnannouncedProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/UnannouncedProfileScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -16,15 +16,15 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.everything_is_cryptographical_sound_just -import curare.composeapp.generated.resources.torch_will_be_broadcast_what_you_publish_to +import bennu.composeapp.generated.resources.everything_is_cryptographical_sound_just +import bennu.composeapp.generated.resources.torch_will_be_broadcast_what_you_publish_to import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable @@ -61,7 +61,7 @@ fun UnannouncedProfileScreen() { Spacer( modifier = Modifier.weight(1f) ) - to.curare.compose.ui.composable.widgets.LoadingDataIndicator( + com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator( fillScreen = false ) @@ -79,7 +79,7 @@ fun UnannouncedProfileScreen() { @ConformancePreviews @Composable private fun UnannouncedProfileScreenPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnindexedProfileScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/UnindexedProfileScreen.kt similarity index 79% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnindexedProfileScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/UnindexedProfileScreen.kt index 33f72bc2..c1d2e059 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnindexedProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/UnindexedProfileScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -16,15 +16,15 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.events_are_indexed_so_that_we_can_deliver_a -import curare.composeapp.generated.resources.everything_is_cryptographical_sound_just_2 +import bennu.composeapp.generated.resources.events_are_indexed_so_that_we_can_deliver_a +import bennu.composeapp.generated.resources.everything_is_cryptographical_sound_just_2 import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable @@ -61,7 +61,7 @@ fun UnindexedProfileScreen() { Spacer( modifier = Modifier.weight(1f) ) - to.curare.compose.ui.composable.widgets.LoadingDataIndicator( + com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator( fillScreen = false ) @@ -79,7 +79,7 @@ fun UnindexedProfileScreen() { @ConformancePreviews @Composable private fun UnannouncedProfileScreenPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnqueuedProfileScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/UnqueuedProfileScreen.kt similarity index 79% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnqueuedProfileScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/UnqueuedProfileScreen.kt index 57583466..a82c22a9 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnqueuedProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/UnqueuedProfileScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -16,15 +16,15 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.all_broadcasts_are_queued_so_that_we_can -import curare.composeapp.generated.resources.everything_is_cryptographical_sound_just_3 +import bennu.composeapp.generated.resources.all_broadcasts_are_queued_so_that_we_can +import bennu.composeapp.generated.resources.everything_is_cryptographical_sound_just_3 import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable @@ -61,7 +61,7 @@ fun UnqueuedProfileScreen() { Spacer( modifier = Modifier.weight(1f) ) - to.curare.compose.ui.composable.widgets.LoadingDataIndicator( + com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator( fillScreen = false ) @@ -79,7 +79,7 @@ fun UnqueuedProfileScreen() { @ConformancePreviews @Composable private fun UnannouncedProfileScreenPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnqueuedProfileSynchronizationScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/UnqueuedProfileSynchronizationScreen.kt similarity index 73% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnqueuedProfileSynchronizationScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/UnqueuedProfileSynchronizationScreen.kt index 701a0aca..2e11b45b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnqueuedProfileSynchronizationScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/UnqueuedProfileSynchronizationScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -18,25 +18,25 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.we_are_looking_for_your_profile_on_as_many -import curare.composeapp.generated.resources.we_are_searching_the_internet_to_find_your +import bennu.composeapp.generated.resources.we_are_looking_for_your_profile_on_as_many +import bennu.composeapp.generated.resources.we_are_searching_the_internet_to_find_your import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable fun UnqueuedProfileSynchronizationScreen( unsignedNostrEventId: Long, profilePublicKey: String, - nostrRepository: to.curare.compose.repository.NostrRepository + nostrRepository: com.machankura.bennu.compose.repository.NostrRepository ) { - val unqueuedProfileSynchronizationViewModel: to.curare.compose.ui.view.model.UnqueuedProfileSynchronizationViewModel = viewModel( - factory = to.curare.compose.ui.view.model.UnqueuedProfileSynchronizationViewModel.factory( + val unqueuedProfileSynchronizationViewModel: com.machankura.bennu.compose.ui.view.model.UnqueuedProfileSynchronizationViewModel = viewModel( + factory = com.machankura.bennu.compose.ui.view.model.UnqueuedProfileSynchronizationViewModel.factory( unsignedNostrEventId = unsignedNostrEventId, profilePublicKey = profilePublicKey, nostrRepository = nostrRepository @@ -72,7 +72,7 @@ fun UnqueuedProfileSynchronizationScreen( textAlign = TextAlign.Center ) - to.curare.compose.ui.composable.widgets.LoadingDataIndicator( + com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator( fillScreen = false ) @@ -91,14 +91,14 @@ fun UnqueuedProfileSynchronizationScreen( @ConformancePreviews @Composable private fun UnqueuedProfileSynchronizationScreenPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { UnqueuedProfileSynchronizationScreen( unsignedNostrEventId = 2, profilePublicKey = "npub is for living.", - nostrRepository = to.curare.compose.repository.NostrRepository.NO_OP_NOSTR_REPOSITORY + nostrRepository = com.machankura.bennu.compose.repository.NostrRepository.NO_OP_NOSTR_REPOSITORY ) } } diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnsignedProfileScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/UnsignedProfileScreen.kt similarity index 78% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnsignedProfileScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/UnsignedProfileScreen.kt index d181f86c..5d37c58a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnsignedProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/UnsignedProfileScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -16,15 +16,15 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.as_long_as_you_control_your_keys_there_can -import curare.composeapp.generated.resources.your_profile_is_almost_ready_just_getting_it +import bennu.composeapp.generated.resources.as_long_as_you_control_your_keys_there_can +import bennu.composeapp.generated.resources.your_profile_is_almost_ready_just_getting_it import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable @@ -58,7 +58,7 @@ fun UnsignedProfileScreen() { textAlign = TextAlign.Center ) - to.curare.compose.ui.composable.widgets.LoadingDataIndicator( + com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator( fillScreen = false ) @@ -73,7 +73,7 @@ fun UnsignedProfileScreen() { @ConformancePreviews @Composable private fun UnsignedProfileScreenPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnsyncedProfileScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/UnsyncedProfileScreen.kt similarity index 83% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnsyncedProfileScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/UnsyncedProfileScreen.kt index fd3b1322..a1198b44 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnsyncedProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/UnsyncedProfileScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -33,40 +33,40 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.style.TextAlign import androidx.lifecycle.viewmodel.compose.viewModel -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.enter_a_name_for_the_profile -import curare.composeapp.generated.resources.enter_the_name_you_want_to_use_for_your_2 -import curare.composeapp.generated.resources.introduce_yourself -import curare.composeapp.generated.resources.it_may_be_new_or_it_may_live_on_relays_we -import curare.composeapp.generated.resources.name_eg_alan_turing -import curare.composeapp.generated.resources.set_up_a_profile -import curare.composeapp.generated.resources.try_again -import curare.composeapp.generated.resources.use_a_different_key -import curare.composeapp.generated.resources.use_a_different_key_question -import curare.composeapp.generated.resources.switch_profile -import curare.composeapp.generated.resources.could_not_sign_out_please_try_again -import to.curare.compose.ui.composable.widgets.dialogs.SignOutOfReadOnlyDialog -import to.curare.compose.ui.composable.widgets.rememberNotifier -import to.curare.compose.ui.view.model.SignOutViewModel +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.enter_a_name_for_the_profile +import bennu.composeapp.generated.resources.enter_the_name_you_want_to_use_for_your_2 +import bennu.composeapp.generated.resources.introduce_yourself +import bennu.composeapp.generated.resources.it_may_be_new_or_it_may_live_on_relays_we +import bennu.composeapp.generated.resources.name_eg_alan_turing +import bennu.composeapp.generated.resources.set_up_a_profile +import bennu.composeapp.generated.resources.try_again +import bennu.composeapp.generated.resources.use_a_different_key +import bennu.composeapp.generated.resources.use_a_different_key_question +import bennu.composeapp.generated.resources.switch_profile +import bennu.composeapp.generated.resources.could_not_sign_out_please_try_again +import com.machankura.bennu.compose.ui.composable.widgets.dialogs.SignOutOfReadOnlyDialog +import com.machankura.bennu.compose.ui.composable.widgets.rememberNotifier +import com.machankura.bennu.compose.ui.view.model.SignOutViewModel import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.rememberCoroutineScope -import curare.composeapp.generated.resources.we_are_looking_for_your_profile_on_as_many -import curare.composeapp.generated.resources.we_are_searching_the_internet_to_find_your -import curare.composeapp.generated.resources.we_could_not_find_a_profile_for_this_key -import curare.composeapp.generated.resources.what_should_people_know_about_you +import bennu.composeapp.generated.resources.we_are_looking_for_your_profile_on_as_many +import bennu.composeapp.generated.resources.we_are_searching_the_internet_to_find_your +import bennu.composeapp.generated.resources.we_could_not_find_a_profile_for_this_key +import bennu.composeapp.generated.resources.what_should_people_know_about_you import org.jetbrains.compose.resources.stringResource -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.composable.widgets.EmptyState -import to.curare.compose.ui.composable.widgets.LocalCanSign -import to.curare.compose.ui.composable.widgets.LoadingDataIndicator -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.ScreenStateTransition -import to.curare.compose.ui.theme.ConformancePreviews -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.view.model.UnsyncedProfileViewModel -import to.curare.compose.ui.view.state.UnsyncedProfileUIState +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.composable.widgets.EmptyState +import com.machankura.bennu.compose.ui.composable.widgets.LocalCanSign +import com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.ScreenStateTransition +import com.machankura.bennu.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.view.model.UnsyncedProfileViewModel +import com.machankura.bennu.compose.ui.view.state.UnsyncedProfileUIState /** * Waiting for a sign-in sync -- and, since Phase 5 of docs/nsec-sign-in.md, able to say @@ -305,7 +305,7 @@ private fun NotFound( @ConformancePreviews @Composable private fun UnsyncedProfileScreenPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/WriteNewNoteScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/WriteNewNoteScreen.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/WriteNewNoteScreen.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/WriteNewNoteScreen.kt index b1654ffd..6bb36108 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/WriteNewNoteScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/WriteNewNoteScreen.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.layout.Arrangement @@ -41,43 +41,43 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.extensions.toFormattedTimeAndDateString +import com.machankura.bennu.compose.extensions.toFormattedTimeAndDateString import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent import kotlin.time.Clock -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.new_note -import curare.composeapp.generated.resources.next -import curare.composeapp.generated.resources.something_went_wrong_and_we_were_unable_to_3 -import curare.composeapp.generated.resources.the_above_will_be_your_new_note -import curare.composeapp.generated.resources.transmit_note -import curare.composeapp.generated.resources.type_out_what_you_would_like_to_publish -import curare.composeapp.generated.resources.what_s_your_comment_on_the_below -import curare.composeapp.generated.resources.what_s_your_reply_to_the_above -import curare.composeapp.generated.resources.what_vibrations_do_you_want_to_send_out -import curare.composeapp.generated.resources.replying_to +import bennu.composeapp.generated.resources.new_note +import bennu.composeapp.generated.resources.next +import bennu.composeapp.generated.resources.something_went_wrong_and_we_were_unable_to_3 +import bennu.composeapp.generated.resources.the_above_will_be_your_new_note +import bennu.composeapp.generated.resources.transmit_note +import bennu.composeapp.generated.resources.type_out_what_you_would_like_to_publish +import bennu.composeapp.generated.resources.what_s_your_comment_on_the_below +import bennu.composeapp.generated.resources.what_s_your_reply_to_the_above +import bennu.composeapp.generated.resources.what_vibrations_do_you_want_to_send_out +import bennu.composeapp.generated.resources.replying_to import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class) @Composable fun WriteNewNoteScreen( activeUserPublicKey: HexKey, - initialWriteNewNoteUIState: to.curare.compose.ui.view.state.WriteNewNoteUIState = to.curare.compose.ui.view.state.WriteNewNoteUIState.Loading, + initialWriteNewNoteUIState: com.machankura.bennu.compose.ui.view.state.WriteNewNoteUIState = com.machankura.bennu.compose.ui.view.state.WriteNewNoteUIState.Loading, replyToNostrEventId: HexKey?, quotedNostrEventId: HexKey?, onNostrEventPublished: () -> Unit, onNavigateToNostrEvent: (HexKey) -> Unit, onNavigateBack: () -> Unit, - nostrRepository: to.curare.compose.repository.NostrRepository + nostrRepository: com.machankura.bennu.compose.repository.NostrRepository ) { - val writeNewNoteViewModel: to.curare.compose.ui.view.model.WriteNewNoteViewModel = viewModel ( - factory = to.curare.compose.ui.view.model.WriteNewNoteViewModel.factory( + val writeNewNoteViewModel: com.machankura.bennu.compose.ui.view.model.WriteNewNoteViewModel = viewModel ( + factory = com.machankura.bennu.compose.ui.view.model.WriteNewNoteViewModel.factory( activeUserPublicKey = activeUserPublicKey, replyToNostrEventId = replyToNostrEventId, quotedNostrEventId = quotedNostrEventId, @@ -114,10 +114,10 @@ fun WriteNewNoteScreen( ) { when (val writeNewNoteUIState = writeNewNoteViewModel.writeNewNoteUIState) { - is to.curare.compose.ui.view.state.WriteNewNoteUIState.Loading -> { - to.curare.compose.ui.composable.widgets.LoadingDataIndicator() + is com.machankura.bennu.compose.ui.view.state.WriteNewNoteUIState.Loading -> { + com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator() } - is to.curare.compose.ui.view.state.WriteNewNoteUIState.InputPrompt -> { + is com.machankura.bennu.compose.ui.view.state.WriteNewNoteUIState.InputPrompt -> { val listState = rememberLazyListState() @@ -196,7 +196,7 @@ fun WriteNewNoteScreen( ) }, leadingIcon = { - to.curare.compose.ui.composable.widgets.profile.ProfileAvatar( + com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar( profile = writeNewNoteUIState.localProfile.profile, size = 35.dp ) @@ -213,8 +213,8 @@ fun WriteNewNoteScreen( }, outputTransformation = OutputTransformation { val content = originalText.toString() - val nostrProfiles = to.curare.compose.ui.composable.widgets.content.ContentParser.parse(content.trimEnd('\n', '\r'), emptyMap(), emptyMap(), trimBlankLines = true) - .filterIsInstance() + val nostrProfiles = com.machankura.bennu.compose.ui.composable.widgets.content.ContentParser.parse(content.trimEnd('\n', '\r'), emptyMap(), emptyMap(), trimBlankLines = true) + .filterIsInstance() // TODO: We might want to order these profiles by the startIndex so that we can replace the better if (writeNewNoteViewModel.mentionedProfiles.isNotEmpty()) { @@ -230,7 +230,7 @@ fun WriteNewNoteScreen( addStyle( SpanStyle( - color = to.curare.compose.ui.composable.widgets.profile.ProfileColor.fromPublicKey(mentionedProfile.publicKey) + color = com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileColor.fromPublicKey(mentionedProfile.publicKey) ), nostrProfile.startIndex, nostrProfile.startIndex + profileMention.length @@ -257,7 +257,7 @@ fun WriteNewNoteScreen( ) }, leadingIcon = { - to.curare.compose.ui.composable.widgets.profile.ProfileAvatar( + com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar( profile = profile ) }, @@ -312,7 +312,7 @@ fun WriteNewNoteScreen( } } - is to.curare.compose.ui.view.state.WriteNewNoteUIState.ConfirmNote-> { + is com.machankura.bennu.compose.ui.view.state.WriteNewNoteUIState.ConfirmNote-> { val listState = rememberLazyListState() @@ -362,7 +362,7 @@ fun WriteNewNoteScreen( ) } - to.curare.compose.ui.composable.widgets.profile.ProfileAvatar( + com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar( profile = writeNewNoteUIState.localProfile.profile ) @@ -374,9 +374,9 @@ fun WriteNewNoteScreen( ) } - to.curare.compose.ui.composable.widgets.content.RichContent( + com.machankura.bennu.compose.ui.composable.widgets.content.RichContent( // Hack to have the thing rendered for a preview... - nostrEvent = to.curare.compose.database.model.NostrEvent( + nostrEvent = com.machankura.bennu.compose.database.model.NostrEvent( id = "", content = writeNewNoteUIState.text, sig = "", @@ -387,8 +387,8 @@ fun WriteNewNoteScreen( ), localQuotedNostrEvent = null, mentionedProfiles = writeNewNoteViewModel.mentionableProfiles.map { - to.curare.compose.database.model.intermdiate.LocalMention( - mention = to.curare.compose.database.model.Mention( + com.machankura.bennu.compose.database.model.intermdiate.LocalMention( + mention = com.machankura.bennu.compose.database.model.Mention( mentionedPublicKey = it.publicKey, mentioningNostrEventId = "" ), @@ -457,7 +457,7 @@ fun WriteNewNoteScreen( } } - is to.curare.compose.ui.view.state.WriteNewNoteUIState.Error -> { + is com.machankura.bennu.compose.ui.view.state.WriteNewNoteUIState.Error -> { Spacer( modifier = Modifier.weight(1f) ) @@ -483,7 +483,7 @@ fun WriteNewNoteScreen( @ConformancePreviews @Composable private fun WriteNewNoteScreenPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { @@ -492,10 +492,10 @@ private fun WriteNewNoteScreenPreview() { replyToNostrEventId = null, quotedNostrEventId = null, initialWriteNewNoteUIState = - to.curare.compose.ui.view.state.WriteNewNoteUIState.InputPrompt( + com.machankura.bennu.compose.ui.view.state.WriteNewNoteUIState.InputPrompt( // text = "Yes, I did it. So WHAT?!", - inReplyToNostrEvent = to.curare.compose.database.model.intermdiate.LocalNostrEvent( - nostrEvent = to.curare.compose.database.model.NostrEvent( + inReplyToNostrEvent = com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent( + nostrEvent = com.machankura.bennu.compose.database.model.NostrEvent( id = "eventId", pubKey = "publicKey", content = """Lorem Ipsum is simply dummy text of the printing and typesetting industry. @@ -507,14 +507,14 @@ It has survived not only five centuries, but also the leap into electronic types sig = "", kind = TextNoteEvent.KIND ), - profile = to.curare.compose.database.model.Profile( + profile = com.machankura.bennu.compose.database.model.Profile( publicKey = "pubKey", displayName = "John Doe", nostrEventId = "nostrEventId" ), ), - localProfile = to.curare.compose.database.model.intermdiate.LocalProfileWithFollowing( - nostrEvent = to.curare.compose.database.model.NostrEvent( + localProfile = com.machankura.bennu.compose.database.model.intermdiate.LocalProfileWithFollowing( + nostrEvent = com.machankura.bennu.compose.database.model.NostrEvent( id = "eventId", pubKey = "publicKey", content = """Lorem Ipsum is simply dummy text of the printing and typesetting industry. @@ -526,7 +526,7 @@ It has survived not only five centuries, but also the leap into electronic types sig = "", kind = TextNoteEvent.KIND ), - profile = to.curare.compose.database.model.Profile( + profile = com.machankura.bennu.compose.database.model.Profile( publicKey = "pubKey", displayName = "John Doe", nip05 = "john@doe.com", @@ -538,7 +538,7 @@ It has survived not only five centuries, but also the leap into electronic types onNostrEventPublished = {}, onNavigateToNostrEvent = {}, onNavigateBack = {}, - nostrRepository = to.curare.compose.repository.NostrRepository.NO_OP_NOSTR_REPOSITORY + nostrRepository = com.machankura.bennu.compose.repository.NostrRepository.NO_OP_NOSTR_REPOSITORY ) } } diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/CurareNavHost.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/BennuNavHost.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/CurareNavHost.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/BennuNavHost.kt index ed571eb4..8600d16e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/CurareNavHost.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/BennuNavHost.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation +package com.machankura.bennu.compose.ui.composable.navigation import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material3.Surface @@ -13,7 +13,7 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import to.curare.compose.AppLifecycle +import com.machankura.bennu.compose.AppLifecycle import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleEventObserver import androidx.lifecycle.compose.LocalLifecycleOwner @@ -23,120 +23,120 @@ import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.toRoute -import to.curare.compose.CurareGlobal -import to.curare.compose.database.repository.DatabaseChatRepository -import to.curare.compose.database.repository.DatabaseDkgRepository -import to.curare.compose.database.repository.DatabaseFrostSigningRepository -import to.curare.compose.database.repository.DatabaseMarmotRepository -import to.curare.compose.database.repository.DatabaseNostrRepository -import to.curare.compose.database.repository.DatabaseSearchRepository -import to.curare.compose.managers.AuxDatabaseManager -import to.curare.compose.ui.composable.ActiveProfileScreen -import to.curare.compose.ui.composable.AddMemberToChatRoomConfirmationScreen -import to.curare.compose.ui.composable.ChatRoomCreationScreen -import to.curare.compose.ui.composable.ChatRoomDetailScreen -import to.curare.compose.ui.composable.ChatRoomMessagingScreen -import to.curare.compose.ui.composable.CreateProfileScreen -import to.curare.compose.ui.composable.DkgJoinApprovalScreen -import to.curare.compose.ui.composable.DkgRitualScreen -import to.curare.compose.ui.composable.DkgRound1ApprovalScreen -import to.curare.compose.ui.composable.DkgRound2ApprovalScreen -import to.curare.compose.ui.composable.EditGroupNostrProfileScreen -import to.curare.compose.ui.composable.AddGroupPostScreen -import to.curare.compose.ui.composable.AcceptCuratedSuggestionScreen -import to.curare.compose.ui.composable.EditGroupCuratedSchemaScreen -import to.curare.compose.ui.composable.SelectCuratedSchemaTemplateScreen -import to.curare.compose.ui.composable.BroadcastGroupSignedEventScreen -import to.curare.compose.ui.composable.CuratedSuggestionListScreen -import to.curare.compose.ui.composable.ProposeGroupEventScreen -import to.curare.compose.ui.composable.EditGroupRelaysScreen -import to.curare.compose.ui.composable.GroupNostrProfileScreen -import to.curare.compose.ui.composable.GroupRelaysScreen -import to.curare.compose.ui.composable.GroupPostsScreen -import to.curare.compose.ui.composable.GroupCuratedSchemasScreen -import to.curare.compose.ui.composable.GroupCuratedEntriesScreen -import to.curare.compose.ui.composable.HomeScreen -import to.curare.compose.ui.composable.ImplementationPendingScreen -import to.curare.compose.ui.composable.KeyPackageManagementScreen -import to.curare.compose.ui.composable.KeyRecoveryScreen -import to.curare.compose.ui.composable.LandingScreen -import to.curare.compose.ui.composable.LoadingScreen -import to.curare.compose.ui.composable.NostrEventDetailScreen -import to.curare.compose.ui.composable.NostrSecretScreen -import to.curare.compose.ui.composable.RecoveryPhraseScreen -import to.curare.compose.ui.composable.SearchMemberToAddToChatRoomScreen -import to.curare.compose.ui.composable.SearchResultScreen -import to.curare.compose.ui.composable.SearchScreen -import to.curare.compose.ui.composable.SelectChatRoomMembersScreen -import to.curare.compose.ui.composable.SelectChatRoomTypeScreen -import to.curare.compose.ui.composable.ShareProfileScreen -import to.curare.compose.ui.composable.SignInToProfileScreen -import to.curare.compose.ui.composable.SocialPreconditionScreen -import to.curare.compose.ui.composable.SovereignWalletStartupScreen -import to.curare.compose.ui.composable.UnannouncedProfileScreen -import to.curare.compose.ui.composable.UnindexedProfileScreen -import to.curare.compose.ui.composable.UnqueuedProfileScreen -import to.curare.compose.ui.composable.UnqueuedProfileSynchronizationScreen -import to.curare.compose.ui.composable.UnsignedProfileScreen -import to.curare.compose.ui.composable.UnsyncedProfileScreen -import to.curare.compose.ui.composable.WriteNewNoteScreen -import to.curare.compose.ui.composable.navigation.routes.ActiveProfileRoute -import to.curare.compose.ui.composable.navigation.routes.AddMemberToChatRoomConfirmationRoute -import to.curare.compose.ui.composable.navigation.routes.BlankRoute -import to.curare.compose.ui.composable.navigation.routes.ChatRoomCreationRoute -import to.curare.compose.ui.composable.navigation.routes.ChatRoomDetailRoute -import to.curare.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute -import to.curare.compose.ui.composable.navigation.routes.CreateProfileRoute -import to.curare.compose.ui.composable.navigation.routes.DkgJoinApprovalRoute -import to.curare.compose.ui.composable.navigation.routes.DkgRitualRoute -import to.curare.compose.ui.composable.navigation.routes.DkgRound1ApprovalRoute -import to.curare.compose.ui.composable.navigation.routes.DkgRound2ApprovalRoute -import to.curare.compose.ui.composable.navigation.routes.HomeRoute -import to.curare.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import to.curare.compose.ui.composable.navigation.routes.KeyPackageManagementRoute -import to.curare.compose.ui.composable.navigation.routes.KeyRecoveryRoute -import to.curare.compose.ui.composable.navigation.routes.LandingRoute -import to.curare.compose.ui.composable.navigation.routes.LoadingRoute -import to.curare.compose.ui.composable.navigation.routes.NostrEventDetailRoute -import to.curare.compose.ui.composable.navigation.routes.NostrSecretRoute -import to.curare.compose.ui.composable.navigation.routes.ProfilePreviewRoute -import to.curare.compose.ui.composable.navigation.routes.ProfilesRoute -import to.curare.compose.ui.composable.navigation.routes.RecoveryPhraseRoute -import to.curare.compose.ui.composable.ProfilePreviewScreen -import to.curare.compose.ui.composable.ProfilesScreen -import to.curare.compose.ui.view.model.ProfilesViewModel -import to.curare.compose.ui.view.model.getAvailableWalletsMeta -import to.curare.compose.ui.view.model.bareKeyProfileWriter -import to.curare.compose.ui.view.model.seedProfileWriter -import to.curare.compose.ui.composable.navigation.routes.SearchMemberToAddToChatRoomRoute -import to.curare.compose.ui.composable.navigation.routes.SearchResultRoute -import to.curare.compose.ui.composable.navigation.routes.SearchRoute -import to.curare.compose.ui.composable.navigation.routes.SelectChatRoomMembersRoute -import to.curare.compose.ui.composable.navigation.routes.SelectSubgroupAdminsRoute -import to.curare.compose.ui.composable.SelectSubgroupAdminsScreen -import to.curare.compose.ui.composable.navigation.routes.SelectChatRoomTypeRoute -import to.curare.compose.ui.composable.navigation.routes.ShareProfileRoute -import to.curare.compose.ui.composable.navigation.routes.SignInRoute -import to.curare.compose.ui.composable.navigation.routes.SocialPreconditionRoute -import to.curare.compose.ui.composable.navigation.routes.SovereignWalletStartupRoute -import to.curare.compose.ui.composable.navigation.routes.UnannouncedProfileRoute -import to.curare.compose.ui.composable.navigation.routes.UnindexedProfileRoute -import to.curare.compose.ui.composable.navigation.routes.UnqueuedProfileRoute -import to.curare.compose.ui.composable.navigation.routes.UnqueuedProfileSynchronizationRoute -import to.curare.compose.ui.composable.navigation.routes.UnsignedProfileRoute -import to.curare.compose.ui.composable.navigation.routes.UnsyncedProfileRoute -import to.curare.compose.ui.composable.navigation.routes.WriteNewNoteRoute -import to.curare.compose.ui.view.model.NavigationViewModel -import to.curare.compose.ui.view.model.NotaryViewModel -import to.curare.compose.ui.view.model.SovereignWalletViewModel -import to.curare.compose.ui.view.model.SynchronizationViewModel -import to.curare.compose.ui.view.state.NavigationUIState -import to.curare.compose.ui.view.state.NostrEventDetailUIState -import to.curare.compose.ui.view.state.SearchUIState -import to.curare.compose.ui.theme.NavigationMotion -import to.curare.compose.ui.composable.SignOutDependencies -import to.curare.compose.ui.composable.widgets.ProvideSigningCapability -import to.curare.compose.ui.theme.breakpoint +import com.machankura.bennu.compose.BennuGlobal +import com.machankura.bennu.compose.database.repository.DatabaseChatRepository +import com.machankura.bennu.compose.database.repository.DatabaseDkgRepository +import com.machankura.bennu.compose.database.repository.DatabaseFrostSigningRepository +import com.machankura.bennu.compose.database.repository.DatabaseMarmotRepository +import com.machankura.bennu.compose.database.repository.DatabaseNostrRepository +import com.machankura.bennu.compose.database.repository.DatabaseSearchRepository +import com.machankura.bennu.compose.managers.AuxDatabaseManager +import com.machankura.bennu.compose.ui.composable.ActiveProfileScreen +import com.machankura.bennu.compose.ui.composable.AddMemberToChatRoomConfirmationScreen +import com.machankura.bennu.compose.ui.composable.ChatRoomCreationScreen +import com.machankura.bennu.compose.ui.composable.ChatRoomDetailScreen +import com.machankura.bennu.compose.ui.composable.ChatRoomMessagingScreen +import com.machankura.bennu.compose.ui.composable.CreateProfileScreen +import com.machankura.bennu.compose.ui.composable.DkgJoinApprovalScreen +import com.machankura.bennu.compose.ui.composable.DkgRitualScreen +import com.machankura.bennu.compose.ui.composable.DkgRound1ApprovalScreen +import com.machankura.bennu.compose.ui.composable.DkgRound2ApprovalScreen +import com.machankura.bennu.compose.ui.composable.EditGroupNostrProfileScreen +import com.machankura.bennu.compose.ui.composable.AddGroupPostScreen +import com.machankura.bennu.compose.ui.composable.AcceptCuratedSuggestionScreen +import com.machankura.bennu.compose.ui.composable.EditGroupCuratedSchemaScreen +import com.machankura.bennu.compose.ui.composable.SelectCuratedSchemaTemplateScreen +import com.machankura.bennu.compose.ui.composable.BroadcastGroupSignedEventScreen +import com.machankura.bennu.compose.ui.composable.CuratedSuggestionListScreen +import com.machankura.bennu.compose.ui.composable.ProposeGroupEventScreen +import com.machankura.bennu.compose.ui.composable.EditGroupRelaysScreen +import com.machankura.bennu.compose.ui.composable.GroupNostrProfileScreen +import com.machankura.bennu.compose.ui.composable.GroupRelaysScreen +import com.machankura.bennu.compose.ui.composable.GroupPostsScreen +import com.machankura.bennu.compose.ui.composable.GroupCuratedSchemasScreen +import com.machankura.bennu.compose.ui.composable.GroupCuratedEntriesScreen +import com.machankura.bennu.compose.ui.composable.HomeScreen +import com.machankura.bennu.compose.ui.composable.ImplementationPendingScreen +import com.machankura.bennu.compose.ui.composable.KeyPackageManagementScreen +import com.machankura.bennu.compose.ui.composable.KeyRecoveryScreen +import com.machankura.bennu.compose.ui.composable.LandingScreen +import com.machankura.bennu.compose.ui.composable.LoadingScreen +import com.machankura.bennu.compose.ui.composable.NostrEventDetailScreen +import com.machankura.bennu.compose.ui.composable.NostrSecretScreen +import com.machankura.bennu.compose.ui.composable.RecoveryPhraseScreen +import com.machankura.bennu.compose.ui.composable.SearchMemberToAddToChatRoomScreen +import com.machankura.bennu.compose.ui.composable.SearchResultScreen +import com.machankura.bennu.compose.ui.composable.SearchScreen +import com.machankura.bennu.compose.ui.composable.SelectChatRoomMembersScreen +import com.machankura.bennu.compose.ui.composable.SelectChatRoomTypeScreen +import com.machankura.bennu.compose.ui.composable.ShareProfileScreen +import com.machankura.bennu.compose.ui.composable.SignInToProfileScreen +import com.machankura.bennu.compose.ui.composable.SocialPreconditionScreen +import com.machankura.bennu.compose.ui.composable.SovereignWalletStartupScreen +import com.machankura.bennu.compose.ui.composable.UnannouncedProfileScreen +import com.machankura.bennu.compose.ui.composable.UnindexedProfileScreen +import com.machankura.bennu.compose.ui.composable.UnqueuedProfileScreen +import com.machankura.bennu.compose.ui.composable.UnqueuedProfileSynchronizationScreen +import com.machankura.bennu.compose.ui.composable.UnsignedProfileScreen +import com.machankura.bennu.compose.ui.composable.UnsyncedProfileScreen +import com.machankura.bennu.compose.ui.composable.WriteNewNoteScreen +import com.machankura.bennu.compose.ui.composable.navigation.routes.ActiveProfileRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.AddMemberToChatRoomConfirmationRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.BlankRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ChatRoomCreationRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ChatRoomDetailRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.CreateProfileRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.DkgJoinApprovalRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.DkgRitualRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.DkgRound1ApprovalRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.DkgRound2ApprovalRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.HomeRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ImplementationPendingRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.KeyPackageManagementRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.KeyRecoveryRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.LandingRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.LoadingRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.NostrEventDetailRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.NostrSecretRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ProfilePreviewRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ProfilesRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.RecoveryPhraseRoute +import com.machankura.bennu.compose.ui.composable.ProfilePreviewScreen +import com.machankura.bennu.compose.ui.composable.ProfilesScreen +import com.machankura.bennu.compose.ui.view.model.ProfilesViewModel +import com.machankura.bennu.compose.ui.view.model.getAvailableWalletsMeta +import com.machankura.bennu.compose.ui.view.model.bareKeyProfileWriter +import com.machankura.bennu.compose.ui.view.model.seedProfileWriter +import com.machankura.bennu.compose.ui.composable.navigation.routes.SearchMemberToAddToChatRoomRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.SearchResultRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.SearchRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.SelectChatRoomMembersRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.SelectSubgroupAdminsRoute +import com.machankura.bennu.compose.ui.composable.SelectSubgroupAdminsScreen +import com.machankura.bennu.compose.ui.composable.navigation.routes.SelectChatRoomTypeRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ShareProfileRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.SignInRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.SocialPreconditionRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.SovereignWalletStartupRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.UnannouncedProfileRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.UnindexedProfileRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.UnqueuedProfileRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.UnqueuedProfileSynchronizationRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.UnsignedProfileRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.UnsyncedProfileRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.WriteNewNoteRoute +import com.machankura.bennu.compose.ui.view.model.NavigationViewModel +import com.machankura.bennu.compose.ui.view.model.NotaryViewModel +import com.machankura.bennu.compose.ui.view.model.SovereignWalletViewModel +import com.machankura.bennu.compose.ui.view.model.SynchronizationViewModel +import com.machankura.bennu.compose.ui.view.state.NavigationUIState +import com.machankura.bennu.compose.ui.view.state.NostrEventDetailUIState +import com.machankura.bennu.compose.ui.view.state.SearchUIState +import com.machankura.bennu.compose.ui.theme.NavigationMotion +import com.machankura.bennu.compose.ui.composable.SignOutDependencies +import com.machankura.bennu.compose.ui.composable.widgets.ProvideSigningCapability +import com.machankura.bennu.compose.ui.theme.breakpoint import co.touchlab.kermit.Logger import fr.acinq.phoenix.PhoenixGlobal import kotlinx.coroutines.CoroutineExceptionHandler @@ -145,51 +145,51 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.launch -import to.curare.compose.database.repository.DatabaseMantraRepository -import to.curare.compose.ui.composable.AddArtifactScreen -import to.curare.compose.ui.composable.navigation.routes.AddArtifactRoute -import to.curare.compose.ui.composable.navigation.routes.AddDialectRoute -import to.curare.compose.ui.composable.navigation.routes.EditGroupNostrProfileRoute -import to.curare.compose.ui.composable.navigation.routes.AddGroupPostRoute -import to.curare.compose.ui.composable.navigation.routes.AcceptCuratedSuggestionRoute -import to.curare.compose.ui.composable.navigation.routes.EditGroupCuratedSchemaRoute -import to.curare.compose.ui.composable.navigation.routes.SelectCuratedSchemaTemplateRoute -import to.curare.compose.ui.composable.navigation.routes.BroadcastGroupSignedEventRoute -import to.curare.compose.ui.composable.navigation.routes.CuratedSuggestionListRoute -import to.curare.compose.ui.composable.navigation.routes.ProposeGroupEventRoute -import to.curare.compose.ui.composable.navigation.routes.EditGroupRelaysRoute -import to.curare.compose.ui.composable.navigation.routes.GroupNostrProfileRoute -import to.curare.compose.ui.composable.navigation.routes.GroupRelaysRoute -import to.curare.compose.ui.composable.navigation.routes.GroupPostsRoute -import to.curare.compose.ui.composable.navigation.routes.GroupCuratedSchemasRoute -import to.curare.compose.ui.composable.navigation.routes.GroupCuratedEntriesRoute -import to.curare.compose.ui.composable.navigation.routes.FrostSigningRoute -import to.curare.compose.ui.composable.navigation.routes.ProposalListRoute -import to.curare.compose.ui.composable.navigation.routes.AddChapterRoute -import to.curare.compose.ui.composable.navigation.routes.AddTranslationRoute -import to.curare.compose.ui.composable.navigation.routes.ArtifactDetailRoute -import to.curare.compose.ui.composable.navigation.routes.ChapterDetailRoute -import to.curare.compose.ui.composable.navigation.routes.TranslateChunkRoute -import to.curare.compose.ui.composable.navigation.routes.TranslationChapterRoute -import to.curare.compose.ui.composable.navigation.routes.TranslationArtifactVersionDetailRoute -import to.curare.compose.ui.composable.ArtifactDetailScreen -import to.curare.compose.ui.composable.AddChapterScreen -import to.curare.compose.ui.composable.AddDialectScreen -import to.curare.compose.ui.composable.FrostSigningScreen -import to.curare.compose.ui.composable.ProposalListScreen -import to.curare.compose.ui.composable.AddTranslationArtifactVersionScreen -import to.curare.compose.ui.composable.ChapterDetailScreen -import to.curare.compose.ui.composable.TranslateChunkScreen -import to.curare.compose.ui.composable.TranslationChapterScreen -import to.curare.compose.ui.composable.TranslationArtifactVersionDetailScreen +import com.machankura.bennu.compose.database.repository.DatabaseMantraRepository +import com.machankura.bennu.compose.ui.composable.AddArtifactScreen +import com.machankura.bennu.compose.ui.composable.navigation.routes.AddArtifactRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.AddDialectRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.EditGroupNostrProfileRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.AddGroupPostRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.AcceptCuratedSuggestionRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.EditGroupCuratedSchemaRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.SelectCuratedSchemaTemplateRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.BroadcastGroupSignedEventRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.CuratedSuggestionListRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ProposeGroupEventRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.EditGroupRelaysRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.GroupNostrProfileRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.GroupRelaysRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.GroupPostsRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.GroupCuratedSchemasRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.GroupCuratedEntriesRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.FrostSigningRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ProposalListRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.AddChapterRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.AddTranslationRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ArtifactDetailRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ChapterDetailRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.TranslateChunkRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.TranslationChapterRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.TranslationArtifactVersionDetailRoute +import com.machankura.bennu.compose.ui.composable.ArtifactDetailScreen +import com.machankura.bennu.compose.ui.composable.AddChapterScreen +import com.machankura.bennu.compose.ui.composable.AddDialectScreen +import com.machankura.bennu.compose.ui.composable.FrostSigningScreen +import com.machankura.bennu.compose.ui.composable.ProposalListScreen +import com.machankura.bennu.compose.ui.composable.AddTranslationArtifactVersionScreen +import com.machankura.bennu.compose.ui.composable.ChapterDetailScreen +import com.machankura.bennu.compose.ui.composable.TranslateChunkScreen +import com.machankura.bennu.compose.ui.composable.TranslationChapterScreen +import com.machankura.bennu.compose.ui.composable.TranslationArtifactVersionDetailScreen @Composable -fun CurareNavHost( - curareGlobal: CurareGlobal, +fun BennuNavHost( + bennuGlobal: BennuGlobal, phoenixGlobal: PhoenixGlobal, navController: NavHostController ) { - val logger = Logger.withTag("CurareNavHost") + val logger = Logger.withTag("BennuNavHost") val exceptionHandler = remember { CoroutineExceptionHandler { _, throwable -> @@ -203,7 +203,7 @@ fun CurareNavHost( val lifecycleOwner = LocalLifecycleOwner.current val auxDatabaseManager = remember { - AuxDatabaseManager(curareGlobal) + AuxDatabaseManager(bennuGlobal) } // Before the repositories: the nostr repository stamps every fetch request it queues @@ -469,7 +469,7 @@ fun CurareNavHost( // Once, above every screen: what a read-only identity may not be offered is decided // where the control is drawn, and this is how the control finds out. ProvideSigningCapability(sovereignWalletViewModel.activeIdentity) { - CurareNavigationSuite( + BennuNavigationSuite( navController = navController, breakpoint = MaterialTheme.breakpoint, activeUserPublicKey = activeUserPublicKey, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/CurareNavigationSuite.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/BennuNavigationSuite.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/CurareNavigationSuite.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/BennuNavigationSuite.kt index fa37f6c9..88c16165 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/CurareNavigationSuite.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/BennuNavigationSuite.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation +package com.machankura.bennu.compose.ui.composable.navigation import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.Icon @@ -12,9 +12,9 @@ import androidx.navigation.NavDestination import androidx.navigation.NavHostController import androidx.navigation.compose.currentBackStackEntryAsState import org.jetbrains.compose.resources.stringResource -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.composable.navigation.routes.HomeRoute -import to.curare.compose.ui.theme.Breakpoint +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.composable.navigation.routes.HomeRoute +import com.machankura.bennu.compose.ui.theme.Breakpoint /** * The navigation bar, collapsed rail or expanded rail, around whatever the nav host draws. @@ -52,7 +52,7 @@ import to.curare.compose.ui.theme.Breakpoint */ @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable -fun CurareNavigationSuite( +fun BennuNavigationSuite( navController: NavHostController, breakpoint: Breakpoint, activeUserPublicKey: String?, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/TopLevelDestination.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/TopLevelDestination.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/TopLevelDestination.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/TopLevelDestination.kt index c11adfb1..48a18bbd 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/TopLevelDestination.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/TopLevelDestination.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation +package com.machankura.bennu.compose.ui.composable.navigation import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Forum @@ -7,15 +7,15 @@ import androidx.compose.material.icons.filled.Search import androidx.compose.ui.graphics.vector.ImageVector import androidx.navigation.NavDestination import androidx.navigation.NavDestination.Companion.hasRoute -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.messages -import curare.composeapp.generated.resources.profile -import curare.composeapp.generated.resources.search +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.messages +import bennu.composeapp.generated.resources.profile +import bennu.composeapp.generated.resources.search import org.jetbrains.compose.resources.StringResource -import to.curare.compose.ui.composable.navigation.routes.ActiveProfileRoute -import to.curare.compose.ui.composable.navigation.routes.HomeRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.navigation.routes.SearchRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ActiveProfileRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.HomeRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.navigation.routes.SearchRoute /** * The three destinations the navigation component switches between. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AcceptCuratedSuggestionRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/AcceptCuratedSuggestionRoute.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AcceptCuratedSuggestionRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/AcceptCuratedSuggestionRoute.kt index 2547e08c..1f4af5c3 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AcceptCuratedSuggestionRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/AcceptCuratedSuggestionRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ActiveProfileRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ActiveProfileRoute.kt similarity index 66% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ActiveProfileRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ActiveProfileRoute.kt index da96b698..bacfecad 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ActiveProfileRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ActiveProfileRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddArtifactRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/AddArtifactRoute.kt similarity index 72% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddArtifactRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/AddArtifactRoute.kt index 5c61f85e..5c481e8f 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddArtifactRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/AddArtifactRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddChapterRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/AddChapterRoute.kt similarity index 75% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddChapterRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/AddChapterRoute.kt index 44f69b58..c6d2dfa8 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddChapterRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/AddChapterRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddDialectRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/AddDialectRoute.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddDialectRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/AddDialectRoute.kt index 002465b1..6ef108c4 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddDialectRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/AddDialectRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddGroupPostRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/AddGroupPostRoute.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddGroupPostRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/AddGroupPostRoute.kt index aa4389b5..fc2619ed 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddGroupPostRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/AddGroupPostRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddMemberToChatRoomConfirmationRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/AddMemberToChatRoomConfirmationRoute.kt similarity index 80% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddMemberToChatRoomConfirmationRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/AddMemberToChatRoomConfirmationRoute.kt index d3220ab0..8a8921c9 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddMemberToChatRoomConfirmationRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/AddMemberToChatRoomConfirmationRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddTranslationRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/AddTranslationRoute.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddTranslationRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/AddTranslationRoute.kt index a2daae49..ecaaa079 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddTranslationRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/AddTranslationRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ArtifactDetailRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ArtifactDetailRoute.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ArtifactDetailRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ArtifactDetailRoute.kt index cd374d0e..64d9574e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ArtifactDetailRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ArtifactDetailRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/AuthenticatedProfileRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/AuthenticatedProfileRoute.kt new file mode 100644 index 00000000..582e3f56 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/AuthenticatedProfileRoute.kt @@ -0,0 +1,6 @@ +package com.machankura.bennu.compose.ui.composable.navigation.routes + +import kotlinx.serialization.Serializable + +@Serializable +data object AuthenticatedProfileRoute \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/BlankRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/BlankRoute.kt new file mode 100755 index 00000000..1960bd85 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/BlankRoute.kt @@ -0,0 +1,6 @@ +package com.machankura.bennu.compose.ui.composable.navigation.routes + +import kotlinx.serialization.Serializable + +@Serializable +object BlankRoute: Route() \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/BroadcastGroupSignedEventRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/BroadcastGroupSignedEventRoute.kt similarity index 83% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/BroadcastGroupSignedEventRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/BroadcastGroupSignedEventRoute.kt index f87a6b6b..7268d494 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/BroadcastGroupSignedEventRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/BroadcastGroupSignedEventRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ChapterDetailRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ChapterDetailRoute.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ChapterDetailRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ChapterDetailRoute.kt index 5df48309..605e6395 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ChapterDetailRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ChapterDetailRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ChatRoomCreationRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ChatRoomCreationRoute.kt similarity index 62% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ChatRoomCreationRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ChatRoomCreationRoute.kt index 9a8fee95..80f75c0d 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ChatRoomCreationRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ChatRoomCreationRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ChatRoomDetailRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ChatRoomDetailRoute.kt similarity index 73% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ChatRoomDetailRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ChatRoomDetailRoute.kt index e5342ce8..9d4fa8c8 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ChatRoomDetailRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ChatRoomDetailRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ChatRoomMessagingRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ChatRoomMessagingRoute.kt similarity index 73% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ChatRoomMessagingRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ChatRoomMessagingRoute.kt index 83a96266..bc76d8aa 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ChatRoomMessagingRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ChatRoomMessagingRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/CreateProfileRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/CreateProfileRoute.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/CreateProfileRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/CreateProfileRoute.kt index 5934424e..b8d97df5 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/CreateProfileRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/CreateProfileRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/CuratedSuggestionListRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/CuratedSuggestionListRoute.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/CuratedSuggestionListRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/CuratedSuggestionListRoute.kt index 8ad4b611..21355463 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/CuratedSuggestionListRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/CuratedSuggestionListRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/DkgJoinApprovalRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/DkgJoinApprovalRoute.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/DkgJoinApprovalRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/DkgJoinApprovalRoute.kt index 1ba70fac..64e5e00d 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/DkgJoinApprovalRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/DkgJoinApprovalRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/DkgRitualRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/DkgRitualRoute.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/DkgRitualRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/DkgRitualRoute.kt index b4e12afc..bb4763fb 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/DkgRitualRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/DkgRitualRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/DkgRound1ApprovalRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/DkgRound1ApprovalRoute.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/DkgRound1ApprovalRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/DkgRound1ApprovalRoute.kt index 11d00c7e..f3c18ea2 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/DkgRound1ApprovalRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/DkgRound1ApprovalRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/DkgRound2ApprovalRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/DkgRound2ApprovalRoute.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/DkgRound2ApprovalRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/DkgRound2ApprovalRoute.kt index d38ea47e..cf55bccc 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/DkgRound2ApprovalRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/DkgRound2ApprovalRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/EditGroupCuratedSchemaRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/EditGroupCuratedSchemaRoute.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/EditGroupCuratedSchemaRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/EditGroupCuratedSchemaRoute.kt index b3ed19bd..fca3d832 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/EditGroupCuratedSchemaRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/EditGroupCuratedSchemaRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/EditGroupNostrProfileRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/EditGroupNostrProfileRoute.kt similarity index 77% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/EditGroupNostrProfileRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/EditGroupNostrProfileRoute.kt index 57653fb7..18cb2495 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/EditGroupNostrProfileRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/EditGroupNostrProfileRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/EditGroupRelaysRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/EditGroupRelaysRoute.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/EditGroupRelaysRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/EditGroupRelaysRoute.kt index ad6f62d5..771dd52e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/EditGroupRelaysRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/EditGroupRelaysRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/FrostSigningRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/FrostSigningRoute.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/FrostSigningRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/FrostSigningRoute.kt index 31b450a6..620fe476 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/FrostSigningRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/FrostSigningRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/GroupCuratedEntriesRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/GroupCuratedEntriesRoute.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/GroupCuratedEntriesRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/GroupCuratedEntriesRoute.kt index 40d85c4d..c83d50f5 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/GroupCuratedEntriesRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/GroupCuratedEntriesRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/GroupCuratedSchemasRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/GroupCuratedSchemasRoute.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/GroupCuratedSchemasRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/GroupCuratedSchemasRoute.kt index a50e6c55..fa005ffc 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/GroupCuratedSchemasRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/GroupCuratedSchemasRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/GroupNostrProfileRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/GroupNostrProfileRoute.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/GroupNostrProfileRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/GroupNostrProfileRoute.kt index 868e6436..a3fd5583 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/GroupNostrProfileRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/GroupNostrProfileRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/GroupPostsRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/GroupPostsRoute.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/GroupPostsRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/GroupPostsRoute.kt index 42977c06..be352f7f 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/GroupPostsRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/GroupPostsRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/GroupRelaysRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/GroupRelaysRoute.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/GroupRelaysRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/GroupRelaysRoute.kt index 2133da7d..a76a9a86 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/GroupRelaysRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/GroupRelaysRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/HomeRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/HomeRoute.kt similarity index 59% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/HomeRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/HomeRoute.kt index e3b889c8..23ab4e06 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/HomeRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/HomeRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ImplementationPendingRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ImplementationPendingRoute.kt similarity index 59% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ImplementationPendingRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ImplementationPendingRoute.kt index 35e82ed2..6c34d8d1 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ImplementationPendingRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ImplementationPendingRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/KeyPackageManagementRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/KeyPackageManagementRoute.kt similarity index 67% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/KeyPackageManagementRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/KeyPackageManagementRoute.kt index 3acfe4d0..dde0829d 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/KeyPackageManagementRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/KeyPackageManagementRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/KeyRecoveryRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/KeyRecoveryRoute.kt similarity index 66% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/KeyRecoveryRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/KeyRecoveryRoute.kt index a943ace6..e0de257c 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/KeyRecoveryRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/KeyRecoveryRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/LandingRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/LandingRoute.kt new file mode 100755 index 00000000..590f295a --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/LandingRoute.kt @@ -0,0 +1,6 @@ +package com.machankura.bennu.compose.ui.composable.navigation.routes + +import kotlinx.serialization.Serializable + +@Serializable +object LandingRoute: Route() \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/LoadingRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/LoadingRoute.kt similarity index 58% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/LoadingRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/LoadingRoute.kt index 5bc683ab..254fff98 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/LoadingRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/LoadingRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/NostrEventDetailRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/NostrEventDetailRoute.kt similarity index 66% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/NostrEventDetailRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/NostrEventDetailRoute.kt index a1c40f8f..3add45f1 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/NostrEventDetailRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/NostrEventDetailRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/NostrSecretRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/NostrSecretRoute.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/NostrSecretRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/NostrSecretRoute.kt index 207b5df1..5b6b7552 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/NostrSecretRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/NostrSecretRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ProfilePreviewRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ProfilePreviewRoute.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ProfilePreviewRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ProfilePreviewRoute.kt index 498b6e1b..d0f66931 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ProfilePreviewRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ProfilePreviewRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ProfilesRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ProfilesRoute.kt similarity index 83% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ProfilesRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ProfilesRoute.kt index 78397612..5c636d10 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ProfilesRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ProfilesRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ProposalDestination.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ProposalDestination.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ProposalDestination.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ProposalDestination.kt index f0118b93..d9901067 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ProposalDestination.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ProposalDestination.kt @@ -1,7 +1,7 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.ui.view.state.ProposalFilter +import com.machankura.bennu.compose.ui.view.state.ProposalFilter /** * Where tapping a proposal in the transcript goes. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ProposalListRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ProposalListRoute.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ProposalListRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ProposalListRoute.kt index 1c6b768b..1565f127 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ProposalListRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ProposalListRoute.kt @@ -1,7 +1,7 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable -import to.curare.compose.ui.view.state.ProposalFilter +import com.machankura.bennu.compose.ui.view.state.ProposalFilter /** * Everything a group has asked its shared key to sign. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ProposeGroupEventRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ProposeGroupEventRoute.kt similarity index 81% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ProposeGroupEventRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ProposeGroupEventRoute.kt index cbde34d6..82c810ba 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ProposeGroupEventRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ProposeGroupEventRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/RecoveryPhraseRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/RecoveryPhraseRoute.kt similarity index 58% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/RecoveryPhraseRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/RecoveryPhraseRoute.kt index df721fd7..bf0eb529 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/RecoveryPhraseRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/RecoveryPhraseRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/Route.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/Route.kt new file mode 100755 index 00000000..1dee54f6 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/Route.kt @@ -0,0 +1,3 @@ +package com.machankura.bennu.compose.ui.composable.navigation.routes + +abstract class Route \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SearchMemberToAddToChatRoomRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SearchMemberToAddToChatRoomRoute.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SearchMemberToAddToChatRoomRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SearchMemberToAddToChatRoomRoute.kt index 6c23c2aa..ff1aa34a 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SearchMemberToAddToChatRoomRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SearchMemberToAddToChatRoomRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SearchResultRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SearchResultRoute.kt similarity index 65% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SearchResultRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SearchResultRoute.kt index b9747a2d..c3f24ca4 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SearchResultRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SearchResultRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SearchRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SearchRoute.kt similarity index 60% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SearchRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SearchRoute.kt index 813abf28..b70e91d0 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SearchRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SearchRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SelectChatRoomMembersRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SelectChatRoomMembersRoute.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SelectChatRoomMembersRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SelectChatRoomMembersRoute.kt index 8569e7fa..e36d05f8 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SelectChatRoomMembersRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SelectChatRoomMembersRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SelectChatRoomTypeRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SelectChatRoomTypeRoute.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SelectChatRoomTypeRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SelectChatRoomTypeRoute.kt index 1dc18706..0b779e9a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SelectChatRoomTypeRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SelectChatRoomTypeRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SelectCuratedSchemaTemplateRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SelectCuratedSchemaTemplateRoute.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SelectCuratedSchemaTemplateRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SelectCuratedSchemaTemplateRoute.kt index 5d86e8cb..04986a48 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SelectCuratedSchemaTemplateRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SelectCuratedSchemaTemplateRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SelectSubgroupAdminsRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SelectSubgroupAdminsRoute.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SelectSubgroupAdminsRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SelectSubgroupAdminsRoute.kt index 0efef117..4a15b10e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SelectSubgroupAdminsRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SelectSubgroupAdminsRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ShareProfileRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ShareProfileRoute.kt similarity index 66% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ShareProfileRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ShareProfileRoute.kt index ee484233..2694a2b3 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ShareProfileRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ShareProfileRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SignInRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SignInRoute.kt new file mode 100755 index 00000000..6998a3e7 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SignInRoute.kt @@ -0,0 +1,6 @@ +package com.machankura.bennu.compose.ui.composable.navigation.routes + +import kotlinx.serialization.Serializable + +@Serializable +object SignInRoute: Route() \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SocialPreconditionRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SocialPreconditionRoute.kt similarity index 61% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SocialPreconditionRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SocialPreconditionRoute.kt index fd32ac60..cfeea63d 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SocialPreconditionRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SocialPreconditionRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SovereignWalletStartupRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SovereignWalletStartupRoute.kt new file mode 100644 index 00000000..b64f3310 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/SovereignWalletStartupRoute.kt @@ -0,0 +1,6 @@ +package com.machankura.bennu.compose.ui.composable.navigation.routes + +import kotlinx.serialization.Serializable + +@Serializable +data object SovereignWalletStartupRoute \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/TranslateChunkRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/TranslateChunkRoute.kt similarity index 78% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/TranslateChunkRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/TranslateChunkRoute.kt index e58f10f7..f377c1ae 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/TranslateChunkRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/TranslateChunkRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/TranslationArtifactVersionDetailRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/TranslationArtifactVersionDetailRoute.kt similarity index 78% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/TranslationArtifactVersionDetailRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/TranslationArtifactVersionDetailRoute.kt index 5bab28e4..c3150b4c 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/TranslationArtifactVersionDetailRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/TranslationArtifactVersionDetailRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/TranslationChapterRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/TranslationChapterRoute.kt similarity index 77% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/TranslationChapterRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/TranslationChapterRoute.kt index 29d0f573..8133a75b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/TranslationChapterRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/TranslationChapterRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnannouncedProfileRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/UnannouncedProfileRoute.kt similarity index 61% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnannouncedProfileRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/UnannouncedProfileRoute.kt index 54632513..23292388 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnannouncedProfileRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/UnannouncedProfileRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnindexedProfileRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/UnindexedProfileRoute.kt similarity index 60% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnindexedProfileRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/UnindexedProfileRoute.kt index 931038a1..4f5e0726 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnindexedProfileRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/UnindexedProfileRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnqueuedProfileRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/UnqueuedProfileRoute.kt similarity index 60% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnqueuedProfileRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/UnqueuedProfileRoute.kt index 6d4239a6..5b5939dd 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnqueuedProfileRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/UnqueuedProfileRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnqueuedProfileSynchronizationRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/UnqueuedProfileSynchronizationRoute.kt similarity index 68% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnqueuedProfileSynchronizationRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/UnqueuedProfileSynchronizationRoute.kt index 2e49e704..0d4b23b0 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnqueuedProfileSynchronizationRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/UnqueuedProfileSynchronizationRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnsignedProfileRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/UnsignedProfileRoute.kt similarity index 61% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnsignedProfileRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/UnsignedProfileRoute.kt index 0aec8c2d..0dedabfe 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnsignedProfileRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/UnsignedProfileRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnsyncedProfileRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/UnsyncedProfileRoute.kt similarity index 59% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnsyncedProfileRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/UnsyncedProfileRoute.kt index 1dbaa8d5..7d757ba4 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnsyncedProfileRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/UnsyncedProfileRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/WriteNewNoteRoute.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/WriteNewNoteRoute.kt similarity index 72% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/WriteNewNoteRoute.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/WriteNewNoteRoute.kt index 983b18ac..6429b71e 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/WriteNewNoteRoute.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/WriteNewNoteRoute.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/DetailRow.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/DetailRow.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/DetailRow.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/DetailRow.kt index d584a60d..bfb75ffc 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/DetailRow.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/DetailRow.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets +package com.machankura.bennu.compose.ui.composable.widgets import androidx.compose.material3.ListItem import androidx.compose.material3.Text diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/LoadingDataIndicator.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/LoadingDataIndicator.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/LoadingDataIndicator.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/LoadingDataIndicator.kt index 944f7cbe..2b6ad22a 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/LoadingDataIndicator.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/LoadingDataIndicator.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets +package com.machankura.bennu.compose.ui.composable.widgets import androidx.compose.foundation.layout.* import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi @@ -13,8 +13,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.theme.ConformancePreviews /** * The app's one loading state, used at 41 call sites. @@ -69,7 +69,7 @@ fun LoadingDataIndicator( @ConformancePreviews @Composable private fun TransferHistoryScreenPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface(modifier = Modifier.fillMaxSize()) { LoadingDataIndicator( text = "Starting up" diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/NavigateBackButton.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/NavigateBackButton.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/NavigateBackButton.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/NavigateBackButton.kt index 1dfb1a5a..2f99632c 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/NavigateBackButton.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/NavigateBackButton.kt @@ -1,12 +1,12 @@ -package to.curare.compose.ui.composable.widgets +package com.machankura.bennu.compose.ui.composable.widgets import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.runtime.Composable -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.back +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.back import org.jetbrains.compose.resources.stringResource /** diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/QRCodeView.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/QRCodeView.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/QRCodeView.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/QRCodeView.kt index 216aeca8..4248f4d4 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/QRCodeView.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/QRCodeView.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets +package com.machankura.bennu.compose.ui.composable.widgets import androidx.compose.foundation.Image import androidx.compose.foundation.isSystemInDarkTheme @@ -14,15 +14,15 @@ import androidx.compose.ui.graphics.drawscope.translate import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import to.curare.compose.ui.theme.LocalExtendedColors +import com.machankura.bennu.compose.ui.theme.LocalExtendedColors import io.github.alexzhirkevich.qrose.options.QrBrush import io.github.alexzhirkevich.qrose.options.QrLogoPadding import io.github.alexzhirkevich.qrose.options.QrLogoShape import io.github.alexzhirkevich.qrose.options.solid import io.github.alexzhirkevich.qrose.rememberQrCodePainter import org.jetbrains.compose.resources.painterResource -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.compose_multiplatform +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.compose_multiplatform class QRCodeBackgroundPainter( private val painter: Painter, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/RelayOutcomeLabel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/RelayOutcomeLabel.kt similarity index 66% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/RelayOutcomeLabel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/RelayOutcomeLabel.kt index 152e7cdb..d227381c 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/RelayOutcomeLabel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/RelayOutcomeLabel.kt @@ -1,14 +1,14 @@ -package to.curare.compose.ui.composable.widgets +package com.machankura.bennu.compose.ui.composable.widgets import androidx.compose.runtime.Composable -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.relay_accepted -import curare.composeapp.generated.resources.relay_could_not_send -import curare.composeapp.generated.resources.relay_no_answer -import curare.composeapp.generated.resources.relay_rejected -import curare.composeapp.generated.resources.relay_sending +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.relay_accepted +import bennu.composeapp.generated.resources.relay_could_not_send +import bennu.composeapp.generated.resources.relay_no_answer +import bennu.composeapp.generated.resources.relay_rejected +import bennu.composeapp.generated.resources.relay_sending import org.jetbrains.compose.resources.stringResource -import to.curare.compose.ui.view.model.BroadcastGroupSignedEventViewModel.RelayOutcome +import com.machankura.bennu.compose.ui.view.model.BroadcastGroupSignedEventViewModel.RelayOutcome /** * One relay's answer to a broadcast, in the words both screens that show one diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/ScreenState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/ScreenState.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/ScreenState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/ScreenState.kt index b44ceb6d..6a1c67b5 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/ScreenState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/ScreenState.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets +package com.machankura.bennu.compose.ui.composable.widgets import androidx.compose.animation.AnimatedContent import androidx.compose.animation.SizeTransform @@ -23,12 +23,12 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.text.style.TextAlign -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.something_went_wrong -import curare.composeapp.generated.resources.try_again +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.something_went_wrong +import bennu.composeapp.generated.resources.try_again import org.jetbrains.compose.resources.stringResource -import to.curare.compose.ui.theme.reducedMotion -import to.curare.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.theme.reducedMotion +import com.machankura.bennu.compose.ui.theme.spacing /** * The two states every list and every screen has, and neither of which had a home. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/Semantics.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/Semantics.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/Semantics.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/Semantics.kt index ca3aaff7..8a25afa1 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/Semantics.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/Semantics.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets +package com.machankura.bennu.compose.ui.composable.widgets /** * An icon or image that adds nothing a screen reader user would miss. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/SigningCapability.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/SigningCapability.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/SigningCapability.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/SigningCapability.kt index 7c4db696..626f940f 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/SigningCapability.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/SigningCapability.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets +package com.machankura.bennu.compose.ui.composable.widgets import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider @@ -7,7 +7,7 @@ import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.staticCompositionLocalOf import kotlinx.coroutines.flow.StateFlow -import to.curare.compose.identity.Identity +import com.machankura.bennu.compose.identity.Identity /** * Whether the identity the app is running as can sign -- the one question every write diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/Snackbars.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/Snackbars.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/Snackbars.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/Snackbars.kt index 67412b51..f3966a1b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/Snackbars.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/Snackbars.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets +package com.machankura.bennu.compose.ui.composable.widgets import androidx.compose.material3.SnackbarDuration import androidx.compose.material3.SnackbarHostState diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/buttons/BroadcastButton.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/buttons/BroadcastButton.kt similarity index 82% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/buttons/BroadcastButton.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/buttons/BroadcastButton.kt index e3f19df8..dcbe5d5e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/buttons/BroadcastButton.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/buttons/BroadcastButton.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.buttons +package com.machankura.bennu.compose.ui.composable.widgets.buttons import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.width @@ -10,11 +10,11 @@ import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.broadcast +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.broadcast import org.jetbrains.compose.resources.stringResource -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.theme.spacing /** * The way into `BroadcastGroupSignedEventScreen`, drawn the same under every diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/buttons/Clickable.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/buttons/Clickable.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/buttons/Clickable.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/buttons/Clickable.kt index 55c47c33..8b78fd42 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/buttons/Clickable.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/buttons/Clickable.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package to.curare.compose.ui.composable.widgets.buttons +package com.machankura.bennu.compose.ui.composable.widgets.buttons import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.Indication @@ -37,12 +37,12 @@ import androidx.compose.ui.graphics.Shape import androidx.compose.ui.semantics.Role import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.dp -import to.curare.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.theme.spacing /** * A tappable surface with no chrome of its own -- vendored from ACINQ's phoenix app. * - * Two things were changed when it moved into `to.curare` from the `com.machankura` + * Two things were changed when it moved into `com.machankura.bennu` from the `com.machankura` * package it was still declaring: * * - **`minimumInteractiveComponentSize()` is applied unconditionally.** Its defaults are diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/buttons/ExtendedFab.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/buttons/ExtendedFab.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/buttons/ExtendedFab.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/buttons/ExtendedFab.kt index 76c2ba7d..eaf1cf03 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/buttons/ExtendedFab.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/buttons/ExtendedFab.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.buttons +package com.machankura.bennu.compose.ui.composable.widgets.buttons import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.width @@ -12,7 +12,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.semantics.disabled import androidx.compose.ui.semantics.semantics -import to.curare.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.theme.spacing /** * A screen's one primary action, as an extended FAB with a label beside its icon. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/chat/ChatTranscript.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/chat/ChatTranscript.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/chat/ChatTranscript.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/chat/ChatTranscript.kt index d7631fc2..b3cf1793 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/chat/ChatTranscript.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/chat/ChatTranscript.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.chat +package com.machankura.bennu.compose.ui.composable.widgets.chat import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -17,15 +17,15 @@ import androidx.compose.foundation.lazy.items import androidx.compose.foundation.text.selection.SelectionContainer import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.AccountTree -import curare.composeapp.generated.resources.open -import curare.composeapp.generated.resources.the_group_has_its_key_finish_setting_it_up -import curare.composeapp.generated.resources.check_the_combined_result -import curare.composeapp.generated.resources.send_your_contribution_to_the_key -import curare.composeapp.generated.resources.join_the_ceremony_by_publishing_your_key -import curare.composeapp.generated.resources.the_subgroups_key_ceremony_needs_you -import curare.composeapp.generated.resources.the_key_ceremony_needs_you -import curare.composeapp.generated.resources.ceremonies_need_you -import to.curare.compose.database.model.types.DkgApprovalStep +import bennu.composeapp.generated.resources.open +import bennu.composeapp.generated.resources.the_group_has_its_key_finish_setting_it_up +import bennu.composeapp.generated.resources.check_the_combined_result +import bennu.composeapp.generated.resources.send_your_contribution_to_the_key +import bennu.composeapp.generated.resources.join_the_ceremony_by_publishing_your_key +import bennu.composeapp.generated.resources.the_subgroups_key_ceremony_needs_you +import bennu.composeapp.generated.resources.the_key_ceremony_needs_you +import bennu.composeapp.generated.resources.ceremonies_need_you +import com.machankura.bennu.compose.database.model.types.DkgApprovalStep import androidx.compose.material.icons.filled.AccessTime import androidx.compose.material.icons.filled.Block import androidx.compose.material.icons.filled.Check @@ -67,29 +67,29 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.intermdiate.LocalChatMessage -import to.curare.compose.extensions.shortened -import to.curare.compose.extensions.toFormattedTimeAndDateString -import to.curare.compose.ui.composable.widgets.profile.ProfileColor -import to.curare.compose.ui.view.model.ChatMessageListViewModel -import to.curare.compose.ui.view.state.ChatMessageListUIState -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.composable.widgets.Decorative -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatMessage +import com.machankura.bennu.compose.extensions.shortened +import com.machankura.bennu.compose.extensions.toFormattedTimeAndDateString +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileColor +import com.machankura.bennu.compose.ui.view.model.ChatMessageListViewModel +import com.machankura.bennu.compose.ui.view.state.ChatMessageListUIState +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.currently_no_messages_have_been_shared -import curare.composeapp.generated.resources.loading -import curare.composeapp.generated.resources.no_chat_message_relays_were_found_for_this -import curare.composeapp.generated.resources.private_to_you -import curare.composeapp.generated.resources.review -import curare.composeapp.generated.resources.waiting_for_your_signature -import curare.composeapp.generated.resources.you -import curare.composeapp.generated.resources.private_to -import curare.composeapp.generated.resources.proposals_are_waiting_for_your_signature -import curare.composeapp.generated.resources.reply_privately_to -import curare.composeapp.generated.resources.sent_a_private_message_to -import to.curare.compose.ui.composable.widgets.ErrorState +import bennu.composeapp.generated.resources.currently_no_messages_have_been_shared +import bennu.composeapp.generated.resources.loading +import bennu.composeapp.generated.resources.no_chat_message_relays_were_found_for_this +import bennu.composeapp.generated.resources.private_to_you +import bennu.composeapp.generated.resources.review +import bennu.composeapp.generated.resources.waiting_for_your_signature +import bennu.composeapp.generated.resources.you +import bennu.composeapp.generated.resources.private_to +import bennu.composeapp.generated.resources.proposals_are_waiting_for_your_signature +import bennu.composeapp.generated.resources.reply_privately_to +import bennu.composeapp.generated.resources.sent_a_private_message_to +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState /** * A chat room's transcript: its messages, the notices between them, and the standing ask diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/coil/forwardingPainter.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/coil/forwardingPainter.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/coil/forwardingPainter.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/coil/forwardingPainter.kt index 999dd354..b4cfb16f 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/coil/forwardingPainter.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/coil/forwardingPainter.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.coil +package com.machankura.bennu.compose.ui.composable.widgets.coil import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.DefaultAlpha diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/ArticleCard.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/ArticleCard.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/ArticleCard.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/ArticleCard.kt index d5777c77..36b6a74e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/ArticleCard.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/ArticleCard.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.content +package com.machankura.bennu.compose.ui.composable.widgets.content import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.clickable @@ -21,16 +21,16 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.article -import curare.composeapp.generated.resources.loading_article -import curare.composeapp.generated.resources.untitled_article +import bennu.composeapp.generated.resources.article +import bennu.composeapp.generated.resources.loading_article +import bennu.composeapp.generated.resources.untitled_article @Composable private fun ArticleCard( - localNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent, + localNostrEvent: com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent, dTag: String, author: String, relayHints: List, @@ -133,7 +133,7 @@ private fun ArticleCard( verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(top = MaterialTheme.spacing.space75) ) { - to.curare.compose.ui.composable.widgets.profile.ProfileAvatar( + com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar( profile = profile, publicKey = localNostrEvent.nostrEvent.pubKey, size = 20.dp diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/Constants.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/Constants.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/Constants.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/Constants.kt index 5e190f26..3f3c3b8f 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/Constants.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/Constants.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.content +package com.machankura.bennu.compose.ui.composable.widgets.content import androidx.collection.LruCache diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/ContentParser.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/ContentParser.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/ContentParser.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/ContentParser.kt index 1d7427cc..f79d70cc 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/ContentParser.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/ContentParser.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.content +package com.machankura.bennu.compose.ui.composable.widgets.content import com.vitorpamplona.quartz.nip19Bech32.Nip19Parser import com.vitorpamplona.quartz.nip19Bech32.entities.NAddress diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/ContentSegment.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/ContentSegment.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/ContentSegment.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/ContentSegment.kt index a43b135e..74489105 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/ContentSegment.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/ContentSegment.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.content +package com.machankura.bennu.compose.ui.composable.widgets.content import com.vitorpamplona.quartz.nip01Core.relay.normalizer.normalizeRelayUrl import com.vitorpamplona.quartz.nip19Bech32.entities.NAddress diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/FullScreenImageViewer.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/FullScreenImageViewer.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/FullScreenImageViewer.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/FullScreenImageViewer.kt index 4982ed9d..cb892f56 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/FullScreenImageViewer.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/FullScreenImageViewer.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.content +package com.machankura.bennu.compose.ui.composable.widgets.content import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -39,7 +39,7 @@ import androidx.compose.ui.window.DialogProperties import coil3.compose.AsyncImage import androidx.compose.material3.MaterialTheme import androidx.compose.material3.minimumInteractiveComponentSize -import to.curare.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.theme.spacing @Composable fun FullScreenImageViewer( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/Helpers.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/Helpers.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/Helpers.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/Helpers.kt index 09a0c2a3..8a7fbbe2 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/Helpers.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/Helpers.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.content +package com.machankura.bennu.compose.ui.composable.widgets.content import com.vitorpamplona.quartz.nip68Picture.PictureEvent import com.vitorpamplona.quartz.nip71Video.VideoNormalEvent @@ -159,7 +159,7 @@ internal object Helpers { // } } - fun isGalleryEvent(event: to.curare.compose.database.model.NostrEvent): Boolean = event.kind in arrayOf( + fun isGalleryEvent(event: com.machankura.bennu.compose.database.model.NostrEvent): Boolean = event.kind in arrayOf( PictureEvent.KIND, VideoNormalEvent.KIND, VideoShortEvent.KIND diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/ImageWithContextMenu.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/ImageWithContextMenu.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/ImageWithContextMenu.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/ImageWithContextMenu.kt index 1509673c..17543c4e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/ImageWithContextMenu.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/ImageWithContextMenu.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.content +package com.machankura.bennu.compose.ui.composable.widgets.content import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.clickable @@ -32,12 +32,12 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalClipboardManager import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.unit.dp -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.copy_url -import curare.composeapp.generated.resources.download -import curare.composeapp.generated.resources.tap_to_load +import bennu.composeapp.generated.resources.copy_url +import bennu.composeapp.generated.resources.download +import bennu.composeapp.generated.resources.tap_to_load @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/InvoicePayState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/InvoicePayState.kt similarity index 51% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/InvoicePayState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/InvoicePayState.kt index 9923af09..407e8269 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/InvoicePayState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/InvoicePayState.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.content +package com.machankura.bennu.compose.ui.composable.widgets.content internal enum class InvoicePayState { Idle, Paying, Success, Failed diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LightningInvoiceCard.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/LightningInvoiceCard.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LightningInvoiceCard.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/LightningInvoiceCard.kt index 44f40ad7..d6b9027a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LightningInvoiceCard.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/LightningInvoiceCard.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.content +package com.machankura.bennu.compose.ui.composable.widgets.content import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.Column @@ -33,18 +33,18 @@ import androidx.compose.ui.unit.dp import fr.acinq.lightning.payment.Bolt11Invoice import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.composable.widgets.Decorative -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.any_amount -import curare.composeapp.generated.resources.cancel -import curare.composeapp.generated.resources.expired -import curare.composeapp.generated.resources.failed -import curare.composeapp.generated.resources.lightning_invoice -import curare.composeapp.generated.resources.paid -import curare.composeapp.generated.resources.pay -import curare.composeapp.generated.resources.pay_now +import bennu.composeapp.generated.resources.any_amount +import bennu.composeapp.generated.resources.cancel +import bennu.composeapp.generated.resources.expired +import bennu.composeapp.generated.resources.failed +import bennu.composeapp.generated.resources.lightning_invoice +import bennu.composeapp.generated.resources.paid +import bennu.composeapp.generated.resources.pay +import bennu.composeapp.generated.resources.pay_now @Composable internal fun LightningInvoiceCard( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LinkPreview.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/LinkPreview.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LinkPreview.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/LinkPreview.kt index a7c82d0b..637f68ec 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LinkPreview.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/LinkPreview.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.content +package com.machankura.bennu.compose.ui.composable.widgets.content import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.clickable @@ -25,8 +25,8 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import coil3.compose.AsyncImage import io.ktor.http.Url -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.composable.widgets.Decorative @Composable internal fun LinkPreview(url: String) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LiveStreamCard.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/LiveStreamCard.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LiveStreamCard.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/LiveStreamCard.kt index af857b1b..3999f778 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LiveStreamCard.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/LiveStreamCard.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.content +package com.machankura.bennu.compose.ui.composable.widgets.content import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.clickable @@ -12,11 +12,11 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import to.curare.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.theme.spacing @Composable private fun LiveStreamCard( - localNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent, + localNostrEvent: com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent, dTag: String, author: String, relayHints: List, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LiveStreamCardContent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/LiveStreamCardContent.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LiveStreamCardContent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/LiveStreamCardContent.kt index 82068c54..aac69dd4 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LiveStreamCardContent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/LiveStreamCardContent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.content +package com.machankura.bennu.compose.ui.composable.widgets.content import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column @@ -19,23 +19,23 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.ended -import curare.composeapp.generated.resources.live -import curare.composeapp.generated.resources.live_stream -import curare.composeapp.generated.resources.loading_stream +import bennu.composeapp.generated.resources.ended +import bennu.composeapp.generated.resources.live +import bennu.composeapp.generated.resources.live_stream +import bennu.composeapp.generated.resources.loading_stream @Composable internal fun LiveStreamCardContent( - event: to.curare.compose.database.model.NostrEvent?, + event: com.machankura.bennu.compose.database.model.NostrEvent?, streamUrl: String?, image: String?, title: String?, summary: String?, status: String?, - profile: to.curare.compose.database.model.Profile?, + profile: com.machankura.bennu.compose.database.model.Profile?, author: String, onProfileClick: ((String) -> Unit)? ) { @@ -141,7 +141,7 @@ internal fun LiveStreamCardContent( verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(top = MaterialTheme.spacing.space75) ) { - to.curare.compose.ui.composable.widgets.profile.ProfileAvatar( + com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar( profile = profile, publicKey = event.pubKey, size = 20.dp diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LoadingAsyncImage.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/LoadingAsyncImage.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LoadingAsyncImage.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/LoadingAsyncImage.kt index db7d33a4..a0d39243 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LoadingAsyncImage.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/LoadingAsyncImage.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.content +package com.machankura.bennu.compose.ui.composable.widgets.content import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.combinedClickable diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/MediaMeta.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/MediaMeta.kt similarity index 68% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/MediaMeta.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/MediaMeta.kt index 7c4b111a..473df40f 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/MediaMeta.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/MediaMeta.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.content +package com.machankura.bennu.compose.ui.composable.widgets.content data class MediaMeta( val url: String, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/NoteActions.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/NoteActions.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/NoteActions.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/NoteActions.kt index ad22c133..6236052b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/NoteActions.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/NoteActions.kt @@ -1,6 +1,6 @@ -package to.curare.compose.ui.composable.widgets.content +package com.machankura.bennu.compose.ui.composable.widgets.content -import to.curare.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.NostrEvent data class NoteActions( val onReply: (NostrEvent) -> Unit = {}, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/OgData.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/OgData.kt similarity index 66% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/OgData.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/OgData.kt index 084d363e..856759e0 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/OgData.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/OgData.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.content +package com.machankura.bennu.compose.ui.composable.widgets.content internal data class OgData( val title: String?, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/QuotedAddressableNote.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/QuotedAddressableNote.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/QuotedAddressableNote.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/QuotedAddressableNote.kt index f061aa98..6c42d818 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/QuotedAddressableNote.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/QuotedAddressableNote.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.content +package com.machankura.bennu.compose.ui.composable.widgets.content import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.Row @@ -17,15 +17,15 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.dp -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.loading_note +import bennu.composeapp.generated.resources.loading_note @Composable internal fun QuotedAddressableNote( - localQuotedNostrEvent: to.curare.compose.database.model.intermdiate.LocalQuotedNostrEvent?, + localQuotedNostrEvent: com.machankura.bennu.compose.database.model.intermdiate.LocalQuotedNostrEvent?, kind: Int, dTag: String, author: String, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/QuotedNote.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/QuotedNote.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/QuotedNote.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/QuotedNote.kt index 4e6c4573..571f3fc8 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/QuotedNote.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/QuotedNote.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.content +package com.machankura.bennu.compose.ui.composable.widgets.content import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.clickable @@ -19,15 +19,15 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.loading_note -import to.curare.compose.ui.theme.ConformancePreviews +import bennu.composeapp.generated.resources.loading_note +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @Composable fun QuotedNote( - localQuotedNostrEvent: to.curare.compose.database.model.intermdiate.LocalQuotedNostrEvent? = null, + localQuotedNostrEvent: com.machankura.bennu.compose.database.model.intermdiate.LocalQuotedNostrEvent? = null, onNavigateToEvent:(HexKey) -> Unit, noteActions: NoteActions? = null ) { @@ -120,14 +120,14 @@ fun QuotedNote( @ConformancePreviews @Composable private fun QuotedNotePreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { QuotedNote( - localQuotedNostrEvent = to.curare.compose.database.model.intermdiate.LocalQuotedNostrEvent( - nostrEvent = to.curare.compose.database.model.NostrEvent( + localQuotedNostrEvent = com.machankura.bennu.compose.database.model.intermdiate.LocalQuotedNostrEvent( + nostrEvent = com.machankura.bennu.compose.database.model.NostrEvent( id = "1c7213118d4e17c6bad5c6b11125f005619bc3e43374affb9cd6483f665fd5e6", content = "God is not in the habit of coming down from heaven to solve people’s problems on earth.", pubKey = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a522", @@ -135,12 +135,12 @@ private fun QuotedNotePreview() { sig = "hexsig", tags = emptyArray() ), - quotedRelation = to.curare.compose.database.model.QuotedRelation( + quotedRelation = com.machankura.bennu.compose.database.model.QuotedRelation( quotingNostrEventId = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a520", quotedProfilePublicKey = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a522", quotedNostrEventId = "1c7213118d4e17c6bad5c6b11125f005619bc3e43374affb9cd6483f665fd5e6" ), - profile = to.curare.compose.database.model.Profile( + profile = com.machankura.bennu.compose.database.model.Profile( publicKey = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a522", nostrEventId = "referenced", displayName = "Steve Biko" diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/RichContent.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/RichContent.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/RichContent.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/RichContent.kt index 72a32dea..88c8495b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/RichContent.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/RichContent.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.content +package com.machankura.bennu.compose.ui.composable.widgets.content import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize @@ -30,18 +30,18 @@ import androidx.compose.ui.unit.dp import co.touchlab.kermit.Logger import coil3.compose.AsyncImage import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.nostr -import curare.composeapp.generated.resources.nostr_2 -import to.curare.compose.ui.theme.ConformancePreviews +import bennu.composeapp.generated.resources.nostr +import bennu.composeapp.generated.resources.nostr_2 +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @Composable fun RichContent( - nostrEvent: to.curare.compose.database.model.NostrEvent, - localQuotedNostrEvent: to.curare.compose.database.model.intermdiate.LocalQuotedNostrEvent?, - mentionedProfiles: List, + nostrEvent: com.machankura.bennu.compose.database.model.NostrEvent, + localQuotedNostrEvent: com.machankura.bennu.compose.database.model.intermdiate.LocalQuotedNostrEvent?, + mentionedProfiles: List, style: TextStyle = MaterialTheme.typography.bodyLarge, color: Color = MaterialTheme.colorScheme.onSurface, linkColor: Color = Color.Unspecified, @@ -202,7 +202,7 @@ fun RichContent( onProfileClick?.invoke(pubkey) } ) { - withStyle(SpanStyle(color = to.curare.compose.ui.composable.widgets.profile.ProfileColor.fromPublicKey(seg.pubkey), textDecoration = linkDecoration)) { + withStyle(SpanStyle(color = com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileColor.fromPublicKey(seg.pubkey), textDecoration = linkDecoration)) { append("@${displayName.trimEnd()}") } } @@ -401,7 +401,7 @@ fun RichContent( @ConformancePreviews @Composable private fun RichContentPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { @@ -410,7 +410,7 @@ private fun RichContentPreview() { ) { RichContent( modifier = Modifier.padding(MaterialTheme.spacing.space125), - nostrEvent = to.curare.compose.database.model.NostrEvent( + nostrEvent = com.machankura.bennu.compose.database.model.NostrEvent( id = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a520", content = "Something something something nostr:npub1uh366qnj68a7atvwgwdy4569xd6v5jtferftapqztwjwlzh9553q47pqsx\nhttps://www.brainyquote.com/authors/steven-biko-quotes\nnostr:nevent1qqspcusnzxx5u97xht2udvg3yhcq2cvmc0jrxa90lwwdvjplve0atespzpmhxue69uhkummnw3ezuamfdejsyg8h5g639qhuv803hzwexfwhyud6t6suxfu364anddqvrmn9j4cahvxksr8q", pubKey = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a522", @@ -418,8 +418,8 @@ private fun RichContentPreview() { sig = "hexsig", tags = emptyArray() ), - localQuotedNostrEvent = to.curare.compose.database.model.intermdiate.LocalQuotedNostrEvent( - nostrEvent = to.curare.compose.database.model.NostrEvent( + localQuotedNostrEvent = com.machankura.bennu.compose.database.model.intermdiate.LocalQuotedNostrEvent( + nostrEvent = com.machankura.bennu.compose.database.model.NostrEvent( id = "1c7213118d4e17c6bad5c6b11125f005619bc3e43374affb9cd6483f665fd5e6", content = "God is not in the habit of coming down from heaven to solve people’s problems on earth.", pubKey = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a522", @@ -427,24 +427,24 @@ private fun RichContentPreview() { sig = "hexsig", tags = emptyArray() ), - quotedRelation = to.curare.compose.database.model.QuotedRelation( + quotedRelation = com.machankura.bennu.compose.database.model.QuotedRelation( quotingNostrEventId = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a520", quotedProfilePublicKey = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a522", quotedNostrEventId = "1c7213118d4e17c6bad5c6b11125f005619bc3e43374affb9cd6483f665fd5e6" ), - profile = to.curare.compose.database.model.Profile( + profile = com.machankura.bennu.compose.database.model.Profile( publicKey = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a522", nostrEventId = "referenced", displayName = "Steve Biko" ), ), mentionedProfiles = listOf( - to.curare.compose.database.model.intermdiate.LocalMention( - mention = to.curare.compose.database.model.Mention( + com.machankura.bennu.compose.database.model.intermdiate.LocalMention( + mention = com.machankura.bennu.compose.database.model.Mention( id = 1, mentionedPublicKey = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a522", ), - profile = to.curare.compose.database.model.Profile( + profile = com.machankura.bennu.compose.database.model.Profile( publicKey = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a522", nostrEventId = "referenced", displayName = "Frank Talk" diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/UnsupportedKindBadge.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/UnsupportedKindBadge.kt similarity index 81% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/UnsupportedKindBadge.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/UnsupportedKindBadge.kt index 114139cb..c2c14c01 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/UnsupportedKindBadge.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/content/UnsupportedKindBadge.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.content +package com.machankura.bennu.compose.ui.composable.widgets.content import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.fillMaxWidth @@ -11,11 +11,11 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.dp -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.unsupported_event_kind -import curare.composeapp.generated.resources.unsupported_event_kind_2 +import bennu.composeapp.generated.resources.unsupported_event_kind +import bennu.composeapp.generated.resources.unsupported_event_kind_2 @Composable internal fun UnsupportedKindBadge(kind: Int?, style: TextStyle) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/detail/MetadataEventDetail.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/detail/MetadataEventDetail.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/detail/MetadataEventDetail.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/detail/MetadataEventDetail.kt index 4359b598..6dedade1 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/detail/MetadataEventDetail.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/detail/MetadataEventDetail.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.detail +package com.machankura.bennu.compose.ui.composable.widgets.detail import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -40,36 +40,36 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalNostrEvent -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute -import to.curare.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.profile.ProfileAvatar -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.model.MetadataEventDetailType -import to.curare.compose.ui.view.model.MetadataEventDetailViewModel -import to.curare.compose.ui.view.state.MetadataEventDetailUIState +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ImplementationPendingRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.model.MetadataEventDetailType +import com.machankura.bennu.compose.ui.view.model.MetadataEventDetailViewModel +import com.machankura.bennu.compose.ui.view.state.MetadataEventDetailUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent -import to.curare.compose.ui.composable.widgets.LocalCanSign -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.composable.widgets.LocalCanSign +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.add_to_group -import curare.composeapp.generated.resources.block_user -import curare.composeapp.generated.resources.edit_profile -import curare.composeapp.generated.resources.follow -import curare.composeapp.generated.resources.follow_back -import curare.composeapp.generated.resources.send_message -import curare.composeapp.generated.resources.unfollow +import bennu.composeapp.generated.resources.add_to_group +import bennu.composeapp.generated.resources.block_user +import bennu.composeapp.generated.resources.edit_profile +import bennu.composeapp.generated.resources.follow +import bennu.composeapp.generated.resources.follow_back +import bennu.composeapp.generated.resources.send_message +import bennu.composeapp.generated.resources.unfollow import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class) @Composable @@ -328,7 +328,7 @@ fun MetadataEventDetail( @Composable private fun MetadataEventEventDetailPreview() { - CurareTheme { + BennuTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/detail/TextNoteEventDetail.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/detail/TextNoteEventDetail.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/detail/TextNoteEventDetail.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/detail/TextNoteEventDetail.kt index 847aadef..89034402 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/detail/TextNoteEventDetail.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/detail/TextNoteEventDetail.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.detail +package com.machankura.bennu.compose.ui.composable.widgets.detail import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -43,40 +43,40 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import to.curare.compose.extensions.toFormattedTimeAndDateString +import com.machankura.bennu.compose.extensions.toFormattedTimeAndDateString import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.be_the_first_to_comment -import curare.composeapp.generated.resources.post -import curare.composeapp.generated.resources.something_went_wrong -import curare.composeapp.generated.resources.reply_to -import to.curare.compose.ui.composable.widgets.ErrorState +import bennu.composeapp.generated.resources.be_the_first_to_comment +import bennu.composeapp.generated.resources.post +import bennu.composeapp.generated.resources.something_went_wrong +import bennu.composeapp.generated.resources.reply_to +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState import androidx.compose.material3.SnackbarHost -import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState -import to.curare.compose.ui.composable.widgets.NavigateBackButton -import to.curare.compose.ui.theme.readableContent -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.composable.widgets.LocalSnackbarHostState +import com.machankura.bennu.compose.ui.composable.widgets.NavigateBackButton +import com.machankura.bennu.compose.ui.theme.readableContent +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class) @Composable fun TextNoteEventDetail( - localNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent, + localNostrEvent: com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent, onNavigateBack: () -> Unit, - nostrRepository: to.curare.compose.repository.NostrRepository, + nostrRepository: com.machankura.bennu.compose.repository.NostrRepository, onNavigateToWriteAReply: (String) -> Unit, onNavigateToNostrEvent: (HexKey) -> Unit, ) { val scrollBehavior = BottomAppBarDefaults.exitAlwaysScrollBehavior() - val inReplyToNostrEventFeedListViewModel: to.curare.compose.ui.view.model.InReplyToViewModel = viewModel( + val inReplyToNostrEventFeedListViewModel: com.machankura.bennu.compose.ui.view.model.InReplyToViewModel = viewModel( key = "replies-${localNostrEvent.nostrEvent.id}", - factory = to.curare.compose.ui.view.model.InReplyToViewModel.factory( + factory = com.machankura.bennu.compose.ui.view.model.InReplyToViewModel.factory( nostrEvent = localNostrEvent.nostrEvent, profile = localNostrEvent.profile, - initialFeedListUIState = to.curare.compose.ui.view.state.FeedListUIState.Loading, + initialFeedListUIState = com.machankura.bennu.compose.ui.view.state.FeedListUIState.Loading, nostrRepository = nostrRepository, createdAt = localNostrEvent.nostrEvent.createdAt ), @@ -126,7 +126,7 @@ fun TextNoteEventDetail( Icon( Icons.Default.Person, contentDescription = "User profile", - tint = to.curare.compose.ui.composable.widgets.profile.ProfileColor.fromPublicKey("profile") + tint = com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileColor.fromPublicKey("profile") ) // ProfileAvatar( // profile = localProfile.profile, @@ -210,7 +210,7 @@ fun TextNoteEventDetail( ) { val profile = localNostrEvent.profile - to.curare.compose.ui.composable.widgets.profile.ProfileAvatar( + com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar( profile = localNostrEvent.profile, publicKey = localNostrEvent.nostrEvent.pubKey ) @@ -227,7 +227,7 @@ fun TextNoteEventDetail( Text( text = staticIdentifier, style = MaterialTheme.typography.labelMedium, - color = to.curare.compose.ui.composable.widgets.profile.ProfileColor.fromProfile( + color = com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileColor.fromProfile( profile ) ) @@ -257,7 +257,7 @@ fun TextNoteEventDetail( } } - to.curare.compose.ui.composable.widgets.content.RichContent( + com.machankura.bennu.compose.ui.composable.widgets.content.RichContent( modifier = Modifier.fillMaxWidth().padding( horizontal = MaterialTheme.spacing.space250 ), @@ -344,7 +344,7 @@ fun TextNoteEventDetail( } when (val inReplyToFeedListUIState = inReplyToNostrEventFeedListViewModel.inReplyToFeedListUIState) { - is to.curare.compose.ui.view.state.FeedListUIState.Loaded -> { + is com.machankura.bennu.compose.ui.view.state.FeedListUIState.Loaded -> { if (inReplyToFeedListUIState.localNostrEvents.isEmpty()) { item { Text( @@ -362,10 +362,10 @@ fun TextNoteEventDetail( } } } - to.curare.compose.ui.view.state.FeedListUIState.Error -> { + com.machankura.bennu.compose.ui.view.state.FeedListUIState.Error -> { item { ErrorState() } } - to.curare.compose.ui.view.state.FeedListUIState.Loading -> { + com.machankura.bennu.compose.ui.view.state.FeedListUIState.Loading -> { item { LoadingIndicator() } @@ -384,13 +384,13 @@ fun TextNoteEventDetail( @Composable private fun TextNoteEventDetailPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { TextNoteEventDetail( - localNostrEvent = to.curare.compose.database.model.intermdiate.LocalNostrEvent( - nostrEvent = to.curare.compose.database.model.NostrEvent( + localNostrEvent = com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent( + nostrEvent = com.machankura.bennu.compose.database.model.NostrEvent( id = "eventId", pubKey = "publicKey", content = """Lorem Ipsum is simply dummy text of the printing and typesetting industry. @@ -402,7 +402,7 @@ It has survived not only five centuries, but also the leap into electronic types sig = "", kind = TextNoteEvent.KIND ), - profile = to.curare.compose.database.model.Profile( + profile = com.machankura.bennu.compose.database.model.Profile( publicKey = "pubKey", displayName = "John Doe", nip05 = "john@doe.me", @@ -412,7 +412,7 @@ It has survived not only five centuries, but also the leap into electronic types onNavigateBack = {}, onNavigateToWriteAReply = {}, onNavigateToNostrEvent = {}, - nostrRepository = to.curare.compose.repository.NostrRepository.NO_OP_NOSTR_REPOSITORY + nostrRepository = com.machankura.bennu.compose.repository.NostrRepository.NO_OP_NOSTR_REPOSITORY ) } } diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/dialogs/BottomSheetDialog.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/dialogs/BottomSheetDialog.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/dialogs/BottomSheetDialog.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/dialogs/BottomSheetDialog.kt index a28c68f3..ce78fd0b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/dialogs/BottomSheetDialog.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/dialogs/BottomSheetDialog.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package to.curare.compose.ui.composable.widgets.dialogs +package com.machankura.bennu.compose.ui.composable.widgets.dialogs import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope @@ -37,7 +37,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import to.curare.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.theme.spacing /** Provides a Material3 [ModalBottomSheet] with some presets. Content is contained in a [Column] with [internalPadding]. */ @OptIn(ExperimentalMaterial3Api::class) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/dialogs/NewChatBottomSheetDialog.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/dialogs/NewChatBottomSheetDialog.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/dialogs/NewChatBottomSheetDialog.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/dialogs/NewChatBottomSheetDialog.kt index 73e5db06..25483821 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/dialogs/NewChatBottomSheetDialog.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/dialogs/NewChatBottomSheetDialog.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.dialogs +package com.machankura.bennu.compose.ui.composable.widgets.dialogs import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -25,16 +25,16 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import to.curare.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.close -import curare.composeapp.generated.resources.create_new_chat -import curare.composeapp.generated.resources.direct_message_via_npub -import curare.composeapp.generated.resources.start_a_group_chat +import bennu.composeapp.generated.resources.close +import bennu.composeapp.generated.resources.create_new_chat +import bennu.composeapp.generated.resources.direct_message_via_npub +import bennu.composeapp.generated.resources.start_a_group_chat @OptIn(ExperimentalMaterial3Api::class) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/dialogs/SignOutOfReadOnlyDialog.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/dialogs/SignOutOfReadOnlyDialog.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/dialogs/SignOutOfReadOnlyDialog.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/dialogs/SignOutOfReadOnlyDialog.kt index 36a70623..97163266 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/dialogs/SignOutOfReadOnlyDialog.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/dialogs/SignOutOfReadOnlyDialog.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.dialogs +package com.machankura.bennu.compose.ui.composable.widgets.dialogs import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Logout @@ -7,14 +7,14 @@ import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.cancel -import curare.composeapp.generated.resources.sign_out -import curare.composeapp.generated.resources.this_device_holds_no_key_for_s_so_there +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.cancel +import bennu.composeapp.generated.resources.sign_out +import bennu.composeapp.generated.resources.this_device_holds_no_key_for_s_so_there import org.jetbrains.compose.resources.StringResource import org.jetbrains.compose.resources.stringResource -import to.curare.compose.extensions.hexToNpubHrp -import to.curare.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.extensions.hexToNpubHrp +import com.machankura.bennu.compose.ui.composable.widgets.Decorative /** * The confirmation before a read-only identity leaves the device, naming the npub so diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05Dialog.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05Dialog.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05Dialog.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05Dialog.kt index df884358..f9576684 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05Dialog.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05Dialog.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.dialogs +package com.machankura.bennu.compose.ui.composable.widgets.dialogs import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -32,26 +32,26 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog -import to.curare.compose.identity.CredentialParser -import to.curare.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import to.curare.compose.ui.composable.navigation.routes.ProfilePreviewRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.theme.CurareTheme +import com.machankura.bennu.compose.identity.CredentialParser +import com.machankura.bennu.compose.ui.composable.navigation.routes.ImplementationPendingRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ProfilePreviewRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.theme.BennuTheme import com.vitorpamplona.quartz.nip01Core.core.HexKey import fr.acinq.phoenix.utils.Parser import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch -import to.curare.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.theme.spacing import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester -import curare.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.find_profile -import curare.composeapp.generated.resources.input_npub_or_nip05 -import curare.composeapp.generated.resources.start_chat_via_npub_or_nip05 -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.theme.ConformancePreviews +import bennu.composeapp.generated.resources.find_profile +import bennu.composeapp.generated.resources.input_npub_or_nip05 +import bennu.composeapp.generated.resources.start_chat_via_npub_or_nip05 +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.theme.ConformancePreviews /** * Whom to write to, as an npub or a nip05. @@ -193,7 +193,7 @@ fun StartDirectMessageToNpubOrNip05Dialog( @ConformancePreviews @Composable private fun StartDirectMessageToNpubOrNip05DialogPreview() { - CurareTheme { + BennuTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/feed/EventListView.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/feed/EventListView.kt similarity index 79% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/feed/EventListView.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/feed/EventListView.kt index 2b517798..9afe332b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/feed/EventListView.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/feed/EventListView.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.feed +package com.machankura.bennu.compose.ui.composable.widgets.feed import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -18,21 +18,21 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import to.curare.compose.extensions.toFormattedTimeAndDateString +import com.machankura.bennu.compose.extensions.toFormattedTimeAndDateString import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent import com.vitorpamplona.quartz.nip18Reposts.RepostEvent import kotlin.time.Instant -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.loading_author_information_2 -import curare.composeapp.generated.resources.malformed_note -import curare.composeapp.generated.resources.reposted -import to.curare.compose.ui.theme.ConformancePreviews +import bennu.composeapp.generated.resources.loading_author_information_2 +import bennu.composeapp.generated.resources.malformed_note +import bennu.composeapp.generated.resources.reposted +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @Composable -fun to.curare.compose.database.model.intermdiate.LocalNostrEvent.ListView( +fun com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent.ListView( onNavigateToEvent: (HexKey) -> Unit ) { when (nostrEvent.kind) { @@ -68,7 +68,7 @@ fun to.curare.compose.database.model.intermdiate.LocalNostrEvent.ListView( Text( text = profile?.humanReadableNameOrPubkey() ?: nostrEvent.pubKey, style = MaterialTheme.typography.labelSmall, - color = to.curare.compose.ui.composable.widgets.profile.ProfileColor.fromPublicKey(profile?.publicKey ?: nostrEvent.pubKey) + color = com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileColor.fromPublicKey(profile?.publicKey ?: nostrEvent.pubKey) ) Text( text = stringResource(Res.string.reposted), @@ -129,12 +129,12 @@ fun to.curare.compose.database.model.intermdiate.LocalNostrEvent.ListView( @ConformancePreviews @Composable private fun EventListViewRepostedPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { - to.curare.compose.database.model.intermdiate.LocalNostrEvent( - nostrEvent = to.curare.compose.database.model.NostrEvent( + com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent( + nostrEvent = com.machankura.bennu.compose.database.model.NostrEvent( id = "hex", content = "Reposting", pubKey = "hexpubkeypubkeypubkeypubkey", @@ -142,13 +142,13 @@ private fun EventListViewRepostedPreview() { sig = "hexsig", tags = emptyArray() ), - localRepostedNostrEvent = to.curare.compose.database.model.intermdiate.LocalRepostedNostrEvent( - repostedRelation = to.curare.compose.database.model.RepostedRelation( + localRepostedNostrEvent = com.machankura.bennu.compose.database.model.intermdiate.LocalRepostedNostrEvent( + repostedRelation = com.machankura.bennu.compose.database.model.RepostedRelation( repostingNostrEventId = "hex", repostedNostrEventId = "repostedhex", repostedProfilePublicKey = "reposterHex" ), - nostrEvent = to.curare.compose.database.model.NostrEvent( + nostrEvent = com.machankura.bennu.compose.database.model.NostrEvent( id = "hex", content = "Something something something", pubKey = "hexpubkeypubkeypubkeypubkey", @@ -156,7 +156,7 @@ private fun EventListViewRepostedPreview() { sig = "hexsig", tags = emptyArray() ), - profile = to.curare.compose.database.model.Profile( + profile = com.machankura.bennu.compose.database.model.Profile( publicKey = "hesd", nostrEventId = "referenced", displayName = "Frank Talk", @@ -164,7 +164,7 @@ private fun EventListViewRepostedPreview() { ), mentionedProfiles = emptyList() ), - profile = to.curare.compose.database.model.Profile( + profile = com.machankura.bennu.compose.database.model.Profile( publicKey = "", nostrEventId = "referenced", displayName = "Steve Biko", @@ -180,12 +180,12 @@ private fun EventListViewRepostedPreview() { @ConformancePreviews @Composable private fun EventListViewInReplyPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { - to.curare.compose.database.model.intermdiate.LocalNostrEvent( - nostrEvent = to.curare.compose.database.model.NostrEvent( + com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent( + nostrEvent = com.machankura.bennu.compose.database.model.NostrEvent( id = "hex", content = "Reposting", pubKey = "hexpubkeypubkeypubkeypubkey", @@ -193,15 +193,15 @@ private fun EventListViewInReplyPreview() { sig = "hexsig", tags = emptyArray() ), - localInReplyToNostrEvent = to.curare.compose.database.model.intermdiate.LocalInReplyToNostrEvent( - inReplyToRelation = to.curare.compose.database.model.InReplyToRelation( + localInReplyToNostrEvent = com.machankura.bennu.compose.database.model.intermdiate.LocalInReplyToNostrEvent( + inReplyToRelation = com.machankura.bennu.compose.database.model.InReplyToRelation( inReplyToNostrEventId = "nostrEvent", inReplyToRootNostrEventId = "rootId", inReplyToProfilePublicKey = "inReplyToProfileKey", inReplyToRootProfilePublicKey = "rootPubKey", replyingNostrEventId = "hex" ), - nostrEvent = to.curare.compose.database.model.NostrEvent( + nostrEvent = com.machankura.bennu.compose.database.model.NostrEvent( id = "hex", content = "Something something something", pubKey = "hexpubkeypubkeypubkeypubkey", @@ -209,7 +209,7 @@ private fun EventListViewInReplyPreview() { sig = "hexsig", tags = emptyArray() ), - profile = to.curare.compose.database.model.Profile( + profile = com.machankura.bennu.compose.database.model.Profile( publicKey = "hesd", nostrEventId = "referenced", displayName = "Frank Talk", @@ -217,7 +217,7 @@ private fun EventListViewInReplyPreview() { ), mentionedProfiles = emptyList() ), - profile = to.curare.compose.database.model.Profile( + profile = com.machankura.bennu.compose.database.model.Profile( publicKey = "", nostrEventId = "referenced", displayName = "Steve Biko", diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/feed/TextNoteFeedItem.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/feed/TextNoteFeedItem.kt similarity index 79% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/feed/TextNoteFeedItem.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/feed/TextNoteFeedItem.kt index 836bb13b..da526e43 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/feed/TextNoteFeedItem.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/feed/TextNoteFeedItem.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.feed +package com.machankura.bennu.compose.ui.composable.widgets.feed import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -22,23 +22,23 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import to.curare.compose.extensions.toFormattedTimeAndDateString +import com.machankura.bennu.compose.extensions.toFormattedTimeAndDateString import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.loading_author_information -import curare.composeapp.generated.resources.loading_information -import to.curare.compose.ui.theme.ConformancePreviews +import bennu.composeapp.generated.resources.loading_author_information +import bennu.composeapp.generated.resources.loading_information +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable internal fun TextNoteFeedItem( - nostrEvent: to.curare.compose.database.model.NostrEvent, - profile: to.curare.compose.database.model.Profile?, - localInReplyToNostrEvent: to.curare.compose.database.model.intermdiate.LocalInReplyToNostrEvent?, - localQuotedNostrEvent: to.curare.compose.database.model.intermdiate.LocalQuotedNostrEvent?, - mentionedProfiles: List, + nostrEvent: com.machankura.bennu.compose.database.model.NostrEvent, + profile: com.machankura.bennu.compose.database.model.Profile?, + localInReplyToNostrEvent: com.machankura.bennu.compose.database.model.intermdiate.LocalInReplyToNostrEvent?, + localQuotedNostrEvent: com.machankura.bennu.compose.database.model.intermdiate.LocalQuotedNostrEvent?, + mentionedProfiles: List, onNavigateToEvent: (HexKey) -> Unit ) { val expended = mutableStateOf(false) @@ -66,7 +66,7 @@ internal fun TextNoteFeedItem( } ), style = MaterialTheme.typography.labelLargeEmphasized, - color = to.curare.compose.ui.composable.widgets.profile.ProfileColor.fromPublicKey(localInReplyToNostrEvent.nostrEvent.pubKey), + color = com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileColor.fromPublicKey(localInReplyToNostrEvent.nostrEvent.pubKey), text = localInReplyToNostrEvent.profile?.humanReadableNameOrPubkey() ?: stringResource(Res.string.loading_information) ) } @@ -96,7 +96,7 @@ internal fun TextNoteFeedItem( horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.space125, Alignment.Start), verticalAlignment = Alignment.CenterVertically ) { - to.curare.compose.ui.composable.widgets.profile.ProfileAvatar( + com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar( publicKey = nostrEvent.pubKey, profile = profile ) @@ -113,7 +113,7 @@ internal fun TextNoteFeedItem( Text( text = staticIdentifier, style = MaterialTheme.typography.bodySmall, - color = to.curare.compose.ui.composable.widgets.profile.ProfileColor.fromProfile(profile) + color = com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileColor.fromProfile(profile) ) } } @@ -124,7 +124,7 @@ internal fun TextNoteFeedItem( ) } - to.curare.compose.ui.composable.widgets.content.RichContent( + com.machankura.bennu.compose.ui.composable.widgets.content.RichContent( modifier = Modifier.fillMaxWidth(), nostrEvent = nostrEvent, localQuotedNostrEvent = localQuotedNostrEvent, @@ -187,12 +187,12 @@ internal fun TextNoteFeedItem( @ConformancePreviews @Composable private fun TextNoteFeedItemPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { TextNoteFeedItem( - nostrEvent = to.curare.compose.database.model.NostrEvent( + nostrEvent = com.machankura.bennu.compose.database.model.NostrEvent( id = "hex", content = "You are either alive and proud or you are dead, and when you are dead, you can't care anyway. https://www.brainyquote.com/authors/steven-biko-quotes", pubKey = "hexpubkeypubkeypubkeypubkey", @@ -200,7 +200,7 @@ private fun TextNoteFeedItemPreview() { sig = "hexsig", tags = emptyArray() ), - profile = to.curare.compose.database.model.Profile( + profile = com.machankura.bennu.compose.database.model.Profile( publicKey = "", nostrEventId = "referenced", displayName = "Frank Talk", @@ -218,12 +218,12 @@ private fun TextNoteFeedItemPreview() { @ConformancePreviews @Composable private fun TextNoteFeedItemInReplyToPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { TextNoteFeedItem( - nostrEvent = to.curare.compose.database.model.NostrEvent( + nostrEvent = com.machankura.bennu.compose.database.model.NostrEvent( id = "hex", content = "It is better to die for an idea that will live, than to live for an idea that will die", pubKey = "hexpubkeypubkeypubkeypubkey", @@ -231,22 +231,22 @@ private fun TextNoteFeedItemInReplyToPreview() { sig = "hexsig", tags = emptyArray() ), - profile = to.curare.compose.database.model.Profile( + profile = com.machankura.bennu.compose.database.model.Profile( publicKey = "", nostrEventId = "referenced", displayName = "Frank Talk", nip05 = "frank@talk.at" ), localQuotedNostrEvent = null, - localInReplyToNostrEvent = to.curare.compose.database.model.intermdiate.LocalInReplyToNostrEvent( - inReplyToRelation = to.curare.compose.database.model.InReplyToRelation( + localInReplyToNostrEvent = com.machankura.bennu.compose.database.model.intermdiate.LocalInReplyToNostrEvent( + inReplyToRelation = com.machankura.bennu.compose.database.model.InReplyToRelation( inReplyToNostrEventId = "nostrEvent", inReplyToRootNostrEventId = "rootId", inReplyToProfilePublicKey = "inReplyToProfileKey", inReplyToRootProfilePublicKey = "rootPubKey", replyingNostrEventId = "hex" ), - nostrEvent = to.curare.compose.database.model.NostrEvent( + nostrEvent = com.machankura.bennu.compose.database.model.NostrEvent( id = "hex", content = "Something something something", pubKey = "hexie", @@ -254,7 +254,7 @@ private fun TextNoteFeedItemInReplyToPreview() { sig = "hexsig", tags = emptyArray() ), - profile = to.curare.compose.database.model.Profile( + profile = com.machankura.bennu.compose.database.model.Profile( publicKey = "hesd", nostrEventId = "referenced", displayName = "Steve Biko", @@ -272,12 +272,12 @@ private fun TextNoteFeedItemInReplyToPreview() { @ConformancePreviews @Composable private fun TextNoteFeedItemQuoteNostrEventPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { TextNoteFeedItem( - nostrEvent = to.curare.compose.database.model.NostrEvent( + nostrEvent = com.machankura.bennu.compose.database.model.NostrEvent( id = "hex", content = "The revolutionary sees his task as liberation not only of the oppressed but also of the oppressor. Happiness can never truly exist in a state of tension.\n" + "Read more at nostr:npub1uh366qnj68a7atvwgwdy4569xd6v5jtferftapqztwjwlzh9553q47pqsx\nnostr:nevent1qqspcusnzxx5u97xht2udvg3yhcq2cvmc0jrxa90lwwdvjplve0atespzpmhxue69uhkummnw3ezuamfdejsyg8h5g639qhuv803hzwexfwhyud6t6suxfu364anddqvrmn9j4cahvxksr8q", @@ -286,14 +286,14 @@ private fun TextNoteFeedItemQuoteNostrEventPreview() { sig = "hexsig", tags = emptyArray() ), - profile = to.curare.compose.database.model.Profile( + profile = com.machankura.bennu.compose.database.model.Profile( publicKey = "", nostrEventId = "referenced", displayName = "Frank Talk", nip05 = "frank@talk.at" ), - localQuotedNostrEvent = to.curare.compose.database.model.intermdiate.LocalQuotedNostrEvent( - nostrEvent = to.curare.compose.database.model.NostrEvent( + localQuotedNostrEvent = com.machankura.bennu.compose.database.model.intermdiate.LocalQuotedNostrEvent( + nostrEvent = com.machankura.bennu.compose.database.model.NostrEvent( id = "1c7213118d4e17c6bad5c6b11125f005619bc3e43374affb9cd6483f665fd5e6", content = "God is not in the habit of coming down from heaven to solve people’s problems on earth.", pubKey = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a522", @@ -301,26 +301,26 @@ private fun TextNoteFeedItemQuoteNostrEventPreview() { sig = "hexsig", tags = emptyArray() ), - quotedRelation = to.curare.compose.database.model.QuotedRelation( + quotedRelation = com.machankura.bennu.compose.database.model.QuotedRelation( quotingNostrEventId = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a520", quotedProfilePublicKey = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a522", quotedNostrEventId = "1c7213118d4e17c6bad5c6b11125f005619bc3e43374affb9cd6483f665fd5e6" ), - profile = to.curare.compose.database.model.Profile( + profile = com.machankura.bennu.compose.database.model.Profile( publicKey = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a522", nostrEventId = "referenced", displayName = "Steve Biko" ), ), - localInReplyToNostrEvent = to.curare.compose.database.model.intermdiate.LocalInReplyToNostrEvent( - inReplyToRelation = to.curare.compose.database.model.InReplyToRelation( + localInReplyToNostrEvent = com.machankura.bennu.compose.database.model.intermdiate.LocalInReplyToNostrEvent( + inReplyToRelation = com.machankura.bennu.compose.database.model.InReplyToRelation( inReplyToNostrEventId = "nostrEvent", inReplyToRootNostrEventId = "rootId", inReplyToProfilePublicKey = "inReplyToProfileKey", inReplyToRootProfilePublicKey = "rootPubKey", replyingNostrEventId = "hex" ), - nostrEvent = to.curare.compose.database.model.NostrEvent( + nostrEvent = com.machankura.bennu.compose.database.model.NostrEvent( id = "hex", content = "Something something something", pubKey = "hexie", @@ -328,7 +328,7 @@ private fun TextNoteFeedItemQuoteNostrEventPreview() { sig = "hexsig", tags = emptyArray() ), - profile = to.curare.compose.database.model.Profile( + profile = com.machankura.bennu.compose.database.model.Profile( publicKey = "hesd", nostrEventId = "referenced", displayName = "Steve Biko", @@ -337,12 +337,12 @@ private fun TextNoteFeedItemQuoteNostrEventPreview() { mentionedProfiles = emptyList() ), mentionedProfiles = listOf( - to.curare.compose.database.model.intermdiate.LocalMention( - mention = to.curare.compose.database.model.Mention( + com.machankura.bennu.compose.database.model.intermdiate.LocalMention( + mention = com.machankura.bennu.compose.database.model.Mention( mentioningNostrEventId = "000067b3f15cac88ba066b28c370083a4fc80dacc054e554ab1dc0def974c89c", mentionedPublicKey = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a522" ), - profile = to.curare.compose.database.model.Profile( + profile = com.machankura.bennu.compose.database.model.Profile( publicKey = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a522", nostrEventId = "referenced", displayName = "Steve Biko", diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/profile/ProfileAvatar.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/profile/ProfileAvatar.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/profile/ProfileAvatar.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/profile/ProfileAvatar.kt index 72a164bf..efbf4e97 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/profile/ProfileAvatar.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/profile/ProfileAvatar.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.profile +package com.machankura.bennu.compose.ui.composable.widgets.profile import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size @@ -20,14 +20,14 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import coil3.compose.AsyncImage -import to.curare.compose.ui.theme.spacing -import to.curare.compose.ui.theme.ConformancePreviews +import com.machankura.bennu.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.theme.ConformancePreviews @Composable fun ProfileAvatar( size: Dp = 55.dp, shape: Shape = CircleShape, - profile: to.curare.compose.database.model.Profile + profile: com.machankura.bennu.compose.database.model.Profile ) { ProfileAvatar( size = size, @@ -42,7 +42,7 @@ fun ProfileAvatar( size: Dp = 55.dp, shape: Shape = CircleShape, publicKey: String, - profile: to.curare.compose.database.model.Profile? + profile: com.machankura.bennu.compose.database.model.Profile? ) { ProfileAvatar( size = size, @@ -89,18 +89,18 @@ fun ProfileAvatar( } else { // Load image... val placeHolderGraphic = - to.curare.compose.ui.composable.widgets.coil.forwardingPainter( + com.machankura.bennu.compose.ui.composable.widgets.coil.forwardingPainter( painter = rememberVectorPainter(Icons.Default.Face5), colorFilter = ColorFilter.tint(tintColor) ) val fallbackGraphic = - to.curare.compose.ui.composable.widgets.coil.forwardingPainter( + com.machankura.bennu.compose.ui.composable.widgets.coil.forwardingPainter( painter = rememberVectorPainter(Icons.Default.Face5), colorFilter = ColorFilter.tint(tintColor) ) val errorGraphic = - to.curare.compose.ui.composable.widgets.coil.forwardingPainter( + com.machankura.bennu.compose.ui.composable.widgets.coil.forwardingPainter( painter = rememberVectorPainter(Icons.Default.FaceRetouchingOff), colorFilter = ColorFilter.tint(tintColor) ) @@ -122,13 +122,13 @@ fun ProfileAvatar( @ConformancePreviews @Composable fun ProfileAvatarPreview() { - to.curare.compose.ui.theme.CurareTheme { + com.machankura.bennu.compose.ui.theme.BennuTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { ProfileAvatar( publicKey = "hwgwefwase", - profile = to.curare.compose.database.model.Profile( + profile = com.machankura.bennu.compose.database.model.Profile( publicKey = "", nostrEventId = "referenced", displayName = "Frank Talk", diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/profile/ProfileColor.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/profile/ProfileColor.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/profile/ProfileColor.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/profile/ProfileColor.kt index 4626f0ee..cccd4ed5 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/profile/ProfileColor.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/profile/ProfileColor.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.profile +package com.machankura.bennu.compose.ui.composable.widgets.profile import androidx.compose.ui.graphics.Color import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -15,7 +15,7 @@ object ProfileColor { ) } - fun fromProfile(profile: to.curare.compose.database.model.Profile): Color { + fun fromProfile(profile: com.machankura.bennu.compose.database.model.Profile): Color { return fromPublicKey( profile.publicKey ) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/wallet/AddProfileRows.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/wallet/AddProfileRows.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/wallet/AddProfileRows.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/wallet/AddProfileRows.kt index 39711569..cb600483 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/wallet/AddProfileRows.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/wallet/AddProfileRows.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.wallet +package com.machankura.bennu.compose.ui.composable.widgets.wallet import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -18,13 +18,13 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.create_a_new_profile -import curare.composeapp.generated.resources.sign_in_with_a_key -import curare.composeapp.generated.resources.the_profile_you_are_in_stays_on_this_device +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.create_a_new_profile +import bennu.composeapp.generated.resources.sign_in_with_a_key +import bennu.composeapp.generated.resources.the_profile_you_are_in_stays_on_this_device import org.jetbrains.compose.resources.stringResource -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.theme.spacing /** * The two ways to add a profile, under the list of the ones the device has -- on the diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/wallet/RememberProfilesOf.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/wallet/RememberProfilesOf.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/wallet/RememberProfilesOf.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/wallet/RememberProfilesOf.kt index b74aad5e..c073e466 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/wallet/RememberProfilesOf.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/wallet/RememberProfilesOf.kt @@ -1,12 +1,12 @@ -package to.curare.compose.ui.composable.widgets.wallet +package com.machankura.bennu.compose.ui.composable.widgets.wallet import androidx.compose.runtime.Composable import androidx.compose.runtime.State import androidx.compose.runtime.produceState import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.database.model.Profile -import to.curare.compose.repository.NostrRepository -import to.curare.compose.repository.observeProfilesOf +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.repository.observeProfilesOf /** * The nostr profiles of [publicKeys], for a screen that has no view model to hold them diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/wallet/WalletAvatar.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/wallet/WalletAvatar.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/wallet/WalletAvatar.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/wallet/WalletAvatar.kt index 9472a9c1..50b04ce3 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/wallet/WalletAvatar.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/wallet/WalletAvatar.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package to.curare.compose.ui.composable.widgets.wallet +package com.machankura.bennu.compose.ui.composable.widgets.wallet import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -44,9 +44,9 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import to.curare.compose.ui.composable.widgets.buttons.Clickable -import to.curare.compose.ui.composable.widgets.dialogs.ModalBottomSheet -import to.curare.compose.ui.theme.spacing +import com.machankura.bennu.compose.ui.composable.widgets.buttons.Clickable +import com.machankura.bennu.compose.ui.composable.widgets.dialogs.ModalBottomSheet +import com.machankura.bennu.compose.ui.theme.spacing object WalletAvatars { val list = listOf( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/wallet/WalletsSelector.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/wallet/WalletsSelector.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/wallet/WalletsSelector.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/wallet/WalletsSelector.kt index b07a9a84..105564af 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/wallet/WalletsSelector.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/wallet/WalletsSelector.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package to.curare.compose.ui.composable.widgets.wallet +package com.machankura.bennu.compose.ui.composable.widgets.wallet import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -43,20 +43,20 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import to.curare.compose.ui.composable.widgets.buttons.Clickable +import com.machankura.bennu.compose.ui.composable.widgets.buttons.Clickable import com.vitorpamplona.quartz.nip01Core.core.HexKey import fr.acinq.phoenix.data.WalletId import fr.acinq.phoenix.utils.preferences.UserWalletMetadata import fr.acinq.phoenix.utils.preferences.getByWalletIdOrDefault -import to.curare.compose.extensions.hexToNpubHrp -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.read_only -import curare.composeapp.generated.resources.wallet +import com.machankura.bennu.compose.extensions.hexToNpubHrp +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.read_only +import bennu.composeapp.generated.resources.wallet import org.jetbrains.compose.resources.stringResource -import to.curare.compose.database.model.Profile -import to.curare.compose.identity.StoredIdentity -import to.curare.compose.ui.composable.widgets.profile.ProfileAvatar -import to.curare.compose.ui.theme.spacing +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.identity.StoredIdentity +import com.machankura.bennu.compose.ui.composable.widgets.profile.ProfileAvatar +import com.machankura.bennu.compose.ui.theme.spacing /** * The device's profiles as a list: the open one above a divider, the others below, @@ -145,7 +145,7 @@ private fun AvailableWalletView( ) { var showWalletEditDialog by remember { mutableStateOf(false) } if (showWalletEditDialog) { - to.curare.compose.ui.composable.widgets.LoadingDataIndicator( + com.machankura.bennu.compose.ui.composable.widgets.LoadingDataIndicator( text = "Edit function coming soon" ) // EditWalletDialog( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Breakpoint.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/Breakpoint.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Breakpoint.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/Breakpoint.kt index d2c58423..ba2569f4 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Breakpoint.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/Breakpoint.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.theme +package com.machankura.bennu.compose.ui.theme import androidx.compose.material3.MaterialTheme import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi @@ -59,7 +59,7 @@ enum class Breakpoint(val minWidth: Dp) { * them. * * Total, including for a width below [Compact.minWidth]. This is called from - * [CurareTheme] on every composition, and a desktop window reports a zero size for + * [BennuTheme] 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 [CurareTheme] as [LocalBreakpoint], so screens read + * Provided by [BennuTheme] 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 [CurareTheme], which wraps every `@Preview` in the tree, and a preview context is + * from [BennuTheme], 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 [CurareTheme] + * screen in this app was written against: a composable that never reaches a [BennuTheme] * should render as it did before breakpoints existed, not fail. */ val LocalBreakpoint = staticCompositionLocalOf { Breakpoint.Compact } diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Color.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/Color.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Color.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/Color.kt index 67a2901a..01b191fc 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Color.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/Color.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.theme +package com.machankura.bennu.compose.ui.theme import androidx.compose.ui.graphics.Color diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/ConformancePreviews.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/ConformancePreviews.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/ConformancePreviews.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/ConformancePreviews.kt index 0f4932b4..a21e729e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/ConformancePreviews.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/ConformancePreviews.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.theme +package com.machankura.bennu.compose.ui.theme import androidx.compose.ui.tooling.preview.Preview @@ -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 - * `CurareTheme(contrast = …)` in the body. [ThemeGallery] covers the schemes once, over + * `BennuTheme(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/to/curare/compose/ui/theme/Motion.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/Motion.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Motion.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/Motion.kt index 22f188c5..c381a68e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Motion.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/Motion.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.theme +package com.machankura.bennu.compose.ui.theme import androidx.compose.animation.AnimatedContentTransitionScope import androidx.compose.animation.EnterTransition @@ -17,7 +17,7 @@ import androidx.navigation.NavBackStackEntry /** * Whether the platform has been asked to keep motion to a minimum. * - * Provided by [CurareTheme] as [LocalReducedMotion]; the transitions below read it, so a + * Provided by [BennuTheme] 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/to/curare/compose/ui/theme/Panes.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/Panes.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Panes.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/Panes.kt index f19d4d58..0dc2d8b5 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Panes.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/Panes.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.theme +package com.machankura.bennu.compose.ui.theme import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/ReadableMeasure.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/ReadableMeasure.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/ReadableMeasure.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/ReadableMeasure.kt index 2df4976a..4f145535 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/ReadableMeasure.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/ReadableMeasure.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.theme +package com.machankura.bennu.compose.ui.theme import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.widthIn diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Shape.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/Shape.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Shape.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/Shape.kt index 069d3826..e90e3288 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Shape.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/Shape.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.theme +package com.machankura.bennu.compose.ui.theme import androidx.compose.material3.Shapes @@ -38,4 +38,4 @@ import androidx.compose.material3.Shapes * Declared explicitly rather than left to `MaterialTheme`'s default so that every slot of * the theme has a named home, and so this note has somewhere to live. */ -val CurareShapes = Shapes() +val BennuShapes = Shapes() diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Spacing.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/Spacing.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Spacing.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/Spacing.kt index 01529dc2..38d35083 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Spacing.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/Spacing.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.theme +package com.machankura.bennu.compose.ui.theme import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable @@ -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. [CurareTheme] provides it. + * same way [ExtendedColors] does. [BennuTheme] 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/to/curare/compose/ui/theme/Theme.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/Theme.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Theme.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/Theme.kt index 4aeebcc2..213e76d0 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Theme.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/Theme.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.theme +package com.machankura.bennu.compose.ui.theme import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.ColorScheme @@ -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 [CurareTheme] + * ride alongside -- so they travel on their own composition local, provided by [BennuTheme] * 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 [CurareTheme] renders a real colour instead of nothing. That should not + * composing outside [BennuTheme] 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 CurareTheme( +fun BennuTheme( darkTheme: Boolean = isSystemInDarkTheme(), contrast: ThemeContrast = platformThemeContrast(), // Dynamic color is available on Android 12+ @@ -531,7 +531,7 @@ fun CurareTheme( // `tween`, so that the whole app's feel is one decision. Nothing reads it yet; // the motion phase is what puts it to work. motionScheme = MotionScheme.expressive(), - shapes = CurareShapes, + shapes = BennuShapes, typography = AuxTypography, content = content ) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/ThemeGallery.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/ThemeGallery.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/ThemeGallery.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/ThemeGallery.kt index d4a5f002..e39cb11e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/ThemeGallery.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/ThemeGallery.kt @@ -2,7 +2,7 @@ // pairings, not UI text. Nobody navigates here and nothing here is translated; // putting these eight strings in the catalogue would add eight entries that no // screen shows and that a translator would have to be told to ignore. -package to.curare.compose.ui.theme +package com.machankura.bennu.compose.ui.theme import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -24,7 +24,7 @@ import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview -import to.curare.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.composable.widgets.Decorative /** * All six schemes, side by side, over the components that carry text. @@ -44,7 +44,7 @@ import to.curare.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 `CurareTheme` + // One render holding all six, not six renders. The contrast step is a `BennuTheme` // 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) { - CurareTheme(darkTheme = darkTheme, contrast = contrast, dynamicColor = false) { + BennuTheme(darkTheme = darkTheme, contrast = contrast, dynamicColor = false) { Surface { Column( modifier = Modifier.padding(MaterialTheme.spacing.compactPadding), diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Type.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/Type.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Type.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/Type.kt index f60182c4..7f40b014 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Type.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/Type.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.theme +package com.machankura.bennu.compose.ui.theme import androidx.compose.material3.Typography diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AcceptCuratedSuggestionViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/AcceptCuratedSuggestionViewModel.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AcceptCuratedSuggestionViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/AcceptCuratedSuggestionViewModel.kt index 6156099f..ab3af30c 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AcceptCuratedSuggestionViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/AcceptCuratedSuggestionViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.foundation.text.input.TextFieldState import androidx.compose.runtime.MutableState @@ -20,14 +20,14 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.flow.first import kotlinx.coroutines.launch -import to.curare.compose.nostr.CuratedSuggestion -import to.curare.compose.nostr.curated.CuratedEntryProblem -import to.curare.compose.nostr.curated.CuratedField -import to.curare.compose.nostr.curated.CuratedSuggestionRef -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.view.state.AcceptCuratedSuggestionUIState +import com.machankura.bennu.compose.nostr.CuratedSuggestion +import com.machankura.bennu.compose.nostr.curated.CuratedEntryProblem +import com.machankura.bennu.compose.nostr.curated.CuratedField +import com.machankura.bennu.compose.nostr.curated.CuratedSuggestionRef +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.view.state.AcceptCuratedSuggestionUIState /** * One suggestion, taken into the list: the entry as somebody suggested it, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ActiveProfileViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ActiveProfileViewModel.kt similarity index 67% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ActiveProfileViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ActiveProfileViewModel.kt index 919e2a29..1edb9317 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ActiveProfileViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ActiveProfileViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -18,14 +18,14 @@ import kotlinx.coroutines.launch class ActiveProfileViewModel( val activeUserPublicKey: HexKey, val nostrEventId: HexKey, - initialActiveProfileUIState: to.curare.compose.ui.view.state.ActiveProfileUIState, - val nostrRepository: to.curare.compose.repository.NostrRepository + initialActiveProfileUIState: com.machankura.bennu.compose.ui.view.state.ActiveProfileUIState, + val nostrRepository: com.machankura.bennu.compose.repository.NostrRepository ): ViewModel() { - var activeProfileUIState: to.curare.compose.ui.view.state.ActiveProfileUIState by mutableStateOf(initialActiveProfileUIState) + var activeProfileUIState: com.machankura.bennu.compose.ui.view.state.ActiveProfileUIState by mutableStateOf(initialActiveProfileUIState) private set fun retryLoad() { - activeProfileUIState = to.curare.compose.ui.view.state.ActiveProfileUIState.Loading + activeProfileUIState = com.machankura.bennu.compose.ui.view.state.ActiveProfileUIState.Loading loadNostrFeed() } @@ -37,11 +37,11 @@ class ActiveProfileViewModel( nostrEventId ).firstOrNull().let { localNostrEvent -> activeProfileUIState = if (localNostrEvent != null && localNostrEvent.nostrEvent.kind == MetadataEvent.KIND) { - to.curare.compose.ui.view.state.ActiveProfileUIState.Loaded( + com.machankura.bennu.compose.ui.view.state.ActiveProfileUIState.Loaded( localNostrEvent = localNostrEvent ) } else { - to.curare.compose.ui.view.state.ActiveProfileUIState.Error + com.machankura.bennu.compose.ui.view.state.ActiveProfileUIState.Error } } } @@ -53,8 +53,8 @@ class ActiveProfileViewModel( fun factory( nostrEventId: HexKey, activeUserPublicKey: HexKey, - initialActiveProfileUIState: to.curare.compose.ui.view.state.ActiveProfileUIState = to.curare.compose.ui.view.state.ActiveProfileUIState.Loading, - nostrRepository: to.curare.compose.repository.NostrRepository, + initialActiveProfileUIState: com.machankura.bennu.compose.ui.view.state.ActiveProfileUIState = com.machankura.bennu.compose.ui.view.state.ActiveProfileUIState.Loading, + nostrRepository: com.machankura.bennu.compose.repository.NostrRepository, ): ViewModelProvider.Factory = viewModelFactory { initializer { ActiveProfileViewModel( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddArtifactViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/AddArtifactViewModel.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddArtifactViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/AddArtifactViewModel.kt index c627c858..bad5507c 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddArtifactViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/AddArtifactViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.foundation.text.input.TextFieldState import androidx.compose.foundation.text.input.clearText @@ -11,19 +11,19 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.NostrRepository +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.NostrRepository import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.launch -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.nip30303.ArtifactEvent -import to.curare.compose.nostr.nip30303.ArtifactVersionEvent -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.repository.MantraRepository -import to.curare.compose.ui.view.state.AddArtifactUIState +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.nip30303.ArtifactEvent +import com.machankura.bennu.compose.nostr.nip30303.ArtifactVersionEvent +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.repository.MantraRepository +import com.machankura.bennu.compose.ui.view.state.AddArtifactUIState class AddArtifactViewModel( val chatRoomId: String, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddChapterViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/AddChapterViewModel.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddChapterViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/AddChapterViewModel.kt index fd88aa90..4411786d 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddChapterViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/AddChapterViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.foundation.text.input.TextFieldState import androidx.compose.foundation.text.input.clearText @@ -16,17 +16,17 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.launch -import to.curare.compose.database.model.MantraArtifactVersion -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.managers.FrostSigningManager -import to.curare.compose.managers.TranslationScaffold -import to.curare.compose.nostr.nip30303.ChapterEvent -import to.curare.compose.nostr.nip30303.ChunkEvent -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.repository.MantraRepository -import to.curare.compose.text.Markdown -import to.curare.compose.ui.view.state.AddChapterUIState +import com.machankura.bennu.compose.database.model.MantraArtifactVersion +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.managers.FrostSigningManager +import com.machankura.bennu.compose.managers.TranslationScaffold +import com.machankura.bennu.compose.nostr.nip30303.ChapterEvent +import com.machankura.bennu.compose.nostr.nip30303.ChunkEvent +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.repository.MantraRepository +import com.machankura.bennu.compose.text.Markdown +import com.machankura.bennu.compose.ui.view.state.AddChapterUIState class AddChapterViewModel( val artifactId: String, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddDialectViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/AddDialectViewModel.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddDialectViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/AddDialectViewModel.kt index 7575b455..4e693c7d 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddDialectViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/AddDialectViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.foundation.text.input.TextFieldState import androidx.compose.foundation.text.input.clearText @@ -16,12 +16,12 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.launch -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.nostr.nip30303.DialectEvent -import to.curare.compose.ui.view.state.AddDialectUIState +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.nostr.nip30303.DialectEvent +import com.machankura.bennu.compose.ui.view.state.AddDialectUIState class AddDialectViewModel( val chatRoomId: String, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddGroupPostViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/AddGroupPostViewModel.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddGroupPostViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/AddGroupPostViewModel.kt index 61efb393..5adc8b61 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddGroupPostViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/AddGroupPostViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.foundation.text.input.TextFieldState import androidx.compose.runtime.MutableState @@ -11,11 +11,11 @@ import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory import co.touchlab.kermit.Logger -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.GroupPost -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.ui.view.state.AddGroupPostUIState +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.GroupPost +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.ui.view.state.AddGroupPostUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddMemberToChatRoomConfirmationViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/AddMemberToChatRoomConfirmationViewModel.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddMemberToChatRoomConfirmationViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/AddMemberToChatRoomConfirmationViewModel.kt index 55c22df8..93ffdded 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddMemberToChatRoomConfirmationViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/AddMemberToChatRoomConfirmationViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue @@ -9,18 +9,18 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import to.curare.compose.database.model.MarmotKeyPackage -import to.curare.compose.exceptions.MarmotCommitPendingException -import to.curare.compose.exceptions.MarmotConvergencePendingException -import to.curare.compose.exceptions.MarmotKeyPackageProfileException -import to.curare.compose.nostr.MarmotProfile -import to.curare.compose.database.model.NegentropySynchronizeRequest -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.types.SynchronizationFilter -import to.curare.compose.nostr.Relays -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.view.state.AddMemberToChatRoomConfirmationUIState +import com.machankura.bennu.compose.database.model.MarmotKeyPackage +import com.machankura.bennu.compose.exceptions.MarmotCommitPendingException +import com.machankura.bennu.compose.exceptions.MarmotConvergencePendingException +import com.machankura.bennu.compose.exceptions.MarmotKeyPackageProfileException +import com.machankura.bennu.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.nostr.Relays +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.view.state.AddMemberToChatRoomConfirmationUIState import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageEvent import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -78,7 +78,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 Curare.") + AddMemberToChatRoomConfirmationUIState.Error("Profile missing key package event. Try again later or tell ${profile.humanReadableNameOrPubkey()} to use Bennu.") } // Observe rather than read once: the key package usually lands a moment after diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddTranslationArtifactVersionViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/AddTranslationArtifactVersionViewModel.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddTranslationArtifactVersionViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/AddTranslationArtifactVersionViewModel.kt index 198c8688..0f7693f5 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddTranslationArtifactVersionViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/AddTranslationArtifactVersionViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue @@ -14,18 +14,18 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.launch -import to.curare.compose.database.model.MantraArtifact -import to.curare.compose.database.model.MantraArtifactVersion -import to.curare.compose.database.model.MantraChapter -import to.curare.compose.database.model.MantraDialect -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.managers.FrostSigningManager -import to.curare.compose.managers.TranslationScaffold -import to.curare.compose.nostr.nip30303.TranslationArtifactVersionEvent -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.repository.MantraRepository -import to.curare.compose.ui.view.state.AddTranslationArtifactVersionUIState +import com.machankura.bennu.compose.database.model.MantraArtifact +import com.machankura.bennu.compose.database.model.MantraArtifactVersion +import com.machankura.bennu.compose.database.model.MantraChapter +import com.machankura.bennu.compose.database.model.MantraDialect +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.managers.FrostSigningManager +import com.machankura.bennu.compose.managers.TranslationScaffold +import com.machankura.bennu.compose.nostr.nip30303.TranslationArtifactVersionEvent +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.repository.MantraRepository +import com.machankura.bennu.compose.ui.view.state.AddTranslationArtifactVersionUIState class AddTranslationArtifactVersionViewModel( val artifactId: String, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ArtifactDetailViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ArtifactDetailViewModel.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ArtifactDetailViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ArtifactDetailViewModel.kt index fb37cefb..926dd046 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ArtifactDetailViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ArtifactDetailViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -13,8 +13,8 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.launch -import to.curare.compose.repository.MantraRepository -import to.curare.compose.ui.view.state.ArtifactDetailUIState +import com.machankura.bennu.compose.repository.MantraRepository +import com.machankura.bennu.compose.ui.view.state.ArtifactDetailUIState class ArtifactDetailViewModel( val artifactId: String, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/BroadcastGroupSignedEventViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/BroadcastGroupSignedEventViewModel.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/BroadcastGroupSignedEventViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/BroadcastGroupSignedEventViewModel.kt index beb3c610..a753fecd 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/BroadcastGroupSignedEventViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/BroadcastGroupSignedEventViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue @@ -24,22 +24,22 @@ import kotlinx.coroutines.TimeoutCancellationException import kotlinx.coroutines.flow.take import kotlinx.coroutines.launch import kotlinx.coroutines.withTimeout -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.exceptions.NostrPublishException -import to.curare.compose.network.dto.RelayDTO -import to.curare.compose.network.relays.EventPublishTransport -import to.curare.compose.network.relays.NostrPublishResult -import to.curare.compose.network.relays.RelayPool -import to.curare.compose.network.sockets.NostrIncomingMessage -import to.curare.compose.nostr.GroupCuratedSchema -import to.curare.compose.nostr.GroupRelayList -import to.curare.compose.nostr.GroupRelaySet -import to.curare.compose.nostr.Relays -import to.curare.compose.nostr.curated.CuratedEntryEvent -import to.curare.compose.nostr.curated.CuratedSchemaEvent -import to.curare.compose.repository.ChatRepository -import to.curare.compose.ui.view.state.BroadcastGroupSignedEventUIState +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.exceptions.NostrPublishException +import com.machankura.bennu.compose.network.dto.RelayDTO +import com.machankura.bennu.compose.network.relays.EventPublishTransport +import com.machankura.bennu.compose.network.relays.NostrPublishResult +import com.machankura.bennu.compose.network.relays.RelayPool +import com.machankura.bennu.compose.network.sockets.NostrIncomingMessage +import com.machankura.bennu.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.nostr.GroupRelayList +import com.machankura.bennu.compose.nostr.GroupRelaySet +import com.machankura.bennu.compose.nostr.Relays +import com.machankura.bennu.compose.nostr.curated.CuratedEntryEvent +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaEvent +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.ui.view.state.BroadcastGroupSignedEventUIState import kotlin.time.Duration.Companion.milliseconds /** diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChapterDetailViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ChapterDetailViewModel.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChapterDetailViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ChapterDetailViewModel.kt index b7c584df..62ad9653 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChapterDetailViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ChapterDetailViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -13,8 +13,8 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.launch -import to.curare.compose.repository.MantraRepository -import to.curare.compose.ui.view.state.ChapterDetailUIState +import com.machankura.bennu.compose.repository.MantraRepository +import com.machankura.bennu.compose.ui.view.state.ChapterDetailUIState class ChapterDetailViewModel( val chapterId: String, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatMessageListViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ChatMessageListViewModel.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatMessageListViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ChatMessageListViewModel.kt index a6118547..caf2c53e 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatMessageListViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ChatMessageListViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.items @@ -13,23 +13,23 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import to.curare.compose.database.model.NegentropySynchronizeRequest -import to.curare.compose.database.model.Participant -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.types.SynchronizationFilter -import to.curare.compose.extensions.shortened -import to.curare.compose.managers.FrostSigningManager -import to.curare.compose.nostr.MemberProfileSync -import to.curare.compose.nostr.Nip17Filters -import to.curare.compose.nostr.Relays -import to.curare.compose.repository.ChatRepository -import to.curare.compose.database.model.types.DkgRitualStage -import to.curare.compose.database.model.types.DkgApprovalStep -import to.curare.compose.repository.DkgRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.text.ProposedEvent -import to.curare.compose.ui.view.state.ChatMessageListUIState +import com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest +import com.machankura.bennu.compose.database.model.Participant +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.extensions.shortened +import com.machankura.bennu.compose.managers.FrostSigningManager +import com.machankura.bennu.compose.nostr.MemberProfileSync +import com.machankura.bennu.compose.nostr.Nip17Filters +import com.machankura.bennu.compose.nostr.Relays +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.database.model.types.DkgRitualStage +import com.machankura.bennu.compose.database.model.types.DkgApprovalStep +import com.machankura.bennu.compose.repository.DkgRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.text.ProposedEvent +import com.machankura.bennu.compose.ui.view.state.ChatMessageListUIState import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomCreationViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ChatRoomCreationViewModel.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomCreationViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ChatRoomCreationViewModel.kt index f66c76c9..dfa9d26a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomCreationViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ChatRoomCreationViewModel.kt @@ -1,12 +1,12 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.navigation.routes.SelectChatRoomMembersRoute -import to.curare.compose.ui.view.state.form.ChatRoomCreationFormState +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.navigation.routes.SelectChatRoomMembersRoute +import com.machankura.bennu.compose.ui.view.state.form.ChatRoomCreationFormState import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomDetailViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ChatRoomDetailViewModel.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomDetailViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ChatRoomDetailViewModel.kt index c8633e96..c4faee87 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomDetailViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ChatRoomDetailViewModel.kt @@ -1,6 +1,6 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model -import to.curare.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.nostr.MarmotProfile import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -10,20 +10,20 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.MantraRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.navigation.routes.HomeRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.view.state.ChatRoomDetailUIState +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.MantraRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.HomeRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.view.state.ChatRoomDetailUIState import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.CancellationException import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.launch -import to.curare.compose.database.model.types.MarmotReindexReport +import com.machankura.bennu.compose.database.model.types.MarmotReindexReport class ChatRoomDetailViewModel( val chatRoomId: String, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomListViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ChatRoomListViewModel.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomListViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ChatRoomListViewModel.kt index 15c68bbe..7dbdee52 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomListViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ChatRoomListViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -27,26 +27,26 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import to.curare.compose.database.model.NegentropySynchronizeRequest -import to.curare.compose.database.model.types.SynchronizationFilter -import to.curare.compose.extensions.toChatListTimestampString -import to.curare.compose.nostr.Nip17Filters -import to.curare.compose.nostr.Relays -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.view.state.ChatRoomListUIState +import com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.extensions.toChatListTimestampString +import com.machankura.bennu.compose.nostr.Nip17Filters +import com.machankura.bennu.compose.nostr.Relays +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.view.state.ChatRoomListUIState import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.mip03GroupMessages.GroupEvent import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.launch -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.loading -import curare.composeapp.generated.resources.no_messages_go_to_a_profile_and_send_them_a -import curare.composeapp.generated.resources.something_went_wrong -import to.curare.compose.ui.composable.widgets.ErrorState +import bennu.composeapp.generated.resources.loading +import bennu.composeapp.generated.resources.no_messages_go_to_a_profile_and_send_them_a +import bennu.composeapp.generated.resources.something_went_wrong +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState class ChatRoomListViewModel( initialChatRoomListUIState: ChatRoomListUIState, @@ -146,7 +146,7 @@ class ChatRoomListViewModel( @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable fun RenderFeed( - onNavigateToDirectMessageDetail: (to.curare.compose.ui.composable.navigation.routes.Route) -> Unit + onNavigateToDirectMessageDetail: (com.machankura.bennu.compose.ui.composable.navigation.routes.Route) -> Unit ) { Column( modifier = Modifier.fillMaxWidth(), @@ -180,7 +180,7 @@ class ChatRoomListViewModel( modifier = Modifier.fillMaxWidth(), onClick = { onNavigateToDirectMessageDetail.invoke( - to.curare.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute( + com.machankura.bennu.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute( activeUserPublicKey = publicKey, chatRoomId = localChatRoom.chatRoom.id, relayHint = localChatRoom.localParticipants.firstOrNull { it.participant.participantPublicKey != localChatRoom.chatRoom.userPublicKey }?.participant?.relayHint diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomMessagingViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ChatRoomMessagingViewModel.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomMessagingViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ChatRoomMessagingViewModel.kt index 62e94965..a9e238ae 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomMessagingViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ChatRoomMessagingViewModel.kt @@ -1,6 +1,6 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model -import to.curare.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.nostr.MarmotProfile import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -10,12 +10,12 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import to.curare.compose.nostr.DirectMessagePeerSync -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.view.state.ChatRoomMessagingUIState +import com.machankura.bennu.compose.nostr.DirectMessagePeerSync +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.view.state.ChatRoomMessagingUIState import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.Dispatchers @@ -97,7 +97,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 Curare." + "Couldn't find this profile's chat details on the relays yet. They may not have finished setting up Bennu." ) } diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/CreateProfileViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/CreateProfileViewModel.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/CreateProfileViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/CreateProfileViewModel.kt index 4eb0bc5a..27cada39 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/CreateProfileViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/CreateProfileViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf @@ -7,10 +7,10 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import to.curare.compose.repository.MarmotRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.view.state.CreateProfileUIState -import to.curare.compose.ui.view.state.form.CreateProfileFormState +import com.machankura.bennu.compose.repository.MarmotRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.view.state.CreateProfileUIState +import com.machankura.bennu.compose.ui.view.state.form.CreateProfileFormState import co.touchlab.kermit.Logger import fr.acinq.phoenix.data.WalletId import kotlinx.coroutines.CoroutineExceptionHandler @@ -18,7 +18,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import to.curare.compose.identity.NewProfileWriter +import com.machankura.bennu.compose.identity.NewProfileWriter class CreateProfileViewModel( val initialCreateProfileUIState: CreateProfileUIState, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/CuratedSuggestionListViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/CuratedSuggestionListViewModel.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/CuratedSuggestionListViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/CuratedSuggestionListViewModel.kt index 7f42d56c..0b6ed93e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/CuratedSuggestionListViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/CuratedSuggestionListViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -19,14 +19,14 @@ import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.launch import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock -import to.curare.compose.database.model.SynchronizeNostrEventRequest -import to.curare.compose.nostr.CuratedSuggestion -import to.curare.compose.nostr.GroupCuratedSchema -import to.curare.compose.nostr.GroupRelayList -import to.curare.compose.nostr.GroupRelaySet -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.view.state.CuratedSuggestionListUIState +import com.machankura.bennu.compose.database.model.SynchronizeNostrEventRequest +import com.machankura.bennu.compose.nostr.CuratedSuggestion +import com.machankura.bennu.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.nostr.GroupRelayList +import com.machankura.bennu.compose.nostr.GroupRelaySet +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.view.state.CuratedSuggestionListUIState import kotlin.time.Duration.Companion.seconds /** diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/DkgRitualViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/DkgRitualViewModel.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/DkgRitualViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/DkgRitualViewModel.kt index 23a4ba29..0929979d 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/DkgRitualViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/DkgRitualViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue @@ -9,30 +9,30 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import to.curare.compose.database.model.types.DkgApprovalStep -import to.curare.compose.database.model.types.DkgRitualStage -import to.curare.compose.database.model.types.FrostSigningStage -import to.curare.compose.database.model.types.ChatRoomType -import to.curare.compose.managers.ChillDkgRitualManager -import to.curare.compose.managers.MarmotGroupCreation -import to.curare.compose.managers.SharedKeyDerivation -import to.curare.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute -import to.curare.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.database.model.types.DkgApprovalStep +import com.machankura.bennu.compose.database.model.types.DkgRitualStage +import com.machankura.bennu.compose.database.model.types.FrostSigningStage +import com.machankura.bennu.compose.database.model.types.ChatRoomType +import com.machankura.bennu.compose.managers.ChillDkgRitualManager +import com.machankura.bennu.compose.managers.MarmotGroupCreation +import com.machankura.bennu.compose.managers.SharedKeyDerivation +import com.machankura.bennu.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import kotlinx.coroutines.flow.first import kotlinx.coroutines.withContext import kotlinx.coroutines.Dispatchers.Main -import to.curare.compose.nostr.dkg.DkgRitualEvents -import to.curare.compose.nostr.frost.GroupKeyStateEvent -import to.curare.compose.nostr.subgroup.SubgroupBirthCertificateEvent -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.DkgRepository -import to.curare.compose.ui.view.state.DkgRitualUIState +import com.machankura.bennu.compose.nostr.dkg.DkgRitualEvents +import com.machankura.bennu.compose.nostr.frost.GroupKeyStateEvent +import com.machankura.bennu.compose.nostr.subgroup.SubgroupBirthCertificateEvent +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.DkgRepository +import com.machankura.bennu.compose.ui.view.state.DkgRitualUIState import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.Kind -import to.curare.compose.identity.Identity +import com.machankura.bennu.compose.identity.Identity import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.Job diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/EditGroupCuratedSchemaViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/EditGroupCuratedSchemaViewModel.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/EditGroupCuratedSchemaViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/EditGroupCuratedSchemaViewModel.kt index f5c0bcb0..316936bf 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/EditGroupCuratedSchemaViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/EditGroupCuratedSchemaViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue @@ -11,21 +11,21 @@ import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory import co.touchlab.kermit.Logger -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.extensions.bech32ToHexOrNull -import to.curare.compose.nostr.GroupCuratedSchema -import to.curare.compose.nostr.GroupRelaySet -import to.curare.compose.nostr.curated.CuratedField -import to.curare.compose.nostr.curated.CuratedFieldType -import to.curare.compose.nostr.curated.CuratedSchema -import to.curare.compose.nostr.curated.CuratedSchemaEvent -import to.curare.compose.nostr.curated.CuratedSchemaProblem -import to.curare.compose.nostr.curated.CuratedSchemaTemplate -import to.curare.compose.nostr.curated.CuratedUnsupportedField -import to.curare.compose.nostr.curated.CuratedVisibility -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.ui.view.state.EditGroupCuratedSchemaUIState +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.extensions.bech32ToHexOrNull +import com.machankura.bennu.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.nostr.GroupRelaySet +import com.machankura.bennu.compose.nostr.curated.CuratedField +import com.machankura.bennu.compose.nostr.curated.CuratedFieldType +import com.machankura.bennu.compose.nostr.curated.CuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaEvent +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaProblem +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaTemplate +import com.machankura.bennu.compose.nostr.curated.CuratedUnsupportedField +import com.machankura.bennu.compose.nostr.curated.CuratedVisibility +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.ui.view.state.EditGroupCuratedSchemaUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/EditGroupNostrProfileViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/EditGroupNostrProfileViewModel.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/EditGroupNostrProfileViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/EditGroupNostrProfileViewModel.kt index 5abf5adc..8467072f 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/EditGroupNostrProfileViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/EditGroupNostrProfileViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.foundation.text.input.TextFieldState import androidx.compose.runtime.MutableState @@ -11,11 +11,11 @@ import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory import co.touchlab.kermit.Logger -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.GroupNostrProfile -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.ui.view.state.EditGroupNostrProfileUIState +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.GroupNostrProfile +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.ui.view.state.EditGroupNostrProfileUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/EditGroupRelaysViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/EditGroupRelaysViewModel.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/EditGroupRelaysViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/EditGroupRelaysViewModel.kt index a24c0277..909fc16b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/EditGroupRelaysViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/EditGroupRelaysViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue @@ -11,13 +11,13 @@ import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory import co.touchlab.kermit.Logger -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.GroupRelay -import to.curare.compose.nostr.GroupRelayList -import to.curare.compose.nostr.GroupRelaySet -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.ui.view.state.EditGroupRelaysUIState +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.GroupRelay +import com.machankura.bennu.compose.nostr.GroupRelayList +import com.machankura.bennu.compose.nostr.GroupRelaySet +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.ui.view.state.EditGroupRelaysUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/FeedListViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/FeedListViewModel.kt similarity index 82% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/FeedListViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/FeedListViewModel.kt index bdbf38c7..811c7bbc 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/FeedListViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/FeedListViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -25,28 +25,28 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import to.curare.compose.database.model.NegentropySynchronizeRequest -import to.curare.compose.ui.composable.widgets.feed.ListView -import to.curare.compose.ui.view.state.FeedListUIState +import com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest +import com.machankura.bennu.compose.ui.composable.widgets.feed.ListView +import com.machankura.bennu.compose.ui.view.state.FeedListUIState import co.touchlab.kermit.Logger import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.first import kotlinx.coroutines.launch -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.loading -import curare.composeapp.generated.resources.something_went_wrong -import curare.composeapp.generated.resources.nothing_in_this_feed_yet -import to.curare.compose.ui.composable.widgets.ErrorState -import to.curare.compose.ui.composable.widgets.EmptyState +import bennu.composeapp.generated.resources.loading +import bennu.composeapp.generated.resources.something_went_wrong +import bennu.composeapp.generated.resources.nothing_in_this_feed_yet +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState +import com.machankura.bennu.compose.ui.composable.widgets.EmptyState class FeedListViewModel( initialFeedListUIState: FeedListUIState, - val synchronizationFilter: to.curare.compose.database.model.types.SynchronizationFilter, - val nostrRepository: to.curare.compose.repository.NostrRepository + val synchronizationFilter: com.machankura.bennu.compose.database.model.types.SynchronizationFilter, + val nostrRepository: com.machankura.bennu.compose.repository.NostrRepository ): ViewModel() { val logger = Logger.withTag(TAG) var feedListUIState: FeedListUIState by mutableStateOf(initialFeedListUIState) @@ -54,7 +54,7 @@ class FeedListViewModel( val isSynchronizationPending: MutableState = mutableStateOf(false) - val negentropySynchronizeRequests = to.curare.compose.nostr.Relays.DefaultDMRelayList.shuffled().map { normalizedRelayUrl -> + val negentropySynchronizeRequests = com.machankura.bennu.compose.nostr.Relays.DefaultDMRelayList.shuffled().map { normalizedRelayUrl -> NegentropySynchronizeRequest( id = NegentropySynchronizeRequest.computeId( normalizedRelayUrl.url, @@ -112,7 +112,7 @@ class FeedListViewModel( @Composable fun RenderFeed( activeUserPublicKey: String, - onNavigateToEvent: (to.curare.compose.ui.composable.navigation.routes.Route) -> Unit + onNavigateToEvent: (com.machankura.bennu.compose.ui.composable.navigation.routes.Route) -> Unit ) { Column( modifier = Modifier.fillMaxWidth(), @@ -138,7 +138,7 @@ class FeedListViewModel( localNostrEvent.ListView( onNavigateToEvent = { nostrEventId -> onNavigateToEvent.invoke( - to.curare.compose.ui.composable.navigation.routes.NostrEventDetailRoute( + com.machankura.bennu.compose.ui.composable.navigation.routes.NostrEventDetailRoute( activeUserPublicKey = activeUserPublicKey, nostrEventId = nostrEventId ) @@ -178,8 +178,8 @@ class FeedListViewModel( fun factory( initialFeedListUIState: FeedListUIState = FeedListUIState.Loading, - synchronizationFilter: to.curare.compose.database.model.types.SynchronizationFilter, - nostrRepository: to.curare.compose.repository.NostrRepository, + synchronizationFilter: com.machankura.bennu.compose.database.model.types.SynchronizationFilter, + nostrRepository: com.machankura.bennu.compose.repository.NostrRepository, ): ViewModelProvider.Factory = viewModelFactory { initializer { FeedListViewModel( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/FollowersListViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/FollowersListViewModel.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/FollowersListViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/FollowersListViewModel.kt index fd3fd524..1d4b633c 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/FollowersListViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/FollowersListViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -30,23 +30,23 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.launch -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.loading -import curare.composeapp.generated.resources.something_went_wrong -import curare.composeapp.generated.resources.nobody_following_you_yet -import to.curare.compose.ui.composable.widgets.ErrorState -import to.curare.compose.ui.composable.widgets.EmptyState +import bennu.composeapp.generated.resources.loading +import bennu.composeapp.generated.resources.something_went_wrong +import bennu.composeapp.generated.resources.nobody_following_you_yet +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState +import com.machankura.bennu.compose.ui.composable.widgets.EmptyState class FollowersListViewModel( - initialFollowingListUIState: to.curare.compose.ui.view.state.FollowersListUIState, + initialFollowingListUIState: com.machankura.bennu.compose.ui.view.state.FollowersListUIState, val publicKey: String, - val synchronizationFilter: to.curare.compose.database.model.types.SynchronizationFilter, - val nostrRepository: to.curare.compose.repository.NostrRepository + val synchronizationFilter: com.machankura.bennu.compose.database.model.types.SynchronizationFilter, + val nostrRepository: com.machankura.bennu.compose.repository.NostrRepository ): ViewModel() { val logger = Logger.withTag(TAG) - var followersListUIState: to.curare.compose.ui.view.state.FollowersListUIState by mutableStateOf(initialFollowingListUIState) + var followersListUIState: com.machankura.bennu.compose.ui.view.state.FollowersListUIState by mutableStateOf(initialFollowingListUIState) private set val isSynchronizationPending: MutableState = mutableStateOf(false) @@ -64,7 +64,7 @@ class FollowersListViewModel( nostrRepository.observeProfileWithFollowers( publicKey ).collect { localFollowers -> - followersListUIState = to.curare.compose.ui.view.state.FollowersListUIState.Loaded( + followersListUIState = com.machankura.bennu.compose.ui.view.state.FollowersListUIState.Loaded( followers = localFollowers?.followers ?: emptyList() ) } @@ -76,9 +76,9 @@ class FollowersListViewModel( viewModelScope.launch(Dispatchers.IO) { // Sync Notifications... might want to also run this in the background nostrRepository.queueNegentropySynchronizeRequest( - to.curare.compose.nostr.Relays.DefaultDMRelayList.shuffled().map { normalizedRelayUrl -> - to.curare.compose.database.model.NegentropySynchronizeRequest( - id = to.curare.compose.database.model.NegentropySynchronizeRequest.computeId( + com.machankura.bennu.compose.nostr.Relays.DefaultDMRelayList.shuffled().map { normalizedRelayUrl -> + com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest( + id = com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest.computeId( relayURL = normalizedRelayUrl.url, synchronizationFilter = synchronizationFilter ), @@ -106,17 +106,17 @@ class FollowersListViewModel( @Composable fun RenderFeed( activeUserPublicKey: String, - onNavigateToEvent: (to.curare.compose.ui.composable.navigation.routes.Route) -> Unit + onNavigateToEvent: (com.machankura.bennu.compose.ui.composable.navigation.routes.Route) -> Unit ) { Column( modifier = Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally ) { when (val followersListUIState = followersListUIState) { - to.curare.compose.ui.view.state.FollowersListUIState.Error -> { + com.machankura.bennu.compose.ui.view.state.FollowersListUIState.Error -> { ErrorState() } - is to.curare.compose.ui.view.state.FollowersListUIState.Loaded -> { + is com.machankura.bennu.compose.ui.view.state.FollowersListUIState.Loaded -> { if (followersListUIState.followers.isEmpty()) { EmptyState(message = stringResource(Res.string.nobody_following_you_yet)) } else { @@ -138,7 +138,7 @@ class FollowersListViewModel( } } - to.curare.compose.ui.view.state.FollowersListUIState.Loading -> { + com.machankura.bennu.compose.ui.view.state.FollowersListUIState.Loading -> { Column( modifier = Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally @@ -165,10 +165,10 @@ class FollowersListViewModel( const val TAG = "FollowersListViewModel" fun factory( - initialFeedListUIState: to.curare.compose.ui.view.state.FollowersListUIState = to.curare.compose.ui.view.state.FollowersListUIState.Loading, + initialFeedListUIState: com.machankura.bennu.compose.ui.view.state.FollowersListUIState = com.machankura.bennu.compose.ui.view.state.FollowersListUIState.Loading, publicKey: String, - synchronizationFilter: to.curare.compose.database.model.types.SynchronizationFilter, - nostrRepository: to.curare.compose.repository.NostrRepository, + synchronizationFilter: com.machankura.bennu.compose.database.model.types.SynchronizationFilter, + nostrRepository: com.machankura.bennu.compose.repository.NostrRepository, ): ViewModelProvider.Factory = viewModelFactory { initializer { FollowersListViewModel( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/FollowingListViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/FollowingListViewModel.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/FollowingListViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/FollowingListViewModel.kt index dda47753..ea57dea1 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/FollowingListViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/FollowingListViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -30,23 +30,23 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.launch -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.loading -import curare.composeapp.generated.resources.something_went_wrong -import curare.composeapp.generated.resources.not_following_anyone_yet -import to.curare.compose.ui.composable.widgets.ErrorState -import to.curare.compose.ui.composable.widgets.EmptyState +import bennu.composeapp.generated.resources.loading +import bennu.composeapp.generated.resources.something_went_wrong +import bennu.composeapp.generated.resources.not_following_anyone_yet +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState +import com.machankura.bennu.compose.ui.composable.widgets.EmptyState class FollowingListViewModel( - initialFollowingListUIState: to.curare.compose.ui.view.state.FollowingListUIState, + initialFollowingListUIState: com.machankura.bennu.compose.ui.view.state.FollowingListUIState, val publicKey: String, - val synchronizationFilter: to.curare.compose.database.model.types.SynchronizationFilter, - val nostrRepository: to.curare.compose.repository.NostrRepository + val synchronizationFilter: com.machankura.bennu.compose.database.model.types.SynchronizationFilter, + val nostrRepository: com.machankura.bennu.compose.repository.NostrRepository ): ViewModel() { val logger = Logger.withTag(TAG) - var followingListUIState: to.curare.compose.ui.view.state.FollowingListUIState by mutableStateOf(initialFollowingListUIState) + var followingListUIState: com.machankura.bennu.compose.ui.view.state.FollowingListUIState by mutableStateOf(initialFollowingListUIState) private set val isSynchronizationPending: MutableState = mutableStateOf(false) @@ -63,7 +63,7 @@ class FollowingListViewModel( nostrRepository.observeProfileWithFollowing( publicKey ).collect { localFollowing -> - followingListUIState = to.curare.compose.ui.view.state.FollowingListUIState.Loaded( + followingListUIState = com.machankura.bennu.compose.ui.view.state.FollowingListUIState.Loaded( following = localFollowing?.following ?: emptyList() ) } @@ -75,9 +75,9 @@ class FollowingListViewModel( viewModelScope.launch(Dispatchers.IO) { // Sync Notifications... might want to also run this in the background nostrRepository.queueNegentropySynchronizeRequest( - to.curare.compose.nostr.Relays.DefaultDMRelayList.shuffled().map { normalizedRelayUrl -> - to.curare.compose.database.model.NegentropySynchronizeRequest( - id = to.curare.compose.database.model.NegentropySynchronizeRequest.computeId( + com.machankura.bennu.compose.nostr.Relays.DefaultDMRelayList.shuffled().map { normalizedRelayUrl -> + com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest( + id = com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest.computeId( relayURL = normalizedRelayUrl.url, synchronizationFilter = synchronizationFilter ), @@ -105,17 +105,17 @@ class FollowingListViewModel( @Composable fun RenderFeed( activeUserPublicKey: String, - onNavigateToEvent: (to.curare.compose.ui.composable.navigation.routes.Route) -> Unit + onNavigateToEvent: (com.machankura.bennu.compose.ui.composable.navigation.routes.Route) -> Unit ) { Column( modifier = Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally ) { when (val feedListUIState = followingListUIState) { - to.curare.compose.ui.view.state.FollowingListUIState.Error -> { + com.machankura.bennu.compose.ui.view.state.FollowingListUIState.Error -> { ErrorState() } - is to.curare.compose.ui.view.state.FollowingListUIState.Loaded -> { + is com.machankura.bennu.compose.ui.view.state.FollowingListUIState.Loaded -> { if (feedListUIState.following.isEmpty()) { EmptyState(message = stringResource(Res.string.not_following_anyone_yet)) } else { @@ -137,7 +137,7 @@ class FollowingListViewModel( } } - to.curare.compose.ui.view.state.FollowingListUIState.Loading -> { + com.machankura.bennu.compose.ui.view.state.FollowingListUIState.Loading -> { Column( modifier = Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally @@ -164,10 +164,10 @@ class FollowingListViewModel( const val TAG = "FollowingListViewModel" fun factory( - initialFeedListUIState: to.curare.compose.ui.view.state.FollowingListUIState = to.curare.compose.ui.view.state.FollowingListUIState.Loading, + initialFeedListUIState: com.machankura.bennu.compose.ui.view.state.FollowingListUIState = com.machankura.bennu.compose.ui.view.state.FollowingListUIState.Loading, publicKey: String, - synchronizationFilter: to.curare.compose.database.model.types.SynchronizationFilter, - nostrRepository: to.curare.compose.repository.NostrRepository, + synchronizationFilter: com.machankura.bennu.compose.database.model.types.SynchronizationFilter, + nostrRepository: com.machankura.bennu.compose.repository.NostrRepository, ): ViewModelProvider.Factory = viewModelFactory { initializer { FollowingListViewModel( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/FrostSigningViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/FrostSigningViewModel.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/FrostSigningViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/FrostSigningViewModel.kt index 646d9c8c..06c421f9 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/FrostSigningViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/FrostSigningViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue @@ -19,13 +19,13 @@ import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.launch -import to.curare.compose.database.model.FrostSignerMessage -import to.curare.compose.database.model.FrostSigningItem -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.nostr.frost.FrostSigningEvents -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.ui.view.state.FrostSigningUIState +import com.machankura.bennu.compose.database.model.FrostSignerMessage +import com.machankura.bennu.compose.database.model.FrostSigningItem +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.nostr.frost.FrostSigningEvents +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.ui.view.state.FrostSigningUIState class FrostSigningViewModel( val chatRoomId: String, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/GroupCuratedEntriesViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/GroupCuratedEntriesViewModel.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/GroupCuratedEntriesViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/GroupCuratedEntriesViewModel.kt index 9e9653e1..8e491817 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/GroupCuratedEntriesViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/GroupCuratedEntriesViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue @@ -16,11 +16,11 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.Job import kotlinx.coroutines.launch -import to.curare.compose.network.relays.EventPublishTransport -import to.curare.compose.nostr.GroupCuratedEntry -import to.curare.compose.repository.ChatRepository -import to.curare.compose.ui.view.model.BroadcastGroupSignedEventViewModel.RelayOutcome -import to.curare.compose.ui.view.state.GroupCuratedEntriesUIState +import com.machankura.bennu.compose.network.relays.EventPublishTransport +import com.machankura.bennu.compose.nostr.GroupCuratedEntry +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.ui.view.model.BroadcastGroupSignedEventViewModel.RelayOutcome +import com.machankura.bennu.compose.ui.view.state.GroupCuratedEntriesUIState /** * The entries the group has accepted into its lists, read once for the screen diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/GroupCuratedSchemasViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/GroupCuratedSchemasViewModel.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/GroupCuratedSchemasViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/GroupCuratedSchemasViewModel.kt index 14162a9f..6b2137dd 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/GroupCuratedSchemasViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/GroupCuratedSchemasViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -11,8 +11,8 @@ import androidx.lifecycle.viewmodel.viewModelFactory import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.launch -import to.curare.compose.repository.ChatRepository -import to.curare.compose.ui.view.state.GroupCuratedSchemasUIState +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.ui.view.state.GroupCuratedSchemasUIState /** * The schemas of the lists the group curates, read once for the screen that diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/GroupNostrProfileViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/GroupNostrProfileViewModel.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/GroupNostrProfileViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/GroupNostrProfileViewModel.kt index 7cd77fed..b5b27846 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/GroupNostrProfileViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/GroupNostrProfileViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -11,8 +11,8 @@ import androidx.lifecycle.viewmodel.viewModelFactory import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.launch -import to.curare.compose.repository.ChatRepository -import to.curare.compose.ui.view.state.GroupNostrProfileUIState +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.ui.view.state.GroupNostrProfileUIState /** * The group's nostr profile, read once for the screen that shows it. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/GroupPostsViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/GroupPostsViewModel.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/GroupPostsViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/GroupPostsViewModel.kt index 8bedbeb8..e3c282ae 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/GroupPostsViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/GroupPostsViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -11,8 +11,8 @@ import androidx.lifecycle.viewmodel.viewModelFactory import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.launch -import to.curare.compose.repository.ChatRepository -import to.curare.compose.ui.view.state.GroupPostsUIState +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.ui.view.state.GroupPostsUIState /** * The group's posts, read once for the screen that shows them, with the diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/GroupRelaysViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/GroupRelaysViewModel.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/GroupRelaysViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/GroupRelaysViewModel.kt index 1d7d7eb1..c3c4a5ea 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/GroupRelaysViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/GroupRelaysViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -11,8 +11,8 @@ import androidx.lifecycle.viewmodel.viewModelFactory import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.launch -import to.curare.compose.repository.ChatRepository -import to.curare.compose.ui.view.state.GroupRelaysUIState +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.ui.view.state.GroupRelaysUIState /** * The group's relay lists, read once for the screen that shows them. One read diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/HomeViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/HomeViewModel.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/HomeViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/HomeViewModel.kt index 842f58ad..322742a9 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/HomeViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/HomeViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.foundation.pager.PagerState import androidx.compose.runtime.getValue @@ -9,7 +9,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import to.curare.compose.ui.view.state.HomeScreenUIState +import com.machankura.bennu.compose.ui.view.state.HomeScreenUIState import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.Dispatchers @@ -23,7 +23,7 @@ enum class HomeScreenType { class HomeViewModel( val activeUserPublicKey: HexKey, val initialHomeScreenUIState: HomeScreenUIState, - val nostrRepository: to.curare.compose.repository.NostrRepository, + val nostrRepository: com.machankura.bennu.compose.repository.NostrRepository, val pagerState: PagerState ): ViewModel() { @@ -60,7 +60,7 @@ class HomeViewModel( fun factory( activeUserPublicKey: HexKey, initialHomeScreenUIState: HomeScreenUIState, - nostrRepository: to.curare.compose.repository.NostrRepository, + nostrRepository: com.machankura.bennu.compose.repository.NostrRepository, pagerState: PagerState ): ViewModelProvider.Factory = viewModelFactory { initializer { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/InReplyToViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/InReplyToViewModel.kt similarity index 73% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/InReplyToViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/InReplyToViewModel.kt index a14931ad..612cfd50 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/InReplyToViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/InReplyToViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -25,7 +25,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import to.curare.compose.ui.composable.widgets.feed.ListView +import com.machankura.bennu.compose.ui.composable.widgets.feed.ListView import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent import com.vitorpamplona.quartz.nip18Reposts.RepostEvent @@ -35,24 +35,24 @@ import kotlinx.coroutines.IO import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.launch import kotlin.time.Instant -import to.curare.compose.ui.theme.spacing -import curare.composeapp.generated.resources.Res +import com.machankura.bennu.compose.ui.theme.spacing +import bennu.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curare.composeapp.generated.resources.loading -import curare.composeapp.generated.resources.something_went_wrong -import curare.composeapp.generated.resources.no_replies_to_this_yet -import to.curare.compose.ui.composable.widgets.ErrorState -import to.curare.compose.ui.composable.widgets.EmptyState +import bennu.composeapp.generated.resources.loading +import bennu.composeapp.generated.resources.something_went_wrong +import bennu.composeapp.generated.resources.no_replies_to_this_yet +import com.machankura.bennu.compose.ui.composable.widgets.ErrorState +import com.machankura.bennu.compose.ui.composable.widgets.EmptyState class InReplyToViewModel( - val nostrEvent: to.curare.compose.database.model.NostrEvent, - val profile: to.curare.compose.database.model.Profile?, - initialFeedListUIState: to.curare.compose.ui.view.state.FeedListUIState, - val synchronizationFilter: to.curare.compose.database.model.types.SynchronizationFilter, - val nostrRepository: to.curare.compose.repository.NostrRepository + val nostrEvent: com.machankura.bennu.compose.database.model.NostrEvent, + val profile: com.machankura.bennu.compose.database.model.Profile?, + initialFeedListUIState: com.machankura.bennu.compose.ui.view.state.FeedListUIState, + val synchronizationFilter: com.machankura.bennu.compose.database.model.types.SynchronizationFilter, + val nostrRepository: com.machankura.bennu.compose.repository.NostrRepository ): ViewModel() { val logger = Logger.withTag(TAG) - var inReplyToFeedListUIState: to.curare.compose.ui.view.state.FeedListUIState by mutableStateOf(initialFeedListUIState) + var inReplyToFeedListUIState: com.machankura.bennu.compose.ui.view.state.FeedListUIState by mutableStateOf(initialFeedListUIState) private set val isSynchronizationPending: MutableState = mutableStateOf(false) @@ -70,7 +70,7 @@ class InReplyToViewModel( nostrRepository.observeNostrFeed( synchronizationFilter ).distinctUntilChanged().collect { localNostrEvents -> - inReplyToFeedListUIState = to.curare.compose.ui.view.state.FeedListUIState.Loaded( + inReplyToFeedListUIState = com.machankura.bennu.compose.ui.view.state.FeedListUIState.Loaded( localNostrEvents = localNostrEvents ) } @@ -83,12 +83,12 @@ class InReplyToViewModel( // Sync Notifications... might want to also run this in the background val publicRelays = profile?.profilePublicRelays( nostrRepository - ) ?: to.curare.compose.nostr.Relays.DefaultDMRelayList + ) ?: com.machankura.bennu.compose.nostr.Relays.DefaultDMRelayList nostrRepository.queueNegentropySynchronizeRequest( publicRelays.take(3).map { normalizedRelayUrl -> - to.curare.compose.database.model.NegentropySynchronizeRequest( - id = to.curare.compose.database.model.NegentropySynchronizeRequest.computeId( + com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest( + id = com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest.computeId( relayURL = normalizedRelayUrl.url, synchronizationFilter = synchronizationFilter ), @@ -116,17 +116,17 @@ class InReplyToViewModel( @Composable fun RenderFeed( activeUserPublicKey: String, - onNavigateToEvent: (to.curare.compose.ui.composable.navigation.routes.Route) -> Unit + onNavigateToEvent: (com.machankura.bennu.compose.ui.composable.navigation.routes.Route) -> Unit ) { Column( modifier = Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally ) { when (val feedListUIState = inReplyToFeedListUIState) { - to.curare.compose.ui.view.state.FeedListUIState.Error -> { + com.machankura.bennu.compose.ui.view.state.FeedListUIState.Error -> { ErrorState() } - is to.curare.compose.ui.view.state.FeedListUIState.Loaded -> { + is com.machankura.bennu.compose.ui.view.state.FeedListUIState.Loaded -> { if (feedListUIState.localNostrEvents.isEmpty()) { EmptyState(message = stringResource(Res.string.no_replies_to_this_yet)) } else { @@ -142,7 +142,7 @@ class InReplyToViewModel( localNostrEvent.ListView( onNavigateToEvent = { nostrEventId -> onNavigateToEvent.invoke( - to.curare.compose.ui.composable.navigation.routes.NostrEventDetailRoute( + com.machankura.bennu.compose.ui.composable.navigation.routes.NostrEventDetailRoute( activeUserPublicKey = activeUserPublicKey, nostrEventId = nostrEventId ) @@ -154,7 +154,7 @@ class InReplyToViewModel( } } - to.curare.compose.ui.view.state.FeedListUIState.Loading -> { + com.machankura.bennu.compose.ui.view.state.FeedListUIState.Loading -> { Column( modifier = Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally @@ -181,11 +181,11 @@ class InReplyToViewModel( const val TAG = "InReplyToViewModel" fun factory( - nostrEvent: to.curare.compose.database.model.NostrEvent, - profile: to.curare.compose.database.model.Profile?, + nostrEvent: com.machankura.bennu.compose.database.model.NostrEvent, + profile: com.machankura.bennu.compose.database.model.Profile?, createdAt: Instant, - initialFeedListUIState: to.curare.compose.ui.view.state.FeedListUIState = to.curare.compose.ui.view.state.FeedListUIState.Loading, - synchronizationFilter: to.curare.compose.database.model.types.SynchronizationFilter = to.curare.compose.database.model.types.SynchronizationFilter( + initialFeedListUIState: com.machankura.bennu.compose.ui.view.state.FeedListUIState = com.machankura.bennu.compose.ui.view.state.FeedListUIState.Loading, + synchronizationFilter: com.machankura.bennu.compose.database.model.types.SynchronizationFilter = com.machankura.bennu.compose.database.model.types.SynchronizationFilter( kinds = arrayOf( TextNoteEvent.KIND, ReactionEvent.KIND, @@ -198,7 +198,7 @@ class InReplyToViewModel( ), since = createdAt ), - nostrRepository: to.curare.compose.repository.NostrRepository, + nostrRepository: com.machankura.bennu.compose.repository.NostrRepository, ): ViewModelProvider.Factory = viewModelFactory { initializer { InReplyToViewModel( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/KeyPackageManagementViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/KeyPackageManagementViewModel.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/KeyPackageManagementViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/KeyPackageManagementViewModel.kt index c23ae660..5cd579f1 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/KeyPackageManagementViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/KeyPackageManagementViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -8,14 +8,14 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import to.curare.compose.database.model.MarmotKeyPackageBundle -import to.curare.compose.repository.MarmotRepository -import to.curare.compose.ui.view.state.KeyPackageManagementUIState +import com.machankura.bennu.compose.database.model.MarmotKeyPackageBundle +import com.machankura.bennu.compose.repository.MarmotRepository +import com.machankura.bennu.compose.ui.view.state.KeyPackageManagementUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey import co.touchlab.kermit.Logger import kotlinx.coroutines.flow.StateFlow -import to.curare.compose.identity.Identity -import to.curare.compose.identity.toKeyPair +import com.machankura.bennu.compose.identity.Identity +import com.machankura.bennu.compose.identity.toKeyPair import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.flow.distinctUntilChanged diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/MetadataEventDetailViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/MetadataEventDetailViewModel.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/MetadataEventDetailViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/MetadataEventDetailViewModel.kt index 1c4fc465..ec9e426a 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/MetadataEventDetailViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/MetadataEventDetailViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.foundation.pager.PagerState import androidx.compose.runtime.MutableState @@ -10,9 +10,9 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import to.curare.compose.database.model.NegentropySynchronizeRequest -import to.curare.compose.database.model.types.SynchronizationFilter -import to.curare.compose.nostr.Relays +import com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.nostr.Relays import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageEvent import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -44,16 +44,16 @@ enum class MetadataEventDetailType { } class MetadataEventDetailViewModel( - initialMetadataEventDetailUIState: to.curare.compose.ui.view.state.MetadataEventDetailUIState = to.curare.compose.ui.view.state.MetadataEventDetailUIState.Loading, + initialMetadataEventDetailUIState: com.machankura.bennu.compose.ui.view.state.MetadataEventDetailUIState = com.machankura.bennu.compose.ui.view.state.MetadataEventDetailUIState.Loading, val activeUserPublicKey: HexKey, val eventPublicKey: HexKey, - val nostrRepository: to.curare.compose.repository.NostrRepository, + val nostrRepository: com.machankura.bennu.compose.repository.NostrRepository, val pagerState: PagerState ): ViewModel() { val isActionPending: MutableState = mutableStateOf(false) - var metadataEventDetailUIState: to.curare.compose.ui.view.state.MetadataEventDetailUIState by mutableStateOf(initialMetadataEventDetailUIState) + var metadataEventDetailUIState: com.machankura.bennu.compose.ui.view.state.MetadataEventDetailUIState by mutableStateOf(initialMetadataEventDetailUIState) private set val logger = Logger.withTag("MetadataEventDetailViewModel") @@ -99,7 +99,7 @@ class MetadataEventDetailViewModel( ).collect { relations -> logger.d("We found relations: $relations") - metadataEventDetailUIState = to.curare.compose.ui.view.state.MetadataEventDetailUIState.Loaded( + metadataEventDetailUIState = com.machankura.bennu.compose.ui.view.state.MetadataEventDetailUIState.Loaded( isActiveUser = isActiveUser(activeUserPublicKey), followingActiveUserConnection = relations.find { connection -> connection.sourcePublicKey == eventPublicKey && connection.destinationPublicKey == activeUserPublicKey }, followedByActiveUserConnection = relations.find { connection -> connection.sourcePublicKey == activeUserPublicKey && connection.destinationPublicKey == eventPublicKey } @@ -127,7 +127,7 @@ class MetadataEventDetailViewModel( metadataEventDetailType: MetadataEventDetailType ) = when (metadataEventDetailType) { MetadataEventDetailType.Posts -> { - to.curare.compose.database.model.types.SynchronizationFilter( + com.machankura.bennu.compose.database.model.types.SynchronizationFilter( authors = arrayOf( eventPublicKey ), @@ -139,7 +139,7 @@ class MetadataEventDetailViewModel( ) } MetadataEventDetailType.Replies -> { - to.curare.compose.database.model.types.SynchronizationFilter( + com.machankura.bennu.compose.database.model.types.SynchronizationFilter( authors = arrayOf( eventPublicKey ), @@ -152,7 +152,7 @@ class MetadataEventDetailViewModel( ) } MetadataEventDetailType.Articles -> { - to.curare.compose.database.model.types.SynchronizationFilter( + com.machankura.bennu.compose.database.model.types.SynchronizationFilter( authors = arrayOf( eventPublicKey ), @@ -163,7 +163,7 @@ class MetadataEventDetailViewModel( ) } MetadataEventDetailType.Followers -> { - to.curare.compose.database.model.types.SynchronizationFilter( + com.machankura.bennu.compose.database.model.types.SynchronizationFilter( authors = arrayOf( eventPublicKey ), @@ -175,7 +175,7 @@ class MetadataEventDetailViewModel( ) } MetadataEventDetailType.Following -> { - to.curare.compose.database.model.types.SynchronizationFilter( + com.machankura.bennu.compose.database.model.types.SynchronizationFilter( authors = arrayOf( eventPublicKey ), @@ -186,7 +186,7 @@ class MetadataEventDetailViewModel( ) } MetadataEventDetailType.Zaps -> { - to.curare.compose.database.model.types.SynchronizationFilter( + com.machankura.bennu.compose.database.model.types.SynchronizationFilter( authors = arrayOf( eventPublicKey ), @@ -198,7 +198,7 @@ class MetadataEventDetailViewModel( ) } MetadataEventDetailType.Photos -> { - to.curare.compose.database.model.types.SynchronizationFilter( + com.machankura.bennu.compose.database.model.types.SynchronizationFilter( authors = arrayOf( eventPublicKey ), @@ -209,7 +209,7 @@ class MetadataEventDetailViewModel( ) } MetadataEventDetailType.Shorts -> { - to.curare.compose.database.model.types.SynchronizationFilter( + com.machankura.bennu.compose.database.model.types.SynchronizationFilter( authors = arrayOf( eventPublicKey ), @@ -220,7 +220,7 @@ class MetadataEventDetailViewModel( ) } MetadataEventDetailType.Videos -> { - to.curare.compose.database.model.types.SynchronizationFilter( + com.machankura.bennu.compose.database.model.types.SynchronizationFilter( authors = arrayOf( eventPublicKey ), @@ -231,7 +231,7 @@ class MetadataEventDetailViewModel( ) } MetadataEventDetailType.Bookmarks -> { - to.curare.compose.database.model.types.SynchronizationFilter( + com.machankura.bennu.compose.database.model.types.SynchronizationFilter( authors = arrayOf( eventPublicKey ), @@ -242,7 +242,7 @@ class MetadataEventDetailViewModel( ) } MetadataEventDetailType.Reports -> { - to.curare.compose.database.model.types.SynchronizationFilter( + com.machankura.bennu.compose.database.model.types.SynchronizationFilter( authors = arrayOf( eventPublicKey ), @@ -253,7 +253,7 @@ class MetadataEventDetailViewModel( ) } MetadataEventDetailType.Relays -> { - to.curare.compose.database.model.types.SynchronizationFilter( + com.machankura.bennu.compose.database.model.types.SynchronizationFilter( authors = arrayOf( eventPublicKey ), @@ -297,7 +297,7 @@ class MetadataEventDetailViewModel( val contactListTagList = followUsers.map { it } nostrRepository.saveUnsignedNostrEvent( - to.curare.compose.database.model.UnsignedNostrEvent( + com.machankura.bennu.compose.database.model.UnsignedNostrEvent( pubKey = activeUserPublicKey, kind = ContactListEvent.KIND, tags = contactListTagList.toTypedArray(), @@ -309,7 +309,7 @@ class MetadataEventDetailViewModel( } } - fun unfollow(connection: to.curare.compose.database.model.Connection) { + fun unfollow(connection: com.machankura.bennu.compose.database.model.Connection) { isActionPending.value = true viewModelScope.launch(Dispatchers.IO) { @@ -324,7 +324,7 @@ class MetadataEventDetailViewModel( logger.d("User is not being followed so no need to unfollow: $eventPublicKey") } else { nostrRepository.saveUnsignedNostrEvent( - to.curare.compose.database.model.UnsignedNostrEvent( + com.machankura.bennu.compose.database.model.UnsignedNostrEvent( pubKey = activeUserPublicKey, kind = ContactListEvent.KIND, tags = contactListEvent.tags.filter { it.size > 1 && it[1] != eventPublicKey } @@ -348,7 +348,7 @@ class MetadataEventDetailViewModel( fun factory( activeUserPublicKey: HexKey, publicKey: HexKey, - nostrRepository: to.curare.compose.repository.NostrRepository, + nostrRepository: com.machankura.bennu.compose.repository.NostrRepository, pagerState: PagerState ): ViewModelProvider.Factory = viewModelFactory { initializer { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/NavigationViewModel.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/NavigationViewModel.kt index b11f123a..e5e1cd99 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/NavigationViewModel.kt @@ -1,14 +1,14 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import to.curare.compose.database.model.intermdiate.LocalAccount -import to.curare.compose.ui.composable.navigation.routes.SovereignWalletStartupRoute -import to.curare.compose.ui.view.state.NavigationUIState +import com.machankura.bennu.compose.database.model.intermdiate.LocalAccount +import com.machankura.bennu.compose.ui.composable.navigation.routes.SovereignWalletStartupRoute +import com.machankura.bennu.compose.ui.view.state.NavigationUIState import co.touchlab.kermit.Logger -import to.curare.compose.identity.Identity +import com.machankura.bennu.compose.identity.Identity import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO @@ -25,7 +25,7 @@ import kotlin.time.Duration.Companion.milliseconds class NavigationViewModel( val activeIdentityStateFlow: StateFlow, initialNavigationUIState: NavigationUIState, - val nostrRepository: to.curare.compose.repository.NostrRepository, + val nostrRepository: com.machankura.bennu.compose.repository.NostrRepository, val scope: CoroutineScope, ): ViewModel() { @@ -38,7 +38,7 @@ class NavigationViewModel( fun factory( activeIdentity: StateFlow, initialNavigationUIState: NavigationUIState, - nostrRepository: to.curare.compose.repository.NostrRepository, + nostrRepository: com.machankura.bennu.compose.repository.NostrRepository, scope: CoroutineScope, ): ViewModelProvider.Factory = viewModelFactory { initializer { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NewProfileWriters.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/NewProfileWriters.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NewProfileWriters.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/NewProfileWriters.kt index 4b4f9f99..8739177a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NewProfileWriters.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/NewProfileWriters.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import fr.acinq.bitcoin.MnemonicCode import fr.acinq.bitcoin.PrivateKey @@ -6,10 +6,10 @@ import fr.acinq.lightning.Lightning import fr.acinq.phoenix.managers.nostrPublicKeyHex import fr.acinq.phoenix.utils.MnemonicLanguage import kotlinx.coroutines.CompletableDeferred -import to.curare.compose.identity.IdentityWriter -import to.curare.compose.identity.NewProfile -import to.curare.compose.identity.NewProfileWriter -import to.curare.compose.identity.StoredIdentity +import com.machankura.bennu.compose.identity.IdentityWriter +import com.machankura.bennu.compose.identity.NewProfile +import com.machankura.bennu.compose.identity.NewProfileWriter +import com.machankura.bennu.compose.identity.StoredIdentity /** * A profile with a wallet attached: twelve fresh words through the seed writer, which diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NostrEventDetailViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/NostrEventDetailViewModel.kt similarity index 71% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NostrEventDetailViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/NostrEventDetailViewModel.kt index 0af8f9d4..72d35279 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NostrEventDetailViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/NostrEventDetailViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -21,14 +21,14 @@ import kotlinx.coroutines.launch class NostrEventDetailViewModel( val activeUserPublicKey: HexKey, val nostrEventId: HexKey, - initialNostrEventDetailUIState: to.curare.compose.ui.view.state.NostrEventDetailUIState, - val nostrRepository: to.curare.compose.repository.NostrRepository + initialNostrEventDetailUIState: com.machankura.bennu.compose.ui.view.state.NostrEventDetailUIState, + val nostrRepository: com.machankura.bennu.compose.repository.NostrRepository ): ViewModel() { - var nostrEventDetailUIState: to.curare.compose.ui.view.state.NostrEventDetailUIState by mutableStateOf(initialNostrEventDetailUIState) + var nostrEventDetailUIState: com.machankura.bennu.compose.ui.view.state.NostrEventDetailUIState by mutableStateOf(initialNostrEventDetailUIState) private set fun retryLoad() { - nostrEventDetailUIState = to.curare.compose.ui.view.state.NostrEventDetailUIState.Loading + nostrEventDetailUIState = com.machankura.bennu.compose.ui.view.state.NostrEventDetailUIState.Loading loadNostrFeed() } @@ -36,11 +36,11 @@ class NostrEventDetailViewModel( viewModelScope.launch(Dispatchers.IO) { // Sync Notifications... might want to also run this in the background nostrRepository.queueSynchronizeNostrEvent( - to.curare.compose.nostr.Relays.DefaultDMRelayList.take(1).map { normalizedRelay -> // TODO: Sync from all relays instead of 1 - to.curare.compose.database.model.SynchronizeNostrEventRequest( + com.machankura.bennu.compose.nostr.Relays.DefaultDMRelayList.take(1).map { normalizedRelay -> // TODO: Sync from all relays instead of 1 + com.machankura.bennu.compose.database.model.SynchronizeNostrEventRequest( purpose = "detail", synchronizationFilters = arrayOf( - to.curare.compose.database.model.types.SynchronizationFilter( + com.machankura.bennu.compose.database.model.types.SynchronizationFilter( kinds = arrayOf( TextNoteEvent.KIND, RepostEvent.KIND, @@ -69,11 +69,11 @@ class NostrEventDetailViewModel( nostrEventId ).collectLatest { localNostrEvent -> nostrEventDetailUIState = if (localNostrEvent != null) { - to.curare.compose.ui.view.state.NostrEventDetailUIState.Loaded( + com.machankura.bennu.compose.ui.view.state.NostrEventDetailUIState.Loaded( localNostrEvent = localNostrEvent ) } else { - to.curare.compose.ui.view.state.NostrEventDetailUIState.Error + com.machankura.bennu.compose.ui.view.state.NostrEventDetailUIState.Error } } } @@ -85,8 +85,8 @@ class NostrEventDetailViewModel( fun factory( nostrEventId: HexKey, activeUserPublicKey: HexKey, - initialNostrEventDetailUIState: to.curare.compose.ui.view.state.NostrEventDetailUIState = to.curare.compose.ui.view.state.NostrEventDetailUIState.Loading, - nostrRepository: to.curare.compose.repository.NostrRepository, + initialNostrEventDetailUIState: com.machankura.bennu.compose.ui.view.state.NostrEventDetailUIState = com.machankura.bennu.compose.ui.view.state.NostrEventDetailUIState.Loading, + nostrRepository: com.machankura.bennu.compose.repository.NostrRepository, ): ViewModelProvider.Factory = viewModelFactory { initializer { NostrEventDetailViewModel( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NostrSecretViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/NostrSecretViewModel.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NostrSecretViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/NostrSecretViewModel.kt index 051bb9b8..19a8b4d0 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NostrSecretViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/NostrSecretViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider @@ -24,13 +24,13 @@ import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import to.curare.compose.extensions.hexToNsecHrp -import to.curare.compose.identity.ForgetIdentity -import to.curare.compose.identity.Identity -import to.curare.compose.identity.IdentityKind -import to.curare.compose.identity.IdentityWriter -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.view.state.NostrSecretUIState +import com.machankura.bennu.compose.extensions.hexToNsecHrp +import com.machankura.bennu.compose.identity.ForgetIdentity +import com.machankura.bennu.compose.identity.Identity +import com.machankura.bennu.compose.identity.IdentityKind +import com.machankura.bennu.compose.identity.IdentityWriter +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.view.state.NostrSecretUIState /** * Reads back the nostr secret key an identity was signed in with. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NotaryViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/NotaryViewModel.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NotaryViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/NotaryViewModel.kt index a642b6cc..bc6391ec 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NotaryViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/NotaryViewModel.kt @@ -1,10 +1,10 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import to.curare.compose.repository.MarmotRepository +import com.machankura.bennu.compose.repository.MarmotRepository import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.toHexKey @@ -12,11 +12,11 @@ import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageEvent import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageFetcher import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent -import to.curare.compose.nostr.SignInSync -import to.curare.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.nostr.SignInSync +import com.machankura.bennu.compose.nostr.MarmotProfile import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent -import to.curare.compose.identity.Identity +import com.machankura.bennu.compose.identity.Identity import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.coroutineScope @@ -26,14 +26,14 @@ import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch -import to.curare.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.NostrEvent import kotlin.time.Duration.Companion.seconds import kotlin.time.Instant class NotaryViewModel( val activeIdentityStateFlow: StateFlow, - val nostrRepository: to.curare.compose.repository.NostrRepository, - val chatRepository: to.curare.compose.repository.ChatRepository, + val nostrRepository: com.machankura.bennu.compose.repository.NostrRepository, + val chatRepository: com.machankura.bennu.compose.repository.ChatRepository, val marmotRepository: MarmotRepository, val scope: CoroutineScope, ): ViewModel() { @@ -44,8 +44,8 @@ class NotaryViewModel( fun factory( activeIdentityStateFlow: StateFlow, - nostrRepository: to.curare.compose.repository.NostrRepository, - chatRepository: to.curare.compose.repository.ChatRepository, + nostrRepository: com.machankura.bennu.compose.repository.NostrRepository, + chatRepository: com.machankura.bennu.compose.repository.ChatRepository, marmotRepository: MarmotRepository, scope: CoroutineScope, ): ViewModelProvider.Factory = viewModelFactory { @@ -108,7 +108,7 @@ class NotaryViewModel( * peer still on the MIP-era path keeps finding us on the relays it always did. */ private suspend fun publishRelaysFor(event: Event): List { - val defaults = to.curare.compose.nostr.Relays.DefaultDMRelayList + val defaults = com.machankura.bennu.compose.nostr.Relays.DefaultDMRelayList if (event.kind != KeyPackageEvent.KIND) return defaults.map { it.url } val outbox = nostrRepository.getNostrEvent(event.pubKey, AdvertisedRelayListEvent.KIND) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ProfilePreviewViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ProfilePreviewViewModel.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ProfilePreviewViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ProfilePreviewViewModel.kt index 4e5a502c..8d07d996 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ProfilePreviewViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ProfilePreviewViewModel.kt @@ -1,6 +1,6 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model -import to.curare.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.nostr.MarmotProfile import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue @@ -18,13 +18,13 @@ import kotlinx.coroutines.delay import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.launch -import to.curare.compose.database.model.MarmotKeyPackage -import to.curare.compose.database.model.Profile -import to.curare.compose.nostr.DirectMessagePeerSync -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.view.state.ProfilePreviewUIState -import to.curare.compose.ui.view.state.ProfilePreviewUIState.Readiness +import com.machankura.bennu.compose.database.model.MarmotKeyPackage +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.nostr.DirectMessagePeerSync +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.view.state.ProfilePreviewUIState +import com.machankura.bennu.compose.ui.view.state.ProfilePreviewUIState.Readiness import kotlin.concurrent.Volatile import kotlin.time.Duration import kotlin.time.Duration.Companion.seconds @@ -47,7 +47,7 @@ import kotlin.time.Duration.Companion.seconds * * One timeout, the one both DM view models use, and it only changes what is shown: * nothing found becomes not-found, and a person found without a key package becomes - * not-yet-on-Curare. The collect stays live past it, so whatever arrives on the + * not-yet-on-Bennu. The collect stays live past it, so whatever arrives on the * twenty-first second still lands. See docs/npub-profile-preview.md. */ class ProfilePreviewViewModel( @@ -89,7 +89,7 @@ class ProfilePreviewViewModel( relaysHadTheirTime = false when (val state = profilePreviewUIState) { is ProfilePreviewUIState.Loaded -> { - if (state.readiness == Readiness.NotYetOnCurare) { + if (state.readiness == Readiness.NotYetOnBennu) { profilePreviewUIState = state.copy(readiness = Readiness.Checking) } askTheRelays(profileToo = false) @@ -135,7 +135,7 @@ class ProfilePreviewViewModel( val readiness = when { existingRoom != null -> existingRoom keyPackage != null -> Readiness.CanStartChat - relaysHadTheirTime -> Readiness.NotYetOnCurare + relaysHadTheirTime -> Readiness.NotYetOnBennu else -> Readiness.Checking } // The clock stops only when there is nothing left to wait for. A profile on its @@ -153,7 +153,7 @@ class ProfilePreviewViewModel( ProfilePreviewUIState.Loading -> profilePreviewUIState = ProfilePreviewUIState.NotFound is ProfilePreviewUIState.Loaded -> if (state.readiness == Readiness.Checking) { - profilePreviewUIState = state.copy(readiness = Readiness.NotYetOnCurare) + profilePreviewUIState = state.copy(readiness = Readiness.NotYetOnBennu) } else -> Unit } diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ProfilesViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ProfilesViewModel.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ProfilesViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ProfilesViewModel.kt index 132be30d..39ca6827 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ProfilesViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ProfilesViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider @@ -17,11 +17,11 @@ import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn -import to.curare.compose.identity.Identity -import to.curare.compose.identity.StoredIdentity -import to.curare.compose.repository.NostrRepository -import to.curare.compose.repository.observeProfilesOf -import to.curare.compose.ui.view.state.ProfilesUIState +import com.machankura.bennu.compose.identity.Identity +import com.machankura.bennu.compose.identity.StoredIdentity +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.repository.observeProfilesOf +import com.machankura.bennu.compose.ui.view.state.ProfilesUIState /** * What the switcher shows: the device's profiles, which one is open, and each one's diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ProposalListViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ProposalListViewModel.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ProposalListViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ProposalListViewModel.kt index 2776aa12..00f04639 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ProposalListViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ProposalListViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -16,17 +16,17 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.flow.combine import kotlinx.coroutines.launch -import to.curare.compose.database.model.intermdiate.FrostSignerTally -import to.curare.compose.database.model.intermdiate.LocalFrostSigningSession -import to.curare.compose.database.model.types.FrostSigningStage -import to.curare.compose.extensions.shortened -import to.curare.compose.managers.FrostSigningManager -import to.curare.compose.nostr.frost.FrostSigningEvents -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.text.ProposedEvent -import to.curare.compose.ui.view.state.ProposalFilter -import to.curare.compose.ui.view.state.ProposalListUIState +import com.machankura.bennu.compose.database.model.intermdiate.FrostSignerTally +import com.machankura.bennu.compose.database.model.intermdiate.LocalFrostSigningSession +import com.machankura.bennu.compose.database.model.types.FrostSigningStage +import com.machankura.bennu.compose.extensions.shortened +import com.machankura.bennu.compose.managers.FrostSigningManager +import com.machankura.bennu.compose.nostr.frost.FrostSigningEvents +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.text.ProposedEvent +import com.machankura.bennu.compose.ui.view.state.ProposalFilter +import com.machankura.bennu.compose.ui.view.state.ProposalListUIState /** * Everything a group has asked its shared key to sign. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ProposeGroupEventViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ProposeGroupEventViewModel.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ProposeGroupEventViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ProposeGroupEventViewModel.kt index 0fab4dfe..29607e18 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ProposeGroupEventViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ProposeGroupEventViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue @@ -10,11 +10,11 @@ import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory import co.touchlab.kermit.Logger -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.GroupEventProposal -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.ui.view.state.ProposeGroupEventUIState +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.GroupEventProposal +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.ui.view.state.ProposeGroupEventUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/RecoveryPhraseViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/RecoveryPhraseViewModel.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/RecoveryPhraseViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/RecoveryPhraseViewModel.kt index f1f1085a..5f5e4b3d 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/RecoveryPhraseViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/RecoveryPhraseViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider @@ -7,7 +7,7 @@ import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory import co.touchlab.kermit.Logger import fr.acinq.phoenix.PhoenixGlobal -import to.curare.compose.identity.Identity +import com.machankura.bennu.compose.identity.Identity import fr.acinq.phoenix.data.DecryptSeedResult import kotlinx.coroutines.CoroutineExceptionHandler import kotlinx.coroutines.Dispatchers @@ -22,7 +22,7 @@ import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import to.curare.compose.ui.view.state.RecoveryPhraseUIState +import com.machankura.bennu.compose.ui.view.state.RecoveryPhraseUIState /** * Reads back the twelve words this device's keys are made of. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SearchMemberToAddToChatRoomViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SearchMemberToAddToChatRoomViewModel.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SearchMemberToAddToChatRoomViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SearchMemberToAddToChatRoomViewModel.kt index 015edff5..22b4016a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SearchMemberToAddToChatRoomViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SearchMemberToAddToChatRoomViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue @@ -9,13 +9,13 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import to.curare.compose.database.model.NegentropySynchronizeRequest -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.types.SynchronizationFilter -import to.curare.compose.nostr.Relays -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.view.state.SearchMemberToAddToChatRoomUIState +import com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.nostr.Relays +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.view.state.SearchMemberToAddToChatRoomUIState import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageEvent import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SearchResultViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SearchResultViewModel.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SearchResultViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SearchResultViewModel.kt index 1ff831ca..c7ee288d 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SearchResultViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SearchResultViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -8,9 +8,9 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import to.curare.compose.database.model.types.SynchronizationFilter -import to.curare.compose.extensions.bech32ToHexOrNull -import to.curare.compose.ui.view.state.SearchResultListUIState +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.extensions.bech32ToHexOrNull +import com.machankura.bennu.compose.ui.view.state.SearchResultListUIState import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import kotlinx.coroutines.Dispatchers @@ -25,8 +25,8 @@ enum class SearchResultType { class SearchResultViewModel( initialSearchResultType: SearchResultType, val searchQuery: String, - val nostrRepository: to.curare.compose.repository.NostrRepository, - val searchRepository: to.curare.compose.repository.SearchRepository, + val nostrRepository: com.machankura.bennu.compose.repository.NostrRepository, + val searchRepository: com.machankura.bennu.compose.repository.SearchRepository, ): ViewModel() { val logger = Logger.withTag(TAG) @@ -101,8 +101,8 @@ class SearchResultViewModel( viewModelScope.launch(Dispatchers.IO) { // Sync Notifications... might want to also run this in the background searchRepository.submitSearch( - to.curare.compose.nostr.Relays.eventFinderRelaySet.map { normalizedRelay -> // TODO: Search all relays instead of the first - to.curare.compose.database.model.SynchronizeNostrEventRequest( + com.machankura.bennu.compose.nostr.Relays.eventFinderRelaySet.map { normalizedRelay -> // TODO: Search all relays instead of the first + com.machankura.bennu.compose.database.model.SynchronizeNostrEventRequest( purpose = "search", synchronizationFilters = arrayOf( synchronizationFilter @@ -133,8 +133,8 @@ class SearchResultViewModel( fun factory( initialSearchResultType: SearchResultType = SearchResultType.Profiles, searchQuery: String, - nostrRepository: to.curare.compose.repository.NostrRepository, - searchRepository: to.curare.compose.repository.SearchRepository, + nostrRepository: com.machankura.bennu.compose.repository.NostrRepository, + searchRepository: com.machankura.bennu.compose.repository.SearchRepository, ): ViewModelProvider.Factory = viewModelFactory { initializer { SearchResultViewModel( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SearchViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SearchViewModel.kt similarity index 64% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SearchViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SearchViewModel.kt index d0209600..0014c264 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SearchViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SearchViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateListOf @@ -15,22 +15,22 @@ import kotlinx.coroutines.IO import kotlinx.coroutines.launch class SearchViewModel( - initialSearchUIState: to.curare.compose.ui.view.state.SearchUIState, - val nostrRepository: to.curare.compose.repository.NostrRepository, - val searchRepository: to.curare.compose.repository.SearchRepository, + initialSearchUIState: com.machankura.bennu.compose.ui.view.state.SearchUIState, + val nostrRepository: com.machankura.bennu.compose.repository.NostrRepository, + val searchRepository: com.machankura.bennu.compose.repository.SearchRepository, ): ViewModel() { val logger = Logger.withTag(TAG) - var searchUIState: to.curare.compose.ui.view.state.SearchUIState by mutableStateOf(initialSearchUIState) + var searchUIState: com.machankura.bennu.compose.ui.view.state.SearchUIState by mutableStateOf(initialSearchUIState) private set - var searchableProfiles = mutableStateListOf() + var searchableProfiles = mutableStateListOf() private set - var filteredProfiles = mutableStateListOf() + var filteredProfiles = mutableStateListOf() private set - var recentSearches = mutableStateListOf() + var recentSearches = mutableStateListOf() private set init { @@ -65,7 +65,7 @@ class SearchViewModel( } } - fun removeRecentSearch(recentSearch: to.curare.compose.database.model.RecentSearch) { + fun removeRecentSearch(recentSearch: com.machankura.bennu.compose.database.model.RecentSearch) { viewModelScope.launch(Dispatchers.IO) { nostrRepository.removeRecentSearch(recentSearch) recentSearches.remove(recentSearch) @@ -76,9 +76,9 @@ class SearchViewModel( const val TAG = "SearchViewModel" fun factory( - initialSearchUIState: to.curare.compose.ui.view.state.SearchUIState = to.curare.compose.ui.view.state.SearchUIState.Prompt, - nostrRepository: to.curare.compose.repository.NostrRepository, - searchRepository: to.curare.compose.repository.SearchRepository, + initialSearchUIState: com.machankura.bennu.compose.ui.view.state.SearchUIState = com.machankura.bennu.compose.ui.view.state.SearchUIState.Prompt, + nostrRepository: com.machankura.bennu.compose.repository.NostrRepository, + searchRepository: com.machankura.bennu.compose.repository.SearchRepository, ): ViewModelProvider.Factory = viewModelFactory { initializer { SearchViewModel( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SelectChatRoomMembersViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SelectChatRoomMembersViewModel.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SelectChatRoomMembersViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SelectChatRoomMembersViewModel.kt index b824b349..bf7a24d0 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SelectChatRoomMembersViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SelectChatRoomMembersViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateListOf @@ -9,14 +9,14 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import to.curare.compose.database.model.NegentropySynchronizeRequest -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.types.SynchronizationFilter -import to.curare.compose.nostr.Relays -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.navigation.routes.SelectChatRoomTypeRoute -import to.curare.compose.ui.view.state.SelectChatRoomMembersUIState +import com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.nostr.Relays +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.navigation.routes.SelectChatRoomTypeRoute +import com.machankura.bennu.compose.ui.view.state.SelectChatRoomMembersUIState import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageEvent import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SelectChatRoomTypeViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SelectChatRoomTypeViewModel.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SelectChatRoomTypeViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SelectChatRoomTypeViewModel.kt index 4230d284..e9290f0e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SelectChatRoomTypeViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SelectChatRoomTypeViewModel.kt @@ -1,6 +1,6 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model -import to.curare.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.nostr.MarmotProfile import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateListOf @@ -11,25 +11,25 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.types.ChatRoomType -import to.curare.compose.extensions.toHex -import to.curare.compose.managers.MarmotGroupFactory -import to.curare.compose.managers.MarmotGroupName -import to.curare.compose.nostr.Relays -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.DkgRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute -import to.curare.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.view.state.SelectChatRoomTypeUIState +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.types.ChatRoomType +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.managers.MarmotGroupFactory +import com.machankura.bennu.compose.managers.MarmotGroupName +import com.machankura.bennu.compose.nostr.Relays +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.DkgRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ImplementationPendingRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.view.state.SelectChatRoomTypeUIState import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.toHexKey import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import com.vitorpamplona.quartz.utils.RandomInstance -import to.curare.compose.identity.Identity +import com.machankura.bennu.compose.identity.Identity import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.async diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SelectSubgroupAdminsViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SelectSubgroupAdminsViewModel.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SelectSubgroupAdminsViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SelectSubgroupAdminsViewModel.kt index 73988533..9e3a5e17 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SelectSubgroupAdminsViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SelectSubgroupAdminsViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue @@ -12,19 +12,19 @@ import androidx.lifecycle.viewmodel.viewModelFactory import androidx.lifecycle.viewModelScope import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.identity.Identity +import com.machankura.bennu.compose.identity.Identity import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import to.curare.compose.database.model.types.ChatRoomType -import to.curare.compose.managers.MarmotGroupCreation -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.DkgRepository -import to.curare.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.view.state.SelectSubgroupAdminsUIState +import com.machankura.bennu.compose.database.model.types.ChatRoomType +import com.machankura.bennu.compose.managers.MarmotGroupCreation +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.DkgRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.view.state.SelectSubgroupAdminsUIState /** * Who runs a subgroup, what it is called, and on what quorum. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ShareProfileViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ShareProfileViewModel.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ShareProfileViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ShareProfileViewModel.kt index 061a9e4a..1f7b4d4a 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ShareProfileViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ShareProfileViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -8,10 +8,10 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import to.curare.compose.database.model.BroadcastNostrEventRequest -import to.curare.compose.database.model.intermdiate.LocalNostrEvent -import to.curare.compose.nostr.Relays -import to.curare.compose.ui.view.state.ShareProfileUIState +import com.machankura.bennu.compose.database.model.BroadcastNostrEventRequest +import com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent +import com.machankura.bennu.compose.nostr.Relays +import com.machankura.bennu.compose.ui.view.state.ShareProfileUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import kotlinx.coroutines.Dispatchers @@ -23,7 +23,7 @@ class ShareProfileViewModel( val activeUserPublicKey: HexKey, val nostrEventId: HexKey, initialActiveProfileUIState: ShareProfileUIState, - val nostrRepository: to.curare.compose.repository.NostrRepository + val nostrRepository: com.machankura.bennu.compose.repository.NostrRepository ): ViewModel() { var shareProfileUIState: ShareProfileUIState by mutableStateOf(initialActiveProfileUIState) private set @@ -72,7 +72,7 @@ class ShareProfileViewModel( nostrEventId: HexKey, activeUserPublicKey: HexKey, initialActiveProfileUIState: ShareProfileUIState = ShareProfileUIState.Loading, - nostrRepository: to.curare.compose.repository.NostrRepository, + nostrRepository: com.machankura.bennu.compose.repository.NostrRepository, ): ViewModelProvider.Factory = viewModelFactory { initializer { ShareProfileViewModel( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SignInToProfileViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SignInToProfileViewModel.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SignInToProfileViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SignInToProfileViewModel.kt index 9af0535f..878ac20c 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SignInToProfileViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SignInToProfileViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf @@ -17,13 +17,13 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import to.curare.compose.identity.CredentialParser -import to.curare.compose.identity.CredentialProblem -import to.curare.compose.identity.IdentityWriter -import to.curare.compose.identity.SignInCredential -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.view.state.SignInToProfileUIState -import to.curare.compose.ui.view.state.form.SignInToProfileFormState +import com.machankura.bennu.compose.identity.CredentialParser +import com.machankura.bennu.compose.identity.CredentialProblem +import com.machankura.bennu.compose.identity.IdentityWriter +import com.machankura.bennu.compose.identity.SignInCredential +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.view.state.SignInToProfileUIState +import com.machankura.bennu.compose.ui.view.state.form.SignInToProfileFormState /** * Signs in with something the user already has: a recovery phrase, an nsec, or -- to diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SignOutViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SignOutViewModel.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SignOutViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SignOutViewModel.kt index e2ed835f..e2bfeccc 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SignOutViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SignOutViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider @@ -14,10 +14,10 @@ import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import to.curare.compose.identity.ForgetIdentity -import to.curare.compose.identity.Identity -import to.curare.compose.identity.IdentityWriter -import to.curare.compose.repository.NostrRepository +import com.machankura.bennu.compose.identity.ForgetIdentity +import com.machankura.bennu.compose.identity.Identity +import com.machankura.bennu.compose.identity.IdentityWriter +import com.machankura.bennu.compose.repository.NostrRepository /** * Signing out of a read-only identity, which is forgetting it: there is nothing on the diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SovereignWalletStartupViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SovereignWalletStartupViewModel.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SovereignWalletStartupViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SovereignWalletStartupViewModel.kt index 2e3a8c36..4be4281f 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SovereignWalletStartupViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SovereignWalletStartupViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.mutableStateOf import androidx.lifecycle.ViewModel @@ -48,11 +48,11 @@ class SovereignWalletStartupViewModel( state.value = StartupViewState.StartingBusiness(walletId) val startResult: StartBusinessResult = - to.curare.compose.extensions.platformStartupLogic( + com.machankura.bennu.compose.extensions.platformStartupLogic( words ) - to.curare.compose.extensions.schedulePlatformLogic( + com.machankura.bennu.compose.extensions.schedulePlatformLogic( phoenixGlobal = phoenixGlobal, ) when (startResult) { @@ -69,7 +69,7 @@ class SovereignWalletStartupViewModel( } fun getShowIntroFlow(): Flow { - return to.curare.compose.extensions.getShowIntroFlow(phoenixGlobal) + return com.machankura.bennu.compose.extensions.getShowIntroFlow(phoenixGlobal) } companion object { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SovereignWalletViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SovereignWalletViewModel.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SovereignWalletViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SovereignWalletViewModel.kt index b0ea49bd..3d813d1b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SovereignWalletViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SovereignWalletViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -39,11 +39,11 @@ import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch -import to.curare.compose.identity.Identity -import to.curare.compose.identity.IdentityKind -import to.curare.compose.identity.IdentityWriter -import to.curare.compose.identity.SeedCredentials -import to.curare.compose.identity.StoredIdentity +import com.machankura.bennu.compose.identity.Identity +import com.machankura.bennu.compose.identity.IdentityKind +import com.machankura.bennu.compose.identity.IdentityWriter +import com.machankura.bennu.compose.identity.SeedCredentials +import com.machankura.bennu.compose.identity.StoredIdentity sealed class WritingSeedState { data object Init : WritingSeedState() @@ -125,17 +125,17 @@ class SovereignWalletViewModel( val exchangeRates = phoenixGlobal.currencyManager.ratesFlow .stateIn(viewModelScope, started = SharingStarted.Lazily, initialValue = emptyList()) - var walletUIState: to.curare.compose.ui.view.state.SovereignWalletUIState by mutableStateOf( - to.curare.compose.ui.view.state.SovereignWalletUIState.Loading) + var walletUIState: com.machankura.bennu.compose.ui.view.state.SovereignWalletUIState by mutableStateOf( + com.machankura.bennu.compose.ui.view.state.SovereignWalletUIState.Loading) private set fun retryLoad() { - walletUIState = to.curare.compose.ui.view.state.SovereignWalletUIState.Loading + walletUIState = com.machankura.bennu.compose.ui.view.state.SovereignWalletUIState.Loading } fun loadSovereignData(walletId: WalletId) { - walletUIState = to.curare.compose.ui.view.state.SovereignWalletUIState.Success( + walletUIState = com.machankura.bennu.compose.ui.view.state.SovereignWalletUIState.Success( publicKey = walletId.nodeIdHash, balanceInSatoshis = 0 // TODO: Get balance... ) @@ -337,7 +337,7 @@ class SovereignWalletViewModel( phoenixGlobal = phoenixGlobal, walletId = walletId, name = null, - avatar = to.curare.compose.ui.composable.widgets.wallet.WalletAvatars.list.random(), + avatar = com.machankura.bennu.compose.ui.composable.widgets.wallet.WalletAvatars.list.random(), isHidden = false ) } @@ -413,7 +413,7 @@ class SovereignWalletViewModel( } fun getGlobalPrefs(): GlobalPrefs { - return to.curare.compose.extensions.getGlobalPrefs( + return com.machankura.bennu.compose.extensions.getGlobalPrefs( phoenixGlobal ) } diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SynchronizationViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SynchronizationViewModel.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SynchronizationViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SynchronizationViewModel.kt index 050c5098..21fcfd87 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SynchronizationViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SynchronizationViewModel.kt @@ -1,25 +1,25 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import to.curare.compose.database.model.BroadcastStatus -import to.curare.compose.database.model.BroadcastNostrEventRequest -import to.curare.compose.database.model.SynchronizeNostrEventRequest -import to.curare.compose.database.model.types.SynchronizationFilter -import to.curare.compose.network.dto.toRelayDTO -import to.curare.compose.AppLifecycle -import to.curare.compose.managers.LiveSubscriptionManager -import to.curare.compose.network.relays.RelayPool -import to.curare.compose.network.relays.RelaysSocketManager -import to.curare.compose.network.relays.isRelayBackPressure -import to.curare.compose.network.sockets.NostrIncomingMessage -import to.curare.compose.network.sockets.DefaultNostrSocketClientFactory -import to.curare.compose.repository.CachingImportRepository -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.repository.RelayRepository +import com.machankura.bennu.compose.database.model.BroadcastStatus +import com.machankura.bennu.compose.database.model.BroadcastNostrEventRequest +import com.machankura.bennu.compose.database.model.SynchronizeNostrEventRequest +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.network.dto.toRelayDTO +import com.machankura.bennu.compose.AppLifecycle +import com.machankura.bennu.compose.managers.LiveSubscriptionManager +import com.machankura.bennu.compose.network.relays.RelayPool +import com.machankura.bennu.compose.network.relays.RelaysSocketManager +import com.machankura.bennu.compose.network.relays.isRelayBackPressure +import com.machankura.bennu.compose.network.sockets.NostrIncomingMessage +import com.machankura.bennu.compose.network.sockets.DefaultNostrSocketClientFactory +import com.machankura.bennu.compose.repository.CachingImportRepository +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.repository.RelayRepository import co.touchlab.kermit.Logger import com.vitorpamplona.negentropy.Negentropy import com.vitorpamplona.negentropy.storage.StorageVector @@ -31,8 +31,8 @@ import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip77Negentropy.NegCloseCmd import com.vitorpamplona.quartz.nip77Negentropy.NegMsgCmd import com.vitorpamplona.quartz.nip77Negentropy.NegOpenCmd -import to.curare.compose.identity.Identity -import to.curare.compose.identity.toKeyPair +import com.machankura.bennu.compose.identity.Identity +import com.machankura.bennu.compose.identity.toKeyPair import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -57,7 +57,7 @@ import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.Semaphore import kotlinx.coroutines.sync.withLock -import to.curare.compose.nostr.SignInSync +import com.machankura.bennu.compose.nostr.SignInSync import kotlinx.coroutines.sync.withPermit import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.seconds @@ -392,8 +392,8 @@ class SynchronizationViewModel( * profile. */ private suspend fun followSignInHop( - nostrEvent: to.curare.compose.database.model.NostrEvent, - request: to.curare.compose.database.model.SynchronizeNostrEventRequest, + nostrEvent: com.machankura.bennu.compose.database.model.NostrEvent, + request: com.machankura.bennu.compose.database.model.SynchronizeNostrEventRequest, ) { if (request.purpose != SignInSync.PURPOSE || request.level != 0) return if (nostrEvent.kind != AdvertisedRelayListEvent.KIND) return @@ -679,7 +679,7 @@ class SynchronizationViewModel( * A row the vector cannot hold is a row this device cannot reconcile; dropping it costs one * event's worth of extra transfer, where letting it through costs the entire sync. */ - private fun List.toNegentropy(): Negentropy { + private fun List.toNegentropy(): Negentropy { val storage = StorageVector() val seen = HashSet(size) @@ -711,7 +711,7 @@ class SynchronizationViewModel( * we have. */ private suspend fun applyReconciliation( - negentropySynchronizeRequest: to.curare.compose.database.model.NegentropySynchronizeRequest, + negentropySynchronizeRequest: com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest, needIds: Set, sendIds: Set, localEventIds: Set, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/TranslateChunkViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/TranslateChunkViewModel.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/TranslateChunkViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/TranslateChunkViewModel.kt index b0b9cd3d..38e195ca 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/TranslateChunkViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/TranslateChunkViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.foundation.text.input.TextFieldState import androidx.compose.runtime.MutableState @@ -15,13 +15,13 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.launch -import to.curare.compose.database.model.MantraChunk -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.nip30303.TranslationChunkEvent -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.repository.MantraRepository -import to.curare.compose.ui.view.state.TranslateChunkUIState +import com.machankura.bennu.compose.database.model.MantraChunk +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.nip30303.TranslationChunkEvent +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.repository.MantraRepository +import com.machankura.bennu.compose.ui.view.state.TranslateChunkUIState class TranslateChunkViewModel( val translationChapterId: String, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/TranslationArtifactVersionDetailViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/TranslationArtifactVersionDetailViewModel.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/TranslationArtifactVersionDetailViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/TranslationArtifactVersionDetailViewModel.kt index 0af34bc8..1ef0431c 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/TranslationArtifactVersionDetailViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/TranslationArtifactVersionDetailViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue @@ -15,15 +15,15 @@ import com.vitorpamplona.quartz.utils.TimeUtils import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.launch -import to.curare.compose.database.model.MantraChapter -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.managers.FrostSigningManager -import to.curare.compose.managers.TranslationScaffold -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.repository.MantraRepository -import to.curare.compose.ui.view.state.TranslationChapterProgress -import to.curare.compose.ui.view.state.TranslationArtifactVersionDetailUIState +import com.machankura.bennu.compose.database.model.MantraChapter +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.managers.FrostSigningManager +import com.machankura.bennu.compose.managers.TranslationScaffold +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.repository.MantraRepository +import com.machankura.bennu.compose.ui.view.state.TranslationChapterProgress +import com.machankura.bennu.compose.ui.view.state.TranslationArtifactVersionDetailUIState class TranslationArtifactVersionDetailViewModel( val translationArtifactVersionId: String, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/TranslationChapterViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/TranslationChapterViewModel.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/TranslationChapterViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/TranslationChapterViewModel.kt index 4633ff6b..8a61891e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/TranslationChapterViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/TranslationChapterViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -13,9 +13,9 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.launch -import to.curare.compose.repository.MantraRepository -import to.curare.compose.ui.view.state.ChunkTranslationPair -import to.curare.compose.ui.view.state.TranslationChapterUIState +import com.machankura.bennu.compose.repository.MantraRepository +import com.machankura.bennu.compose.ui.view.state.ChunkTranslationPair +import com.machankura.bennu.compose.ui.view.state.TranslationChapterUIState class TranslationChapterViewModel( val translationChapterId: String, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/UnqueuedProfileSynchronizationViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/UnqueuedProfileSynchronizationViewModel.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/UnqueuedProfileSynchronizationViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/UnqueuedProfileSynchronizationViewModel.kt index 685a06cb..89b18b9f 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/UnqueuedProfileSynchronizationViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/UnqueuedProfileSynchronizationViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf @@ -12,12 +12,12 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import to.curare.compose.nostr.SignInSync +import com.machankura.bennu.compose.nostr.SignInSync class UnqueuedProfileSynchronizationViewModel( val unsignedNostrEventId: Long, val profilePublicKey: String, - val nostrRepository: to.curare.compose.repository.NostrRepository + val nostrRepository: com.machankura.bennu.compose.repository.NostrRepository ): ViewModel() { companion object { private const val TAG = "UnqueuedProfileSynchronizationViewModel" @@ -25,7 +25,7 @@ class UnqueuedProfileSynchronizationViewModel( fun factory( unsignedNostrEventId: Long, profilePublicKey: String, - nostrRepository: to.curare.compose.repository.NostrRepository + nostrRepository: com.machankura.bennu.compose.repository.NostrRepository ): ViewModelProvider.Factory = viewModelFactory { initializer { UnqueuedProfileSynchronizationViewModel( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/UnsyncedProfileViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/UnsyncedProfileViewModel.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/UnsyncedProfileViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/UnsyncedProfileViewModel.kt index 32665293..ea93c61f 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/UnsyncedProfileViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/UnsyncedProfileViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf @@ -18,11 +18,11 @@ import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch -import to.curare.compose.database.model.intermdiate.LocalAccount -import to.curare.compose.nostr.SignInSync -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.view.state.UnsyncedProfileUIState -import to.curare.compose.ui.view.state.form.CreateProfileFormState +import com.machankura.bennu.compose.database.model.intermdiate.LocalAccount +import com.machankura.bennu.compose.nostr.SignInSync +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.view.state.UnsyncedProfileUIState +import com.machankura.bennu.compose.ui.view.state.form.CreateProfileFormState /** * The screen that waits for a sign-in sync, and the one decision it makes: whether the diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/WriteNewNoteViewModel.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/WriteNewNoteViewModel.kt similarity index 71% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/WriteNewNoteViewModel.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/WriteNewNoteViewModel.kt index 75e495d3..49376d2c 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/WriteNewNoteViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/WriteNewNoteViewModel.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue @@ -24,9 +24,9 @@ class WriteNewNoteViewModel( val replyToNostrEventId: HexKey?, val quotedNostrEventId: HexKey?, - initialWriteNewNoteUIState: to.curare.compose.ui.view.state.WriteNewNoteUIState, - val writeNewNoteFormState: to.curare.compose.ui.view.state.form.WriteNewNoteFormState = to.curare.compose.ui.view.state.form.WriteNewNoteFormState(), - val nostrRepository: to.curare.compose.repository.NostrRepository + initialWriteNewNoteUIState: com.machankura.bennu.compose.ui.view.state.WriteNewNoteUIState, + val writeNewNoteFormState: com.machankura.bennu.compose.ui.view.state.form.WriteNewNoteFormState = com.machankura.bennu.compose.ui.view.state.form.WriteNewNoteFormState(), + val nostrRepository: com.machankura.bennu.compose.repository.NostrRepository ): ViewModel() { companion object { private const val TAG = "WriteNewNoteViewModel" @@ -35,8 +35,8 @@ class WriteNewNoteViewModel( activeUserPublicKey: HexKey, replyToNostrEventId: HexKey?, quotedNostrEventId: HexKey?, - initialWriteNewNoteUIState: to.curare.compose.ui.view.state.WriteNewNoteUIState, - nostrRepository: to.curare.compose.repository.NostrRepository, + initialWriteNewNoteUIState: com.machankura.bennu.compose.ui.view.state.WriteNewNoteUIState, + nostrRepository: com.machankura.bennu.compose.repository.NostrRepository, ): ViewModelProvider.Factory = viewModelFactory { initializer { WriteNewNoteViewModel( @@ -54,13 +54,13 @@ class WriteNewNoteViewModel( val isActionPending: MutableState = mutableStateOf(false) - var writeNewNoteUIState: to.curare.compose.ui.view.state.WriteNewNoteUIState by mutableStateOf(initialWriteNewNoteUIState) + var writeNewNoteUIState: com.machankura.bennu.compose.ui.view.state.WriteNewNoteUIState by mutableStateOf(initialWriteNewNoteUIState) private set - var mentionableProfiles = mutableStateListOf() + var mentionableProfiles = mutableStateListOf() private set - var mentionedProfiles = mutableStateListOf() + var mentionedProfiles = mutableStateListOf() private set var atSymbolRange = mutableStateOf(null) @@ -78,7 +78,7 @@ class WriteNewNoteViewModel( } } - fun addProfileToMentionedProfiles(profile: to.curare.compose.database.model.Profile) { + fun addProfileToMentionedProfiles(profile: com.machankura.bennu.compose.database.model.Profile) { atSymbolRange.value?.let { range -> mentionedProfiles.add(profile) writeNewNoteFormState.textFieldForm.textFieldState.edit { @@ -121,27 +121,27 @@ class WriteNewNoteViewModel( activePublicKey ).collect { profileWithFollowing -> writeNewNoteUIState = if (profileWithFollowing != null) { - to.curare.compose.ui.view.state.WriteNewNoteUIState.InputPrompt( + com.machankura.bennu.compose.ui.view.state.WriteNewNoteUIState.InputPrompt( localProfile = profileWithFollowing, inReplyToNostrEvent = nostrEventBeingRepliedTo, quotedNostrEvent = nostrEventBeingQuoted ) } else { - to.curare.compose.ui.view.state.WriteNewNoteUIState.Error + com.machankura.bennu.compose.ui.view.state.WriteNewNoteUIState.Error } } } } fun confirmNote( - localProfile: to.curare.compose.database.model.intermdiate.LocalProfileWithFollowing, - inReplyToNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent?, - quotedNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent? + localProfile: com.machankura.bennu.compose.database.model.intermdiate.LocalProfileWithFollowing, + inReplyToNostrEvent: com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent?, + quotedNostrEvent: com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent? ) { validateInput().let { isInputValid -> if (isInputValid) { writeNewNoteUIState = - to.curare.compose.ui.view.state.WriteNewNoteUIState.ConfirmNote( + com.machankura.bennu.compose.ui.view.state.WriteNewNoteUIState.ConfirmNote( localProfile = localProfile, inReplyToNostrEvent = inReplyToNostrEvent, quotedNostrEvent = quotedNostrEvent, @@ -165,16 +165,16 @@ class WriteNewNoteViewModel( fun createNewNote( activeUserPublicKey: HexKey, onNostrEventPublished: () -> Unit, - inReplyToNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent? = null, - quotedNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent? = null, + inReplyToNostrEvent: com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent? = null, + quotedNostrEvent: com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent? = null, ) { logger.d { "createAccount" } isActionPending.value = true viewModelScope.launch(Dispatchers.IO) { - val mentionedPublicKeys = to.curare.compose.ui.composable.widgets.content.ContentParser.parse( + val mentionedPublicKeys = com.machankura.bennu.compose.ui.composable.widgets.content.ContentParser.parse( writeNewNoteFormState.textFieldForm.textFieldState.text.toString(), - ).filterIsInstance().map { it.pubkey } + ).filterIsInstance().map { it.pubkey } nostrRepository.createNewTextNote( publicKey = activeUserPublicKey, @@ -183,7 +183,7 @@ class WriteNewNoteViewModel( inReplyToNostrEvent = inReplyToNostrEvent, quotedNostrEvent = quotedNostrEvent, onError = { - writeNewNoteUIState = to.curare.compose.ui.view.state.WriteNewNoteUIState.Error + writeNewNoteUIState = com.machankura.bennu.compose.ui.view.state.WriteNewNoteUIState.Error }, onSuccess = onNostrEventPublished ) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AcceptCuratedSuggestionUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/AcceptCuratedSuggestionUIState.kt similarity index 81% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AcceptCuratedSuggestionUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/AcceptCuratedSuggestionUIState.kt index f279e1b8..db966141 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AcceptCuratedSuggestionUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/AcceptCuratedSuggestionUIState.kt @@ -1,8 +1,8 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.CuratedSuggestion -import to.curare.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.CuratedSuggestion +import com.machankura.bennu.compose.nostr.GroupCuratedSchema sealed interface AcceptCuratedSuggestionUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ActiveProfileUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ActiveProfileUIState.kt similarity index 60% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ActiveProfileUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ActiveProfileUIState.kt index ddbdf19a..4325c1d3 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ActiveProfileUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ActiveProfileUIState.kt @@ -1,8 +1,8 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state sealed interface ActiveProfileUIState { data class Loaded( - val localNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent + val localNostrEvent: com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent ): ActiveProfileUIState data object Error: ActiveProfileUIState diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddArtifactUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/AddArtifactUIState.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddArtifactUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/AddArtifactUIState.kt index 1e6ffec5..4de694a1 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddArtifactUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/AddArtifactUIState.kt @@ -1,7 +1,7 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.MantraDialect -import to.curare.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.MantraDialect +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom sealed interface AddArtifactUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddChapterUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/AddChapterUIState.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddChapterUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/AddChapterUIState.kt index 9c88be0a..89ff2ca2 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddChapterUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/AddChapterUIState.kt @@ -1,8 +1,8 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.MantraArtifact -import to.curare.compose.database.model.MantraArtifactVersion -import to.curare.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.MantraArtifact +import com.machankura.bennu.compose.database.model.MantraArtifactVersion +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom sealed interface AddChapterUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddDialectUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/AddDialectUIState.kt similarity index 79% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddDialectUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/AddDialectUIState.kt index 94372452..21951d3a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddDialectUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/AddDialectUIState.kt @@ -1,6 +1,6 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom sealed interface AddDialectUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddGroupPostUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/AddGroupPostUIState.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddGroupPostUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/AddGroupPostUIState.kt index d53a0454..0c499154 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddGroupPostUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/AddGroupPostUIState.kt @@ -1,7 +1,7 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.GroupNostrProfile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.GroupNostrProfile sealed interface AddGroupPostUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddMemberToChatRoomConfirmationUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/AddMemberToChatRoomConfirmationUIState.kt similarity index 61% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddMemberToChatRoomConfirmationUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/AddMemberToChatRoomConfirmationUIState.kt index d013f15e..121b9fd9 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddMemberToChatRoomConfirmationUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/AddMemberToChatRoomConfirmationUIState.kt @@ -1,8 +1,8 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.MarmotKeyPackage -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.MarmotKeyPackage +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom sealed interface AddMemberToChatRoomConfirmationUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddTranslationArtifactVersionUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/AddTranslationArtifactVersionUIState.kt similarity index 80% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddTranslationArtifactVersionUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/AddTranslationArtifactVersionUIState.kt index 94db5d1c..36edc1c9 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddTranslationArtifactVersionUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/AddTranslationArtifactVersionUIState.kt @@ -1,10 +1,10 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.MantraArtifact -import to.curare.compose.database.model.MantraArtifactVersion -import to.curare.compose.database.model.MantraChapter -import to.curare.compose.database.model.MantraDialect -import to.curare.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.MantraArtifact +import com.machankura.bennu.compose.database.model.MantraArtifactVersion +import com.machankura.bennu.compose.database.model.MantraChapter +import com.machankura.bennu.compose.database.model.MantraDialect +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom sealed interface AddTranslationArtifactVersionUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ArtifactDetailUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ArtifactDetailUIState.kt similarity index 58% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ArtifactDetailUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ArtifactDetailUIState.kt index 7023d467..468ed2d2 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ArtifactDetailUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ArtifactDetailUIState.kt @@ -1,9 +1,9 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.MantraArtifact -import to.curare.compose.database.model.MantraArtifactVersion -import to.curare.compose.database.model.MantraChapter -import to.curare.compose.database.model.MantraTranslationArtifactVersion +import com.machankura.bennu.compose.database.model.MantraArtifact +import com.machankura.bennu.compose.database.model.MantraArtifactVersion +import com.machankura.bennu.compose.database.model.MantraChapter +import com.machankura.bennu.compose.database.model.MantraTranslationArtifactVersion sealed interface ArtifactDetailUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/BroadcastGroupSignedEventUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/BroadcastGroupSignedEventUIState.kt similarity index 78% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/BroadcastGroupSignedEventUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/BroadcastGroupSignedEventUIState.kt index 07924b9c..7b9eb675 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/BroadcastGroupSignedEventUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/BroadcastGroupSignedEventUIState.kt @@ -1,9 +1,9 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.GroupCuratedSchema -import to.curare.compose.nostr.GroupRelayList +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.nostr.GroupRelayList sealed interface BroadcastGroupSignedEventUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChapterDetailUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ChapterDetailUIState.kt similarity index 63% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChapterDetailUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ChapterDetailUIState.kt index 91f818db..33b9d74b 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChapterDetailUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ChapterDetailUIState.kt @@ -1,7 +1,7 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.MantraChapter -import to.curare.compose.database.model.MantraChunk +import com.machankura.bennu.compose.database.model.MantraChapter +import com.machankura.bennu.compose.database.model.MantraChunk sealed interface ChapterDetailUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChatMessageListUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ChatMessageListUIState.kt similarity index 65% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChatMessageListUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ChatMessageListUIState.kt index aff772b6..597dcd24 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChatMessageListUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ChatMessageListUIState.kt @@ -1,6 +1,6 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.intermdiate.LocalChatMessage +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatMessage sealed interface ChatMessageListUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChatRoomDetailUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ChatRoomDetailUIState.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChatRoomDetailUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ChatRoomDetailUIState.kt index eccbd987..75f3e339 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChatRoomDetailUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ChatRoomDetailUIState.kt @@ -1,15 +1,15 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.database.model.GroupKeyState -import to.curare.compose.managers.SubgroupManager -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.GroupCuratedEntry -import to.curare.compose.nostr.GroupCuratedSchema -import to.curare.compose.nostr.GroupNostrProfile -import to.curare.compose.nostr.GroupPost -import to.curare.compose.nostr.GroupRelayList +import com.machankura.bennu.compose.database.model.GroupKeyState +import com.machankura.bennu.compose.managers.SubgroupManager +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.GroupCuratedEntry +import com.machankura.bennu.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.nostr.GroupNostrProfile +import com.machankura.bennu.compose.nostr.GroupPost +import com.machankura.bennu.compose.nostr.GroupRelayList sealed interface ChatRoomDetailUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChatRoomListUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ChatRoomListUIState.kt similarity index 54% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChatRoomListUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ChatRoomListUIState.kt index ea73d001..171a9eda 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChatRoomListUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ChatRoomListUIState.kt @@ -1,8 +1,8 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state sealed interface ChatRoomListUIState { data class Loaded( - val chatRoomList: List + val chatRoomList: List ): ChatRoomListUIState data object Error: ChatRoomListUIState diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChatRoomMessagingUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ChatRoomMessagingUIState.kt similarity index 72% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChatRoomMessagingUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ChatRoomMessagingUIState.kt index f88dfe25..805c1c89 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChatRoomMessagingUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ChatRoomMessagingUIState.kt @@ -1,6 +1,6 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom sealed interface ChatRoomMessagingUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/CreateProfileUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/CreateProfileUIState.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/CreateProfileUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/CreateProfileUIState.kt index 952546f3..fef13d90 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/CreateProfileUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/CreateProfileUIState.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state abstract class CreateProfileUIState { data object Error: CreateProfileUIState() @@ -13,6 +13,6 @@ abstract class CreateProfileUIState { ) : CreateProfileUIState() data class ProfileReady( - val profile: to.curare.compose.database.model.Profile + val profile: com.machankura.bennu.compose.database.model.Profile ) : CreateProfileUIState() } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/CuratedSuggestionListUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/CuratedSuggestionListUIState.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/CuratedSuggestionListUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/CuratedSuggestionListUIState.kt index 6264dd24..b91f5219 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/CuratedSuggestionListUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/CuratedSuggestionListUIState.kt @@ -1,8 +1,8 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.CuratedSuggestion -import to.curare.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.CuratedSuggestion +import com.machankura.bennu.compose.nostr.GroupCuratedSchema sealed interface CuratedSuggestionListUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/DkgRitualUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/DkgRitualUIState.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/DkgRitualUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/DkgRitualUIState.kt index fcdb0e25..5d5e2761 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/DkgRitualUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/DkgRitualUIState.kt @@ -1,14 +1,14 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.DkgSession -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.GroupKeyState -import to.curare.compose.database.model.Participant -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.intermdiate.LocalParticipant -import to.curare.compose.database.model.types.DkgApprovalStep +import com.machankura.bennu.compose.database.model.DkgSession +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.GroupKeyState +import com.machankura.bennu.compose.database.model.Participant +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalParticipant +import com.machankura.bennu.compose.database.model.types.DkgApprovalStep import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.managers.ChillDkgRitualManager +import com.machankura.bennu.compose.managers.ChillDkgRitualManager sealed interface DkgRitualUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/EditGroupCuratedSchemaUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/EditGroupCuratedSchemaUIState.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/EditGroupCuratedSchemaUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/EditGroupCuratedSchemaUIState.kt index ee5cd045..2fcf36e2 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/EditGroupCuratedSchemaUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/EditGroupCuratedSchemaUIState.kt @@ -1,7 +1,7 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.GroupCuratedSchema sealed interface EditGroupCuratedSchemaUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/EditGroupNostrProfileUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/EditGroupNostrProfileUIState.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/EditGroupNostrProfileUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/EditGroupNostrProfileUIState.kt index 49a370b2..a2a39725 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/EditGroupNostrProfileUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/EditGroupNostrProfileUIState.kt @@ -1,7 +1,7 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.GroupNostrProfile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.GroupNostrProfile sealed interface EditGroupNostrProfileUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/EditGroupRelaysUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/EditGroupRelaysUIState.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/EditGroupRelaysUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/EditGroupRelaysUIState.kt index d0060792..e957ce76 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/EditGroupRelaysUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/EditGroupRelaysUIState.kt @@ -1,7 +1,7 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.GroupRelayList +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.GroupRelayList sealed interface EditGroupRelaysUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/FeedListUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/FeedListUIState.kt similarity index 51% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/FeedListUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/FeedListUIState.kt index c18dfe53..79681540 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/FeedListUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/FeedListUIState.kt @@ -1,8 +1,8 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state sealed interface FeedListUIState { data class Loaded( - val localNostrEvents: List + val localNostrEvents: List ): FeedListUIState data object Error: FeedListUIState diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/FollowersListUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/FollowersListUIState.kt similarity index 58% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/FollowersListUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/FollowersListUIState.kt index e83763e4..0db2526c 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/FollowersListUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/FollowersListUIState.kt @@ -1,8 +1,8 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state sealed interface FollowersListUIState { data class Loaded( - val followers: List + val followers: List ): FollowersListUIState data object Error: FollowersListUIState diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/FollowingListUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/FollowingListUIState.kt similarity index 58% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/FollowingListUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/FollowingListUIState.kt index 5ea51e2d..ccf8d656 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/FollowingListUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/FollowingListUIState.kt @@ -1,8 +1,8 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state sealed interface FollowingListUIState { data class Loaded( - val following: List + val following: List ): FollowingListUIState data object Error: FollowingListUIState diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/FrostSigningUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/FrostSigningUIState.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/FrostSigningUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/FrostSigningUIState.kt index ac95317d..7d985df9 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/FrostSigningUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/FrostSigningUIState.kt @@ -1,15 +1,15 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlin.time.Clock import kotlin.time.Instant -import to.curare.compose.database.model.FrostSigningItem -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.Participant -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.intermdiate.LocalParticipant -import to.curare.compose.database.model.types.FrostSigningStage -import to.curare.compose.managers.FrostSigningManager +import com.machankura.bennu.compose.database.model.FrostSigningItem +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.Participant +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalParticipant +import com.machankura.bennu.compose.database.model.types.FrostSigningStage +import com.machankura.bennu.compose.managers.FrostSigningManager sealed interface FrostSigningUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/GroupCuratedEntriesUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/GroupCuratedEntriesUIState.kt similarity index 83% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/GroupCuratedEntriesUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/GroupCuratedEntriesUIState.kt index 2d32b1a1..2ed9ccae 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/GroupCuratedEntriesUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/GroupCuratedEntriesUIState.kt @@ -1,8 +1,8 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.GroupCuratedEntry -import to.curare.compose.nostr.GroupRelayList +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.GroupCuratedEntry +import com.machankura.bennu.compose.nostr.GroupRelayList sealed interface GroupCuratedEntriesUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/GroupCuratedSchemasUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/GroupCuratedSchemasUIState.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/GroupCuratedSchemasUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/GroupCuratedSchemasUIState.kt index 0c5ac6b6..e317cc8c 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/GroupCuratedSchemasUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/GroupCuratedSchemasUIState.kt @@ -1,7 +1,7 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.GroupCuratedSchema sealed interface GroupCuratedSchemasUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/GroupNostrProfileUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/GroupNostrProfileUIState.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/GroupNostrProfileUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/GroupNostrProfileUIState.kt index c41e9b59..d4a47e41 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/GroupNostrProfileUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/GroupNostrProfileUIState.kt @@ -1,7 +1,7 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.GroupNostrProfile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.GroupNostrProfile sealed interface GroupNostrProfileUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/GroupPostsUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/GroupPostsUIState.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/GroupPostsUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/GroupPostsUIState.kt index 2d0d2533..a4d93d9e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/GroupPostsUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/GroupPostsUIState.kt @@ -1,8 +1,8 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.GroupNostrProfile -import to.curare.compose.nostr.GroupPost +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.GroupNostrProfile +import com.machankura.bennu.compose.nostr.GroupPost sealed interface GroupPostsUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/GroupRelaysUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/GroupRelaysUIState.kt similarity index 83% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/GroupRelaysUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/GroupRelaysUIState.kt index 89b0df17..cd2a0e14 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/GroupRelaysUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/GroupRelaysUIState.kt @@ -1,7 +1,7 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.GroupRelayList +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.GroupRelayList sealed interface GroupRelaysUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/HomeScreenUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/HomeScreenUIState.kt similarity index 51% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/HomeScreenUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/HomeScreenUIState.kt index 536f24be..110f6976 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/HomeScreenUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/HomeScreenUIState.kt @@ -1,9 +1,9 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state sealed interface HomeScreenUIState { data class Loaded( - val profileWithFollowing: to.curare.compose.database.model.intermdiate.LocalProfileWithFollowing + val profileWithFollowing: com.machankura.bennu.compose.database.model.intermdiate.LocalProfileWithFollowing ): HomeScreenUIState data object Error: HomeScreenUIState diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/KeyPackageManagementUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/KeyPackageManagementUIState.kt similarity index 72% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/KeyPackageManagementUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/KeyPackageManagementUIState.kt index 9687208d..e2bd6592 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/KeyPackageManagementUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/KeyPackageManagementUIState.kt @@ -1,6 +1,6 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.MarmotKeyPackageBundle +import com.machankura.bennu.compose.database.model.MarmotKeyPackageBundle sealed interface KeyPackageManagementUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/MetadataEventDetailUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/MetadataEventDetailUIState.kt new file mode 100755 index 00000000..3e67f30c --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/MetadataEventDetailUIState.kt @@ -0,0 +1,14 @@ +package com.machankura.bennu.compose.ui.view.state + + +sealed interface MetadataEventDetailUIState { + data class Loaded( + val isActiveUser: Boolean, + val followingActiveUserConnection: com.machankura.bennu.compose.database.model.Connection?, + val followedByActiveUserConnection: com.machankura.bennu.compose.database.model.Connection?, + ): MetadataEventDetailUIState + + data object Error: MetadataEventDetailUIState + data object Loading: MetadataEventDetailUIState +} + diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/NavigationUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/NavigationUIState.kt similarity index 54% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/NavigationUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/NavigationUIState.kt index 270e9e31..e854192c 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/NavigationUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/NavigationUIState.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state abstract class NavigationUIState { data object Error: NavigationUIState() @@ -11,28 +11,28 @@ abstract class NavigationUIState { data object Landing: NavigationUIState() data class UnsignedProfile( - val unsignedNostrEvent: to.curare.compose.database.model.UnsignedNostrEvent, + val unsignedNostrEvent: com.machankura.bennu.compose.database.model.UnsignedNostrEvent, ) : NavigationUIState() data class UnsyncedProfile( - val unsignedNostrEvent: to.curare.compose.database.model.UnsignedNostrEvent, + val unsignedNostrEvent: com.machankura.bennu.compose.database.model.UnsignedNostrEvent, ) : NavigationUIState() data class UnqueuedProfileSynchronization( - val unsignedNostrEvent: to.curare.compose.database.model.UnsignedNostrEvent, + val unsignedNostrEvent: com.machankura.bennu.compose.database.model.UnsignedNostrEvent, ) : NavigationUIState() data class UnindexedProfile( - val nostrEvent: to.curare.compose.database.model.NostrEvent, + val nostrEvent: com.machankura.bennu.compose.database.model.NostrEvent, ) : NavigationUIState() data class UnqueuedProfile( - val profile: to.curare.compose.database.model.Profile, + val profile: com.machankura.bennu.compose.database.model.Profile, ) : NavigationUIState() data class UnannouncedProfile( - val broadcastNostrEventRequest: to.curare.compose.database.model.BroadcastNostrEventRequest, + val broadcastNostrEventRequest: com.machankura.bennu.compose.database.model.BroadcastNostrEventRequest, ) : NavigationUIState() diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/NostrEventDetailUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/NostrEventDetailUIState.kt similarity index 62% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/NostrEventDetailUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/NostrEventDetailUIState.kt index be570a85..3ccfa0e1 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/NostrEventDetailUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/NostrEventDetailUIState.kt @@ -1,8 +1,8 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state sealed interface NostrEventDetailUIState { data class Loaded( - val localNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent + val localNostrEvent: com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent ): NostrEventDetailUIState data object Error: NostrEventDetailUIState diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/NostrSecretUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/NostrSecretUIState.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/NostrSecretUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/NostrSecretUIState.kt index 4466eb71..e5b087ba 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/NostrSecretUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/NostrSecretUIState.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state /** * What the nostr secret key screen is showing. The key is never held here longer than diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ProfilePreviewUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ProfilePreviewUIState.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ProfilePreviewUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ProfilePreviewUIState.kt index 4fcf0c8b..e90df1ca 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ProfilePreviewUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ProfilePreviewUIState.kt @@ -1,6 +1,6 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.Profile /** * The person behind a pasted npub, before a chat with them is started. @@ -47,6 +47,6 @@ sealed interface ProfilePreviewUIState { data object Checking : Readiness /** The relays have had their time and no key package came. */ - data object NotYetOnCurare : Readiness + data object NotYetOnBennu : Readiness } } diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ProfilesUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ProfilesUIState.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ProfilesUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ProfilesUIState.kt index 86f0697a..3d67ce5a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ProfilesUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ProfilesUIState.kt @@ -1,10 +1,10 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state import com.vitorpamplona.quartz.nip01Core.core.HexKey import fr.acinq.phoenix.data.WalletId import fr.acinq.phoenix.utils.preferences.UserWalletMetadata -import to.curare.compose.database.model.Profile -import to.curare.compose.identity.StoredIdentity +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.identity.StoredIdentity /** * The switcher's states. Three, not four: an empty list cannot happen while something diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ProposalFilter.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ProposalFilter.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ProposalFilter.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ProposalFilter.kt index 03f61d4e..c3c377a7 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ProposalFilter.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ProposalFilter.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state /** * Which proposals the reader has asked to see. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ProposalListUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ProposalListUIState.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ProposalListUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ProposalListUIState.kt index 4f8b0d0c..cc03a348 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ProposalListUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ProposalListUIState.kt @@ -1,12 +1,12 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state import kotlin.time.Clock import kotlin.time.Instant -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.types.FrostSigningStage -import to.curare.compose.managers.FrostSigningManager -import to.curare.compose.text.ProposedEvent +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.types.FrostSigningStage +import com.machankura.bennu.compose.managers.FrostSigningManager +import com.machankura.bennu.compose.text.ProposedEvent sealed interface ProposalListUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ProposalState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ProposalState.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ProposalState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ProposalState.kt index b1358f3e..f959efd6 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ProposalState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ProposalState.kt @@ -1,9 +1,9 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state /** * Where a proposal has got to, as a reader scanning a list of them cares. * - * Deliberately not [to.curare.compose.database.model.types.FrostSigningStage], + * Deliberately not [com.machankura.bennu.compose.database.model.types.FrostSigningStage], * although it has come to be the stage plus one. The one is the point: a * proposal waiting on *this* member is `COLLECTING_NONCES` like every other open * one, and what sets it apart is `FrostSigningSession.signApprovedAt` and diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ProposeGroupEventUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ProposeGroupEventUIState.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ProposeGroupEventUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ProposeGroupEventUIState.kt index 98e5f629..6e867343 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ProposeGroupEventUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ProposeGroupEventUIState.kt @@ -1,7 +1,7 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.GroupNostrProfile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.GroupNostrProfile sealed interface ProposeGroupEventUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/RecoveryPhraseUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/RecoveryPhraseUIState.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/RecoveryPhraseUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/RecoveryPhraseUIState.kt index 02bfa0bc..86cb6a9a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/RecoveryPhraseUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/RecoveryPhraseUIState.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state /** * What the recovery phrase screen is showing. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SearchMemberToAddToChatRoomUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/SearchMemberToAddToChatRoomUIState.kt similarity index 65% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SearchMemberToAddToChatRoomUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/SearchMemberToAddToChatRoomUIState.kt index 0dec6b79..ab774c1a 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SearchMemberToAddToChatRoomUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/SearchMemberToAddToChatRoomUIState.kt @@ -1,7 +1,7 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom sealed interface SearchMemberToAddToChatRoomUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SearchResultListUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/SearchResultListUIState.kt similarity index 55% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SearchResultListUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/SearchResultListUIState.kt index 0da15e48..c15d1339 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SearchResultListUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/SearchResultListUIState.kt @@ -1,8 +1,8 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state sealed interface SearchResultListUIState { data class Loaded( - val localNostrEvents: List + val localNostrEvents: List ): SearchResultListUIState data object Error: SearchResultListUIState diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SearchUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/SearchUIState.kt similarity index 56% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SearchUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/SearchUIState.kt index 4ccd5d06..19f9b492 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SearchUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/SearchUIState.kt @@ -1,8 +1,8 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state sealed interface SearchUIState { data class Loaded( - val localNostrEvents: List + val localNostrEvents: List ): SearchUIState data object Error: SearchUIState diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SelectChatRoomMembersUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/SelectChatRoomMembersUIState.kt similarity index 72% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SelectChatRoomMembersUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/SelectChatRoomMembersUIState.kt index 7f1384fe..14111d37 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SelectChatRoomMembersUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/SelectChatRoomMembersUIState.kt @@ -1,6 +1,6 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.Profile sealed interface SelectChatRoomMembersUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SelectChatRoomTypeUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/SelectChatRoomTypeUIState.kt similarity index 75% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SelectChatRoomTypeUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/SelectChatRoomTypeUIState.kt index 75540016..801facc2 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SelectChatRoomTypeUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/SelectChatRoomTypeUIState.kt @@ -1,6 +1,6 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.Profile sealed interface SelectChatRoomTypeUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SelectSubgroupAdminsUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/SelectSubgroupAdminsUIState.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SelectSubgroupAdminsUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/SelectSubgroupAdminsUIState.kt index 3741ffb3..e64974d1 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SelectSubgroupAdminsUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/SelectSubgroupAdminsUIState.kt @@ -1,8 +1,8 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.intermdiate.LocalParticipant +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalParticipant sealed interface SelectSubgroupAdminsUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ShareProfileUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ShareProfileUIState.kt similarity index 60% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ShareProfileUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ShareProfileUIState.kt index efd2f20f..de6cb2c2 100755 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ShareProfileUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/ShareProfileUIState.kt @@ -1,8 +1,8 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state sealed interface ShareProfileUIState { data class Loaded( - val localNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent + val localNostrEvent: com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent ): ShareProfileUIState data object Error: ShareProfileUIState diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SignInToProfileUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/SignInToProfileUIState.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SignInToProfileUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/SignInToProfileUIState.kt index be8e4e2a..3bc37b8e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SignInToProfileUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/SignInToProfileUIState.kt @@ -1,8 +1,8 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state import fr.acinq.phoenix.data.WalletId -import to.curare.compose.identity.CredentialProblem -import to.curare.compose.identity.SignInCredential +import com.machankura.bennu.compose.identity.CredentialProblem +import com.machankura.bennu.compose.identity.SignInCredential /** * The sign-in screen's four states. Problems with the *input* are not one of them: those diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SovereignWalletUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/SovereignWalletUIState.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SovereignWalletUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/SovereignWalletUIState.kt index d4fe9202..eccc8570 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SovereignWalletUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/SovereignWalletUIState.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state sealed interface SovereignWalletUIState { data object Uninitialized: SovereignWalletUIState diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/StartupChoice.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/StartupChoice.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/StartupChoice.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/StartupChoice.kt index 31b90d3d..a05da97f 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/StartupChoice.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/StartupChoice.kt @@ -1,7 +1,7 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state import fr.acinq.phoenix.data.WalletId -import to.curare.compose.identity.StoredIdentity +import com.machankura.bennu.compose.identity.StoredIdentity /** * Which profile the startup screen opens without asking, and when it asks instead. diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/TranslateChunkUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/TranslateChunkUIState.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/TranslateChunkUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/TranslateChunkUIState.kt index c466a1b2..b6281d6c 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/TranslateChunkUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/TranslateChunkUIState.kt @@ -1,7 +1,7 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.MantraChunk -import to.curare.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.MantraChunk +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom sealed interface TranslateChunkUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/TranslationArtifactVersionDetailUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/TranslationArtifactVersionDetailUIState.kt similarity index 82% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/TranslationArtifactVersionDetailUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/TranslationArtifactVersionDetailUIState.kt index 92600822..3d67b44a 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/TranslationArtifactVersionDetailUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/TranslationArtifactVersionDetailUIState.kt @@ -1,9 +1,9 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.MantraChapter -import to.curare.compose.database.model.MantraTranslationArtifactVersion -import to.curare.compose.database.model.MantraTranslationChapter -import to.curare.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.MantraChapter +import com.machankura.bennu.compose.database.model.MantraTranslationArtifactVersion +import com.machankura.bennu.compose.database.model.MantraTranslationChapter +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom /** A translation chapter with how many of its chunks have been translated. */ data class TranslationChapterProgress( diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/TranslationChapterUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/TranslationChapterUIState.kt similarity index 79% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/TranslationChapterUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/TranslationChapterUIState.kt index 5d766290..0f2b8a08 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/TranslationChapterUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/TranslationChapterUIState.kt @@ -1,7 +1,7 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state -import to.curare.compose.database.model.MantraChunk -import to.curare.compose.database.model.MantraTranslationChunk +import com.machankura.bennu.compose.database.model.MantraChunk +import com.machankura.bennu.compose.database.model.MantraTranslationChunk /** * An original chunk paired with its translation chunk. [translationChunk] is diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/UnsyncedProfileUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/UnsyncedProfileUIState.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/UnsyncedProfileUIState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/UnsyncedProfileUIState.kt index 28934b98..bbcd092e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/UnsyncedProfileUIState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/UnsyncedProfileUIState.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state /** What the screen waiting on a sign-in sync is showing. */ sealed interface UnsyncedProfileUIState { diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/WriteNewNoteUIState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/WriteNewNoteUIState.kt new file mode 100644 index 00000000..67fb2e97 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/WriteNewNoteUIState.kt @@ -0,0 +1,24 @@ +package com.machankura.bennu.compose.ui.view.state + +import com.vitorpamplona.quartz.nip01Core.core.HexKey + +abstract class WriteNewNoteUIState { + data object Loading: WriteNewNoteUIState() + + data object Error: WriteNewNoteUIState() + + data class InputPrompt( + val localProfile: com.machankura.bennu.compose.database.model.intermdiate.LocalProfileWithFollowing, + val inReplyToNostrEvent: com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent? = null, + val quotedNostrEvent: com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent? = null, + val replayToId: HexKey? = null, + ): WriteNewNoteUIState() + + data class ConfirmNote( + val localProfile: com.machankura.bennu.compose.database.model.intermdiate.LocalProfileWithFollowing, + val inReplyToNostrEvent: com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent? = null, + val quotedNostrEvent: com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent? = null, + val text: String, + ) : WriteNewNoteUIState() + +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/ChatRoomCreationFormState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/form/ChatRoomCreationFormState.kt similarity index 72% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/ChatRoomCreationFormState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/form/ChatRoomCreationFormState.kt index ed8110f1..9dbb9b1c 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/ChatRoomCreationFormState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/form/ChatRoomCreationFormState.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.state.form +package com.machankura.bennu.compose.ui.view.state.form data class ChatRoomCreationFormState( val nameField: TextFieldForm = TextFieldForm(), diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/CreateProfileFormState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/form/CreateProfileFormState.kt similarity index 71% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/CreateProfileFormState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/form/CreateProfileFormState.kt index 45b7679d..7d92240e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/CreateProfileFormState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/form/CreateProfileFormState.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.state.form +package com.machankura.bennu.compose.ui.view.state.form data class CreateProfileFormState( val nameField: TextFieldForm = TextFieldForm(), diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/SignInToProfileFormState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/form/SignInToProfileFormState.kt similarity index 62% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/SignInToProfileFormState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/form/SignInToProfileFormState.kt index 105e746b..379c6847 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/SignInToProfileFormState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/form/SignInToProfileFormState.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.state.form +package com.machankura.bennu.compose.ui.view.state.form data class SignInToProfileFormState( val textFieldForm: TextFieldForm = TextFieldForm(), diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/TextFieldForm.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/form/TextFieldForm.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/TextFieldForm.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/form/TextFieldForm.kt index 08489f30..3060e88e 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/TextFieldForm.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/form/TextFieldForm.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.state.form +package com.machankura.bennu.compose.ui.view.state.form import androidx.compose.foundation.text.input.TextFieldState import androidx.compose.runtime.MutableState diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/WriteNewNoteFormState.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/form/WriteNewNoteFormState.kt similarity index 61% rename from composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/WriteNewNoteFormState.kt rename to composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/form/WriteNewNoteFormState.kt index d427e694..14817813 100644 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/WriteNewNoteFormState.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/state/form/WriteNewNoteFormState.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.state.form +package com.machankura.bennu.compose.ui.view.state.form data class WriteNewNoteFormState( val textFieldForm: TextFieldForm = TextFieldForm(), diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/CurareGlobal.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/CurareGlobal.kt deleted file mode 100644 index 93640f1a..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/CurareGlobal.kt +++ /dev/null @@ -1,5 +0,0 @@ -package to.curare.compose - -class CurareGlobal( - val platformContext: PlatformContext -) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/Platform.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/Platform.kt deleted file mode 100644 index 907a6096..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/Platform.kt +++ /dev/null @@ -1,7 +0,0 @@ -package to.curare.compose - -interface Platform { - val name: String -} - -expect fun getPlatform(): Platform \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/PlatformContext.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/PlatformContext.kt deleted file mode 100644 index ff4fdede..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/PlatformContext.kt +++ /dev/null @@ -1,3 +0,0 @@ -package to.curare.compose - -expect class PlatformContext \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/CurareDatabaseConstructor.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/CurareDatabaseConstructor.kt deleted file mode 100644 index e9a959e9..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/CurareDatabaseConstructor.kt +++ /dev/null @@ -1,9 +0,0 @@ -package to.curare.compose.database - -import androidx.room3.RoomDatabaseConstructor - -@Suppress("KotlinNoActualForExpect", "NO_ACTUAL_FOR_EXPECT") -expect object CurareDatabaseConstructor: RoomDatabaseConstructor { - - override fun initialize(): CurareDatabase -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/BroadcastNostrEventReceiptDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/BroadcastNostrEventReceiptDao.kt deleted file mode 100644 index 117824db..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/BroadcastNostrEventReceiptDao.kt +++ /dev/null @@ -1,21 +0,0 @@ -package to.curare.compose.database.dao - -import androidx.room3.Dao -import androidx.room3.Query -import androidx.room3.Upsert -import kotlinx.coroutines.flow.Flow - -@Dao -interface BroadcastNostrEventReceiptDao { - @Query("SELECT * FROM BroadcastNostrEventReceipt") - suspend fun getAllBroadcastNostrEventReceipts(): List - - @Query("SELECT * FROM BroadcastNostrEventReceipt WHERE id = :id") - fun getBroadcastNostrEventReceiptById(id: Long): Flow - - @Query("SELECT * FROM BroadcastNostrEventReceipt WHERE nostrEventId = :nostrEventId") - fun getBroadcastNostrEventReceiptByNostrEventId(nostrEventId: String): Flow - - @Upsert - suspend fun upsert(broadcastNostrEventReceipt: to.curare.compose.database.model.BroadcastNostrEventReceipt): Long -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatMessageNostrEventRelationDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatMessageNostrEventRelationDao.kt deleted file mode 100644 index 8f2a047f..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatMessageNostrEventRelationDao.kt +++ /dev/null @@ -1,11 +0,0 @@ -package to.curare.compose.database.dao - -import androidx.room3.Dao -import androidx.room3.Upsert - -@Dao -interface ChatMessageNostrEventRelationDao { - - @Upsert - suspend fun upsert(chatMessageNostrEventRelation: to.curare.compose.database.model.ChatMessageNostrEventRelation) -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NegentropySynchronizeResultDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NegentropySynchronizeResultDao.kt deleted file mode 100644 index 0674acbe..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NegentropySynchronizeResultDao.kt +++ /dev/null @@ -1,10 +0,0 @@ -package to.curare.compose.database.dao - -import androidx.room3.Dao -import androidx.room3.Upsert - -@Dao -interface NegentropySynchronizeResultDao { - @Upsert - suspend fun upsert(negentropySynchronizeResult: to.curare.compose.database.model.NegentropySynchronizeResult) -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/PostDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/PostDao.kt deleted file mode 100644 index c17e50b0..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/PostDao.kt +++ /dev/null @@ -1,21 +0,0 @@ -package to.curare.compose.database.dao - -import androidx.room3.Dao -import androidx.room3.Insert -import androidx.room3.Query -import androidx.room3.Upsert - -@Dao -interface PostDao { - @Query("SELECT * FROM Post") - suspend fun getAllPosts(): List - - @Query("SELECT * FROM Post WHERE id = :id") - suspend fun getPostById(id: String): to.curare.compose.database.model.Post? - - @Insert - suspend fun insert(post: to.curare.compose.database.model.Post) - - @Upsert - suspend fun upsert(post: to.curare.compose.database.model.Post) -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ReactionDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ReactionDao.kt deleted file mode 100644 index c97541fd..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ReactionDao.kt +++ /dev/null @@ -1,18 +0,0 @@ -package to.curare.compose.database.dao - -import androidx.room3.Dao -import androidx.room3.Query -import androidx.room3.Upsert -import kotlinx.coroutines.flow.Flow - -@Dao -interface ReactionDao { - @Query("SELECT * FROM Reaction") - suspend fun getAllReactions(): List - - @Query("SELECT * FROM Reaction WHERE id = :id") - fun getReactionById(id: String): Flow - - @Upsert - suspend fun upsert(reaction: to.curare.compose.database.model.Reaction) -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/RecentSearchDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/RecentSearchDao.kt deleted file mode 100644 index 5e93e5e1..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/RecentSearchDao.kt +++ /dev/null @@ -1,22 +0,0 @@ -package to.curare.compose.database.dao - -import androidx.room3.Dao -import androidx.room3.Delete -import androidx.room3.Query -import androidx.room3.Upsert -import kotlinx.coroutines.flow.Flow - -@Dao -interface RecentSearchDao { - @Query("SELECT * FROM RecentSearch WHERE `query` = :query") - fun observeRecentSearchByQuery(query: String): Flow - - @Query("SELECT * FROM RecentSearch ORDER BY createdAt DESC LIMIT :limit ") - suspend fun getAllRecentSearches(limit: Int = 21): List - - @Delete - suspend fun deleteRecentSearch(recentSearch: to.curare.compose.database.model.RecentSearch) - - @Upsert - suspend fun upsert(recentSearch: to.curare.compose.database.model.RecentSearch) -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/RelayDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/RelayDao.kt deleted file mode 100644 index 97eb7377..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/RelayDao.kt +++ /dev/null @@ -1,19 +0,0 @@ -package to.curare.compose.database.dao - -import androidx.room3.Dao -import androidx.room3.Query -import androidx.room3.Upsert -import kotlinx.coroutines.flow.Flow - -@Dao -interface RelayDao { - @Query("SELECT * FROM Relay") - suspend fun getAllPosts(): List - - @Query("SELECT * FROM Relay WHERE publicKey = :publicKey") - fun observePublicKeyRelays(publicKey: String): Flow> - - @Upsert - suspend fun upsert(relay: to.curare.compose.database.model.Relay) - -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/SynchronizeNostrEventResultDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/SynchronizeNostrEventResultDao.kt deleted file mode 100644 index 905fac9f..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/SynchronizeNostrEventResultDao.kt +++ /dev/null @@ -1,10 +0,0 @@ -package to.curare.compose.database.dao - -import androidx.room3.Dao -import androidx.room3.Upsert - -@Dao -interface SynchronizeNostrEventResultDao { - @Upsert - suspend fun upsert(synchronizeNostrEventResult: to.curare.compose.database.model.SynchronizeNostrEventResult) -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalAccount.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalAccount.kt deleted file mode 100644 index 732059d5..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalAccount.kt +++ /dev/null @@ -1,39 +0,0 @@ -package to.curare.compose.database.model.intermdiate - -import androidx.room3.Embedded -import androidx.room3.Relation - -data class LocalAccount( - @Embedded val unsignedNostrEvent: to.curare.compose.database.model.UnsignedNostrEvent?, - - @Relation( - parentColumns = ["id"], - entityColumns = ["unsignedNostrEventId"] - ) - val nostrEvent: to.curare.compose.database.model.NostrEvent?, - - @Relation( - parentColumns = ["pubKey"], - entityColumns = ["publicKey"] - ) - val profile: to.curare.compose.database.model.Profile?, - - @Relation( - parentColumns = ["id"], - entityColumns = ["unsignedNostrEventId"] - ) - val broadcastNostrEventRequest: to.curare.compose.database.model.BroadcastNostrEventRequest?, - - @Relation( - parentColumns = ["id"], - entityColumns = ["unsignedNostrEventId"] - ) - val broadcastNostrEventReceipt: to.curare.compose.database.model.BroadcastNostrEventReceipt?, - - @Relation( - parentColumns = ["id"], - entityColumns = ["unsignedNostrEventId"] - ) - val synchronizeNostrEventRequests: List, - - ) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalBroadcastNostrEventRequest.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalBroadcastNostrEventRequest.kt deleted file mode 100644 index 211aa313..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalBroadcastNostrEventRequest.kt +++ /dev/null @@ -1,14 +0,0 @@ -package to.curare.compose.database.model.intermdiate - -import androidx.room3.Embedded -import androidx.room3.Relation - -data class LocalBroadcastNostrEventRequest( - @Embedded val broadcastNostrEventRequest: to.curare.compose.database.model.BroadcastNostrEventRequest, - - @Relation( - parentColumns = ["nostrEventId"], - entityColumns = ["id"] - ) - val nostrEvent: to.curare.compose.database.model.NostrEvent, -) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalChatMessage.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalChatMessage.kt deleted file mode 100644 index 6fca08b1..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalChatMessage.kt +++ /dev/null @@ -1,34 +0,0 @@ -package to.curare.compose.database.model.intermdiate - -import androidx.room3.Embedded -import androidx.room3.Relation - -data class LocalChatMessage( - @Embedded val chatMessage: to.curare.compose.database.model.ChatMessage, - - @Relation( - parentColumns = ["senderPublicKey"], - entityColumns = ["publicKey"] - ) - val profile: to.curare.compose.database.model.Profile?, - - @Relation( - parentColumns = ["id"], - entityColumns = ["chatMessageId"] - ) - val chatMessageBroadcastNostrEventReceiptRelation: to.curare.compose.database.model.ChatMessageBroadcastNostrEventReceiptRelation? = null, - - - @Relation( - parentColumns = ["id"], - entityColumns = ["chatMessageId"] - ) - val chatMessageBroadcastNostrEventRequestRelation: to.curare.compose.database.model.ChatMessageBroadcastNostrEventRequestRelation? = null, - - - @Relation( - parentColumns = ["id"], - entityColumns = ["chatMessageId"] - ) - val chatMessageNostrEventRelation: to.curare.compose.database.model.ChatMessageNostrEventRelation? = null, -) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalMention.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalMention.kt deleted file mode 100644 index 774300e2..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalMention.kt +++ /dev/null @@ -1,14 +0,0 @@ -package to.curare.compose.database.model.intermdiate - -import androidx.room3.Embedded -import androidx.room3.Relation - -data class LocalMention( - @Embedded val mention: to.curare.compose.database.model.Mention, - - @Relation( - parentColumns = ["mentionedPublicKey"], - entityColumns = ["publicKey"] - ) - val profile: to.curare.compose.database.model.Profile?, -) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalParticipant.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalParticipant.kt deleted file mode 100644 index 53853429..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalParticipant.kt +++ /dev/null @@ -1,14 +0,0 @@ -package to.curare.compose.database.model.intermdiate - -import androidx.room3.Embedded -import androidx.room3.Relation - -data class LocalParticipant( - @Embedded val participant: to.curare.compose.database.model.Participant, - - @Relation( - parentColumns = ["participantPublicKey"], - entityColumns = ["publicKey"] - ) - val profile: to.curare.compose.database.model.Profile?, -) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/typealiases/HexArray.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/typealiases/HexArray.kt deleted file mode 100644 index 43156dac..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/typealiases/HexArray.kt +++ /dev/null @@ -1,4 +0,0 @@ -package to.curare.compose.database.model.typealiases - -typealias HexArray = Array - diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/typealiases/KindArray.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/typealiases/KindArray.kt deleted file mode 100644 index 34c7592a..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/typealiases/KindArray.kt +++ /dev/null @@ -1,3 +0,0 @@ -package to.curare.compose.database.model.typealiases - -typealias KindArray = Array \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/typealiases/SynchronizationFilterArray.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/typealiases/SynchronizationFilterArray.kt deleted file mode 100644 index bd852363..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/typealiases/SynchronizationFilterArray.kt +++ /dev/null @@ -1,3 +0,0 @@ -package to.curare.compose.database.model.typealiases - -typealias SynchronizationFilterArray = Array \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabasePostRepository.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabasePostRepository.kt deleted file mode 100644 index bef10167..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabasePostRepository.kt +++ /dev/null @@ -1,5 +0,0 @@ -package to.curare.compose.database.repository - -class DatabasePostRepository( - private val database: to.curare.compose.database.CurareDatabase -): to.curare.compose.repository.PostRepository \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseSearchRepository.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseSearchRepository.kt deleted file mode 100644 index 99debbb5..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseSearchRepository.kt +++ /dev/null @@ -1,12 +0,0 @@ -package to.curare.compose.database.repository - -class DatabaseSearchRepository( - private val database: to.curare.compose.database.CurareDatabase -): to.curare.compose.repository.SearchRepository { - - override suspend fun submitSearch(synchronizeNostrEventRequests: List) { - database.synchronizeNostrEventRequestDao().insert( - synchronizeNostrEventRequests = synchronizeNostrEventRequests - ) - } -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/GiftWrapImpersonationException.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/GiftWrapImpersonationException.kt deleted file mode 100644 index ca4964bd..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/GiftWrapImpersonationException.kt +++ /dev/null @@ -1,3 +0,0 @@ -package to.curare.compose.exceptions - -open class GiftWrapImpersonationException(message: String? = null, cause: Throwable? = null) : Exception(message, cause) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/GiftWrapPayloadUnsupportedException.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/GiftWrapPayloadUnsupportedException.kt deleted file mode 100644 index 9253f892..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/GiftWrapPayloadUnsupportedException.kt +++ /dev/null @@ -1,3 +0,0 @@ -package to.curare.compose.exceptions - -open class GiftWrapPayloadUnsupportedException(message: String? = null, cause: Throwable? = null) : Exception(message, cause) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/GiftWrapSealDecryptionException.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/GiftWrapSealDecryptionException.kt deleted file mode 100644 index cebb5048..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/GiftWrapSealDecryptionException.kt +++ /dev/null @@ -1,3 +0,0 @@ -package to.curare.compose.exceptions - -open class GiftWrapSealDecryptionException(message: String? = null, cause: Throwable? = null) : Exception(message, cause) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/GiftWrapUnsealException.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/GiftWrapUnsealException.kt deleted file mode 100644 index 21aadeef..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/GiftWrapUnsealException.kt +++ /dev/null @@ -1,3 +0,0 @@ -package to.curare.compose.exceptions - -open class GiftWrapUnsealException(message: String? = null, cause: Throwable? = null) : Exception(message, cause) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/InvalidNostrPrivateKeyException.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/InvalidNostrPrivateKeyException.kt deleted file mode 100644 index 431dcfbf..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/InvalidNostrPrivateKeyException.kt +++ /dev/null @@ -1,3 +0,0 @@ -package to.curare.compose.exceptions - -class InvalidNostrPrivateKeyException: RuntimeException() \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/NostrNoticeException.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/NostrNoticeException.kt deleted file mode 100644 index 7472eebf..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/NostrNoticeException.kt +++ /dev/null @@ -1,6 +0,0 @@ -package to.curare.compose.exceptions - -class NostrNoticeException( - val reason: String?, - val subscriptionId: String? = null -): RuntimeException("$subscriptionId: $reason") \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/SignatureException.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/SignatureException.kt deleted file mode 100644 index 954c9c75..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/SignatureException.kt +++ /dev/null @@ -1,3 +0,0 @@ -package to.curare.compose.exceptions - -open class SignatureException(message: String? = null, cause: Throwable? = null) : Exception(message, cause) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/SigningRejectedException.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/SigningRejectedException.kt deleted file mode 100644 index c55b1aca..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/SigningRejectedException.kt +++ /dev/null @@ -1,3 +0,0 @@ -package to.curare.compose.exceptions - -class SigningRejectedException(message: String? = null, cause: Throwable? = null) : SignatureException(message, cause) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/AuxDatabaseManager.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/AuxDatabaseManager.kt deleted file mode 100644 index 59fdbd92..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/managers/AuxDatabaseManager.kt +++ /dev/null @@ -1,26 +0,0 @@ -package to.curare.compose.managers - -class AuxDatabaseManager( - curareGlobal: to.curare.compose.CurareGlobal -) { - val auxDatabase by lazy { - to.curare.compose.database.builder.getRoomDatabase( - to.curare.compose.database.builder.PlatformDatabaseBuilder.getDatabaseBuilder( - curareGlobal.platformContext - ) - ) - } - - /** - * Dynamic data like user feeds and the likes will be in a in-memory db. - * - * We may also decide to just use the normal DB and manage what's saved better... - */ - val inMemoryAuxDatabase by lazy { - to.curare.compose.database.builder.getRoomDatabase( - to.curare.compose.database.builder.PlatformDatabaseBuilder.getInMemoryDatabaseBuilder( - curareGlobal.platformContext - ) - ) - } -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/network/UserAgent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/network/UserAgent.kt deleted file mode 100644 index 9ba0e36e..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/network/UserAgent.kt +++ /dev/null @@ -1,11 +0,0 @@ -package to.curare.compose.network - -object UserAgent { - const val APP_NAME = "Curare" - const val CLIENT_NAME = "Curare" -} - -fun String.asClientTag(): Array = arrayOf( - "client", - this -) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/CachingImportRepository.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/CachingImportRepository.kt deleted file mode 100644 index 8a4ab244..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/CachingImportRepository.kt +++ /dev/null @@ -1,40 +0,0 @@ -package to.curare.compose.repository - -/** - * As seen in Primal - * - * https://github.com/PrimalHQ/primal-android-app/blob/a7e32e2203555d27e60a749238175cd1ee0fa2af/domain/primal/src/commonMain/kotlin/net/primal/domain/global/CachingImportRepository.kt - * - */ -interface CachingImportRepository { - suspend fun cacheNostrEvents(vararg events: to.curare.compose.database.model.NostrEvent) - suspend fun cacheNostrEvents(events: List) - - suspend fun importEvents(events: List): Boolean - suspend fun broadcastEvents(events: List, relays: List): Result> - - companion object { - val NO_OP_CACHING_IMPORT_REPOSITORY = object : CachingImportRepository { - override suspend fun cacheNostrEvents(vararg events: to.curare.compose.database.model.NostrEvent) { - } - - override suspend fun cacheNostrEvents(events: List) { - - } - - override suspend fun importEvents(events: List): Boolean { - return true - } - - override suspend fun broadcastEvents( - events: List, - relays: List - ): Result> { - return Result.success( - emptyList() - ) - } - - } - } -} diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/PostRepository.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/PostRepository.kt deleted file mode 100644 index 7597ea61..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/PostRepository.kt +++ /dev/null @@ -1,3 +0,0 @@ -package to.curare.compose.repository - -interface PostRepository \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AuthenticatedProfileRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AuthenticatedProfileRoute.kt deleted file mode 100644 index 5dc855f9..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AuthenticatedProfileRoute.kt +++ /dev/null @@ -1,6 +0,0 @@ -package to.curare.compose.ui.composable.navigation.routes - -import kotlinx.serialization.Serializable - -@Serializable -data object AuthenticatedProfileRoute \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/BlankRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/BlankRoute.kt deleted file mode 100755 index 0ee86f81..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/BlankRoute.kt +++ /dev/null @@ -1,6 +0,0 @@ -package to.curare.compose.ui.composable.navigation.routes - -import kotlinx.serialization.Serializable - -@Serializable -object BlankRoute: Route() \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/LandingRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/LandingRoute.kt deleted file mode 100755 index 4fb0596a..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/LandingRoute.kt +++ /dev/null @@ -1,6 +0,0 @@ -package to.curare.compose.ui.composable.navigation.routes - -import kotlinx.serialization.Serializable - -@Serializable -object LandingRoute: Route() \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/Route.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/Route.kt deleted file mode 100755 index e19b8b2e..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/Route.kt +++ /dev/null @@ -1,3 +0,0 @@ -package to.curare.compose.ui.composable.navigation.routes - -abstract class Route \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SignInRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SignInRoute.kt deleted file mode 100755 index 94459fe1..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SignInRoute.kt +++ /dev/null @@ -1,6 +0,0 @@ -package to.curare.compose.ui.composable.navigation.routes - -import kotlinx.serialization.Serializable - -@Serializable -object SignInRoute: Route() \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SovereignWalletStartupRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SovereignWalletStartupRoute.kt deleted file mode 100644 index faddfbe5..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SovereignWalletStartupRoute.kt +++ /dev/null @@ -1,6 +0,0 @@ -package to.curare.compose.ui.composable.navigation.routes - -import kotlinx.serialization.Serializable - -@Serializable -data object SovereignWalletStartupRoute \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/MetadataEventDetailUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/MetadataEventDetailUIState.kt deleted file mode 100755 index dd2839c4..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/MetadataEventDetailUIState.kt +++ /dev/null @@ -1,14 +0,0 @@ -package to.curare.compose.ui.view.state - - -sealed interface MetadataEventDetailUIState { - data class Loaded( - val isActiveUser: Boolean, - val followingActiveUserConnection: to.curare.compose.database.model.Connection?, - val followedByActiveUserConnection: to.curare.compose.database.model.Connection?, - ): MetadataEventDetailUIState - - data object Error: MetadataEventDetailUIState - data object Loading: MetadataEventDetailUIState -} - diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/WriteNewNoteUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/WriteNewNoteUIState.kt deleted file mode 100644 index 3f662004..00000000 --- a/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/WriteNewNoteUIState.kt +++ /dev/null @@ -1,24 +0,0 @@ -package to.curare.compose.ui.view.state - -import com.vitorpamplona.quartz.nip01Core.core.HexKey - -abstract class WriteNewNoteUIState { - data object Loading: WriteNewNoteUIState() - - data object Error: WriteNewNoteUIState() - - data class InputPrompt( - val localProfile: to.curare.compose.database.model.intermdiate.LocalProfileWithFollowing, - val inReplyToNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent? = null, - val quotedNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent? = null, - val replayToId: HexKey? = null, - ): WriteNewNoteUIState() - - data class ConfirmNote( - val localProfile: to.curare.compose.database.model.intermdiate.LocalProfileWithFollowing, - val inReplyToNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent? = null, - val quotedNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent? = null, - val text: String, - ) : WriteNewNoteUIState() - -} \ No newline at end of file diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/ComposeAppCommonTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ComposeAppCommonTest.kt similarity index 80% rename from composeApp/src/commonTest/kotlin/to/curare/compose/ComposeAppCommonTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ComposeAppCommonTest.kt index d51d1ea9..6829e961 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/ComposeAppCommonTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ComposeAppCommonTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose +package com.machankura.bennu.compose import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/ChatRoomMembershipWindowTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/model/ChatRoomMembershipWindowTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/to/curare/compose/database/model/ChatRoomMembershipWindowTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/model/ChatRoomMembershipWindowTest.kt index 99b276a9..68b747fb 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/ChatRoomMembershipWindowTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/model/ChatRoomMembershipWindowTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/GiftWrapMessageTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/model/GiftWrapMessageTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/to/curare/compose/database/model/GiftWrapMessageTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/model/GiftWrapMessageTest.kt index af5f0b44..bbd45e8e 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/GiftWrapMessageTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/model/GiftWrapMessageTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import com.vitorpamplona.quartz.nip01Core.core.toHexKey import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/MarmotChatLineReconciliationTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/model/MarmotChatLineReconciliationTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/to/curare/compose/database/model/MarmotChatLineReconciliationTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/model/MarmotChatLineReconciliationTest.kt index 17beb812..7b35af0b 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/MarmotChatLineReconciliationTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/model/MarmotChatLineReconciliationTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/MarmotCommitResultMappingTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/model/MarmotCommitResultMappingTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/to/curare/compose/database/model/MarmotCommitResultMappingTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/model/MarmotCommitResultMappingTest.kt index 203177fa..1681e9bb 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/MarmotCommitResultMappingTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/model/MarmotCommitResultMappingTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import com.vitorpamplona.quartz.marmot.mls.messages.CommitResult import kotlin.test.Test diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/MarmotGroupEventRoomFilterTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/model/MarmotGroupEventRoomFilterTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/to/curare/compose/database/model/MarmotGroupEventRoomFilterTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/model/MarmotGroupEventRoomFilterTest.kt index 7ec2d772..a76be0b6 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/MarmotGroupEventRoomFilterTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/model/MarmotGroupEventRoomFilterTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/RumorIdAgreementTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/model/RumorIdAgreementTest.kt similarity index 90% rename from composeApp/src/commonTest/kotlin/to/curare/compose/database/model/RumorIdAgreementTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/model/RumorIdAgreementTest.kt index 168344be..d897746c 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/RumorIdAgreementTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/model/RumorIdAgreementTest.kt @@ -1,18 +1,18 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import kotlin.test.Test import kotlin.test.assertEquals -import to.curare.compose.nostr.nip30303.ArtifactEvent -import to.curare.compose.nostr.nip30303.ArtifactVersionEvent -import to.curare.compose.nostr.nip30303.ChapterEvent -import to.curare.compose.nostr.nip30303.ChunkEvent -import to.curare.compose.nostr.nip30303.DialectEvent -import to.curare.compose.nostr.nip30303.SubmissionEvent -import to.curare.compose.nostr.nip30303.TranslationArtifactVersionEvent -import to.curare.compose.nostr.nip30303.tags.ArtifactIdTag +import com.machankura.bennu.compose.nostr.nip30303.ArtifactEvent +import com.machankura.bennu.compose.nostr.nip30303.ArtifactVersionEvent +import com.machankura.bennu.compose.nostr.nip30303.ChapterEvent +import com.machankura.bennu.compose.nostr.nip30303.ChunkEvent +import com.machankura.bennu.compose.nostr.nip30303.DialectEvent +import com.machankura.bennu.compose.nostr.nip30303.SubmissionEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationArtifactVersionEvent +import com.machankura.bennu.compose.nostr.nip30303.tags.ArtifactIdTag /** * The row on disk and the payload on the wire have to be the same event. diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/TranscriptRequestStateTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/model/TranscriptRequestStateTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/to/curare/compose/database/model/TranscriptRequestStateTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/model/TranscriptRequestStateTest.kt index 13f69a31..14fbde5c 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/TranscriptRequestStateTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/model/TranscriptRequestStateTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/intermdiate/ChatRoomLastMessagePreviewTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/model/intermdiate/ChatRoomLastMessagePreviewTest.kt similarity index 96% rename from composeApp/src/commonTest/kotlin/to/curare/compose/database/model/intermdiate/ChatRoomLastMessagePreviewTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/model/intermdiate/ChatRoomLastMessagePreviewTest.kt index 34496259..5e6db562 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/intermdiate/ChatRoomLastMessagePreviewTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/model/intermdiate/ChatRoomLastMessagePreviewTest.kt @@ -1,9 +1,9 @@ -package to.curare.compose.database.model.intermdiate +package com.machankura.bennu.compose.database.model.intermdiate -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.Participant -import to.curare.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.Participant +import com.machankura.bennu.compose.database.model.Profile import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNull diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/database/query/NostrEventFilterQueryTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/query/NostrEventFilterQueryTest.kt similarity index 97% rename from composeApp/src/commonTest/kotlin/to/curare/compose/database/query/NostrEventFilterQueryTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/query/NostrEventFilterQueryTest.kt index 80c52f22..57168712 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/database/query/NostrEventFilterQueryTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/database/query/NostrEventFilterQueryTest.kt @@ -1,7 +1,7 @@ -package to.curare.compose.database.query +package com.machankura.bennu.compose.database.query import androidx.sqlite.SQLiteStatement -import to.curare.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter import kotlin.test.Test import kotlin.test.assertEquals import kotlin.time.Instant @@ -144,13 +144,13 @@ class NostrEventFilterQueryTest { @Test fun `search still matches content`() { - val query = NostrEventFilterQuery.build(SynchronizationFilter(search = "curare")) + val query = NostrEventFilterQuery.build(SynchronizationFilter(search = "bennu")) assertEquals( "SELECT * FROM NostrEvent WHERE content LIKE '%' || ? || '%' ORDER BY createdAt DESC, id DESC", query.sql, ) - assertEquals(listOf("curare"), query.boundValues()) + assertEquals(listOf("bennu"), query.boundValues()) } private fun androidx.room3.RoomRawQuery.boundValues(): List = diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/extensions/ChatListTimestampTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/extensions/ChatListTimestampTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/to/curare/compose/extensions/ChatListTimestampTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/extensions/ChatListTimestampTest.kt index 0c3b0c34..e3f0cfc5 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/extensions/ChatListTimestampTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/extensions/ChatListTimestampTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.extensions +package com.machankura.bennu.compose.extensions import kotlinx.datetime.TimeZone import kotlinx.datetime.atStartOfDayIn diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/ChillDkgRitualOrderingTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/ChillDkgRitualOrderingTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/to/curare/compose/managers/ChillDkgRitualOrderingTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/ChillDkgRitualOrderingTest.kt index ea4c9f12..00be0e2f 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/ChillDkgRitualOrderingTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/ChillDkgRitualOrderingTest.kt @@ -1,6 +1,6 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers -import to.curare.compose.extensions.toHex +import com.machankura.bennu.compose.extensions.toHex import fr.acinq.bitcoin.ByteVector import fr.acinq.bitcoin.ByteVector32 import fr.acinq.bitcoin.ByteVector64 diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/FrostSigningRoundTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/FrostSigningRoundTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/to/curare/compose/managers/FrostSigningRoundTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/FrostSigningRoundTest.kt index 05bc4a2b..c5dee506 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/FrostSigningRoundTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/FrostSigningRoundTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher @@ -19,12 +19,12 @@ import kotlin.test.assertEquals import kotlin.test.assertFalse import kotlin.test.assertTrue import kotlin.time.Instant -import to.curare.compose.database.model.DkgSession -import to.curare.compose.database.model.FrostSigningItem -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.types.FrostSigningStage -import to.curare.compose.extensions.toHex -import to.curare.compose.nostr.frost.FrostSigningEvents +import com.machankura.bennu.compose.database.model.DkgSession +import com.machankura.bennu.compose.database.model.FrostSigningItem +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.types.FrostSigningStage +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.nostr.frost.FrostSigningEvents /** * The two rounds a signing session runs, against real FROST. diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/GroupKeyStateTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/GroupKeyStateTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/to/curare/compose/managers/GroupKeyStateTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/GroupKeyStateTest.kt index 49e3d825..4a922454 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/GroupKeyStateTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/GroupKeyStateTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray @@ -20,15 +20,15 @@ import kotlin.test.assertNotEquals import kotlin.test.assertNull import kotlin.test.assertTrue import kotlin.time.Instant -import to.curare.compose.database.model.FrostSigningItem -import to.curare.compose.database.model.GroupKeyState -import to.curare.compose.extensions.toHex -import to.curare.compose.nostr.frost.GroupKeyStateEvent -import to.curare.compose.nostr.subgroup.SubgroupBirthCertificateEvent -import to.curare.compose.nostr.subgroup.SubgroupParentage -import to.curare.compose.nostr.nip30303.ArtifactEvent -import to.curare.compose.nostr.nip30303.ChapterEvent -import to.curare.compose.nostr.nip30303.DialectEvent +import com.machankura.bennu.compose.database.model.FrostSigningItem +import com.machankura.bennu.compose.database.model.GroupKeyState +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.nostr.frost.GroupKeyStateEvent +import com.machankura.bennu.compose.nostr.subgroup.SubgroupBirthCertificateEvent +import com.machankura.bennu.compose.nostr.subgroup.SubgroupParentage +import com.machankura.bennu.compose.nostr.nip30303.ArtifactEvent +import com.machankura.bennu.compose.nostr.nip30303.ChapterEvent +import com.machankura.bennu.compose.nostr.nip30303.DialectEvent /** * What a room's key state is allowed to convince a member of. diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/LiveInstanceCacheTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/LiveInstanceCacheTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/to/curare/compose/managers/LiveInstanceCacheTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/LiveInstanceCacheTest.kt index 06ce0f94..c2214e2a 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/LiveInstanceCacheTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/LiveInstanceCacheTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/LiveSubscriptionPlanTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/LiveSubscriptionPlanTest.kt similarity index 85% rename from composeApp/src/commonTest/kotlin/to/curare/compose/managers/LiveSubscriptionPlanTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/LiveSubscriptionPlanTest.kt index 9bf4e3b7..2d939eda 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/LiveSubscriptionPlanTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/LiveSubscriptionPlanTest.kt @@ -1,21 +1,21 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import com.vitorpamplona.quartz.marmot.mip03GroupMessages.GroupEvent import com.vitorpamplona.quartz.nip59Giftwrap.wraps.GiftWrapEvent -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.MarmotRouting -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.managers.LiveSubscriptionManager.Companion.GIFT_WRAP_SUB_ID -import to.curare.compose.managers.LiveSubscriptionManager.Companion.GROUP_SUB_ID_PREFIX -import to.curare.compose.managers.LiveSubscriptionManager.Companion.giftWrapFilter -import to.curare.compose.managers.LiveSubscriptionManager.Companion.groupChunks -import to.curare.compose.managers.LiveSubscriptionManager.Companion.groupFilter -import to.curare.compose.managers.LiveSubscriptionManager.Companion.groupIdsFrom -import to.curare.compose.managers.LiveSubscriptionManager.Companion.groupSubId -import to.curare.compose.managers.LiveSubscriptionManager.Companion.subscriptionIndex -import to.curare.compose.managers.LiveSubscriptionManager.Companion.subscriptionKey -import to.curare.compose.network.sockets.NostrIncomingMessage -import to.curare.compose.network.sockets.endsLiveSubscription +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.MarmotRouting +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.managers.LiveSubscriptionManager.Companion.GIFT_WRAP_SUB_ID +import com.machankura.bennu.compose.managers.LiveSubscriptionManager.Companion.GROUP_SUB_ID_PREFIX +import com.machankura.bennu.compose.managers.LiveSubscriptionManager.Companion.giftWrapFilter +import com.machankura.bennu.compose.managers.LiveSubscriptionManager.Companion.groupChunks +import com.machankura.bennu.compose.managers.LiveSubscriptionManager.Companion.groupFilter +import com.machankura.bennu.compose.managers.LiveSubscriptionManager.Companion.groupIdsFrom +import com.machankura.bennu.compose.managers.LiveSubscriptionManager.Companion.groupSubId +import com.machankura.bennu.compose.managers.LiveSubscriptionManager.Companion.subscriptionIndex +import com.machankura.bennu.compose.managers.LiveSubscriptionManager.Companion.subscriptionKey +import com.machankura.bennu.compose.network.sockets.NostrIncomingMessage +import com.machankura.bennu.compose.network.sockets.endsLiveSubscription import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/LiveSubscriptionReconcileTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/LiveSubscriptionReconcileTest.kt similarity index 95% rename from composeApp/src/commonTest/kotlin/to/curare/compose/managers/LiveSubscriptionReconcileTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/LiveSubscriptionReconcileTest.kt index d79bd9a0..0ad64e8c 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/LiveSubscriptionReconcileTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/LiveSubscriptionReconcileTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import com.vitorpamplona.quartz.nip01Core.relay.commands.toRelay.ReqCmd @@ -13,16 +13,16 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.test.advanceTimeBy import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.NegentropySynchronizeRequest -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.managers.LiveSubscriptionManager.Companion.GIFT_WRAP_SUB_ID -import to.curare.compose.managers.LiveSubscriptionManager.Companion.groupSubId -import to.curare.compose.network.relays.LiveSubscriptionTransport -import to.curare.compose.network.sockets.NostrIncomingMessage -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.NostrRepository +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.managers.LiveSubscriptionManager.Companion.GIFT_WRAP_SUB_ID +import com.machankura.bennu.compose.managers.LiveSubscriptionManager.Companion.groupSubId +import com.machankura.bennu.compose.network.relays.LiveSubscriptionTransport +import com.machankura.bennu.compose.network.sockets.NostrIncomingMessage +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.NostrRepository import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/MarmotGroupNameTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/MarmotGroupNameTest.kt similarity index 97% rename from composeApp/src/commonTest/kotlin/to/curare/compose/managers/MarmotGroupNameTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/MarmotGroupNameTest.kt index 28fecf89..827fb537 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/MarmotGroupNameTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/MarmotGroupNameTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/MarmotMip03CarveOutTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/MarmotMip03CarveOutTest.kt similarity index 97% rename from composeApp/src/commonTest/kotlin/to/curare/compose/managers/MarmotMip03CarveOutTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/MarmotMip03CarveOutTest.kt index 448664e0..a69781ee 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/MarmotMip03CarveOutTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/MarmotMip03CarveOutTest.kt @@ -1,10 +1,10 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import com.vitorpamplona.quartz.nip59Giftwrap.wraps.GiftWrapEvent import com.vitorpamplona.quartz.nip17Dm.messages.ChatMessageEvent import com.vitorpamplona.quartz.nip59Giftwrap.seals.SealedRumorEvent import com.vitorpamplona.quartz.nipC7Chats.ChatEvent -import to.curare.compose.nostr.MarmotDirectMessage +import com.machankura.bennu.compose.nostr.MarmotDirectMessage import kotlin.test.Test import kotlin.test.assertNotNull import kotlin.test.assertNull diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/MarmotReindexSweepTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/MarmotReindexSweepTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/to/curare/compose/managers/MarmotReindexSweepTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/MarmotReindexSweepTest.kt index e3f20463..3ee3ecc3 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/MarmotReindexSweepTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/MarmotReindexSweepTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import kotlinx.coroutines.test.runTest import kotlin.test.Test diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/MarmotRoomIdentityTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/MarmotRoomIdentityTest.kt similarity index 97% rename from composeApp/src/commonTest/kotlin/to/curare/compose/managers/MarmotRoomIdentityTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/MarmotRoomIdentityTest.kt index 5fdc913c..9caa4f45 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/MarmotRoomIdentityTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/MarmotRoomIdentityTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/SharedKeyDerivationTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/SharedKeyDerivationTest.kt similarity index 97% rename from composeApp/src/commonTest/kotlin/to/curare/compose/managers/SharedKeyDerivationTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/SharedKeyDerivationTest.kt index 562b3a8f..c5cc7184 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/SharedKeyDerivationTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/SharedKeyDerivationTest.kt @@ -1,6 +1,6 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers -import to.curare.compose.extensions.toHex +import com.machankura.bennu.compose.extensions.toHex import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray import fr.acinq.bitcoin.ByteVector import fr.acinq.bitcoin.PrivateKey @@ -10,7 +10,7 @@ import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotEquals import kotlin.test.assertTrue -import to.curare.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.FrostSigningSession /** * The derivation every member's device has to agree on, run against real FROST diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/SignedArtifactTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/SignedArtifactTest.kt similarity index 96% rename from composeApp/src/commonTest/kotlin/to/curare/compose/managers/SignedArtifactTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/SignedArtifactTest.kt index 04bc9a65..8190e758 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/SignedArtifactTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/SignedArtifactTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray @@ -18,12 +18,12 @@ import kotlin.test.assertEquals import kotlin.test.assertNotEquals import kotlin.test.assertNotNull import kotlin.test.assertTrue -import to.curare.compose.database.model.FrostSigningItem -import to.curare.compose.database.model.MantraArtifact -import to.curare.compose.database.model.MantraArtifactVersion -import to.curare.compose.extensions.toHex -import to.curare.compose.nostr.nip30303.ArtifactEvent -import to.curare.compose.nostr.nip30303.ArtifactVersionEvent +import com.machankura.bennu.compose.database.model.FrostSigningItem +import com.machankura.bennu.compose.database.model.MantraArtifact +import com.machankura.bennu.compose.database.model.MantraArtifactVersion +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.nostr.nip30303.ArtifactEvent +import com.machankura.bennu.compose.nostr.nip30303.ArtifactVersionEvent /** * An artifact the group signed, from proposal to rows, against real FROST. diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/SignedChapterTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/SignedChapterTest.kt similarity index 97% rename from composeApp/src/commonTest/kotlin/to/curare/compose/managers/SignedChapterTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/SignedChapterTest.kt index 70390469..dcfbe7c8 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/SignedChapterTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/SignedChapterTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray @@ -18,12 +18,12 @@ import kotlin.test.assertEquals import kotlin.test.assertNotEquals import kotlin.test.assertNotNull import kotlin.test.assertTrue -import to.curare.compose.database.model.FrostSigningItem -import to.curare.compose.database.model.MantraChapter -import to.curare.compose.database.model.MantraChunk -import to.curare.compose.extensions.toHex -import to.curare.compose.nostr.nip30303.ChapterEvent -import to.curare.compose.nostr.nip30303.ChunkEvent +import com.machankura.bennu.compose.database.model.FrostSigningItem +import com.machankura.bennu.compose.database.model.MantraChapter +import com.machankura.bennu.compose.database.model.MantraChunk +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.nostr.nip30303.ChapterEvent +import com.machankura.bennu.compose.nostr.nip30303.ChunkEvent /** * A chapter and its chunks the group signed, from proposal to rows, against diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/TranslationScaffoldTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/TranslationScaffoldTest.kt similarity index 93% rename from composeApp/src/commonTest/kotlin/to/curare/compose/managers/TranslationScaffoldTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/TranslationScaffoldTest.kt index 13c7f0b2..2290545f 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/managers/TranslationScaffoldTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/TranslationScaffoldTest.kt @@ -1,14 +1,14 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue -import to.curare.compose.database.model.MantraChapter -import to.curare.compose.database.model.MantraTranslationChapter -import to.curare.compose.nostr.nip30303.TranslationChapterEvent -import to.curare.compose.nostr.nip30303.tags.ChapterIdTag -import to.curare.compose.nostr.nip30303.tags.IndexTag -import to.curare.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag +import com.machankura.bennu.compose.database.model.MantraChapter +import com.machankura.bennu.compose.database.model.MantraTranslationChapter +import com.machankura.bennu.compose.nostr.nip30303.TranslationChapterEvent +import com.machankura.bennu.compose.nostr.nip30303.tags.ChapterIdTag +import com.machankura.bennu.compose.nostr.nip30303.tags.IndexTag +import com.machankura.bennu.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag /** * The join between a translation and the chapters it is of, as a pure function. diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/network/relays/RelayBackPressureTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/network/relays/RelayBackPressureTest.kt similarity index 97% rename from composeApp/src/commonTest/kotlin/to/curare/compose/network/relays/RelayBackPressureTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/network/relays/RelayBackPressureTest.kt index c65dc40c..a7f441f2 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/network/relays/RelayBackPressureTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/network/relays/RelayBackPressureTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.network.relays +package com.machankura.bennu.compose.network.relays import kotlin.test.Test import kotlin.test.assertFalse diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/network/relays/RelayPoolSubscriptionTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/network/relays/RelayPoolSubscriptionTest.kt similarity index 95% rename from composeApp/src/commonTest/kotlin/to/curare/compose/network/relays/RelayPoolSubscriptionTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/network/relays/RelayPoolSubscriptionTest.kt index a15fbb73..0a6d15a1 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/network/relays/RelayPoolSubscriptionTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/network/relays/RelayPoolSubscriptionTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.network.relays +package com.machankura.bennu.compose.network.relays import com.vitorpamplona.quartz.nip01Core.relay.commands.toRelay.CloseCmd import com.vitorpamplona.quartz.nip01Core.relay.commands.toRelay.ReqCmd @@ -13,14 +13,14 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.test.UnconfinedTestDispatcher import kotlinx.coroutines.test.runTest import kotlinx.serialization.json.JsonObject -import to.curare.compose.network.dto.RelayDTO -import to.curare.compose.network.sockets.NostrIncomingMessage -import to.curare.compose.network.sockets.NostrSocketClient -import to.curare.compose.network.sockets.NostrSocketClientFactory -import to.curare.compose.network.sockets.SocketConnectionClosedCallback -import to.curare.compose.network.sockets.SocketConnectionOpenedCallback -import to.curare.compose.network.sockets.SocketConnectionReopenedCallback -import to.curare.compose.repository.CachingImportRepository +import com.machankura.bennu.compose.network.dto.RelayDTO +import com.machankura.bennu.compose.network.sockets.NostrIncomingMessage +import com.machankura.bennu.compose.network.sockets.NostrSocketClient +import com.machankura.bennu.compose.network.sockets.NostrSocketClientFactory +import com.machankura.bennu.compose.network.sockets.SocketConnectionClosedCallback +import com.machankura.bennu.compose.network.sockets.SocketConnectionOpenedCallback +import com.machankura.bennu.compose.network.sockets.SocketConnectionReopenedCallback +import com.machankura.bennu.compose.repository.CachingImportRepository import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/network/sockets/ReconnectBackoffTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/network/sockets/ReconnectBackoffTest.kt similarity index 97% rename from composeApp/src/commonTest/kotlin/to/curare/compose/network/sockets/ReconnectBackoffTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/network/sockets/ReconnectBackoffTest.kt index 467c1b21..2ca2e065 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/network/sockets/ReconnectBackoffTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/network/sockets/ReconnectBackoffTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.network.sockets +package com.machankura.bennu.compose.network.sockets import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/CuratedSuggestionTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/CuratedSuggestionTest.kt similarity index 90% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/CuratedSuggestionTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/CuratedSuggestionTest.kt index 94b841c0..0ebffe8c 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/CuratedSuggestionTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/CuratedSuggestionTest.kt @@ -1,16 +1,16 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr -import to.curare.compose.database.GENESIS_AT -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalNostrEvent -import to.curare.compose.nostr.curated.CuratedField -import to.curare.compose.nostr.curated.CuratedFieldConfig -import to.curare.compose.nostr.curated.CuratedFieldType -import to.curare.compose.nostr.curated.CuratedSchema -import to.curare.compose.nostr.curated.CuratedSchemaEvent -import to.curare.compose.nostr.curated.CuratedVisibility +import com.machankura.bennu.compose.database.GENESIS_AT +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent +import com.machankura.bennu.compose.nostr.curated.CuratedField +import com.machankura.bennu.compose.nostr.curated.CuratedFieldConfig +import com.machankura.bennu.compose.nostr.curated.CuratedFieldType +import com.machankura.bennu.compose.nostr.curated.CuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaEvent +import com.machankura.bennu.compose.nostr.curated.CuratedVisibility import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/DirectMessagePeerSyncTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/DirectMessagePeerSyncTest.kt similarity index 96% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/DirectMessagePeerSyncTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/DirectMessagePeerSyncTest.kt index 29f42da5..cec27121 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/DirectMessagePeerSyncTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/DirectMessagePeerSyncTest.kt @@ -1,10 +1,10 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageEvent import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip17Dm.settings.ChatMessageRelayListEvent import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent -import to.curare.compose.database.model.NegentropySynchronizeRequest +import com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNull diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupCuratedEntryTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/GroupCuratedEntryTest.kt similarity index 94% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupCuratedEntryTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/GroupCuratedEntryTest.kt index 50ff569f..f2ba664a 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupCuratedEntryTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/GroupCuratedEntryTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray @@ -12,17 +12,17 @@ import fr.acinq.bitcoin.crypto.frost.IndividualNonce import fr.acinq.bitcoin.crypto.frost.KeyMaterial import fr.acinq.bitcoin.crypto.frost.SecretNonce import fr.acinq.bitcoin.crypto.frost.Session -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.extensions.toHex -import to.curare.compose.managers.SharedKeyDerivation -import to.curare.compose.nostr.curated.CuratedEntryEvent -import to.curare.compose.nostr.curated.CuratedField -import to.curare.compose.nostr.curated.CuratedFieldConfig -import to.curare.compose.nostr.curated.CuratedFieldType -import to.curare.compose.nostr.curated.CuratedSchema -import to.curare.compose.nostr.curated.CuratedSchemaEvent -import to.curare.compose.nostr.curated.CuratedSuggestionRef -import to.curare.compose.nostr.curated.CuratedVisibility +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.managers.SharedKeyDerivation +import com.machankura.bennu.compose.nostr.curated.CuratedEntryEvent +import com.machankura.bennu.compose.nostr.curated.CuratedField +import com.machankura.bennu.compose.nostr.curated.CuratedFieldConfig +import com.machankura.bennu.compose.nostr.curated.CuratedFieldType +import com.machankura.bennu.compose.nostr.curated.CuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaEvent +import com.machankura.bennu.compose.nostr.curated.CuratedSuggestionRef +import com.machankura.bennu.compose.nostr.curated.CuratedVisibility import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotNull diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupCuratedSchemaTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/GroupCuratedSchemaTest.kt similarity index 95% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupCuratedSchemaTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/GroupCuratedSchemaTest.kt index 0ac6365d..830f9fb1 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupCuratedSchemaTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/GroupCuratedSchemaTest.kt @@ -1,14 +1,14 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.extensions.toHex -import to.curare.compose.managers.SharedKeyDerivation -import to.curare.compose.nostr.curated.CuratedField -import to.curare.compose.nostr.curated.CuratedFieldConfig -import to.curare.compose.nostr.curated.CuratedFieldType -import to.curare.compose.nostr.curated.CuratedSchema -import to.curare.compose.nostr.curated.CuratedSchemaEvent -import to.curare.compose.nostr.curated.CuratedVisibility +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.managers.SharedKeyDerivation +import com.machankura.bennu.compose.nostr.curated.CuratedField +import com.machankura.bennu.compose.nostr.curated.CuratedFieldConfig +import com.machankura.bennu.compose.nostr.curated.CuratedFieldType +import com.machankura.bennu.compose.nostr.curated.CuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaEvent +import com.machankura.bennu.compose.nostr.curated.CuratedVisibility import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupEventProposalTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/GroupEventProposalTest.kt similarity index 97% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupEventProposalTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/GroupEventProposalTest.kt index c2f48bd7..7ce93c11 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupEventProposalTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/GroupEventProposalTest.kt @@ -1,11 +1,11 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.extensions.toHex -import to.curare.compose.managers.SharedKeyDerivation -import to.curare.compose.nostr.curated.CuratedSchemaEvent -import to.curare.compose.nostr.curated.CuratedSchemaProblem -import to.curare.compose.nostr.curated.CuratedVisibility +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.managers.SharedKeyDerivation +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaEvent +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaProblem +import com.machankura.bennu.compose.nostr.curated.CuratedVisibility import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupNostrProfileTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/GroupNostrProfileTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupNostrProfileTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/GroupNostrProfileTest.kt index 51f76940..e80ae282 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupNostrProfileTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/GroupNostrProfileTest.kt @@ -1,8 +1,8 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.extensions.toHex -import to.curare.compose.managers.SharedKeyDerivation +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.managers.SharedKeyDerivation import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupPostTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/GroupPostTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupPostTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/GroupPostTest.kt index f2b741d2..92362772 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupPostTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/GroupPostTest.kt @@ -1,8 +1,8 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.extensions.toHex -import to.curare.compose.managers.SharedKeyDerivation +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.managers.SharedKeyDerivation import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupRelayListTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/GroupRelayListTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupRelayListTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/GroupRelayListTest.kt index 07cfdb1c..22ed566e 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupRelayListTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/GroupRelayListTest.kt @@ -1,8 +1,8 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.extensions.toHex -import to.curare.compose.managers.SharedKeyDerivation +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.managers.SharedKeyDerivation import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MarmotAppPayloadTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/MarmotAppPayloadTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MarmotAppPayloadTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/MarmotAppPayloadTest.kt index d06c58d1..d7b36cc8 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MarmotAppPayloadTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/MarmotAppPayloadTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr import com.vitorpamplona.quartz.marmot.foundation.appEvents.MarmotAppEvent import com.vitorpamplona.quartz.nip01Core.core.Event diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MarmotDeliveryTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/MarmotDeliveryTest.kt similarity index 97% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MarmotDeliveryTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/MarmotDeliveryTest.kt index a39f3041..07fe4a36 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MarmotDeliveryTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/MarmotDeliveryTest.kt @@ -1,6 +1,6 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr -import to.curare.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.ChatMessage import kotlin.test.Test import kotlin.test.assertContentEquals import kotlin.test.assertEquals diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MarmotDirectMessageDeliveryTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/MarmotDirectMessageDeliveryTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MarmotDirectMessageDeliveryTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/MarmotDirectMessageDeliveryTest.kt index 25af0f74..7b2b83a9 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MarmotDirectMessageDeliveryTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/MarmotDirectMessageDeliveryTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.toHexKey diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MarmotDirectMessageTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/MarmotDirectMessageTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MarmotDirectMessageTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/MarmotDirectMessageTest.kt index 705136ae..d564d217 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MarmotDirectMessageTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/MarmotDirectMessageTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr import com.vitorpamplona.quartz.marmot.foundation.appEvents.MarmotAppEvent import com.vitorpamplona.quartz.nip01Core.core.Event diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MarmotPayloadBoundsTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/MarmotPayloadBoundsTest.kt similarity index 96% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MarmotPayloadBoundsTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/MarmotPayloadBoundsTest.kt index c75251dc..a53528c4 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MarmotPayloadBoundsTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/MarmotPayloadBoundsTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr import com.vitorpamplona.quartz.marmot.foundation.appEvents.MarmotAppEvent import com.vitorpamplona.quartz.marmot.foundation.appEvents.MarmotJson @@ -10,9 +10,9 @@ import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync import com.vitorpamplona.quartz.nip01Core.tags.people.PTag import com.vitorpamplona.quartz.nip17Dm.messages.ChatMessageEvent import com.vitorpamplona.quartz.nip59Giftwrap.rumors.RumorAssembler -import to.curare.compose.nostr.chronicle.ChronicleEvent -import to.curare.compose.nostr.nip30303.ChunkEvent -import to.curare.compose.nostr.nip30303.DialectEvent +import com.machankura.bennu.compose.nostr.chronicle.ChronicleEvent +import com.machankura.bennu.compose.nostr.nip30303.ChunkEvent +import com.machankura.bennu.compose.nostr.nip30303.DialectEvent import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotNull diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MemberProfileSyncTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/MemberProfileSyncTest.kt similarity index 92% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MemberProfileSyncTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/MemberProfileSyncTest.kt index d7e85853..82a38fc6 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MemberProfileSyncTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/MemberProfileSyncTest.kt @@ -1,13 +1,13 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent -import to.curare.compose.database.GENESIS_AT -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.Participant -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.intermdiate.LocalParticipant +import com.machankura.bennu.compose.database.GENESIS_AT +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.Participant +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalParticipant import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/Nip17FiltersTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/Nip17FiltersTest.kt similarity index 94% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/Nip17FiltersTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/Nip17FiltersTest.kt index f5342cb2..e0043f10 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/Nip17FiltersTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/Nip17FiltersTest.kt @@ -1,7 +1,7 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr -import to.curare.compose.database.query.NostrEventFilterQuery -import to.curare.compose.network.serialization.encodeToJsonString +import com.machankura.bennu.compose.database.query.NostrEventFilterQuery +import com.machankura.bennu.compose.network.serialization.encodeToJsonString import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNull diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/SignInSyncTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/SignInSyncTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/SignInSyncTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/SignInSyncTest.kt index c5a393e2..bd197314 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/SignInSyncTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/SignInSyncTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr +package com.machankura.bennu.compose.nostr import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer import kotlin.test.Test diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/chronicle/ChronicleEventTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/chronicle/ChronicleEventTest.kt similarity index 93% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/chronicle/ChronicleEventTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/chronicle/ChronicleEventTest.kt index b2e28361..22542fb3 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/chronicle/ChronicleEventTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/chronicle/ChronicleEventTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.chronicle +package com.machankura.bennu.compose.nostr.chronicle import com.vitorpamplona.quartz.nip01Core.core.Event import kotlin.test.Test @@ -8,25 +8,25 @@ import kotlin.test.assertFalse import kotlin.test.assertNotNull import kotlin.test.assertNull import kotlin.test.assertTrue -import to.curare.compose.nostr.chronicle.tags.ChronicleIdTag -import to.curare.compose.nostr.chronicle.tags.ChroniclePageTag -import to.curare.compose.nostr.chronicle.tags.ChronicleRecipientTag -import to.curare.compose.nostr.frost.FrostSigningEvents -import to.curare.compose.nostr.frost.GroupKeyStateEvent -import to.curare.compose.nostr.subgroup.SubgroupBirthCertificateEvent -import to.curare.compose.nostr.nip30303.ArtifactEvent -import to.curare.compose.nostr.nip30303.ArtifactVersionEvent -import to.curare.compose.nostr.nip30303.ChapterEvent -import to.curare.compose.nostr.nip30303.ChunkEvent -import to.curare.compose.nostr.nip30303.DialectEvent -import to.curare.compose.nostr.nip30303.SubmissionEvent -import to.curare.compose.nostr.nip30303.TranslationArtifactVersionContributorListEvent -import to.curare.compose.nostr.nip30303.TranslationArtifactVersionEvent -import to.curare.compose.nostr.nip30303.TranslationChapterContributorListEvent -import to.curare.compose.nostr.nip30303.TranslationChapterEvent -import to.curare.compose.nostr.nip30303.TranslationChunkEvent -import to.curare.compose.nostr.nip30303.TranslationContributorListEvent -import to.curare.compose.nostr.nip30303.TranslationEvent +import com.machankura.bennu.compose.nostr.chronicle.tags.ChronicleIdTag +import com.machankura.bennu.compose.nostr.chronicle.tags.ChroniclePageTag +import com.machankura.bennu.compose.nostr.chronicle.tags.ChronicleRecipientTag +import com.machankura.bennu.compose.nostr.frost.FrostSigningEvents +import com.machankura.bennu.compose.nostr.frost.GroupKeyStateEvent +import com.machankura.bennu.compose.nostr.subgroup.SubgroupBirthCertificateEvent +import com.machankura.bennu.compose.nostr.nip30303.ArtifactEvent +import com.machankura.bennu.compose.nostr.nip30303.ArtifactVersionEvent +import com.machankura.bennu.compose.nostr.nip30303.ChapterEvent +import com.machankura.bennu.compose.nostr.nip30303.ChunkEvent +import com.machankura.bennu.compose.nostr.nip30303.DialectEvent +import com.machankura.bennu.compose.nostr.nip30303.SubmissionEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationArtifactVersionContributorListEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationArtifactVersionEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationChapterContributorListEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationChapterEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationChunkEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationContributorListEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationEvent /** * The envelope a chronicle travels in: what it carries, what it refuses, and the diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/chronicle/ChronicleRoundTripTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/chronicle/ChronicleRoundTripTest.kt similarity index 92% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/chronicle/ChronicleRoundTripTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/chronicle/ChronicleRoundTripTest.kt index 878d7899..78e88c4c 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/chronicle/ChronicleRoundTripTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/chronicle/ChronicleRoundTripTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.chronicle +package com.machankura.bennu.compose.nostr.chronicle import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray @@ -18,25 +18,25 @@ import kotlin.test.assertEquals import kotlin.test.assertFalse import kotlin.test.assertNotNull import kotlin.test.assertTrue -import to.curare.compose.database.model.MantraArtifact -import to.curare.compose.database.model.MantraArtifactVersion -import to.curare.compose.database.model.MantraChapter -import to.curare.compose.database.model.MantraChunk -import to.curare.compose.database.model.MantraDialect -import to.curare.compose.database.model.MantraTranslationArtifactVersion -import to.curare.compose.database.model.MantraTranslationChapter -import to.curare.compose.database.model.MantraTranslationChunk -import to.curare.compose.extensions.toHex -import to.curare.compose.managers.SharedKeyDerivation -import to.curare.compose.nostr.frost.GroupKeyStateEvent -import to.curare.compose.nostr.nip30303.ArtifactEvent -import to.curare.compose.nostr.nip30303.ArtifactVersionEvent -import to.curare.compose.nostr.nip30303.ChapterEvent -import to.curare.compose.nostr.nip30303.ChunkEvent -import to.curare.compose.nostr.nip30303.DialectEvent -import to.curare.compose.nostr.nip30303.TranslationArtifactVersionEvent -import to.curare.compose.nostr.nip30303.TranslationChapterEvent -import to.curare.compose.nostr.nip30303.TranslationChunkEvent +import com.machankura.bennu.compose.database.model.MantraArtifact +import com.machankura.bennu.compose.database.model.MantraArtifactVersion +import com.machankura.bennu.compose.database.model.MantraChapter +import com.machankura.bennu.compose.database.model.MantraChunk +import com.machankura.bennu.compose.database.model.MantraDialect +import com.machankura.bennu.compose.database.model.MantraTranslationArtifactVersion +import com.machankura.bennu.compose.database.model.MantraTranslationChapter +import com.machankura.bennu.compose.database.model.MantraTranslationChunk +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.managers.SharedKeyDerivation +import com.machankura.bennu.compose.nostr.frost.GroupKeyStateEvent +import com.machankura.bennu.compose.nostr.nip30303.ArtifactEvent +import com.machankura.bennu.compose.nostr.nip30303.ArtifactVersionEvent +import com.machankura.bennu.compose.nostr.nip30303.ChapterEvent +import com.machankura.bennu.compose.nostr.nip30303.ChunkEvent +import com.machankura.bennu.compose.nostr.nip30303.DialectEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationArtifactVersionEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationChapterEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationChunkEvent /** * The assumption the chronicle's *fallback* rests on: a row can be turned back diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/curated/CuratedEntryEventTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/curated/CuratedEntryEventTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/curated/CuratedEntryEventTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/curated/CuratedEntryEventTest.kt index d162391b..7c01cd28 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/curated/CuratedEntryEventTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/curated/CuratedEntryEventTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.curated +package com.machankura.bennu.compose.nostr.curated import com.vitorpamplona.quartz.nip01Core.core.Event import kotlin.test.Test diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/curated/CuratedSchemaEventTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/curated/CuratedSchemaEventTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/curated/CuratedSchemaEventTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/curated/CuratedSchemaEventTest.kt index 989260ee..5fec47f1 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/curated/CuratedSchemaEventTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/curated/CuratedSchemaEventTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.curated +package com.machankura.bennu.compose.nostr.curated import com.vitorpamplona.quartz.nip01Core.core.Event import kotlin.test.Test diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/curated/CuratedSchemaTemplateTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/curated/CuratedSchemaTemplateTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/curated/CuratedSchemaTemplateTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/curated/CuratedSchemaTemplateTest.kt index a8fa5c03..7a164dfa 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/curated/CuratedSchemaTemplateTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/curated/CuratedSchemaTemplateTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.curated +package com.machankura.bennu.compose.nostr.curated import com.vitorpamplona.quartz.nip01Core.core.Event import kotlin.test.Test diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/frost/FrostProposalCodecTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/frost/FrostProposalCodecTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/frost/FrostProposalCodecTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/frost/FrostProposalCodecTest.kt index 8141e3d7..cadba09c 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/frost/FrostProposalCodecTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/frost/FrostProposalCodecTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.frost +package com.machankura.bennu.compose.nostr.frost import com.vitorpamplona.quartz.nip01Core.core.Event import kotlin.test.Test diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/frost/FrostSilentMembersTagTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/frost/FrostSilentMembersTagTest.kt similarity index 96% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/frost/FrostSilentMembersTagTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/frost/FrostSilentMembersTagTest.kt index 8648546a..1d569abd 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/frost/FrostSilentMembersTagTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/frost/FrostSilentMembersTagTest.kt @@ -1,10 +1,10 @@ -package to.curare.compose.nostr.frost +package com.machankura.bennu.compose.nostr.frost import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNull import kotlin.test.assertTrue -import to.curare.compose.nostr.frost.tags.FrostSilentMembersTag +import com.machankura.bennu.compose.nostr.frost.tags.FrostSilentMembersTag /** * The tag a resent proposal carries, and what a reader makes of a bad one. diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/nip30303/ArtifactEventTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/nip30303/ArtifactEventTest.kt similarity index 97% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/nip30303/ArtifactEventTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/nip30303/ArtifactEventTest.kt index d476197c..c9db7fc0 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/nip30303/ArtifactEventTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/nip30303/ArtifactEventTest.kt @@ -1,11 +1,11 @@ -package to.curare.compose.nostr.nip30303 +package com.machankura.bennu.compose.nostr.nip30303 import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNull -import to.curare.compose.nostr.nip30303.tags.ArtifactVersionMetadataTag +import com.machankura.bennu.compose.nostr.nip30303.tags.ArtifactVersionMetadataTag /** * What the form collects has to reach the members deciding whether to sign it. diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/nip30303/ChapterChunkSplitTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/nip30303/ChapterChunkSplitTest.kt similarity index 97% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/nip30303/ChapterChunkSplitTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/nip30303/ChapterChunkSplitTest.kt index 921541f2..40e8990c 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/nip30303/ChapterChunkSplitTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/nip30303/ChapterChunkSplitTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303 +package com.machankura.bennu.compose.nostr.nip30303 import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher @@ -6,8 +6,8 @@ import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotEquals import kotlin.test.assertTrue -import to.curare.compose.nostr.nip30303.tags.OriginalTextTag -import to.curare.compose.text.Markdown +import com.machankura.bennu.compose.nostr.nip30303.tags.OriginalTextTag +import com.machankura.bennu.compose.text.Markdown /** * The chunks a chapter is proposed with are cut from the chapter itself. diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/nip30303/InitialArtifactVersionTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/nip30303/InitialArtifactVersionTest.kt similarity index 97% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/nip30303/InitialArtifactVersionTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/nip30303/InitialArtifactVersionTest.kt index c0e6f5b7..7d9e7f40 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/nip30303/InitialArtifactVersionTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/nip30303/InitialArtifactVersionTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303 +package com.machankura.bennu.compose.nostr.nip30303 import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher @@ -7,7 +7,7 @@ import kotlin.test.assertEquals import kotlin.test.assertNotEquals import kotlin.test.assertNull import kotlin.test.assertTrue -import to.curare.compose.nostr.nip30303.tags.ArtifactVersionMetadataTag +import com.machankura.bennu.compose.nostr.nip30303.tags.ArtifactVersionMetadataTag /** * The version an artifact starts life with, built to be signed beside it. diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/nip30303/SubmissionEventTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/nip30303/SubmissionEventTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/nip30303/SubmissionEventTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/nip30303/SubmissionEventTest.kt index bb70781d..21149222 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/nip30303/SubmissionEventTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/nip30303/SubmissionEventTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.nip30303 +package com.machankura.bennu.compose.nostr.nip30303 import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/subgroup/SubgroupBirthCertificateEventTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/subgroup/SubgroupBirthCertificateEventTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/to/curare/compose/nostr/subgroup/SubgroupBirthCertificateEventTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/subgroup/SubgroupBirthCertificateEventTest.kt index 660c4b01..c9f643ff 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/subgroup/SubgroupBirthCertificateEventTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/subgroup/SubgroupBirthCertificateEventTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.nostr.subgroup +package com.machankura.bennu.compose.nostr.subgroup import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray @@ -16,8 +16,8 @@ import kotlin.test.assertEquals import kotlin.test.assertFalse import kotlin.test.assertNull import kotlin.test.assertTrue -import to.curare.compose.extensions.toHex -import to.curare.compose.managers.SharedKeyDerivation +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.managers.SharedKeyDerivation /** * What a birth certificate is allowed to convince a member of. diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/text/ProposedEventTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/text/ProposedEventTest.kt similarity index 96% rename from composeApp/src/commonTest/kotlin/to/curare/compose/text/ProposedEventTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/text/ProposedEventTest.kt index a4a2e86d..29cc3904 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/text/ProposedEventTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/text/ProposedEventTest.kt @@ -1,7 +1,7 @@ -package to.curare.compose.text +package com.machankura.bennu.compose.text -import to.curare.compose.nostr.curated.CuratedEntryEvent -import to.curare.compose.nostr.curated.CuratedSchemaEvent +import com.machankura.bennu.compose.nostr.curated.CuratedEntryEvent +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaEvent import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/composable/navigation/NavigationSuiteTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/composable/navigation/NavigationSuiteTest.kt similarity index 92% rename from composeApp/src/commonTest/kotlin/to/curare/compose/ui/composable/navigation/NavigationSuiteTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/composable/navigation/NavigationSuiteTest.kt index 66ec92bf..9a0d0eef 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/composable/navigation/NavigationSuiteTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/composable/navigation/NavigationSuiteTest.kt @@ -1,11 +1,11 @@ -package to.curare.compose.ui.composable.navigation +package com.machankura.bennu.compose.ui.composable.navigation import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteType -import to.curare.compose.ui.composable.navigation.routes.ActiveProfileRoute -import to.curare.compose.ui.composable.navigation.routes.HomeRoute -import to.curare.compose.ui.composable.navigation.routes.SearchRoute -import to.curare.compose.ui.theme.Breakpoint +import com.machankura.bennu.compose.ui.composable.navigation.routes.ActiveProfileRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.HomeRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.SearchRoute +import com.machankura.bennu.compose.ui.theme.Breakpoint import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNull diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/composable/navigation/routes/ProposalDestinationTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ProposalDestinationTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/to/curare/compose/ui/composable/navigation/routes/ProposalDestinationTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ProposalDestinationTest.kt index 2c2cb92b..ad044434 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/composable/navigation/routes/ProposalDestinationTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/composable/navigation/routes/ProposalDestinationTest.kt @@ -1,9 +1,9 @@ -package to.curare.compose.ui.composable.navigation.routes +package com.machankura.bennu.compose.ui.composable.navigation.routes import kotlinx.serialization.descriptors.SerialKind import kotlinx.serialization.json.Json import kotlinx.serialization.serializer -import to.curare.compose.ui.view.state.ProposalFilter +import com.machankura.bennu.compose.ui.view.state.ProposalFilter import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/AppColorSchemeSelectionTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/theme/AppColorSchemeSelectionTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/AppColorSchemeSelectionTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/theme/AppColorSchemeSelectionTest.kt index c1cb6f14..ce9c0959 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/AppColorSchemeSelectionTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/theme/AppColorSchemeSelectionTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.theme +package com.machankura.bennu.compose.ui.theme import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/BreakpointTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/theme/BreakpointTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/BreakpointTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/theme/BreakpointTest.kt index 90315ea5..4c6b0adf 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/BreakpointTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/theme/BreakpointTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.theme +package com.machankura.bennu.compose.ui.theme import androidx.compose.ui.unit.dp import kotlin.test.Test diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/ColorSchemeContrastTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/theme/ColorSchemeContrastTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/ColorSchemeContrastTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/theme/ColorSchemeContrastTest.kt index fd425310..d2e9ed46 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/ColorSchemeContrastTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/theme/ColorSchemeContrastTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.theme +package com.machankura.bennu.compose.ui.theme import androidx.compose.material3.ColorScheme import androidx.compose.ui.graphics.Color diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/PanesTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/theme/PanesTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/PanesTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/theme/PanesTest.kt index 17ffbbb4..67e34f53 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/PanesTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/theme/PanesTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.theme +package com.machankura.bennu.compose.ui.theme import androidx.compose.ui.unit.dp import kotlin.test.Test diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/ReadableMeasureTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/theme/ReadableMeasureTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/ReadableMeasureTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/theme/ReadableMeasureTest.kt index de6146f0..f8f71a0d 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/ReadableMeasureTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/theme/ReadableMeasureTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.theme +package com.machankura.bennu.compose.ui.theme import androidx.compose.ui.unit.dp import kotlin.test.Test diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/SpacingScaleTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/theme/SpacingScaleTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/SpacingScaleTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/theme/SpacingScaleTest.kt index 9c054cbc..96328966 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/SpacingScaleTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/theme/SpacingScaleTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.theme +package com.machankura.bennu.compose.ui.theme import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/model/NavigationRoutingTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/model/NavigationRoutingTest.kt similarity index 93% rename from composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/model/NavigationRoutingTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/model/NavigationRoutingTest.kt index 8e5e20ff..239cf57f 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/model/NavigationRoutingTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/model/NavigationRoutingTest.kt @@ -1,7 +1,7 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import com.vitorpamplona.quartz.nip01Core.core.HexKey -import to.curare.compose.identity.Identity +import com.machankura.bennu.compose.identity.Identity import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.cancel @@ -9,13 +9,13 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.test.runTest -import to.curare.compose.database.GENESIS_AT -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.UnsignedNostrEvent -import to.curare.compose.database.model.intermdiate.LocalAccount -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.navigation.routes.SovereignWalletStartupRoute -import to.curare.compose.ui.view.state.NavigationUIState +import com.machankura.bennu.compose.database.GENESIS_AT +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.UnsignedNostrEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalAccount +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.SovereignWalletStartupRoute +import com.machankura.bennu.compose.ui.view.state.NavigationUIState import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotEquals diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/model/UnsyncedProfileDecisionTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/model/UnsyncedProfileDecisionTest.kt similarity index 87% rename from composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/model/UnsyncedProfileDecisionTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/model/UnsyncedProfileDecisionTest.kt index 75152499..9eedbe60 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/model/UnsyncedProfileDecisionTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/model/UnsyncedProfileDecisionTest.kt @@ -1,14 +1,14 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model -import to.curare.compose.database.GENESIS_AT -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.SynchronizeNostrEventRequest -import to.curare.compose.database.model.UnsignedNostrEvent -import to.curare.compose.database.model.intermdiate.LocalAccount -import to.curare.compose.database.model.types.SynchronizationFilter -import to.curare.compose.nostr.SignInSync -import to.curare.compose.ui.view.state.UnsyncedProfileUIState +import com.machankura.bennu.compose.database.GENESIS_AT +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.SynchronizeNostrEventRequest +import com.machankura.bennu.compose.database.model.UnsignedNostrEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalAccount +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.nostr.SignInSync +import com.machankura.bennu.compose.ui.view.state.UnsyncedProfileUIState import kotlin.test.Test import kotlin.test.assertEquals import kotlin.time.Instant diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/state/FrostSigningMembersTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/state/FrostSigningMembersTest.kt similarity index 91% rename from composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/state/FrostSigningMembersTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/state/FrostSigningMembersTest.kt index 62939923..e6925d15 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/state/FrostSigningMembersTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/state/FrostSigningMembersTest.kt @@ -1,13 +1,13 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNull -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.Participant -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.intermdiate.LocalParticipant +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.Participant +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalParticipant /** * Who the signing screen lists as able to answer a proposal. diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/state/FrostSigningResendStateTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/state/FrostSigningResendStateTest.kt similarity index 91% rename from composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/state/FrostSigningResendStateTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/state/FrostSigningResendStateTest.kt index fbf8c68e..5c3c109e 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/state/FrostSigningResendStateTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/state/FrostSigningResendStateTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state import kotlin.test.Test import kotlin.test.assertEquals @@ -7,14 +7,14 @@ import kotlin.test.assertNotNull import kotlin.test.assertNull import kotlin.test.assertTrue import kotlin.time.Clock -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.FrostSigningItem -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.Participant -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.intermdiate.LocalParticipant -import to.curare.compose.database.model.types.FrostSigningStage -import to.curare.compose.managers.FrostSigningManager +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.FrostSigningItem +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.Participant +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalParticipant +import com.machankura.bennu.compose.database.model.types.FrostSigningStage +import com.machankura.bennu.compose.managers.FrostSigningManager /** * When the signing screen offers to ask the members it is waiting on again. diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/state/ProposalAskAgainTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/state/ProposalAskAgainTest.kt similarity index 95% rename from composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/state/ProposalAskAgainTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/state/ProposalAskAgainTest.kt index 12fe35de..7284cc54 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/state/ProposalAskAgainTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/state/ProposalAskAgainTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state import kotlin.test.Test import kotlin.test.assertEquals @@ -7,9 +7,9 @@ import kotlin.test.assertNotNull import kotlin.test.assertNull import kotlin.test.assertTrue import kotlin.time.Clock -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.types.FrostSigningStage -import to.curare.compose.managers.FrostSigningManager +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.types.FrostSigningStage +import com.machankura.bennu.compose.managers.FrostSigningManager /** * When a row offers to ask the quiet members again, and when it only looks like @@ -136,8 +136,8 @@ class ProposalAskAgainTest { proposals: List, filter: ProposalFilter = ProposalFilter.ALL, ) = ProposalListUIState.Loaded( - localChatRoom = to.curare.compose.database.model.intermdiate.LocalChatRoom( - chatRoom = to.curare.compose.database.model.ChatRoom( + localChatRoom = com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom( + chatRoom = com.machankura.bennu.compose.database.model.ChatRoom( id = roomId, userPublicKey = me, subject = "#Ekklesia", diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/state/ProposalFilterTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/state/ProposalFilterTest.kt similarity index 96% rename from composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/state/ProposalFilterTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/state/ProposalFilterTest.kt index b890b06d..075108dd 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/state/ProposalFilterTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/state/ProposalFilterTest.kt @@ -1,13 +1,13 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue import kotlin.time.Clock -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.types.FrostSigningStage +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.types.FrostSigningStage /** * What a filter selects, and what the chips count. diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/state/ProposalProgressTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/state/ProposalProgressTest.kt similarity index 97% rename from composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/state/ProposalProgressTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/state/ProposalProgressTest.kt index 1bb889f2..de28bcfc 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/state/ProposalProgressTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/state/ProposalProgressTest.kt @@ -1,11 +1,11 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNull import kotlin.time.Clock -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.types.FrostSigningStage +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.types.FrostSigningStage /** * How far along a proposal says it is, and when it says nothing. diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/state/ProposalStateTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/state/ProposalStateTest.kt similarity index 95% rename from composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/state/ProposalStateTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/state/ProposalStateTest.kt index 287467bf..a0a899c8 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/state/ProposalStateTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/state/ProposalStateTest.kt @@ -1,16 +1,16 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse import kotlin.test.assertTrue import kotlin.time.Clock -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.FrostSigningItem -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.types.FrostSigningStage -import to.curare.compose.managers.FrostSigningManager +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.FrostSigningItem +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.types.FrostSigningStage +import com.machankura.bennu.compose.managers.FrostSigningManager /** * How a proposal is classified for the list, and what the classification is diff --git a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/state/StartupChoiceTest.kt b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/state/StartupChoiceTest.kt similarity index 95% rename from composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/state/StartupChoiceTest.kt rename to composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/state/StartupChoiceTest.kt index 0dc83d9d..9f492c0a 100644 --- a/composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/state/StartupChoiceTest.kt +++ b/composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/ui/view/state/StartupChoiceTest.kt @@ -1,7 +1,7 @@ -package to.curare.compose.ui.view.state +package com.machankura.bennu.compose.ui.view.state import fr.acinq.phoenix.data.WalletId -import to.curare.compose.identity.StoredIdentity +import com.machankura.bennu.compose.identity.StoredIdentity import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNull diff --git a/composeApp/src/iosMain/kotlin/to/curare/compose/AppVersion.ios.kt b/composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/AppVersion.ios.kt similarity index 91% rename from composeApp/src/iosMain/kotlin/to/curare/compose/AppVersion.ios.kt rename to composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/AppVersion.ios.kt index e71b2fb8..bfd66d78 100644 --- a/composeApp/src/iosMain/kotlin/to/curare/compose/AppVersion.ios.kt +++ b/composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/AppVersion.ios.kt @@ -1,4 +1,4 @@ -package to.curare.compose +package com.machankura.bennu.compose import platform.Foundation.NSBundle diff --git a/composeApp/src/iosMain/kotlin/to/curare/compose/MainViewController.kt b/composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/MainViewController.kt similarity index 84% rename from composeApp/src/iosMain/kotlin/to/curare/compose/MainViewController.kt rename to composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/MainViewController.kt index a214ccda..e6ab9f16 100644 --- a/composeApp/src/iosMain/kotlin/to/curare/compose/MainViewController.kt +++ b/composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/MainViewController.kt @@ -1,4 +1,4 @@ -package to.curare.compose +package com.machankura.bennu.compose import androidx.compose.ui.window.ComposeUIViewController import androidx.navigation.compose.rememberNavController @@ -7,9 +7,9 @@ import fr.acinq.phoenix.PhoenixGlobal fun MainViewController() = ComposeUIViewController { val navController = rememberNavController() - CurareApp( + BennuApp( navController = navController, - curareGlobal = CurareGlobal( + bennuGlobal = BennuGlobal( platformContext = PlatformContext() ), phoenixGlobal = PhoenixGlobal( diff --git a/composeApp/src/iosMain/kotlin/to/curare/compose/Platform.ios.kt b/composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/Platform.ios.kt similarity index 67% rename from composeApp/src/iosMain/kotlin/to/curare/compose/Platform.ios.kt rename to composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/Platform.ios.kt index eef25180..be045372 100644 --- a/composeApp/src/iosMain/kotlin/to/curare/compose/Platform.ios.kt +++ b/composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/Platform.ios.kt @@ -1,4 +1,4 @@ -package to.curare.compose +package com.machankura.bennu.compose import platform.UIKit.UIDevice diff --git a/composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/PlatformContext.ios.kt b/composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/PlatformContext.ios.kt new file mode 100644 index 00000000..9ea271aa --- /dev/null +++ b/composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/PlatformContext.ios.kt @@ -0,0 +1,3 @@ +package com.machankura.bennu.compose + +actual class PlatformContext \ No newline at end of file diff --git a/composeApp/src/iosMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.ios.kt b/composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/database/builder/PlatformDatabaseBuilder.ios.kt similarity index 76% rename from composeApp/src/iosMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.ios.kt rename to composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/database/builder/PlatformDatabaseBuilder.ios.kt index a270c0fa..05560980 100644 --- a/composeApp/src/iosMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.ios.kt +++ b/composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/database/builder/PlatformDatabaseBuilder.ios.kt @@ -1,18 +1,18 @@ -package to.curare.compose.database.builder +package com.machankura.bennu.compose.database.builder import androidx.room3.Room import androidx.room3.RoomDatabase -import to.curare.compose.PlatformContext -import to.curare.compose.database.CurareDatabase +import com.machankura.bennu.compose.PlatformContext +import com.machankura.bennu.compose.database.BennuDatabase import kotlinx.cinterop.ExperimentalForeignApi import platform.Foundation.NSDocumentDirectory import platform.Foundation.NSFileManager import platform.Foundation.NSUserDomainMask actual object PlatformDatabaseBuilder { - actual fun getDatabaseBuilder(platformContext: PlatformContext): RoomDatabase.Builder { + actual fun getDatabaseBuilder(platformContext: PlatformContext): RoomDatabase.Builder { val dbFilePath = documentDirectory() + "/aux.db" - return Room.databaseBuilder( + return Room.databaseBuilder( name = dbFilePath, ) } @@ -29,7 +29,7 @@ actual object PlatformDatabaseBuilder { return requireNotNull(documentDirectory?.path) } - actual fun getInMemoryDatabaseBuilder(platform: PlatformContext): RoomDatabase.Builder { + actual fun getInMemoryDatabaseBuilder(platform: PlatformContext): RoomDatabase.Builder { return Room.inMemoryDatabaseBuilder() } diff --git a/composeApp/src/iosMain/kotlin/to/curare/compose/extensions/Phoenix.ios.kt b/composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/extensions/Phoenix.ios.kt similarity index 95% rename from composeApp/src/iosMain/kotlin/to/curare/compose/extensions/Phoenix.ios.kt rename to composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/extensions/Phoenix.ios.kt index e0305b28..b6126ab8 100644 --- a/composeApp/src/iosMain/kotlin/to/curare/compose/extensions/Phoenix.ios.kt +++ b/composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/extensions/Phoenix.ios.kt @@ -1,4 +1,4 @@ -package to.curare.compose.extensions +package com.machankura.bennu.compose.extensions import co.touchlab.kermit.Logger import fr.acinq.bitcoin.Chain diff --git a/composeApp/src/iosMain/kotlin/to/curare/compose/network/PlatformHttpClientEngine.ios.kt b/composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/network/PlatformHttpClientEngine.ios.kt similarity index 80% rename from composeApp/src/iosMain/kotlin/to/curare/compose/network/PlatformHttpClientEngine.ios.kt rename to composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/network/PlatformHttpClientEngine.ios.kt index f5dabf37..329820c7 100644 --- a/composeApp/src/iosMain/kotlin/to/curare/compose/network/PlatformHttpClientEngine.ios.kt +++ b/composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/network/PlatformHttpClientEngine.ios.kt @@ -1,4 +1,4 @@ -package to.curare.compose.network +package com.machankura.bennu.compose.network import io.ktor.client.engine.HttpClientEngineFactory import io.ktor.client.engine.darwin.Darwin diff --git a/composeApp/src/iosMain/kotlin/to/curare/compose/ui/theme/Motion.ios.kt b/composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/ui/theme/Motion.ios.kt similarity index 97% rename from composeApp/src/iosMain/kotlin/to/curare/compose/ui/theme/Motion.ios.kt rename to composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/ui/theme/Motion.ios.kt index 83d96a98..9731626f 100644 --- a/composeApp/src/iosMain/kotlin/to/curare/compose/ui/theme/Motion.ios.kt +++ b/composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/ui/theme/Motion.ios.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.theme +package com.machankura.bennu.compose.ui.theme import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect diff --git a/composeApp/src/iosMain/kotlin/to/curare/compose/ui/theme/Theme.ios.kt b/composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/ui/theme/Theme.ios.kt similarity index 98% rename from composeApp/src/iosMain/kotlin/to/curare/compose/ui/theme/Theme.ios.kt rename to composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/ui/theme/Theme.ios.kt index e18615d7..c105d374 100644 --- a/composeApp/src/iosMain/kotlin/to/curare/compose/ui/theme/Theme.ios.kt +++ b/composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/ui/theme/Theme.ios.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.theme +package com.machankura.bennu.compose.ui.theme import androidx.compose.material3.ColorScheme import androidx.compose.runtime.Composable diff --git a/composeApp/src/iosMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.ios.kt b/composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/ui/view/model/NavigationViewModel.ios.kt similarity index 97% rename from composeApp/src/iosMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.ios.kt rename to composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/ui/view/model/NavigationViewModel.ios.kt index 86542528..8c462afb 100644 --- a/composeApp/src/iosMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.ios.kt +++ b/composeApp/src/iosMain/kotlin/com/machankura/bennu/compose/ui/view/model/NavigationViewModel.ios.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import fr.acinq.bitcoin.Chain import fr.acinq.phoenix.PhoenixGlobal diff --git a/composeApp/src/iosMain/kotlin/to/curare/compose/PlatformContext.ios.kt b/composeApp/src/iosMain/kotlin/to/curare/compose/PlatformContext.ios.kt deleted file mode 100644 index a78759ed..00000000 --- a/composeApp/src/iosMain/kotlin/to/curare/compose/PlatformContext.ios.kt +++ /dev/null @@ -1,3 +0,0 @@ -package to.curare.compose - -actual class PlatformContext \ No newline at end of file diff --git a/composeApp/src/jvmMain/kotlin/to/curare/compose/AppVersion.jvm.kt b/composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/AppVersion.jvm.kt similarity index 94% rename from composeApp/src/jvmMain/kotlin/to/curare/compose/AppVersion.jvm.kt rename to composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/AppVersion.jvm.kt index ed220d2d..a1915c9f 100644 --- a/composeApp/src/jvmMain/kotlin/to/curare/compose/AppVersion.jvm.kt +++ b/composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/AppVersion.jvm.kt @@ -1,4 +1,4 @@ -package to.curare.compose +package com.machankura.bennu.compose /** * Android reads these from `BuildConfig`, which the android plugin generates. There is no diff --git a/composeApp/src/jvmMain/kotlin/to/curare/compose/Platform.jvm.kt b/composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/Platform.jvm.kt similarity index 81% rename from composeApp/src/jvmMain/kotlin/to/curare/compose/Platform.jvm.kt rename to composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/Platform.jvm.kt index b10b0d11..92733f80 100644 --- a/composeApp/src/jvmMain/kotlin/to/curare/compose/Platform.jvm.kt +++ b/composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/Platform.jvm.kt @@ -1,4 +1,4 @@ -package to.curare.compose +package com.machankura.bennu.compose class JvmPlatform : Platform { override val name: String = "Java ${System.getProperty("java.version")}" diff --git a/composeApp/src/jvmMain/kotlin/to/curare/compose/PlatformContext.jvm.kt b/composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/PlatformContext.jvm.kt similarity index 89% rename from composeApp/src/jvmMain/kotlin/to/curare/compose/PlatformContext.jvm.kt rename to composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/PlatformContext.jvm.kt index 3f0fd9b4..af16edc1 100644 --- a/composeApp/src/jvmMain/kotlin/to/curare/compose/PlatformContext.jvm.kt +++ b/composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/PlatformContext.jvm.kt @@ -1,4 +1,4 @@ -package to.curare.compose +package com.machankura.bennu.compose import java.io.File import java.util.Locale @@ -13,7 +13,7 @@ import java.util.Locale * directory to both so one install keeps one place on disk. */ actual class PlatformContext( - val applicationDir: File = defaultCurareDir(), + val applicationDir: File = defaultBennuDir(), ) /** @@ -23,7 +23,7 @@ actual class PlatformContext( * behind a TODO: most systems clear it on reboot, and the chat history and marmot group * state live here. */ -internal fun defaultCurareDir(): File { +internal fun defaultBennuDir(): File { val home = File(System.getProperty("user.home")) val os = System.getProperty("os.name").orEmpty().lowercase(Locale.ROOT) return when { @@ -45,7 +45,7 @@ internal fun defaultCurareDir(): File { } /** - * The directory name kept the old brand through the rebrand to Curare, for the same + * The directory name kept the old brand through the rebrands to Curare and Bennu, for the same * reason the `mantra/` hash prefixes did: its spelling is load-bearing for state that * already exists. It names the one directory holding the Room database, the marmot * group state and the phoenix wallet, so renaming it does not move an install -- it @@ -54,6 +54,6 @@ internal fun defaultCurareDir(): File { * * Renaming it is a migration -- copy or move on first run, then flip this -- and not * part of a rebrand. Until that exists, the desktop app is `curated` on disk and - * `Curare` everywhere a user can read. + * `Bennu` everywhere a user can read. */ private const val APP_DIR_NAME = "curated" diff --git a/composeApp/src/jvmMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.jvm.kt b/composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/database/builder/PlatformDatabaseBuilder.jvm.kt similarity index 66% rename from composeApp/src/jvmMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.jvm.kt rename to composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/database/builder/PlatformDatabaseBuilder.jvm.kt index b3acbd99..deb8a26c 100644 --- a/composeApp/src/jvmMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.jvm.kt +++ b/composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/database/builder/PlatformDatabaseBuilder.jvm.kt @@ -1,21 +1,21 @@ -package to.curare.compose.database.builder +package com.machankura.bennu.compose.database.builder import androidx.room3.Room import androidx.room3.RoomDatabase -import to.curare.compose.PlatformContext -import to.curare.compose.database.CurareDatabase +import com.machankura.bennu.compose.PlatformContext +import com.machankura.bennu.compose.database.BennuDatabase import java.io.File actual object PlatformDatabaseBuilder { - actual fun getDatabaseBuilder(platformContext: PlatformContext): RoomDatabase.Builder { + actual fun getDatabaseBuilder(platformContext: PlatformContext): RoomDatabase.Builder { // Under the context's application directory, not java.io.tmpdir -- which is what the // abandoned Aux implementation did behind a TODO, and which most systems clear on // reboot. The file keeps android's name so one app does not have two on disk. val dbFile = File(platformContext.applicationDir.apply { mkdirs() }, "aux.db") - return Room.databaseBuilder(name = dbFile.absolutePath) + return Room.databaseBuilder(name = dbFile.absolutePath) } - actual fun getInMemoryDatabaseBuilder(platform: PlatformContext): RoomDatabase.Builder { + actual fun getInMemoryDatabaseBuilder(platform: PlatformContext): RoomDatabase.Builder { return Room.inMemoryDatabaseBuilder() } } diff --git a/composeApp/src/jvmMain/kotlin/to/curare/compose/extensions/JvmGlobalPrefs.kt b/composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/extensions/JvmGlobalPrefs.kt similarity index 96% rename from composeApp/src/jvmMain/kotlin/to/curare/compose/extensions/JvmGlobalPrefs.kt rename to composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/extensions/JvmGlobalPrefs.kt index e1316fc0..fd257bb7 100644 --- a/composeApp/src/jvmMain/kotlin/to/curare/compose/extensions/JvmGlobalPrefs.kt +++ b/composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/extensions/JvmGlobalPrefs.kt @@ -1,4 +1,4 @@ -package to.curare.compose.extensions +package com.machankura.bennu.compose.extensions import fr.acinq.bitcoin.Chain import fr.acinq.phoenix.PhoenixGlobal diff --git a/composeApp/src/jvmMain/kotlin/to/curare/compose/extensions/Phoenix.jvm.kt b/composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/extensions/Phoenix.jvm.kt similarity index 97% rename from composeApp/src/jvmMain/kotlin/to/curare/compose/extensions/Phoenix.jvm.kt rename to composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/extensions/Phoenix.jvm.kt index 2efdac02..4cc16f49 100644 --- a/composeApp/src/jvmMain/kotlin/to/curare/compose/extensions/Phoenix.jvm.kt +++ b/composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/extensions/Phoenix.jvm.kt @@ -1,4 +1,4 @@ -package to.curare.compose.extensions +package com.machankura.bennu.compose.extensions import co.touchlab.kermit.Logger import fr.acinq.phoenix.PhoenixGlobal diff --git a/composeApp/src/jvmMain/kotlin/to/curare/compose/network/PlatformHttpClientEngine.jvm.kt b/composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/network/PlatformHttpClientEngine.jvm.kt similarity index 80% rename from composeApp/src/jvmMain/kotlin/to/curare/compose/network/PlatformHttpClientEngine.jvm.kt rename to composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/network/PlatformHttpClientEngine.jvm.kt index 0fb439a3..8ce27bc4 100644 --- a/composeApp/src/jvmMain/kotlin/to/curare/compose/network/PlatformHttpClientEngine.jvm.kt +++ b/composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/network/PlatformHttpClientEngine.jvm.kt @@ -1,4 +1,4 @@ -package to.curare.compose.network +package com.machankura.bennu.compose.network import io.ktor.client.engine.HttpClientEngineFactory import io.ktor.client.engine.cio.CIO diff --git a/composeApp/src/jvmMain/kotlin/to/curare/compose/ui/theme/Motion.jvm.kt b/composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/ui/theme/Motion.jvm.kt similarity index 95% rename from composeApp/src/jvmMain/kotlin/to/curare/compose/ui/theme/Motion.jvm.kt rename to composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/ui/theme/Motion.jvm.kt index fd85a640..ee2dfbfd 100644 --- a/composeApp/src/jvmMain/kotlin/to/curare/compose/ui/theme/Motion.jvm.kt +++ b/composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/ui/theme/Motion.jvm.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.theme +package com.machankura.bennu.compose.ui.theme import androidx.compose.runtime.Composable diff --git a/composeApp/src/jvmMain/kotlin/to/curare/compose/ui/theme/Theme.jvm.kt b/composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/ui/theme/Theme.jvm.kt similarity index 98% rename from composeApp/src/jvmMain/kotlin/to/curare/compose/ui/theme/Theme.jvm.kt rename to composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/ui/theme/Theme.jvm.kt index 21540e9e..0ccee4de 100644 --- a/composeApp/src/jvmMain/kotlin/to/curare/compose/ui/theme/Theme.jvm.kt +++ b/composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/ui/theme/Theme.jvm.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.theme +package com.machankura.bennu.compose.ui.theme import androidx.compose.material3.ColorScheme import androidx.compose.runtime.Composable diff --git a/composeApp/src/jvmMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.jvm.kt b/composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/ui/view/model/NavigationViewModel.jvm.kt similarity index 94% rename from composeApp/src/jvmMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.jvm.kt rename to composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/ui/view/model/NavigationViewModel.jvm.kt index 9f5b41ef..036bf52d 100644 --- a/composeApp/src/jvmMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.jvm.kt +++ b/composeApp/src/jvmMain/kotlin/com/machankura/bennu/compose/ui/view/model/NavigationViewModel.jvm.kt @@ -6,7 +6,7 @@ // it means an intermediate source set between iosMain and jvmMain, which is a change to how // the module is wired rather than to what it does. -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import fr.acinq.phoenix.PhoenixGlobal import fr.acinq.phoenix.data.DecryptSeedResult @@ -15,7 +15,7 @@ import fr.acinq.phoenix.jvm.BusinessManager import fr.acinq.phoenix.managers.SeedManager import fr.acinq.phoenix.utils.preferences.UserWalletMetadata import kotlinx.coroutines.flow.Flow -import to.curare.compose.extensions.JvmGlobalPrefs +import com.machankura.bennu.compose.extensions.JvmGlobalPrefs actual fun updateBusinessActiveInUI(walletId: WalletId) { diff --git a/composeApp/src/jvmMain/kotlin/to/curare/desktop/Main.kt b/composeApp/src/jvmMain/kotlin/com/machankura/bennu/desktop/Main.kt similarity index 88% rename from composeApp/src/jvmMain/kotlin/to/curare/desktop/Main.kt rename to composeApp/src/jvmMain/kotlin/com/machankura/bennu/desktop/Main.kt index cc2c13ad..bf1ffcc8 100644 --- a/composeApp/src/jvmMain/kotlin/to/curare/desktop/Main.kt +++ b/composeApp/src/jvmMain/kotlin/com/machankura/bennu/desktop/Main.kt @@ -1,4 +1,4 @@ -package to.curare.desktop +package com.machankura.bennu.desktop import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -36,11 +36,11 @@ import fr.acinq.phoenix.security.JvmKeyStore import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import to.curare.compose.CurareApp -import to.curare.compose.CurareGlobal -import to.curare.compose.PlatformContext -import to.curare.compose.defaultCurareDir -import to.curare.compose.ui.theme.CurareTheme +import com.machankura.bennu.compose.BennuApp +import com.machankura.bennu.compose.BennuGlobal +import com.machankura.bennu.compose.PlatformContext +import com.machankura.bennu.compose.defaultBennuDir +import com.machankura.bennu.compose.ui.theme.BennuTheme import java.awt.Dimension import java.io.File @@ -52,15 +52,15 @@ import java.io.File * * - the wallet seed is protected by a passphrase, so nothing can start until one has been * entered (see [PassphraseGate]); - * - one directory is handed to both the curare and the phoenix context, so a single install + * - one directory is handed to both the bennu and the phoenix context, so a single install * keeps a single place on disk rather than two named after different projects. */ fun main() = application { - val appDir = remember { defaultCurareDir().apply { mkdirs() } } + val appDir = remember { defaultBennuDir().apply { mkdirs() } } Window( onCloseRequest = ::exitApplication, - title = "Curare", + title = "Bennu", // 1100dp is the expanded breakpoint -- 840 to 1199 -- which is the narrowest window // M3 recommends two panes in, and so the smallest opening size at which a desktop // user sees a desktop layout rather than a phone one stretched. It used to open at @@ -80,21 +80,21 @@ fun main() = application { // 400x600 is the narrowest window the phase's acceptance widths name. LaunchedEffect(window) { window.minimumSize = Dimension(400, 600) } - // CurareTheme wraps both branches, not just the app. PassphraseGate used to sit - // beside CurareApp -- which applies the theme itself -- so it composed under the + // BennuTheme wraps both branches, not just the app. PassphraseGate used to sit + // beside BennuApp -- 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. // - // CurareApp still applies CurareTheme, so the unlocked branch is wrapped twice. - // That is deliberate: android and ios enter through CurareApp and would lose the + // BennuApp still applies BennuTheme, so the unlocked branch is wrapped twice. + // That is deliberate: android and ios enter through BennuApp and would lose the // theme entirely if it moved out, and a second application of the same values // costs one composition of a CompositionLocalProvider. - CurareTheme { + BennuTheme { if (unlocked) { val navController = rememberNavController() - CurareApp( + BennuApp( navController = navController, - curareGlobal = CurareGlobal(platformContext = PlatformContext(appDir)), + bennuGlobal = BennuGlobal(platformContext = PlatformContext(appDir)), phoenixGlobal = PhoenixGlobal( ctx = fr.acinq.phoenix.utils.PlatformContext(applicationDir = appDir), ), @@ -165,7 +165,7 @@ private fun PassphraseGate(appDir: File, onUnlocked: () -> Unit) { verticalArrangement = Arrangement.spacedBy(16.dp, Alignment.CenterVertically), horizontalAlignment = Alignment.CenterHorizontally, ) { - Text("Unlock Curare", style = MaterialTheme.typography.headlineSmall) + Text("Unlock Bennu", style = MaterialTheme.typography.headlineSmall) Text( "This desktop build protects your seed with a passphrase rather than a " + "hardware-backed keystore. Do not use it for real funds.", diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/CurareDatabaseJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/BennuDatabaseJvmTest.kt similarity index 90% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/CurareDatabaseJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/BennuDatabaseJvmTest.kt index 2565a3cd..d981a3d6 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/CurareDatabaseJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/BennuDatabaseJvmTest.kt @@ -1,16 +1,16 @@ -package to.curare.compose.database +package com.machankura.bennu.compose.database import androidx.room3.Room import androidx.sqlite.driver.bundled.BundledSQLiteDriver import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.runBlocking -import to.curare.compose.PlatformContext -import to.curare.compose.database.builder.PlatformDatabaseBuilder -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile +import com.machankura.bennu.compose.PlatformContext +import com.machankura.bennu.compose.database.builder.PlatformDatabaseBuilder +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile import java.nio.file.Files import kotlin.test.AfterTest import kotlin.test.Test @@ -30,13 +30,13 @@ import kotlin.test.assertTrue * * Room's own guidance recommends exactly this shape -- an in-memory database on the host * rather than an instrumented test on a device -- and the no-`Context` builder overload it - * uses is available here because `CurareDatabaseConstructor` gives Room a way to instantiate + * uses is available here because `BennuDatabaseConstructor` gives Room a way to instantiate * without reflection. */ -class CurareDatabaseJvmTest { +class BennuDatabaseJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest @@ -143,7 +143,7 @@ class CurareDatabaseJvmTest { */ @Test fun `the on-disk builder writes where the context says`() = runBlocking { - val dir = Files.createTempDirectory("curare-db-test").toFile() + val dir = Files.createTempDirectory("bennu-db-test").toFile() try { val onDisk = getRoomDatabase( PlatformDatabaseBuilder.getDatabaseBuilder(PlatformContext(dir)) diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/BroadcastNostrEventRequestDaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/BroadcastNostrEventRequestDaoJvmTest.kt similarity index 94% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/BroadcastNostrEventRequestDaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/BroadcastNostrEventRequestDaoJvmTest.kt index 757a4146..340e2c8f 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/BroadcastNostrEventRequestDaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/BroadcastNostrEventRequestDaoJvmTest.kt @@ -1,12 +1,12 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Room import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.BroadcastNostrEventRequest -import to.curare.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.BroadcastNostrEventRequest +import com.machankura.bennu.compose.database.model.NostrEvent import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -26,8 +26,8 @@ import kotlin.time.Instant */ class BroadcastNostrEventRequestDaoJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/ChatMessageDaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/ChatMessageDaoJvmTest.kt similarity index 94% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/ChatMessageDaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/ChatMessageDaoJvmTest.kt index 393dff84..7d315a97 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/ChatMessageDaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/ChatMessageDaoJvmTest.kt @@ -1,15 +1,15 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Room import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.MarmotGroupEvent -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.MarmotGroupEvent +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -31,8 +31,8 @@ import kotlin.time.Instant */ class ChatMessageDaoJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/ChatRoomDaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/ChatRoomDaoJvmTest.kt similarity index 90% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/ChatRoomDaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/ChatRoomDaoJvmTest.kt index db37d8c9..9eee10b2 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/ChatRoomDaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/ChatRoomDaoJvmTest.kt @@ -1,13 +1,13 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Room import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -22,13 +22,13 @@ import kotlin.time.Instant * * The parts that can only be checked against a real SQLite are here -- which row the * correlated subquery picks, and how the ordering treats a room nothing has been said - * in. What the picked row is then rendered as is [to.curare.compose.database.model.intermdiate.LocalChatRoom]'s + * in. What the picked row is then rendered as is [com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom]'s * own business and is tested against it directly. */ class ChatRoomDaoJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/DkgSessionDaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/DkgSessionDaoJvmTest.kt similarity index 93% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/DkgSessionDaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/DkgSessionDaoJvmTest.kt index 073ae184..59b386d7 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/DkgSessionDaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/DkgSessionDaoJvmTest.kt @@ -1,17 +1,17 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Room import com.vitorpamplona.quartz.nip01Core.core.toHexKey import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.DkgParticipantMessage -import to.curare.compose.database.model.DkgSession -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.types.DkgRitualStage +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.DkgParticipantMessage +import com.machankura.bennu.compose.database.model.DkgSession +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.types.DkgRitualStage import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -35,8 +35,8 @@ import kotlin.time.Instant */ class DkgSessionDaoJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/FrostSigningSessionDaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/FrostSigningSessionDaoJvmTest.kt similarity index 95% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/FrostSigningSessionDaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/FrostSigningSessionDaoJvmTest.kt index 5433b087..6c436483 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/FrostSigningSessionDaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/FrostSigningSessionDaoJvmTest.kt @@ -1,21 +1,21 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Room import com.vitorpamplona.quartz.nip01Core.core.toHexKey import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.DkgParticipantMessage -import to.curare.compose.database.model.DkgSession -import to.curare.compose.database.model.FrostSignerMessage -import to.curare.compose.database.model.FrostSigningItem -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.types.FrostSigningStage +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.DkgParticipantMessage +import com.machankura.bennu.compose.database.model.DkgSession +import com.machankura.bennu.compose.database.model.FrostSignerMessage +import com.machankura.bennu.compose.database.model.FrostSigningItem +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.types.FrostSigningStage import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -37,8 +37,8 @@ import kotlin.time.Instant */ class FrostSigningSessionDaoJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/GroupSignedEventDaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/GroupSignedEventDaoJvmTest.kt similarity index 93% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/GroupSignedEventDaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/GroupSignedEventDaoJvmTest.kt index fa8ed154..d29712a3 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/GroupSignedEventDaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/GroupSignedEventDaoJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Room import com.vitorpamplona.quartz.nip01Core.core.Event @@ -23,17 +23,17 @@ import kotlin.test.assertNull import kotlin.test.assertTrue import kotlin.time.Instant import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.extensions.toHex -import to.curare.compose.managers.SharedKeyDerivation -import to.curare.compose.nostr.nip30303.ArtifactEvent -import to.curare.compose.nostr.nip30303.DialectEvent +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.managers.SharedKeyDerivation +import com.machankura.bennu.compose.nostr.nip30303.ArtifactEvent +import com.machankura.bennu.compose.nostr.nip30303.DialectEvent /** * The table that keeps what a quorum signed, checked against a real quorum. @@ -46,7 +46,7 @@ import to.curare.compose.nostr.nip30303.DialectEvent * failing to round-trip. */ class GroupSignedEventDaoJvmTest { - private val db: CurareDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) + private val db: BennuDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) @AfterTest fun closeDb() = db.close() diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MantraDaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/MantraDaoJvmTest.kt similarity index 90% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MantraDaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/MantraDaoJvmTest.kt index 56e6258f..2ce2705e 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MantraDaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/MantraDaoJvmTest.kt @@ -1,17 +1,17 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Room import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.MantraArtifact -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.nip30303.DialectEvent -import to.curare.compose.nostr.nip30303.SubmissionEvent -import to.curare.compose.repository.MantraRepository +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.MantraArtifact +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.nip30303.DialectEvent +import com.machankura.bennu.compose.nostr.nip30303.SubmissionEvent +import com.machankura.bennu.compose.repository.MantraRepository import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -32,8 +32,8 @@ import kotlin.test.assertTrue */ class MantraDaoJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotKeyPackageFixture.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/MarmotKeyPackageFixture.kt similarity index 96% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotKeyPackageFixture.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/MarmotKeyPackageFixture.kt index f492821a..970f582c 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotKeyPackageFixture.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/MarmotKeyPackageFixture.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageRotationManager.Companion.KEY_PACKAGE_LIFETIME_SECONDS import com.vitorpamplona.quartz.marmot.mls.crypto.Ed25519 @@ -14,7 +14,7 @@ import com.vitorpamplona.quartz.marmot.mls.tree.Lifetime import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray import com.vitorpamplona.quartz.utils.TimeUtils -import to.curare.compose.database.model.MarmotKeyPackage +import com.machankura.bennu.compose.database.model.MarmotKeyPackage import com.vitorpamplona.quartz.marmot.appComponents.CurrentProfileGroupFactory import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageEvent import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageUtils @@ -24,8 +24,8 @@ import com.vitorpamplona.quartz.nip01Core.core.toHexKey import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.nostr.Relays +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.nostr.Relays import kotlin.io.encoding.Base64 import kotlin.time.Instant diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotKeyPackageIngestJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/MarmotKeyPackageIngestJvmTest.kt similarity index 91% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotKeyPackageIngestJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/MarmotKeyPackageIngestJvmTest.kt index 8bf96c78..8b68b841 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotKeyPackageIngestJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/MarmotKeyPackageIngestJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Room import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageUtils @@ -10,14 +10,14 @@ import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray import com.vitorpamplona.quartz.nip01Core.core.toHexKey import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.extensions.toHex -import to.curare.compose.nostr.Relays +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.nostr.Relays import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -38,8 +38,8 @@ import kotlin.io.encoding.Base64 */ class MarmotKeyPackageIngestJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotOutboundDaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/MarmotOutboundDaoJvmTest.kt similarity index 94% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotOutboundDaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/MarmotOutboundDaoJvmTest.kt index 81276a87..c4fe4485 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotOutboundDaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/MarmotOutboundDaoJvmTest.kt @@ -1,23 +1,23 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Room import com.vitorpamplona.quartz.nip01Core.core.toHexKey import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.MarmotKeyPackage -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.extensions.toHex -import to.curare.compose.nostr.Relays +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.MarmotKeyPackage +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.nostr.Relays import com.vitorpamplona.quartz.marmot.mip01Groups.MarmotGroupData import com.vitorpamplona.quartz.marmot.mls.group.MlsGroup import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray -import to.curare.compose.exceptions.MarmotMissingChatGroupException +import com.machankura.bennu.compose.exceptions.MarmotMissingChatGroupException import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -43,8 +43,8 @@ import kotlin.test.assertTrue */ class MarmotOutboundDaoJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotOutboundQueueJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/MarmotOutboundQueueJvmTest.kt similarity index 93% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotOutboundQueueJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/MarmotOutboundQueueJvmTest.kt index 5f3b8295..4189d4ed 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotOutboundQueueJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/MarmotOutboundQueueJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Room import com.vitorpamplona.quartz.marmot.mip01Groups.MarmotGroupData @@ -12,16 +12,16 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.MarmotInnerEvent -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.repository.DatabaseMarmotRepository -import to.curare.compose.exceptions.MarmotMissingChatGroupException -import to.curare.compose.extensions.toHex -import to.curare.compose.nostr.Relays +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.MarmotInnerEvent +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.repository.DatabaseMarmotRepository +import com.machankura.bennu.compose.exceptions.MarmotMissingChatGroupException +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.nostr.Relays import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -47,8 +47,8 @@ import kotlin.time.Instant */ class MarmotOutboundQueueJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotPreJoinIndexingJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/MarmotPreJoinIndexingJvmTest.kt similarity index 91% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotPreJoinIndexingJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/MarmotPreJoinIndexingJvmTest.kt index ff5fc663..19b19204 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotPreJoinIndexingJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/MarmotPreJoinIndexingJvmTest.kt @@ -1,15 +1,15 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Room import com.vitorpamplona.quartz.nip01Core.core.toHexKey import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -37,8 +37,8 @@ import kotlin.time.Instant */ class MarmotPreJoinIndexingJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotRetainedEpochSecretDaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/MarmotRetainedEpochSecretDaoJvmTest.kt similarity index 92% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotRetainedEpochSecretDaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/MarmotRetainedEpochSecretDaoJvmTest.kt index 0ba5c056..e82ee04d 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotRetainedEpochSecretDaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/MarmotRetainedEpochSecretDaoJvmTest.kt @@ -1,13 +1,13 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Room import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.MarmotRetainedEpochSecret -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.MarmotRetainedEpochSecret +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertContentEquals @@ -25,8 +25,8 @@ import kotlin.test.assertTrue */ class MarmotRetainedEpochSecretDaoJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/NostrDaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/NostrDaoJvmTest.kt similarity index 94% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/NostrDaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/NostrDaoJvmTest.kt index 9958103c..5edbba88 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/NostrDaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/NostrDaoJvmTest.kt @@ -1,16 +1,16 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Room import com.vitorpamplona.quartz.nip01Core.core.toHexKey import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.BroadcastNostrEventRequest -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.UnsignedNostrEvent +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.BroadcastNostrEventRequest +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.UnsignedNostrEvent import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -32,8 +32,8 @@ import kotlin.time.Instant */ class NostrDaoJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest @@ -296,7 +296,7 @@ class NostrDaoJvmTest { event(marmotGroupEventId, Instant.fromEpochSeconds(1_000), kind = 445) ) db.marmotGroupEventDao().upsert( - to.curare.compose.database.model.MarmotGroupEvent( + com.machankura.bennu.compose.database.model.MarmotGroupEvent( id = marmotGroupEventId, userPublicKey = author, publicKey = author, @@ -307,7 +307,7 @@ class NostrDaoJvmTest { ) ) db.chatMessageDao().upsert( - to.curare.compose.database.model.ChatMessage( + com.machankura.bennu.compose.database.model.ChatMessage( content = "a sent message", chatRoomId = roomId, senderPublicKey = author, diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/NostrEventDaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/NostrEventDaoJvmTest.kt similarity index 96% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/NostrEventDaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/NostrEventDaoJvmTest.kt index 1e755ef2..574f3ec2 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/NostrEventDaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/NostrEventDaoJvmTest.kt @@ -1,11 +1,11 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Room import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.MarmotGroupEvent -import to.curare.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.MarmotGroupEvent +import com.machankura.bennu.compose.database.model.NostrEvent import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -25,8 +25,8 @@ import kotlin.time.Instant */ class NostrEventDaoJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/NostrNip17DaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/NostrNip17DaoJvmTest.kt similarity index 95% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/NostrNip17DaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/NostrNip17DaoJvmTest.kt index 079c3a61..524e7ff8 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/NostrNip17DaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/NostrNip17DaoJvmTest.kt @@ -1,14 +1,14 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Room import com.vitorpamplona.quartz.nip01Core.core.toHexKey import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -32,8 +32,8 @@ import kotlin.test.assertTrue */ class NostrNip17DaoJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/OwnedRequestQueueJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/OwnedRequestQueueJvmTest.kt similarity index 88% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/OwnedRequestQueueJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/OwnedRequestQueueJvmTest.kt index fab47987..38784f87 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/OwnedRequestQueueJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/OwnedRequestQueueJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.datastore.preferences.core.PreferenceDataStoreFactory import androidx.room3.Room @@ -15,15 +15,15 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking import okio.Path.Companion.toPath -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.NegentropySynchronizeRequest -import to.curare.compose.database.model.SynchronizeNostrEventRequest -import to.curare.compose.database.model.types.SynchronizationFilter -import to.curare.compose.database.repository.DatabaseNostrRepository -import to.curare.compose.identity.Identity -import to.curare.compose.identity.IdentityKind -import to.curare.compose.identity.toWalletId +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest +import com.machankura.bennu.compose.database.model.SynchronizeNostrEventRequest +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.database.repository.DatabaseNostrRepository +import com.machankura.bennu.compose.identity.Identity +import com.machankura.bennu.compose.identity.IdentityKind +import com.machankura.bennu.compose.identity.toWalletId import java.nio.file.Files import kotlin.test.AfterTest import kotlin.test.Test @@ -42,7 +42,7 @@ import kotlin.time.Instant */ class OwnedRequestQueueJvmTest { - private val db: CurareDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) + private val db: BennuDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) private val scope = CoroutineScope(Job() + Dispatchers.IO) private val keyA = PrivateKey(ByteVector32("0a".repeat(32))) diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/ReadOnlyGiftWrapDaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/ReadOnlyGiftWrapDaoJvmTest.kt similarity index 95% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/ReadOnlyGiftWrapDaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/ReadOnlyGiftWrapDaoJvmTest.kt index c983804f..cf6af4e8 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/ReadOnlyGiftWrapDaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/ReadOnlyGiftWrapDaoJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Room import com.vitorpamplona.quartz.nip01Core.core.toHexKey @@ -7,9 +7,9 @@ import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync import com.vitorpamplona.quartz.nip59Giftwrap.seals.SealedRumorEvent import com.vitorpamplona.quartz.nip59Giftwrap.wraps.GiftWrapEvent import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.NostrEvent import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -32,8 +32,8 @@ import kotlin.time.Instant */ class ReadOnlyGiftWrapDaoJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/SubgroupDaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/SubgroupDaoJvmTest.kt similarity index 94% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/SubgroupDaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/SubgroupDaoJvmTest.kt index f9fcaa6b..199acff6 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/SubgroupDaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/SubgroupDaoJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Room import com.vitorpamplona.quartz.nip01Core.core.toHexKey @@ -11,14 +11,14 @@ import kotlin.test.assertEquals import kotlin.test.assertNull import kotlin.test.assertTrue import kotlin.time.Instant -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.DkgSession -import to.curare.compose.database.model.GroupKeyState -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.types.DkgRitualStage +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.DkgSession +import com.machankura.bennu.compose.database.model.GroupKeyState +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.types.DkgRitualStage /** * What schema 17 has to survive, and the one thing it must refuse to do. @@ -44,8 +44,8 @@ import to.curare.compose.database.model.types.DkgRitualStage */ class SubgroupDaoJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/SynchronizeNostrEventRequestCompletionJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/SynchronizeNostrEventRequestCompletionJvmTest.kt similarity index 81% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/SynchronizeNostrEventRequestCompletionJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/SynchronizeNostrEventRequestCompletionJvmTest.kt index 63561b49..246e22f8 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/SynchronizeNostrEventRequestCompletionJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/SynchronizeNostrEventRequestCompletionJvmTest.kt @@ -1,14 +1,14 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Room import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.SynchronizeNostrEventRequest -import to.curare.compose.database.model.UnsignedNostrEvent -import to.curare.compose.database.model.types.SynchronizationFilter -import to.curare.compose.nostr.SignInSync +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.SynchronizeNostrEventRequest +import com.machankura.bennu.compose.database.model.UnsignedNostrEvent +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.nostr.SignInSync import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -22,8 +22,8 @@ import kotlin.time.Instant */ class SynchronizeNostrEventRequestCompletionJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/UnsignedNostrEventQueueJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/UnsignedNostrEventQueueJvmTest.kt similarity index 95% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/UnsignedNostrEventQueueJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/UnsignedNostrEventQueueJvmTest.kt index d5538948..ed24d675 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/UnsignedNostrEventQueueJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/UnsignedNostrEventQueueJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.dao +package com.machankura.bennu.compose.database.dao import androidx.room3.Room import com.vitorpamplona.quartz.nip01Core.core.Event @@ -8,10 +8,10 @@ import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.UnsignedNostrEvent +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.UnsignedNostrEvent import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -45,8 +45,8 @@ import kotlin.time.Instant */ class UnsignedNostrEventQueueJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/migrations/ChronicleRenameMigrationJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/migrations/ChronicleRenameMigrationJvmTest.kt similarity index 98% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/migrations/ChronicleRenameMigrationJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/migrations/ChronicleRenameMigrationJvmTest.kt index 37eec2c0..35d486e7 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/migrations/ChronicleRenameMigrationJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/migrations/ChronicleRenameMigrationJvmTest.kt @@ -1,10 +1,10 @@ -package to.curare.compose.database.migrations +package com.machankura.bennu.compose.database.migrations import androidx.sqlite.SQLiteConnection import androidx.sqlite.driver.bundled.BundledSQLiteDriver import androidx.sqlite.execSQL import kotlinx.coroutines.runBlocking -import to.curare.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.ChatMessage import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/migrations/FrostSigningItemMigrationJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/migrations/FrostSigningItemMigrationJvmTest.kt similarity index 99% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/migrations/FrostSigningItemMigrationJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/migrations/FrostSigningItemMigrationJvmTest.kt index 29b51288..fd3fc6f1 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/migrations/FrostSigningItemMigrationJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/migrations/FrostSigningItemMigrationJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.migrations +package com.machankura.bennu.compose.database.migrations import androidx.sqlite.SQLiteConnection import androidx.sqlite.driver.bundled.BundledSQLiteDriver diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/migrations/JoinedGroupAtMigrationJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/migrations/JoinedGroupAtMigrationJvmTest.kt similarity index 98% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/migrations/JoinedGroupAtMigrationJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/migrations/JoinedGroupAtMigrationJvmTest.kt index 3491f0ad..f12afd0d 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/migrations/JoinedGroupAtMigrationJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/migrations/JoinedGroupAtMigrationJvmTest.kt @@ -1,10 +1,10 @@ -package to.curare.compose.database.migrations +package com.machankura.bennu.compose.database.migrations import androidx.sqlite.SQLiteConnection import androidx.sqlite.driver.bundled.BundledSQLiteDriver import androidx.sqlite.execSQL import kotlinx.coroutines.runBlocking -import to.curare.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.ChatMessage import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/model/MarmotSystemRowJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/model/MarmotSystemRowJvmTest.kt similarity index 87% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/model/MarmotSystemRowJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/model/MarmotSystemRowJvmTest.kt index e1049ac9..653e8807 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/model/MarmotSystemRowJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/model/MarmotSystemRowJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Room import com.vitorpamplona.quartz.marmot.foundation.appEvents.MarmotAppEvent @@ -6,8 +6,8 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -23,7 +23,7 @@ import kotlin.time.Instant */ class MarmotSystemRowJvmTest { - private val db: CurareDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) + private val db: BennuDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) @AfterTest fun closeDb() = db.close() diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/model/TranslationChunkApplyJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/model/TranslationChunkApplyJvmTest.kt similarity index 96% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/model/TranslationChunkApplyJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/model/TranslationChunkApplyJvmTest.kt index 0920e6c7..ba4d1ef4 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/model/TranslationChunkApplyJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/model/TranslationChunkApplyJvmTest.kt @@ -1,12 +1,12 @@ -package to.curare.compose.database.model +package com.machankura.bennu.compose.database.model import androidx.room3.Room import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.nostr.nip30303.TranslationChunkEvent +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.nostr.nip30303.TranslationChunkEvent import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -30,8 +30,8 @@ import kotlin.time.Instant */ class TranslationChunkApplyJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/query/NostrEventFilterQueryExecutionTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/query/NostrEventFilterQueryExecutionTest.kt similarity index 95% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/query/NostrEventFilterQueryExecutionTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/query/NostrEventFilterQueryExecutionTest.kt index 07d23eb8..d53ed367 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/query/NostrEventFilterQueryExecutionTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/query/NostrEventFilterQueryExecutionTest.kt @@ -1,11 +1,11 @@ -package to.curare.compose.database.query +package com.machankura.bennu.compose.database.query import androidx.room3.Room import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -22,7 +22,7 @@ import kotlin.time.Instant * * That last one is worth spelling out, because it spans two files that nothing forces to * agree. [NostrEventFilterQuery] binds `since`/`until` as `epochSeconds`; - * `CurareConverters.instantToTimestamp` writes the `createdAt` column as `epochSeconds`. Change + * `BennuConverters.instantToTimestamp` writes the `createdAt` column as `epochSeconds`. Change * either one to milliseconds and the filter silently selects nothing, or everything. * * The stakes are the same as for the builder test: negentropy reconciles our set against the @@ -31,8 +31,8 @@ import kotlin.time.Instant */ class NostrEventFilterQueryExecutionTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/repository/CurrentProfileKeyPackageJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/repository/CurrentProfileKeyPackageJvmTest.kt similarity index 95% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/repository/CurrentProfileKeyPackageJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/repository/CurrentProfileKeyPackageJvmTest.kt index 17471921..8014600b 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/repository/CurrentProfileKeyPackageJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/repository/CurrentProfileKeyPackageJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.repository +package com.machankura.bennu.compose.database.repository import androidx.room3.Room import com.vitorpamplona.quartz.marmot.appComponents.AppComponentIds @@ -25,12 +25,12 @@ import com.vitorpamplona.quartz.utils.RandomInstance import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.nostr.MarmotProfile -import to.curare.compose.nostr.Relays +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.nostr.Relays import kotlin.io.encoding.Base64 import kotlin.test.AfterTest import kotlin.test.Test @@ -53,8 +53,8 @@ import kotlin.time.Instant */ class CurrentProfileKeyPackageJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) private val scope = CoroutineScope(Dispatchers.Default) private val marmotRepository = DatabaseMarmotRepository(db, scope) diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/repository/DatabaseChatRepositoryJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/repository/DatabaseChatRepositoryJvmTest.kt similarity index 84% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/repository/DatabaseChatRepositoryJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/repository/DatabaseChatRepositoryJvmTest.kt index b334c561..43b9eaa4 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/repository/DatabaseChatRepositoryJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/repository/DatabaseChatRepositoryJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.repository +package com.machankura.bennu.compose.database.repository import androidx.room3.Room import com.vitorpamplona.quartz.nip01Core.core.toHexKey @@ -6,15 +6,15 @@ import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.MarmotKeyPackage -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.exceptions.MarmotMissingChatGroupException +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.MarmotKeyPackage +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.exceptions.MarmotMissingChatGroupException import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertFailsWith @@ -33,8 +33,8 @@ import kotlin.test.assertTrue */ class DatabaseChatRepositoryJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/repository/FindDirectMessageRoomJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/repository/FindDirectMessageRoomJvmTest.kt similarity index 87% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/repository/FindDirectMessageRoomJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/repository/FindDirectMessageRoomJvmTest.kt index ff331014..ccdb24b3 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/repository/FindDirectMessageRoomJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/repository/FindDirectMessageRoomJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.repository +package com.machankura.bennu.compose.database.repository import androidx.room3.Room import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -6,12 +6,12 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.cancel import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Participant -import to.curare.compose.database.model.Profile +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Participant +import com.machankura.bennu.compose.database.model.Profile import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -26,8 +26,8 @@ import kotlin.test.assertNull */ class FindDirectMessageRoomJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) private val scope = CoroutineScope(Job()) private val repository = DatabaseChatRepository(db, scope) diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/repository/ForgetLocalAccountJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/repository/ForgetLocalAccountJvmTest.kt similarity index 84% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/repository/ForgetLocalAccountJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/repository/ForgetLocalAccountJvmTest.kt index 588f4742..cf66921b 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/repository/ForgetLocalAccountJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/repository/ForgetLocalAccountJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.repository +package com.machankura.bennu.compose.database.repository import androidx.room3.Room import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer @@ -7,9 +7,9 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.cancel import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.nostr.SignInSync +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.nostr.SignInSync import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -21,8 +21,8 @@ import kotlin.test.assertNotNull */ class ForgetLocalAccountJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) private val scope = CoroutineScope(Job()) private val repository = DatabaseNostrRepository(db, scope) diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/repository/SetUpProfileForExistingKeyJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/repository/SetUpProfileForExistingKeyJvmTest.kt similarity index 87% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/repository/SetUpProfileForExistingKeyJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/repository/SetUpProfileForExistingKeyJvmTest.kt index 9f3b4243..d7b1155d 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/repository/SetUpProfileForExistingKeyJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/repository/SetUpProfileForExistingKeyJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.database.repository +package com.machankura.bennu.compose.database.repository import androidx.room3.Room import kotlinx.coroutines.CoroutineScope @@ -6,9 +6,9 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.cancel import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.GENESIS_AT -import to.curare.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.GENESIS_AT +import com.machankura.bennu.compose.database.builder.getRoomDatabase import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -26,8 +26,8 @@ import kotlin.test.assertTrue */ class SetUpProfileForExistingKeyJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) private val scope = CoroutineScope(Job()) private val repository = DatabaseNostrRepository(db, scope) diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/repository/SignInToProfileTwiceJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/repository/SignInToProfileTwiceJvmTest.kt similarity index 83% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/database/repository/SignInToProfileTwiceJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/repository/SignInToProfileTwiceJvmTest.kt index fb6b799f..b8a172fb 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/database/repository/SignInToProfileTwiceJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/repository/SignInToProfileTwiceJvmTest.kt @@ -1,13 +1,13 @@ -package to.curare.compose.database.repository +package com.machankura.bennu.compose.database.repository import androidx.room3.Room import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.cancel import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.GENESIS_AT -import to.curare.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.GENESIS_AT +import com.machankura.bennu.compose.database.builder.getRoomDatabase import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -24,8 +24,8 @@ import kotlin.test.assertEquals */ class SignInToProfileTwiceJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) private val scope = CoroutineScope(Job()) private val repository = DatabaseNostrRepository(db, scope) diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/identity/AddProfileFromInsideJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/AddProfileFromInsideJvmTest.kt similarity index 88% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/identity/AddProfileFromInsideJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/AddProfileFromInsideJvmTest.kt index 9915ffee..c9cde9c7 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/identity/AddProfileFromInsideJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/AddProfileFromInsideJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.identity +package com.machankura.bennu.compose.identity import androidx.room3.Room import co.touchlab.kermit.Logger @@ -20,15 +20,15 @@ import kotlinx.coroutines.cancel import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withTimeout -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.repository.DatabaseMarmotRepository -import to.curare.compose.database.repository.DatabaseNostrRepository -import to.curare.compose.ui.view.model.CreateProfileViewModel -import to.curare.compose.ui.view.model.SignInToProfileViewModel -import to.curare.compose.ui.view.model.SovereignWalletViewModel -import to.curare.compose.ui.view.model.bareKeyProfileWriter -import to.curare.compose.ui.view.state.CreateProfileUIState +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.repository.DatabaseMarmotRepository +import com.machankura.bennu.compose.database.repository.DatabaseNostrRepository +import com.machankura.bennu.compose.ui.view.model.CreateProfileViewModel +import com.machankura.bennu.compose.ui.view.model.SignInToProfileViewModel +import com.machankura.bennu.compose.ui.view.model.SovereignWalletViewModel +import com.machankura.bennu.compose.ui.view.model.bareKeyProfileWriter +import com.machankura.bennu.compose.ui.view.state.CreateProfileUIState import java.io.File import java.nio.file.Files import kotlin.test.AfterTest @@ -57,7 +57,7 @@ class AddProfileFromInsideJvmTest { private lateinit var appDir: File private lateinit var phoenixGlobal: PhoenixGlobal - private val db: CurareDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) + private val db: BennuDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) private val scope = CoroutineScope(Job() + Dispatchers.IO) private val nostrRepository = DatabaseNostrRepository(db, scope) private val marmotRepository = DatabaseMarmotRepository(db, scope) @@ -68,8 +68,8 @@ class AddProfileFromInsideJvmTest { @BeforeTest fun setUp() { - storeDir = Files.createTempDirectory("curare-add-inside-store").toFile() - appDir = Files.createTempDirectory("curare-add-inside-app").toFile() + storeDir = Files.createTempDirectory("bennu-add-inside-store").toFile() + appDir = Files.createTempDirectory("bennu-add-inside-app").toFile() JvmKeyStore.lock() JvmKeyStore.unlock("correct horse battery staple".toCharArray(), storeDir) // No GlobalPrefs of the test's own: DataStoreManager caches one per process, and @@ -94,7 +94,7 @@ class AddProfileFromInsideJvmTest { nostrRepository = nostrRepository, writeNostrKey = { key -> sovereign.writeNostrKey(key) }, writeNostrPublicKey = { pubkey -> sovereign.writeNostrPublicKey(pubkey) }, - writeRecoveryPhrase = { _, _, onError -> onError(to.curare.compose.ui.view.model.WritingSeedState.Error.CannotLoadSeedMap) }, + writeRecoveryPhrase = { _, _, onError -> onError(com.machankura.bennu.compose.ui.view.model.WritingSeedState.Error.CannotLoadSeedMap) }, ) private fun activated(stored: StoredIdentity.NostrSecret): Identity { diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/identity/CredentialParserJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/CredentialParserJvmTest.kt similarity index 98% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/identity/CredentialParserJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/CredentialParserJvmTest.kt index c7e4a58b..2abca902 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/identity/CredentialParserJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/CredentialParserJvmTest.kt @@ -1,6 +1,6 @@ -package to.curare.compose.identity +package com.machankura.bennu.compose.identity -import to.curare.compose.extensions.hexToNpubHrp +import com.machankura.bennu.compose.extensions.hexToNpubHrp import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertIs diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/identity/ForgetIdentityJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/ForgetIdentityJvmTest.kt similarity index 97% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/identity/ForgetIdentityJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/ForgetIdentityJvmTest.kt index de07dfc4..e8a263ac 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/identity/ForgetIdentityJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/ForgetIdentityJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.identity +package com.machankura.bennu.compose.identity import androidx.datastore.preferences.core.PreferenceDataStoreFactory import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -11,7 +11,7 @@ import kotlinx.coroutines.runBlocking import okio.Path.Companion.toPath import org.junit.Rule import org.junit.rules.TemporaryFolder -import to.curare.compose.repository.NostrRepository +import com.machankura.bennu.compose.repository.NostrRepository import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/identity/IdentitySwitchJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/IdentitySwitchJvmTest.kt similarity index 91% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/identity/IdentitySwitchJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/IdentitySwitchJvmTest.kt index 5bc16763..04273dce 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/identity/IdentitySwitchJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/IdentitySwitchJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.identity +package com.machankura.bennu.compose.identity import androidx.room3.Room import co.touchlab.kermit.Logger @@ -13,7 +13,7 @@ import fr.acinq.phoenix.managers.NodeParamsManager import fr.acinq.phoenix.managers.nostrPublicKeyHex import fr.acinq.phoenix.security.JvmKeyStore import fr.acinq.phoenix.utils.PlatformContext -import to.curare.compose.extensions.getGlobalPrefs +import com.machankura.bennu.compose.extensions.getGlobalPrefs import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job @@ -22,17 +22,17 @@ import kotlinx.coroutines.delay import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withTimeout -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.UnsignedNostrEvent -import to.curare.compose.database.repository.DatabaseChatRepository -import to.curare.compose.database.repository.DatabaseMarmotRepository -import to.curare.compose.database.repository.DatabaseNostrRepository -import to.curare.compose.ui.view.model.NavigationViewModel -import to.curare.compose.ui.view.model.NotaryViewModel -import to.curare.compose.ui.view.model.SovereignWalletViewModel -import to.curare.compose.ui.view.state.NavigationUIState -import to.curare.compose.ui.view.state.StartupChoice +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.UnsignedNostrEvent +import com.machankura.bennu.compose.database.repository.DatabaseChatRepository +import com.machankura.bennu.compose.database.repository.DatabaseMarmotRepository +import com.machankura.bennu.compose.database.repository.DatabaseNostrRepository +import com.machankura.bennu.compose.ui.view.model.NavigationViewModel +import com.machankura.bennu.compose.ui.view.model.NotaryViewModel +import com.machankura.bennu.compose.ui.view.model.SovereignWalletViewModel +import com.machankura.bennu.compose.ui.view.state.NavigationUIState +import com.machankura.bennu.compose.ui.view.state.StartupChoice import fr.acinq.phoenix.data.EmptyWalletId import java.io.File import java.nio.file.Files @@ -71,7 +71,7 @@ class IdentitySwitchJvmTest { private lateinit var appDir: File private lateinit var phoenixGlobal: PhoenixGlobal - private val db: CurareDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) + private val db: BennuDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) private val scope = CoroutineScope(Job() + Dispatchers.IO) private val nostrRepository = DatabaseNostrRepository(db, scope) private val chatRepository = DatabaseChatRepository(db, scope) @@ -85,8 +85,8 @@ class IdentitySwitchJvmTest { @BeforeTest fun setUp() { - storeDir = Files.createTempDirectory("curare-switch-store").toFile() - appDir = Files.createTempDirectory("curare-switch-app").toFile() + storeDir = Files.createTempDirectory("bennu-switch-store").toFile() + appDir = Files.createTempDirectory("bennu-switch-app").toFile() JvmKeyStore.lock() JvmKeyStore.unlock("correct horse battery staple".toCharArray(), storeDir) // No GlobalPrefs of the test's own -- see AddProfileFromInsideJvmTest.setUp: the diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/identity/IdentityWriterJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/IdentityWriterJvmTest.kt similarity index 98% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/identity/IdentityWriterJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/IdentityWriterJvmTest.kt index f68c643f..b5c99c84 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/identity/IdentityWriterJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/IdentityWriterJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.identity +package com.machankura.bennu.compose.identity import androidx.datastore.preferences.core.PreferenceDataStoreFactory import co.touchlab.kermit.Logger @@ -30,7 +30,7 @@ import kotlinx.coroutines.test.setMain import kotlinx.coroutines.withTimeout import okio.FileSystem import okio.SYSTEM -import to.curare.compose.ui.view.model.WritingSeedState +import com.machankura.bennu.compose.ui.view.model.WritingSeedState import java.io.File import java.nio.file.Files import kotlin.test.AfterTest @@ -78,8 +78,8 @@ class IdentityWriterJvmTest { // to; a real dispatcher rather than a test one, because it reports after a real // one-second delay and a virtual clock would never reach it. Dispatchers.setMain(Dispatchers.Default) - storeDir = Files.createTempDirectory("curare-identity-writer-store").toFile() - appDir = Files.createTempDirectory("curare-identity-writer-app").toFile() + storeDir = Files.createTempDirectory("bennu-identity-writer-store").toFile() + appDir = Files.createTempDirectory("bennu-identity-writer-app").toFile() JvmKeyStore.lock() JvmKeyStore.unlock("correct horse battery staple".toCharArray(), storeDir) phoenixGlobal = PhoenixGlobal(PlatformContext(applicationDir = appDir)) diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/identity/MultipleProfilesRoundTripJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/MultipleProfilesRoundTripJvmTest.kt similarity index 89% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/identity/MultipleProfilesRoundTripJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/MultipleProfilesRoundTripJvmTest.kt index b11ff5c7..0fd06526 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/identity/MultipleProfilesRoundTripJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/MultipleProfilesRoundTripJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.identity +package com.machankura.bennu.compose.identity import androidx.room3.Room import fr.acinq.bitcoin.PrivateKey @@ -24,24 +24,24 @@ import kotlinx.coroutines.delay import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withTimeout -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.UnsignedNostrEvent -import to.curare.compose.database.repository.DatabaseChatRepository -import to.curare.compose.database.repository.DatabaseMarmotRepository -import to.curare.compose.database.repository.DatabaseNostrRepository -import to.curare.compose.extensions.getGlobalPrefs -import to.curare.compose.ui.view.model.CreateProfileViewModel -import to.curare.compose.ui.view.model.NavigationViewModel -import to.curare.compose.ui.view.model.NotaryViewModel -import to.curare.compose.ui.view.model.SignInToProfileViewModel -import to.curare.compose.ui.view.model.SovereignWalletViewModel -import to.curare.compose.ui.view.model.WritingSeedState -import to.curare.compose.ui.view.model.bareKeyProfileWriter -import to.curare.compose.ui.view.model.seedProfileWriter -import to.curare.compose.ui.view.state.CreateProfileUIState -import to.curare.compose.ui.view.state.NavigationUIState -import to.curare.compose.ui.view.state.StartupChoice +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.UnsignedNostrEvent +import com.machankura.bennu.compose.database.repository.DatabaseChatRepository +import com.machankura.bennu.compose.database.repository.DatabaseMarmotRepository +import com.machankura.bennu.compose.database.repository.DatabaseNostrRepository +import com.machankura.bennu.compose.extensions.getGlobalPrefs +import com.machankura.bennu.compose.ui.view.model.CreateProfileViewModel +import com.machankura.bennu.compose.ui.view.model.NavigationViewModel +import com.machankura.bennu.compose.ui.view.model.NotaryViewModel +import com.machankura.bennu.compose.ui.view.model.SignInToProfileViewModel +import com.machankura.bennu.compose.ui.view.model.SovereignWalletViewModel +import com.machankura.bennu.compose.ui.view.model.WritingSeedState +import com.machankura.bennu.compose.ui.view.model.bareKeyProfileWriter +import com.machankura.bennu.compose.ui.view.model.seedProfileWriter +import com.machankura.bennu.compose.ui.view.state.CreateProfileUIState +import com.machankura.bennu.compose.ui.view.state.NavigationUIState +import com.machankura.bennu.compose.ui.view.state.StartupChoice import java.io.File import java.nio.file.Files import kotlin.test.AfterTest @@ -74,7 +74,7 @@ class MultipleProfilesRoundTripJvmTest { private lateinit var appDir: File private lateinit var phoenixGlobal: PhoenixGlobal - private val db: CurareDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) + private val db: BennuDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) private val scope = CoroutineScope(Job() + Dispatchers.IO) private val nostrRepository = DatabaseNostrRepository(db, scope) private val chatRepository = DatabaseChatRepository(db, scope) @@ -85,8 +85,8 @@ class MultipleProfilesRoundTripJvmTest { @BeforeTest fun setUp() { - storeDir = Files.createTempDirectory("curare-profiles-store").toFile() - appDir = Files.createTempDirectory("curare-profiles-app").toFile() + storeDir = Files.createTempDirectory("bennu-profiles-store").toFile() + appDir = Files.createTempDirectory("bennu-profiles-app").toFile() JvmKeyStore.lock() JvmKeyStore.unlock("correct horse battery staple".toCharArray(), storeDir) // No GlobalPrefs of the test's own -- see AddProfileFromInsideJvmTest.setUp. diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/identity/NpubPreviewRoundTripJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/NpubPreviewRoundTripJvmTest.kt similarity index 90% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/identity/NpubPreviewRoundTripJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/NpubPreviewRoundTripJvmTest.kt index 778c90e8..9bd859a5 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/identity/NpubPreviewRoundTripJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/NpubPreviewRoundTripJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.identity +package com.machankura.bennu.compose.identity import androidx.datastore.preferences.core.PreferenceDataStoreFactory import androidx.room3.Room @@ -27,17 +27,17 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withTimeout -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.GENESIS_AT -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.repository.DatabaseChatRepository -import to.curare.compose.database.repository.DatabaseMarmotRepository -import to.curare.compose.database.repository.DatabaseNostrRepository -import to.curare.compose.ui.view.model.NavigationViewModel -import to.curare.compose.ui.view.model.NotaryViewModel -import to.curare.compose.ui.view.model.SignInToProfileViewModel -import to.curare.compose.ui.view.state.NavigationUIState +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.GENESIS_AT +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.repository.DatabaseChatRepository +import com.machankura.bennu.compose.database.repository.DatabaseMarmotRepository +import com.machankura.bennu.compose.database.repository.DatabaseNostrRepository +import com.machankura.bennu.compose.ui.view.model.NavigationViewModel +import com.machankura.bennu.compose.ui.view.model.NotaryViewModel +import com.machankura.bennu.compose.ui.view.model.SignInToProfileViewModel +import com.machankura.bennu.compose.ui.view.state.NavigationUIState import java.io.File import java.nio.file.Files import kotlin.test.AfterTest @@ -48,7 +48,7 @@ import kotlin.test.assertFalse import kotlin.test.assertIs import kotlin.test.assertNull import kotlin.test.assertTrue -import to.curare.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.nostr.MarmotProfile import kotlin.time.Instant /** @@ -76,8 +76,8 @@ class NpubPreviewRoundTripJvmTest { private lateinit var phoenixGlobal: PhoenixGlobal private lateinit var globalPrefs: GlobalPrefs - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) private val scope = CoroutineScope(Job() + Dispatchers.IO) private val nostrRepository = DatabaseNostrRepository(db, scope) @@ -91,8 +91,8 @@ class NpubPreviewRoundTripJvmTest { @BeforeTest fun setUp() { - storeDir = Files.createTempDirectory("curare-preview-store").toFile() - appDir = Files.createTempDirectory("curare-preview-app").toFile() + storeDir = Files.createTempDirectory("bennu-preview-store").toFile() + appDir = Files.createTempDirectory("bennu-preview-app").toFile() JvmKeyStore.lock() JvmKeyStore.unlock("correct horse battery staple".toCharArray(), storeDir) phoenixGlobal = PhoenixGlobal(PlatformContext(applicationDir = appDir)) @@ -116,7 +116,7 @@ class NpubPreviewRoundTripJvmTest { nostrRepository = nostrRepository, writeNostrKey = { key -> IdentityWriter.writeNostrKey(log, phoenixGlobal, globalPrefs, key, isTorEnabled = false, customElectrumServer = null) }, writeNostrPublicKey = { pubkey -> IdentityWriter.writeNostrPublicKey(log, phoenixGlobal, globalPrefs, pubkey, isTorEnabled = false, customElectrumServer = null) }, - writeRecoveryPhrase = { _, _, onError -> onError(to.curare.compose.ui.view.model.WritingSeedState.Error.CannotLoadSeedMap) }, + writeRecoveryPhrase = { _, _, onError -> onError(com.machankura.bennu.compose.ui.view.model.WritingSeedState.Error.CannotLoadSeedMap) }, ) private fun listed() = StoredIdentity.merge( diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/identity/NsecRestoreRoundTripJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/NsecRestoreRoundTripJvmTest.kt similarity index 91% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/identity/NsecRestoreRoundTripJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/NsecRestoreRoundTripJvmTest.kt index 33525daf..db5d8d03 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/identity/NsecRestoreRoundTripJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/NsecRestoreRoundTripJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.identity +package com.machankura.bennu.compose.identity import androidx.datastore.preferences.core.PreferenceDataStoreFactory import co.touchlab.kermit.Logger @@ -23,13 +23,13 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withTimeout -import to.curare.compose.database.GENESIS_AT -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.UnsignedNostrEvent -import to.curare.compose.database.model.intermdiate.LocalAccount -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.view.model.NavigationViewModel -import to.curare.compose.ui.view.state.NavigationUIState +import com.machankura.bennu.compose.database.GENESIS_AT +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.UnsignedNostrEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalAccount +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.view.model.NavigationViewModel +import com.machankura.bennu.compose.ui.view.state.NavigationUIState import java.io.File import java.nio.file.Files import kotlin.test.AfterTest @@ -68,8 +68,8 @@ class NsecRestoreRoundTripJvmTest { @BeforeTest fun setUp() { - storeDir = Files.createTempDirectory("curare-round-trip-store").toFile() - appDir = Files.createTempDirectory("curare-round-trip-app").toFile() + storeDir = Files.createTempDirectory("bennu-round-trip-store").toFile() + appDir = Files.createTempDirectory("bennu-round-trip-app").toFile() JvmKeyStore.lock() JvmKeyStore.unlock("correct horse battery staple".toCharArray(), storeDir) phoenixGlobal = PhoenixGlobal(PlatformContext(applicationDir = appDir)) diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/identity/SeedCredentialsJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/SeedCredentialsJvmTest.kt similarity index 97% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/identity/SeedCredentialsJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/SeedCredentialsJvmTest.kt index 7bd2bbb5..4855f7bb 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/identity/SeedCredentialsJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/SeedCredentialsJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.identity +package com.machankura.bennu.compose.identity import co.touchlab.kermit.Logger import fr.acinq.bitcoin.MnemonicCode @@ -64,8 +64,8 @@ class SeedCredentialsJvmTest { @BeforeTest fun setUp() { - storeDir = Files.createTempDirectory("curare-seed-credentials-store").toFile() - appDir = Files.createTempDirectory("curare-seed-credentials-app").toFile() + storeDir = Files.createTempDirectory("bennu-seed-credentials-store").toFile() + appDir = Files.createTempDirectory("bennu-seed-credentials-app").toFile() JvmKeyStore.lock() JvmKeyStore.unlock("correct horse battery staple".toCharArray(), storeDir) phoenixGlobal = PhoenixGlobal(PlatformContext(applicationDir = appDir)) diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/identity/StoredIdentityJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/StoredIdentityJvmTest.kt similarity index 99% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/identity/StoredIdentityJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/StoredIdentityJvmTest.kt index 60b62903..7c33acc8 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/identity/StoredIdentityJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/identity/StoredIdentityJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.identity +package com.machankura.bennu.compose.identity import fr.acinq.bitcoin.ByteVector32 import fr.acinq.bitcoin.PrivateKey diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/ChapterBatchProposalJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/ChapterBatchProposalJvmTest.kt similarity index 89% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/managers/ChapterBatchProposalJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/ChapterBatchProposalJvmTest.kt index 0fd0c272..bd62c329 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/ChapterBatchProposalJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/ChapterBatchProposalJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import androidx.room3.Room import com.vitorpamplona.quartz.nip01Core.core.Event @@ -13,20 +13,20 @@ import kotlin.test.assertEquals import kotlin.test.assertFailsWith import kotlin.test.assertTrue import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.DkgParticipantMessage -import to.curare.compose.database.model.DkgSession -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.types.DkgRitualStage -import to.curare.compose.extensions.toHex -import to.curare.compose.nostr.dkg.DkgRitualEvents -import to.curare.compose.nostr.nip30303.ChapterEvent -import to.curare.compose.nostr.nip30303.ChunkEvent -import to.curare.compose.text.Markdown +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.DkgParticipantMessage +import com.machankura.bennu.compose.database.model.DkgSession +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.types.DkgRitualStage +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.nostr.dkg.DkgRitualEvents +import com.machankura.bennu.compose.nostr.nip30303.ChapterEvent +import com.machankura.bennu.compose.nostr.nip30303.ChunkEvent +import com.machankura.bennu.compose.text.Markdown /** * What a chapter proposal actually puts in front of the group. @@ -68,7 +68,7 @@ class ChapterBatchProposalJvmTest { private val proposer = members.first() private val artifactVersionId = "b".repeat(64) - private lateinit var db: CurareDatabase + private lateinit var db: BennuDatabase private lateinit var room: LocalChatRoom @AfterTest @@ -78,7 +78,7 @@ class ChapterBatchProposalJvmTest { /** The proposer's device: a room it can sign in, and the share to sign with. */ private suspend fun openDevice() { - db = getRoomDatabase(Room.inMemoryDatabaseBuilder()) + db = getRoomDatabase(Room.inMemoryDatabaseBuilder()) // Profile hangs off a nostr event, and a room off a profile. Neither is // anything this test is about; they are the foreign keys in the way. diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/ChronicleApplyJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/ChronicleApplyJvmTest.kt similarity index 94% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/managers/ChronicleApplyJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/ChronicleApplyJvmTest.kt index d5780e90..6c1e88a2 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/ChronicleApplyJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/ChronicleApplyJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import androidx.room3.Room import com.vitorpamplona.quartz.nip01Core.core.Event @@ -23,30 +23,30 @@ import kotlin.test.assertTrue import kotlin.time.Clock import kotlin.time.Instant import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.MarmotInnerEvent -import to.curare.compose.database.model.MarmotKeyPackage -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.extensions.toHex -import to.curare.compose.nostr.chronicle.ChronicleEvent -import to.curare.compose.nostr.chronicle.ChronicleRequestEvent -import to.curare.compose.nostr.chronicle.tags.ChronicleIdTag -import to.curare.compose.nostr.chronicle.tags.ChroniclePageTag -import to.curare.compose.nostr.chronicle.tags.ChronicleRecipientTag +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.MarmotInnerEvent +import com.machankura.bennu.compose.database.model.MarmotKeyPackage +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.nostr.chronicle.ChronicleEvent +import com.machankura.bennu.compose.nostr.chronicle.ChronicleRequestEvent +import com.machankura.bennu.compose.nostr.chronicle.tags.ChronicleIdTag +import com.machankura.bennu.compose.nostr.chronicle.tags.ChroniclePageTag +import com.machankura.bennu.compose.nostr.chronicle.tags.ChronicleRecipientTag import com.vitorpamplona.quartz.marmot.mip02Welcome.WelcomeEvent -import to.curare.compose.nostr.frost.GroupKeyStateEvent -import to.curare.compose.nostr.nip30303.ArtifactEvent -import to.curare.compose.nostr.nip30303.ArtifactVersionEvent -import to.curare.compose.nostr.nip30303.ChapterEvent -import to.curare.compose.nostr.nip30303.ChunkEvent -import to.curare.compose.nostr.nip30303.DialectEvent -import to.curare.compose.nostr.nip30303.TranslationArtifactVersionEvent -import to.curare.compose.nostr.nip30303.TranslationChapterEvent -import to.curare.compose.nostr.nip30303.TranslationChunkEvent +import com.machankura.bennu.compose.nostr.frost.GroupKeyStateEvent +import com.machankura.bennu.compose.nostr.nip30303.ArtifactEvent +import com.machankura.bennu.compose.nostr.nip30303.ArtifactVersionEvent +import com.machankura.bennu.compose.nostr.nip30303.ChapterEvent +import com.machankura.bennu.compose.nostr.nip30303.ChunkEvent +import com.machankura.bennu.compose.nostr.nip30303.DialectEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationArtifactVersionEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationChapterEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationChunkEvent /** * Two devices, two databases: one that did the work and one that arrived after @@ -65,10 +65,10 @@ import to.curare.compose.nostr.nip30303.TranslationChunkEvent */ class ChronicleApplyJvmTest { /** The member who did the work. */ - private val sender: CurareDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) + private val sender: BennuDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) /** The member who arrived afterwards. No share, no sessions, no history. */ - private val receiver: CurareDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) + private val receiver: BennuDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) @AfterTest fun closeDbs() { @@ -174,7 +174,7 @@ class ChronicleApplyJvmTest { private fun signed(template: EventTemplate<*>) = signedBy(keyMaterial, template) - private suspend fun seedRoom(db: CurareDatabase, user: String) { + private suspend fun seedRoom(db: BennuDatabase, user: String) { val nostrEventId = "c".repeat(63) + if (user == newMember) "1" else "2" db.nostrEventDao().upsert( NostrEvent( @@ -198,7 +198,7 @@ class ChronicleApplyJvmTest { ) } - private suspend fun apply(db: CurareDatabase, event: Event) { + private suspend fun apply(db: BennuDatabase, event: Event) { ChatMessage.applyInnerEvent( database = db, groupId = chatRoomId, @@ -354,7 +354,7 @@ class ChronicleApplyJvmTest { private suspend fun senderChronicle() = ChronicleManager.assemble(sender, chatRoomId, newMember) - private suspend fun rowCounts(db: CurareDatabase): Map { + private suspend fun rowCounts(db: BennuDatabase): Map { val dialects = db.mantraDialectDao().getDialectsByChatRoomId(chatRoomId) val artifacts = db.mantraArtifactDao().getArtifactsByChatRoomId(chatRoomId) val versions = artifacts.flatMap { @@ -393,7 +393,7 @@ class ChronicleApplyJvmTest { * group's signature -- or re-authored a row as whoever sent it -- would pass a * count and fail the only thing the chronicle is for. */ - private suspend fun rowFingerprints(db: CurareDatabase): List> { + private suspend fun rowFingerprints(db: BennuDatabase): List> { val artifacts = db.mantraArtifactDao().getArtifactsByChatRoomId(chatRoomId) val versions = artifacts.flatMap { db.mantraArtifactVersionDao().getArtifactVersionsByArtifactId(it.id) @@ -719,7 +719,7 @@ class ChronicleApplyJvmTest { // ---- Asking for one -------------------------------------------------- - private suspend fun queued(db: CurareDatabase, kind: Int) = db.marmotInnerEventDao() + private suspend fun queued(db: BennuDatabase, kind: Int) = db.marmotInnerEventDao() .getByChatRoomAndKinds(chatRoomId, listOf(kind)) .filter { it.marmotGroupEventId == null } diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/ChronicleAssemblyJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/ChronicleAssemblyJvmTest.kt similarity index 94% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/managers/ChronicleAssemblyJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/ChronicleAssemblyJvmTest.kt index 6fa8833d..ed613d76 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/ChronicleAssemblyJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/ChronicleAssemblyJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import androidx.room3.Room import com.vitorpamplona.quartz.nip01Core.core.Event @@ -20,26 +20,26 @@ import kotlin.test.assertNotNull import kotlin.test.assertTrue import kotlin.time.Instant import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.MantraDialect -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.extensions.toHex -import to.curare.compose.nostr.chronicle.ChronicleEvent -import to.curare.compose.nostr.frost.GroupKeyStateEvent -import to.curare.compose.nostr.nip30303.SubmissionEvent -import to.curare.compose.nostr.nip30303.ArtifactEvent -import to.curare.compose.nostr.nip30303.ArtifactVersionEvent -import to.curare.compose.nostr.nip30303.ChapterEvent -import to.curare.compose.nostr.nip30303.ChunkEvent -import to.curare.compose.nostr.nip30303.DialectEvent -import to.curare.compose.nostr.nip30303.TranslationArtifactVersionEvent -import to.curare.compose.nostr.nip30303.TranslationChapterEvent -import to.curare.compose.nostr.nip30303.TranslationChunkEvent +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.MantraDialect +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.nostr.chronicle.ChronicleEvent +import com.machankura.bennu.compose.nostr.frost.GroupKeyStateEvent +import com.machankura.bennu.compose.nostr.nip30303.SubmissionEvent +import com.machankura.bennu.compose.nostr.nip30303.ArtifactEvent +import com.machankura.bennu.compose.nostr.nip30303.ArtifactVersionEvent +import com.machankura.bennu.compose.nostr.nip30303.ChapterEvent +import com.machankura.bennu.compose.nostr.nip30303.ChunkEvent +import com.machankura.bennu.compose.nostr.nip30303.DialectEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationArtifactVersionEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationChapterEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationChunkEvent /** * Assembling a room's chronicle out of the rows a device actually holds. @@ -51,7 +51,7 @@ import to.curare.compose.nostr.nip30303.TranslationChunkEvent * differs from what was signed, and rows assembled by hand would hide it. */ class ChronicleAssemblyJvmTest { - private val db: CurareDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) + private val db: BennuDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) @AfterTest fun closeDb() = db.close() diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/ConvergenceForkJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/ConvergenceForkJvmTest.kt similarity index 95% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/managers/ConvergenceForkJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/ConvergenceForkJvmTest.kt index 03a66f0d..7579a013 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/ConvergenceForkJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/ConvergenceForkJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import androidx.room3.Room import com.vitorpamplona.quartz.marmot.GroupEventResult @@ -18,13 +18,13 @@ import com.vitorpamplona.quartz.utils.sha256.sha256 import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.MarmotKeyPackage -import to.curare.compose.database.repository.DatabaseChatRepository -import to.curare.compose.database.repository.DatabaseMarmotRepository -import to.curare.compose.database.repository.DatabaseNostrRepository -import to.curare.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.MarmotKeyPackage +import com.machankura.bennu.compose.database.repository.DatabaseChatRepository +import com.machankura.bennu.compose.database.repository.DatabaseMarmotRepository +import com.machankura.bennu.compose.database.repository.DatabaseNostrRepository +import com.machankura.bennu.compose.nostr.MarmotProfile import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertContentEquals @@ -57,7 +57,7 @@ import kotlin.time.Instant */ class ConvergenceForkJvmTest { - private val db: CurareDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) + private val db: BennuDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) private val scope = CoroutineScope(Dispatchers.Default) private val marmotRepository = DatabaseMarmotRepository(db, scope) private val chatRepository = DatabaseChatRepository(db, scope) diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/CurrentProfileInteropJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/CurrentProfileInteropJvmTest.kt similarity index 92% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/managers/CurrentProfileInteropJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/CurrentProfileInteropJvmTest.kt index d446441c..2f77c452 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/CurrentProfileInteropJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/CurrentProfileInteropJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import androidx.room3.Room import com.vitorpamplona.quartz.marmot.GroupEventResult @@ -15,11 +15,11 @@ import com.vitorpamplona.quartz.utils.TimeUtils import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.MarmotInnerEvent -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.repository.DatabaseMarmotRepository +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.MarmotInnerEvent +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.repository.DatabaseMarmotRepository import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -31,7 +31,7 @@ import kotlin.time.Instant /** * Two implementations in one current-profile group: the app's engine over a - * `CurareDatabase`, and a bare library stand-in -- `MlsGroupManager` and the two + * `BennuDatabase`, and a bare library stand-in -- `MlsGroupManager` and the two * processors over an in-memory store -- playing Amethyst. docs/marmot-v2.md, * Phases 5 and 8. * @@ -42,8 +42,8 @@ import kotlin.time.Instant */ class CurrentProfileInteropJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) private val marmotRepository = DatabaseMarmotRepository(db, CoroutineScope(Dispatchers.Default)) diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/FrostSigningDeclineJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/FrostSigningDeclineJvmTest.kt similarity index 93% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/managers/FrostSigningDeclineJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/FrostSigningDeclineJvmTest.kt index c9e7d254..3cceca93 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/FrostSigningDeclineJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/FrostSigningDeclineJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import androidx.room3.Room import com.vitorpamplona.quartz.nip01Core.core.Event @@ -18,23 +18,23 @@ import kotlin.test.assertTrue import kotlin.time.Clock import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.DkgParticipantMessage -import to.curare.compose.database.model.DkgSession -import to.curare.compose.database.model.FrostSigningItem -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.repository.DatabaseFrostSigningRepository -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.types.DkgRitualStage -import to.curare.compose.database.model.types.FrostSigningStage -import to.curare.compose.extensions.toHex -import to.curare.compose.nostr.dkg.DkgRitualEvents -import to.curare.compose.nostr.frost.FrostSigningEvents +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.DkgParticipantMessage +import com.machankura.bennu.compose.database.model.DkgSession +import com.machankura.bennu.compose.database.model.FrostSigningItem +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.repository.DatabaseFrostSigningRepository +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.types.DkgRitualStage +import com.machankura.bennu.compose.database.model.types.FrostSigningStage +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.nostr.dkg.DkgRitualEvents +import com.machankura.bennu.compose.nostr.frost.FrostSigningEvents /** * What one member's refusal does to a signing session, against a real @@ -81,7 +81,7 @@ class FrostSigningDeclineJvmTest { /** A member of the room who holds no share: never in the ceremony at all. */ private val stranger = "d".repeat(64) - private lateinit var db: CurareDatabase + private lateinit var db: BennuDatabase private lateinit var room: LocalChatRoom @AfterTest @@ -97,7 +97,7 @@ class FrostSigningDeclineJvmTest { * order the signer ids come from -- is the same on every device. */ private suspend fun openDevice(owner: HexKey = alice) { - db = getRoomDatabase(Room.inMemoryDatabaseBuilder()) + db = getRoomDatabase(Room.inMemoryDatabaseBuilder()) val index = members.indexOf(owner) diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/FrostSigningResendJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/FrostSigningResendJvmTest.kt similarity index 97% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/managers/FrostSigningResendJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/FrostSigningResendJvmTest.kt index 8707d59b..8766b378 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/FrostSigningResendJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/FrostSigningResendJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import androidx.room3.Room import com.vitorpamplona.quartz.nip01Core.core.Event @@ -21,27 +21,27 @@ import kotlin.test.assertNull import kotlin.test.assertTrue import kotlin.time.Clock import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.DkgParticipantMessage -import to.curare.compose.database.model.DkgSession -import to.curare.compose.database.model.FrostSignerMessage -import to.curare.compose.database.model.FrostSigningItem -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.GiftWrapPayload -import to.curare.compose.database.model.MarmotInnerEvent -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Participant -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.intermdiate.LocalParticipant -import to.curare.compose.database.model.types.DkgRitualStage -import to.curare.compose.database.model.types.FrostSigningStage -import to.curare.compose.extensions.toHex -import to.curare.compose.nostr.dkg.DkgRitualEvents -import to.curare.compose.nostr.frost.FrostSigningEvents +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.DkgParticipantMessage +import com.machankura.bennu.compose.database.model.DkgSession +import com.machankura.bennu.compose.database.model.FrostSignerMessage +import com.machankura.bennu.compose.database.model.FrostSigningItem +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.GiftWrapPayload +import com.machankura.bennu.compose.database.model.MarmotInnerEvent +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Participant +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalParticipant +import com.machankura.bennu.compose.database.model.types.DkgRitualStage +import com.machankura.bennu.compose.database.model.types.FrostSigningStage +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.nostr.dkg.DkgRitualEvents +import com.machankura.bennu.compose.nostr.frost.FrostSigningEvents /** * What a resend does, against a real database and the real manager. @@ -89,7 +89,7 @@ class FrostSigningResendJvmTest { private val bob = members[1] private val carol = members[2] - private lateinit var db: CurareDatabase + private lateinit var db: BennuDatabase private lateinit var room: LocalChatRoom @AfterTest @@ -106,7 +106,7 @@ class FrostSigningResendJvmTest { * quiet members is visible only if there is somebody to leave out. */ private suspend fun openDevice(owner: HexKey = alice, marmot: Boolean = false) { - db = getRoomDatabase(Room.inMemoryDatabaseBuilder()) + db = getRoomDatabase(Room.inMemoryDatabaseBuilder()) val index = members.indexOf(owner) diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/GroupLifecycleJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/GroupLifecycleJvmTest.kt similarity index 92% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/managers/GroupLifecycleJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/GroupLifecycleJvmTest.kt index 99921b5d..93c94aae 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/GroupLifecycleJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/GroupLifecycleJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import androidx.room3.Room import com.vitorpamplona.quartz.marmot.GroupEventResult @@ -12,16 +12,16 @@ import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.MarmotKeyPackage -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.repository.DatabaseChatRepository -import to.curare.compose.database.repository.DatabaseMarmotRepository -import to.curare.compose.database.repository.DatabaseNostrRepository -import to.curare.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.MarmotKeyPackage +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.repository.DatabaseChatRepository +import com.machankura.bennu.compose.database.repository.DatabaseMarmotRepository +import com.machankura.bennu.compose.database.repository.DatabaseNostrRepository +import com.machankura.bennu.compose.nostr.MarmotProfile import kotlin.io.encoding.Base64 import kotlin.test.AfterTest import kotlin.test.Test @@ -44,7 +44,7 @@ import kotlin.time.Instant */ class GroupLifecycleJvmTest { - private val db: CurareDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) + private val db: BennuDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) private val scope = CoroutineScope(Dispatchers.Default) private val chatRepository = DatabaseChatRepository(db, scope) private val nostrRepository = DatabaseNostrRepository(db, scope) diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/MarmotGroupCreationJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/MarmotGroupCreationJvmTest.kt similarity index 94% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/managers/MarmotGroupCreationJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/MarmotGroupCreationJvmTest.kt index 7501521c..e34900ce 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/MarmotGroupCreationJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/MarmotGroupCreationJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import androidx.room3.Room import com.vitorpamplona.quartz.nip01Core.core.toHexKey @@ -13,13 +13,13 @@ import kotlin.test.assertEquals import kotlin.test.assertIs import kotlin.test.assertNotNull import kotlin.test.assertTrue -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.repository.DatabaseChatRepository -import to.curare.compose.extensions.toHex -import to.curare.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.repository.DatabaseChatRepository +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.nostr.MarmotProfile import kotlin.test.assertNotEquals import kotlin.test.assertNull import kotlin.time.Clock @@ -43,8 +43,8 @@ import kotlin.time.Clock */ class MarmotGroupCreationJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/MarmotGroupFactoryJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/MarmotGroupFactoryJvmTest.kt similarity index 95% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/managers/MarmotGroupFactoryJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/MarmotGroupFactoryJvmTest.kt index 929aaa49..f26784a8 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/MarmotGroupFactoryJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/MarmotGroupFactoryJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import com.vitorpamplona.quartz.marmot.appComponents.CurrentProfileGroupFactory import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageUtils @@ -7,9 +7,9 @@ import com.vitorpamplona.quartz.nip01Core.core.toHexKey import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal import kotlinx.coroutines.runBlocking -import to.curare.compose.database.dao.marmotKeyPackageFor -import to.curare.compose.nostr.MarmotProfile -import to.curare.compose.nostr.Relays +import com.machankura.bennu.compose.database.dao.marmotKeyPackageFor +import com.machankura.bennu.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.nostr.Relays import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFailsWith diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/MarmotStandIn.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/MarmotStandIn.kt similarity index 90% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/managers/MarmotStandIn.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/MarmotStandIn.kt index 0984a6e5..cf2eb3bc 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/MarmotStandIn.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/MarmotStandIn.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import com.vitorpamplona.quartz.marmot.MarmotInboundProcessor import com.vitorpamplona.quartz.marmot.MarmotOutboundProcessor @@ -22,12 +22,12 @@ import com.vitorpamplona.quartz.nip59Giftwrap.rumors.RumorAssembler import com.vitorpamplona.quartz.nip59Giftwrap.seals.SealedRumorEvent import com.vitorpamplona.quartz.nip59Giftwrap.wraps.GiftWrapEvent import com.vitorpamplona.quartz.utils.RandomInstance -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.repository.DatabaseMarmotRepository -import to.curare.compose.nostr.MarmotProfile -import to.curare.compose.nostr.Relays +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.repository.DatabaseMarmotRepository +import com.machankura.bennu.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.nostr.Relays import kotlin.io.encoding.Base64 import kotlin.test.assertNotNull import kotlin.time.Instant @@ -105,7 +105,7 @@ internal class MarmotStandIn(val keyPair: KeyPair = KeyPair()) { * throwaway key and p-tagged to the app, through the sync funnel. The app's * current-profile package is published first. Returns the app's room id. */ - suspend fun inviteApp(db: CurareDatabase, marmotRepository: DatabaseMarmotRepository, user: KeyPair, routingId: String): String { + suspend fun inviteApp(db: BennuDatabase, marmotRepository: DatabaseMarmotRepository, user: KeyPair, routingId: String): String { val userHex = user.pubKey.toHexKey() marmotRepository.publishMarmotKeyPackageBundle(user, setOf(MarmotProfile.CURRENT)) val unsigned = db.unsignedNostrEventDao().getAllUnprocessedUnsignedNostrEvents() @@ -136,14 +136,14 @@ internal class MarmotStandIn(val keyPair: KeyPair = KeyPair()) { companion object { /** Seeds the profile rows a member needs before the app can hold one as a participant. */ - suspend fun seedProfile(db: CurareDatabase, publicKey: String, name: String = publicKey.take(8)) { + suspend fun seedProfile(db: BennuDatabase, publicKey: String, name: String = publicKey.take(8)) { val eventId = publicKey.take(32).padEnd(64, 'e') db.nostrEventDao().upsert(NostrEvent(id = eventId, pubKey = publicKey, kind = 0, tags = emptyArray(), content = "{}", sig = "0".repeat(128))) db.profileDao().upsert(Profile(publicKey = publicKey, userName = name, nostrEventId = eventId)) } /** [event] as the sync funnel hands it to the app. */ - suspend fun storeInApp(db: CurareDatabase, user: KeyPair, event: Event, relay: String = "wss://relay.example") = + suspend fun storeInApp(db: BennuDatabase, user: KeyPair, event: Event, relay: String = "wss://relay.example") = db.nostrDao().storeNostrEvent( nostrEvent = NostrEvent( id = event.id, pubKey = event.pubKey, kind = event.kind, tags = event.tags, diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/PublishBeforeApplyJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/PublishBeforeApplyJvmTest.kt similarity index 91% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/managers/PublishBeforeApplyJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/PublishBeforeApplyJvmTest.kt index 447ee0b3..0b2fbb82 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/PublishBeforeApplyJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/PublishBeforeApplyJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import androidx.room3.Room import com.vitorpamplona.quartz.marmot.appComponents.CurrentProfileGroupFactory @@ -9,18 +9,18 @@ import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.BroadcastNostrEventRequest -import to.curare.compose.database.model.BroadcastStatus -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.MarmotKeyPackage -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.repository.DatabaseChatRepository -import to.curare.compose.database.repository.DatabaseNostrRepository -import to.curare.compose.exceptions.MarmotCommitPendingException -import to.curare.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.BroadcastNostrEventRequest +import com.machankura.bennu.compose.database.model.BroadcastStatus +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.MarmotKeyPackage +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.repository.DatabaseChatRepository +import com.machankura.bennu.compose.database.repository.DatabaseNostrRepository +import com.machankura.bennu.compose.exceptions.MarmotCommitPendingException +import com.machankura.bennu.compose.nostr.MarmotProfile import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -40,7 +40,7 @@ import kotlin.test.assertTrue */ class PublishBeforeApplyJvmTest { - private val db: CurareDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) + private val db: BennuDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) private val scope = CoroutineScope(Dispatchers.Default) private val chatRepository = DatabaseChatRepository(db, scope) private val nostrRepository = DatabaseNostrRepository(db, scope) diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/RobustRoomKeyCeremonyTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/RobustRoomKeyCeremonyTest.kt similarity index 96% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/managers/RobustRoomKeyCeremonyTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/RobustRoomKeyCeremonyTest.kt index f8dee2a8..8b087e9e 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/RobustRoomKeyCeremonyTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/RobustRoomKeyCeremonyTest.kt @@ -1,18 +1,18 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import androidx.room3.Room import com.vitorpamplona.quartz.nip01Core.core.toHexKey import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.types.DkgRitualStage -import to.curare.compose.nostr.dkg.DkgRitualEvents +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.types.DkgRitualStage +import com.machankura.bennu.compose.nostr.dkg.DkgRitualEvents import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -45,8 +45,8 @@ import kotlin.test.assertTrue */ class RobustRoomKeyCeremonyTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/RoomMlsGroupStateStoreJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/RoomMlsGroupStateStoreJvmTest.kt similarity index 87% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/managers/RoomMlsGroupStateStoreJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/RoomMlsGroupStateStoreJvmTest.kt index 37a4d95a..12169a21 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/RoomMlsGroupStateStoreJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/RoomMlsGroupStateStoreJvmTest.kt @@ -1,16 +1,16 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import androidx.room3.Room import com.vitorpamplona.quartz.marmot.mls.codec.TlsWriter import com.vitorpamplona.quartz.marmot.mls.group.RetainedEpochSecrets import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.MarmotRouting -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.extensions.toHex +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.MarmotRouting +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.extensions.toHex import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertContentEquals @@ -22,7 +22,7 @@ import kotlin.test.assertNull * resolved to the room, and the retained epochs as rows rather than a map. */ class RoomMlsGroupStateStoreJvmTest { - private val db: CurareDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) + private val db: BennuDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) private val store = RoomMlsGroupStateStore(db) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/SignedGroupKeyStateTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/SignedGroupKeyStateTest.kt similarity index 97% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/managers/SignedGroupKeyStateTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/SignedGroupKeyStateTest.kt index 97487901..8bcfa422 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/SignedGroupKeyStateTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/SignedGroupKeyStateTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import androidx.room3.Room import com.vitorpamplona.quartz.nip01Core.core.Event @@ -11,8 +11,8 @@ import fr.acinq.bitcoin.PrivateKey import fr.acinq.bitcoin.XonlyPublicKey import fr.acinq.bitcoin.crypto.frost.Frost import fr.acinq.bitcoin.crypto.frost.KeyMaterial -import to.curare.compose.nostr.subgroup.SubgroupParentage -import to.curare.compose.nostr.subgroup.SubgroupBirthCertificateEvent +import com.machankura.bennu.compose.nostr.subgroup.SubgroupParentage +import com.machankura.bennu.compose.nostr.subgroup.SubgroupBirthCertificateEvent import fr.acinq.bitcoin.crypto.frost.Session import fr.acinq.bitcoin.crypto.frost.SecretNonce import fr.acinq.bitcoin.crypto.frost.IndividualNonce @@ -27,27 +27,27 @@ import kotlin.test.assertTrue import kotlin.time.Instant import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.repository.DatabaseDkgRepository -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.DkgParticipantMessage -import to.curare.compose.database.model.DkgSession -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.GiftWrapPayload -import to.curare.compose.database.model.MarmotInnerEvent -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Participant -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.types.DkgRitualStage -import to.curare.compose.database.model.types.FrostSigningStage -import to.curare.compose.extensions.toHex -import to.curare.compose.nostr.dkg.DkgRitualEvents -import to.curare.compose.nostr.frost.FrostSigningEvents -import to.curare.compose.nostr.frost.GroupKeyStateEvent -import to.curare.compose.nostr.nip30303.DialectEvent +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.repository.DatabaseDkgRepository +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.DkgParticipantMessage +import com.machankura.bennu.compose.database.model.DkgSession +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.GiftWrapPayload +import com.machankura.bennu.compose.database.model.MarmotInnerEvent +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Participant +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.types.DkgRitualStage +import com.machankura.bennu.compose.database.model.types.FrostSigningStage +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.nostr.dkg.DkgRitualEvents +import com.machankura.bennu.compose.nostr.frost.FrostSigningEvents +import com.machankura.bennu.compose.nostr.frost.GroupKeyStateEvent +import com.machankura.bennu.compose.nostr.nip30303.DialectEvent /** * Two devices, two databases, one real signing session, and the wire between @@ -133,7 +133,7 @@ class SignedGroupKeyStateTest { */ private inner class Device( val publicKey: HexKey, - val db: CurareDatabase, + val db: BennuDatabase, val room: LocalChatRoom ) { /** @@ -213,7 +213,7 @@ class SignedGroupKeyStateTest { */ mlsGroupState: String? = "00" ): Device { - val db = getRoomDatabase(Room.inMemoryDatabaseBuilder()) + val db = getRoomDatabase(Room.inMemoryDatabaseBuilder()) // Profile hangs off a nostr event, and a room off a profile. Neither is // anything this test is about; they are the foreign keys in the way. diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/SubgroupCeremonyInParentRoomTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/SubgroupCeremonyInParentRoomTest.kt similarity index 93% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/managers/SubgroupCeremonyInParentRoomTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/SubgroupCeremonyInParentRoomTest.kt index 2e0eecc4..ed890bc3 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/SubgroupCeremonyInParentRoomTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/SubgroupCeremonyInParentRoomTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import androidx.room3.Room import com.vitorpamplona.quartz.marmot.mip01Groups.MarmotGroupData @@ -20,21 +20,21 @@ import kotlin.test.assertNotNull import kotlin.test.assertNull import kotlin.test.assertTrue import kotlin.time.Instant -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.DkgParticipantMessage -import to.curare.compose.database.model.DkgSession -import to.curare.compose.database.model.MarmotInnerEvent -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Participant -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.types.DkgApprovalStep -import to.curare.compose.database.model.types.DkgRitualStage -import to.curare.compose.extensions.toHex -import to.curare.compose.nostr.Relays -import to.curare.compose.nostr.dkg.DkgRitualEvents +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.DkgParticipantMessage +import com.machankura.bennu.compose.database.model.DkgSession +import com.machankura.bennu.compose.database.model.MarmotInnerEvent +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Participant +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.types.DkgApprovalStep +import com.machankura.bennu.compose.database.model.types.DkgRitualStage +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.nostr.Relays +import com.machankura.bennu.compose.nostr.dkg.DkgRitualEvents /** * A subgroup's key ceremony, held in the room of the group making it. @@ -64,13 +64,13 @@ import to.curare.compose.nostr.dkg.DkgRitualEvents */ class SubgroupCeremonyInParentRoomTest { - private val parent: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val parent: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) /** A second device's database, so a proposal can be received rather than made. */ - private val receiver: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val receiver: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest @@ -122,7 +122,7 @@ class SubgroupCeremonyInParentRoomTest { subject = "Translation" ) - private suspend fun innerEvents(database: CurareDatabase) = database.marmotInnerEventDao() + private suspend fun innerEvents(database: BennuDatabase) = database.marmotInnerEventDao() .getByChatRoomAndKinds(parentRoomId, DkgRitualEvents.ALL.toList()) /** The rumor as the manager queued it, which is what the other side receives. */ @@ -546,7 +546,7 @@ class SubgroupCeremonyInParentRoomTest { return assertNotNull(receiver.chatRoomDao().findChatRoomById(parentRoomId)) } - private suspend fun seedProfile(database: CurareDatabase, publicKey: String) { + private suspend fun seedProfile(database: BennuDatabase, publicKey: String) { if (database.profileDao().getProfileByPublicKey(publicKey) != null) return val nostrEventId = publicKey.take(63) + "f" diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/SubgroupManagerJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/SubgroupManagerJvmTest.kt similarity index 96% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/managers/SubgroupManagerJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/SubgroupManagerJvmTest.kt index e638a3a4..2caaa42f 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/SubgroupManagerJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/SubgroupManagerJvmTest.kt @@ -1,10 +1,10 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import androidx.room3.Room import com.vitorpamplona.quartz.marmot.mip01Groups.MarmotGroupData import com.vitorpamplona.quartz.marmot.mls.crypto.Ed25519 import com.vitorpamplona.quartz.marmot.mls.group.MlsGroup -import to.curare.compose.nostr.Relays +import com.machankura.bennu.compose.nostr.Relays import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray import com.vitorpamplona.quartz.nip01Core.core.toHexKey @@ -28,20 +28,20 @@ import kotlin.test.assertNotNull import kotlin.test.assertNull import kotlin.test.assertTrue import kotlin.time.Instant -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.DkgParticipantMessage -import to.curare.compose.database.model.DkgSession -import to.curare.compose.database.model.types.DkgRitualStage -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Participant -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.extensions.toHex -import to.curare.compose.nostr.dkg.DkgRitualEvents -import to.curare.compose.nostr.subgroup.SubgroupBirthCertificateEvent +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.DkgParticipantMessage +import com.machankura.bennu.compose.database.model.DkgSession +import com.machankura.bennu.compose.database.model.types.DkgRitualStage +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Participant +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.nostr.dkg.DkgRitualEvents +import com.machankura.bennu.compose.nostr.subgroup.SubgroupBirthCertificateEvent /** * What a parent's own record says about its children, and what it refuses to say. @@ -66,8 +66,8 @@ import to.curare.compose.nostr.subgroup.SubgroupBirthCertificateEvent */ class SubgroupManagerJvmTest { - private val db: CurareDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: BennuDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/TranslationBatchProposalJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/TranslationBatchProposalJvmTest.kt similarity index 92% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/managers/TranslationBatchProposalJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/TranslationBatchProposalJvmTest.kt index c8546daa..c4b362d7 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/TranslationBatchProposalJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/TranslationBatchProposalJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import androidx.room3.Room import com.vitorpamplona.quartz.nip01Core.core.Event @@ -13,26 +13,26 @@ import kotlin.test.assertFailsWith import kotlin.test.assertNotEquals import kotlin.test.assertTrue import kotlinx.coroutines.runBlocking -import to.curare.compose.database.CurareDatabase -import to.curare.compose.database.builder.getRoomDatabase -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.DkgParticipantMessage -import to.curare.compose.database.model.DkgSession -import to.curare.compose.database.model.MantraChapter -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.types.DkgRitualStage -import to.curare.compose.extensions.toHex -import to.curare.compose.nostr.dkg.DkgRitualEvents -import to.curare.compose.nostr.nip30303.ChapterEvent -import to.curare.compose.nostr.nip30303.ChunkEvent -import to.curare.compose.nostr.nip30303.TranslationArtifactVersionEvent -import to.curare.compose.nostr.nip30303.TranslationChapterEvent -import to.curare.compose.text.Markdown -import to.curare.compose.ui.view.model.AddChapterViewModel -import to.curare.compose.ui.view.model.AddTranslationArtifactVersionViewModel +import com.machankura.bennu.compose.database.BennuDatabase +import com.machankura.bennu.compose.database.builder.getRoomDatabase +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.DkgParticipantMessage +import com.machankura.bennu.compose.database.model.DkgSession +import com.machankura.bennu.compose.database.model.MantraChapter +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.types.DkgRitualStage +import com.machankura.bennu.compose.extensions.toHex +import com.machankura.bennu.compose.nostr.dkg.DkgRitualEvents +import com.machankura.bennu.compose.nostr.nip30303.ChapterEvent +import com.machankura.bennu.compose.nostr.nip30303.ChunkEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationArtifactVersionEvent +import com.machankura.bennu.compose.nostr.nip30303.TranslationChapterEvent +import com.machankura.bennu.compose.text.Markdown +import com.machankura.bennu.compose.ui.view.model.AddChapterViewModel +import com.machankura.bennu.compose.ui.view.model.AddTranslationArtifactVersionViewModel /** * What a translation proposal actually puts in front of the group. @@ -75,7 +75,7 @@ class TranslationBatchProposalJvmTest { private val artifactVersionId = "b".repeat(64) private val dialectId = "d".repeat(64) - private lateinit var db: CurareDatabase + private lateinit var db: BennuDatabase private lateinit var room: LocalChatRoom @AfterTest @@ -85,7 +85,7 @@ class TranslationBatchProposalJvmTest { /** The proposer's device: a room it can sign in, and the share to sign with. */ private suspend fun openDevice() { - db = getRoomDatabase(Room.inMemoryDatabaseBuilder()) + db = getRoomDatabase(Room.inMemoryDatabaseBuilder()) // Profile hangs off a nostr event, and a room off a profile. Neither is // anything this test is about; they are the foreign keys in the way. diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/WelcomeBundleMatchJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/WelcomeBundleMatchJvmTest.kt similarity index 97% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/managers/WelcomeBundleMatchJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/WelcomeBundleMatchJvmTest.kt index 4d878956..29420338 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/WelcomeBundleMatchJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/WelcomeBundleMatchJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.managers +package com.machankura.bennu.compose.managers import com.vitorpamplona.quartz.marmot.appComponents.CurrentProfileGroupFactory import com.vitorpamplona.quartz.marmot.mip01Groups.MarmotGroupData @@ -9,7 +9,7 @@ import com.vitorpamplona.quartz.nip01Core.core.toHexKey import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal import kotlinx.coroutines.runBlocking -import to.curare.compose.nostr.Relays +import com.machankura.bennu.compose.nostr.Relays import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNull diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/network/relays/RelaysSocketManagerSwitchJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/network/relays/RelaysSocketManagerSwitchJvmTest.kt similarity index 89% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/network/relays/RelaysSocketManagerSwitchJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/network/relays/RelaysSocketManagerSwitchJvmTest.kt index 84f62719..75954fbd 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/network/relays/RelaysSocketManagerSwitchJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/network/relays/RelaysSocketManagerSwitchJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.network.relays +package com.machankura.bennu.compose.network.relays import androidx.datastore.preferences.core.PreferenceDataStoreFactory import fr.acinq.bitcoin.ByteVector32 @@ -22,18 +22,18 @@ import kotlinx.serialization.json.JsonObject import okio.Path.Companion.toPath import org.junit.Rule import org.junit.rules.TemporaryFolder -import to.curare.compose.database.model.Relay -import to.curare.compose.identity.Identity -import to.curare.compose.identity.IdentityKind -import to.curare.compose.identity.toWalletId -import to.curare.compose.network.sockets.NostrIncomingMessage -import to.curare.compose.network.sockets.NostrSocketClient -import to.curare.compose.network.sockets.NostrSocketClientFactory -import to.curare.compose.network.sockets.SocketConnectionClosedCallback -import to.curare.compose.network.sockets.SocketConnectionOpenedCallback -import to.curare.compose.network.sockets.SocketConnectionReopenedCallback -import to.curare.compose.repository.CachingImportRepository -import to.curare.compose.repository.RelayRepository +import com.machankura.bennu.compose.database.model.Relay +import com.machankura.bennu.compose.identity.Identity +import com.machankura.bennu.compose.identity.IdentityKind +import com.machankura.bennu.compose.identity.toWalletId +import com.machankura.bennu.compose.network.sockets.NostrIncomingMessage +import com.machankura.bennu.compose.network.sockets.NostrSocketClient +import com.machankura.bennu.compose.network.sockets.NostrSocketClientFactory +import com.machankura.bennu.compose.network.sockets.SocketConnectionClosedCallback +import com.machankura.bennu.compose.network.sockets.SocketConnectionOpenedCallback +import com.machankura.bennu.compose.network.sockets.SocketConnectionReopenedCallback +import com.machankura.bennu.compose.repository.CachingImportRepository +import com.machankura.bennu.compose.repository.RelayRepository import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/StringCatalogueJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/StringCatalogueJvmTest.kt similarity index 86% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/StringCatalogueJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/StringCatalogueJvmTest.kt index beb1baf2..a5450928 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/StringCatalogueJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/StringCatalogueJvmTest.kt @@ -1,14 +1,14 @@ -package to.curare.compose.ui +package com.machankura.bennu.compose.ui import kotlinx.coroutines.runBlocking -import curare.composeapp.generated.resources.Res -import curare.composeapp.generated.resources.currently_no_messages_have_been_shared -import curare.composeapp.generated.resources.don_t_sign -import curare.composeapp.generated.resources.something_went_wrong -import curare.composeapp.generated.resources.add_chapter_to -import curare.composeapp.generated.resources.chapter_words_characters -import curare.composeapp.generated.resources.sent_a_private_message_to -import curare.composeapp.generated.resources.template_links +import bennu.composeapp.generated.resources.Res +import bennu.composeapp.generated.resources.currently_no_messages_have_been_shared +import bennu.composeapp.generated.resources.don_t_sign +import bennu.composeapp.generated.resources.something_went_wrong +import bennu.composeapp.generated.resources.add_chapter_to +import bennu.composeapp.generated.resources.chapter_words_characters +import bennu.composeapp.generated.resources.sent_a_private_message_to +import bennu.composeapp.generated.resources.template_links import org.jetbrains.compose.resources.getString import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/AcceptCuratedSuggestionScreenJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/AcceptCuratedSuggestionScreenJvmTest.kt similarity index 87% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/AcceptCuratedSuggestionScreenJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/AcceptCuratedSuggestionScreenJvmTest.kt index 3d1a84cf..8529e38f 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/AcceptCuratedSuggestionScreenJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/AcceptCuratedSuggestionScreenJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize @@ -13,25 +13,25 @@ import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performTextReplacement import androidx.compose.ui.test.runDesktopComposeUiTest -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.intermdiate.LocalNostrEvent -import to.curare.compose.nostr.CuratedSuggestion -import to.curare.compose.nostr.GroupCuratedSchema -import to.curare.compose.nostr.curated.CuratedField -import to.curare.compose.nostr.curated.CuratedFieldConfig -import to.curare.compose.nostr.curated.CuratedFieldType -import to.curare.compose.nostr.curated.CuratedSchema -import to.curare.compose.nostr.curated.CuratedSchemaEvent -import to.curare.compose.nostr.curated.CuratedVisibility -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.widgets.ProvideSnackbarHost -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.state.AcceptCuratedSuggestionUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent +import com.machankura.bennu.compose.nostr.CuratedSuggestion +import com.machankura.bennu.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedField +import com.machankura.bennu.compose.nostr.curated.CuratedFieldConfig +import com.machankura.bennu.compose.nostr.curated.CuratedFieldType +import com.machankura.bennu.compose.nostr.curated.CuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaEvent +import com.machankura.bennu.compose.nostr.curated.CuratedVisibility +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.widgets.ProvideSnackbarHost +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.state.AcceptCuratedSuggestionUIState import kotlin.test.Test import kotlin.time.Instant @@ -190,7 +190,7 @@ class AcceptCuratedSuggestionScreenJvmTest { assertions: ComposeUiTest.() -> Unit ) = runDesktopComposeUiTest(width = 400, height = 2400) { setContent { - CurareTheme { + BennuTheme { ProvideSnackbarHost { Box(modifier = Modifier.fillMaxSize()) { AcceptCuratedSuggestionScreen( diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/BroadcastGroupSignedEventScreenJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/BroadcastGroupSignedEventScreenJvmTest.kt similarity index 88% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/BroadcastGroupSignedEventScreenJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/BroadcastGroupSignedEventScreenJvmTest.kt index b740552b..a1ffe4fc 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/BroadcastGroupSignedEventScreenJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/BroadcastGroupSignedEventScreenJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize @@ -17,23 +17,23 @@ import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.exceptions.NostrPublishException -import to.curare.compose.network.dto.RelayDTO -import to.curare.compose.network.relays.EventPublishTransport -import to.curare.compose.network.relays.NostrPublishResult -import to.curare.compose.network.sockets.NostrIncomingMessage -import to.curare.compose.nostr.GroupRelay -import to.curare.compose.nostr.GroupRelayList -import to.curare.compose.nostr.GroupRelaySet -import to.curare.compose.nostr.Relays -import to.curare.compose.repository.ChatRepository -import to.curare.compose.ui.composable.widgets.ProvideSnackbarHost -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.state.BroadcastGroupSignedEventUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.exceptions.NostrPublishException +import com.machankura.bennu.compose.network.dto.RelayDTO +import com.machankura.bennu.compose.network.relays.EventPublishTransport +import com.machankura.bennu.compose.network.relays.NostrPublishResult +import com.machankura.bennu.compose.network.sockets.NostrIncomingMessage +import com.machankura.bennu.compose.nostr.GroupRelay +import com.machankura.bennu.compose.nostr.GroupRelayList +import com.machankura.bennu.compose.nostr.GroupRelaySet +import com.machankura.bennu.compose.nostr.Relays +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.ui.composable.widgets.ProvideSnackbarHost +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.state.BroadcastGroupSignedEventUIState import kotlin.test.Test import kotlin.test.assertTrue import kotlin.time.Instant @@ -217,7 +217,7 @@ class BroadcastGroupSignedEventScreenJvmTest { assertions: ComposeUiTest.() -> Unit ) = runDesktopComposeUiTest(width = 400, height = 1600) { setContent { - CurareTheme { + BennuTheme { ProvideSnackbarHost { Box(modifier = Modifier.fillMaxSize()) { BroadcastGroupSignedEventScreen( diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ChatPaneLayoutJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/ChatPaneLayoutJvmTest.kt similarity index 86% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ChatPaneLayoutJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/ChatPaneLayoutJvmTest.kt index 6b0b1195..901e99b0 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ChatPaneLayoutJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/ChatPaneLayoutJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.ui.test.ExperimentalTestApi import androidx.compose.ui.test.assertIsDisplayed @@ -9,17 +9,17 @@ import androidx.compose.ui.test.runDesktopComposeUiTest import androidx.compose.ui.unit.dp import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.intermdiate.LocalProfileWithFollowing -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.DkgRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.widgets.ProvideSnackbarHost -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.state.HomeScreenUIState +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalProfileWithFollowing +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.DkgRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.widgets.ProvideSnackbarHost +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.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() { - CurareTheme { + BennuTheme { // 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/to/curare/compose/ui/composable/ChatPaneSelectionJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/ChatPaneSelectionJvmTest.kt similarity index 89% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ChatPaneSelectionJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/ChatPaneSelectionJvmTest.kt index 543b2ded..e5172f12 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ChatPaneSelectionJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/ChatPaneSelectionJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.runtime.Composable import androidx.compose.ui.test.ComposeUiTest @@ -15,20 +15,20 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.onCompletion -import to.curare.compose.database.model.ChatMessage -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalChatMessage -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.intermdiate.LocalProfileWithFollowing -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.DkgRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.widgets.ProvideSnackbarHost -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.state.HomeScreenUIState +import com.machankura.bennu.compose.database.model.ChatMessage +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatMessage +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalProfileWithFollowing +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.DkgRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.widgets.ProvideSnackbarHost +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.state.HomeScreenUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent import java.util.concurrent.ConcurrentHashMap @@ -120,7 +120,7 @@ class ChatPaneSelectionJvmTest { @Composable private fun Home() { - CurareTheme { + BennuTheme { ProvideSnackbarHost { HomeScreen( activeUserPublicKey = publicKey, diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ChatRoomMemberRowJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/ChatRoomMemberRowJvmTest.kt similarity index 80% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ChatRoomMemberRowJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/ChatRoomMemberRowJvmTest.kt index 3eb08dbd..dc3ce8d2 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ChatRoomMemberRowJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/ChatRoomMemberRowJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize @@ -8,19 +8,19 @@ import androidx.compose.ui.test.ExperimentalTestApi import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.runDesktopComposeUiTest -import to.curare.compose.database.model.Participant -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalParticipant -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.MantraRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.activeUserPublicKey -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.chatRoomId -import to.curare.compose.ui.composable.navigation.routes.ProfilePreviewRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.ProvideSnackbarHost -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.state.ChatRoomDetailUIState +import com.machankura.bennu.compose.database.model.Participant +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalParticipant +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.MantraRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.activeUserPublicKey +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.chatRoomId +import com.machankura.bennu.compose.ui.composable.navigation.routes.ProfilePreviewRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.ProvideSnackbarHost +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.state.ChatRoomDetailUIState import kotlin.test.Test import kotlin.test.assertEquals @@ -102,7 +102,7 @@ class ChatRoomMemberRowJvmTest { assertions: ComposeUiTest.() -> Unit, ) = runDesktopComposeUiTest(width = 400, height = 4000) { setContent { - CurareTheme { + BennuTheme { ProvideSnackbarHost { Box(modifier = Modifier.fillMaxSize()) { ChatRoomDetailScreen( diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/CreateProfileScreenJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/CreateProfileScreenJvmTest.kt similarity index 77% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/CreateProfileScreenJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/CreateProfileScreenJvmTest.kt index a239a21d..5b4f6b7e 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/CreateProfileScreenJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/CreateProfileScreenJvmTest.kt @@ -1,16 +1,16 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable 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 to.curare.compose.database.model.Profile -import to.curare.compose.identity.NewProfileWriter -import to.curare.compose.repository.MarmotRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.widgets.ProvideSnackbarHost -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.state.CreateProfileUIState +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.identity.NewProfileWriter +import com.machankura.bennu.compose.repository.MarmotRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.widgets.ProvideSnackbarHost +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.state.CreateProfileUIState import kotlin.test.Test /** @@ -27,7 +27,7 @@ class CreateProfileScreenJvmTest { @Test fun `the screen that adds a profile cannot wipe the others`() = runDesktopComposeUiTest(400, 900) { setContent { - CurareTheme { + BennuTheme { ProvideSnackbarHost { CreateProfileScreen( initialCreateProfileUIState = CreateProfileUIState.ProfileReady( diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/CuratedSuggestionListScreenJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/CuratedSuggestionListScreenJvmTest.kt similarity index 90% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/CuratedSuggestionListScreenJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/CuratedSuggestionListScreenJvmTest.kt index 916f4054..5c960dd7 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/CuratedSuggestionListScreenJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/CuratedSuggestionListScreenJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize @@ -12,25 +12,25 @@ import androidx.compose.ui.test.onAllNodesWithText import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.runDesktopComposeUiTest -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.CuratedSuggestion -import to.curare.compose.nostr.GroupCuratedSchema -import to.curare.compose.nostr.curated.CuratedEntry -import to.curare.compose.nostr.curated.CuratedField -import to.curare.compose.nostr.curated.CuratedFieldConfig -import to.curare.compose.nostr.curated.CuratedFieldType -import to.curare.compose.nostr.curated.CuratedSchema -import to.curare.compose.nostr.curated.CuratedSchemaEvent -import to.curare.compose.nostr.curated.CuratedVisibility -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.widgets.ProvideSnackbarHost -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.state.CuratedSuggestionListUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.CuratedSuggestion +import com.machankura.bennu.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedEntry +import com.machankura.bennu.compose.nostr.curated.CuratedField +import com.machankura.bennu.compose.nostr.curated.CuratedFieldConfig +import com.machankura.bennu.compose.nostr.curated.CuratedFieldType +import com.machankura.bennu.compose.nostr.curated.CuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaEvent +import com.machankura.bennu.compose.nostr.curated.CuratedVisibility +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.widgets.ProvideSnackbarHost +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.state.CuratedSuggestionListUIState import kotlin.test.Test import kotlin.test.assertTrue import kotlin.time.Instant @@ -190,7 +190,7 @@ class CuratedSuggestionListScreenJvmTest { var accepted = false setContent { - CurareTheme { + BennuTheme { ProvideSnackbarHost { CuratedSuggestionSheetContent( suggestion = suggestion("Magic Money", 1_700_000_000, isCurated = false), @@ -223,7 +223,7 @@ class CuratedSuggestionListScreenJvmTest { fun `a suggestion the group already took up offers a revision, not a second acceptance`() = runDesktopComposeUiTest(width = 400, height = 2000) { setContent { - CurareTheme { + BennuTheme { ProvideSnackbarHost { CuratedSuggestionSheetContent( suggestion = suggestion("Magic Money", 1_700_000_000, isCurated = true), @@ -309,7 +309,7 @@ class CuratedSuggestionListScreenJvmTest { assertions: ComposeUiTest.() -> Unit ) = runDesktopComposeUiTest(width = 400, height = 2000) { setContent { - CurareTheme { + BennuTheme { ProvideSnackbarHost { Box(modifier = Modifier.fillMaxSize()) { CuratedSuggestionListScreen( diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/EditGroupCuratedSchemaScreenJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/EditGroupCuratedSchemaScreenJvmTest.kt similarity index 90% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/EditGroupCuratedSchemaScreenJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/EditGroupCuratedSchemaScreenJvmTest.kt index c1e7211f..fdd41e05 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/EditGroupCuratedSchemaScreenJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/EditGroupCuratedSchemaScreenJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize @@ -17,24 +17,24 @@ import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.runDesktopComposeUiTest -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.extensions.hexToNpubHrp -import to.curare.compose.nostr.GroupCuratedSchema -import to.curare.compose.nostr.curated.CuratedField -import to.curare.compose.nostr.curated.CuratedFieldConfig -import to.curare.compose.nostr.curated.CuratedFieldType -import to.curare.compose.nostr.curated.CuratedSchema -import to.curare.compose.nostr.curated.CuratedSchemaEvent -import to.curare.compose.nostr.curated.CuratedSchemaTemplate -import to.curare.compose.nostr.curated.CuratedVisibility -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.ui.composable.widgets.ProvideSnackbarHost -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.model.EditGroupCuratedSchemaViewModel -import to.curare.compose.ui.view.state.EditGroupCuratedSchemaUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.extensions.hexToNpubHrp +import com.machankura.bennu.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedField +import com.machankura.bennu.compose.nostr.curated.CuratedFieldConfig +import com.machankura.bennu.compose.nostr.curated.CuratedFieldType +import com.machankura.bennu.compose.nostr.curated.CuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaEvent +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaTemplate +import com.machankura.bennu.compose.nostr.curated.CuratedVisibility +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.ui.composable.widgets.ProvideSnackbarHost +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.model.EditGroupCuratedSchemaViewModel +import com.machankura.bennu.compose.ui.view.state.EditGroupCuratedSchemaUIState import kotlin.test.Test import kotlin.test.assertTrue import kotlin.time.Instant @@ -251,7 +251,7 @@ class EditGroupCuratedSchemaScreenJvmTest { assertions: ComposeUiTest.() -> Unit ) = runDesktopComposeUiTest(width = 400, height = 3000) { setContent { - CurareTheme { + BennuTheme { ProvideSnackbarHost { Box(modifier = Modifier.fillMaxSize()) { EditGroupCuratedSchemaScreen( @@ -287,7 +287,7 @@ class EditGroupCuratedSchemaScreenJvmTest { assertions: ComposeUiTest.() -> Unit ) = runDesktopComposeUiTest(width = 400, height = 2000) { setContent { - CurareTheme { + BennuTheme { ProvideSnackbarHost { Box(modifier = Modifier.fillMaxSize()) { FieldEditorSheetContent( diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupCuratedEntriesScreenJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/GroupCuratedEntriesScreenJvmTest.kt similarity index 87% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupCuratedEntriesScreenJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/GroupCuratedEntriesScreenJvmTest.kt index 1d931e6c..606a5ce5 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupCuratedEntriesScreenJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/GroupCuratedEntriesScreenJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize @@ -15,25 +15,25 @@ import androidx.compose.ui.test.runDesktopComposeUiTest import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.exceptions.NostrPublishException -import to.curare.compose.network.dto.RelayDTO -import to.curare.compose.network.relays.EventPublishTransport -import to.curare.compose.network.relays.NostrPublishResult -import to.curare.compose.network.sockets.NostrIncomingMessage -import to.curare.compose.nostr.GroupCuratedEntry -import to.curare.compose.nostr.GroupRelay -import to.curare.compose.nostr.GroupRelayList -import to.curare.compose.nostr.GroupRelaySet -import to.curare.compose.repository.ChatRepository -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.activeUserPublicKey -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.chatRoomId -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.entry -import to.curare.compose.ui.composable.navigation.routes.BroadcastGroupSignedEventRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.ProvideSnackbarHost -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.state.GroupCuratedEntriesUIState +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.exceptions.NostrPublishException +import com.machankura.bennu.compose.network.dto.RelayDTO +import com.machankura.bennu.compose.network.relays.EventPublishTransport +import com.machankura.bennu.compose.network.relays.NostrPublishResult +import com.machankura.bennu.compose.network.sockets.NostrIncomingMessage +import com.machankura.bennu.compose.nostr.GroupCuratedEntry +import com.machankura.bennu.compose.nostr.GroupRelay +import com.machankura.bennu.compose.nostr.GroupRelayList +import com.machankura.bennu.compose.nostr.GroupRelaySet +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.activeUserPublicKey +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.chatRoomId +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.entry +import com.machankura.bennu.compose.ui.composable.navigation.routes.BroadcastGroupSignedEventRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.ProvideSnackbarHost +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.state.GroupCuratedEntriesUIState import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue @@ -217,7 +217,7 @@ class GroupCuratedEntriesScreenJvmTest { assertions: ComposeUiTest.() -> Unit ) = runDesktopComposeUiTest(width = 400, height = 2000) { setContent { - CurareTheme { + BennuTheme { ProvideSnackbarHost { Box(modifier = Modifier.fillMaxSize()) { GroupCuratedEntriesScreen( diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupCuratedSchemasScreenJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/GroupCuratedSchemasScreenJvmTest.kt similarity index 88% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupCuratedSchemasScreenJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/GroupCuratedSchemasScreenJvmTest.kt index a33cbee7..3ff0e362 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupCuratedSchemasScreenJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/GroupCuratedSchemasScreenJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize @@ -13,19 +13,19 @@ import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.runDesktopComposeUiTest -import to.curare.compose.nostr.GroupCuratedSchema -import to.curare.compose.repository.ChatRepository -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.activeUserPublicKey -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.chatRoomId -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.schema -import to.curare.compose.ui.composable.navigation.routes.BroadcastGroupSignedEventRoute -import to.curare.compose.ui.composable.navigation.routes.CuratedSuggestionListRoute -import to.curare.compose.ui.composable.navigation.routes.EditGroupCuratedSchemaRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.navigation.routes.SelectCuratedSchemaTemplateRoute -import to.curare.compose.ui.composable.widgets.ProvideSnackbarHost -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.state.GroupCuratedSchemasUIState +import com.machankura.bennu.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.activeUserPublicKey +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.chatRoomId +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.schema +import com.machankura.bennu.compose.ui.composable.navigation.routes.BroadcastGroupSignedEventRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.CuratedSuggestionListRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.EditGroupCuratedSchemaRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.navigation.routes.SelectCuratedSchemaTemplateRoute +import com.machankura.bennu.compose.ui.composable.widgets.ProvideSnackbarHost +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.state.GroupCuratedSchemasUIState import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNull @@ -213,7 +213,7 @@ class GroupCuratedSchemasScreenJvmTest { assertions: ComposeUiTest.() -> Unit ) = runDesktopComposeUiTest(width = 400, height = 2000) { setContent { - CurareTheme { + BennuTheme { ProvideSnackbarHost { Box(modifier = Modifier.fillMaxSize()) { GroupCuratedSchemasScreen( diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupKeyStateSheetLayoutJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/GroupKeyStateSheetLayoutJvmTest.kt similarity index 91% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupKeyStateSheetLayoutJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/GroupKeyStateSheetLayoutJvmTest.kt index d20c75c8..28fcfd31 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupKeyStateSheetLayoutJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/GroupKeyStateSheetLayoutJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxWidth @@ -14,11 +14,11 @@ import androidx.compose.ui.unit.dp import com.vitorpamplona.quartz.nip01Core.core.Event import kotlin.test.Test import kotlin.time.Instant -import to.curare.compose.database.model.GroupKeyState -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.nostr.frost.GroupKeyStateEvent -import to.curare.compose.ui.composable.widgets.ProvideSnackbarHost -import to.curare.compose.ui.theme.CurareTheme +import com.machankura.bennu.compose.database.model.GroupKeyState +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.nostr.frost.GroupKeyStateEvent +import com.machankura.bennu.compose.ui.composable.widgets.ProvideSnackbarHost +import com.machankura.bennu.compose.ui.theme.BennuTheme /** * 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 { - CurareTheme { + BennuTheme { // 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 { - CurareTheme { + BennuTheme { ProvideSnackbarHost { Box(modifier = Modifier.width(phoneWidth).testTag(SHEET)) { GroupKeyStateSheetContent( diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupNostrProfileScreenJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/GroupNostrProfileScreenJvmTest.kt similarity index 85% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupNostrProfileScreenJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/GroupNostrProfileScreenJvmTest.kt index 651b1c30..ef996630 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupNostrProfileScreenJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/GroupNostrProfileScreenJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize @@ -12,17 +12,17 @@ import androidx.compose.ui.test.onAllNodesWithText import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.runDesktopComposeUiTest -import to.curare.compose.nostr.GroupNostrProfile -import to.curare.compose.repository.ChatRepository -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.activeUserPublicKey -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.chatRoomId -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.profile -import to.curare.compose.ui.composable.navigation.routes.BroadcastGroupSignedEventRoute -import to.curare.compose.ui.composable.navigation.routes.EditGroupNostrProfileRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.ProvideSnackbarHost -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.state.GroupNostrProfileUIState +import com.machankura.bennu.compose.nostr.GroupNostrProfile +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.activeUserPublicKey +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.chatRoomId +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.profile +import com.machankura.bennu.compose.ui.composable.navigation.routes.BroadcastGroupSignedEventRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.EditGroupNostrProfileRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.ProvideSnackbarHost +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.state.GroupNostrProfileUIState import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue @@ -131,7 +131,7 @@ class GroupNostrProfileScreenJvmTest { assertions: ComposeUiTest.() -> Unit ) = runDesktopComposeUiTest(width = 400, height = 2000) { setContent { - CurareTheme { + BennuTheme { ProvideSnackbarHost { Box(modifier = Modifier.fillMaxSize()) { GroupNostrProfileScreen( diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupPostsScreenJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/GroupPostsScreenJvmTest.kt similarity index 85% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupPostsScreenJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/GroupPostsScreenJvmTest.kt index ffa985c7..21ee20b8 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupPostsScreenJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/GroupPostsScreenJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize @@ -12,19 +12,19 @@ import androidx.compose.ui.test.onAllNodesWithText import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.runDesktopComposeUiTest -import to.curare.compose.nostr.GroupNostrProfile -import to.curare.compose.nostr.GroupPost -import to.curare.compose.repository.ChatRepository -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.activeUserPublicKey -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.chatRoomId -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.post -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.profile -import to.curare.compose.ui.composable.navigation.routes.AddGroupPostRoute -import to.curare.compose.ui.composable.navigation.routes.BroadcastGroupSignedEventRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.ProvideSnackbarHost -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.state.GroupPostsUIState +import com.machankura.bennu.compose.nostr.GroupNostrProfile +import com.machankura.bennu.compose.nostr.GroupPost +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.activeUserPublicKey +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.chatRoomId +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.post +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.profile +import com.machankura.bennu.compose.ui.composable.navigation.routes.AddGroupPostRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.BroadcastGroupSignedEventRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.ProvideSnackbarHost +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.state.GroupPostsUIState import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue @@ -145,7 +145,7 @@ class GroupPostsScreenJvmTest { assertions: ComposeUiTest.() -> Unit ) = runDesktopComposeUiTest(width = 400, height = 2000) { setContent { - CurareTheme { + BennuTheme { ProvideSnackbarHost { Box(modifier = Modifier.fillMaxSize()) { GroupPostsScreen( diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupRelaysScreenJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/GroupRelaysScreenJvmTest.kt similarity index 83% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupRelaysScreenJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/GroupRelaysScreenJvmTest.kt index 8c1768f7..0e8368fa 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupRelaysScreenJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/GroupRelaysScreenJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize @@ -12,18 +12,18 @@ import androidx.compose.ui.test.onAllNodesWithText import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.runDesktopComposeUiTest -import to.curare.compose.nostr.GroupRelaySet -import to.curare.compose.repository.ChatRepository -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.activeUserPublicKey -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.chatRoomId -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.relaySignedEvent -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.signedRelayLists -import to.curare.compose.ui.composable.navigation.routes.BroadcastGroupSignedEventRoute -import to.curare.compose.ui.composable.navigation.routes.EditGroupRelaysRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.ProvideSnackbarHost -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.state.GroupRelaysUIState +import com.machankura.bennu.compose.nostr.GroupRelaySet +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.activeUserPublicKey +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.chatRoomId +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.relaySignedEvent +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.signedRelayLists +import com.machankura.bennu.compose.ui.composable.navigation.routes.BroadcastGroupSignedEventRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.EditGroupRelaysRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.ProvideSnackbarHost +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.state.GroupRelaysUIState import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue @@ -117,7 +117,7 @@ class GroupRelaysScreenJvmTest { assertions: ComposeUiTest.() -> Unit ) = runDesktopComposeUiTest(width = 400, height = 2000) { setContent { - CurareTheme { + BennuTheme { ProvideSnackbarHost { Box(modifier = Modifier.fillMaxSize()) { GroupRelaysScreen( diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupSignedWorkFixtures.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/GroupSignedWorkFixtures.kt similarity index 85% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupSignedWorkFixtures.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/GroupSignedWorkFixtures.kt index a150876b..023fec93 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupSignedWorkFixtures.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/GroupSignedWorkFixtures.kt @@ -1,28 +1,28 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip01Core.metadata.UserMetadata import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.GroupKeyState -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.nostr.GroupCuratedEntry -import to.curare.compose.nostr.GroupCuratedSchema -import to.curare.compose.nostr.GroupNostrProfile -import to.curare.compose.nostr.GroupPost -import to.curare.compose.nostr.GroupRelay -import to.curare.compose.nostr.GroupRelayList -import to.curare.compose.nostr.GroupRelaySet -import to.curare.compose.nostr.curated.CuratedEntry -import to.curare.compose.nostr.curated.CuratedEntryEvent -import to.curare.compose.nostr.curated.CuratedField -import to.curare.compose.nostr.curated.CuratedFieldType -import to.curare.compose.nostr.curated.CuratedSchema -import to.curare.compose.nostr.curated.CuratedSchemaEvent -import to.curare.compose.nostr.curated.CuratedSuggestionRef -import to.curare.compose.nostr.curated.CuratedVisibility +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.GroupKeyState +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.nostr.GroupCuratedEntry +import com.machankura.bennu.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.nostr.GroupNostrProfile +import com.machankura.bennu.compose.nostr.GroupPost +import com.machankura.bennu.compose.nostr.GroupRelay +import com.machankura.bennu.compose.nostr.GroupRelayList +import com.machankura.bennu.compose.nostr.GroupRelaySet +import com.machankura.bennu.compose.nostr.curated.CuratedEntry +import com.machankura.bennu.compose.nostr.curated.CuratedEntryEvent +import com.machankura.bennu.compose.nostr.curated.CuratedField +import com.machankura.bennu.compose.nostr.curated.CuratedFieldType +import com.machankura.bennu.compose.nostr.curated.CuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaEvent +import com.machankura.bennu.compose.nostr.curated.CuratedSuggestionRef +import com.machankura.bennu.compose.nostr.curated.CuratedVisibility import kotlin.time.Instant /** diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupSignedWorkRowsJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/GroupSignedWorkRowsJvmTest.kt similarity index 86% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupSignedWorkRowsJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/GroupSignedWorkRowsJvmTest.kt index c9421bc1..ae73a17e 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupSignedWorkRowsJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/GroupSignedWorkRowsJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize @@ -13,30 +13,30 @@ import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.runDesktopComposeUiTest import com.vitorpamplona.quartz.nip01Core.metadata.UserMetadata -import to.curare.compose.nostr.GroupCuratedEntry -import to.curare.compose.nostr.GroupCuratedSchema -import to.curare.compose.nostr.GroupNostrProfile -import to.curare.compose.nostr.GroupPost -import to.curare.compose.nostr.GroupRelayList -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.MantraRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.activeUserPublicKey -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.chatRoomId -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.entry -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.post -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.profile -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.schema -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.signedRelayLists -import to.curare.compose.ui.composable.navigation.routes.GroupCuratedEntriesRoute -import to.curare.compose.ui.composable.navigation.routes.GroupCuratedSchemasRoute -import to.curare.compose.ui.composable.navigation.routes.GroupNostrProfileRoute -import to.curare.compose.ui.composable.navigation.routes.GroupPostsRoute -import to.curare.compose.ui.composable.navigation.routes.GroupRelaysRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.ProvideSnackbarHost -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.state.ChatRoomDetailUIState +import com.machankura.bennu.compose.nostr.GroupCuratedEntry +import com.machankura.bennu.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.nostr.GroupNostrProfile +import com.machankura.bennu.compose.nostr.GroupPost +import com.machankura.bennu.compose.nostr.GroupRelayList +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.MantraRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.activeUserPublicKey +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.chatRoomId +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.entry +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.post +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.profile +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.schema +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.signedRelayLists +import com.machankura.bennu.compose.ui.composable.navigation.routes.GroupCuratedEntriesRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.GroupCuratedSchemasRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.GroupNostrProfileRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.GroupPostsRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.GroupRelaysRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.ProvideSnackbarHost +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.state.ChatRoomDetailUIState import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue @@ -257,7 +257,7 @@ class GroupSignedWorkRowsJvmTest { assertions: ComposeUiTest.() -> Unit ) = runDesktopComposeUiTest(width = 400, height = 4000) { setContent { - CurareTheme { + BennuTheme { ProvideSnackbarHost { Box(modifier = Modifier.fillMaxSize()) { ChatRoomDetailScreen( diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/NavigateBackButtonJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/NavigateBackButtonJvmTest.kt similarity index 85% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/NavigateBackButtonJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/NavigateBackButtonJvmTest.kt index 414ad06c..5f3ae814 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/NavigateBackButtonJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/NavigateBackButtonJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.runtime.Composable import androidx.compose.ui.test.ExperimentalTestApi @@ -6,15 +6,15 @@ import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.performClick import androidx.compose.ui.test.runDesktopComposeUiTest -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.DkgRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.widgets.ProvideSnackbarHost -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.state.ChatRoomMessagingUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.DkgRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.widgets.ProvideSnackbarHost +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.state.ChatRoomMessagingUIState import kotlin.test.Test import kotlin.test.assertTrue @@ -70,7 +70,7 @@ class NavigateBackButtonJvmTest { @Composable private fun Chat(onNavigateBack: (() -> Unit)?) { - CurareTheme { + BennuTheme { ProvideSnackbarHost { ChatRoomMessagingScreen( activeUserPublicKey = "a".repeat(64), @@ -102,7 +102,7 @@ class NavigateBackButtonJvmTest { @Composable private fun Placeholder(onNavigateBack: (() -> Unit)?) { - CurareTheme { + BennuTheme { ProvideSnackbarHost { ImplementationPendingScreen(text = "Learn more", onNavigateBack = onNavigateBack) } diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ProfilePreviewScreenJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/ProfilePreviewScreenJvmTest.kt similarity index 85% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ProfilePreviewScreenJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/ProfilePreviewScreenJvmTest.kt index 195661e5..e06e1082 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ProfilePreviewScreenJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/ProfilePreviewScreenJvmTest.kt @@ -1,6 +1,6 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable -import to.curare.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.nostr.MarmotProfile import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.runtime.CompositionLocalProvider @@ -15,21 +15,21 @@ import androidx.compose.ui.test.performClick import androidx.compose.ui.test.runDesktopComposeUiTest import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf -import to.curare.compose.database.model.MarmotKeyPackage -import to.curare.compose.database.model.NegentropySynchronizeRequest -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.SynchronizeNostrEventRequest -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.repository.ChatRepository -import to.curare.compose.extensions.hexToNpubHrp -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.LocalCanSign -import to.curare.compose.ui.composable.widgets.ProvideSnackbarHost -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.state.ProfilePreviewUIState -import to.curare.compose.ui.view.state.ProfilePreviewUIState.Readiness +import com.machankura.bennu.compose.database.model.MarmotKeyPackage +import com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.SynchronizeNostrEventRequest +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.extensions.hexToNpubHrp +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.LocalCanSign +import com.machankura.bennu.compose.ui.composable.widgets.ProvideSnackbarHost +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.state.ProfilePreviewUIState +import com.machankura.bennu.compose.ui.view.state.ProfilePreviewUIState.Readiness import kotlin.test.Test import kotlin.test.assertEquals @@ -125,11 +125,11 @@ class ProfilePreviewScreenJvmTest { } @Test - fun `a person not yet on Curare cannot be written to, and the reason is under the button`() = render( - ProfilePreviewUIState.Loaded(profile = alice, readiness = Readiness.NotYetOnCurare) + fun `a person not yet on Bennu cannot be written to, and the reason is under the button`() = render( + ProfilePreviewUIState.Loaded(profile = alice, readiness = Readiness.NotYetOnBennu) ) { onNodeWithText("Start new chat").assertIsNotEnabled() - onNodeWithText("Alice hasn't set up messaging on Curare yet. Try again later, or ask them to open Curare.").assertIsDisplayed() + onNodeWithText("Alice hasn't set up messaging on Bennu yet. Try again later, or ask them to open Bennu.").assertIsDisplayed() onNodeWithText("Try again").assertIsDisplayed() } @@ -198,7 +198,7 @@ class ProfilePreviewScreenJvmTest { assertions: ComposeUiTest.() -> Unit, ) = runDesktopComposeUiTest(width = 400, height = 1200) { setContent { - CurareTheme { + BennuTheme { ProvideSnackbarHost { CompositionLocalProvider(LocalCanSign provides canSign) { Box(modifier = Modifier.fillMaxSize()) { diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ProfilesScreenJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/ProfilesScreenJvmTest.kt similarity index 92% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ProfilesScreenJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/ProfilesScreenJvmTest.kt index a6d4aacd..651e79f0 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ProfilesScreenJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/ProfilesScreenJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.runtime.Composable import androidx.compose.ui.test.ComposeUiTest @@ -25,15 +25,15 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.flowOf import okio.Path.Companion.toPath -import to.curare.compose.database.model.Profile -import to.curare.compose.extensions.hexToNpubHrp -import to.curare.compose.identity.Identity -import to.curare.compose.identity.IdentityKind -import to.curare.compose.identity.StoredIdentity -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.widgets.ProvideSnackbarHost -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.model.ProfilesViewModel +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.extensions.hexToNpubHrp +import com.machankura.bennu.compose.identity.Identity +import com.machankura.bennu.compose.identity.IdentityKind +import com.machankura.bennu.compose.identity.StoredIdentity +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.widgets.ProvideSnackbarHost +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.model.ProfilesViewModel import java.nio.file.Files import kotlin.test.Test import kotlin.test.assertEquals @@ -98,7 +98,7 @@ class ProfilesScreenJvmTest { @Composable private fun Screen(viewModel: ProfilesViewModel, onRetry: () -> Unit = {}) { - CurareTheme { + BennuTheme { ProvideSnackbarHost { ProfilesScreen( viewModel = viewModel, diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ProposalListScreenJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/ProposalListScreenJvmTest.kt similarity index 96% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ProposalListScreenJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/ProposalListScreenJvmTest.kt index 7bb58e00..a16804d8 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ProposalListScreenJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/ProposalListScreenJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize @@ -16,19 +16,19 @@ import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performScrollTo import androidx.compose.ui.test.runDesktopComposeUiTest -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.types.FrostSigningStage -import to.curare.compose.repository.ChatRepository -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.text.ProposedEvent -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.activeUserPublicKey -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.chatRoomId -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.ProvideSnackbarHost -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.state.ProposalFilter -import to.curare.compose.ui.view.state.ProposalListUIState +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.types.FrostSigningStage +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.text.ProposedEvent +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.activeUserPublicKey +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.chatRoomId +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.ProvideSnackbarHost +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.state.ProposalFilter +import com.machankura.bennu.compose.ui.view.state.ProposalListUIState import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNull @@ -655,7 +655,7 @@ class ProposalListScreenJvmTest { assertions: ComposeUiTest.() -> Unit ) = runDesktopComposeUiTest(width = 500, height = 1600) { setContent { - CurareTheme { + BennuTheme { ProvideSnackbarHost { Box(modifier = Modifier.fillMaxSize()) { ProposalListScreen( diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ProposeGroupEventScreenJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/ProposeGroupEventScreenJvmTest.kt similarity index 89% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ProposeGroupEventScreenJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/ProposeGroupEventScreenJvmTest.kt index f0dab9e7..dceea08e 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ProposeGroupEventScreenJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/ProposeGroupEventScreenJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize @@ -11,13 +11,13 @@ import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performTextInput import androidx.compose.ui.test.runDesktopComposeUiTest -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.ui.composable.widgets.ProvideSnackbarHost -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.state.ProposeGroupEventUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.ui.composable.widgets.ProvideSnackbarHost +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.state.ProposeGroupEventUIState import kotlin.test.Test /** @@ -93,7 +93,7 @@ class ProposeGroupEventScreenJvmTest { assertions: ComposeUiTest.() -> Unit ) = runDesktopComposeUiTest(width = 400, height = 1200) { setContent { - CurareTheme { + BennuTheme { ProvideSnackbarHost { Box(modifier = Modifier.fillMaxSize()) { ProposeGroupEventScreen( diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ReadOnlyEntrancesJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/ReadOnlyEntrancesJvmTest.kt similarity index 90% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ReadOnlyEntrancesJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/ReadOnlyEntrancesJvmTest.kt index 8142d231..b8b2313d 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ReadOnlyEntrancesJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/ReadOnlyEntrancesJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider @@ -16,35 +16,35 @@ import fr.acinq.phoenix.utils.preferences.InternalPrefs import fr.acinq.phoenix.utils.preferences.UserPrefs import kotlinx.coroutines.flow.MutableStateFlow import okio.Path.Companion.toPath -import to.curare.compose.database.GENESIS_AT -import to.curare.compose.database.model.SynchronizeNostrEventRequest -import to.curare.compose.database.model.UnsignedNostrEvent -import to.curare.compose.database.model.intermdiate.LocalAccount -import to.curare.compose.database.model.types.SynchronizationFilter -import to.curare.compose.extensions.hexToNpubHrp -import to.curare.compose.identity.Identity -import to.curare.compose.nostr.SignInSync +import com.machankura.bennu.compose.database.GENESIS_AT +import com.machankura.bennu.compose.database.model.SynchronizeNostrEventRequest +import com.machankura.bennu.compose.database.model.UnsignedNostrEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalAccount +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.extensions.hexToNpubHrp +import com.machankura.bennu.compose.identity.Identity +import com.machankura.bennu.compose.nostr.SignInSync import java.nio.file.Files import kotlin.time.Instant import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.intermdiate.LocalNostrEvent -import to.curare.compose.database.model.intermdiate.LocalProfileWithFollowing -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.DkgRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.widgets.LocalCanSign -import to.curare.compose.ui.composable.widgets.ProvideSnackbarHost -import to.curare.compose.ui.theme.CurareTheme -import to.curare.compose.ui.view.state.ActiveProfileUIState -import to.curare.compose.ui.view.state.HomeScreenUIState -import to.curare.compose.ui.view.state.ProfilePreviewUIState +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalProfileWithFollowing +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.DkgRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.widgets.LocalCanSign +import com.machankura.bennu.compose.ui.composable.widgets.ProvideSnackbarHost +import com.machankura.bennu.compose.ui.theme.BennuTheme +import com.machankura.bennu.compose.ui.view.state.ActiveProfileUIState +import com.machankura.bennu.compose.ui.view.state.HomeScreenUIState +import com.machankura.bennu.compose.ui.view.state.ProfilePreviewUIState import kotlin.test.Test import kotlin.test.assertEquals @@ -261,7 +261,7 @@ class ReadOnlyEntrancesJvmTest { @Composable private fun AsIdentity(canSign: Boolean, content: @Composable () -> Unit) { - CurareTheme { + BennuTheme { ProvideSnackbarHost { CompositionLocalProvider(LocalCanSign provides canSign) { content() diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/SelectCuratedSchemaTemplateScreenJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/SelectCuratedSchemaTemplateScreenJvmTest.kt similarity index 87% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/SelectCuratedSchemaTemplateScreenJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/SelectCuratedSchemaTemplateScreenJvmTest.kt index a41a5908..f6343208 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/SelectCuratedSchemaTemplateScreenJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/SelectCuratedSchemaTemplateScreenJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable +package com.machankura.bennu.compose.ui.composable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize @@ -11,13 +11,13 @@ import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.runDesktopComposeUiTest -import to.curare.compose.nostr.curated.CuratedSchemaTemplate -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.activeUserPublicKey -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.chatRoomId -import to.curare.compose.ui.composable.navigation.routes.EditGroupCuratedSchemaRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.ProvideSnackbarHost -import to.curare.compose.ui.theme.CurareTheme +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaTemplate +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.activeUserPublicKey +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.chatRoomId +import com.machankura.bennu.compose.ui.composable.navigation.routes.EditGroupCuratedSchemaRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.ProvideSnackbarHost +import com.machankura.bennu.compose.ui.theme.BennuTheme import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue @@ -95,7 +95,7 @@ class SelectCuratedSchemaTemplateScreenJvmTest { assertions: ComposeUiTest.() -> Unit ) = runDesktopComposeUiTest(width = 400, height = 1600) { setContent { - CurareTheme { + BennuTheme { ProvideSnackbarHost { Box(modifier = Modifier.fillMaxSize()) { SelectCuratedSchemaTemplateScreen( diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/navigation/NavigationSuiteRenderJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/navigation/NavigationSuiteRenderJvmTest.kt similarity index 91% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/navigation/NavigationSuiteRenderJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/navigation/NavigationSuiteRenderJvmTest.kt index 2696f4f5..62b4a80a 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/navigation/NavigationSuiteRenderJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/navigation/NavigationSuiteRenderJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.navigation +package com.machankura.bennu.compose.ui.composable.navigation import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -14,12 +14,12 @@ import androidx.navigation.NavHostController import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController -import to.curare.compose.ui.composable.navigation.routes.ActiveProfileRoute -import to.curare.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute -import to.curare.compose.ui.composable.navigation.routes.HomeRoute -import to.curare.compose.ui.composable.navigation.routes.SearchRoute -import to.curare.compose.ui.theme.Breakpoint -import to.curare.compose.ui.theme.CurareTheme +import com.machankura.bennu.compose.ui.composable.navigation.routes.ActiveProfileRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.HomeRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.SearchRoute +import com.machankura.bennu.compose.ui.theme.Breakpoint +import com.machankura.bennu.compose.ui.theme.BennuTheme import kotlin.test.Test /** @@ -122,7 +122,7 @@ class NavigationSuiteRenderJvmTest { /** * The three top-level routes and one pushed route, each rendering only its own name. * - * A stand-in for the app's graph rather than the graph itself: `CurareNavHost` builds + * A stand-in for the app's graph rather than the graph itself: `BennuNavHost` builds * a database, six repositories and four view models on the way to its first screen, * and none of that decides whether the navigation component appears. */ @@ -131,8 +131,8 @@ class NavigationSuiteRenderJvmTest { profileNostrEventId: String?, navController: NavHostController = rememberNavController(), ) { - CurareTheme { - CurareNavigationSuite( + BennuTheme { + BennuNavigationSuite( navController = navController, breakpoint = Breakpoint.Large, activeUserPublicKey = publicKey, diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/widgets/ScreenStateTransitionJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/widgets/ScreenStateTransitionJvmTest.kt similarity index 91% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/widgets/ScreenStateTransitionJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/widgets/ScreenStateTransitionJvmTest.kt index 6380166d..4ab5dca3 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/widgets/ScreenStateTransitionJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/widgets/ScreenStateTransitionJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets +package com.machankura.bennu.compose.ui.composable.widgets import androidx.compose.material3.Text import androidx.compose.runtime.getValue @@ -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 to.curare.compose.ui.theme.CurareTheme +import com.machankura.bennu.compose.ui.theme.BennuTheme 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 { CurareTheme { ScreenStateTransition(state) { Render(it) } } } + setContent { BennuTheme { 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 { CurareTheme { ScreenStateTransition(state) { Render(it) } } } + setContent { BennuTheme { ScreenStateTransition(state) { Render(it) } } } mainClock.advanceTimeBy(16) onNodeWithText("first").assertIsDisplayed() diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/widgets/buttons/ExtendedFabJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/widgets/buttons/ExtendedFabJvmTest.kt similarity index 93% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/widgets/buttons/ExtendedFabJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/widgets/buttons/ExtendedFabJvmTest.kt index 6d0aaafe..02313ea5 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/widgets/buttons/ExtendedFabJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/widgets/buttons/ExtendedFabJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.buttons +package com.machankura.bennu.compose.ui.composable.widgets.buttons import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Add @@ -12,8 +12,8 @@ import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.runDesktopComposeUiTest -import to.curare.compose.ui.composable.widgets.Decorative -import to.curare.compose.ui.theme.CurareTheme +import com.machankura.bennu.compose.ui.composable.widgets.Decorative +import com.machankura.bennu.compose.ui.theme.BennuTheme import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue @@ -38,7 +38,7 @@ class ExtendedFabJvmTest { fun `the button is found by its label in the merged tree, with the icon beside it`() = runDesktopComposeUiTest(400, 200) { setContent { - CurareTheme { + BennuTheme { ExtendedFab( label = "Propose post", icon = { Icon(Icons.Default.Add, contentDescription = "Propose post icon") }, @@ -61,7 +61,7 @@ class ExtendedFabJvmTest { fun `a decorative icon leaves the label as the button's only name, which is enough`() = runDesktopComposeUiTest(400, 200) { setContent { - CurareTheme { + BennuTheme { ExtendedFab( label = "Broadcast all", icon = { Icon(Icons.Default.Add, contentDescription = Decorative) }, @@ -79,7 +79,7 @@ class ExtendedFabJvmTest { runDesktopComposeUiTest(400, 200) { setContent { - CurareTheme { + BennuTheme { ExtendedFab( label = "Propose post", icon = { Icon(Icons.Default.Add, contentDescription = Decorative) }, @@ -95,7 +95,7 @@ class ExtendedFabJvmTest { runDesktopComposeUiTest(400, 200) { setContent { - CurareTheme { + BennuTheme { ExtendedFab( label = "Propose post", icon = { Icon(Icons.Default.Add, contentDescription = Decorative) }, diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05DialogJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05DialogJvmTest.kt similarity index 89% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05DialogJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05DialogJvmTest.kt index b9da64d1..a94ad974 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05DialogJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05DialogJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.composable.widgets.dialogs +package com.machankura.bennu.compose.ui.composable.widgets.dialogs import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.test.ComposeUiTest @@ -9,11 +9,11 @@ import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performTextInput import androidx.compose.ui.test.runDesktopComposeUiTest -import to.curare.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import to.curare.compose.ui.composable.navigation.routes.ProfilePreviewRoute -import to.curare.compose.ui.composable.navigation.routes.Route -import to.curare.compose.ui.composable.widgets.ProvideSnackbarHost -import to.curare.compose.ui.theme.CurareTheme +import com.machankura.bennu.compose.ui.composable.navigation.routes.ImplementationPendingRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.ProfilePreviewRoute +import com.machankura.bennu.compose.ui.composable.navigation.routes.Route +import com.machankura.bennu.compose.ui.composable.widgets.ProvideSnackbarHost +import com.machankura.bennu.compose.ui.theme.BennuTheme import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNull @@ -95,7 +95,7 @@ class StartDirectMessageToNpubOrNip05DialogJvmTest { assertions: ComposeUiTest.() -> Unit, ) = runDesktopComposeUiTest(width = 400, height = 800) { setContent { - CurareTheme { + BennuTheme { ProvideSnackbarHost { StartDirectMessageToNpubOrNip05Dialog( activeUserPublicKey = activeUserPublicKey, diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/theme/NavigationMotionJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/theme/NavigationMotionJvmTest.kt similarity index 95% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/theme/NavigationMotionJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/theme/NavigationMotionJvmTest.kt index 42919bbc..c99bfa24 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/theme/NavigationMotionJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/theme/NavigationMotionJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.theme +package com.machankura.bennu.compose.ui.theme import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize @@ -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 - // `CurareTheme` silently overwrote it -- the reduced case read 54dp of - // slide. That is also why `reducedMotion` is a `CurareTheme` parameter + // `BennuTheme` silently overwrote it -- the reduced case read 54dp of + // slide. That is also why `reducedMotion` is a `BennuTheme` 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. - CurareTheme(reducedMotion = reducedMotion) { + BennuTheme(reducedMotion = reducedMotion) { NavHost( navController = controller, startDestination = First, diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/theme/ReadableContentLayoutJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/theme/ReadableContentLayoutJvmTest.kt similarity index 98% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/theme/ReadableContentLayoutJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/theme/ReadableContentLayoutJvmTest.kt index 27048b83..58003609 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/theme/ReadableContentLayoutJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/theme/ReadableContentLayoutJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.theme +package com.machankura.bennu.compose.ui.theme import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxWidth @@ -78,7 +78,7 @@ class ReadableContentLayoutJvmTest { var margin: Dp? = null runDesktopComposeUiTest(width = windowWidth, height = 900) { setContent { - CurareTheme { + BennuTheme { seen = MaterialTheme.breakpoint margin = MaterialTheme.spacing.screenMargin } @@ -109,7 +109,7 @@ class ReadableContentLayoutJvmTest { @Composable private fun TaggedContent() { - CurareTheme { + BennuTheme { Box(Modifier.readableContent()) { Box(Modifier.fillMaxWidth().height(8.dp).testTag(Content)) } diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/AcceptCuratedSuggestionViewModelJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/AcceptCuratedSuggestionViewModelJvmTest.kt similarity index 92% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/AcceptCuratedSuggestionViewModelJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/AcceptCuratedSuggestionViewModelJvmTest.kt index 98e4906f..322e8664 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/AcceptCuratedSuggestionViewModelJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/AcceptCuratedSuggestionViewModelJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -12,28 +12,28 @@ import kotlinx.coroutines.test.UnconfinedTestDispatcher import kotlinx.coroutines.test.resetMain import kotlinx.coroutines.test.setMain import kotlinx.coroutines.withTimeout -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.intermdiate.LocalNostrEvent -import to.curare.compose.database.model.types.SynchronizationFilter -import to.curare.compose.nostr.CuratedSuggestion -import to.curare.compose.nostr.GroupCuratedSchema -import to.curare.compose.nostr.curated.CuratedEntryEvent -import to.curare.compose.nostr.curated.CuratedEntryProblem -import to.curare.compose.nostr.curated.CuratedField -import to.curare.compose.nostr.curated.CuratedFieldConfig -import to.curare.compose.nostr.curated.CuratedFieldType -import to.curare.compose.nostr.curated.CuratedSchema -import to.curare.compose.nostr.curated.CuratedSchemaEvent -import to.curare.compose.nostr.curated.CuratedUnsupportedField -import to.curare.compose.nostr.curated.CuratedVisibility -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.view.state.AcceptCuratedSuggestionUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.nostr.CuratedSuggestion +import com.machankura.bennu.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedEntryEvent +import com.machankura.bennu.compose.nostr.curated.CuratedEntryProblem +import com.machankura.bennu.compose.nostr.curated.CuratedField +import com.machankura.bennu.compose.nostr.curated.CuratedFieldConfig +import com.machankura.bennu.compose.nostr.curated.CuratedFieldType +import com.machankura.bennu.compose.nostr.curated.CuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaEvent +import com.machankura.bennu.compose.nostr.curated.CuratedUnsupportedField +import com.machankura.bennu.compose.nostr.curated.CuratedVisibility +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.view.state.AcceptCuratedSuggestionUIState import kotlin.test.AfterTest import kotlin.test.BeforeTest import kotlin.test.Test diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/BroadcastGroupSignedEventViewModelJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/BroadcastGroupSignedEventViewModelJvmTest.kt similarity index 92% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/BroadcastGroupSignedEventViewModelJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/BroadcastGroupSignedEventViewModelJvmTest.kt index 69641892..20f56ffa 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/BroadcastGroupSignedEventViewModelJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/BroadcastGroupSignedEventViewModelJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl @@ -15,25 +15,25 @@ import kotlinx.coroutines.test.resetMain import kotlinx.coroutines.test.setMain import kotlinx.coroutines.withTimeout import kotlinx.serialization.json.jsonPrimitive -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.exceptions.NostrPublishException -import to.curare.compose.network.dto.RelayDTO -import to.curare.compose.network.relays.EventPublishTransport -import to.curare.compose.network.relays.NostrPublishResult -import to.curare.compose.network.sockets.NostrIncomingMessage -import to.curare.compose.nostr.GroupRelay -import to.curare.compose.nostr.GroupRelayList -import to.curare.compose.nostr.GroupRelaySet -import to.curare.compose.nostr.Relays -import to.curare.compose.nostr.GroupCuratedSchema -import to.curare.compose.nostr.curated.CuratedEntryEvent -import to.curare.compose.nostr.curated.CuratedSchema -import to.curare.compose.nostr.curated.CuratedSchemaEvent -import to.curare.compose.nostr.curated.CuratedVisibility -import to.curare.compose.repository.ChatRepository -import to.curare.compose.ui.view.model.BroadcastGroupSignedEventViewModel.RelayOutcome -import to.curare.compose.ui.view.state.BroadcastGroupSignedEventUIState +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.exceptions.NostrPublishException +import com.machankura.bennu.compose.network.dto.RelayDTO +import com.machankura.bennu.compose.network.relays.EventPublishTransport +import com.machankura.bennu.compose.network.relays.NostrPublishResult +import com.machankura.bennu.compose.network.sockets.NostrIncomingMessage +import com.machankura.bennu.compose.nostr.GroupRelay +import com.machankura.bennu.compose.nostr.GroupRelayList +import com.machankura.bennu.compose.nostr.GroupRelaySet +import com.machankura.bennu.compose.nostr.Relays +import com.machankura.bennu.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedEntryEvent +import com.machankura.bennu.compose.nostr.curated.CuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaEvent +import com.machankura.bennu.compose.nostr.curated.CuratedVisibility +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.ui.view.model.BroadcastGroupSignedEventViewModel.RelayOutcome +import com.machankura.bennu.compose.ui.view.state.BroadcastGroupSignedEventUIState import kotlin.test.AfterTest import kotlin.test.BeforeTest import kotlin.test.Test diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/CuratedSuggestionListViewModelJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/CuratedSuggestionListViewModelJvmTest.kt similarity index 90% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/CuratedSuggestionListViewModelJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/CuratedSuggestionListViewModelJvmTest.kt index d2de528a..195650ec 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/CuratedSuggestionListViewModelJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/CuratedSuggestionListViewModelJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.lifecycle.viewModelScope import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -9,27 +9,27 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withTimeout -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.database.model.SynchronizeNostrEventRequest -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.intermdiate.LocalNostrEvent -import to.curare.compose.database.model.types.SynchronizationFilter -import to.curare.compose.nostr.CuratedSuggestion -import to.curare.compose.nostr.GroupCuratedSchema -import to.curare.compose.nostr.GroupRelay -import to.curare.compose.nostr.GroupRelayList -import to.curare.compose.nostr.GroupRelaySet -import to.curare.compose.nostr.Relays -import to.curare.compose.nostr.curated.CuratedEntry -import to.curare.compose.nostr.curated.CuratedField -import to.curare.compose.nostr.curated.CuratedSchema -import to.curare.compose.nostr.curated.CuratedSchemaEvent -import to.curare.compose.nostr.curated.CuratedVisibility -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.view.state.CuratedSuggestionListUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.database.model.SynchronizeNostrEventRequest +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalNostrEvent +import com.machankura.bennu.compose.database.model.types.SynchronizationFilter +import com.machankura.bennu.compose.nostr.CuratedSuggestion +import com.machankura.bennu.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.nostr.GroupRelay +import com.machankura.bennu.compose.nostr.GroupRelayList +import com.machankura.bennu.compose.nostr.GroupRelaySet +import com.machankura.bennu.compose.nostr.Relays +import com.machankura.bennu.compose.nostr.curated.CuratedEntry +import com.machankura.bennu.compose.nostr.curated.CuratedField +import com.machankura.bennu.compose.nostr.curated.CuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaEvent +import com.machankura.bennu.compose.nostr.curated.CuratedVisibility +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.view.state.CuratedSuggestionListUIState import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/EditGroupCuratedSchemaViewModelJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/EditGroupCuratedSchemaViewModelJvmTest.kt similarity index 94% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/EditGroupCuratedSchemaViewModelJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/EditGroupCuratedSchemaViewModelJvmTest.kt index 7255e0e0..0e05c5b1 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/EditGroupCuratedSchemaViewModelJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/EditGroupCuratedSchemaViewModelJvmTest.kt @@ -1,22 +1,22 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.extensions.hexToNpubHrp -import to.curare.compose.nostr.GroupCuratedSchema -import to.curare.compose.nostr.curated.CuratedField -import to.curare.compose.nostr.curated.CuratedFieldConfig -import to.curare.compose.nostr.curated.CuratedFieldType -import to.curare.compose.nostr.curated.CuratedSchema -import to.curare.compose.nostr.curated.CuratedSchemaEvent -import to.curare.compose.nostr.curated.CuratedSchemaProblem -import to.curare.compose.nostr.curated.CuratedSchemaTemplate -import to.curare.compose.nostr.curated.CuratedUnsupportedField -import to.curare.compose.nostr.curated.CuratedVisibility -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.ui.view.state.EditGroupCuratedSchemaUIState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.extensions.hexToNpubHrp +import com.machankura.bennu.compose.nostr.GroupCuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedField +import com.machankura.bennu.compose.nostr.curated.CuratedFieldConfig +import com.machankura.bennu.compose.nostr.curated.CuratedFieldType +import com.machankura.bennu.compose.nostr.curated.CuratedSchema +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaEvent +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaProblem +import com.machankura.bennu.compose.nostr.curated.CuratedSchemaTemplate +import com.machankura.bennu.compose.nostr.curated.CuratedUnsupportedField +import com.machankura.bennu.compose.nostr.curated.CuratedVisibility +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.ui.view.state.EditGroupCuratedSchemaUIState import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/EditGroupRelaysViewModelJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/EditGroupRelaysViewModelJvmTest.kt similarity index 94% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/EditGroupRelaysViewModelJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/EditGroupRelaysViewModelJvmTest.kt index bfba37ec..007312ca 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/EditGroupRelaysViewModelJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/EditGroupRelaysViewModelJvmTest.kt @@ -1,13 +1,13 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model -import to.curare.compose.database.model.GroupSignedEvent -import to.curare.compose.nostr.GroupRelay -import to.curare.compose.nostr.GroupRelayList -import to.curare.compose.nostr.GroupRelaySet -import to.curare.compose.nostr.Relays -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.ui.view.state.EditGroupRelaysUIState +import com.machankura.bennu.compose.database.model.GroupSignedEvent +import com.machankura.bennu.compose.nostr.GroupRelay +import com.machankura.bennu.compose.nostr.GroupRelayList +import com.machankura.bennu.compose.nostr.GroupRelaySet +import com.machankura.bennu.compose.nostr.Relays +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.ui.view.state.EditGroupRelaysUIState import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/GroupCuratedEntriesViewModelJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/GroupCuratedEntriesViewModelJvmTest.kt similarity index 89% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/GroupCuratedEntriesViewModelJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/GroupCuratedEntriesViewModelJvmTest.kt index b51bec31..26c05e14 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/GroupCuratedEntriesViewModelJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/GroupCuratedEntriesViewModelJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer @@ -12,24 +12,24 @@ import kotlinx.coroutines.test.UnconfinedTestDispatcher import kotlinx.coroutines.test.resetMain import kotlinx.coroutines.test.setMain import kotlinx.coroutines.withTimeout -import to.curare.compose.database.model.NostrEvent -import to.curare.compose.exceptions.NostrPublishException -import to.curare.compose.network.dto.RelayDTO -import to.curare.compose.network.relays.EventPublishTransport -import to.curare.compose.network.relays.NostrPublishResult -import to.curare.compose.network.sockets.NostrIncomingMessage -import to.curare.compose.nostr.GroupCuratedEntry -import to.curare.compose.nostr.GroupRelay -import to.curare.compose.nostr.GroupRelayList -import to.curare.compose.nostr.GroupRelaySet -import to.curare.compose.repository.ChatRepository -import to.curare.compose.ui.composable.GroupSignedWorkFixtures -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.chatRoomId -import to.curare.compose.ui.composable.GroupSignedWorkFixtures.entry -import to.curare.compose.ui.view.model.BroadcastGroupSignedEventViewModel.RelayOutcome -import to.curare.compose.ui.view.model.GroupCuratedEntriesViewModel.BroadcastAllProgress -import to.curare.compose.ui.view.model.GroupCuratedEntriesViewModel.EntryBroadcast -import to.curare.compose.ui.view.state.GroupCuratedEntriesUIState +import com.machankura.bennu.compose.database.model.NostrEvent +import com.machankura.bennu.compose.exceptions.NostrPublishException +import com.machankura.bennu.compose.network.dto.RelayDTO +import com.machankura.bennu.compose.network.relays.EventPublishTransport +import com.machankura.bennu.compose.network.relays.NostrPublishResult +import com.machankura.bennu.compose.network.sockets.NostrIncomingMessage +import com.machankura.bennu.compose.nostr.GroupCuratedEntry +import com.machankura.bennu.compose.nostr.GroupRelay +import com.machankura.bennu.compose.nostr.GroupRelayList +import com.machankura.bennu.compose.nostr.GroupRelaySet +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.chatRoomId +import com.machankura.bennu.compose.ui.composable.GroupSignedWorkFixtures.entry +import com.machankura.bennu.compose.ui.view.model.BroadcastGroupSignedEventViewModel.RelayOutcome +import com.machankura.bennu.compose.ui.view.model.GroupCuratedEntriesViewModel.BroadcastAllProgress +import com.machankura.bennu.compose.ui.view.model.GroupCuratedEntriesViewModel.EntryBroadcast +import com.machankura.bennu.compose.ui.view.state.GroupCuratedEntriesUIState import kotlin.test.AfterTest import kotlin.test.BeforeTest import kotlin.test.Test diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/NavigationIdentityRoutingJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/NavigationIdentityRoutingJvmTest.kt similarity index 94% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/NavigationIdentityRoutingJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/NavigationIdentityRoutingJvmTest.kt index 55a246e1..76963c4c 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/NavigationIdentityRoutingJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/NavigationIdentityRoutingJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.datastore.preferences.core.PreferenceDataStoreFactory import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -21,15 +21,15 @@ import kotlinx.coroutines.withTimeout import okio.Path.Companion.toPath import org.junit.Rule import org.junit.rules.TemporaryFolder -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.UnsignedNostrEvent -import to.curare.compose.database.model.intermdiate.LocalAccount -import to.curare.compose.identity.Identity -import to.curare.compose.identity.IdentityKind -import to.curare.compose.identity.toWalletId -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.composable.navigation.routes.SovereignWalletStartupRoute -import to.curare.compose.ui.view.state.NavigationUIState +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.UnsignedNostrEvent +import com.machankura.bennu.compose.database.model.intermdiate.LocalAccount +import com.machankura.bennu.compose.identity.Identity +import com.machankura.bennu.compose.identity.IdentityKind +import com.machankura.bennu.compose.identity.toWalletId +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.composable.navigation.routes.SovereignWalletStartupRoute +import com.machankura.bennu.compose.ui.view.state.NavigationUIState import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFailsWith diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/NostrSecretViewModelJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/NostrSecretViewModelJvmTest.kt similarity index 91% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/NostrSecretViewModelJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/NostrSecretViewModelJvmTest.kt index 2f4d7e8c..315befcc 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/NostrSecretViewModelJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/NostrSecretViewModelJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.datastore.preferences.core.PreferenceDataStoreFactory import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -21,12 +21,12 @@ import kotlinx.coroutines.withTimeout import okio.Path.Companion.toPath import org.junit.Rule import org.junit.rules.TemporaryFolder -import to.curare.compose.identity.Identity -import to.curare.compose.identity.IdentityKind -import to.curare.compose.identity.IdentityWriter -import to.curare.compose.identity.toWalletId -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.view.state.NostrSecretUIState +import com.machankura.bennu.compose.identity.Identity +import com.machankura.bennu.compose.identity.IdentityKind +import com.machankura.bennu.compose.identity.IdentityWriter +import com.machankura.bennu.compose.identity.toWalletId +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.view.state.NostrSecretUIState import kotlin.test.AfterTest import kotlin.test.BeforeTest import kotlin.test.Test diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/ProfilePreviewViewModelJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/ProfilePreviewViewModelJvmTest.kt similarity index 90% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/ProfilePreviewViewModelJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/ProfilePreviewViewModelJvmTest.kt index 1c2f9458..75b993b0 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/ProfilePreviewViewModelJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/ProfilePreviewViewModelJvmTest.kt @@ -1,6 +1,6 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model -import to.curare.compose.nostr.MarmotProfile +import com.machankura.bennu.compose.nostr.MarmotProfile import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -12,20 +12,20 @@ import kotlinx.coroutines.test.UnconfinedTestDispatcher import kotlinx.coroutines.test.resetMain import kotlinx.coroutines.test.setMain import kotlinx.coroutines.withTimeout -import to.curare.compose.database.GENESIS_AT -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.MarmotKeyPackage -import to.curare.compose.database.model.NegentropySynchronizeRequest -import to.curare.compose.database.model.Participant -import to.curare.compose.database.model.Profile -import to.curare.compose.database.model.SynchronizeNostrEventRequest -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.intermdiate.LocalParticipant -import to.curare.compose.nostr.DirectMessagePeerSync -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.NostrRepository -import to.curare.compose.ui.view.state.ProfilePreviewUIState -import to.curare.compose.ui.view.state.ProfilePreviewUIState.Readiness +import com.machankura.bennu.compose.database.GENESIS_AT +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.MarmotKeyPackage +import com.machankura.bennu.compose.database.model.NegentropySynchronizeRequest +import com.machankura.bennu.compose.database.model.Participant +import com.machankura.bennu.compose.database.model.Profile +import com.machankura.bennu.compose.database.model.SynchronizeNostrEventRequest +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalParticipant +import com.machankura.bennu.compose.nostr.DirectMessagePeerSync +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.NostrRepository +import com.machankura.bennu.compose.ui.view.state.ProfilePreviewUIState +import com.machankura.bennu.compose.ui.view.state.ProfilePreviewUIState.Readiness import kotlin.test.AfterTest import kotlin.test.BeforeTest import kotlin.test.Test @@ -246,14 +246,14 @@ class ProfilePreviewViewModelJvmTest { } @Test - fun `a person with no key package is not yet on Curare after the timeout, and a late one still counts`() = runBlocking { + fun `a person with no key package is not yet on Bennu after the timeout, and a late one still counts`() = runBlocking { val recorder = Recorder(profile = MutableStateFlow(resolved(alice))) val rooms = Rooms() val viewModel = viewModel(recorder, rooms) viewModel.initiate() await { viewModel.profilePreviewUIState == loaded(Readiness.Checking) } - await { viewModel.profilePreviewUIState == loaded(Readiness.NotYetOnCurare) } + await { viewModel.profilePreviewUIState == loaded(Readiness.NotYetOnBennu) } rooms.keyPackage.value = keyPackage(alice) await { viewModel.profilePreviewUIState == loaded(Readiness.CanStartChat) } @@ -266,7 +266,7 @@ class ProfilePreviewViewModelJvmTest { val viewModel = viewModel(recorder, Rooms()) viewModel.initiate() - await { viewModel.profilePreviewUIState == loaded(Readiness.NotYetOnCurare) } + await { viewModel.profilePreviewUIState == loaded(Readiness.NotYetOnBennu) } assertEquals(bothAsks, recorder.effects) viewModel.retry() @@ -274,7 +274,7 @@ class ProfilePreviewViewModelJvmTest { await { recorder.effects.size == 3 } assertEquals(bothAsks + chatAsk, recorder.effects) - await { viewModel.profilePreviewUIState == loaded(Readiness.NotYetOnCurare) } + await { viewModel.profilePreviewUIState == loaded(Readiness.NotYetOnBennu) } } // --- fixtures ----------------------------------------------------------------------- diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/ProposalListViewModelJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/ProposalListViewModelJvmTest.kt similarity index 97% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/ProposalListViewModelJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/ProposalListViewModelJvmTest.kt index 03d3d2d0..fabd8efd 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/ProposalListViewModelJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/ProposalListViewModelJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.lifecycle.viewModelScope import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -16,19 +16,19 @@ import kotlinx.coroutines.test.UnconfinedTestDispatcher import kotlinx.coroutines.test.resetMain import kotlinx.coroutines.test.setMain import kotlinx.coroutines.withTimeout -import to.curare.compose.database.model.ChatRoom -import to.curare.compose.database.model.FrostSigningItem -import to.curare.compose.database.model.FrostSigningSession -import to.curare.compose.database.model.intermdiate.FrostSignerTally -import to.curare.compose.database.model.intermdiate.LocalChatRoom -import to.curare.compose.database.model.intermdiate.LocalFrostSigningSession -import to.curare.compose.database.model.types.FrostSigningStage -import to.curare.compose.nostr.frost.FrostSigningEvents -import to.curare.compose.repository.ChatRepository -import to.curare.compose.repository.FrostSigningRepository -import to.curare.compose.ui.view.state.ProposalFilter -import to.curare.compose.ui.view.state.ProposalListUIState -import to.curare.compose.ui.view.state.ProposalState +import com.machankura.bennu.compose.database.model.ChatRoom +import com.machankura.bennu.compose.database.model.FrostSigningItem +import com.machankura.bennu.compose.database.model.FrostSigningSession +import com.machankura.bennu.compose.database.model.intermdiate.FrostSignerTally +import com.machankura.bennu.compose.database.model.intermdiate.LocalChatRoom +import com.machankura.bennu.compose.database.model.intermdiate.LocalFrostSigningSession +import com.machankura.bennu.compose.database.model.types.FrostSigningStage +import com.machankura.bennu.compose.nostr.frost.FrostSigningEvents +import com.machankura.bennu.compose.repository.ChatRepository +import com.machankura.bennu.compose.repository.FrostSigningRepository +import com.machankura.bennu.compose.ui.view.state.ProposalFilter +import com.machankura.bennu.compose.ui.view.state.ProposalListUIState +import com.machankura.bennu.compose.ui.view.state.ProposalState import kotlin.test.AfterTest import kotlin.test.BeforeTest import kotlin.test.Test diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/SignInToProfileViewModelJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/SignInToProfileViewModelJvmTest.kt similarity index 94% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/SignInToProfileViewModelJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/SignInToProfileViewModelJvmTest.kt index 830eec20..9ad447c7 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/SignInToProfileViewModelJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/SignInToProfileViewModelJvmTest.kt @@ -1,15 +1,15 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import com.vitorpamplona.quartz.nip01Core.core.HexKey import fr.acinq.bitcoin.ByteVector32 import fr.acinq.bitcoin.PrivateKey import fr.acinq.phoenix.data.WalletId import kotlinx.coroutines.runBlocking -import to.curare.compose.identity.CredentialProblem -import to.curare.compose.identity.IdentityWriter -import to.curare.compose.identity.SignInCredential -import to.curare.compose.identity.StoredIdentity -import to.curare.compose.repository.NostrRepository +import com.machankura.bennu.compose.identity.CredentialProblem +import com.machankura.bennu.compose.identity.IdentityWriter +import com.machankura.bennu.compose.identity.SignInCredential +import com.machankura.bennu.compose.identity.StoredIdentity +import com.machankura.bennu.compose.repository.NostrRepository import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/SignOutViewModelJvmTest.kt b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/SignOutViewModelJvmTest.kt similarity index 93% rename from composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/SignOutViewModelJvmTest.kt rename to composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/SignOutViewModelJvmTest.kt index a2017e10..a8a49c84 100644 --- a/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/SignOutViewModelJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/ui/view/model/SignOutViewModelJvmTest.kt @@ -1,4 +1,4 @@ -package to.curare.compose.ui.view.model +package com.machankura.bennu.compose.ui.view.model import androidx.datastore.preferences.core.PreferenceDataStoreFactory import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -15,10 +15,10 @@ import kotlinx.coroutines.withTimeout import okio.Path.Companion.toPath import org.junit.Rule import org.junit.rules.TemporaryFolder -import to.curare.compose.identity.Identity -import to.curare.compose.identity.IdentityWriter -import to.curare.compose.identity.toWalletId -import to.curare.compose.repository.NostrRepository +import com.machankura.bennu.compose.identity.Identity +import com.machankura.bennu.compose.identity.IdentityWriter +import com.machankura.bennu.compose.identity.toWalletId +import com.machankura.bennu.compose.repository.NostrRepository import kotlin.test.Test import kotlin.test.assertEquals diff --git a/docs/dead-code.md b/docs/dead-code.md index f799fd78..8c90bdca 100644 --- a/docs/dead-code.md +++ b/docs/dead-code.md @@ -34,7 +34,7 @@ Two things that method cannot see, so each item was also read in context: ## Orphaned by the live-sync change **`ChatRoomListViewModel.scheduleSynchronization`** — -[ChatRoomListViewModel.kt:80](composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomListViewModel.kt:80) +[ChatRoomListViewModel.kt:80](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ChatRoomListViewModel.kt:80) No longer called by `initiate()`. It was kept as the entry point for a user-initiated refresh, which is the one thing the live tier does not answer — @@ -57,21 +57,21 @@ Each of these predates the sync work. | what | where | note | |---|---|---| -| `RelayPool.removeRelays` | [RelayPool.kt:123](composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelayPool.kt:123) | never called; `changeRelays` and `closePool` cover every path that removes a relay | -| `RelayPool.hasRelays` | [RelayPool.kt:171](composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelayPool.kt:171) | never called | -| `RelayPool.transformWhileEventsAreIncoming` | [RelayPool.kt:486](composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelayPool.kt:486) | private, never called. Superseded by `completeOnSubscriptionEnd`, which ends a flow on EOSE/CLOSED/NEG-ERR rather than on "the last message was not an event" | -| the commented-out publish gate | [RelayPool.kt:547-560](composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelayPool.kt:547) | the only thing keeping `import kotlinx.coroutines.flow.transform` ([:30](composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelayPool.kt:30)) alive | -| `RelaysSocketManager.clearRelayPools` | [RelaysSocketManager.kt:100](composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelaysSocketManager.kt:100) | private, never called. Nothing tears the pool down on sign-out | -| `RelaysSocketManager.tryConnectingToAllRelays` | [RelaysSocketManager.kt:131](composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelaysSocketManager.kt:131) | never called; the only caller of `RelayPool.tryConnectingToRelay`, which is otherwise dead too | -| the commented `tryConnectingToUserRelay` | [RelaysSocketManager.kt:139](composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelaysSocketManager.kt:139) | | -| `NostrIncomingMessage?.verifyOrThrow` | [NostrIncomingMessage.kt:59](composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrIncomingMessage.kt:59) | never called. It also treats any NOTICE as a failure, which is wrong for the reason `filterByEventId` documents — a NOTICE has no subscription id and reaches every collector | -| `String?.decodeFromJsonStringOrNull` | [CommonJson.kt:37](composeApp/src/commonMain/kotlin/to/curare/compose/network/serialization/CommonJson.kt:37) | never called | -| `NostrSocketClientImpl.compressMessage` | [NostrSocketClientImpl.kt:368](composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClientImpl.kt:368) | already carries `@Suppress("unused")`. Outgoing compression is not a thing any relay here asks for | -| `DefaultNostrSocketClientFactory.create(httpClient = …)` | [NostrSocketClientFactory.kt](composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClientFactory.kt) | the overload taking an explicit `HttpClient` has no caller; everything goes through the interface method and `defaultSocketsHttpClient` | +| `RelayPool.removeRelays` | [RelayPool.kt:123](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/RelayPool.kt:123) | never called; `changeRelays` and `closePool` cover every path that removes a relay | +| `RelayPool.hasRelays` | [RelayPool.kt:171](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/RelayPool.kt:171) | never called | +| `RelayPool.transformWhileEventsAreIncoming` | [RelayPool.kt:486](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/RelayPool.kt:486) | private, never called. Superseded by `completeOnSubscriptionEnd`, which ends a flow on EOSE/CLOSED/NEG-ERR rather than on "the last message was not an event" | +| the commented-out publish gate | [RelayPool.kt:547-560](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/RelayPool.kt:547) | the only thing keeping `import kotlinx.coroutines.flow.transform` ([:30](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/RelayPool.kt:30)) alive | +| `RelaysSocketManager.clearRelayPools` | [RelaysSocketManager.kt:100](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/RelaysSocketManager.kt:100) | private, never called. Nothing tears the pool down on sign-out | +| `RelaysSocketManager.tryConnectingToAllRelays` | [RelaysSocketManager.kt:131](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/RelaysSocketManager.kt:131) | never called; the only caller of `RelayPool.tryConnectingToRelay`, which is otherwise dead too | +| the commented `tryConnectingToUserRelay` | [RelaysSocketManager.kt:139](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/RelaysSocketManager.kt:139) | | +| `NostrIncomingMessage?.verifyOrThrow` | [NostrIncomingMessage.kt:59](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrIncomingMessage.kt:59) | never called. It also treats any NOTICE as a failure, which is wrong for the reason `filterByEventId` documents — a NOTICE has no subscription id and reaches every collector | +| `String?.decodeFromJsonStringOrNull` | [CommonJson.kt:37](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/serialization/CommonJson.kt:37) | never called | +| `NostrSocketClientImpl.compressMessage` | [NostrSocketClientImpl.kt:368](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrSocketClientImpl.kt:368) | already carries `@Suppress("unused")`. Outgoing compression is not a thing any relay here asks for | +| `DefaultNostrSocketClientFactory.create(httpClient = …)` | [NostrSocketClientFactory.kt](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrSocketClientFactory.kt) | the overload taking an explicit `HttpClient` has no caller; everything goes through the interface method and `defaultSocketsHttpClient` | ### `RelaysSocketManager.userRelays` is a field that is never written -[RelaysSocketManager.kt:52](composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelaysSocketManager.kt:52) +[RelaysSocketManager.kt:52](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/RelaysSocketManager.kt:52) Worth separating from the table, because it does not read as dead — it reads as a bug. @@ -80,9 +80,9 @@ a bug. private val userRelays = mutableSetOf() // nothing ever adds to this ``` -The `userRelays` at [:83](composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelaysSocketManager.kt:83) +The `userRelays` at [:83](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/RelaysSocketManager.kt:83) is a *different, shadowing local* inside `observeRelays`. The field itself is -only ever read, at [:107](composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelaysSocketManager.kt:107): +only ever read, at [:107](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/RelaysSocketManager.kt:107): ```kotlin return if (userRelays.isNotEmpty()) { ...publish to the user's relays... } @@ -102,10 +102,10 @@ command with `OptimizedJsonMapper` and goes through `sendMESSAGE`. | declaration | impl | |---|---| -| `sendREQ` [:37](composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClient.kt:37) | [:349](composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClientImpl.kt:333) | -| `sendCLOSE` [:31](composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClient.kt:31) | [:361](composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClientImpl.kt:345) | -| `sendCOUNT` [:33](composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClient.kt:33) | [:354](composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClientImpl.kt:338) | -| `sendAUTH` [:29](composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClient.kt:29) | [:365](composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClientImpl.kt:349) | +| `sendREQ` [:37](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrSocketClient.kt:37) | [:349](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrSocketClientImpl.kt:333) | +| `sendCLOSE` [:31](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrSocketClient.kt:31) | [:361](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrSocketClientImpl.kt:345) | +| `sendCOUNT` [:33](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrSocketClient.kt:33) | [:354](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrSocketClientImpl.kt:338) | +| `sendAUTH` [:29](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrSocketClient.kt:29) | [:365](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrSocketClientImpl.kt:349) | Removing them also orphans `buildNostrREQMessage`, `buildNostrCOUNTMessage`, `buildNostrCLOSEMessage` and `buildNostrAUTHMessage` in @@ -114,12 +114,12 @@ Removing them also orphans `buildNostrREQMessage`, `buildNostrCOUNTMessage`, Two of the four are worth keeping for a named reason rather than out of habit: - **`sendAUTH` is the NIP-42 hole.** `NostrIncomingMessage.AuthMessage` - ([:34](composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrIncomingMessage.kt:34)) + ([:34](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrIncomingMessage.kt:34)) is parsed and then dropped — nothing anywhere handles an AUTH challenge. A relay that answers CLOSED with `auth-required` is currently retried with backoff forever and will never succeed. `sendAUTH` is half of the fix, so delete it only alongside a decision not to support authenticated relays. -- **`sendCOUNT` and `CountMessage`** ([:38](composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrIncomingMessage.kt:38)) +- **`sendCOUNT` and `CountMessage`** ([:38](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/sockets/NostrIncomingMessage.kt:38)) are a matched pair with no caller. `CountMessage` is parsed and admitted by `filterBySubscriptionId`, but since nothing sends a COUNT it can never arrive. Both go, or neither. @@ -130,7 +130,7 @@ would not start. ## Dead all the way down: the publisher chain **`NostrPublisherRepository`** — -[NostrPublisherRepository.kt:15](composeApp/src/commonMain/kotlin/to/curare/compose/repository/NostrPublisherRepository.kt:15) +[NostrPublisherRepository.kt:15](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/NostrPublisherRepository.kt:15) The whole class is unreferenced: nothing constructs it, and neither of its two methods (`signPublishImportNostrEvent`, `publishRelayList`) is called. Publishing @@ -149,9 +149,9 @@ would let `CachingImportRepository` go with them. ## Dead columns (need a migration) `isRecommendedRelay` on both -[SynchronizeNostrEventRequest.kt:40](composeApp/src/commonMain/kotlin/to/curare/compose/database/model/SynchronizeNostrEventRequest.kt:40) +[SynchronizeNostrEventRequest.kt:40](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/SynchronizeNostrEventRequest.kt:40) and -[NegentropySynchronizeRequest.kt:39](composeApp/src/commonMain/kotlin/to/curare/compose/database/model/NegentropySynchronizeRequest.kt:39) +[NegentropySynchronizeRequest.kt:39](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/NegentropySynchronizeRequest.kt:39) is never written by any caller (every construction takes the `false` default) and never read. @@ -175,7 +175,7 @@ not have to re-derive them: re-add, but see the Room caveat above: confirm each against the generated implementation, not just by grep. - **Bech32/credential helpers** in - [Credentials.kt](composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Credentials.kt) — + [Credentials.kt](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/extensions/Credentials.kt) — `assureValidNpub`, `assureValidPubKeyHex`, `hexToNoteHrp`, `urlToLnUrlHrp`, `bechToBytesOrThrow`. A conversion toolkit where only some conversions are used. Worth keeping as a set if the intent is a complete encoding surface; diff --git a/docs/frost-batch-signing.md b/docs/frost-batch-signing.md index 270d8bf3..79fbfc51 100644 --- a/docs/frost-batch-signing.md +++ b/docs/frost-batch-signing.md @@ -19,7 +19,7 @@ ceremony — the rounds, the group events, and the approval a human is asked for A batch of `k` events is `k` independent FROST instances run in lockstep, sharing one signer set, one transcript and one prompt. The saving is transport and UX, not crypto, and that is the saving worth having: today -[FrostSigningManager](../composeApp/src/commonMain/kotlin/to/curare/compose/managers/FrostSigningManager.kt) +[FrostSigningManager](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/FrostSigningManager.kt) spends five MLS group events and one human decision per event signed. ## The constraint @@ -28,7 +28,7 @@ A Schnorr partial signature is `s = k + e·x`, with `e = H(R‖P‖m)`. Two diff messages under the same nonce `R` give two equations in one unknown and the secret share falls out. That is not a subtlety to be careful around; it is the one way a t-of-n key is lost, and it is already what the two write-once rules on -[FrostSigningSession](../composeApp/src/commonMain/kotlin/to/curare/compose/database/model/FrostSigningSession.kt) +[FrostSigningSession](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/FrostSigningSession.kt) exist to prevent. So the rule every phase below is built to keep: @@ -131,13 +131,13 @@ in-flight session resumes as though nothing happened. A migration that dropped them and let sessions restart would be the one dangerous way to write this. Update the entity list and `version = 10` in -[CurareDatabase.kt:175](../composeApp/src/commonMain/kotlin/to/curare/compose/database/CurareDatabase.kt), +[BennuDatabase.kt:175](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/BennuDatabase.kt), regenerate `composeApp/schemas/10.json`, and add the DAO methods: `getItems(sessionId)`, `observeItems(sessionId)`, `upsertItems(List)`, `countItems(sessionId)`, `countSignedItems(sessionId)`. **Test:** extend -[FrostSigningSessionDaoJvmTest](../composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/FrostSigningSessionDaoJvmTest.kt) +[FrostSigningSessionDaoJvmTest](../composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/database/dao/FrostSigningSessionDaoJvmTest.kt) with item CRUD, the `(sessionId, itemIndex)` dedupe, index ordering and the cascade delete. Add a migration test that runs the migration over a v9 database holding a half-finished session and asserts the seed and aggregate survive at @@ -154,7 +154,7 @@ The whole point of this phase is that **every existing test passes unchanged**. on the wire are byte-identical to today's. What changes is that `advance()` loops. -In [FrostSigningManager.advance](../composeApp/src/commonMain/kotlin/to/curare/compose/managers/FrostSigningManager.kt): +In [FrostSigningManager.advance](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/FrostSigningManager.kt): 1. Load `items` once, ordered by `index`. 2. Nonce generation becomes a `map` over items, each with its own @@ -209,9 +209,9 @@ they are the identity — a one-element comma join is the bare value — so they change no byte on the wire and leave Phase 3 to the proposal encoding alone. **Test:** existing tests are the test. If -[FrostSigningRoundTest](../composeApp/src/commonTest/kotlin/to/curare/compose/managers/FrostSigningRoundTest.kt) +[FrostSigningRoundTest](../composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/FrostSigningRoundTest.kt) and -[SignedGroupKeyStateTest](../composeApp/src/jvmTest/kotlin/to/curare/compose/managers/SignedGroupKeyStateTest.kt) +[SignedGroupKeyStateTest](../composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/SignedGroupKeyStateTest.kt) pass without edits beyond the schema move, the vectorisation is faithful. --- @@ -321,7 +321,7 @@ above. This phase is what surrounds it.)* ```kotlin suspend fun proposeSigningBatch( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, userPublicKey: HexKey, events: List>, // each carries its own createdAt @@ -330,17 +330,17 @@ suspend fun proposeSigningBatch( ``` `proposeSigning` stays, as the one-element call into it, so -[AddDialectViewModel](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddDialectViewModel.kt), -[AddArtifactViewModel](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddArtifactViewModel.kt) +[AddDialectViewModel](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/AddDialectViewModel.kt), +[AddArtifactViewModel](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/AddArtifactViewModel.kt) and -[GroupKeyStateManager.propose](../composeApp/src/commonMain/kotlin/to/curare/compose/managers/GroupKeyStateManager.kt) +[GroupKeyStateManager.propose](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/GroupKeyStateManager.kt) need no edit at all. `GroupKeyStateManager` in particular should never batch: a room's key state is the statement every other session is opened against, and bundling it with anything else would make it as available as its worst co-passenger. Mirror both on -[FrostSigningRepository](../composeApp/src/commonMain/kotlin/to/curare/compose/repository/FrostSigningRepository.kt), +[FrostSigningRepository](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/FrostSigningRepository.kt), including the `NO_OP` implementation. `signedEvent(session): Event?` becomes `signedEvents(session): List`. @@ -381,10 +381,10 @@ coordinator rather than a normal ending. **Two days, most of it in the screen.** - `FrostSigningUIState.Loaded` gains `items: List`. -- [FrostSigningViewModel](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/FrostSigningViewModel.kt) +- [FrostSigningViewModel](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/FrostSigningViewModel.kt) combines `observeItems` into its existing `combine`; nothing else changes, since it already re-renders on every session write. -- [FrostSigningScreen](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/FrostSigningScreen.kt) +- [FrostSigningScreen](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/FrostSigningScreen.kt) renders a list where it renders one event today. **The approval gate must show every event, not a count.** The argument in @@ -401,7 +401,7 @@ one session. No new `ChatMessage` types. The existing `TYPE_FROST_*` constants, `FROST_REQUEST_FULFILMENTS`, `FROST_SETTLEMENTS` and `FROST_TYPES` in -[ChatMessage.kt:220](../composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessage.kt) +[ChatMessage.kt:220](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/ChatMessage.kt) all work as they stand — one line per step, per member, whatever `k` is. Only the wording in `announceStep` and `announceStarted` gains a count: "signed their part of 12 events". This is worth checking rather than assuming, because a new @@ -446,7 +446,7 @@ session opens the list instead. this is the section anybody adding to these tests will read.)* Extend -[SignedGroupKeyStateTest](../composeApp/src/jvmTest/kotlin/to/curare/compose/managers/SignedGroupKeyStateTest.kt), +[SignedGroupKeyStateTest](../composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/SignedGroupKeyStateTest.kt), which already runs a real signing session between two devices over two databases, with a `k = 3` batch: both devices reach `COMPLETE`, all three signatures verify against their own event ids under the room's key, all three @@ -475,7 +475,7 @@ faulty or dishonest member in this harness: message. And three in -[FrostSigningRoundTest](../composeApp/src/commonTest/kotlin/to/curare/compose/managers/FrostSigningRoundTest.kt), +[FrostSigningRoundTest](../composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/managers/FrostSigningRoundTest.kt), against real FROST with no database, for the same reason that file exists at all — the library calls are checked with nothing in the way: a `k = 3` batch from one signer set where all three verify, an item's signature refusing to diff --git a/docs/frost-session-resend.md b/docs/frost-session-resend.md index bf578b2b..16be4dda 100644 --- a/docs/frost-session-resend.md +++ b/docs/frost-session-resend.md @@ -196,7 +196,7 @@ the parent. ```kotlin suspend fun resend( - database: CurareDatabase, + database: BennuDatabase, localChatRoom: LocalChatRoom, sessionId: String ): Boolean diff --git a/docs/jvm-target.md b/docs/jvm-target.md index 751d3016..b6f38f51 100644 --- a/docs/jvm-target.md +++ b/docs/jvm-target.md @@ -457,15 +457,15 @@ unit tests, not just the compile. Curare declares 16 expects across 8 files. They split cleanly: -**Six platform basics.** `getPlatform` ([Platform.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/Platform.kt)), +**Six platform basics.** `getPlatform` ([Platform.kt](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/Platform.kt)), `PlatformContext`, `AppVersion`, `themeColorScheme` -([Theme.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Theme.kt)), +([Theme.kt](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/theme/Theme.kt)), and `PlatformDatabaseBuilder`'s two functions. The deleted Aux files from Phase 0 -are a working skeleton for five of these — repackage to `to.curare.compose`, +are a working skeleton for five of these — repackage to `com.machankura.bennu.compose`, update Room 2 → Room 3 (`androidx.room` → `androidx.room3`), and point at -`CurareDatabase` instead of `AuxDatabase`. +`BennuDatabase` instead of `AuxDatabase`. -`CurareDatabaseConstructor` needs no hand-written actual; Room's KSP generates it +`BennuDatabaseConstructor` needs no hand-written actual; Room's KSP generates it once `kspJvm` is wired above. For `PlatformDatabaseBuilder.getDatabaseBuilder`, use the real application data @@ -487,10 +487,10 @@ is exactly what the jvm can do. `NavigationViewModel.ios.kt` is likewise portabl one changed import. **Nine lightning wrappers.** Four in -[Phoenix.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Phoenix.kt) +[Phoenix.kt](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/extensions/Phoenix.kt) (`platformStartupLogic`, `schedulePlatformLogic`, `getShowIntroFlow`, `getGlobalPrefs`) and five declared in -[SovereignWalletViewModel.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SovereignWalletViewModel.kt) +[SovereignWalletViewModel.kt](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SovereignWalletViewModel.kt) (`updateBusinessActiveInUI`, `loadAndDecryptSeed`, `getAvailableWalletsMeta`, and the two `saveAvailableWalletMeta` overloads, plus `platformWriteSeed`) whose android actuals live in `NavigationViewModel.android.kt`. @@ -521,7 +521,7 @@ dependency-substitution surprises to land here rather than earlier. **~1–2 days. Blocked by Phase 4.** [composeApp/build.gradle.kts:221](../composeApp/build.gradle.kts) already names -`to.curare.desktop.MainKt` as the desktop main class. **That file does not +`com.machankura.bennu.desktop.MainKt` as the desktop main class. **That file does not exist.** Write it: a `application { Window { ... } }` entry point constructing `PlatformContext` and handing it to the same root composable android uses. @@ -545,7 +545,7 @@ the protection, so the window opens onto a gate rather than onto the app. **Verification:** `./gradlew :composeApp:run`, and then a jvm test that opens the database. The run proves the window paints; it does not prove Room works, because the -gate stops before anything touches the database. `CurareDatabaseJvmTest` covers what +gate stops before anything touches the database. `BennuDatabaseJvmTest` covers what the compiler cannot see — that Room's KSP output for this target is usable, that the **host** SQLite native loads (the android artifact ships only android-ABI `.so` files and would fail here), that the schema is created, and that the queries forced from @@ -607,8 +607,8 @@ no-`Context` builder overload: inMemoryDatabaseBuilder(kotlin.jvm.functions.Function0) ``` -and [CurareDatabaseConstructor.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/database/CurareDatabaseConstructor.kt) -already supplies what it needs. So `Room.inMemoryDatabaseBuilder()` +and [BennuDatabaseConstructor.kt](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/BennuDatabaseConstructor.kt) +already supplies what it needs. So `Room.inMemoryDatabaseBuilder()` compiles in `commonTest` and runs under `testDebugUnitTest`. The one trap is native, and it is the same shape as the secp256k1 problem diff --git a/docs/long-running-sync.md b/docs/long-running-sync.md index 23e76e52..da85ce23 100644 --- a/docs/long-running-sync.md +++ b/docs/long-running-sync.md @@ -11,7 +11,7 @@ app is in the foreground: events that make us a member of a new group. - **kind 445**, Marmot group events h-tagged with every group id we belong to. -The code is [`LiveSubscriptionManager`](composeApp/src/commonMain/kotlin/to/curare/compose/managers/LiveSubscriptionManager.kt), +The code is [`LiveSubscriptionManager`](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/LiveSubscriptionManager.kt), built and scoped by `SynchronizationViewModel`. ## What this replaced @@ -99,14 +99,14 @@ reconcile against a conversation the relay is no longer having. The two kinds need opposite treatment, and it is visible in our own outbound code. Gift wraps are stamped with `TimeUtils.randomWithTwoDays()` -([`DatabaseChatRepository.kt:344`](composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseChatRepository.kt:344)), +([`DatabaseChatRepository.kt:344`](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseChatRepository.kt:344)), so a wrap published *now* can carry a `created_at` two days old. **A `since` anywhere near the present would silently drop a large fraction of genuinely new messages** — and "some DMs just don't arrive" is the worst failure mode to debug. There is none. Group events use `TimeUtils.now()` -([`MarmotOutboundDao.kt:578`](composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotOutboundDao.kt:578)), +([`MarmotOutboundDao.kt:578`](composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotOutboundDao.kt:578)), so a watermark would be safe there. It still is not used: `limit` already bounds the initial burst, and a watermark would have to be recomputed every time a chunk's membership changed. @@ -154,7 +154,7 @@ id which the old one then closes out from under. ### Lifecycle `AppLifecycle` is a singleton `StateFlow` fed by a `LifecycleEventObserver` -in `CurareNavHost`. A singleton rather than something threaded through the +in `BennuNavHost`. A singleton rather than something threaded through the composition, because the consumers are application-scoped coroutines that outlive any screen. It defaults to foreground: on a platform where the observer is not wired up, "always on" is the behaviour that predates it, and a subscription that diff --git a/docs/marmot-v2.md b/docs/marmot-v2.md index 074047c4..9bbbd3a6 100644 --- a/docs/marmot-v2.md +++ b/docs/marmot-v2.md @@ -40,7 +40,7 @@ of the code: | Phase 4: "extend `Outcome.BlockedOn` to a package that cannot be used" | `MarmotKeyPackageProfileException` at the add step, whose message the confirmation screen shows. `BlockedOn` still means missing, because the picker -- `getMarmotKeyPackageForPublicKey(publicKey, roomProfile)` -- refuses the wrong profile before creation ever asks, so there a wrong-profile package *is* a missing one | | Phase 5: four stores | one, `RoomMlsGroupStateStore`, over the state blob, `MarmotRetainedEpochSecret` and `MarmotRouting`. No `KeyPackageBundleStore` and no snapshot table: the `KeyPackageRotationManager` is constructed because the processor's constructor demands one and is never consulted, and bundles stay the app's rows with the notary's per-profile republish over them. No `MarmotIngestDedupStore`: 1.15.2's processor takes no such store, so there is nothing to mark into | | Phase 5: `MarmotGroupEvent` gains a `marmotMessageId` column | not added. The processor dedups by message id in memory for the life of the process; the reindex sweep still dedups by event id. The follow-up if a relay ever redelivers under a second id | -| Phase 5: one engine "held by the identity's scope" | `CurareDatabase.marmotEngine`, one per database, restored on first use. The DAOs that need it hold the database and not a view model's scope, and a switch of identity is a restart | +| Phase 5: one engine "held by the identity's scope" | `BennuDatabase.marmotEngine`, one per database, restored on first use. The DAOs that need it hold the database and not a view model's scope, and a switch of identity is a restart | | Phase 5: the timer "beside `LiveSubscriptionManager`"; an outbound row "stays on the queue" while a pass is open | `MarmotEngine.settleLater`, armed by the ingest whenever a pass opens and ticking on the engine's own scope; and `awaitSettled` on the outbound side -- a wait of up to three ticks rather than a refusal, because the outbound queue re-emits on a table change and a pass settling is not one | | Phase 6: "a terminal rejection resolves `FAILED`" | built in a follow-up, once "terminal" had a definition: a NIP-01 `OK` reason a relay will keep giving (`blocked:`, `invalid:`, `pow:`, `restricted:`) is a new "rejected" status that the launch-time requeue leaves alone, `rate-limited:` and `error:` are "failed" like a timeout, and `duplicate:` is "published". The obligation goes only when every relay in scope has rejected -- `BroadcastStatus`, `MarmotEngine.discardRejected` -- and the room gets a line in the relay's words | | Phase 6: `gate.satisfyEmptyObligation` for the group that is only its creator | `installState` straight after `stageAddMember`, keyed off the `isOneMemberInitialGroupCreation` the app already computed | @@ -154,11 +154,11 @@ decision in here that cannot be reversed once a v2 room exists. `quartz = "1.15.2"` in the version catalogue, and two compile fixes: - `CommitOrdering` was deleted from the library. It is vendored, unchanged, as - [managers/CommitOrdering.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/managers/CommitOrdering.kt) + [managers/CommitOrdering.kt](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/CommitOrdering.kt) with a header saying why the library dropped it. It goes again in Phase 5. - `GroupEventResult` gained `AppMessageOnCandidateBranch` and `RefusedByLifecycle`, and the exhaustive `when` in - [ChatMessage.fromGroupEventResult](../composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessage.kt:777) + [ChatMessage.fromGroupEventResult](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/ChatMessage.kt:777) now returns `null` for both. Neither is a delivery, and until Phase 5 the app never constructs either. @@ -182,7 +182,7 @@ with Amethyst users starts, since Amethyst still joins legacy groups. Nothing it Seventeen call sites read `currentMarmotData()`, which is the `0xF2EE` extension and is null on a v2 group. Ten of them read `nostrGroupId`, and the Welcome path in -[NostrDao.kt:701](../composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrDao.kt:701) +[NostrDao.kt:701](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NostrDao.kt:701) throws `MarmotMissingNostrGroupDataExtension` when it gets null -- so today a v2 Welcome is not a room the app cannot read but an exception it cannot get past. @@ -208,12 +208,12 @@ fun MlsGroup.retentionSeconds(): Long? = and point the seventeen sites at those, `currentNostrGroupId()` and `currentAdminIdentities()`. The two that matter most are -[SubgroupManager.kt:123](../composeApp/src/commonMain/kotlin/to/curare/compose/managers/SubgroupManager.kt:123), +[SubgroupManager.kt:123](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/SubgroupManager.kt:123), which decides who may open a subgroup ceremony, and -[MarmotInboundManager.processGroupMembershipChanges](../composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotInboundManager.kt:104), +[MarmotInboundManager.processGroupMembershipChanges](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MarmotInboundManager.kt:104), which stamps `adminAt`. On a v2 group both currently see no admins at all, so a member who is an admin is shown as none, and a subgroup cannot be started. -[MarmotInnerEvent.disappearingExpiration](../composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotInnerEvent.kt:117) +[MarmotInnerEvent.disappearingExpiration](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MarmotInnerEvent.kt:117) gets the same treatment; the library's own outbound processor had precisely this bug -- it read only `0xF2EE` and disappearing messages silently did not disappear in v2 groups -- and fixed it the same way. @@ -222,14 +222,14 @@ v2 groups -- and fixed it the same way. A current-profile kind:30443's content is not a bare `KeyPackage` but an `MLSMessage{KEY_PACKAGE}` around one. -[MarmotOutboundDao.inviteMember](../composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotOutboundDao.kt:453) +[MarmotOutboundDao.inviteMember](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotOutboundDao.kt:453) does `MlsKeyPackage.decodeTls(TlsReader(bytes))` on whatever the ingest stored, which reads the framing's version and wire-format words as the KeyPackage's own and fails. `KeyPackageUtils.decodeKeyPackage(bytes)` sniffs the first four bytes and handles both; use it there. While in the ingest at -[NostrDao.kt:429](../composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrDao.kt:429): +[NostrDao.kt:429](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NostrDao.kt:429): nothing validates a KeyPackage today. Run `KeyPackageUtils.isValid(event)` and `isCryptographicallyValid(event)` before storing one. The second now checks the leaf's lifetime and, for a current-profile package, the identity proof -- which is @@ -239,7 +239,7 @@ for that. ### Payloads without a signature -In [MarmotInboundManager.processPrivateMessage](../composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotInboundManager.kt:289) +In [MarmotInboundManager.processPrivateMessage](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MarmotInboundManager.kt:289) the author check reads `Event.fromJsonOrNull(innerJson)`. That accepts a canonical payload by accident -- the deserialiser defaults `sig` -- but it also accepts payloads the spec says to refuse: duplicate keys, unknown members, an id that does @@ -284,7 +284,7 @@ asserting the member lands. That is the Amethyst-user case, end to end. ### What goes out -In [encryptAndSendMarmotInnerEvent](../composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotOutboundDao.kt:735) +In [encryptAndSendMarmotInnerEvent](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotOutboundDao.kt:735) the plaintext is `innerEvent.toJson().encodeToByteArray()`, which carries `"sig":""`. The library's outbound processor is explicit about why that is refused by a conformant peer rather than merely untidy: a payload with a real signature @@ -324,7 +324,7 @@ accepts it. A kind:1059 wrap is signed -- by a throwaway key, but signed -- and its `pubkey` is that key, not the sender's. Under v2 it is refused twice over: for the `sig` member and for the author mismatch. The carve-out in -[mip03Rejection](../composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotInboundManager.kt:88) +[mip03Rejection](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MarmotInboundManager.kt:88) that admits it is exactly what other clients do not have, and the direct-message note already says those clients drop these as impersonation. @@ -381,7 +381,7 @@ kind:30443 anyway -- the notary returns before signing anything for it, so the bundle is never attempted, as [the npub sign-in note](./npub-sign-in.md) records. Replace -[DatabaseMarmotRepository.generateKeyPackage](../composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseMarmotRepository.kt:164) +[DatabaseMarmotRepository.generateKeyPackage](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseMarmotRepository.kt:164) and `buildKeyPackageLeafNode` with `CurrentProfileGroupFactory.createKeyPackage(signer, lastResort = true)`, and the event with `KeyPackageEvent.buildCurrentProfileFrom(bundle.keyPackage, dTagSlot, clientName = "curare")`. The event's tags change shape -- `mls_extensions` names `0x0006`, `mls_proposals` @@ -466,7 +466,7 @@ app creates on the current profile gets a fresh `RandomInstance.bytes(32)` as it routing id and keeps `SharedKeyDerivation.marmotGroupId` as its `ChatRoom.id`. The lookups that change are the ones keyed by the `h` tag: -[NostrDao.kt:441](../composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrDao.kt:441), +[NostrDao.kt:441](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NostrDao.kt:441), where an inbound kind:445's `groupId()` becomes the room via the table; `getMarmotGroupNostrEventsByChatRoomId`, whose `LIKE` on the tag narrows by the room's routing ids; the `#h` filter `LiveSubscriptionManager` keeps open, which @@ -485,9 +485,9 @@ group's private traffic to its public work with one string comparison. ### Creating one -[MarmotGroupCreation.create](../composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotGroupCreation.kt:105) +[MarmotGroupCreation.create](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/MarmotGroupCreation.kt:105) and -[SelectChatRoomTypeViewModel.createMarmotChatRoom](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SelectChatRoomTypeViewModel.kt:219) +[SelectChatRoomTypeViewModel.createMarmotChatRoom](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SelectChatRoomTypeViewModel.kt:219) both build a `MarmotGroupData` and hand it to `MlsGroup.create`. Both become ```kotlin @@ -584,7 +584,7 @@ group whose current state it never retained. ### Inbound -[NostrDao.indexMarmotGroupEvent](../composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrDao.kt:1311) +[NostrDao.indexMarmotGroupEvent](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NostrDao.kt:1311) replaces its `MlsGroupCache.withGroup { MarmotInboundManager.processGroupEvent(...) }` with `engine.inbound.processGroupEvent(groupEvent)`. Everything after the result -- `ChatMessage.fromGroupEventResult`, the FROST and DKG dispatch, membership changes @@ -679,7 +679,7 @@ second because a `Disbanding` or `Leaving` gate must survive a restart. `MarmotCommitResult` stays as the Welcome half; it already holds the framed commit, the Welcome bytes and the pre-commit exporter secret. -[inviteMember](../composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotOutboundDao.kt:453) +[inviteMember](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/MarmotOutboundDao.kt:453) becomes: `stageAddMembers` on the manager (a clone; the live group keeps its pending proposals) -> `buildCommitEvent(routingId, staged.framedCommitBytes, staged.preCommitExporterSecret)` -> `gate.prepare(groupId, staged, outboundBytes, recipientScope = relays)`, which is @@ -689,7 +689,7 @@ goes to the inbound processor at the same time, because the gate does not tell convergence about our own commits and a fork we are half of would otherwise look like an orphan. -[DatabaseNostrRepository.broadcastProcessed](../composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseNostrRepository.kt:473) +[DatabaseNostrRepository.broadcastProcessed](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseNostrRepository.kt:473) is already the place a relay OK arrives and already turns it into the deferred Welcome. It gains `gate.resolve(obligationId, CONFIRMED)` first, which installs the pending state, and only then delivers the Welcome -- which is the MIP-02 ordering @@ -728,7 +728,7 @@ welcome goes out` with the order it asserts made strict. ### Leaving -[leaveChatRoom](../composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseChatRepository.kt:655) +[leaveChatRoom](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseChatRepository.kt:655) sets `leftGroupAt` and sends the text "Left group". The group does not learn of it: the leaf stays in the tree, holding the group's keys. v2 leaving is a `SelfRemove` proposal published as a `PublicMessage` kind:445, which the app already @@ -784,7 +784,7 @@ disband is absorbing across a rebuilt engine; the snapshot diff yields exactly o **Two days.** Two implementations in one group, in `jvmTest`: the app's engine over a -`CurareDatabase`, and a bare library stand-in -- `MlsGroupManager` and +`BennuDatabase`, and a bare library stand-in -- `MlsGroupManager` and `MarmotInboundProcessor` over the in-memory stores -- playing Amethyst. The existing subgroup tests already run two databases in one process; this is the same shape with a foreign member. diff --git a/docs/material-design-conformance.md b/docs/material-design-conformance.md index 4fd43ad0..2b0f3de5 100644 --- a/docs/material-design-conformance.md +++ b/docs/material-design-conformance.md @@ -99,7 +99,7 @@ Worth knowing before reading older guidance or older code: ## Where this app stands -Counts below are over `composeApp/src/commonMain/kotlin/to/curare/compose/ui` +Counts below are over `composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui` unless stated. Phase 0 turns them into a script so they can be re-run. ### The theme is incomplete, and two entry points bypass it @@ -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`; `CurareTheme` only ever selects `darkScheme` or `lightScheme`. + `private val`; `BennuTheme` 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 @@ -133,12 +133,12 @@ Three gaps: Two entry points render outside the theme: -- `composeApp/src/jvmMain/kotlin/to/curare/desktop/Main.kt:126` — - `PassphraseGate` sits in the `else` branch beside `CurareApp`, so it composes +- `composeApp/src/jvmMain/kotlin/com/machankura/bennu/desktop/Main.kt:126` — + `PassphraseGate` sits in the `else` branch beside `BennuApp`, so it composes 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 `CurareTheme` by hand, +- `Profile.kt:183` and 50 other `@Preview` bodies wrap in `BennuTheme` 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.* `CurareTheme` takes a `ThemeContrast` +2. **Reach the contrast schemes.** *Built.* `BennuTheme` 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,8 +441,8 @@ 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 `CurareTheme` calls `MaterialExpressiveTheme` with all four - slots passed explicitly — colour, `MotionScheme.expressive()`, `CurareShapes`, + **expressive**, so `BennuTheme` calls `MaterialExpressiveTheme` with all four + slots passed explicitly — colour, `MotionScheme.expressive()`, `BennuShapes`, `AuxTypography`. Explicitly, because `MaterialExpressiveTheme` would otherwise default them to `expressiveLightColorScheme()` and friends, which is Material's palette rather than this app's: the same class of accident as the twelve @@ -456,13 +456,13 @@ find-and-replace. components later phases need (button groups, split buttons, floating toolbars, wide navigation rails, `LoadingIndicator`). - `CurareShapes` is baseline `Shapes()`, and `Shape.kt` records why: the corners + `BennuShapes` is baseline `Shapes()`, and `Shape.kt` records why: the corners hand-written across the tree already land on the scale — 4dp ×3 = `extraSmall`, 12dp ×11 = `medium`, 16dp ×2 = `large`, and one 30dp that drifted two units off `extraLarge`. Nothing needs restyling; seventeen literals need migrating, later. 4. **Move and fill typography.** `Type.kt` moves from `com.example.ui.theme` to - `to.curare.compose.ui.theme`. It stays baseline-derived, but it becomes a + `com.machankura.bennu.compose.ui.theme`. It stays baseline-derived, but it becomes a real file with a stated font stack and a comment recording which roles carry what: `display*`/`headline*` for screen identity, `title*` for section and card headers, `body*` for prose, `label*` for component text only. @@ -472,19 +472,19 @@ 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 `CurareTheme` outside the +6. **Wrap the desktop gate.** *Built.* `Main.kt` moves `BennuTheme` outside the `unlocked` branch, so `PassphraseGate` — the first screen a desktop user sees — - stops composing under the default `MaterialTheme`. `CurareApp` keeps its own - `CurareTheme`, so the unlocked branch is wrapped twice: android and ios enter - through `CurareApp` and would lose the theme entirely if it moved out, and a + stops composing under the default `MaterialTheme`. `BennuApp` keeps its own + `BennuTheme`, so the unlocked branch is wrapped twice: android and ios enter + through `BennuApp` and would lose the theme entirely if it moved out, and a second application of the same values costs one `CompositionLocalProvider`. - `Type.kt` also left `com.example.ui.theme` for `to.curare.compose.ui.theme`, + `Type.kt` also left `com.example.ui.theme` for `com.machankura.bennu.compose.ui.theme`, which removes one of the three package namespaces the UI was living across. **Done when** every role in `ColorScheme` is explicitly assigned in both schemes; the contrast test still passes and now covers six schemes; `Type.kt` -lives under `to.curare`; no composable in the tree renders under a default +lives under `com.machankura.bennu`; no composable in the tree renders under a default `MaterialTheme`. **Risk:** medium. Adding the fixed roles cannot regress anything (nothing reads @@ -654,10 +654,11 @@ format argument. `m3-extract-formatted.py --remaining` lists them. `UserAgent.APP_NAME` said "Torch", and was left that way here because it goes on the wire to relay operators -- a network identity question rather than a content one. That was settled when the app was rebranded to Curated: both it and `CLIENT_NAME` were moved off -Torch there, and the later rebrand carried them to "Curare", so the `client` tag on a -published relay list names the client that published it. `TorchTheme` became -`CuratedTheme` in that same change and `CurareTheme` in the next, and the two error -strings that told a user to install Torch name Curare now, so no live code answers to +Torch there, and the later rebrands carried them to "Curare" and then "Bennu", so the +`client` tag on a published relay list names the client that published it. `TorchTheme` +became `CuratedTheme` in that same change, `CurareTheme` in the next and `BennuTheme` in +the one after, and the two error strings that told a user to install Torch name Bennu +now, so no live code answers to that brand any more. What is left of it is this note, the finding above, and one test fixture -- all three records of what was, and wrong to rewrite. @@ -739,13 +740,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. `CurareTheme` classifies + thresholds are assertable without a Compose runtime. `BennuTheme` 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 `CurareTheme`, + on android, `WindowInfoTracker` and an activity. This call sits in `BennuTheme`, which wraps all 51 `@Preview` bodies in the tree, and a preview context is not an activity. @@ -971,9 +972,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 `CurareTheme` +slide at first, because the test provided `LocalReducedMotion` around `BennuTheme` and the theme overwrote it. The fix is not in the test: `reducedMotion` is now a -`CurareTheme` parameter defaulted to the platform, exactly as `contrast` is, +`BennuTheme` 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. @@ -1038,7 +1039,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 - `CurareTheme(contrast = …)` in the body. `ThemeGallery` covers the six once, + `BennuTheme(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. @@ -1125,7 +1126,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.** `CurareTheme` defaults +- **Whether dynamic colour should keep overriding the brand.** `BennuTheme` 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 @@ -1148,7 +1149,7 @@ Phases 1–5 can be worked in parallel by different people if 1 lands first; - **iOS.** The ios targets only build on a mac (see `jvm-target.md`), so nothing here has been verified on the platform whose HIG asks for 44dp targets rather than 48dp. M3 notes the difference; this plan assumes 48dp everywhere. -- **The three package namespaces.** `to.curare`, `com.example.ui.theme` and +- **The three package namespaces.** `com.machankura.bennu`, `com.example.ui.theme` and `com.machankura.compose` all hold live UI code. Phase 1 moves `Type.kt` and Phase 3 moves `Clickable.kt` because both are in the way; the rest of the `com.machankura` tree — NFC widgets among it — is out of scope. diff --git a/docs/member-chronicle.md b/docs/member-chronicle.md index ee6fecdb..62c31493 100644 --- a/docs/member-chronicle.md +++ b/docs/member-chronicle.md @@ -159,7 +159,7 @@ after the phase that makes it unnecessary. **Half a day. No wire change, no behaviour change.** -In [GroupKeyStateEvent.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/GroupKeyStateEvent.kt), +In [GroupKeyStateEvent.kt](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/frost/GroupKeyStateEvent.kt), split the existing check in two and keep the existing one as a caller: ```kotlin @@ -197,7 +197,7 @@ is even reached. **A day.** -A new package, `to.curare.compose.nostr.chronicle`, with `ChronicleEvents.kt` +A new package, `com.machankura.bennu.compose.nostr.chronicle`, with `ChronicleEvents.kt` holding the kinds -- mirroring `FrostSigningEvents`. ``` @@ -660,7 +660,7 @@ batch-signing note's did, so this section is the index rather than the work. Every claim below is asserted somewhere; what is here is which claim and where. **The whole thing, end to end** -- -[ChronicleApplyJvmTest](../composeApp/src/jvmTest/kotlin/to/curare/compose/managers/ChronicleApplyJvmTest.kt), +[ChronicleApplyJvmTest](../composeApp/src/jvmTest/kotlin/com/machankura/bennu/compose/managers/ChronicleApplyJvmTest.kt), over two real databases with the pages carried by hand. The sender's room is seeded through `ChatMessage.applyInnerEvent` itself, so what is chronicled is what a member's device really holds rather than rows built to suit the test. The @@ -691,7 +691,7 @@ hand-rolled because `ChronicleEvent.build` refuses the kind, which is the outbou half of the same rule. **The `toXEvent` round trip per chronicled kind** -- -[ChronicleRoundTripTest](../composeApp/src/commonTest/kotlin/to/curare/compose/nostr/chronicle/ChronicleRoundTripTest.kt), +[ChronicleRoundTripTest](../composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/chronicle/ChronicleRoundTripTest.kt), against real FROST with no database. This is the one that earned its place: it found that `MantraArtifact.toArtifactEvent` had the alt tag in the wrong position *and* omitted the version metadata entirely, either of which produces payloads @@ -781,17 +781,17 @@ short. That is the failure mode to weigh -- it looks like success on both ends. | what | where | |---|---| -| `rebuiltEventsOf` | [ChronicleManager.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/managers/ChronicleManager.kt) -- the tree walk, and the version-label recovery inside it | +| `rebuiltEventsOf` | [ChronicleManager.kt](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/ChronicleManager.kt) -- the tree walk, and the version-label recovery inside it | | the union in `signedEventsOf` | same file -- it collapses to the `GroupSignedEvent` read plus the `isChroniclable` filter, which **stays**: see below | -| `MantraDialect.toDialectEvent` | [MantraDialect.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraDialect.kt) | -| `MantraArtifact.toArtifactEvent` | [MantraArtifact.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraArtifact.kt) -- and with it the `versionLabel` parameter that exists only because the label is not on the row | -| `MantraArtifactVersion.toArtifactVersionEvent` | [MantraArtifactVersion.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraArtifactVersion.kt) | -| `MantraChapter.toChapterEvent` | [MantraChapter.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraChapter.kt) | -| `MantraChunk.toChunkEvent` | [MantraChunk.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraChunk.kt) | -| `MantraTranslationArtifactVersion.toTranslationArtifactVersionEvent` | [MantraTranslationArtifactVersion.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationArtifactVersion.kt) | -| `MantraTranslationChapter.toTranslationChapterEvent` | [MantraTranslationChapter.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChapter.kt) | -| `MantraTranslationChunk.toTranslationChunkEvent` | [MantraTranslationChunk.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChunk.kt) | -| `ChronicleRoundTripTest`, all ten cases | [ChronicleRoundTripTest.kt](../composeApp/src/commonTest/kotlin/to/curare/compose/nostr/chronicle/ChronicleRoundTripTest.kt) -- it exists to hold the rebuild up and covers nothing else | +| `MantraDialect.toDialectEvent` | [MantraDialect.kt](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraDialect.kt) | +| `MantraArtifact.toArtifactEvent` | [MantraArtifact.kt](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraArtifact.kt) -- and with it the `versionLabel` parameter that exists only because the label is not on the row | +| `MantraArtifactVersion.toArtifactVersionEvent` | [MantraArtifactVersion.kt](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraArtifactVersion.kt) | +| `MantraChapter.toChapterEvent` | [MantraChapter.kt](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraChapter.kt) | +| `MantraChunk.toChunkEvent` | [MantraChunk.kt](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraChunk.kt) | +| `MantraTranslationArtifactVersion.toTranslationArtifactVersionEvent` | [MantraTranslationArtifactVersion.kt](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslationArtifactVersion.kt) | +| `MantraTranslationChapter.toTranslationChapterEvent` | [MantraTranslationChapter.kt](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslationChapter.kt) | +| `MantraTranslationChunk.toTranslationChunkEvent` | [MantraTranslationChunk.kt](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/MantraTranslationChunk.kt) | +| `ChronicleRoundTripTest`, all ten cases | [ChronicleRoundTripTest.kt](../composeApp/src/commonTest/kotlin/com/machankura/bennu/compose/nostr/chronicle/ChronicleRoundTripTest.kt) -- it exists to hold the rebuild up and covers nothing else | | the "Where the events come from" reasoning above | this file | **Two already-dead cousins to sweep at the same time**, neither of which is part diff --git a/docs/multiple-profiles.md b/docs/multiple-profiles.md index cae43cf2..97a3d568 100644 --- a/docs/multiple-profiles.md +++ b/docs/multiple-profiles.md @@ -106,7 +106,7 @@ Every screen from the home tab inward takes `activeUserPublicKey` as a route argument — `HomeRoute`, `SearchRoute`, `ActiveProfileRoute`, `ChatRoomDetailRoute`, all of them. The navigation component reads the signed-in key *off the current route* rather than holding it -([CurareNavHost.kt:418](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/CurareNavHost.kt)), +([BennuNavHost.kt:418](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/BennuNavHost.kt)), precisely so that it cannot drift from the screen underneath. That is the right design for one profile and it decides the shape of a switch: a stack of routes built for key A cannot be handed key B. The only honest switch is to clear the @@ -116,7 +116,7 @@ does when the active identity changes. The second half of the constraint is the database. It is one Room file for the device, and it is *mostly* keyed by whose it is: `ChatRoom.userPublicKey` — whose comment reads "should help us have multiple user support" -([ChatRoom.kt:48](../composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatRoom.kt)) +([ChatRoom.kt:48](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/ChatRoom.kt)) — `UnsignedNostrEvent.pubKey`, `MarmotKeyPackageBundle.publicKey`, `GiftWrapMessage.receiverPublicKey`, the `Connection` relation by both keys. The profile cache is shared, and should be: a kind 0 is the same event whoever fetched @@ -131,19 +131,19 @@ application, and its switching machinery came across intact and unused. | piece | where | state | |---|---|---| -| the credentials file, its encrypted writer, and the app writing it from `writeMnemonic` — to *delete* a public entry a seed supersedes | [IdentityWriter.kt:148](../composeApp/src/commonMain/kotlin/to/curare/compose/identity/IdentityWriter.kt) | built; writing a `Secret` from the same place is one line more | -| `migrateFromNostrKeys`: a named, idempotent write that runs from `listIdentities` before anything reads either file | [SovereignWalletViewModel.kt:183](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SovereignWalletViewModel.kt) | built; the shape Phase 1's repair copies | -| `StoredIdentity.merge`, deriving every seed's nostr public key at listing to compare stores by pubkey | [StoredIdentity.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/identity/StoredIdentity.kt) | built; the derivation is what attaches a seed to its credential | -| `switchToWallet(id)`: sets `desiredWalletId`, clears the active identity | [SovereignWalletViewModel.kt:304](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SovereignWalletViewModel.kt) | built; called by the sign-in and create tails and the startup selector, never from a signed-in screen | -| `resetToSelector()`: clears both and asks startup for the list | [SovereignWalletViewModel.kt:315](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SovereignWalletViewModel.kt) | built; the sign-out and forget tails use it | -| `NavigationViewModel.observeProfile`: a null identity is `StartupPhoenix`, which the nav host navigates to with `popUpTo(0)`; a new identity is observed from its account | [NavigationViewModel.kt:184](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.kt) | built — this *is* the restart | -| the notary, the sync pumps and the live subscriptions run as children of `collectLatest` over the identity, so a change cancels them — the comments say "a wallet switch" in as many words | [NotaryViewModel.kt:62](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NotaryViewModel.kt), [SynchronizationViewModel.kt:193](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SynchronizationViewModel.kt) | built | -| the startup screen: lists, picks by `forceWalletId` / `desiredWalletId` / the default, shows `WalletsSelector` otherwise, and wraps every activation in the lock gate | [SovereignWalletStartupScreen.kt:106](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SovereignWalletStartupScreen.kt) | built; the precedence is wrong for a switch, see below | -| `WalletsSelector`: a current section with a divider, the others below, a *read only* label, `topContent` and `bottomContent` slots | [WalletsSelector.kt:59](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/wallet/WalletsSelector.kt) | built; shows "Default name" and a random emoji for every row | +| the credentials file, its encrypted writer, and the app writing it from `writeMnemonic` — to *delete* a public entry a seed supersedes | [IdentityWriter.kt:148](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/IdentityWriter.kt) | built; writing a `Secret` from the same place is one line more | +| `migrateFromNostrKeys`: a named, idempotent write that runs from `listIdentities` before anything reads either file | [SovereignWalletViewModel.kt:183](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SovereignWalletViewModel.kt) | built; the shape Phase 1's repair copies | +| `StoredIdentity.merge`, deriving every seed's nostr public key at listing to compare stores by pubkey | [StoredIdentity.kt](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/StoredIdentity.kt) | built; the derivation is what attaches a seed to its credential | +| `switchToWallet(id)`: sets `desiredWalletId`, clears the active identity | [SovereignWalletViewModel.kt:304](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SovereignWalletViewModel.kt) | built; called by the sign-in and create tails and the startup selector, never from a signed-in screen | +| `resetToSelector()`: clears both and asks startup for the list | [SovereignWalletViewModel.kt:315](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SovereignWalletViewModel.kt) | built; the sign-out and forget tails use it | +| `NavigationViewModel.observeProfile`: a null identity is `StartupPhoenix`, which the nav host navigates to with `popUpTo(0)`; a new identity is observed from its account | [NavigationViewModel.kt:184](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/NavigationViewModel.kt) | built — this *is* the restart | +| the notary, the sync pumps and the live subscriptions run as children of `collectLatest` over the identity, so a change cancels them — the comments say "a wallet switch" in as many words | [NotaryViewModel.kt:62](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/NotaryViewModel.kt), [SynchronizationViewModel.kt:193](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SynchronizationViewModel.kt) | built | +| the startup screen: lists, picks by `forceWalletId` / `desiredWalletId` / the default, shows `WalletsSelector` otherwise, and wraps every activation in the lock gate | [SovereignWalletStartupScreen.kt:106](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SovereignWalletStartupScreen.kt) | built; the precedence is wrong for a switch, see below | +| `WalletsSelector`: a current section with a divider, the others below, a *read only* label, `topContent` and `bottomContent` slots | [WalletsSelector.kt:59](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/wallet/WalletsSelector.kt) | built; shows "Default name" and a random emoji for every row | | `BusinessManager`: a map of running nodes by wallet id; starting one that runs returns it; `stopBusiness(walletId)` on all three platforms | [BusinessManager.kt:208](../lightning-kmp-app/library/src/androidMain/kotlin/fr/acinq/phoenix/android/BusinessManager.kt) | built; nothing in the app calls `stopBusiness` | | `GlobalPrefs.getDefaultWallet`, `saveDefaultWallet`, `clearDefaultWallet` | [GlobalPrefs.kt:102](../lightning-kmp-app/library/src/commonMain/kotlin/fr/acinq/phoenix/utils/preferences/GlobalPrefs.kt) | read by startup; never written by anything | -| the sign-in and create tails: re-list, select, go to startup | [CurareNavHost.kt:746](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/CurareNavHost.kt), [:545](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/CurareNavHost.kt) | built; a shape that works from inside the app as well as from Landing | -| *Change account* on the profile tab | [ActiveProfileScreen.kt:309](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ActiveProfileScreen.kt) | `ImplementationPendingRoute` | +| the sign-in and create tails: re-list, select, go to startup | [BennuNavHost.kt:746](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/BennuNavHost.kt), [:545](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/BennuNavHost.kt) | built; a shape that works from inside the app as well as from Landing | +| *Change account* on the profile tab | [ActiveProfileScreen.kt:309](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ActiveProfileScreen.kt) | `ImplementationPendingRoute` | | `ForgetIdentity` and `SignOutViewModel` for a read-only identity; *forget this key* for an nsec | `identity/ForgetIdentity.kt`, `NostrSecretScreen` | built; the tail lands on the selector or Landing, which is right for several profiles too | | `NpubPreviewRoundTripJvmTest`: a real key store, a real in-memory database, real view models | `jvmTest/.../identity/` | the harness every test below reuses | @@ -160,10 +160,10 @@ Seven things, in the order a user would hit them. **A seed's profile is not a credential.** `writeMnemonic` writes `seed.dat` and nothing else — and if a `Public` entry for the seed's key exists, it *deletes* it, so the seed becomes the only holder -([IdentityWriter.kt:148](../composeApp/src/commonMain/kotlin/to/curare/compose/identity/IdentityWriter.kt)). +([IdentityWriter.kt:148](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/IdentityWriter.kt)). The key is then derived twice on every launch: at listing, from the words, to learn the pubkey the selector shows; and at activation, from the *running node's* -key manager ([SovereignWalletViewModel.kt:151](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SovereignWalletViewModel.kt)), +key manager ([SovereignWalletViewModel.kt:151](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SovereignWalletViewModel.kt)), which is why a seed-backed profile has to start Lightning before it can be anyone. Both sign-in plans made this an invariant rather than an accident — one entry per pubkey *across both files*, `writeNostrKey` refusing a key a seed @@ -173,7 +173,7 @@ builds would inherit a list in which one kind of row is a key and another is a seed pretending to be one. **There is no way in.** Landing is reached only when `availableIdentities` is -empty ([SovereignWalletStartupScreen.kt:95](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SovereignWalletStartupScreen.kt)), +empty ([SovereignWalletStartupScreen.kt:95](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SovereignWalletStartupScreen.kt)), and the sign-in and create screens are reached only from Landing. A device with one profile cannot be given a second: the flow that adds one is behind a screen the device never shows again. @@ -185,7 +185,7 @@ pending screen. **The startup precedence is wrong for a switch.** The `when` that picks what to open reads `!startWalletImmediately -> null` *before* `desiredWalletId != null` -([:122](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SovereignWalletStartupScreen.kt)), +([:122](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SovereignWalletStartupScreen.kt)), and `startWalletImmediately` is set to false by `resetToSelector()` and by the lock prompt's back button and set back to true by nothing. So after the first visit to the selector, every sign-in on that device lands on the selector instead @@ -196,7 +196,7 @@ profiles is the selector, every time, with no memory of which one was open. **Two things are not torn down.** `RelaysSocketManager.observeActiveUserId` keeps one relay-list observer *per pubkey* and only ever cancels the one for the pubkey being started; its own comment says `TODO: Cancel all pending jobs?` -([RelaysSocketManager.kt:65](../composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelaysSocketManager.kt)). +([RelaysSocketManager.kt:65](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/RelaysSocketManager.kt)). After a switch, A's observer and B's observer both feed `updateRelayPools`, and the one pool follows whichever relay list emitted last. And the previous profile's node, where it had one, keeps running in `BusinessManager` — Electrum, @@ -207,13 +207,13 @@ running for a profile that is not active is that finding with the sign flipped. **The queues belong to the device, not the identity.** `SynchronizeNostrEventRequest`, `NegentropySynchronizeRequest` and `BroadcastNostrEventRequest` have no owner column, and the pumps drain whatever is `pending` with the *active* key pair -([DatabaseNostrRepository.kt:111](../composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseNostrRepository.kt)). +([DatabaseNostrRepository.kt:111](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseNostrRepository.kt)). Requests A queued a moment before the switch — its sign-in sync, its room reconciliation — are answered while B is active, and everything that comes back is indexed as B: a gift wrap addressed to A is stored, found not to be addressed -to the active key, and left ([NostrDao.kt:439](../composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrDao.kt)). +to the active key, and left ([NostrDao.kt:439](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NostrDao.kt)). Then `storeNostrEvent` never indexes an event it already holds -([NostrDao.kt:176](../composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrDao.kt), +([NostrDao.kt:176](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NostrDao.kt), the `TODO: Check if event got indexed`), so when A is opened again, its live subscription re-receives the wrap, the DAO sees a known id, and returns. **A message that arrives while the other profile is open is lost to the one it was @@ -221,7 +221,7 @@ for.** Silently, and it looks in the logs like nothing happened, because nothing did. **Two destructive controls assume one profile.** `CreateProfileScreen`'s *end -this* calls `wipeDatabase()` ([CreateProfileScreen.kt:381](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/CreateProfileScreen.kt)) +this* calls `wipeDatabase()` ([CreateProfileScreen.kt:381](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/CreateProfileScreen.kt)) — on a device with a second profile, that profile's rooms and MLS state go with it, from a screen the user opened to *add* one. And once a default is remembered, forgetting the identity it names has to clear it, or the next boot opens a @@ -731,7 +731,7 @@ detail to pair with. `WalletsSelector` shows `metadata.nameOrDefault()` — "Default name", for every row, because nothing in this app writes the wallet metadata's name — over a -random emoji ([WalletsSelector.kt:162](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/wallet/WalletsSelector.kt)). +random emoji ([WalletsSelector.kt:162](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/wallet/WalletsSelector.kt)). Two profiles side by side, both called Default name, distinguished by a bech32 string, is not a switcher. @@ -753,7 +753,7 @@ a wallet question, and between two profiles with the same name, and it belongs before the tap for the reason the read-only label does. A bare-key profile carries no label; it is the plain case. -The startup screen draws the same widget and gets the same map: `CurareNavHost` +The startup screen draws the same widget and gets the same map: `BennuNavHost` already holds `databaseNostrRepository` where it composes `SovereignWalletStartupScreen`, and passes it through. Both lists then look the same, which is what a user who has just seen one and is now looking at the other @@ -814,7 +814,7 @@ the app. ### A profile created from inside is a key `CreateProfileScreen` generates twelve words behind its form -([CreateProfileViewModel.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/CreateProfileViewModel.kt)): +([CreateProfileViewModel.kt](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/CreateProfileViewModel.kt)): a seed, a node, a wallet, and — at the NIP-06 path — the key that becomes the profile. That is the right thing for the first profile on a device, which is the one the wallet will belong to, and the wrong thing for the second: a user who diff --git a/docs/npub-profile-preview.md b/docs/npub-profile-preview.md index f4df6b17..a7ba285f 100644 --- a/docs/npub-profile-preview.md +++ b/docs/npub-profile-preview.md @@ -20,7 +20,7 @@ reasoning; where the implementation chose differently the table below says so: | a new string, `no_profile_was_found_for_this_npub` | the sign-in screen's `we_could_not_find_a_profile_for_this_key` — "We could not find a profile for this key on the relays we asked." One string, two screens, one meaning, as the npub plan found with `use_a_different_key` | | a new string, `open_chat` | it existed: `SelectChatRoomTypeScreen`'s. The build failed on the duplicate key, which is the catalogue doing its job | | `findDirectMessageRoom` as "the rule `initiateNewChat` applied" | the rule's *intent*: a room whose members are exactly the two keys, or the one key when they are the same. The old size-one branch would have opened any room in which the peer sat alone, whoever the peer was; the new rule needs that lone member to be you, and the repository test pins a room the peer has with somebody else as not yours | -| `retry()` from `NotYetOnCurare` | from any `Loaded`: it re-asks the DM relays alone and touches the readiness only when it was `NotYetOnCurare`, so a retry never takes an "Open chat" back to "Checking" | +| `retry()` from `NotYetOnBennu` | from any `Loaded`: it re-asks the DM relays alone and touches the readiness only when it was `NotYetOnBennu`, so a retry never takes an "Open chat" back to "Checking" | | the timeout "fires with a person on screen" | a flag, `relaysHadTheirTime`, because the profile can arrive *after* the timeout and has to read not-yet-on-Curare rather than checking; cleared by a retry, and `@Volatile` because the timeout and the collect are different coroutines | | the view model tested on `TestScope` virtual time | real time, as the other view-model tests: `Dispatchers.setMain(UnconfinedTestDispatcher())`, a poll under `withTimeout`, and the twenty seconds cut to three hundred milliseconds through the constructor | | `initiate()` "runs from a `LaunchedEffect`" | and is idempotent besides: a recomposition that calls it again opens no second collect, which the view-model test asserts | @@ -36,20 +36,20 @@ edit — which is what made the `nostr:npub1…` row a four-line test. ## The flow today 1. The "New chat" button on the home screen opens the sheet - ([HomeScreen.kt:193](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/HomeScreen.kt), + ([HomeScreen.kt:193](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/HomeScreen.kt), and again at 300 for the two-pane layout). 2. `NewChatBottomSheetDialog` — titled "Create new chat" — offers two cards. The first, "Direct message via npub", hides the sheet and opens a dialog - ([HomeScreen.kt:353](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/HomeScreen.kt)). + ([HomeScreen.kt:353](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/HomeScreen.kt)). 3. `StartDirectMessageToNpubOrNip05Dialog` is one field and a "Start chat" button. The button is enabled when the text starts with `npub1` or `nostr:npub1`, or parses as an email-like address - ([StartDirectMessageToNpubOrNip05Dialog.kt:125](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05Dialog.kt)). + ([StartDirectMessageToNpubOrNip05Dialog.kt:125](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05Dialog.kt)). 4. "Start chat" decodes the npub and pushes `ChatRoomMessagingRoute(chatRoomId = )` (line 162). A nip05 goes to `ImplementationPendingRoute` (line 153). 5. `ChatRoomMessagingScreen` finds no room under that id and moves to `InitiatingNewChat` - ([ChatRoomMessagingViewModel.kt:52](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomMessagingViewModel.kt)), + ([ChatRoomMessagingViewModel.kt:52](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ChatRoomMessagingViewModel.kt)), and `initiateNewChat` (line 69) looks for a room that already has the two of you in it, otherwise waits on the peer's profile *and* key package, with a twenty-second timeout, then calls `createMlsDirectMessage` (line 153) and replaces itself with the @@ -63,7 +63,7 @@ twenty seconds and "Couldn't find this profile's chat details on the relays yet" and in neither case a way to tell *wrong npub* from *right person, not on Curare yet*. The one place in the app that shows a person and offers "Send message", `MetadataEventDetail` -([MetadataEventDetail.kt:296](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/detail/MetadataEventDetail.kt)), +([MetadataEventDetail.kt:296](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/detail/MetadataEventDetail.kt)), is reached by the *event id* of a kind 0 the device already holds, and a pasted npub has neither. @@ -84,19 +84,19 @@ Almost all of it. The preview is a new screen over pieces that exist. | piece | where | state | |---|---|---| -| a person plus one action, reached by pubkey: `AddMemberToChatRoomConfirmationScreen` waits on a key package with a timeout and shows the profile's name over a bottom-bar button | [AddMemberToChatRoomConfirmationViewModel.kt:74](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddMemberToChatRoomConfirmationViewModel.kt) | the shape, whole | -| the existing-room check, the profile-and-key-package wait, the timeout, the creation, the self-replacement | [ChatRoomMessagingViewModel.kt:69](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomMessagingViewModel.kt) | stays exactly where it is; the preview hands over to it | +| a person plus one action, reached by pubkey: `AddMemberToChatRoomConfirmationScreen` waits on a key package with a timeout and shows the profile's name over a bottom-bar button | [AddMemberToChatRoomConfirmationViewModel.kt:74](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/AddMemberToChatRoomConfirmationViewModel.kt) | the shape, whole | +| the existing-room check, the profile-and-key-package wait, the timeout, the creation, the self-replacement | [ChatRoomMessagingViewModel.kt:69](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/ChatRoomMessagingViewModel.kt) | stays exactly where it is; the preview hands over to it | | the three-kind filter a chat needs — kind 0, key package, DM relay list — on the DM relays | `ChatRoomMessagingViewModel.scheduleProfileAndKeyPackageSync`, line 182 | private; lifted out in Phase 1 | -| a sync object with tests, and the rule that a placeholder is not a profile: `createdAt > GENESIS_AT` | [MemberProfileSync.kt:52](../composeApp/src/commonMain/kotlin/to/curare/compose/nostr/MemberProfileSync.kt) | the precedent for both | -| where a kind 0 is found for a key that has lived elsewhere: the indexer relays plus our own | [SignInSync.kt:53](../composeApp/src/commonMain/kotlin/to/curare/compose/nostr/SignInSync.kt), `bootstrapRelays` | reused as is | -| the full npub validation — `nostr:` stripped, case folded, hrp checked, thirty-two bytes, a point on the curve | [CredentialParser.kt:139](../composeApp/src/commonMain/kotlin/to/curare/compose/identity/CredentialParser.kt) | private; exposed in Phase 3 | +| a sync object with tests, and the rule that a placeholder is not a profile: `createdAt > GENESIS_AT` | [MemberProfileSync.kt:52](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/MemberProfileSync.kt) | the precedent for both | +| where a kind 0 is found for a key that has lived elsewhere: the indexer relays plus our own | [SignInSync.kt:53](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/SignInSync.kt), `bootstrapRelays` | reused as is | +| the full npub validation — `nostr:` stripped, case folded, hrp checked, thirty-two bytes, a point on the curve | [CredentialParser.kt:139](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/CredentialParser.kt) | private; exposed in Phase 3 | | `observeProfileWithPublicKey`, `observeMarmotKeyPackageForPublicKey`, `getAllParticipantsWithPubKey`, `getChatRoomByIdentifier` | `NostrRepository`, `ChatRepository` | built | -| the queue stamps the asking identity on every request | [DatabaseNostrRepository.kt:686](../composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseNostrRepository.kt) | nothing for a view model to do | -| a re-queued negentropy request inside the same minute re-arms the row rather than being ignored | [NegentropySynchronizeRequestDao.kt:32](../composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NegentropySynchronizeRequestDao.kt) | "try again" works | -| a kind 0 arriving overwrites the placeholder row | [NostrDao.kt:424](../composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrDao.kt) | the observed flow emits it | -| the stack shape for "a profile becomes a chat": push the room, pop the profile | [CurareNavHost.kt:1706](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/CurareNavHost.kt), `NostrEventDetailRoute`'s DM exit | copied | +| the queue stamps the asking identity on every request | [DatabaseNostrRepository.kt:686](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseNostrRepository.kt) | nothing for a view model to do | +| a re-queued negentropy request inside the same minute re-arms the row rather than being ignored | [NegentropySynchronizeRequestDao.kt:32](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NegentropySynchronizeRequestDao.kt) | "try again" works | +| a kind 0 arriving overwrites the placeholder row | [NostrDao.kt:424](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NostrDao.kt) | the observed flow emits it | +| the stack shape for "a profile becomes a chat": push the room, pop the profile | [BennuNavHost.kt:1706](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/BennuNavHost.kt), `NostrEventDetailRoute`'s DM exit | copied | | `ProfileAvatar`, `humanReadableNameOrPubkey()`, `staticIdentifier()`, `hexToNpubHrp()` | `Profile.kt`, `Credentials.kt` | built | -| a constant app bar with the state transition inside it | [GroupNostrProfileScreen.kt:106](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/GroupNostrProfileScreen.kt) | the layout to copy | +| a constant app bar with the state transition inside it | [GroupNostrProfileScreen.kt:106](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/GroupNostrProfileScreen.kt) | the layout to copy | | `LoadingDataIndicator(text = …)`, `EmptyState(message, icon, action)`, `ErrorState(onRetry)`, `NavigateBackButton`, `LocalCanSign` | `widgets/` | built | | strings: `profile`, `try_again`, `start_chat`, `send_message` | `strings.xml` | present; the new ones are listed per phase | @@ -127,7 +127,7 @@ link and, once one exists, a resolved nip05: every one of them arrives as a key. A pubkey gets a `Profile` row the moment the device first sees it, and that row is the "LOADING..." placeholder stamped `GENESIS_AT` -([NostrDao.kt:273](../composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrDao.kt)). +([NostrDao.kt:273](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NostrDao.kt)). The preview shows a profile only when a kind 0 has been read for it — the rule `ChatRoomMessagingViewModel` already applies at line 136 and `MemberProfileSync` at line 58, given a name in Phase 1 so that it is applied once. @@ -187,7 +187,7 @@ screen will read, testable without a composition. ### `DirectMessagePeerSync` `ChatRoomMessagingViewModel.scheduleProfileAndKeyPackageSync` lifted into -`to.curare.compose.nostr`, beside `MemberProfileSync` and shaped like it, with the +`com.machankura.bennu.compose.nostr`, beside `MemberProfileSync` and shaped like it, with the kind 0 request the preview adds: ```kotlin @@ -225,7 +225,7 @@ asks for the key package alone under a different purpose and is left as it is. Level 0 on both, for the reason `MemberProfileSync` gives: it marks a request as one somebody is waiting on, and a kind 0 arriving at level 0 over a placeholder queues the rest of that person's profile kinds off the back of it -([NostrDao.kt:1243](../composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrDao.kt)). +([NostrDao.kt:1243](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NostrDao.kt)). From an indexer that follow-up asks the indexer for key packages it does not hold, which is harmless and is why the DM-relay request is queued explicitly rather than relied on. @@ -430,7 +430,7 @@ is the record that `Don't` survives the round trip and `Don\'t` does not. ### The host -In `CurareNavHost`, after `NostrEventDetailRoute`: +In `BennuNavHost`, after `NostrEventDetailRoute`: ```kotlin composable { backStackEntry -> @@ -456,7 +456,7 @@ same two steps the dialog produces today, with the preview gone from between the ### Tests `ProfilePreviewScreenJvmTest`, on the pattern of `GroupNostrProfileScreenJvmTest` -— `runDesktopComposeUiTest` at a phone's width, `CurareTheme`, `ProvideSnackbarHost`, +— `runDesktopComposeUiTest` at a phone's width, `BennuTheme`, `ProvideSnackbarHost`, the state passed in, the NO_OP repository never asked: - `Loaded` draws the name, the nip05, the whole of the about, and the npub; @@ -597,7 +597,7 @@ sealed interface Readiness { /** Asked, not answered yet. */ data object Checking : Readiness /** The relays have had their time and no key package came. */ - data object NotYetOnCurare : Readiness + data object NotYetOnBennu : Readiness } ``` @@ -606,13 +606,13 @@ The view model takes `chatRepository` and, in `initiate`, reads `ChatRoomMessagingViewModel` does at line 130, the profile flow *combined with* `observeMarmotKeyPackageForPublicKey`, and on each emission with a resolved profile sets `Loaded(profile, readiness)` where readiness is `ExistingChat` if the room was -found, else `CanStartChat` if the key package is non-null, else `NotYetOnCurare` if +found, else `CanStartChat` if the key package is non-null, else `NotYetOnBennu` if the timeout has fired, else `Checking`. The one timeout now does two things when it fires: `Loading` becomes `NotFound`, and `Loaded(_, Checking)` becomes -`Loaded(_, NotYetOnCurare)`. A key package cancels it only if the profile has also +`Loaded(_, NotYetOnBennu)`. A key package cancels it only if the profile has also arrived; a profile cancels nothing on its own, since the key package is still owed. -`retry()` from `NotYetOnCurare` keeps the profile on screen — it is found; it is the +`retry()` from `NotYetOnBennu` keeps the profile on screen — it is found; it is the key package being asked for again — sets readiness back to `Checking`, restarts the timeout and queues `DirectMessagePeerSync.requests` alone. @@ -636,7 +636,7 @@ factory hands it to the view model. The button reads its state: | `ExistingChat` | `open_chat`, enabled → `ChatRoomMessagingRoute(chatRoomId = room id, relayHint)` | `you_already_have_a_chat_with_s` | | `CanStartChat` | `start_new_chat`, enabled → as Phase 2 | nothing; the button is the answer | | `Checking` | `start_new_chat`, disabled | a `LoadingIndicator` and `checking_whether_s_can_receive_messages_here` | -| `NotYetOnCurare` | `start_new_chat`, disabled | `s_hasn_t_set_up_messaging_on_curare_yet`, and a `TextButton(try_again)` → `retry()` | +| `NotYetOnBennu` | `start_new_chat`, disabled | `s_hasn_t_set_up_messaging_on_curare_yet`, and a `TextButton(try_again)` → `retry()` | `%1$s` is `humanReadableNameOrPubkey()` in every one. The line under the button is `bodySmall` in `onSurfaceVariant` — a supporting line, not a second message. A @@ -677,9 +677,9 @@ key package flow a `MutableStateFlow`: - profile then key package: `Checking` then `CanStartChat`, and the timeout is cancelled; - key package then profile: `Loading` until the profile, then `CanStartChat` at once; -- profile and no key package: `Checking` until the timeout, then `NotYetOnCurare`, +- profile and no key package: `Checking` until the timeout, then `NotYetOnBennu`, and a late key package still flips it to `CanStartChat`; -- `retry` from `NotYetOnCurare` queues `requests` alone, not `profileRequests`, and +- `retry` from `NotYetOnBennu` queues `requests` alone, not `profileRequests`, and the profile stays on screen. `ProfilePreviewScreenJvmTest` grows the four rows of the table above: the label, diff --git a/docs/npub-sign-in.md b/docs/npub-sign-in.md index 7e187af0..263200f2 100644 --- a/docs/npub-sign-in.md +++ b/docs/npub-sign-in.md @@ -55,14 +55,14 @@ and in this app "anything else" is most of the app: | what needs the secret | where | |---|---| | signing every queued event — the kind 0, the follow list, key packages, group posts, proposals | `NotaryViewModel.observeUnsignedNostrEvents` | -| opening a NIP-17 gift wrap addressed to the user | [GiftWrapMessage.kt:126](../composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GiftWrapMessage.kt) — NIP-44 with the recipient's key | +| opening a NIP-17 gift wrap addressed to the user | [GiftWrapMessage.kt:126](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/GiftWrapMessage.kt) — NIP-44 with the recipient's key | | joining a Marmot group — a key package has to be signed and published before any welcome can be addressed to it, and the welcome itself arrives as a gift wrap | `MarmotRepository.publishMarmotKeyPackageBundle`, `MarmotInboundManager` | -| the ChillDKG host key, `sha256(tag ‖ nostrPrivateKey)` | [ChillDkgRitualManager.kt:117](../composeApp/src/commonMain/kotlin/to/curare/compose/managers/ChillDkgRitualManager.kt) | +| the ChillDKG host key, `sha256(tag ‖ nostrPrivateKey)` | [ChillDkgRitualManager.kt:117](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/ChillDkgRitualManager.kt) | What a public key *gets* is the events it has published — the kind 0, the kind 3, the relay lists — and the profiles of the people it follows, because indexing a kind 3 plants a placeholder for each and queues its sync -([NostrDao.kt:1128](../composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrDao.kt)). +([NostrDao.kt:1128](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NostrDao.kt)). In a client with a public feed, that is the client: read-only in Damus or Amethyst means "browse as this person". @@ -84,16 +84,16 @@ of it on the way. | piece | where | state | |---|---|---| -| the parser recognises `npub1…` and `nostr:npub1…` — and refuses it, as `PublicKeyOnly` | [CredentialParser.kt:94](../composeApp/src/commonMain/kotlin/to/curare/compose/identity/CredentialParser.kt) | one branch from accepting it | -| `signInToProfile(pubkey)` plants the `GENESIS_AT` placeholder from a pubkey alone | [DatabaseNostrRepository.kt:258](../composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseNostrRepository.kt) | built; needs one property, see [Phase 4](#a-sign-in-that-can-be-repeated) | -| the state machine from there — `UnqueuedProfileSynchronization → UnsyncedProfile → UnindexedProfile → ProfileLoaded` — reads `identity.nostrPublicKey` and never a key | [NavigationViewModel.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.kt) | built | +| the parser recognises `npub1…` and `nostr:npub1…` — and refuses it, as `PublicKeyOnly` | [CredentialParser.kt:94](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/CredentialParser.kt) | one branch from accepting it | +| `signInToProfile(pubkey)` plants the `GENESIS_AT` placeholder from a pubkey alone | [DatabaseNostrRepository.kt:258](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseNostrRepository.kt) | built; needs one property, see [Phase 4](#a-sign-in-that-can-be-repeated) | +| the state machine from there — `UnqueuedProfileSynchronization → UnsyncedProfile → UnindexedProfile → ProfileLoaded` — reads `identity.nostrPublicKey` and never a key | [NavigationViewModel.kt](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/NavigationViewModel.kt) | built | | the sign-in sync, the indexer relays, the one hop, and the not-found exit | `SignInSync`, `UnsyncedProfileViewModel` | built; the exit needs a third action, see [Phase 6](#phase-6--leaving) | -| `RelaysSocketManager` follows the identity's relay list by pubkey | [RelaysSocketManager.kt:70](../composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelaysSocketManager.kt) | works unchanged | -| the notary returns before doing anything when there is no key | [NotaryViewModel.kt:72](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NotaryViewModel.kt) | works unchanged — and so the key package bundle it would publish is never attempted | +| `RelaysSocketManager` follows the identity's relay list by pubkey | [RelaysSocketManager.kt:70](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/RelaysSocketManager.kt) | works unchanged | +| the notary returns before doing anything when there is no key | [NotaryViewModel.kt:72](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/NotaryViewModel.kt) | works unchanged — and so the key package bundle it would publish is never attempted | | quartz's `KeyPair(pubKey = …)` with no private key, commented in its own source as "this is a read-only account" | `com.vitorpamplona.quartz.nip01Core.crypto.KeyPair` | usable; it is why the DAO carries `privKey!!` at all | -| `Identity.business` is nullable; a read-only identity is `NostrSecret` minus the secret | [Identity.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/identity/Identity.kt) | one field from it | +| `Identity.business` is nullable; a read-only identity is `NostrSecret` minus the secret | [Identity.kt](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/Identity.kt) | one field from it | | the forget flow — key out, prefs deleted, metadata hidden, account rows gone, re-list, selector | `NostrSecretViewModel.forgetKey`, `IdentityWriter.forgetNostrKey` | built for an nsec; the sequence transfers whole | -| `WalletsSelector` shows the npub for every kind | [WalletsSelector.kt:161](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/wallet/WalletsSelector.kt) | needs a "read only" label | +| `WalletsSelector` shows the npub for every kind | [WalletsSelector.kt:161](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/wallet/WalletsSelector.kt) | needs a "read only" label | | `nostr-keys.dat`, with a version byte and a doc that says "a new shape would be a new version" | `EncryptedNostrKeys`, `NostrKeyManager`, `AtomicFileWrite` | the envelope, the atomic write and the manager shape all carry over; only the entries change | | a string, `this_will_give_you_read_only_access_to_the` | `strings.xml` | present, unused, and says too little | @@ -103,7 +103,7 @@ Five things, in dependency order. **The identity's key is not optional.** `Identity.nostrPrivateKey` is a `PrivateKey` and `nostrPublicKey` is computed from it -([Identity.kt:50](../composeApp/src/commonMain/kotlin/to/curare/compose/identity/Identity.kt), +([Identity.kt:50](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/identity/Identity.kt), 62). Every reader of the identity compiles against that. **There is nowhere to keep a public key.** Both stores hold secrets. `nostr-keys.dat` @@ -114,7 +114,7 @@ this one ([Phase 2](#phase-2--one-credentials-file)). **The pumps are gated on the private key.** `SynchronizationViewModel` runs its four collectors inside `identity?.nostrPrivateKey?.let { … }` -([SynchronizationViewModel.kt:194](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SynchronizationViewModel.kt)). +([SynchronizationViewModel.kt:194](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SynchronizationViewModel.kt)). A read-only identity's sign-in sync would be queued and never dispatched, and the machine would park on `UnsyncedProfile` for good — the nsec plan's Phase 5 failure again, from a different cause. @@ -122,10 +122,10 @@ again, from a different cause. **The DAO opens what is addressed to it, or rolls back.** `storeNostrEvent` is `@Transaction` and indexes inside it; a gift wrap addressed to the active key that cannot be unsealed throws -([NostrDao.kt:448–459](../composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrDao.kt)), +([NostrDao.kt:448–459](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NostrDao.kt)), and the throw takes the event with it. Worse, and not obvious: `decryptGiftWrapSeal` builds `KeyPair(privKey = keyPair.privKey)` -([GiftWrapMessage.kt:126](../composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GiftWrapMessage.kt)), +([GiftWrapMessage.kt:126](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/GiftWrapMessage.kt)), and in quartz a `KeyPair` given neither key *generates a fresh random one*. A read-only pair forwarded there would try to open the wrap with a key nobody has, fail, and roll back — silently correct-looking in the logs. @@ -242,7 +242,7 @@ forces anything, and the sites that need a decision are found by reading, in One site does change. `KeyRecoveryScreen` branches on `activeIdentity?.kind` with `NostrSecret` in one arm and `else` in the other -([KeyRecoveryScreen.kt:177](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/KeyRecoveryScreen.kt)), +([KeyRecoveryScreen.kt:177](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/KeyRecoveryScreen.kt)), and the `else` meant *mnemonic*. A read-only identity would fall into it and be offered a recovery phrase it does not have. Make both `when`s in that file exhaustive; the `NostrPublic` arm is unreachable after Phase 5 hides the row, and @@ -329,7 +329,7 @@ A version byte of 2 in `nostr-keys.dat` would be the natural move and it is the wrong one. An older build's reader throws on an unknown version, `NostrKeyManager` classifies that as `SerializationError`, and `listIdentities` **returns** on that result before it publishes anything -([SovereignWalletViewModel.kt:218](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SovereignWalletViewModel.kt)): +([SovereignWalletViewModel.kt:218](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SovereignWalletViewModel.kt)): the old build would list no identities at all, seed wallets included. That is the `seed.dat` failure the nsec plan's appendix rejected a version-4 payload for. A file the old build does not look for cannot do that to it. @@ -446,10 +446,10 @@ leaves the others and takes its preferences. `SovereignWalletViewModel.listIdentities` runs the migration, then reads `nostr-credentials.dat` where it read `nostr-keys.dat`, with the same five results handled the same way; the change is the type of the map it hands to `merge` -([SovereignWalletViewModel.kt:242](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SovereignWalletViewModel.kt)). +([SovereignWalletViewModel.kt:242](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SovereignWalletViewModel.kt)). `SovereignWalletStartupScreen` gains its third branch, beside the nsec one -([SovereignWalletStartupScreen.kt:185](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SovereignWalletStartupScreen.kt)): +([SovereignWalletStartupScreen.kt:185](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SovereignWalletStartupScreen.kt)): ```kotlin is StoredIdentity.NostrPublic -> sovereignWalletViewModel.setActiveIdentity( @@ -515,14 +515,14 @@ With a private key, quartz recomputes the public key from it and the second argument is a cross-check. Without one, it is the read-only constructor. What it must never be is `KeyPair(privKey = null)` with nothing else — that is quartz's "make me a new key", and it is what `decryptGiftWrapSeal` does today -([GiftWrapMessage.kt:126](../composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GiftWrapMessage.kt)). +([GiftWrapMessage.kt:126](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/GiftWrapMessage.kt)). The helper exists so that the trap has one place to be avoided; leave a comment on it that says what the trap is. ### The one DAO guard After the `isAddressedTo` check in `indexNostrEvent` -([NostrDao.kt:439](../composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrDao.kt)): +([NostrDao.kt:439](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/dao/NostrDao.kt)): ```kotlin if (activeKeyPair.privKey == null) { @@ -625,7 +625,7 @@ because Phase 3 made it run. ### A sign-in that can be repeated `signInToProfile` inserts a new kind-0 `UnsignedNostrEvent` every time it is called -([DatabaseNostrRepository.kt:258](../composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseNostrRepository.kt)). +([DatabaseNostrRepository.kt:258](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseNostrRepository.kt)). Until now nothing called it twice for one pubkey: the writers refused the second sign-in before it got there. The upgrade is the first path that signs in a pubkey whose account already exists, and a second placeholder would be "two kind-0 rows @@ -677,7 +677,7 @@ val LocalCanSign: ProvidableCompositionLocal = staticCompositionLocalOf fun ProvideSigningCapability(activeIdentity: StateFlow, content: @Composable () -> Unit) ``` -Provided once, in `CurareNavHost` around the `NavHost`, from +Provided once, in `BennuNavHost` around the `NavHost`, from `sovereignWalletViewModel.activeIdentity`. The default is `true` rather than an error, and that is the one way this differs from `LocalSnackbarHostState`: the provider sits above every screen and cannot be forgotten per screen, so the only @@ -700,14 +700,14 @@ the empty state beside it. |---|---|---|---| | `HomeScreen` | *New chat* (both layouts), the sheet, the npub dialog | key packages, welcomes, gift wraps | hidden; the tab shows the [empty state below](#the-messages-tab) | | `HomeScreen` | `ChatRoomListViewModel.initiate` | queues the inbox sync and the MLS negentropy | not composed, so not queued | -| `MetadataEventDetail` | *follow*, *unfollow*, *follow back* ([:215](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/detail/MetadataEventDetail.kt)) | a kind 3 | hidden; the "follows you" state still shows | -| `MetadataEventDetail` | *send message* ([:303](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/detail/MetadataEventDetail.kt)) | a gift wrap | hidden | +| `MetadataEventDetail` | *follow*, *unfollow*, *follow back* ([:215](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/detail/MetadataEventDetail.kt)) | a kind 3 | hidden; the "follows you" state still shows | +| `MetadataEventDetail` | *send message* ([:303](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/detail/MetadataEventDetail.kt)) | a gift wrap | hidden | | `MetadataEventDetail` | *edit profile* | a kind 0 | hidden (it is `ImplementationPendingRoute` today, and stays so for the other kinds) | -| `ActiveProfileScreen` | *key package management* ([:233](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ActiveProfileScreen.kt)) | key packages | hidden | -| `ActiveProfileScreen` | *key recovery* ([:286](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ActiveProfileScreen.kt)) | nothing, but there is nothing to recover | hidden | -| `ActiveProfileScreen` | *sign out* ([:341](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ActiveProfileScreen.kt)) | — | **real**, see [Phase 6](#phase-6--leaving) | -| `ShareProfileScreen` | *re-broadcast* ([:191](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ShareProfileScreen.kt)) | nothing is signed, but a copy of the kind 0 is queued for the finder relays | hidden; a preview puts nothing on a relay, not even a copy, and the broadcast pump is not running to carry it | -| `UnsyncedProfileScreen` | *set one up* ([:217](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnsyncedProfileScreen.kt)) | the six-event bootstrap | hidden; replaced, see Phase 6 | +| `ActiveProfileScreen` | *key package management* ([:233](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ActiveProfileScreen.kt)) | key packages | hidden | +| `ActiveProfileScreen` | *key recovery* ([:286](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ActiveProfileScreen.kt)) | nothing, but there is nothing to recover | hidden | +| `ActiveProfileScreen` | *sign out* ([:341](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ActiveProfileScreen.kt)) | — | **real**, see [Phase 6](#phase-6--leaving) | +| `ShareProfileScreen` | *re-broadcast* ([:191](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/ShareProfileScreen.kt)) | nothing is signed, but a copy of the kind 0 is queued for the finder relays | hidden; a preview puts nothing on a relay, not even a copy, and the broadcast pump is not running to carry it | +| `UnsyncedProfileScreen` | *set one up* ([:217](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/UnsyncedProfileScreen.kt)) | the six-event bootstrap | hidden; replaced, see Phase 6 | | `SocialPreconditionScreen` | *invite a friend*, *view invites* | pending, and writes when they exist | hidden; only *skip for now* | | `WriteNewNoteScreen` and the rest | — | — | unreachable: every route to them starts in a room or behind a control above | diff --git a/docs/nsec-sign-in.md b/docs/nsec-sign-in.md index a4f83428..e81f660a 100644 --- a/docs/nsec-sign-in.md +++ b/docs/nsec-sign-in.md @@ -89,14 +89,14 @@ ten times, in eight files: | site | what it does with the key | |---|---| -| [NotaryViewModel.kt:71](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NotaryViewModel.kt) | signs the queues, seals Marmot bundles with `nsecPassword` | -| [SynchronizationViewModel.kt:193](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SynchronizationViewModel.kt) | the three pumps' key pair | -| [RelaysSocketManager.kt:68](../composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelaysSocketManager.kt) | the pubkey whose relay list to follow | -| [NavigationViewModel.kt:193](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.kt) | the pubkey whose account to observe | -| [DkgRitualViewModel.kt:476](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/DkgRitualViewModel.kt), 516, 570 | the ChillDKG host key, derived from the nostr key | -| [SelectChatRoomTypeViewModel.kt:193](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SelectChatRoomTypeViewModel.kt) | same | -| [SelectSubgroupAdminsViewModel.kt:208](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SelectSubgroupAdminsViewModel.kt) | same | -| [NostrNotaryRepository.kt:70](../composeApp/src/commonMain/kotlin/to/curare/compose/repository/NostrNotaryRepository.kt) | signs — but nothing constructs this class; it only has to compile | +| [NotaryViewModel.kt:71](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/NotaryViewModel.kt) | signs the queues, seals Marmot bundles with `nsecPassword` | +| [SynchronizationViewModel.kt:193](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SynchronizationViewModel.kt) | the three pumps' key pair | +| [RelaysSocketManager.kt:68](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/network/relays/RelaysSocketManager.kt) | the pubkey whose relay list to follow | +| [NavigationViewModel.kt:193](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/NavigationViewModel.kt) | the pubkey whose account to observe | +| [DkgRitualViewModel.kt:476](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/DkgRitualViewModel.kt), 516, 570 | the ChillDKG host key, derived from the nostr key | +| [SelectChatRoomTypeViewModel.kt:193](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SelectChatRoomTypeViewModel.kt) | same | +| [SelectSubgroupAdminsViewModel.kt:208](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SelectSubgroupAdminsViewModel.kt) | same | +| [NostrNotaryRepository.kt:70](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/NostrNotaryRepository.kt) | signs — but nothing constructs this class; it only has to compile | And that is the whole list. There is no call into `peerManager`, `paymentsManager`, `balanceManager`, `sendManager` or `lnurlManager` anywhere in the app. The @@ -106,7 +106,7 @@ watchers `schedulePlatformLogic` sets up — is started on every cold boot as a Everything downstream of the key is already independent of the seed. `ChillDkgRitualManager.deriveHostSecretKey` hashes the nostr key -([ChillDkgRitualManager.kt:117](../composeApp/src/commonMain/kotlin/to/curare/compose/managers/ChillDkgRitualManager.kt)); +([ChillDkgRitualManager.kt:117](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/managers/ChillDkgRitualManager.kt)); `nsecPassword` is `hash160` of it; the notary and pumps build a quartz `KeyPair` from its bytes. None of them would notice where the key came from. @@ -125,16 +125,16 @@ the only way in. | piece | where | state | |---|---|---| -| `signInToProfile(pubkey)` — plants a kind‑0 `UnsignedNostrEvent` stamped `signedAt = GENESIS_AT`, so the notary skips it and the navigation machine treats the account as "signed, needs syncing" | [DatabaseNostrRepository.kt:215](../composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseNostrRepository.kt) | built, no caller | -| the state machine that takes it from there: `UnqueuedProfileSynchronization → UnsyncedProfile → UnindexedProfile → ProfileLoaded` | [NavigationViewModel.kt:96](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.kt) | built | -| the `purpose = "sign-in"` relay sync for kinds 0, 3, 10002, 10005, 10007, 10012, 10050 and 10086 — profile, contacts, and every relay list the app reads | [UnqueuedProfileSynchronizationViewModel.kt:57](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/UnqueuedProfileSynchronizationViewModel.kt) | built, asks one relay — see [Phase 5](#phase-5--finding-the-profile-and-not-finding-it) | -| a `SignInToProfileViewModel` that parses `nsec1…`/`npub1…`/`nostr:` with quartz's `Nip19Parser` and calls `signInToProfile`; a `SignInToProfileUIState` with `InputPrompt`, `ConfirmNsecSignIn(nsec, hexKey)`, `ConfirmNpubSignIn`, `Error`; a `SignInToProfileFormState` | [SignInToProfileViewModel.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SignInToProfileViewModel.kt) | built, unreferenced — and it **drops the nsec on the floor**; nothing ever stored it | -| `String.extractKeyPairFromPrivateKeyOrThrow()` — hex or bech32 in, `(nsec, npub)` out, `InvalidNostrPrivateKeyException` otherwise | [Credentials.kt:60](../composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Credentials.kt) | built | +| `signInToProfile(pubkey)` — plants a kind‑0 `UnsignedNostrEvent` stamped `signedAt = GENESIS_AT`, so the notary skips it and the navigation machine treats the account as "signed, needs syncing" | [DatabaseNostrRepository.kt:215](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseNostrRepository.kt) | built, no caller | +| the state machine that takes it from there: `UnqueuedProfileSynchronization → UnsyncedProfile → UnindexedProfile → ProfileLoaded` | [NavigationViewModel.kt:96](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/NavigationViewModel.kt) | built | +| the `purpose = "sign-in"` relay sync for kinds 0, 3, 10002, 10005, 10007, 10012, 10050 and 10086 — profile, contacts, and every relay list the app reads | [UnqueuedProfileSynchronizationViewModel.kt:57](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/UnqueuedProfileSynchronizationViewModel.kt) | built, asks one relay — see [Phase 5](#phase-5--finding-the-profile-and-not-finding-it) | +| a `SignInToProfileViewModel` that parses `nsec1…`/`npub1…`/`nostr:` with quartz's `Nip19Parser` and calls `signInToProfile`; a `SignInToProfileUIState` with `InputPrompt`, `ConfirmNsecSignIn(nsec, hexKey)`, `ConfirmNpubSignIn`, `Error`; a `SignInToProfileFormState` | [SignInToProfileViewModel.kt](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SignInToProfileViewModel.kt) | built, unreferenced — and it **drops the nsec on the floor**; nothing ever stored it | +| `String.extractKeyPairFromPrivateKeyOrThrow()` — hex or bech32 in, `(nsec, npub)` out, `InvalidNostrPrivateKeyException` otherwise | [Credentials.kt:60](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/extensions/Credentials.kt) | built | | strings: `enter_the_nsec_or_npub_read_only_that_you`, `sign_in_to_nsec`, `sign_in_with_an_npub`, `be_sure_to_keep_this_nsec_safe`, `sign_in_to_torch_via_nsec_or_remote_signer` | `strings.xml` | present, unused | | `ActiveWallet.business` is already `PhoenixBusiness?` | [Wallet.kt:50](../lightning-kmp-app/library/src/commonMain/kotlin/fr/acinq/phoenix/data/Wallet.kt) | nullable today | | `keyStoreEncryption` / `keyStoreDecryption` — public `expect` functions with android, jvm and ios actuals, parameterised by key alias | [KeyStoreFunctions.kt](../lightning-kmp-app/library/src/commonMain/kotlin/fr/acinq/phoenix/security/KeyStoreFunctions.kt) | usable as-is | -| `platformWriteSeed(…, isRestoringWallet = …)` — the seed writer already has a restore flag | [NavigationViewModel.android.kt:64](../composeApp/src/androidMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.android.kt) | built; recovery-phrase sign-in is nearly free once a screen exists | -| `SignInToProfileScreen` | [SignInScreen.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SignInScreen.kt) | a sentence saying sign in is not available | +| `platformWriteSeed(…, isRestoringWallet = …)` — the seed writer already has a restore flag | [NavigationViewModel.android.kt:64](../composeApp/src/androidMain/kotlin/com/machankura/bennu/compose/ui/view/model/NavigationViewModel.android.kt) | built; recovery-phrase sign-in is nearly free once a screen exists | +| `SignInToProfileScreen` | [SignInScreen.kt](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SignInScreen.kt) | a sentence saying sign in is not available | The gap, then, is exactly two things: **somewhere for the nsec to live**, and **something for the app to read the key from that is not the node**. Everything @@ -156,22 +156,22 @@ says why it should not be given one. **The identity is carried by the node.** `activeWalletInUI: StateFlow` is set only from `StartBusinessResult.Success` -([SovereignWalletViewModel.kt:118](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SovereignWalletViewModel.kt)), +([SovereignWalletViewModel.kt:118](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SovereignWalletViewModel.kt)), and twenty-five parameters across eighteen files are typed on it. **Startup only knows about wallets.** `SovereignWalletStartupScreen` sends an empty `availableWallets` to the landing page -([SovereignWalletStartupScreen.kt:91](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SovereignWalletStartupScreen.kt)) +([SovereignWalletStartupScreen.kt:91](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/SovereignWalletStartupScreen.kt)) and starts whatever is selected with `startupNode(words)` (line 171). An nsec stored anywhere else is invisible to it, and `NavigationViewModel.observeProfile` answers a null `business` by navigating back to startup -([NavigationViewModel.kt:187](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.kt)) +([NavigationViewModel.kt:187](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/NavigationViewModel.kt)) — a loop, for an identity that will never have one. **The bootstrap asks the wrong relay.** The sign-in sync queues its `REQ` at `Relays.DefaultDMRelayList`, which is `listOf(ephemeral)` — `wss://ephemeral.mantra.press` -([Relays.kt:61](../composeApp/src/commonMain/kotlin/to/curare/compose/nostr/Relays.kt)). +([Relays.kt:61](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/Relays.kt)). That is the right relay for a profile *this app* created. An identity that has lived on Damus for three years has never heard of it, and the machine has no exit for "nothing came back". @@ -182,7 +182,7 @@ Should a mnemonic identity still start the Lightning node to reach its key? `CreateProfileViewModel` already derives the pubkey without one — it constructs `LocalKeyManager(seed)` locally and reads `nostrPublicKey()` off it -([CreateProfileViewModel.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/CreateProfileViewModel.kt)). +([CreateProfileViewModel.kt](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/CreateProfileViewModel.kt)). Doing the same at startup would make both kinds of identity symmetric — secret → key in memory, node optional — and would take the Electrum and LSP connections off every cold boot of what is, today, a chat application. @@ -210,7 +210,7 @@ and it should land alone so that its diff is boring. ### The type ```kotlin -package to.curare.compose.identity +package com.machankura.bennu.compose.identity enum class IdentityKind { /** Twelve words. The nostr key is derived from them, and so is a wallet. */ @@ -347,7 +347,7 @@ private fun getKeyForName(keyName: String): SecretKey = when (keyName) { A new alias is a library change on that platform regardless, and both existing aliases already resolve to the one key. On the jvm, `JvmKeyStore.unlock` runs in `Main.kt` before anything reads -([Main.kt:146](../composeApp/src/jvmMain/kotlin/to/curare/desktop/Main.kt)), so a +([Main.kt:146](../composeApp/src/jvmMain/kotlin/com/machankura/bennu/desktop/Main.kt)), so a second file under the same alias costs nothing there either; the ios keychain helper is likewise keyed by alias. @@ -413,7 +413,7 @@ and have both result types map from it. **`LocalKeyManager.nostrPublicKey()` in the library is not a nostr public key.** It returns `nostrPrivateKey().publicKey().toHex()` — the 33-byte compressed encoding, sixty-six hex characters. Nostr keys are x-only, sixty-four. Nothing in -the app calls it (the app has its own, correct, `to.curare.compose.extensions.nostrPublicKey`), +the app calls it (the app has its own, correct, `com.machankura.bennu.compose.extensions.nostrPublicKey`), which is the only reason it has not mattered. Fix it or delete it; a helper this plan does want is @@ -483,7 +483,7 @@ is not done here. Metadata registration is unchanged: the loop that saves a `UserWalletMetadata` with a random avatar for every id it has not seen -([SovereignWalletViewModel.kt:128](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SovereignWalletViewModel.kt)) +([SovereignWalletViewModel.kt:128](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/SovereignWalletViewModel.kt)) works on `WalletId` and does not care what is behind it. ### Starting @@ -575,7 +575,7 @@ means. `NavigationRoutingTest` gains the fixture it is missing: an account whose The app's `WalletsSelector` takes `Map` and shows `userWallet.nodeId` in monospace -([WalletsSelector.kt:55](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/wallet/WalletsSelector.kt)). +([WalletsSelector.kt:55](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/widgets/wallet/WalletsSelector.kt)). It takes `Map` and shows the npub for an nsec identity and the node id for a mnemonic one — or the npub for both, which is the identifier the rest of the app uses and the one a user might actually recognise. The @@ -669,7 +669,7 @@ sovereignWalletViewModel.listIdentities { ``` The tail is the one `CreateProfileRoute` already uses after `writeSeed` -([CurareNavHost.kt:505](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/CurareNavHost.kt)): +([BennuNavHost.kt:505](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/navigation/BennuNavHost.kt)): re-list, select, go to startup. Startup finds a `StoredIdentity.NostrSecret`, activates it, `NavigationViewModel` observes its pubkey, finds the placeholder account with `signedAt != null` and no sync requests, and lands on @@ -744,7 +744,7 @@ it a caller.** `UnqueuedProfileSynchronizationViewModel.queueSynchronization` fans the sign-in `REQ` out over `Relays.DefaultDMRelayList` — one relay, ours. Change it to `Relays.DefaultIndexerRelayList` -([Relays.kt:65](../composeApp/src/commonMain/kotlin/to/curare/compose/nostr/Relays.kt): +([Relays.kt:65](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/Relays.kt): purplepag.es, indexer.coracle.social, user.kindpag.es, directory.yabu.me, nostr1) **plus** `ephemeral`. Indexer relays exist to hold everyone's kinds 0, 3 and 10002; that is the whole of their purpose, and it is exactly the list the @@ -769,7 +769,7 @@ unsignedNostrEvent.signedAt != null && synchronizeNostrEventRequests.isNotEmpty( and `UnsyncedProfile` shows "we are searching the internet to find your profile" with a spinner, forever. Nothing records that a search *finished empty*. A request goes `pending → sent` when its `REQ` is dispatched -([DatabaseNostrRepository.kt:489](../composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseNostrRepository.kt)) +([DatabaseNostrRepository.kt:489](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseNostrRepository.kt)) and `sent → processed` only when an event arrives for it (line 532, which also stamps the `nostrEventId`). A relay that answers with EOSE and nothing else leaves its request at `sent` for good; the EOSE branch in @@ -821,7 +821,7 @@ one request goes `processed` instead, asserting it never flips at all. `KeyRecoveryScreen` offers one backup: *recovery phrase*, routing to `RecoveryPhraseRoute`, whose view model reads `userWallet.words` out of the decrypted seed map -([RecoveryPhraseViewModel.kt:114](../composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/RecoveryPhraseViewModel.kt)). +([RecoveryPhraseViewModel.kt:114](../composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/view/model/RecoveryPhraseViewModel.kt)). For an nsec identity there are no words, and `NoPhraseForThisWallet` is the honest error it would show. Instead: diff --git a/docs/scripts/m3-audit.sh b/docs/scripts/m3-audit.sh index 7acdc6a7..c02d6337 100755 --- a/docs/scripts/m3-audit.sh +++ b/docs/scripts/m3-audit.sh @@ -18,7 +18,7 @@ set -uo pipefail cd "$(dirname "${BASH_SOURCE[0]}")/../.." || exit 1 -UI=composeApp/src/commonMain/kotlin/to/curare/compose/ui +UI=composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui THEME="$UI/theme" # --------------------------------------------------------------------------- diff --git a/docs/scripts/m3-extract-formatted.py b/docs/scripts/m3-extract-formatted.py index 835d7bbe..dab140b0 100755 --- a/docs/scripts/m3-extract-formatted.py +++ b/docs/scripts/m3-extract-formatted.py @@ -214,9 +214,9 @@ def main(): src = src[:start] + f'stringResource(Res.string.{names[fmt]}, {args})' + src[end:] rewritten += 1 need = sorted({names[fmt] for *_x, fmt in [(c[0], c[4]) for c in found]}) - for imp in (['import curare.composeapp.generated.resources.Res', + for imp in (['import bennu.composeapp.generated.resources.Res', 'import org.jetbrains.compose.resources.stringResource'] - + [f'import curare.composeapp.generated.resources.{n}' for n in need]): + + [f'import bennu.composeapp.generated.resources.{n}' for n in need]): if not has_import(src, imp): lines = src.split('\n') idx = max(i for i, l in enumerate(lines) if l.startswith('import ')) diff --git a/docs/scripts/m3-extract-strings.py b/docs/scripts/m3-extract-strings.py index 0a741a32..b2471b60 100755 --- a/docs/scripts/m3-extract-strings.py +++ b/docs/scripts/m3-extract-strings.py @@ -17,7 +17,7 @@ Usage: """ import os, re, sys, io, collections -UI = 'composeApp/src/commonMain/kotlin/to/curare/compose/ui' +UI = 'composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui' STRINGS = 'composeApp/src/commonMain/composeResources/values/strings.xml' DRY = '--apply' not in sys.argv @@ -243,7 +243,7 @@ def main(): for start, end, value in reversed(found): src = src[:start] + f'stringResource(Res.string.{names[value]})' + src[end:] if changed: - for imp in ('import curare.composeapp.generated.resources.Res', + for imp in ('import bennu.composeapp.generated.resources.Res', 'import org.jetbrains.compose.resources.stringResource'): if not has_import(src, imp): lines = src.split('\n') @@ -256,7 +256,7 @@ def main(): lines = src.split('\n') idx = max(i for i, l in enumerate(lines) if l.startswith('import ')) for nm in reversed(need): - imp = f'import curare.composeapp.generated.resources.{nm}' + imp = f'import bennu.composeapp.generated.resources.{nm}' if not has_import(src, imp): lines.insert(idx + 1, imp) src = '\n'.join(lines) diff --git a/docs/scripts/m3-migrate-spacing.py b/docs/scripts/m3-migrate-spacing.py index a602f11c..158f05ea 100755 --- a/docs/scripts/m3-migrate-spacing.py +++ b/docs/scripts/m3-migrate-spacing.py @@ -19,7 +19,7 @@ is a dimension and is left alone. """ import re, sys, io, os -UI = 'composeApp/src/commonMain/kotlin/to/curare/compose/ui' +UI = 'composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui' # {"padding": {"8": "compactPadding"}, "gap": {...}, "spacer": {...}, "*": {...}} # A shape-specific entry wins over "*". Shape matters because the same number means # different things in different positions: 8dp of padding is compactPadding, 8dp of gap @@ -131,11 +131,11 @@ def process(path): break lines.insert(idx + 1, 'import androidx.compose.material3.MaterialTheme') text = '\n'.join(lines) - if 'import to.curare.compose.ui.theme.spacing' not in text and \ + if 'import com.machankura.bennu.compose.ui.theme.spacing' not in text and \ not path.endswith('theme/Spacing.kt'): lines = text.split('\n') idx = max(i for i, l in enumerate(lines) if l.startswith('import ')) - lines.insert(idx + 1, 'import to.curare.compose.ui.theme.spacing') + lines.insert(idx + 1, 'import com.machankura.bennu.compose.ui.theme.spacing') text = '\n'.join(lines) if not DRY: io.open(path, 'w', encoding='utf-8').write(text) diff --git a/docs/scripts/m3-spacing-positions.py b/docs/scripts/m3-spacing-positions.py index 3c35ec02..b3ea78c3 100755 --- a/docs/scripts/m3-spacing-positions.py +++ b/docs/scripts/m3-spacing-positions.py @@ -18,7 +18,7 @@ Usage: m3-spacing-positions.py [--list] """ import os, re, sys -UI = 'composeApp/src/commonMain/kotlin/to/curare/compose/ui' +UI = 'composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui' THEME = os.path.join(UI, 'theme') diff --git a/docs/scripts/m3-title-case.py b/docs/scripts/m3-title-case.py index 7d7d0b6b..9d4ac9f3 100755 --- a/docs/scripts/m3-title-case.py +++ b/docs/scripts/m3-title-case.py @@ -19,7 +19,7 @@ Usage: m3-title-case.py [--list] """ import os, re, sys -UI = 'composeApp/src/commonMain/kotlin/to/curare/compose/ui' +UI = 'composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui' CATALOGUE = 'composeApp/src/commonMain/composeResources/values/strings.xml' SMALL = {'a', 'an', 'the', 'to', 'of', 'for', 'and', 'or', 'via', diff --git a/docs/scripts/m3-touch-targets.py b/docs/scripts/m3-touch-targets.py index f204aedf..2e310920 100755 --- a/docs/scripts/m3-touch-targets.py +++ b/docs/scripts/m3-touch-targets.py @@ -18,7 +18,7 @@ Usage: m3-touch-targets.py [--list] """ import os, re, sys -UI = 'composeApp/src/commonMain/kotlin/to/curare/compose/ui' +UI = 'composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui' def offenders(): diff --git a/docs/subgroups.md b/docs/subgroups.md index 8a6c6384..c8fc3193 100644 --- a/docs/subgroups.md +++ b/docs/subgroups.md @@ -270,7 +270,7 @@ roster check the paragraph above forbids. ## Phase 2 — schema 16 → 17 Four nullable columns and nothing else, so Room migrates itself and the entry -joins the list in `CurareDatabase`. +joins the list in `BennuDatabase`. | table | column | filled from | trusted? | |---|---|---|---| @@ -530,7 +530,7 @@ object SubgroupManager { /** Step 2: ask the parent's quorum to certify the child. Runs in the parent room. */ suspend fun proposeBirthCertificate( - database: CurareDatabase, + database: BennuDatabase, parentRoom: LocalChatRoom, userPublicKey: HexKey, key: DkgSession, @@ -541,7 +541,7 @@ object SubgroupManager { /** The newest certificate for this child that actually certifies it, or null. */ suspend fun certificateFor( - database: CurareDatabase, + database: BennuDatabase, subgroupChatRoomId: String, parentChatRoomId: String ): GroupSignedEvent? @@ -550,10 +550,10 @@ object SubgroupManager { suspend fun proposeSubgroupKeyState(...): FrostSigningSession /** Everything the parent has certified, whether or not the room exists here. */ - suspend fun subgroupsOf(database: CurareDatabase, parentChatRoomId: String): List + suspend fun subgroupsOf(database: BennuDatabase, parentChatRoomId: String): List /** Files a certificate that arrived, or drops it and says why. */ - suspend fun record(database: CurareDatabase, chatRoomId: String, innerEvent: Event): GroupSignedEvent? + suspend fun record(database: BennuDatabase, chatRoomId: String, innerEvent: Event): GroupSignedEvent? } ``` @@ -628,7 +628,7 @@ So it moves, unchanged in behaviour, to `managers/MarmotGroupCreation.kt`: ```kotlin suspend fun create( - database: CurareDatabase, + database: BennuDatabase, chatRepository: ChatRepository, groupId: String, name: String, diff --git a/iosApp/Configuration/Config.xcconfig b/iosApp/Configuration/Config.xcconfig index f835e9a2..63dcdb24 100644 --- a/iosApp/Configuration/Config.xcconfig +++ b/iosApp/Configuration/Config.xcconfig @@ -1,7 +1,7 @@ TEAM_ID=ZK3TQ662GB -PRODUCT_NAME=Curare -PRODUCT_BUNDLE_IDENTIFIER=to.curare.ios$(TEAM_ID) +PRODUCT_NAME=Bennu +PRODUCT_BUNDLE_IDENTIFIER=com.machankura.bennu.ios$(TEAM_ID) CURRENT_PROJECT_VERSION=1 MARKETING_VERSION=0.1.0 \ No newline at end of file diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj index 3dcba763..c7cbb753 100644 --- a/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/iosApp/iosApp.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXFileReference section */ - 41CB266BF907B985085BE6EC /* Curare.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Curare.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 41CB266BF907B985085BE6EC /* Bennu.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Bennu.app; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ @@ -59,7 +59,7 @@ ECDAFDDED408A506DEFE0AF1 /* Products */ = { isa = PBXGroup; children = ( - 41CB266BF907B985085BE6EC /* Curare.app */, + 41CB266BF907B985085BE6EC /* Bennu.app */, ); name = Products; sourceTree = ""; @@ -87,7 +87,7 @@ packageProductDependencies = ( ); productName = iosApp; - productReference = 41CB266BF907B985085BE6EC /* Curare.app */; + productReference = 41CB266BF907B985085BE6EC /* Bennu.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ diff --git a/settings.gradle.kts b/settings.gradle.kts index fba80a81..2675dfca 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,4 +1,4 @@ -rootProject.name = "Curare" +rootProject.name = "Bennu" enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") pluginManagement {