From e6aee79282c9edc7a6cbcca2f0d8acbe98c309d3 Mon Sep 17 00:00:00 2001 From: Kgothatso Ngako Date: Thu, 10 Sep 2026 13:31:57 +0200 Subject: [PATCH] refactor: rebrand curated to curare, and the one name that stays on disk `com.it.curated.{compose,android,desktop}` becomes `to.curare.{compose,android,desktop}` across 700 file moves, and the app is Curare everywhere a user can read it. This is the third rename this tree has been through, so the question was never how to spell the new name but which of the 5074 occurrences of the old one were the brand. `3bc8be53` and `d26cf6c7` had already sorted most of that, which is why this rename is mechanical where those two were not -- and why the interesting part is the one place it is still not. **`APP_DIR_NAME` keeps the old brand, and is the only thing that does.** It names the desktop app's data directory -- `~/.local/share/curated`, `Application Support/curated`, `%LOCALAPPDATA%\curated` -- and that single directory holds the Room database, the marmot group state and the phoenix wallet. Renaming it does not move an install: it silently starts an empty one beside it and leaves the old chat history and the old seed sitting where nothing reads them any more. That is the same class of silent failure as the `mantra/` hash prefixes, so it gets the same treatment -- it stays, with a comment saying what renaming it would cost and that doing it properly is a first-run migration rather than a rebrand. The desktop app is `curated` on disk and `Curare` everywhere a user can read. **The applicationId and the namespace are one value again, at `to.curare.android`.** `3bc8be53` split them precisely so `com.it.curated` could land verbatim as the store identity while the namespace kept `.android`; the decision here was to collapse them, so both read `to.curare.android` and the manifest's relative `android:name=".CurareApplication"` and `BuildConfig` resolve against the same package they always did. Debug is `to.curare.android.debug` through the existing suffix. Worth stating plainly because nothing in the build will: an applicationId *is* the app's identity to Play, so this is a new listing rather than an update, and no installed Curated can update into it. **`CuratedDatabase` -> `CurareDatabase` moves a directory, never a table.** The `@Database` class name picks the schema *directory*, so `composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/` becomes `to.curare.compose.database.CurareDatabase/` and its 19 files move unmodified. What makes that safe has not changed since last time: the 12 entity classes are still `Mantra*` and still declare no `tableName`, so Room still takes their class names as the SQLite table names -- and this rename does not touch one of them. The check is that Room found all 19 schemas at the new directory and generated no twentieth. **The generated resources package moved because `rootProject.name` did, again.** Compose Resources derives it from the root project, so `Curated` -> `Curare` silently turns `curated.composeapp.generated.resources` into `curare.composeapp.generated.resources` and breaks 72 files' imports at once. Rewritten with them: the two string keys that carried the brand -- `curated` and `sign_in_is_not_yet_available_while_curated_is` -- their three call sites, and the eight `docs/scripts/` tools that hardcode the UI source path. The audit reporting 582 `stringResource` sites and 178 `Icon(` call sites is the evidence those tools still see the whole tree rather than an empty directory. **A global rename edits the sentences that describe the previous rename, and two of them came out false.** `material-design-conformance.md` recorded that `TorchTheme` became `CuratedTheme` and that `UserAgent` was moved off Torch "when the app was rebranded to Curated" -- which a blanket sweep turns into a claim about a change that had not happened when it was written. Same in `HomeScreen`, where "the brand before that one" meant Torch while Curated was current, and quietly came to mean Curated while still naming `TorchTheme`. Both now say what happened, in order. The three deliberate Torch records -- the finding at :278, that note, and `NavigationRoutingTest`'s fixture -- are intact. **What was protected stays protected, and now says "two rebrands".** `TWEAK_TAG`, `HOST_KEY_DERIVATION_TAG` and `wss://ephemeral.mantra.press` are byte-identical; only the prose around them moved, because "survived the rebrand to Curated" had stopped being the whole story. The tree's 1668 `Mantra` and 17 `Torch` tokens differ from the 1666 and 16 before this change only by the words those comments added. **iOS is `Curare` / `to.curare.ios`**, with the three pbxproj product references renamed to match, and is unverified here for the same reason as last time -- the build gates the ios targets behind `isMacOsX` and this was built on linux. The bundle id takes a platform segment rather than the bare base it translates from, so that it reads alongside an android applicationId that now carries one: `to.curare.android` and `to.curare.ios`, and `to.curare` left as the base neither store claims. 1226 tests pass -- 787 in `:composeApp:jvmTest`, 439 in `:composeApp:testDebugUnitTest` -- `:composeApp:compileDebugKotlinAndroid` is clean, and `m3Audit` meets every budget. Three stale things are left alone, because none of them is branding. `.gitea/workflows/material-design-conformance.yml` still triggers on `branches: [mantra]`, which stopped naming a branch that exists somewhere before this change and is now two brands out; the three `torch_*` string keys still carry a brand two renames old, though every value they hold reads Curare; and `androidMain/res/values/strings.xml` has opened `a` since well before this. Each wants its own change. Co-Authored-By: Claude Opus 5 --- composeApp/build.gradle.kts | 16 +- .../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 .../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 +- .../curare/android/CurareApplication.kt} | 4 +- .../curare}/android/MainActivity.kt | 12 +- .../curare}/compose/AppVersion.android.kt | 4 +- .../curare}/compose/Platform.android.kt | 2 +- .../compose/PlatformContext.android.kt | 2 +- .../PlatformDatabaseBuilder.android.kt | 12 +- .../compose/extensions/Phoenix.android.kt | 8 +- .../compose/ui/theme/Motion.android.kt | 2 +- .../curare}/compose/ui/theme/Theme.android.kt | 2 +- .../view/model/NavigationViewModel.android.kt | 12 +- .../src/androidMain/res/values/strings.xml | 2 +- .../composeResources/values/strings.xml | 18 +- .../com/it/curated/compose/CuratedGlobal.kt | 5 - .../kotlin/com/it/curated/compose/Platform.kt | 7 - .../com/it/curated/compose/PlatformContext.kt | 3 - .../database/CuratedDatabaseConstructor.kt | 9 - .../dao/BroadcastNostrEventReceiptDao.kt | 21 -- .../dao/ChatMessageNostrEventRelationDao.kt | 11 - .../database/dao/GiftWrapMessageDao.kt | 15 -- .../compose/database/dao/GiftWrapSealDao.kt | 15 -- .../dao/NegentropySynchronizeResultDao.kt | 10 - .../database/dao/NostrEventRelayDao.kt | 12 - .../curated/compose/database/dao/PostDao.kt | 21 -- .../compose/database/dao/ReactionDao.kt | 18 -- .../compose/database/dao/RecentSearchDao.kt | 22 -- .../curated/compose/database/dao/RelayDao.kt | 19 -- .../dao/SynchronizeNostrEventResultDao.kt | 10 - .../model/intermdiate/LocalAccount.kt | 39 --- .../LocalBroadcastNostrEventRequest.kt | 14 - .../model/intermdiate/LocalChatMessage.kt | 34 --- .../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 - .../compose/exceptions/SignatureException.kt | 3 - .../exceptions/SigningRejectedException.kt | 3 - .../compose/managers/AuxDatabaseManager.kt | 26 -- .../it/curated/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 - .../ui/view/state/WriteNewNoteUIState.kt | 24 -- .../curare}/compose/AppLifecycle.kt | 2 +- .../curare}/compose/AppVersion.kt | 2 +- .../curare/compose/CurareApp.kt} | 18 +- .../kotlin/to/curare/compose/CurareGlobal.kt | 5 + .../kotlin/to/curare/compose/Platform.kt | 7 + .../to/curare/compose/PlatformContext.kt | 3 + .../compose/cryptography/Extensions.kt | 8 +- .../compose/database/CurareDatabase.kt} | 226 ++++++++-------- .../database/CurareDatabaseConstructor.kt | 9 + .../builder/PlatformDatabaseBuilder.kt | 18 +- .../database/converters/CurareConverters.kt} | 8 +- .../dao/BroadcastNostrEventReceiptDao.kt | 21 ++ .../dao/BroadcastNostrEventRequestDao.kt | 6 +- ...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 | 10 +- .../database/dao/GiftWrapMessageDao.kt | 15 ++ .../database/dao/GiftWrapPayloadDao.kt | 4 +- .../compose/database/dao/GiftWrapSealDao.kt | 15 ++ .../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 +- .../curare}/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 | 54 ++-- .../dao/MarmotRetainedEpochSecretDao.kt | 4 +- .../compose/database/dao/MentionDao.kt | 6 +- .../dao/NegentropySynchronizeRequestDao.kt | 4 +- .../dao/NegentropySynchronizeResultDao.kt | 10 + .../curare}/compose/database/dao/NostrDao.kt | 82 +++--- .../compose/database/dao/NostrEventDao.kt | 24 +- .../database/dao/NostrEventRelayDao.kt | 12 + .../compose/database/dao/NostrNip17Dao.kt | 28 +- .../compose/database/dao/ParticipantDao.kt | 4 +- .../to/curare/compose/database/dao/PostDao.kt | 21 ++ .../compose/database/dao/ProfileDao.kt | 12 +- .../compose/database/dao/QuotedRelationDao.kt | 10 +- .../compose/database/dao/ReactionDao.kt | 18 ++ .../compose/database/dao/RecentSearchDao.kt | 22 ++ .../curare/compose/database/dao/RelayDao.kt | 19 ++ .../database/dao/RepostedRelationDao.kt | 10 +- .../dao/SynchronizeNostrEventRequestDao.kt | 8 +- .../dao/SynchronizeNostrEventResultDao.kt | 10 + .../database/dao/UnsignedNostrEventDao.kt | 6 +- .../curare}/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/ChatMessage.kt | 70 ++--- ...ssageBroadcastNostrEventReceiptRelation.kt | 6 +- ...ssageBroadcastNostrEventRequestRelation.kt | 6 +- .../model/ChatMessageNostrEventRelation.kt | 6 +- .../compose/database/model/ChatRoom.kt | 10 +- .../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 | 10 +- .../database/model/MarmotKeyPackage.kt | 10 +- .../database/model/MarmotKeyPackageBundle.kt | 10 +- .../model/MarmotRetainedEpochSecret.kt | 6 +- .../curare}/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 | 10 +- .../curare}/compose/database/model/Post.kt | 18 +- .../curare}/compose/database/model/Profile.kt | 30 +-- .../compose/database/model/QuotedRelation.kt | 12 +- .../compose/database/model/Reaction.kt | 18 +- .../compose/database/model/RecentSearch.kt | 6 +- .../curare}/compose/database/model/Relay.kt | 2 +- .../database/model/RepostedRelation.kt | 12 +- .../model/SynchronizeNostrEventRequest.kt | 10 +- .../model/SynchronizeNostrEventResult.kt | 6 +- .../database/model/UnsignedNostrEvent.kt | 10 +- .../curare}/compose/database/model/Zap.kt | 14 +- .../model/intermdiate/ChatRoomLastMessage.kt | 4 +- .../model/intermdiate/LocalAccount.kt | 39 +++ .../LocalBroadcastNostrEventRequest.kt | 14 + .../model/intermdiate/LocalChatMessage.kt | 34 +++ .../model/intermdiate/LocalChatRoom.kt | 12 +- .../intermdiate/LocalFrostSigningSession.kt | 8 +- .../intermdiate/LocalInReplyToNostrEvent.kt | 14 +- .../model/intermdiate/LocalMention.kt | 6 +- .../model/intermdiate/LocalNostrEvent.kt | 20 +- .../model/intermdiate/LocalParticipant.kt | 6 +- .../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 | 52 ++-- .../repository/DatabaseDkgRepository.kt | 38 +-- .../DatabaseFrostSigningRepository.kt | 20 +- .../repository/DatabaseMantraRepository.kt | 28 +- .../repository/DatabaseMarmotRepository.kt | 20 +- .../repository/DatabaseNostrRepository.kt | 84 +++--- .../repository/DatabasePostRepository.kt | 5 + .../repository/DatabaseSearchRepository.kt | 12 + .../GiftWrapImpersonationException.kt | 3 + .../GiftWrapPayloadUnsupportedException.kt | 3 + .../GiftWrapSealDecryptionException.kt | 3 + .../exceptions/GiftWrapUnsealException.kt | 3 + .../InvalidNostrPrivateKeyException.kt | 3 + .../MarmotMissingChatGroupException.kt | 2 +- .../MarmotMissingKeyPackageBundleException.kt | 2 +- ...MarmotMissingKeyPackageEventIdException.kt | 2 +- .../MarmotMissingNostrGroupDataExtension.kt | 2 +- ...MissingRetainedExporterSecretsException.kt | 2 +- .../MarmotNotMemberOfChatGroupException.kt | 2 +- .../MarmotUnprocessableInnerEventException.kt | 2 +- .../MarmotUnsupportedWireFormatException.kt | 2 +- ...eEventMissingKeyPackageEventIdException.kt | 2 +- ...MarmotWelcomeMismatchedGroupIdException.kt | 2 +- .../MarmotWelcomeMissingGroupIdException.kt | 2 +- .../compose/exceptions/NetworkException.kt | 2 +- .../exceptions/NostrNoticeException.kt | 2 +- .../exceptions/NostrPublishException.kt | 2 +- .../compose/exceptions/SignatureException.kt | 3 + .../exceptions/SigningKeyNotFoundException.kt | 2 +- .../exceptions/SigningRejectedException.kt | 3 + .../curare}/compose/extensions/Credentials.kt | 4 +- .../curare}/compose/extensions/Instant.kt | 2 +- .../curare}/compose/extensions/Member.kt | 4 +- .../compose/extensions/MlsGroupExtensions.kt | 2 +- .../curare}/compose/extensions/Phoenix.kt | 2 +- .../extensions/WalletManagerExtension.kt | 2 +- .../compose/managers/AuxDatabaseManager.kt | 26 ++ .../compose/managers/ChillDkgRitualManager.kt | 75 +++--- .../compose/managers/ChronicleManager.kt | 40 +-- .../compose/managers/FrostSigningManager.kt | 104 ++++---- .../compose/managers/GroupKeyStateManager.kt | 32 +-- .../managers/LiveSubscriptionManager.kt | 28 +- .../compose/managers/MarmotGroupCreation.kt | 18 +- .../compose/managers/MarmotGroupName.kt | 2 +- .../compose/managers/MarmotInboundManager.kt | 46 ++-- .../compose/managers/MarmotReindexSweep.kt | 4 +- .../curare}/compose/managers/MlsGroupCache.kt | 4 +- .../compose/managers/SharedKeyDerivation.kt | 19 +- .../compose/managers/SubgroupManager.kt | 36 +-- .../compose/managers/TranslationScaffold.kt | 8 +- .../to/curare/compose/network/UserAgent.kt | 11 + .../curare}/compose/network/dto/RelayDTO.kt | 4 +- .../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 | 4 +- .../network/sockets/NostrSocketClientImpl.kt | 4 +- .../compose/network/sockets/NostrVerb.kt | 2 +- .../network/sockets/ReconnectBackoff.kt | 2 +- .../sockets/SocketConnectionCallbacks.kt | 2 +- .../compose/nostr/GroupNostrProfile.kt | 4 +- .../curare}/compose/nostr/GroupPost.kt | 4 +- .../curare}/compose/nostr/GroupRelayList.kt | 4 +- .../curare}/compose/nostr/MarmotDelivery.kt | 10 +- .../compose/nostr/MarmotDirectMessage.kt | 2 +- .../compose/nostr/MemberProfileSync.kt | 10 +- .../curare}/compose/nostr/Nip17Filters.kt | 4 +- .../curare}/compose/nostr/Relays.kt | 11 +- .../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 +- .../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 | 12 +- .../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 +- .../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 | 32 +-- .../compose/repository/DkgRepository.kt | 18 +- .../repository/FrostSigningRepository.kt | 12 +- .../compose/repository/MantraRepository.kt | 20 +- .../compose/repository/MarmotRepository.kt | 6 +- .../repository/NostrNotaryRepository.kt | 36 +-- .../repository/NostrPublisherRepository.kt | 22 +- .../compose/repository/NostrRepository.kt | 38 +-- .../compose/repository/PostRepository.kt | 3 + .../compose/repository/RelayRepository.kt | 4 +- .../compose/repository/SearchRepository.kt | 6 +- .../curare}/compose/text/Markdown.kt | 2 +- .../curare}/compose/text/ProposedEvent.kt | 22 +- .../curare}/compose/ui/BlurHashDecoder.kt | 2 +- .../ui/composable/ActiveProfileScreen.kt | 68 ++--- .../ui/composable/AddArtifactScreen.kt | 70 ++--- .../compose/ui/composable/AddChapterScreen.kt | 62 ++--- .../compose/ui/composable/AddDialectScreen.kt | 58 ++-- .../ui/composable/AddGroupPostScreen.kt | 56 ++-- .../AddMemberToChatRoomConfirmationScreen.kt | 50 ++-- .../AddTranslationArtifactVersionScreen.kt | 58 ++-- .../ui/composable/ArtifactDetailScreen.kt | 66 ++--- .../ui/composable/ChapterDetailScreen.kt | 42 +-- .../ui/composable/ChatRoomCreationScreen.kt | 32 +-- .../ui/composable/ChatRoomDetailScreen.kt | 208 +++++++-------- .../ui/composable/ChatRoomMessagingScreen.kt | 66 ++--- .../ui/composable/CreateProfileScreen.kt | 70 ++--- .../ui/composable/DkgApprovalScaffold.kt | 26 +- .../ui/composable/DkgJoinApprovalScreen.kt | 10 +- .../compose/ui/composable/DkgRitualScreen.kt | 122 ++++----- .../ui/composable/DkgRound1ApprovalScreen.kt | 16 +- .../ui/composable/DkgRound2ApprovalScreen.kt | 14 +- .../composable/EditGroupNostrProfileScreen.kt | 76 +++--- .../ui/composable/EditGroupRelaysScreen.kt | 98 +++---- .../ui/composable/FrostSigningScreen.kt | 58 ++-- .../compose/ui/composable/HomeScreen.kt | 79 +++--- .../composable/ImplementationPendingScreen.kt | 16 +- .../composable/KeyPackageManagementScreen.kt | 48 ++-- .../ui/composable/KeyRecoveryScreen.kt | 48 ++-- .../compose/ui/composable/LandingScreen.kt | 30 +-- .../compose/ui/composable/LoadingScreen.kt | 12 +- .../ui/composable/NostrEventDetailScreen.kt | 48 ++-- .../ui/composable/ProposalListScreen.kt | 52 ++-- .../ui/composable/RecoveryPhraseScreen.kt | 58 ++-- .../SearchMemberToAddToChatRoomScreen.kt | 46 ++-- .../ui/composable/SearchResultScreen.kt | 46 ++-- .../compose/ui/composable/SearchScreen.kt | 42 +-- .../composable/SelectChatRoomMembersScreen.kt | 48 ++-- .../ui/composable/SelectChatRoomTypeScreen.kt | 60 ++--- .../composable/SelectSubgroupAdminsScreen.kt | 60 ++--- .../ui/composable/ShareProfileScreen.kt | 48 ++-- .../compose/ui/composable/SignInScreen.kt | 18 +- .../ui/composable/SocialPreconditionScreen.kt | 26 +- .../SovereignWalletStartupScreen.kt | 32 +-- .../ui/composable/TranslateChunkScreen.kt | 54 ++-- .../TranslationArtifactVersionDetailScreen.kt | 56 ++-- .../ui/composable/TranslationChapterScreen.kt | 38 +-- .../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 | 20 +- .../ui/composable/WriteNewNoteScreen.kt | 88 +++---- .../composable/navigation/CurareNavHost.kt} | 248 +++++++++--------- .../navigation/CurareNavigationSuite.kt} | 10 +- .../navigation/TopLevelDestination.kt | 18 +- .../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 + .../navigation/routes/ChapterDetailRoute.kt | 2 +- .../routes/ChatRoomCreationRoute.kt | 2 +- .../navigation/routes/ChatRoomDetailRoute.kt | 2 +- .../routes/ChatRoomMessagingRoute.kt | 2 +- .../navigation/routes/CreateProfileRoute.kt | 2 +- .../navigation/routes/DkgJoinApprovalRoute.kt | 2 +- .../navigation/routes/DkgRitualRoute.kt | 2 +- .../routes/DkgRound1ApprovalRoute.kt | 2 +- .../routes/DkgRound2ApprovalRoute.kt | 2 +- .../routes/EditGroupNostrProfileRoute.kt | 2 +- .../navigation/routes/EditGroupRelaysRoute.kt | 2 +- .../navigation/routes/FrostSigningRoute.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/ProposalListRoute.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 +- .../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 +- .../ui/composable/widgets/QRCodeView.kt | 8 +- .../ui/composable/widgets/ScreenState.kt | 12 +- .../ui/composable/widgets/Semantics.kt | 2 +- .../ui/composable/widgets/Snackbars.kt | 2 +- .../composable/widgets/buttons/Clickable.kt | 6 +- .../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 | 52 ++-- .../widgets/detail/TextNoteEventDetail.kt | 58 ++-- .../widgets/dialogs/BottomSheetDialog.kt | 4 +- .../dialogs/NewChatBottomSheetDialog.kt | 16 +- .../StartDirectMessageToNpubOrNip05Dialog.kt | 26 +- .../composable/widgets/feed/EventListView.kt | 52 ++-- .../widgets/feed/TextNoteFeedItem.kt | 80 +++--- .../widgets/profile/ProfileAvatar.kt | 20 +- .../widgets/profile/ProfileColor.kt | 4 +- .../composable/widgets/wallet/WalletAvatar.kt | 8 +- .../widgets/wallet/WalletsSelector.kt | 8 +- .../curare}/compose/ui/theme/Breakpoint.kt | 10 +- .../curare}/compose/ui/theme/Color.kt | 2 +- .../compose/ui/theme/ConformancePreviews.kt | 4 +- .../curare}/compose/ui/theme/Motion.kt | 4 +- .../curare}/compose/ui/theme/Panes.kt | 2 +- .../compose/ui/theme/ReadableMeasure.kt | 2 +- .../curare}/compose/ui/theme/Shape.kt | 4 +- .../curare}/compose/ui/theme/Spacing.kt | 4 +- .../curare}/compose/ui/theme/Theme.kt | 10 +- .../curare}/compose/ui/theme/ThemeGallery.kt | 8 +- .../curare}/compose/ui/theme/Type.kt | 2 +- .../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 | 20 +- .../AddTranslationArtifactVersionViewModel.kt | 26 +- .../ui/view/model/ArtifactDetailViewModel.kt | 6 +- .../ui/view/model/ChapterDetailViewModel.kt | 6 +- .../ui/view/model/ChatMessageListViewModel.kt | 36 +-- .../view/model/ChatRoomCreationViewModel.kt | 8 +- .../ui/view/model/ChatRoomDetailViewModel.kt | 18 +- .../ui/view/model/ChatRoomListViewModel.kt | 34 +-- .../view/model/ChatRoomMessagingViewModel.kt | 22 +- .../ui/view/model/CreateProfileViewModel.kt | 12 +- .../ui/view/model/DkgRitualViewModel.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 | 14 +- .../compose/ui/view/model/HomeViewModel.kt | 8 +- .../ui/view/model/InReplyToViewModel.kt | 58 ++-- .../model/KeyPackageManagementViewModel.kt | 8 +- .../model/MetadataEventDetailViewModel.kt | 48 ++-- .../ui/view/model/NavigationViewModel.kt | 14 +- .../view/model/NostrEventDetailViewModel.kt | 24 +- .../compose/ui/view/model/NotaryViewModel.kt | 16 +- .../ui/view/model/ProposalListViewModel.kt | 16 +- .../ui/view/model/RecoveryPhraseViewModel.kt | 4 +- .../SearchMemberToAddToChatRoomViewModel.kt | 16 +- .../ui/view/model/SearchResultViewModel.kt | 20 +- .../compose/ui/view/model/SearchViewModel.kt | 24 +- .../model/SelectChatRoomMembersViewModel.kt | 18 +- .../view/model/SelectChatRoomTypeViewModel.kt | 26 +- .../model/SelectSubgroupAdminsViewModel.kt | 16 +- .../ui/view/model/ShareProfileViewModel.kt | 14 +- .../ui/view/model/SignInToProfileViewModel.kt | 16 +- .../model/SovereignWalletStartupViewModel.kt | 8 +- .../ui/view/model/SovereignWalletViewModel.kt | 14 +- .../ui/view/model/SynchronizationViewModel.kt | 36 +-- .../ui/view/model/TranslateChunkViewModel.kt | 16 +- ...anslationArtifactVersionDetailViewModel.kt | 20 +- .../view/model/TranslationChapterViewModel.kt | 8 +- ...UnqueuedProfileSynchronizationViewModel.kt | 12 +- .../ui/view/model/WriteNewNoteViewModel.kt | 42 +-- .../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 +- .../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 +- .../compose/ui/view/state/DkgRitualUIState.kt | 18 +- .../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 | 8 +- .../ui/view/state/HomeScreenUIState.kt | 4 +- .../view/state/KeyPackageManagementUIState.kt | 4 +- .../view/state/MetadataEventDetailUIState.kt | 6 +- .../ui/view/state/NavigationUIState.kt | 14 +- .../ui/view/state/NostrEventDetailUIState.kt | 4 +- .../ui/view/state/ProposalListUIState.kt | 8 +- .../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 | 2 +- .../ui/view/state/SovereignWalletUIState.kt | 2 +- .../ui/view/state/TranslateChunkUIState.kt | 6 +- ...TranslationArtifactVersionDetailUIState.kt | 10 +- .../view/state/TranslationChapterUIState.kt | 6 +- .../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 +- .../curare}/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 | 28 +- .../managers/LiveSubscriptionReconcileTest.kt | 22 +- .../compose/managers/MarmotGroupNameTest.kt | 2 +- .../managers/MarmotMip03CarveOutTest.kt | 2 +- .../managers/MarmotReindexSweepTest.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/GroupNostrProfileTest.kt | 8 +- .../curare}/compose/nostr/GroupPostTest.kt | 8 +- .../compose/nostr/GroupRelayListTest.kt | 8 +- .../compose/nostr/MarmotDeliveryTest.kt | 4 +- .../nostr/MarmotDirectMessageDeliveryTest.kt | 2 +- .../compose/nostr/MarmotDirectMessageTest.kt | 2 +- .../compose/nostr/MemberProfileSyncTest.kt | 14 +- .../curare}/compose/nostr/Nip17FiltersTest.kt | 6 +- .../nostr/chronicle/ChronicleEventTest.kt | 40 +-- .../nostr/chronicle/ChronicleRoundTripTest.kt | 40 +-- .../nostr/frost/FrostProposalCodecTest.kt | 2 +- .../nostr/nip30303/ArtifactEventTest.kt | 4 +- .../nostr/nip30303/ChapterChunkSplitTest.kt | 6 +- .../nip30303/InitialArtifactVersionTest.kt | 4 +- .../nostr/nip30303/SubmissionEventTest.kt | 2 +- .../SubgroupBirthCertificateEventTest.kt | 6 +- .../navigation/NavigationSuiteTest.kt | 10 +- .../ui/theme/AppColorSchemeSelectionTest.kt | 2 +- .../compose/ui/theme/BreakpointTest.kt | 2 +- .../ui/theme/ColorSchemeContrastTest.kt | 2 +- .../curare}/compose/ui/theme/PanesTest.kt | 2 +- .../compose/ui/theme/ReadableMeasureTest.kt | 2 +- .../compose/ui/theme/SpacingScaleTest.kt | 2 +- .../ui/view/model/NavigationRoutingTest.kt | 14 +- .../it/curated/compose/PlatformContext.ios.kt | 3 - .../curare}/compose/AppVersion.ios.kt | 2 +- .../curare}/compose/MainViewController.kt | 6 +- .../curare}/compose/Platform.ios.kt | 2 +- .../to/curare/compose/PlatformContext.ios.kt | 3 + .../builder/PlatformDatabaseBuilder.ios.kt | 12 +- .../curare}/compose/extensions/Phoenix.ios.kt | 2 +- .../curare}/compose/ui/theme/Motion.ios.kt | 2 +- .../curare}/compose/ui/theme/Theme.ios.kt | 2 +- .../ui/view/model/NavigationViewModel.ios.kt | 4 +- .../curare}/compose/AppVersion.jvm.kt | 2 +- .../curare}/compose/Platform.jvm.kt | 2 +- .../curare}/compose/PlatformContext.jvm.kt | 18 +- .../builder/PlatformDatabaseBuilder.jvm.kt | 12 +- .../curare}/compose/extensions/Phoenix.jvm.kt | 2 +- .../curare}/compose/ui/theme/Motion.jvm.kt | 2 +- .../curare}/compose/ui/theme/Theme.jvm.kt | 2 +- .../ui/view/model/NavigationViewModel.jvm.kt | 4 +- .../it/curated => to/curare}/desktop/Main.kt | 34 +-- .../database/CurareDatabaseJvmTest.kt} | 24 +- .../BroadcastNostrEventRequestDaoJvmTest.kt | 14 +- .../database/dao/ChatMessageDaoJvmTest.kt | 20 +- .../database/dao/ChatRoomDaoJvmTest.kt | 20 +- .../database/dao/DkgSessionDaoJvmTest.kt | 22 +- .../dao/FrostSigningSessionDaoJvmTest.kt | 24 +- .../dao/GroupSignedEventDaoJvmTest.kt | 26 +- .../compose/database/dao/MantraDaoJvmTest.kt | 26 +- .../database/dao/MarmotKeyPackageFixture.kt | 4 +- .../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/SubgroupDaoJvmTest.kt | 22 +- .../dao/UnsignedNostrEventQueueJvmTest.kt | 14 +- .../ChronicleRenameMigrationJvmTest.kt | 4 +- .../FrostSigningItemMigrationJvmTest.kt | 2 +- .../JoinedGroupAtMigrationJvmTest.kt | 4 +- .../model/TranslationChunkApplyJvmTest.kt | 12 +- .../NostrEventFilterQueryExecutionTest.kt | 16 +- .../DatabaseChatRepositoryJvmTest.kt | 24 +- .../managers/ChapterBatchProposalJvmTest.kt | 34 +-- .../compose/managers/ChronicleApplyJvmTest.kt | 62 ++--- .../managers/ChronicleAssemblyJvmTest.kt | 44 ++-- .../managers/MarmotGroupCreationJvmTest.kt | 18 +- .../managers/RobustRoomKeyCeremonyTest.kt | 22 +- .../managers/SignedGroupKeyStateTest.kt | 52 ++-- .../SubgroupCeremonyInParentRoomTest.kt | 44 ++-- .../managers/SubgroupManagerJvmTest.kt | 36 +-- .../TranslationBatchProposalJvmTest.kt | 46 ++-- .../compose/ui/StringCatalogueJvmTest.kt | 16 +- .../ui/composable/ChatPaneLayoutJvmTest.kt | 26 +- .../GroupKeyStateSheetLayoutJvmTest.kt | 16 +- .../GroupNostrProfileSectionJvmTest.kt | 34 +-- .../NavigationSuiteRenderJvmTest.kt | 20 +- .../widgets/ScreenStateTransitionJvmTest.kt | 8 +- .../ui/theme/NavigationMotionJvmTest.kt | 8 +- .../ui/theme/ReadableContentLayoutJvmTest.kt | 6 +- .../model/EditGroupRelaysViewModelJvmTest.kt | 18 +- docs/README.md | 2 +- docs/dead-code.md | 50 ++-- docs/frost-batch-signing.md | 34 +-- docs/jvm-target.md | 44 ++-- docs/long-running-sync.md | 8 +- docs/material-design-conformance.md | 59 +++-- docs/member-chronicle.md | 28 +- 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/shared-key-derivation.md | 9 +- docs/subgroups.md | 12 +- iosApp/Configuration/Config.xcconfig | 4 +- iosApp/iosApp.xcodeproj/project.pbxproj | 6 +- settings.gradle.kts | 2 +- 765 files changed, 5277 insertions(+), 5255 deletions(-) rename composeApp/schemas/{com.it.curated.compose.database.CuratedDatabase => to.curare.compose.database.CurareDatabase}/1.json (100%) rename composeApp/schemas/{com.it.curated.compose.database.CuratedDatabase => to.curare.compose.database.CurareDatabase}/10.json (100%) rename composeApp/schemas/{com.it.curated.compose.database.CuratedDatabase => to.curare.compose.database.CurareDatabase}/11.json (100%) rename composeApp/schemas/{com.it.curated.compose.database.CuratedDatabase => to.curare.compose.database.CurareDatabase}/12.json (100%) rename composeApp/schemas/{com.it.curated.compose.database.CuratedDatabase => to.curare.compose.database.CurareDatabase}/13.json (100%) rename composeApp/schemas/{com.it.curated.compose.database.CuratedDatabase => to.curare.compose.database.CurareDatabase}/14.json (100%) rename composeApp/schemas/{com.it.curated.compose.database.CuratedDatabase => to.curare.compose.database.CurareDatabase}/15.json (100%) rename composeApp/schemas/{com.it.curated.compose.database.CuratedDatabase => to.curare.compose.database.CurareDatabase}/16.json (100%) rename composeApp/schemas/{com.it.curated.compose.database.CuratedDatabase => to.curare.compose.database.CurareDatabase}/17.json (100%) rename composeApp/schemas/{com.it.curated.compose.database.CuratedDatabase => to.curare.compose.database.CurareDatabase}/18.json (100%) rename composeApp/schemas/{com.it.curated.compose.database.CuratedDatabase => to.curare.compose.database.CurareDatabase}/19.json (100%) rename composeApp/schemas/{com.it.curated.compose.database.CuratedDatabase => to.curare.compose.database.CurareDatabase}/2.json (100%) rename composeApp/schemas/{com.it.curated.compose.database.CuratedDatabase => to.curare.compose.database.CurareDatabase}/3.json (100%) rename composeApp/schemas/{com.it.curated.compose.database.CuratedDatabase => to.curare.compose.database.CurareDatabase}/4.json (100%) rename composeApp/schemas/{com.it.curated.compose.database.CuratedDatabase => to.curare.compose.database.CurareDatabase}/5.json (100%) rename composeApp/schemas/{com.it.curated.compose.database.CuratedDatabase => to.curare.compose.database.CurareDatabase}/6.json (100%) rename composeApp/schemas/{com.it.curated.compose.database.CuratedDatabase => to.curare.compose.database.CurareDatabase}/7.json (100%) rename composeApp/schemas/{com.it.curated.compose.database.CuratedDatabase => to.curare.compose.database.CurareDatabase}/8.json (100%) rename composeApp/schemas/{com.it.curated.compose.database.CuratedDatabase => to.curare.compose.database.CurareDatabase}/9.json (100%) rename composeApp/src/androidMain/kotlin/{com/it/curated/android/CuratedApplication.kt => to/curare/android/CurareApplication.kt} (92%) rename composeApp/src/androidMain/kotlin/{com/it/curated => to/curare}/android/MainActivity.kt (87%) rename composeApp/src/androidMain/kotlin/{com/it/curated => to/curare}/compose/AppVersion.android.kt (72%) rename composeApp/src/androidMain/kotlin/{com/it/curated => to/curare}/compose/Platform.android.kt (60%) rename composeApp/src/androidMain/kotlin/{com/it/curated => to/curare}/compose/PlatformContext.android.kt (75%) rename composeApp/src/androidMain/kotlin/{com/it/curated => to/curare}/compose/database/builder/PlatformDatabaseBuilder.android.kt (65%) rename composeApp/src/androidMain/kotlin/{com/it/curated => to/curare}/compose/extensions/Phoenix.android.kt (89%) rename composeApp/src/androidMain/kotlin/{com/it/curated => to/curare}/compose/ui/theme/Motion.android.kt (98%) rename composeApp/src/androidMain/kotlin/{com/it/curated => to/curare}/compose/ui/theme/Theme.android.kt (98%) rename composeApp/src/androidMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/NavigationViewModel.android.kt (95%) delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/CuratedGlobal.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/Platform.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/PlatformContext.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/database/CuratedDatabaseConstructor.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/BroadcastNostrEventReceiptDao.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ChatMessageNostrEventRelationDao.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/GiftWrapMessageDao.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/GiftWrapSealDao.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/NegentropySynchronizeResultDao.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/NostrEventRelayDao.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/PostDao.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ReactionDao.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/RecentSearchDao.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/RelayDao.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/SynchronizeNostrEventResultDao.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalAccount.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalBroadcastNostrEventRequest.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalChatMessage.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/typealiases/HexArray.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/typealiases/KindArray.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/typealiases/SynchronizationFilterArray.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabasePostRepository.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabaseSearchRepository.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/GiftWrapImpersonationException.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/GiftWrapPayloadUnsupportedException.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/GiftWrapSealDecryptionException.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/GiftWrapUnsealException.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/InvalidNostrPrivateKeyException.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/SignatureException.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/SigningRejectedException.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/AuxDatabaseManager.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/network/UserAgent.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/CachingImportRepository.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/PostRepository.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/AuthenticatedProfileRoute.kt delete mode 100755 composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/BlankRoute.kt delete mode 100755 composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/LandingRoute.kt delete mode 100755 composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/Route.kt delete mode 100755 composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SignInRoute.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SovereignWalletStartupRoute.kt delete mode 100644 composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/WriteNewNoteUIState.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/AppLifecycle.kt (97%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/AppVersion.kt (78%) rename composeApp/src/commonMain/kotlin/{com/it/curated/compose/CuratedApp.kt => to/curare/compose/CurareApp.kt} (72%) create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/CurareGlobal.kt create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/Platform.kt create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/PlatformContext.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/cryptography/Extensions.kt (77%) rename composeApp/src/commonMain/kotlin/{com/it/curated/compose/database/CuratedDatabase.kt => to/curare/compose/database/CurareDatabase.kt} (67%) create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/CurareDatabaseConstructor.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/builder/PlatformDatabaseBuilder.kt (55%) rename composeApp/src/commonMain/kotlin/{com/it/curated/compose/database/converters/CuratedConverters.kt => to/curare/compose/database/converters/CurareConverters.kt} (94%) create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/BroadcastNostrEventReceiptDao.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/BroadcastNostrEventRequestDao.kt (91%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/ChatMessageBroadcastNostrEventReceiptRelationDao.kt (59%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/ChatMessageBroadcastNostrEventRequestRelationDao.kt (81%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/ChatMessageDao.kt (85%) create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatMessageNostrEventRelationDao.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/ChatRoomDao.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/ConnectionDao.kt (55%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/DkgSessionDao.kt (98%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/FrostSigningSessionDao.kt (93%) create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GiftWrapMessageDao.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/GiftWrapPayloadDao.kt (95%) create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GiftWrapSealDao.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/GroupKeyStateDao.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/GroupSignedEventDao.kt (97%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/InReplyToRelationDao.kt (56%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/MantraArtifactDao.kt (82%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/MantraArtifactVersionDao.kt (85%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/MantraChapterDao.kt (91%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/MantraChunkDao.kt (84%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/MantraDao.kt (88%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/MantraDialectDao.kt (84%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/MantraTranslationArtifactVersionContributorDao.kt (64%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/MantraTranslationArtifactVersionDao.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/MantraTranslationChapterContributorDao.kt (53%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/MantraTranslationChapterDao.kt (86%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/MantraTranslationChunkDao.kt (91%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/MantraTranslationContributorDao.kt (62%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/MantraTranslationDao.kt (70%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/MarmotCommitResultDao.kt (79%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/MarmotGroupEventDao.kt (60%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/MarmotInnerEventDao.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/MarmotKeyPackageBundleDao.kt (90%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/MarmotKeyPackageDao.kt (91%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/MarmotOutboundDao.kt (95%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/MarmotRetainedEpochSecretDao.kt (89%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/MentionDao.kt (53%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/NegentropySynchronizeRequestDao.kt (92%) create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NegentropySynchronizeResultDao.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/NostrDao.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/NostrEventDao.kt (88%) create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrEventRelayDao.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/NostrNip17Dao.kt (92%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/ParticipantDao.kt (85%) create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/PostDao.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/ProfileDao.kt (81%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/QuotedRelationDao.kt (57%) create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ReactionDao.kt create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/RecentSearchDao.kt create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/RelayDao.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/RepostedRelationDao.kt (58%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/SynchronizeNostrEventRequestDao.kt (69%) create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/SynchronizeNostrEventResultDao.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/UnsignedNostrEventDao.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/dao/ZapDao.kt (74%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/migrations/ChronicleRenameMigration.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/migrations/DkgApprovalRequestMigration.kt (95%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/migrations/FrostSigningItemMigration.kt (98%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/migrations/JoinedGroupAtMigration.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/BroadcastNostrEventReceipt.kt (84%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/BroadcastNostrEventRequest.kt (81%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/ChatMessage.kt (97%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/ChatMessageBroadcastNostrEventReceiptRelation.kt (84%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/ChatMessageBroadcastNostrEventRequestRelation.kt (84%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/ChatMessageNostrEventRelation.kt (84%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/ChatRoom.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/Connection.kt (74%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/DkgParticipantMessage.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/DkgSession.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/FrostSignerMessage.kt (97%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/FrostSigningItem.kt (98%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/FrostSigningSession.kt (95%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/GiftWrapMessage.kt (92%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/GiftWrapPayload.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/GiftWrapSeal.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/GroupKeyState.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/GroupSignedEvent.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/InReplyToRelation.kt (86%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/MantraArtifact.kt (91%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/MantraArtifactVersion.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/MantraChapter.kt (90%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/MantraChunk.kt (91%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/MantraDialect.kt (90%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/MantraTranslation.kt (89%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/MantraTranslationArtifactVersion.kt (91%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/MantraTranslationArtifactVersionContributor.kt (86%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/MantraTranslationChapter.kt (91%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/MantraTranslationChapterContributor.kt (86%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/MantraTranslationChunk.kt (92%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/MantraTranslationChunkProposal.kt (91%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/MantraTranslationContributor.kt (92%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/MarmotCommitResult.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/MarmotGroupEvent.kt (78%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/MarmotInnerEvent.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/MarmotKeyPackage.kt (86%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/MarmotKeyPackageBundle.kt (90%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/MarmotRetainedEpochSecret.kt (82%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/Mention.kt (78%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/NegentropySynchronizeRequest.kt (82%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/NegentropySynchronizeResult.kt (88%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/NostrEvent.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/NostrEventRelay.kt (78%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/Participant.kt (88%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/Post.kt (76%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/Profile.kt (84%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/QuotedRelation.kt (79%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/Reaction.kt (73%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/RecentSearch.kt (82%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/Relay.kt (83%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/RepostedRelation.kt (79%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/SynchronizeNostrEventRequest.kt (87%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/SynchronizeNostrEventResult.kt (79%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/UnsignedNostrEvent.kt (88%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/Zap.kt (80%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/intermdiate/ChatRoomLastMessage.kt (85%) create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalAccount.kt create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalBroadcastNostrEventRequest.kt create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalChatMessage.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/intermdiate/LocalChatRoom.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/intermdiate/LocalFrostSigningSession.kt (85%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/intermdiate/LocalInReplyToNostrEvent.kt (85%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/intermdiate/LocalMention.kt (50%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/intermdiate/LocalNostrEvent.kt (82%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/intermdiate/LocalParticipant.kt (50%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/intermdiate/LocalPost.kt (60%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/intermdiate/LocalProfile.kt (60%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/intermdiate/LocalProfileWithFollowers.kt (57%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/intermdiate/LocalProfileWithFollowing.kt (57%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/intermdiate/LocalQuotedNostrEvent.kt (82%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/intermdiate/LocalRepostedNostrEvent.kt (85%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/traits/BroadcastableEntity.kt (63%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/traits/LocalStoreEntity.kt (60%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/traits/NostrEventEntity.kt (67%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/traits/OptionalNostrEventEntity.kt (69%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/traits/ProfilePublicKeyEntity.kt (69%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/traits/ReplyingToEntity.kt (67%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/traits/SoftDeletableEntity.kt (62%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/traits/TimestampedEntity.kt (67%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/traits/UnsignedNostrEventEntity.kt (57%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/traits/UserViewableEntity.kt (61%) create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/model/typealiases/HexArray.kt create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/model/typealiases/KindArray.kt create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/model/typealiases/SynchronizationFilterArray.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/types/ChatRoomType.kt (97%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/types/DkgApprovalStep.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/types/DkgRitualStage.kt (95%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/types/FrostSigningStage.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/types/MarmotReindexReport.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/model/types/SynchronizationFilter.kt (97%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/query/NostrEventFilterQuery.kt (98%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/repository/DatabaseChatRepository.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/repository/DatabaseDkgRepository.kt (88%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/repository/DatabaseFrostSigningRepository.kt (88%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/repository/DatabaseMantraRepository.kt (81%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/repository/DatabaseMarmotRepository.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/database/repository/DatabaseNostrRepository.kt (90%) create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabasePostRepository.kt create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseSearchRepository.kt create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/GiftWrapImpersonationException.kt create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/GiftWrapPayloadUnsupportedException.kt create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/GiftWrapSealDecryptionException.kt create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/GiftWrapUnsealException.kt create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/InvalidNostrPrivateKeyException.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/exceptions/MarmotMissingChatGroupException.kt (73%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/exceptions/MarmotMissingKeyPackageBundleException.kt (74%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/exceptions/MarmotMissingKeyPackageEventIdException.kt (74%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/exceptions/MarmotMissingNostrGroupDataExtension.kt (74%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/exceptions/MarmotMissingRetainedExporterSecretsException.kt (74%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/exceptions/MarmotNotMemberOfChatGroupException.kt (74%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/exceptions/MarmotUnprocessableInnerEventException.kt (74%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/exceptions/MarmotUnsupportedWireFormatException.kt (74%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/exceptions/MarmotWelcomeEventMissingKeyPackageEventIdException.kt (76%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/exceptions/MarmotWelcomeMismatchedGroupIdException.kt (74%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/exceptions/MarmotWelcomeMissingGroupIdException.kt (74%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/exceptions/NetworkException.kt (51%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/exceptions/NostrNoticeException.kt (51%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/exceptions/NostrPublishException.kt (64%) create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/SignatureException.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/exceptions/SigningKeyNotFoundException.kt (76%) create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/SigningRejectedException.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/extensions/Credentials.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/extensions/Instant.kt (98%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/extensions/Member.kt (90%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/extensions/MlsGroupExtensions.kt (80%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/extensions/Phoenix.kt (91%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/extensions/WalletManagerExtension.kt (89%) create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/managers/AuxDatabaseManager.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/managers/ChillDkgRitualManager.kt (97%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/managers/ChronicleManager.kt (97%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/managers/FrostSigningManager.kt (97%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/managers/GroupKeyStateManager.kt (95%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/managers/LiveSubscriptionManager.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/managers/MarmotGroupCreation.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/managers/MarmotGroupName.kt (98%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/managers/MarmotInboundManager.kt (97%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/managers/MarmotReindexSweep.kt (97%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/managers/MlsGroupCache.kt (98%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/managers/SharedKeyDerivation.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/managers/SubgroupManager.kt (95%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/managers/TranslationScaffold.kt (94%) create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/network/UserAgent.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/network/dto/RelayDTO.kt (87%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/network/relays/FallbackRelays.kt (72%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/network/relays/LiveSubscriptionTransport.kt (90%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/network/relays/NostrPublishResult.kt (55%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/network/relays/RelayBackPressure.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/network/relays/RelayPool.kt (85%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/network/relays/RelaysSocketManager.kt (81%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/network/relays/broadcast/BroadcastEventResponse.kt (80%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/network/relays/broadcast/BroadcastRequestBody.kt (78%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/network/serialization/CommonJson.kt (95%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/network/serialization/SocketsJson.kt (79%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/network/sockets/NostrIncomingMessage.kt (81%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/network/sockets/NostrIncomingMessageExt.kt (98%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/network/sockets/NostrIncomingMessageParser.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/network/sockets/NostrOutgoingMessageBuilder.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/network/sockets/NostrSocketClient.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/network/sockets/NostrSocketClientFactory.kt (95%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/network/sockets/NostrSocketClientImpl.kt (99%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/network/sockets/NostrVerb.kt (95%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/network/sockets/ReconnectBackoff.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/network/sockets/SocketConnectionCallbacks.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/GroupNostrProfile.kt (98%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/GroupPost.kt (98%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/GroupRelayList.kt (99%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/MarmotDelivery.kt (88%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/MarmotDirectMessage.kt (99%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/MemberProfileSync.kt (92%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/Nip17Filters.kt (95%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/Relays.kt (88%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/chronicle/ChronicleEvent.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/chronicle/ChronicleRequestEvent.kt (98%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/chronicle/tags/ChronicleIdTag.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/chronicle/tags/ChroniclePageTag.kt (97%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/chronicle/tags/ChronicleRecipientTag.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/dkg/DkgRitualEvents.kt (95%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/dkg/tags/DkgSessionIdTag.kt (95%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/dkg/tags/DkgThresholdTag.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/frost/FrostSigningEvents.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/frost/GroupKeyStateEvent.kt (95%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/frost/tags/FrostDerivationPathTag.kt (92%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/frost/tags/FrostKeyTag.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/frost/tags/FrostSessionIdTag.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/frost/tags/FrostSignerIdsTag.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/ArtifactEvent.kt (87%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/ArtifactVersionEvent.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/ChapterEvent.kt (87%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/ChunkEvent.kt (92%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/DialectEvent.kt (87%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/SubmissionEvent.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/TranslationArtifactVersionContributorListEvent.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/TranslationArtifactVersionEvent.kt (84%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/TranslationChapterContributorListEvent.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/TranslationChapterEvent.kt (87%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/TranslationChunkEvent.kt (84%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/TranslationChunkProposalEvent.kt (84%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/TranslationContributorListEvent.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/TranslationEvent.kt (88%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/tags/ArtifactIdTag.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/tags/ArtifactVersionIdTag.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/tags/ArtifactVersionMetadataTag.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/tags/ChapterIdTag.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/tags/ChunkIdTag.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/tags/ContributorTag.kt (97%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/tags/CountryTag.kt (92%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/tags/DialectIdTag.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/tags/IndexTag.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/tags/LanguageTag.kt (92%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/tags/LicenseTag.kt (92%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/tags/NameTag.kt (92%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/tags/OriginalTextTag.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/tags/PayloadIdTag.kt (97%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/tags/PayloadKindTag.kt (95%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/tags/TranslationArtifactVersionIdTag.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/tags/TranslationChapterIdTag.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/tags/TranslationChunkIdTag.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/tags/TranslationIdTag.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/tags/UrlTag.kt (92%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/tags/VisibilityTag.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/tags/WordStatisticsTag.kt (95%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/subgroup/SubgroupBirthCertificateEvent.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/subgroup/SubgroupParentage.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/subgroup/tags/SubgroupBirthCertificateTag.kt (97%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/subgroup/tags/SubgroupKeyTag.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/nostr/subgroup/tags/SubgroupParentTag.kt (97%) create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/repository/CachingImportRepository.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/repository/ChatRepository.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/repository/DkgRepository.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/repository/FrostSigningRepository.kt (95%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/repository/MantraRepository.kt (87%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/repository/MarmotRepository.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/repository/NostrNotaryRepository.kt (67%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/repository/NostrPublisherRepository.kt (69%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/repository/NostrRepository.kt (90%) create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/repository/PostRepository.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/repository/RelayRepository.kt (58%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/repository/SearchRepository.kt (54%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/text/Markdown.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/text/ProposedEvent.kt (91%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/BlurHashDecoder.kt (99%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/ActiveProfileScreen.kt (89%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/AddArtifactScreen.kt (89%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/AddChapterScreen.kt (89%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/AddDialectScreen.kt (90%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/AddGroupPostScreen.kt (89%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt (87%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/AddTranslationArtifactVersionScreen.kt (90%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/ArtifactDetailScreen.kt (88%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/ChapterDetailScreen.kt (88%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/ChatRoomCreationScreen.kt (86%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/ChatRoomDetailScreen.kt (91%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/ChatRoomMessagingScreen.kt (91%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/CreateProfileScreen.kt (88%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/DkgApprovalScaffold.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/DkgJoinApprovalScreen.kt (92%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/DkgRitualScreen.kt (90%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/DkgRound1ApprovalScreen.kt (88%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/DkgRound2ApprovalScreen.kt (88%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/EditGroupNostrProfileScreen.kt (88%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/EditGroupRelaysScreen.kt (89%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/FrostSigningScreen.kt (91%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/HomeScreen.kt (88%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/ImplementationPendingScreen.kt (77%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/KeyPackageManagementScreen.kt (88%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/KeyRecoveryScreen.kt (87%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/LandingScreen.kt (81%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/LoadingScreen.kt (71%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/NostrEventDetailScreen.kt (83%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/ProposalListScreen.kt (92%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/RecoveryPhraseScreen.kt (90%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt (88%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/SearchResultScreen.kt (88%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/SearchScreen.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/SelectChatRoomMembersScreen.kt (89%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/SelectChatRoomTypeScreen.kt (91%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/SelectSubgroupAdminsScreen.kt (87%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/ShareProfileScreen.kt (88%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/SignInScreen.kt (76%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/SocialPreconditionScreen.kt (84%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/SovereignWalletStartupScreen.kt (92%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/TranslateChunkScreen.kt (89%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/TranslationArtifactVersionDetailScreen.kt (89%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/TranslationChapterScreen.kt (90%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/UnannouncedProfileScreen.kt (80%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/UnindexedProfileScreen.kt (80%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/UnqueuedProfileScreen.kt (80%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/UnqueuedProfileSynchronizationScreen.kt (74%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/UnsignedProfileScreen.kt (79%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/UnsyncedProfileScreen.kt (80%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/WriteNewNoteScreen.kt (87%) rename composeApp/src/commonMain/kotlin/{com/it/curated/compose/ui/composable/navigation/CuratedNavHost.kt => to/curare/compose/ui/composable/navigation/CurareNavHost.kt} (85%) rename composeApp/src/commonMain/kotlin/{com/it/curated/compose/ui/composable/navigation/CuratedNavigationSuite.kt => to/curare/compose/ui/composable/navigation/CurareNavigationSuite.kt} (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/TopLevelDestination.kt (86%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/ActiveProfileRoute.kt (68%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/AddArtifactRoute.kt (74%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/AddChapterRoute.kt (77%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/AddDialectRoute.kt (77%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/AddGroupPostRoute.kt (78%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/AddMemberToChatRoomConfirmationRoute.kt (81%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/AddTranslationRoute.kt (77%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/ArtifactDetailRoute.kt (77%) create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AuthenticatedProfileRoute.kt create mode 100755 composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/BlankRoute.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/ChapterDetailRoute.kt (77%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/ChatRoomCreationRoute.kt (63%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/ChatRoomDetailRoute.kt (74%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/ChatRoomMessagingRoute.kt (75%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/CreateProfileRoute.kt (63%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/DkgJoinApprovalRoute.kt (90%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/DkgRitualRoute.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/DkgRound1ApprovalRoute.kt (90%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/DkgRound2ApprovalRoute.kt (90%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/EditGroupNostrProfileRoute.kt (78%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/EditGroupRelaysRoute.kt (78%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/FrostSigningRoute.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/HomeRoute.kt (61%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/ImplementationPendingRoute.kt (61%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/KeyPackageManagementRoute.kt (69%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/KeyRecoveryRoute.kt (68%) create mode 100755 composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/LandingRoute.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/LoadingRoute.kt (60%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/NostrEventDetailRoute.kt (68%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/ProposalListRoute.kt (87%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/RecoveryPhraseRoute.kt (61%) create mode 100755 composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/Route.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/SearchMemberToAddToChatRoomRoute.kt (75%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/SearchResultRoute.kt (66%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/SearchRoute.kt (61%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/SelectChatRoomMembersRoute.kt (86%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/SelectChatRoomTypeRoute.kt (88%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/SelectSubgroupAdminsRoute.kt (91%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/ShareProfileRoute.kt (67%) create mode 100755 composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SignInRoute.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/SocialPreconditionRoute.kt (63%) create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SovereignWalletStartupRoute.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/TranslateChunkRoute.kt (80%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/TranslationArtifactVersionDetailRoute.kt (80%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/TranslationChapterRoute.kt (78%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/UnannouncedProfileRoute.kt (62%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/UnindexedProfileRoute.kt (62%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/UnqueuedProfileRoute.kt (62%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/UnqueuedProfileSynchronizationRoute.kt (69%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/UnsignedProfileRoute.kt (63%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/UnsyncedProfileRoute.kt (61%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/routes/WriteNewNoteRoute.kt (73%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/DetailRow.kt (87%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/LoadingDataIndicator.kt (91%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/QRCodeView.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/ScreenState.kt (95%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/Semantics.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/Snackbars.kt (98%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/buttons/Clickable.kt (95%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/chat/ChatTranscript.kt (95%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/coil/forwardingPainter.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/content/ArticleCard.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/content/Constants.kt (97%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/content/ContentParser.kt (99%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/content/ContentSegment.kt (98%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/content/FullScreenImageViewer.kt (98%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/content/Helpers.kt (97%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/content/ImageWithContextMenu.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/content/InvoicePayState.kt (54%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/content/LightningInvoiceCard.kt (91%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/content/LinkPreview.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/content/LiveStreamCard.kt (92%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/content/LiveStreamCardContent.kt (92%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/content/LoadingAsyncImage.kt (97%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/content/MediaMeta.kt (70%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/content/NoteActions.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/content/OgData.kt (68%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/content/QuotedAddressableNote.kt (88%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/content/QuotedNote.kt (87%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/content/RichContent.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/content/UnsupportedKindBadge.kt (81%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/detail/MetadataEventDetail.kt (90%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/detail/TextNoteEventDetail.kt (88%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/dialogs/BottomSheetDialog.kt (97%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/dialogs/NewChatBottomSheetDialog.kt (91%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05Dialog.kt (90%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/feed/EventListView.kt (79%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/feed/TextNoteFeedItem.kt (80%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/profile/ProfileAvatar.kt (85%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/profile/ProfileColor.kt (76%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/wallet/WalletAvatar.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/wallet/WalletsSelector.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/theme/Breakpoint.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/theme/Color.kt (99%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/theme/ConformancePreviews.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/theme/Motion.kt (98%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/theme/Panes.kt (97%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/theme/ReadableMeasure.kt (99%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/theme/Shape.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/theme/Spacing.kt (98%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/theme/Theme.kt (99%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/theme/ThemeGallery.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/theme/Type.kt (98%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/ActiveProfileViewModel.kt (69%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/AddArtifactViewModel.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/AddChapterViewModel.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/AddDialectViewModel.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/AddGroupPostViewModel.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/AddMemberToChatRoomConfirmationViewModel.kt (92%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/AddTranslationArtifactVersionViewModel.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/ArtifactDetailViewModel.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/ChapterDetailViewModel.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/ChatMessageListViewModel.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/ChatRoomCreationViewModel.kt (88%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/ChatRoomDetailViewModel.kt (92%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/ChatRoomListViewModel.kt (91%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/ChatRoomMessagingViewModel.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/CreateProfileViewModel.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/DkgRitualViewModel.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/EditGroupNostrProfileViewModel.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/EditGroupRelaysViewModel.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/FeedListViewModel.kt (83%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/FollowersListViewModel.kt (75%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/FollowingListViewModel.kt (75%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/FrostSigningViewModel.kt (92%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/HomeViewModel.kt (89%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/InReplyToViewModel.kt (74%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/KeyPackageManagementViewModel.kt (92%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/MetadataEventDetailViewModel.kt (85%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/NavigationViewModel.kt (95%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/NostrEventDetailViewModel.kt (72%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/NotaryViewModel.kt (95%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/ProposalListViewModel.kt (89%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/RecoveryPhraseViewModel.kt (98%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/SearchMemberToAddToChatRoomViewModel.kt (90%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/SearchResultViewModel.kt (85%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/SearchViewModel.kt (66%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/SelectChatRoomMembersViewModel.kt (89%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/SelectChatRoomTypeViewModel.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/SelectSubgroupAdminsViewModel.kt (96%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/ShareProfileViewModel.kt (86%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/SignInToProfileViewModel.kt (76%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/SovereignWalletStartupViewModel.kt (91%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/SovereignWalletViewModel.kt (95%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/SynchronizationViewModel.kt (97%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/TranslateChunkViewModel.kt (93%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/TranslationArtifactVersionDetailViewModel.kt (92%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/TranslationChapterViewModel.kt (94%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/UnqueuedProfileSynchronizationViewModel.kt (86%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/WriteNewNoteViewModel.kt (73%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/ActiveProfileUIState.kt (62%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/AddArtifactUIState.kt (76%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/AddChapterUIState.kt (78%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/AddDialectUIState.kt (81%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/AddGroupPostUIState.kt (86%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/AddMemberToChatRoomConfirmationUIState.kt (64%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/AddTranslationArtifactVersionUIState.kt (82%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/ArtifactDetailUIState.kt (60%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/ChapterDetailUIState.kt (65%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/ChatMessageListUIState.kt (67%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/ChatRoomDetailUIState.kt (90%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/ChatRoomListUIState.kt (56%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/ChatRoomMessagingUIState.kt (74%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/CreateProfileUIState.kt (76%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/DkgRitualUIState.kt (92%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/EditGroupNostrProfileUIState.kt (87%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/EditGroupRelaysUIState.kt (86%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/FeedListUIState.kt (53%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/FollowersListUIState.kt (60%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/FollowingListUIState.kt (60%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/FrostSigningUIState.kt (79%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/HomeScreenUIState.kt (53%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/KeyPackageManagementUIState.kt (74%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/MetadataEventDetailUIState.kt (51%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/NavigationUIState.kt (56%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/NostrEventDetailUIState.kt (63%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/ProposalListUIState.kt (91%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/RecoveryPhraseUIState.kt (95%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/SearchMemberToAddToChatRoomUIState.kt (67%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/SearchResultListUIState.kt (57%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/SearchUIState.kt (58%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/SelectChatRoomMembersUIState.kt (74%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/SelectChatRoomTypeUIState.kt (77%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/SelectSubgroupAdminsUIState.kt (88%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/ShareProfileUIState.kt (61%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/SignInToProfileUIState.kt (90%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/SovereignWalletUIState.kt (87%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/TranslateChunkUIState.kt (78%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/TranslationArtifactVersionDetailUIState.kt (84%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/TranslationChapterUIState.kt (81%) create mode 100644 composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/WriteNewNoteUIState.kt rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/form/ChatRoomCreationFormState.kt (74%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/form/CreateProfileFormState.kt (73%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/form/SignInToProfileFormState.kt (64%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/form/TextFieldForm.kt (86%) rename composeApp/src/commonMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/state/form/WriteNewNoteFormState.kt (64%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/ComposeAppCommonTest.kt (82%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/database/model/ChatRoomMembershipWindowTest.kt (98%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/database/model/GiftWrapMessageTest.kt (99%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/database/model/MarmotChatLineReconciliationTest.kt (99%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/database/model/MarmotCommitResultMappingTest.kt (99%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/database/model/MarmotGroupEventRoomFilterTest.kt (98%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/database/model/RumorIdAgreementTest.kt (91%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/database/model/TranscriptRequestStateTest.kt (99%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/database/model/intermdiate/ChatRoomLastMessagePreviewTest.kt (96%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/database/query/NostrEventFilterQueryTest.kt (97%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/extensions/ChatListTimestampTest.kt (98%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/managers/ChillDkgRitualOrderingTest.kt (98%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/managers/FrostSigningRoundTest.kt (98%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/managers/GroupKeyStateTest.kt (98%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/managers/LiveInstanceCacheTest.kt (99%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/managers/LiveSubscriptionPlanTest.kt (84%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/managers/LiveSubscriptionReconcileTest.kt (95%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/managers/MarmotGroupNameTest.kt (97%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/managers/MarmotMip03CarveOutTest.kt (98%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/managers/MarmotReindexSweepTest.kt (99%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/managers/SharedKeyDerivationTest.kt (97%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/managers/SignedArtifactTest.kt (96%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/managers/SignedChapterTest.kt (97%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/managers/TranslationScaffoldTest.kt (93%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/network/relays/RelayBackPressureTest.kt (97%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/network/relays/RelayPoolSubscriptionTest.kt (96%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/network/sockets/ReconnectBackoffTest.kt (98%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/nostr/GroupNostrProfileTest.kt (98%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/nostr/GroupPostTest.kt (98%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/nostr/GroupRelayListTest.kt (98%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/nostr/MarmotDeliveryTest.kt (97%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/nostr/MarmotDirectMessageDeliveryTest.kt (99%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/nostr/MarmotDirectMessageTest.kt (99%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/nostr/MemberProfileSyncTest.kt (93%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/nostr/Nip17FiltersTest.kt (95%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/nostr/chronicle/ChronicleEventTest.kt (93%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/nostr/chronicle/ChronicleRoundTripTest.kt (92%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/nostr/frost/FrostProposalCodecTest.kt (98%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/ArtifactEventTest.kt (97%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/ChapterChunkSplitTest.kt (97%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/InitialArtifactVersionTest.kt (98%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/nostr/nip30303/SubmissionEventTest.kt (98%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/nostr/subgroup/SubgroupBirthCertificateEventTest.kt (99%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/NavigationSuiteTest.kt (92%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/ui/theme/AppColorSchemeSelectionTest.kt (98%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/ui/theme/BreakpointTest.kt (99%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/ui/theme/ColorSchemeContrastTest.kt (99%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/ui/theme/PanesTest.kt (98%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/ui/theme/ReadableMeasureTest.kt (98%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/ui/theme/SpacingScaleTest.kt (99%) rename composeApp/src/commonTest/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/NavigationRoutingTest.kt (93%) delete mode 100644 composeApp/src/iosMain/kotlin/com/it/curated/compose/PlatformContext.ios.kt rename composeApp/src/iosMain/kotlin/{com/it/curated => to/curare}/compose/AppVersion.ios.kt (92%) rename composeApp/src/iosMain/kotlin/{com/it/curated => to/curare}/compose/MainViewController.kt (84%) rename composeApp/src/iosMain/kotlin/{com/it/curated => to/curare}/compose/Platform.ios.kt (72%) create mode 100644 composeApp/src/iosMain/kotlin/to/curare/compose/PlatformContext.ios.kt rename composeApp/src/iosMain/kotlin/{com/it/curated => to/curare}/compose/database/builder/PlatformDatabaseBuilder.ios.kt (76%) rename composeApp/src/iosMain/kotlin/{com/it/curated => to/curare}/compose/extensions/Phoenix.ios.kt (96%) rename composeApp/src/iosMain/kotlin/{com/it/curated => to/curare}/compose/ui/theme/Motion.ios.kt (97%) rename composeApp/src/iosMain/kotlin/{com/it/curated => to/curare}/compose/ui/theme/Theme.ios.kt (98%) rename composeApp/src/iosMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/NavigationViewModel.ios.kt (98%) rename composeApp/src/jvmMain/kotlin/{com/it/curated => to/curare}/compose/AppVersion.jvm.kt (95%) rename composeApp/src/jvmMain/kotlin/{com/it/curated => to/curare}/compose/Platform.jvm.kt (84%) rename composeApp/src/jvmMain/kotlin/{com/it/curated => to/curare}/compose/PlatformContext.jvm.kt (67%) rename composeApp/src/jvmMain/kotlin/{com/it/curated => to/curare}/compose/database/builder/PlatformDatabaseBuilder.jvm.kt (67%) rename composeApp/src/jvmMain/kotlin/{com/it/curated => to/curare}/compose/extensions/Phoenix.jvm.kt (98%) rename composeApp/src/jvmMain/kotlin/{com/it/curated => to/curare}/compose/ui/theme/Motion.jvm.kt (96%) rename composeApp/src/jvmMain/kotlin/{com/it/curated => to/curare}/compose/ui/theme/Theme.jvm.kt (98%) rename composeApp/src/jvmMain/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/NavigationViewModel.jvm.kt (98%) rename composeApp/src/jvmMain/kotlin/{com/it/curated => to/curare}/desktop/Main.kt (89%) rename composeApp/src/jvmTest/kotlin/{com/it/curated/compose/database/CuratedDatabaseJvmTest.kt => to/curare/compose/database/CurareDatabaseJvmTest.kt} (90%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/database/dao/BroadcastNostrEventRequestDaoJvmTest.kt (95%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/database/dao/ChatMessageDaoJvmTest.kt (95%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/database/dao/ChatRoomDaoJvmTest.kt (90%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/database/dao/DkgSessionDaoJvmTest.kt (93%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/database/dao/FrostSigningSessionDaoJvmTest.kt (95%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/database/dao/GroupSignedEventDaoJvmTest.kt (93%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/database/dao/MantraDaoJvmTest.kt (90%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/database/dao/MarmotKeyPackageFixture.kt (96%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/database/dao/MarmotOutboundDaoJvmTest.kt (94%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/database/dao/MarmotOutboundQueueJvmTest.kt (94%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/database/dao/MarmotPreJoinIndexingJvmTest.kt (92%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/database/dao/MarmotRetainedEpochSecretDaoJvmTest.kt (93%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/database/dao/NostrDaoJvmTest.kt (94%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/database/dao/NostrEventDaoJvmTest.kt (96%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/database/dao/NostrNip17DaoJvmTest.kt (96%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/database/dao/SubgroupDaoJvmTest.kt (94%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/database/dao/UnsignedNostrEventQueueJvmTest.kt (96%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/database/migrations/ChronicleRenameMigrationJvmTest.kt (98%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/database/migrations/FrostSigningItemMigrationJvmTest.kt (99%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/database/migrations/JoinedGroupAtMigrationJvmTest.kt (99%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/database/model/TranslationChunkApplyJvmTest.kt (96%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/database/query/NostrEventFilterQueryExecutionTest.kt (95%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/database/repository/DatabaseChatRepositoryJvmTest.kt (85%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/managers/ChapterBatchProposalJvmTest.kt (90%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/managers/ChronicleApplyJvmTest.kt (94%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/managers/ChronicleAssemblyJvmTest.kt (95%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/managers/MarmotGroupCreationJvmTest.kt (92%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/managers/RobustRoomKeyCeremonyTest.kt (96%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/managers/SignedGroupKeyStateTest.kt (97%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/managers/SubgroupCeremonyInParentRoomTest.kt (94%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/managers/SubgroupManagerJvmTest.kt (96%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/managers/TranslationBatchProposalJvmTest.kt (93%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/ui/StringCatalogueJvmTest.kt (85%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/ui/composable/ChatPaneLayoutJvmTest.kt (87%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/ui/composable/GroupKeyStateSheetLayoutJvmTest.kt (91%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/ui/composable/GroupNostrProfileSectionJvmTest.kt (93%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/ui/composable/navigation/NavigationSuiteRenderJvmTest.kt (91%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/ui/composable/widgets/ScreenStateTransitionJvmTest.kt (92%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/ui/theme/NavigationMotionJvmTest.kt (95%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/ui/theme/ReadableContentLayoutJvmTest.kt (98%) rename composeApp/src/jvmTest/kotlin/{com/it/curated => to/curare}/compose/ui/view/model/EditGroupRelaysViewModelJvmTest.kt (94%) diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts index 9451fbfc..2052140d 100644 --- a/composeApp/build.gradle.kts +++ b/composeApp/build.gradle.kts @@ -13,7 +13,7 @@ plugins { alias(libs.plugins.ksp) // No sqldelight plugin here on purpose. The fr.acinq.phoenix.db.sqldelight databases this // module used to generate are the same three lightning-kmp-app's :library generates from an - // identical copy of the .sq sources, and nothing under com.it.curated touches them. Generating + // identical copy of the .sq sources, and nothing under to.curare touches them. Generating // them on both sides put every generated class in the apk twice, which debug tolerates and // mergeDexRelease rejects as duplicate types. The library's copies are the ones that count. } @@ -159,14 +159,18 @@ kotlin { } android { - namespace = "com.it.curated.android" + namespace = "to.curare.android" compileSdk = libs.versions.android.compileSdk.get().toInt() buildFeatures { buildConfig = true } defaultConfig { - applicationId = "com.it.curated" + // The store identity and the namespace are one value again. They were split when + // the app was com.it.curated so the base package could land verbatim as the + // applicationId; the rebrand collapsed them, so `BuildConfig` and the manifest's + // relative `android:name=".CurareApplication"` resolve against this same package. + applicationId = "to.curare.android" minSdk = libs.versions.android.minSdk.get().toInt() targetSdk = libs.versions.android.targetSdk.get().toInt() versionCode = 2 @@ -243,7 +247,7 @@ val m3Audit = tasks.register("m3Audit") { val script = rootProject.layout.projectDirectory.file("docs/scripts/m3-audit.sh").asFile val uiSources = rootProject.layout.projectDirectory - .dir("composeApp/src/commonMain/kotlin/com/it/curated/compose/ui") + .dir("composeApp/src/commonMain/kotlin/to/curare/compose/ui") val projectDirectory = rootProject.layout.projectDirectory.asFile inputs.file(script).withPropertyName("auditScript") @@ -286,11 +290,11 @@ tasks.named("check") { dependsOn(m3Audit) } compose.desktop { application { - mainClass = "com.it.curated.desktop.MainKt" + mainClass = "to.curare.desktop.MainKt" nativeDistributions { targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb) - packageName = "com.it.curated.desktop" + packageName = "to.curare.desktop" packageVersion = "1.0.0" } } diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/1.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/1.json similarity index 100% rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/1.json rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/1.json diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/10.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/10.json similarity index 100% rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/10.json rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/10.json diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/11.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/11.json similarity index 100% rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/11.json rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/11.json diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/12.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/12.json similarity index 100% rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/12.json rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/12.json diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/13.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/13.json similarity index 100% rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/13.json rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/13.json diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/14.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/14.json similarity index 100% rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/14.json rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/14.json diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/15.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/15.json similarity index 100% rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/15.json rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/15.json diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/16.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/16.json similarity index 100% rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/16.json rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/16.json diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/17.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/17.json similarity index 100% rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/17.json rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/17.json diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/18.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/18.json similarity index 100% rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/18.json rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/18.json diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/19.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/19.json similarity index 100% rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/19.json rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/19.json diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/2.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/2.json similarity index 100% rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/2.json rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/2.json diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/3.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/3.json similarity index 100% rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/3.json rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/3.json diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/4.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/4.json similarity index 100% rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/4.json rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/4.json diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/5.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/5.json similarity index 100% rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/5.json rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/5.json diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/6.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/6.json similarity index 100% rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/6.json rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/6.json diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/7.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/7.json similarity index 100% rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/7.json rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/7.json diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/8.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/8.json similarity index 100% rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/8.json rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/8.json diff --git a/composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/9.json b/composeApp/schemas/to.curare.compose.database.CurareDatabase/9.json similarity index 100% rename from composeApp/schemas/com.it.curated.compose.database.CuratedDatabase/9.json rename to composeApp/schemas/to.curare.compose.database.CurareDatabase/9.json diff --git a/composeApp/src/androidMain/AndroidManifest.xml b/composeApp/src/androidMain/AndroidManifest.xml index 28f59742..b239300b 100644 --- a/composeApp/src/androidMain/AndroidManifest.xml +++ b/composeApp/src/androidMain/AndroidManifest.xml @@ -7,7 +7,7 @@ + android:name="to.curare.android.MainActivity"> diff --git a/composeApp/src/androidMain/kotlin/com/it/curated/android/CuratedApplication.kt b/composeApp/src/androidMain/kotlin/to/curare/android/CurareApplication.kt similarity index 92% rename from composeApp/src/androidMain/kotlin/com/it/curated/android/CuratedApplication.kt rename to composeApp/src/androidMain/kotlin/to/curare/android/CurareApplication.kt index cbf73289..4a02da38 100644 --- a/composeApp/src/androidMain/kotlin/com/it/curated/android/CuratedApplication.kt +++ b/composeApp/src/androidMain/kotlin/to/curare/android/CurareApplication.kt @@ -1,4 +1,4 @@ -package com.it.curated.android +package to.curare.android import android.app.Application import android.content.Context @@ -14,7 +14,7 @@ import fr.acinq.phoenix.utils.preferences.GlobalPrefs /** This datastore persists preferences across node ids. */ val Context.globalPrefs: DataStore by preferencesDataStore(name = "globalprefs") -class CuratedApplication: Application(), LightningApplication { +class CurareApplication: Application(), LightningApplication { private lateinit var globalPrefs: GlobalPrefs private lateinit var phoenixGlobal: PhoenixGlobal diff --git a/composeApp/src/androidMain/kotlin/com/it/curated/android/MainActivity.kt b/composeApp/src/androidMain/kotlin/to/curare/android/MainActivity.kt similarity index 87% rename from composeApp/src/androidMain/kotlin/com/it/curated/android/MainActivity.kt rename to composeApp/src/androidMain/kotlin/to/curare/android/MainActivity.kt index fa9ea30e..5b40aad5 100644 --- a/composeApp/src/androidMain/kotlin/com/it/curated/android/MainActivity.kt +++ b/composeApp/src/androidMain/kotlin/to/curare/android/MainActivity.kt @@ -1,4 +1,4 @@ -package com.it.curated.android +package to.curare.android import android.content.Intent import android.nfc.NfcAdapter @@ -8,9 +8,9 @@ import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge import androidx.navigation.compose.rememberNavController import fr.acinq.phoenix.NFCActivity -import com.it.curated.compose.PlatformContext -import com.it.curated.compose.CuratedApp -import com.it.curated.compose.CuratedGlobal +import to.curare.compose.PlatformContext +import to.curare.compose.CurareApp +import to.curare.compose.CurareGlobal import fr.acinq.phoenix.PhoenixGlobal import fr.acinq.phoenix.android.services.HceService @@ -25,9 +25,9 @@ class MainActivity : ComponentActivity(), NFCActivity { setContent { val navController = rememberNavController() - CuratedApp( + CurareApp( navController = navController, - curatedGlobal = CuratedGlobal( + curareGlobal = CurareGlobal( platformContext = PlatformContext( applicationContext = applicationContext ) diff --git a/composeApp/src/androidMain/kotlin/com/it/curated/compose/AppVersion.android.kt b/composeApp/src/androidMain/kotlin/to/curare/compose/AppVersion.android.kt similarity index 72% rename from composeApp/src/androidMain/kotlin/com/it/curated/compose/AppVersion.android.kt rename to composeApp/src/androidMain/kotlin/to/curare/compose/AppVersion.android.kt index 6faaf115..a9b4c177 100644 --- a/composeApp/src/androidMain/kotlin/com/it/curated/compose/AppVersion.android.kt +++ b/composeApp/src/androidMain/kotlin/to/curare/compose/AppVersion.android.kt @@ -1,6 +1,6 @@ -package com.it.curated.compose +package to.curare.compose -import com.it.curated.android.BuildConfig +import to.curare.android.BuildConfig actual object AppVersion { actual val versionName: String diff --git a/composeApp/src/androidMain/kotlin/com/it/curated/compose/Platform.android.kt b/composeApp/src/androidMain/kotlin/to/curare/compose/Platform.android.kt similarity index 60% rename from composeApp/src/androidMain/kotlin/com/it/curated/compose/Platform.android.kt rename to composeApp/src/androidMain/kotlin/to/curare/compose/Platform.android.kt index a44b6da4..a4bfa293 100644 --- a/composeApp/src/androidMain/kotlin/com/it/curated/compose/Platform.android.kt +++ b/composeApp/src/androidMain/kotlin/to/curare/compose/Platform.android.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose +package to.curare.compose import android.os.Build diff --git a/composeApp/src/androidMain/kotlin/com/it/curated/compose/PlatformContext.android.kt b/composeApp/src/androidMain/kotlin/to/curare/compose/PlatformContext.android.kt similarity index 75% rename from composeApp/src/androidMain/kotlin/com/it/curated/compose/PlatformContext.android.kt rename to composeApp/src/androidMain/kotlin/to/curare/compose/PlatformContext.android.kt index c8740099..ba72bbe2 100644 --- a/composeApp/src/androidMain/kotlin/com/it/curated/compose/PlatformContext.android.kt +++ b/composeApp/src/androidMain/kotlin/to/curare/compose/PlatformContext.android.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose +package to.curare.compose import android.content.Context diff --git a/composeApp/src/androidMain/kotlin/com/it/curated/compose/database/builder/PlatformDatabaseBuilder.android.kt b/composeApp/src/androidMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.android.kt similarity index 65% rename from composeApp/src/androidMain/kotlin/com/it/curated/compose/database/builder/PlatformDatabaseBuilder.android.kt rename to composeApp/src/androidMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.android.kt index abefc988..6f388407 100644 --- a/composeApp/src/androidMain/kotlin/com/it/curated/compose/database/builder/PlatformDatabaseBuilder.android.kt +++ b/composeApp/src/androidMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.android.kt @@ -1,22 +1,22 @@ -package com.it.curated.compose.database.builder +package to.curare.compose.database.builder import androidx.room3.Room import androidx.room3.RoomDatabase -import com.it.curated.compose.PlatformContext -import com.it.curated.compose.database.CuratedDatabase +import to.curare.compose.PlatformContext +import to.curare.compose.database.CurareDatabase actual object PlatformDatabaseBuilder { - actual fun getDatabaseBuilder(platformContext: PlatformContext): RoomDatabase.Builder { + actual fun getDatabaseBuilder(platformContext: PlatformContext): RoomDatabase.Builder { val appContext = platformContext.applicationContext val dbFile = appContext.getDatabasePath("aux.db") - return Room.databaseBuilder( + return Room.databaseBuilder( context = appContext, name = dbFile.absolutePath ) } - actual fun getInMemoryDatabaseBuilder(platform: PlatformContext): RoomDatabase.Builder { + actual fun getInMemoryDatabaseBuilder(platform: PlatformContext): RoomDatabase.Builder { return Room.inMemoryDatabaseBuilder( context = platform.applicationContext ) diff --git a/composeApp/src/androidMain/kotlin/com/it/curated/compose/extensions/Phoenix.android.kt b/composeApp/src/androidMain/kotlin/to/curare/compose/extensions/Phoenix.android.kt similarity index 89% rename from composeApp/src/androidMain/kotlin/com/it/curated/compose/extensions/Phoenix.android.kt rename to composeApp/src/androidMain/kotlin/to/curare/compose/extensions/Phoenix.android.kt index 66cecddd..7b65495e 100644 --- a/composeApp/src/androidMain/kotlin/com/it/curated/compose/extensions/Phoenix.android.kt +++ b/composeApp/src/androidMain/kotlin/to/curare/compose/extensions/Phoenix.android.kt @@ -1,6 +1,6 @@ -package com.it.curated.compose.extensions +package to.curare.compose.extensions -import com.it.curated.android.CuratedApplication +import to.curare.android.CurareApplication import fr.acinq.phoenix.PhoenixGlobal import fr.acinq.phoenix.android.BusinessManager import fr.acinq.phoenix.android.services.ChannelsWatcher @@ -23,11 +23,11 @@ actual fun schedulePlatformLogic(phoenixGlobal: PhoenixGlobal) { ContactsPhotoCleaner.schedule(phoenixGlobal.ctx.applicationContext) } actual fun getShowIntroFlow(phoenixGlobal: PhoenixGlobal): Flow { - val machankuraApplication = phoenixGlobal.ctx.applicationContext as CuratedApplication + val machankuraApplication = phoenixGlobal.ctx.applicationContext as CurareApplication return machankuraApplication.getGlobalPrefs().getShowIntro } actual fun getGlobalPrefs(phoenixGlobal: PhoenixGlobal): GlobalPrefs { - val machankuraApplication = phoenixGlobal.ctx.applicationContext as CuratedApplication + val machankuraApplication = phoenixGlobal.ctx.applicationContext as CurareApplication return machankuraApplication.getGlobalPrefs() } \ No newline at end of file diff --git a/composeApp/src/androidMain/kotlin/com/it/curated/compose/ui/theme/Motion.android.kt b/composeApp/src/androidMain/kotlin/to/curare/compose/ui/theme/Motion.android.kt similarity index 98% rename from composeApp/src/androidMain/kotlin/com/it/curated/compose/ui/theme/Motion.android.kt rename to composeApp/src/androidMain/kotlin/to/curare/compose/ui/theme/Motion.android.kt index f862c472..e7f9475d 100644 --- a/composeApp/src/androidMain/kotlin/com/it/curated/compose/ui/theme/Motion.android.kt +++ b/composeApp/src/androidMain/kotlin/to/curare/compose/ui/theme/Motion.android.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.theme +package to.curare.compose.ui.theme import android.database.ContentObserver import android.provider.Settings diff --git a/composeApp/src/androidMain/kotlin/com/it/curated/compose/ui/theme/Theme.android.kt b/composeApp/src/androidMain/kotlin/to/curare/compose/ui/theme/Theme.android.kt similarity index 98% rename from composeApp/src/androidMain/kotlin/com/it/curated/compose/ui/theme/Theme.android.kt rename to composeApp/src/androidMain/kotlin/to/curare/compose/ui/theme/Theme.android.kt index 543248b0..d811a28f 100644 --- a/composeApp/src/androidMain/kotlin/com/it/curated/compose/ui/theme/Theme.android.kt +++ b/composeApp/src/androidMain/kotlin/to/curare/compose/ui/theme/Theme.android.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.theme +package to.curare.compose.ui.theme import android.app.UiModeManager import android.content.Context diff --git a/composeApp/src/androidMain/kotlin/com/it/curated/compose/ui/view/model/NavigationViewModel.android.kt b/composeApp/src/androidMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.android.kt similarity index 95% rename from composeApp/src/androidMain/kotlin/com/it/curated/compose/ui/view/model/NavigationViewModel.android.kt rename to composeApp/src/androidMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.android.kt index d289818c..17947250 100644 --- a/composeApp/src/androidMain/kotlin/com/it/curated/compose/ui/view/model/NavigationViewModel.android.kt +++ b/composeApp/src/androidMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.android.kt @@ -1,7 +1,7 @@ -package com.it.curated.compose.ui.view.model +package to.curare.compose.ui.view.model -import com.it.curated.android.CuratedApplication -import com.it.curated.compose.AppVersion +import to.curare.android.CurareApplication +import to.curare.compose.AppVersion import co.touchlab.kermit.Logger import fr.acinq.bitcoin.MnemonicCode import fr.acinq.lightning.crypto.LocalKeyManager @@ -35,12 +35,12 @@ actual fun loadAndDecryptSeed(phoenixGlobal: PhoenixGlobal): DecryptSeedResult { } actual fun getAvailableWalletsMeta(phoenixGlobal: PhoenixGlobal): Flow> { - val machankuraApplication = phoenixGlobal.ctx.applicationContext as CuratedApplication + val machankuraApplication = phoenixGlobal.ctx.applicationContext as CurareApplication return machankuraApplication.getGlobalPrefs().getAvailableWalletsMeta } actual suspend fun saveAvailableWalletMeta(phoenixGlobal: PhoenixGlobal, metadata: UserWalletMetadata) { - val machankuraApplication = phoenixGlobal.ctx.applicationContext as CuratedApplication + val machankuraApplication = phoenixGlobal.ctx.applicationContext as CurareApplication machankuraApplication.getGlobalPrefs().saveAvailableWalletMeta(metadata) } @@ -51,7 +51,7 @@ actual suspend fun saveAvailableWalletMeta( avatar: String, isHidden: Boolean ) { - val machankuraApplication = phoenixGlobal.ctx.applicationContext as CuratedApplication + val machankuraApplication = phoenixGlobal.ctx.applicationContext as CurareApplication 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 e8a3baa4..2fe49528 100644 --- a/composeApp/src/androidMain/res/values/strings.xml +++ b/composeApp/src/androidMain/res/values/strings.xml @@ -1,5 +1,5 @@ a - Curated + Curare 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 945ed945..25ea8758 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 "Curated". + which is what AndroidManifest.xml points at. Both now say "Curare". Externalising the 334 is the rest of phase 4 in docs/material-design-conformance.md. They land here. @@ -20,7 +20,7 @@ an em dash or a comma. The compose resources plugin reports that only as "XML file ... is not valid. Check the file content." --> - Curated + Curare Add a dialect the group can translate into Add artifact to library Add artifact to the group library @@ -109,7 +109,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 Curated or just want to create a fresh profile + If you are new to Curare or just want to create a fresh profile Initial version label Input npub... or nip05 Introduce yourself @@ -141,7 +141,7 @@ Lose this phone before you do, and the profile goes with it. Lock prompt coming soon. Malformed note - Curated + Curare Members members Name @@ -228,9 +228,9 @@ This device holds the group's reading of this, but not the signed event itself. Nothing here can be checked against a signature. Sign Sign in - Sign in is not yet available while Curated is in alpha testing. + Sign in is not yet available while Curare is in alpha testing. Sign in to nsec - Sign in to Curated via nsec, or remote signer + Sign in to Curare via nsec, or remote signer Sign in with an npub Sign out Sign with the group's key @@ -255,7 +255,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 Curated 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 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. 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. @@ -272,7 +272,7 @@ This will be the display name for your profile and also important for search. This will give you read only access to the profile. This will give you write access to the profile. - Curated broadcasts what you publish to a distributed set of relays, so it stays decentralised. + Curare broadcasts what you publish to a distributed set of relays, so it stays decentralised. Translate chunk Translate into which dialect? Translated text @@ -353,7 +353,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 Curated. + %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 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 diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/CuratedGlobal.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/CuratedGlobal.kt deleted file mode 100644 index 60a6ad2b..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/CuratedGlobal.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.it.curated.compose - -class CuratedGlobal( - val platformContext: PlatformContext -) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/Platform.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/Platform.kt deleted file mode 100644 index 5ba326bc..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/Platform.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.it.curated.compose - -interface Platform { - val name: String -} - -expect fun getPlatform(): Platform \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/PlatformContext.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/PlatformContext.kt deleted file mode 100644 index 2f785f3f..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/PlatformContext.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.it.curated.compose - -expect class PlatformContext \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/CuratedDatabaseConstructor.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/CuratedDatabaseConstructor.kt deleted file mode 100644 index 46a6913a..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/CuratedDatabaseConstructor.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.it.curated.compose.database - -import androidx.room3.RoomDatabaseConstructor - -@Suppress("KotlinNoActualForExpect", "NO_ACTUAL_FOR_EXPECT") -expect object CuratedDatabaseConstructor: RoomDatabaseConstructor { - - override fun initialize(): CuratedDatabase -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/BroadcastNostrEventReceiptDao.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/BroadcastNostrEventReceiptDao.kt deleted file mode 100644 index ae059c4f..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/BroadcastNostrEventReceiptDao.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.it.curated.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.it.curated.compose.database.model.BroadcastNostrEventReceipt): Long -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ChatMessageNostrEventRelationDao.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ChatMessageNostrEventRelationDao.kt deleted file mode 100644 index a1405c19..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ChatMessageNostrEventRelationDao.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.it.curated.compose.database.dao - -import androidx.room3.Dao -import androidx.room3.Upsert - -@Dao -interface ChatMessageNostrEventRelationDao { - - @Upsert - suspend fun upsert(chatMessageNostrEventRelation: com.it.curated.compose.database.model.ChatMessageNostrEventRelation) -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/GiftWrapMessageDao.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/GiftWrapMessageDao.kt deleted file mode 100644 index 4c30a9e4..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/GiftWrapMessageDao.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.it.curated.compose.database.dao - -import androidx.room3.Dao -import androidx.room3.Query -import androidx.room3.Upsert - -@Dao -interface GiftWrapMessageDao { - @Query("SELECT * FROM GiftWrapMessage") - suspend fun getAllGiftWrapMessages(): List - - @Upsert - suspend fun upsert(giftWrapMessage: com.it.curated.compose.database.model.GiftWrapMessage) - -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/GiftWrapSealDao.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/GiftWrapSealDao.kt deleted file mode 100644 index 9692185e..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/GiftWrapSealDao.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.it.curated.compose.database.dao - -import androidx.room3.Dao -import androidx.room3.Query -import androidx.room3.Upsert - -@Dao -interface GiftWrapSealDao { - @Query("SELECT * FROM GiftWrapSeal") - suspend fun getAllGiftWrapSeals(): List - - @Upsert - suspend fun upsert(giftWrapSeal: com.it.curated.compose.database.model.GiftWrapSeal) - -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/NegentropySynchronizeResultDao.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/NegentropySynchronizeResultDao.kt deleted file mode 100644 index 8316ec97..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/NegentropySynchronizeResultDao.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.it.curated.compose.database.dao - -import androidx.room3.Dao -import androidx.room3.Upsert - -@Dao -interface NegentropySynchronizeResultDao { - @Upsert - suspend fun upsert(negentropySynchronizeResult: com.it.curated.compose.database.model.NegentropySynchronizeResult) -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/NostrEventRelayDao.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/NostrEventRelayDao.kt deleted file mode 100644 index 41d8e88b..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/NostrEventRelayDao.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.it.curated.compose.database.dao - -import androidx.room3.Dao -import androidx.room3.Upsert - -@Dao -interface NostrEventRelayDao { - - @Upsert - suspend fun upsert(nostrEventRelay: com.it.curated.compose.database.model.NostrEventRelay) - -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/PostDao.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/PostDao.kt deleted file mode 100644 index 6496a691..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/PostDao.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.it.curated.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.it.curated.compose.database.model.Post? - - @Insert - suspend fun insert(post: com.it.curated.compose.database.model.Post) - - @Upsert - suspend fun upsert(post: com.it.curated.compose.database.model.Post) -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ReactionDao.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ReactionDao.kt deleted file mode 100644 index 6b01d779..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ReactionDao.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.it.curated.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.it.curated.compose.database.model.Reaction) -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/RecentSearchDao.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/RecentSearchDao.kt deleted file mode 100644 index 8b72682f..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/RecentSearchDao.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.it.curated.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.it.curated.compose.database.model.RecentSearch) - - @Upsert - suspend fun upsert(recentSearch: com.it.curated.compose.database.model.RecentSearch) -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/RelayDao.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/RelayDao.kt deleted file mode 100644 index 7ca357d4..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/RelayDao.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.it.curated.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.it.curated.compose.database.model.Relay) - -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/SynchronizeNostrEventResultDao.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/SynchronizeNostrEventResultDao.kt deleted file mode 100644 index f34f0e26..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/SynchronizeNostrEventResultDao.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.it.curated.compose.database.dao - -import androidx.room3.Dao -import androidx.room3.Upsert - -@Dao -interface SynchronizeNostrEventResultDao { - @Upsert - suspend fun upsert(synchronizeNostrEventResult: com.it.curated.compose.database.model.SynchronizeNostrEventResult) -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalAccount.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalAccount.kt deleted file mode 100644 index 40a18b20..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalAccount.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.it.curated.compose.database.model.intermdiate - -import androidx.room3.Embedded -import androidx.room3.Relation - -data class LocalAccount( - @Embedded val unsignedNostrEvent: com.it.curated.compose.database.model.UnsignedNostrEvent?, - - @Relation( - parentColumns = ["id"], - entityColumns = ["unsignedNostrEventId"] - ) - val nostrEvent: com.it.curated.compose.database.model.NostrEvent?, - - @Relation( - parentColumns = ["pubKey"], - entityColumns = ["publicKey"] - ) - val profile: com.it.curated.compose.database.model.Profile?, - - @Relation( - parentColumns = ["id"], - entityColumns = ["unsignedNostrEventId"] - ) - val broadcastNostrEventRequest: com.it.curated.compose.database.model.BroadcastNostrEventRequest?, - - @Relation( - parentColumns = ["id"], - entityColumns = ["unsignedNostrEventId"] - ) - val broadcastNostrEventReceipt: com.it.curated.compose.database.model.BroadcastNostrEventReceipt?, - - @Relation( - parentColumns = ["id"], - entityColumns = ["unsignedNostrEventId"] - ) - val synchronizeNostrEventRequests: List, - - ) diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalBroadcastNostrEventRequest.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalBroadcastNostrEventRequest.kt deleted file mode 100644 index acaf7774..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalBroadcastNostrEventRequest.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.it.curated.compose.database.model.intermdiate - -import androidx.room3.Embedded -import androidx.room3.Relation - -data class LocalBroadcastNostrEventRequest( - @Embedded val broadcastNostrEventRequest: com.it.curated.compose.database.model.BroadcastNostrEventRequest, - - @Relation( - parentColumns = ["nostrEventId"], - entityColumns = ["id"] - ) - val nostrEvent: com.it.curated.compose.database.model.NostrEvent, -) diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalChatMessage.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalChatMessage.kt deleted file mode 100644 index 808e7894..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalChatMessage.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.it.curated.compose.database.model.intermdiate - -import androidx.room3.Embedded -import androidx.room3.Relation - -data class LocalChatMessage( - @Embedded val chatMessage: com.it.curated.compose.database.model.ChatMessage, - - @Relation( - parentColumns = ["senderPublicKey"], - entityColumns = ["publicKey"] - ) - val profile: com.it.curated.compose.database.model.Profile?, - - @Relation( - parentColumns = ["id"], - entityColumns = ["chatMessageId"] - ) - val chatMessageBroadcastNostrEventReceiptRelation: com.it.curated.compose.database.model.ChatMessageBroadcastNostrEventReceiptRelation? = null, - - - @Relation( - parentColumns = ["id"], - entityColumns = ["chatMessageId"] - ) - val chatMessageBroadcastNostrEventRequestRelation: com.it.curated.compose.database.model.ChatMessageBroadcastNostrEventRequestRelation? = null, - - - @Relation( - parentColumns = ["id"], - entityColumns = ["chatMessageId"] - ) - val chatMessageNostrEventRelation: com.it.curated.compose.database.model.ChatMessageNostrEventRelation? = null, -) diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/typealiases/HexArray.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/typealiases/HexArray.kt deleted file mode 100644 index f44e8497..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/typealiases/HexArray.kt +++ /dev/null @@ -1,4 +0,0 @@ -package com.it.curated.compose.database.model.typealiases - -typealias HexArray = Array - diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/typealiases/KindArray.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/typealiases/KindArray.kt deleted file mode 100644 index da6d9a4b..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/typealiases/KindArray.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.it.curated.compose.database.model.typealiases - -typealias KindArray = Array \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/typealiases/SynchronizationFilterArray.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/typealiases/SynchronizationFilterArray.kt deleted file mode 100644 index b20fa5cf..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/typealiases/SynchronizationFilterArray.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.it.curated.compose.database.model.typealiases - -typealias SynchronizationFilterArray = Array \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabasePostRepository.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabasePostRepository.kt deleted file mode 100644 index 847d0516..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabasePostRepository.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.it.curated.compose.database.repository - -class DatabasePostRepository( - private val database: com.it.curated.compose.database.CuratedDatabase -): com.it.curated.compose.repository.PostRepository \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabaseSearchRepository.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabaseSearchRepository.kt deleted file mode 100644 index f2a11006..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabaseSearchRepository.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.it.curated.compose.database.repository - -class DatabaseSearchRepository( - private val database: com.it.curated.compose.database.CuratedDatabase -): com.it.curated.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/it/curated/compose/exceptions/GiftWrapImpersonationException.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/GiftWrapImpersonationException.kt deleted file mode 100644 index 412aa8bc..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/GiftWrapImpersonationException.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.it.curated.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/it/curated/compose/exceptions/GiftWrapPayloadUnsupportedException.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/GiftWrapPayloadUnsupportedException.kt deleted file mode 100644 index 3c58d9cb..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/GiftWrapPayloadUnsupportedException.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.it.curated.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/it/curated/compose/exceptions/GiftWrapSealDecryptionException.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/GiftWrapSealDecryptionException.kt deleted file mode 100644 index 2c059f6f..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/GiftWrapSealDecryptionException.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.it.curated.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/it/curated/compose/exceptions/GiftWrapUnsealException.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/GiftWrapUnsealException.kt deleted file mode 100644 index e418f800..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/GiftWrapUnsealException.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.it.curated.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/it/curated/compose/exceptions/InvalidNostrPrivateKeyException.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/InvalidNostrPrivateKeyException.kt deleted file mode 100644 index 9fe2148e..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/InvalidNostrPrivateKeyException.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.it.curated.compose.exceptions - -class InvalidNostrPrivateKeyException: RuntimeException() \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/SignatureException.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/SignatureException.kt deleted file mode 100644 index c9b9db35..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/SignatureException.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.it.curated.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/com/it/curated/compose/exceptions/SigningRejectedException.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/SigningRejectedException.kt deleted file mode 100644 index 924cef10..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/SigningRejectedException.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.it.curated.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/com/it/curated/compose/managers/AuxDatabaseManager.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/AuxDatabaseManager.kt deleted file mode 100644 index 80a9734d..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/AuxDatabaseManager.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.it.curated.compose.managers - -class AuxDatabaseManager( - curatedGlobal: com.it.curated.compose.CuratedGlobal -) { - val auxDatabase by lazy { - com.it.curated.compose.database.builder.getRoomDatabase( - com.it.curated.compose.database.builder.PlatformDatabaseBuilder.getDatabaseBuilder( - curatedGlobal.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.it.curated.compose.database.builder.getRoomDatabase( - com.it.curated.compose.database.builder.PlatformDatabaseBuilder.getInMemoryDatabaseBuilder( - curatedGlobal.platformContext - ) - ) - } -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/UserAgent.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/UserAgent.kt deleted file mode 100644 index 555ca72b..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/UserAgent.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.it.curated.compose.network - -object UserAgent { - const val APP_NAME = "Curated" - const val CLIENT_NAME = "Curated" -} - -fun String.asClientTag(): Array = arrayOf( - "client", - this -) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/CachingImportRepository.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/CachingImportRepository.kt deleted file mode 100644 index a05fa291..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/CachingImportRepository.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.it.curated.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.it.curated.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.it.curated.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/com/it/curated/compose/repository/PostRepository.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/PostRepository.kt deleted file mode 100644 index 8688aa92..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/PostRepository.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.it.curated.compose.repository - -interface PostRepository \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/AuthenticatedProfileRoute.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/AuthenticatedProfileRoute.kt deleted file mode 100644 index b000d0c8..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/AuthenticatedProfileRoute.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.it.curated.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/it/curated/compose/ui/composable/navigation/routes/BlankRoute.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/BlankRoute.kt deleted file mode 100755 index 08c93cf4..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/BlankRoute.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.it.curated.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/com/it/curated/compose/ui/composable/navigation/routes/LandingRoute.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/LandingRoute.kt deleted file mode 100755 index 7ad3420a..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/LandingRoute.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.it.curated.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/com/it/curated/compose/ui/composable/navigation/routes/Route.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/Route.kt deleted file mode 100755 index 36a50957..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/Route.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.it.curated.compose.ui.composable.navigation.routes - -abstract class Route \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SignInRoute.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SignInRoute.kt deleted file mode 100755 index 975c187a..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SignInRoute.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.it.curated.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/com/it/curated/compose/ui/composable/navigation/routes/SovereignWalletStartupRoute.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SovereignWalletStartupRoute.kt deleted file mode 100644 index e553eecc..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SovereignWalletStartupRoute.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.it.curated.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/com/it/curated/compose/ui/view/state/WriteNewNoteUIState.kt b/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/WriteNewNoteUIState.kt deleted file mode 100644 index d39cdba8..00000000 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/WriteNewNoteUIState.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.it.curated.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.it.curated.compose.database.model.intermdiate.LocalProfileWithFollowing, - val inReplyToNostrEvent: com.it.curated.compose.database.model.intermdiate.LocalNostrEvent? = null, - val quotedNostrEvent: com.it.curated.compose.database.model.intermdiate.LocalNostrEvent? = null, - val replayToId: HexKey? = null, - ): WriteNewNoteUIState() - - data class ConfirmNote( - val localProfile: com.it.curated.compose.database.model.intermdiate.LocalProfileWithFollowing, - val inReplyToNostrEvent: com.it.curated.compose.database.model.intermdiate.LocalNostrEvent? = null, - val quotedNostrEvent: com.it.curated.compose.database.model.intermdiate.LocalNostrEvent? = null, - val text: String, - ) : WriteNewNoteUIState() - -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/AppLifecycle.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/AppLifecycle.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/AppLifecycle.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/AppLifecycle.kt index b0e14c0e..d89e87d8 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/AppLifecycle.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/AppLifecycle.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose +package to.curare.compose import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/AppVersion.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/AppVersion.kt similarity index 78% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/AppVersion.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/AppVersion.kt index c55b6d40..30ed2ebf 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/AppVersion.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/AppVersion.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose +package to.curare.compose expect object AppVersion { val versionName: String diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/CuratedApp.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/CurareApp.kt similarity index 72% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/CuratedApp.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/CurareApp.kt index 0eb309de..f60492f6 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/CuratedApp.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/CurareApp.kt @@ -1,22 +1,22 @@ -package com.it.curated.compose +package to.curare.compose import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material3.Surface import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.navigation.NavHostController -import com.it.curated.compose.ui.composable.navigation.CuratedNavHost -import com.it.curated.compose.ui.composable.widgets.ProvideSnackbarHost -import com.it.curated.compose.ui.theme.CuratedTheme +import to.curare.compose.ui.composable.navigation.CurareNavHost +import to.curare.compose.ui.composable.widgets.ProvideSnackbarHost +import to.curare.compose.ui.theme.CurareTheme import fr.acinq.phoenix.PhoenixGlobal @Composable -fun CuratedApp( +fun CurareApp( navController: NavHostController, - curatedGlobal: CuratedGlobal, + curareGlobal: CurareGlobal, phoenixGlobal: PhoenixGlobal ) { - CuratedTheme { + CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { @@ -26,8 +26,8 @@ fun CuratedApp( // outcome does not have to be handed a state through the parameter list of // every composable between it and the Scaffold. ProvideSnackbarHost { - CuratedNavHost( - curatedGlobal = curatedGlobal, + CurareNavHost( + curareGlobal = curareGlobal, phoenixGlobal = phoenixGlobal, navController = navController ) diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/CurareGlobal.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/CurareGlobal.kt new file mode 100644 index 00000000..93640f1a --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/CurareGlobal.kt @@ -0,0 +1,5 @@ +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 new file mode 100644 index 00000000..907a6096 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/Platform.kt @@ -0,0 +1,7 @@ +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 new file mode 100644 index 00000000..ff4fdede --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/PlatformContext.kt @@ -0,0 +1,3 @@ +package to.curare.compose + +expect class PlatformContext \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/cryptography/Extensions.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/cryptography/Extensions.kt similarity index 77% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/cryptography/Extensions.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/cryptography/Extensions.kt index b3436113..f0276a2d 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/cryptography/Extensions.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/cryptography/Extensions.kt @@ -1,6 +1,6 @@ -package com.it.curated.compose.cryptography +package to.curare.compose.cryptography -import com.it.curated.compose.database.model.NostrEvent +import to.curare.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 com.it.curated.compose.database.model.UnsignedNostrEvent.signOrThrow(nsec: String): NostrEvent { +fun to.curare.compose.database.model.UnsignedNostrEvent.signOrThrow(nsec: String): NostrEvent { val hexPrivateKey = Bech32.decodeBytes(nsec).second return this.signOrThrow(hexPrivateKey) } -fun com.it.curated.compose.database.model.UnsignedNostrEvent.signOrThrow(hexPrivateKey: ByteArray): NostrEvent { +fun to.curare.compose.database.model.UnsignedNostrEvent.signOrThrow(hexPrivateKey: ByteArray): NostrEvent { val tempSigner = NostrSignerSync( KeyPair( privKey = hexPrivateKey diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/CuratedDatabase.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/CurareDatabase.kt similarity index 67% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/CuratedDatabase.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/CurareDatabase.kt index 638890d3..bf5c84e7 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/CuratedDatabase.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/CurareDatabase.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database +package to.curare.compose.database import androidx.room3.ColumnTypeConverters import androidx.room3.AutoMigration @@ -6,116 +6,116 @@ import androidx.room3.Database import androidx.room3.RoomDatabase import androidx.room3.immediateTransaction import androidx.room3.useWriterConnection -import com.it.curated.compose.database.converters.CuratedConverters -import com.it.curated.compose.database.dao.BroadcastNostrEventReceiptDao -import com.it.curated.compose.database.dao.BroadcastNostrEventRequestDao -import com.it.curated.compose.database.dao.ChatMessageBroadcastNostrEventReceiptRelationDao -import com.it.curated.compose.database.dao.ChatMessageBroadcastNostrEventRequestRelationDao -import com.it.curated.compose.database.dao.ChatMessageDao -import com.it.curated.compose.database.dao.ChatMessageNostrEventRelationDao -import com.it.curated.compose.database.dao.ChatRoomDao -import com.it.curated.compose.database.dao.ConnectionDao -import com.it.curated.compose.database.dao.DkgSessionDao -import com.it.curated.compose.database.dao.FrostSigningSessionDao -import com.it.curated.compose.database.dao.GiftWrapMessageDao -import com.it.curated.compose.database.dao.GiftWrapPayloadDao -import com.it.curated.compose.database.dao.GiftWrapSealDao -import com.it.curated.compose.database.dao.GroupKeyStateDao -import com.it.curated.compose.database.dao.GroupSignedEventDao -import com.it.curated.compose.database.dao.InReplyToRelationDao -import com.it.curated.compose.database.dao.MantraArtifactDao -import com.it.curated.compose.database.dao.MantraArtifactVersionDao -import com.it.curated.compose.database.dao.MantraChapterDao -import com.it.curated.compose.database.dao.MantraChunkDao -import com.it.curated.compose.database.dao.MantraDao -import com.it.curated.compose.database.dao.MantraDialectDao -import com.it.curated.compose.database.dao.MantraTranslationArtifactVersionDao -import com.it.curated.compose.database.dao.MantraTranslationArtifactVersionContributorDao -import com.it.curated.compose.database.dao.MantraTranslationChapterDao -import com.it.curated.compose.database.dao.MantraTranslationChapterContributorDao -import com.it.curated.compose.database.dao.MantraTranslationChunkDao -import com.it.curated.compose.database.dao.MantraTranslationDao -import com.it.curated.compose.database.dao.MantraTranslationContributorDao -import com.it.curated.compose.database.dao.MarmotCommitResultDao -import com.it.curated.compose.database.dao.MarmotOutboundDao -import com.it.curated.compose.database.dao.MarmotGroupEventDao -import com.it.curated.compose.database.dao.MarmotInnerEventDao -import com.it.curated.compose.database.dao.MarmotKeyPackageBundleDao -import com.it.curated.compose.database.dao.MarmotKeyPackageDao -import com.it.curated.compose.database.dao.MarmotRetainedEpochSecretDao -import com.it.curated.compose.database.dao.MentionDao -import com.it.curated.compose.database.dao.NegentropySynchronizeRequestDao -import com.it.curated.compose.database.dao.NegentropySynchronizeResultDao -import com.it.curated.compose.database.dao.NostrDao -import com.it.curated.compose.database.dao.NostrEventDao -import com.it.curated.compose.database.dao.NostrEventRelayDao -import com.it.curated.compose.database.dao.NostrNip17Dao -import com.it.curated.compose.database.dao.ParticipantDao -import com.it.curated.compose.database.dao.PostDao -import com.it.curated.compose.database.dao.ProfileDao -import com.it.curated.compose.database.dao.QuotedRelationDao -import com.it.curated.compose.database.dao.ReactionDao -import com.it.curated.compose.database.dao.RecentSearchDao -import com.it.curated.compose.database.dao.RelayDao -import com.it.curated.compose.database.dao.RepostedRelationDao -import com.it.curated.compose.database.dao.SynchronizeNostrEventRequestDao -import com.it.curated.compose.database.dao.SynchronizeNostrEventResultDao -import com.it.curated.compose.database.dao.UnsignedNostrEventDao -import com.it.curated.compose.database.dao.ZapDao -import com.it.curated.compose.database.model.BroadcastNostrEventReceipt -import com.it.curated.compose.database.model.BroadcastNostrEventRequest -import com.it.curated.compose.database.model.ChatMessage -import com.it.curated.compose.database.model.ChatMessageBroadcastNostrEventReceiptRelation -import com.it.curated.compose.database.model.ChatMessageBroadcastNostrEventRequestRelation -import com.it.curated.compose.database.model.ChatMessageNostrEventRelation -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.Connection -import com.it.curated.compose.database.model.GiftWrapMessage -import com.it.curated.compose.database.model.GiftWrapPayload -import com.it.curated.compose.database.model.GiftWrapSeal -import com.it.curated.compose.database.model.GroupKeyState -import com.it.curated.compose.database.model.GroupSignedEvent -import com.it.curated.compose.database.model.InReplyToRelation -import com.it.curated.compose.database.model.MantraArtifact -import com.it.curated.compose.database.model.MantraArtifactVersion -import com.it.curated.compose.database.model.MantraChapter -import com.it.curated.compose.database.model.MantraChunk -import com.it.curated.compose.database.model.MantraDialect -import com.it.curated.compose.database.model.MantraTranslation -import com.it.curated.compose.database.model.MantraTranslationArtifactVersion -import com.it.curated.compose.database.model.MantraTranslationArtifactVersionContributor -import com.it.curated.compose.database.model.MantraTranslationChapter -import com.it.curated.compose.database.model.MantraTranslationChapterContributor -import com.it.curated.compose.database.model.MantraTranslationChunk -import com.it.curated.compose.database.model.MantraTranslationContributor -import com.it.curated.compose.database.model.MarmotCommitResult -import com.it.curated.compose.database.model.MarmotGroupEvent -import com.it.curated.compose.database.model.MarmotInnerEvent -import com.it.curated.compose.database.model.MarmotKeyPackage -import com.it.curated.compose.database.model.MarmotKeyPackageBundle -import com.it.curated.compose.database.model.MarmotRetainedEpochSecret -import com.it.curated.compose.database.model.Mention -import com.it.curated.compose.database.model.NegentropySynchronizeRequest -import com.it.curated.compose.database.model.NegentropySynchronizeResult -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.NostrEventRelay -import com.it.curated.compose.database.model.Participant -import com.it.curated.compose.database.model.Post -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.QuotedRelation -import com.it.curated.compose.database.model.Reaction -import com.it.curated.compose.database.model.RecentSearch -import com.it.curated.compose.database.model.DkgParticipantMessage -import com.it.curated.compose.database.model.DkgSession -import com.it.curated.compose.database.model.FrostSignerMessage -import com.it.curated.compose.database.model.FrostSigningItem -import com.it.curated.compose.database.model.FrostSigningSession -import com.it.curated.compose.database.model.Relay -import com.it.curated.compose.database.model.RepostedRelation -import com.it.curated.compose.database.model.SynchronizeNostrEventRequest -import com.it.curated.compose.database.model.SynchronizeNostrEventResult -import com.it.curated.compose.database.model.UnsignedNostrEvent -import com.it.curated.compose.database.model.Zap +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.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.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 kotlin.time.Instant val GENESIS_AT = Instant.fromEpochMilliseconds(1231006505000L) @@ -314,8 +314,8 @@ val GENESIS_AT = Instant.fromEpochMilliseconds(1231006505000L) AutoMigration(from = 18, to = 19), ] ) -@ColumnTypeConverters(CuratedConverters::class) -abstract class CuratedDatabase: RoomDatabase() { +@ColumnTypeConverters(CurareConverters::class) +abstract class CurareDatabase: RoomDatabase() { abstract fun broadcastNostrEventReceiptDao(): BroadcastNostrEventReceiptDao abstract fun broadcastNostrEventRequestDao(): BroadcastNostrEventRequestDao diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/CurareDatabaseConstructor.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/CurareDatabaseConstructor.kt new file mode 100644 index 00000000..e9a959e9 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/CurareDatabaseConstructor.kt @@ -0,0 +1,9 @@ +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/com/it/curated/compose/database/builder/PlatformDatabaseBuilder.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.kt similarity index 55% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/builder/PlatformDatabaseBuilder.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.kt index 64a66d37..2afdb272 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/builder/PlatformDatabaseBuilder.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.kt @@ -1,23 +1,23 @@ -package com.it.curated.compose.database.builder +package to.curare.compose.database.builder import androidx.room3.RoomDatabase import androidx.sqlite.driver.bundled.BundledSQLiteDriver -import com.it.curated.compose.database.migrations.MIGRATION_3_4 -import com.it.curated.compose.database.migrations.MIGRATION_9_10 -import com.it.curated.compose.database.migrations.MIGRATION_13_14 -import com.it.curated.compose.database.migrations.MIGRATION_14_15 +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 kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO expect object PlatformDatabaseBuilder { - fun getDatabaseBuilder(platformContext: com.it.curated.compose.PlatformContext): RoomDatabase.Builder + fun getDatabaseBuilder(platformContext: to.curare.compose.PlatformContext): RoomDatabase.Builder - fun getInMemoryDatabaseBuilder(platform: com.it.curated.compose.PlatformContext): RoomDatabase.Builder + fun getInMemoryDatabaseBuilder(platform: to.curare.compose.PlatformContext): RoomDatabase.Builder } fun getRoomDatabase( - builder: RoomDatabase.Builder -): com.it.curated.compose.database.CuratedDatabase { + builder: RoomDatabase.Builder +): to.curare.compose.database.CurareDatabase { 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/com/it/curated/compose/database/converters/CuratedConverters.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/converters/CurareConverters.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/converters/CuratedConverters.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/converters/CurareConverters.kt index c4c8cb5a..4172ae73 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/converters/CuratedConverters.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/converters/CurareConverters.kt @@ -1,13 +1,13 @@ -package com.it.curated.compose.database.converters +package to.curare.compose.database.converters import androidx.room3.ColumnTypeConverter -import com.it.curated.compose.database.model.types.SynchronizationFilter +import to.curare.compose.database.model.types.SynchronizationFilter import co.touchlab.kermit.Logger import kotlinx.serialization.json.Json import kotlin.time.Instant -class CuratedConverters { - val logger = Logger.withTag("CuratedConverters") +class CurareConverters { + val logger = Logger.withTag("CurareConverters") @ColumnTypeConverter fun fromTimestamp(value: Long?): Instant? { 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 new file mode 100644 index 00000000..117824db --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/BroadcastNostrEventReceiptDao.kt @@ -0,0 +1,21 @@ +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/com/it/curated/compose/database/dao/BroadcastNostrEventRequestDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/BroadcastNostrEventRequestDao.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/BroadcastNostrEventRequestDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/BroadcastNostrEventRequestDao.kt index b4eb79d1..343ebcbd 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/BroadcastNostrEventRequestDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/BroadcastNostrEventRequestDao.kt @@ -1,11 +1,11 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Insert import androidx.room3.Query import androidx.room3.Upsert -import com.it.curated.compose.database.model.BroadcastNostrEventRequest -import com.it.curated.compose.database.model.intermdiate.LocalBroadcastNostrEventRequest +import to.curare.compose.database.model.BroadcastNostrEventRequest +import to.curare.compose.database.model.intermdiate.LocalBroadcastNostrEventRequest import kotlinx.coroutines.flow.Flow import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ChatMessageBroadcastNostrEventReceiptRelationDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatMessageBroadcastNostrEventReceiptRelationDao.kt similarity index 59% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ChatMessageBroadcastNostrEventReceiptRelationDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatMessageBroadcastNostrEventReceiptRelationDao.kt index 9c677061..5a54d24a 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ChatMessageBroadcastNostrEventReceiptRelationDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatMessageBroadcastNostrEventReceiptRelationDao.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.dao +package to.curare.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: com.it.curated.compose.database.model.ChatMessageBroadcastNostrEventReceiptRelation) + suspend fun upsert(chatMessageBroadcastNostrEventReceiptRelation: to.curare.compose.database.model.ChatMessageBroadcastNostrEventReceiptRelation) } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ChatMessageBroadcastNostrEventRequestRelationDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatMessageBroadcastNostrEventRequestRelationDao.kt similarity index 81% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ChatMessageBroadcastNostrEventRequestRelationDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatMessageBroadcastNostrEventRequestRelationDao.kt index 6a8b9c58..4dda3434 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ChatMessageBroadcastNostrEventRequestRelationDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatMessageBroadcastNostrEventRequestRelationDao.kt @@ -1,9 +1,9 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Query import androidx.room3.Upsert -import com.it.curated.compose.database.model.ChatMessageBroadcastNostrEventRequestRelation +import to.curare.compose.database.model.ChatMessageBroadcastNostrEventRequestRelation @Dao interface ChatMessageBroadcastNostrEventRequestRelationDao { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ChatMessageDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatMessageDao.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ChatMessageDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatMessageDao.kt index 9a87f183..7fdeb465 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ChatMessageDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatMessageDao.kt @@ -1,10 +1,10 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Query import androidx.room3.Transaction import androidx.room3.Upsert -import com.it.curated.compose.database.model.ChatMessage +import to.curare.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. [com.it.curated.compose.database.converters.CuratedConverters] + * `id DESC` is not decoration. [to.curare.compose.database.converters.CurareConverters] * 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 [com.it.curated.compose.database.model.ChatMessage.UNRESOLVED_MARMOT_TYPES]: + * [unresolvedTypes] is [to.curare.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: com.it.curated.compose.database.model.ChatMessage): Long + suspend fun upsert(chatMessage: to.curare.compose.database.model.ChatMessage): 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 new file mode 100644 index 00000000..8f2a047f --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatMessageNostrEventRelationDao.kt @@ -0,0 +1,11 @@ +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/com/it/curated/compose/database/dao/ChatRoomDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatRoomDao.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ChatRoomDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatRoomDao.kt index 22a2b524..d2258507 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ChatRoomDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ChatRoomDao.kt @@ -1,19 +1,19 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Delete import androidx.room3.Query import androidx.room3.Transaction import androidx.room3.Upsert -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom +import to.curare.compose.database.model.ChatRoom +import to.curare.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 - * [com.it.curated.compose.database.model.ChatMessage] timestamp is stored to the second, + * [to.curare.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/com/it/curated/compose/database/dao/ConnectionDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ConnectionDao.kt similarity index 55% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ConnectionDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ConnectionDao.kt index 48464a66..66cfd15e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ConnectionDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ConnectionDao.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.dao +package to.curare.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: com.it.curated.compose.database.model.Connection) + suspend fun insertPlaceholderProfile(connection: to.curare.compose.database.model.Connection) @Upsert - suspend fun upsert(connection: com.it.curated.compose.database.model.Connection) + suspend fun upsert(connection: to.curare.compose.database.model.Connection) @Delete - suspend fun delete(connection: com.it.curated.compose.database.model.Connection) + suspend fun delete(connection: to.curare.compose.database.model.Connection) } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/DkgSessionDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/DkgSessionDao.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/DkgSessionDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/DkgSessionDao.kt index ed2a6fdd..1f1e8d28 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/DkgSessionDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/DkgSessionDao.kt @@ -1,10 +1,10 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Query import androidx.room3.Upsert -import com.it.curated.compose.database.model.DkgParticipantMessage -import com.it.curated.compose.database.model.DkgSession +import to.curare.compose.database.model.DkgParticipantMessage +import to.curare.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/com/it/curated/compose/database/dao/FrostSigningSessionDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/FrostSigningSessionDao.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/FrostSigningSessionDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/FrostSigningSessionDao.kt index f8515082..da75571e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/FrostSigningSessionDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/FrostSigningSessionDao.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Query @@ -7,10 +7,10 @@ import androidx.room3.Upsert import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.Kind import kotlinx.coroutines.flow.Flow -import com.it.curated.compose.database.model.FrostSignerMessage -import com.it.curated.compose.database.model.FrostSigningItem -import com.it.curated.compose.database.model.FrostSigningSession -import com.it.curated.compose.database.model.intermdiate.LocalFrostSigningSession +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.LocalFrostSigningSession @Dao interface FrostSigningSessionDao { diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GiftWrapMessageDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GiftWrapMessageDao.kt new file mode 100644 index 00000000..3177f93b --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GiftWrapMessageDao.kt @@ -0,0 +1,15 @@ +package to.curare.compose.database.dao + +import androidx.room3.Dao +import androidx.room3.Query +import androidx.room3.Upsert + +@Dao +interface GiftWrapMessageDao { + @Query("SELECT * FROM GiftWrapMessage") + suspend fun getAllGiftWrapMessages(): List + + @Upsert + suspend fun upsert(giftWrapMessage: to.curare.compose.database.model.GiftWrapMessage) + +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/GiftWrapPayloadDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GiftWrapPayloadDao.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/GiftWrapPayloadDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GiftWrapPayloadDao.kt index 8b427c7d..ff0ceaac 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/GiftWrapPayloadDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GiftWrapPayloadDao.kt @@ -1,10 +1,10 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Insert import androidx.room3.Query import androidx.room3.Upsert -import com.it.curated.compose.database.model.GiftWrapPayload +import to.curare.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/to/curare/compose/database/dao/GiftWrapSealDao.kt new file mode 100644 index 00000000..44f7ed74 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GiftWrapSealDao.kt @@ -0,0 +1,15 @@ +package to.curare.compose.database.dao + +import androidx.room3.Dao +import androidx.room3.Query +import androidx.room3.Upsert + +@Dao +interface GiftWrapSealDao { + @Query("SELECT * FROM GiftWrapSeal") + suspend fun getAllGiftWrapSeals(): List + + @Upsert + suspend fun upsert(giftWrapSeal: to.curare.compose.database.model.GiftWrapSeal) + +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/GroupKeyStateDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GroupKeyStateDao.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/GroupKeyStateDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GroupKeyStateDao.kt index 2558ff54..7fdc886d 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/GroupKeyStateDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GroupKeyStateDao.kt @@ -1,11 +1,11 @@ -package com.it.curated.compose.database.dao +package to.curare.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 com.it.curated.compose.database.model.GroupKeyState +import to.curare.compose.database.model.GroupKeyState @Dao abstract class GroupKeyStateDao { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/GroupSignedEventDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GroupSignedEventDao.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/GroupSignedEventDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GroupSignedEventDao.kt index 48211d16..b6f6b73e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/GroupSignedEventDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/GroupSignedEventDao.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.dao +package to.curare.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 com.it.curated.compose.database.model.GroupSignedEvent +import to.curare.compose.database.model.GroupSignedEvent @Dao abstract class GroupSignedEventDao { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/InReplyToRelationDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/InReplyToRelationDao.kt similarity index 56% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/InReplyToRelationDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/InReplyToRelationDao.kt index 3daa861c..0e626560 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/InReplyToRelationDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/InReplyToRelationDao.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.dao +package to.curare.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): com.it.curated.compose.database.model.InReplyToRelation? + suspend fun getRepostByReplyingNostrEventId(replyingNostrEventId: String): to.curare.compose.database.model.InReplyToRelation? @Query("SELECT * FROM InReplyToRelation WHERE inReplyToNostrEventId = :inReplyToNostrEventId") - suspend fun getRepostByInReplyToNostrEventId(inReplyToNostrEventId: String): com.it.curated.compose.database.model.InReplyToRelation? + suspend fun getRepostByInReplyToNostrEventId(inReplyToNostrEventId: String): to.curare.compose.database.model.InReplyToRelation? @Insert - suspend fun insert(inReplyToRelation: com.it.curated.compose.database.model.InReplyToRelation) + suspend fun insert(inReplyToRelation: to.curare.compose.database.model.InReplyToRelation) @Upsert - suspend fun upsert(inReplyToRelation: com.it.curated.compose.database.model.InReplyToRelation) + suspend fun upsert(inReplyToRelation: to.curare.compose.database.model.InReplyToRelation) } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraArtifactDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraArtifactDao.kt similarity index 82% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraArtifactDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraArtifactDao.kt index b6c35156..e3d42c37 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraArtifactDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraArtifactDao.kt @@ -1,9 +1,9 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Query import androidx.room3.Upsert -import com.it.curated.compose.database.model.MantraArtifact +import to.curare.compose.database.model.MantraArtifact @Dao interface MantraArtifactDao { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraArtifactVersionDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraArtifactVersionDao.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraArtifactVersionDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraArtifactVersionDao.kt index 8f3f7589..6113ed01 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraArtifactVersionDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraArtifactVersionDao.kt @@ -1,11 +1,11 @@ -package com.it.curated.compose.database.dao +package to.curare.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 com.it.curated.compose.database.model.MantraArtifactVersion +import to.curare.compose.database.model.MantraArtifactVersion @Dao interface MantraArtifactVersionDao { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraChapterDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraChapterDao.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraChapterDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraChapterDao.kt index d4ccd25d..9b899e4f 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraChapterDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraChapterDao.kt @@ -1,11 +1,11 @@ -package com.it.curated.compose.database.dao +package to.curare.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 com.it.curated.compose.database.model.MantraChapter +import to.curare.compose.database.model.MantraChapter @Dao interface MantraChapterDao { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraChunkDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraChunkDao.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraChunkDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraChunkDao.kt index 7f36a30f..e24c5b9d 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraChunkDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraChunkDao.kt @@ -1,11 +1,11 @@ -package com.it.curated.compose.database.dao +package to.curare.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 com.it.curated.compose.database.model.MantraChunk +import to.curare.compose.database.model.MantraChunk @Dao interface MantraChunkDao { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraDao.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraDao.kt index 777e911f..e73a2cf2 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraDao.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.dao +package to.curare.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 com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.model.ChatMessage -import com.it.curated.compose.database.model.MantraArtifactVersion -import com.it.curated.compose.database.model.MantraDialect -import com.it.curated.compose.database.model.MarmotInnerEvent -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.nostr.nip30303.ArtifactVersionEvent -import com.it.curated.compose.nostr.nip30303.DialectEvent -import com.it.curated.compose.nostr.nip30303.SubmissionEvent -import com.it.curated.compose.nostr.nip30303.tags.ArtifactIdTag -import com.it.curated.compose.repository.MantraRepository.Companion.DEFAULT_LICENSE -import com.it.curated.compose.repository.MantraRepository.Companion.DEFAULT_VISIBILITY +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 kotlin.time.Instant @Dao abstract class MantraDao( - private val database: CuratedDatabase, + private val database: CurareDatabase, ) { val logger = Logger.withTag("NostrDao") diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraDialectDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraDialectDao.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraDialectDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraDialectDao.kt index a37d300c..63ee74cf 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraDialectDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraDialectDao.kt @@ -1,11 +1,11 @@ -package com.it.curated.compose.database.dao +package to.curare.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 com.it.curated.compose.database.model.MantraDialect +import to.curare.compose.database.model.MantraDialect @Dao interface MantraDialectDao { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraTranslationArtifactVersionContributorDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationArtifactVersionContributorDao.kt similarity index 64% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraTranslationArtifactVersionContributorDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationArtifactVersionContributorDao.kt index 4b69eb0f..419b54dc 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraTranslationArtifactVersionContributorDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationArtifactVersionContributorDao.kt @@ -1,8 +1,8 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Upsert -import com.it.curated.compose.database.model.MantraTranslationArtifactVersionContributor +import to.curare.compose.database.model.MantraTranslationArtifactVersionContributor @Dao interface MantraTranslationArtifactVersionContributorDao { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraTranslationArtifactVersionDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationArtifactVersionDao.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraTranslationArtifactVersionDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationArtifactVersionDao.kt index daf7fd3e..4f0dc180 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraTranslationArtifactVersionDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationArtifactVersionDao.kt @@ -1,11 +1,11 @@ -package com.it.curated.compose.database.dao +package to.curare.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 com.it.curated.compose.database.model.MantraTranslationArtifactVersion +import to.curare.compose.database.model.MantraTranslationArtifactVersion @Dao interface MantraTranslationArtifactVersionDao { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraTranslationChapterContributorDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationChapterContributorDao.kt similarity index 53% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraTranslationChapterContributorDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationChapterContributorDao.kt index 0a35dbd7..e5590040 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraTranslationChapterContributorDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationChapterContributorDao.kt @@ -1,9 +1,9 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Upsert -import com.it.curated.compose.database.model.MantraTranslationChapter -import com.it.curated.compose.database.model.MantraTranslationChapterContributor +import to.curare.compose.database.model.MantraTranslationChapter +import to.curare.compose.database.model.MantraTranslationChapterContributor @Dao interface MantraTranslationChapterContributorDao { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraTranslationChapterDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationChapterDao.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraTranslationChapterDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationChapterDao.kt index dc13fae4..c3433741 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraTranslationChapterDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationChapterDao.kt @@ -1,11 +1,11 @@ -package com.it.curated.compose.database.dao +package to.curare.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 com.it.curated.compose.database.model.MantraTranslationChapter +import to.curare.compose.database.model.MantraTranslationChapter @Dao interface MantraTranslationChapterDao { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraTranslationChunkDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationChunkDao.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraTranslationChunkDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationChunkDao.kt index a220a68c..1a4cef36 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraTranslationChunkDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationChunkDao.kt @@ -1,11 +1,11 @@ -package com.it.curated.compose.database.dao +package to.curare.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 com.it.curated.compose.database.model.MantraTranslationChunk +import to.curare.compose.database.model.MantraTranslationChunk @Dao interface MantraTranslationChunkDao { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraTranslationContributorDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationContributorDao.kt similarity index 62% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraTranslationContributorDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationContributorDao.kt index 84f584be..afc35bc2 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraTranslationContributorDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationContributorDao.kt @@ -1,8 +1,8 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Upsert -import com.it.curated.compose.database.model.MantraTranslationContributor +import to.curare.compose.database.model.MantraTranslationContributor @Dao interface MantraTranslationContributorDao { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraTranslationDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationDao.kt similarity index 70% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraTranslationDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationDao.kt index d4d744ab..a23e1d11 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MantraTranslationDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MantraTranslationDao.kt @@ -1,10 +1,10 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Insert import androidx.room3.OnConflictStrategy.Companion.IGNORE import androidx.room3.Upsert -import com.it.curated.compose.database.model.MantraTranslation +import to.curare.compose.database.model.MantraTranslation @Dao interface MantraTranslationDao { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MarmotCommitResultDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotCommitResultDao.kt similarity index 79% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MarmotCommitResultDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotCommitResultDao.kt index d7724644..b71878ef 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MarmotCommitResultDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotCommitResultDao.kt @@ -1,9 +1,9 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Query import androidx.room3.Upsert -import com.it.curated.compose.database.model.MarmotCommitResult +import to.curare.compose.database.model.MarmotCommitResult import com.vitorpamplona.quartz.nip01Core.core.HexKey @Dao diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MarmotGroupEventDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotGroupEventDao.kt similarity index 60% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MarmotGroupEventDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotGroupEventDao.kt index a50ce71f..c912ebb1 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MarmotGroupEventDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotGroupEventDao.kt @@ -1,8 +1,8 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Upsert -import com.it.curated.compose.database.model.MarmotGroupEvent +import to.curare.compose.database.model.MarmotGroupEvent @Dao interface MarmotGroupEventDao { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MarmotInnerEventDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotInnerEventDao.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MarmotInnerEventDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotInnerEventDao.kt index 9692dc51..685cba7e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MarmotInnerEventDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotInnerEventDao.kt @@ -1,9 +1,9 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Query import androidx.room3.Upsert -import com.it.curated.compose.database.model.MarmotInnerEvent +import to.curare.compose.database.model.MarmotInnerEvent import kotlinx.coroutines.flow.Flow @Dao diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MarmotKeyPackageBundleDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotKeyPackageBundleDao.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MarmotKeyPackageBundleDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotKeyPackageBundleDao.kt index fc5bedd0..3164d662 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MarmotKeyPackageBundleDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotKeyPackageBundleDao.kt @@ -1,9 +1,9 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Query import androidx.room3.Upsert -import com.it.curated.compose.database.model.MarmotKeyPackageBundle +import to.curare.compose.database.model.MarmotKeyPackageBundle import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.flow.Flow diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MarmotKeyPackageDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotKeyPackageDao.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MarmotKeyPackageDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotKeyPackageDao.kt index 6a71c92d..5ff94009 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MarmotKeyPackageDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotKeyPackageDao.kt @@ -1,9 +1,9 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Query import androidx.room3.Upsert -import com.it.curated.compose.database.model.MarmotKeyPackage +import to.curare.compose.database.model.MarmotKeyPackage import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.flow.Flow diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MarmotOutboundDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotOutboundDao.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MarmotOutboundDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotOutboundDao.kt index eb5a0625..989df8a8 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MarmotOutboundDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotOutboundDao.kt @@ -1,32 +1,32 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Transaction -import com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.managers.ChronicleManager -import com.it.curated.compose.database.model.BroadcastNostrEventRequest -import com.it.curated.compose.database.model.ChatMessage -import com.it.curated.compose.database.model.ChatMessageBroadcastNostrEventRequestRelation -import com.it.curated.compose.database.model.ChatMessageNostrEventRelation -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.GiftWrapPayload -import com.it.curated.compose.database.model.MarmotCommitResult -import com.it.curated.compose.database.model.MarmotGroupEvent -import com.it.curated.compose.database.model.MarmotInnerEvent -import com.it.curated.compose.database.model.MarmotInnerEvent.Companion.disappearingExpiration -import com.it.curated.compose.database.model.MarmotKeyPackage -import com.it.curated.compose.database.model.MarmotRetainedEpochSecret -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Participant -import com.it.curated.compose.exceptions.MarmotMissingChatGroupException -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.extensions.exporterSecret -import com.it.curated.compose.extensions.shortened -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.managers.MarmotInboundManager.EPOCH_RETENTION_WINDOW -import com.it.curated.compose.nostr.MarmotDelivery -import com.it.curated.compose.nostr.MarmotDirectMessage -import com.it.curated.compose.nostr.Relays +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.MarmotRetainedEpochSecret +import to.curare.compose.database.model.NostrEvent +import to.curare.compose.database.model.Participant +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 co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.mip00KeyPackages.tags.EncodingTag import com.vitorpamplona.quartz.marmot.mip01Groups.MarmotGroupData @@ -56,7 +56,7 @@ import kotlin.time.Instant @Dao abstract class MarmotOutboundDao( - private val database: CuratedDatabase + private val database: CurareDatabase ) { val logger = Logger.withTag(TAG) diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MarmotRetainedEpochSecretDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotRetainedEpochSecretDao.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MarmotRetainedEpochSecretDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotRetainedEpochSecretDao.kt index 99993f10..9a0af5cd 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MarmotRetainedEpochSecretDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MarmotRetainedEpochSecretDao.kt @@ -1,11 +1,11 @@ -package com.it.curated.compose.database.dao +package to.curare.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 com.it.curated.compose.database.model.MarmotRetainedEpochSecret +import to.curare.compose.database.model.MarmotRetainedEpochSecret import com.vitorpamplona.quartz.nip01Core.core.HexKey @Dao diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MentionDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MentionDao.kt similarity index 53% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MentionDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MentionDao.kt index d6fa3fb4..32577ad7 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/MentionDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/MentionDao.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Insert @@ -11,8 +11,8 @@ interface MentionDao { @Insert( onConflict = IGNORE ) - suspend fun insert(mention: com.it.curated.compose.database.model.Mention) + suspend fun insert(mention: to.curare.compose.database.model.Mention) @Upsert - suspend fun upsert(mention: com.it.curated.compose.database.model.Mention) + suspend fun upsert(mention: to.curare.compose.database.model.Mention) } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/NegentropySynchronizeRequestDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NegentropySynchronizeRequestDao.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/NegentropySynchronizeRequestDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NegentropySynchronizeRequestDao.kt index 8c2b7e3d..0ddfa274 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/NegentropySynchronizeRequestDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NegentropySynchronizeRequestDao.kt @@ -1,9 +1,9 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Query import androidx.room3.Upsert -import com.it.curated.compose.database.model.NegentropySynchronizeRequest +import to.curare.compose.database.model.NegentropySynchronizeRequest import kotlinx.coroutines.flow.Flow @Dao 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 new file mode 100644 index 00000000..0674acbe --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NegentropySynchronizeResultDao.kt @@ -0,0 +1,10 @@ +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/com/it/curated/compose/database/dao/NostrDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrDao.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/NostrDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrDao.kt index 4021881b..ceac30fb 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/NostrDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrDao.kt @@ -1,43 +1,43 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Transaction -import com.it.curated.compose.database.GENESIS_AT -import com.it.curated.compose.database.model.BroadcastNostrEventRequest -import com.it.curated.compose.database.model.ChatMessage -import com.it.curated.compose.database.model.ChatMessageBroadcastNostrEventRequestRelation -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.Connection -import com.it.curated.compose.database.model.GiftWrapPayload -import com.it.curated.compose.database.model.MarmotGroupEvent -import com.it.curated.compose.database.model.MarmotKeyPackage -import com.it.curated.compose.database.model.Mention -import com.it.curated.compose.database.model.NegentropySynchronizeRequest -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.NostrEventRelay -import com.it.curated.compose.database.model.Participant -import com.it.curated.compose.database.model.Post -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.types.MarmotReindexReport -import com.it.curated.compose.database.model.types.SynchronizationFilter -import com.it.curated.compose.exceptions.GiftWrapImpersonationException -import com.it.curated.compose.exceptions.GiftWrapSealDecryptionException -import com.it.curated.compose.exceptions.GiftWrapUnsealException -import com.it.curated.compose.exceptions.MarmotMissingChatGroupException -import com.it.curated.compose.exceptions.MarmotMissingKeyPackageBundleException -import com.it.curated.compose.exceptions.MarmotMissingNostrGroupDataExtension -import com.it.curated.compose.exceptions.MarmotNotMemberOfChatGroupException -import com.it.curated.compose.exceptions.MarmotWelcomeEventMissingKeyPackageEventIdException -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.managers.ChillDkgRitualManager -import com.it.curated.compose.nostr.dkg.DkgRitualEvents -import com.it.curated.compose.nostr.frost.FrostSigningEvents -import com.it.curated.compose.managers.FrostSigningManager -import com.it.curated.compose.managers.GroupKeyStateManager -import com.it.curated.compose.managers.MlsGroupCache -import com.it.curated.compose.managers.MarmotInboundManager -import com.it.curated.compose.managers.MarmotReindexSweep +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.exceptions.MarmotWelcomeEventMissingKeyPackageEventIdException +import to.curare.compose.extensions.toHex +import to.curare.compose.managers.ChillDkgRitualManager +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 co.touchlab.kermit.Logger import kotlinx.coroutines.CancellationException import com.vitorpamplona.quartz.marmot.GroupEventResult @@ -69,7 +69,7 @@ import kotlin.time.Instant @Dao abstract class NostrDao( - private val database: com.it.curated.compose.database.CuratedDatabase, + private val database: to.curare.compose.database.CurareDatabase, ) { val logger = Logger.withTag("NostrDao") @@ -87,7 +87,7 @@ abstract class NostrDao( ) open suspend fun publishNostrEvent( - unsignedNostrEvent: com.it.curated.compose.database.model.UnsignedNostrEvent, + unsignedNostrEvent: to.curare.compose.database.model.UnsignedNostrEvent, nostrEvent: NostrEvent, relayURLs: List, activeKeyPair: KeyPair @@ -122,7 +122,7 @@ abstract class NostrDao( */ @Transaction protected open suspend fun commitPublishedNostrEvent( - unsignedNostrEvent: com.it.curated.compose.database.model.UnsignedNostrEvent, + unsignedNostrEvent: to.curare.compose.database.model.UnsignedNostrEvent, nostrEvent: NostrEvent, relayURLs: List ) { @@ -1645,7 +1645,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 [com.it.curated.compose.database.model.BroadcastNostrEventReceipt] + * [ChatMessageBroadcastNostrEventRequestRelation] when we produce the [to.curare.compose.database.model.BroadcastNostrEventReceipt] */ @Transaction open suspend fun rescheduleBroadcastNostrEventRequests(broadcastNostrEventRequests: List) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/NostrEventDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrEventDao.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/NostrEventDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrEventDao.kt index 268b418b..3f5366d0 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/NostrEventDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrEventDao.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.dao +package to.curare.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 com.it.curated.compose.database.model.MarmotGroupEvent -import com.it.curated.compose.database.model.NostrEvent +import to.curare.compose.database.model.MarmotGroupEvent +import to.curare.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 - * [com.it.curated.compose.database.query.NostrEventFilterQuery]. Raw because a nostr filter is + * [to.curare.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. @@ -195,7 +195,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/to/curare/compose/database/dao/NostrEventRelayDao.kt new file mode 100644 index 00000000..fc44e965 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrEventRelayDao.kt @@ -0,0 +1,12 @@ +package to.curare.compose.database.dao + +import androidx.room3.Dao +import androidx.room3.Upsert + +@Dao +interface NostrEventRelayDao { + + @Upsert + suspend fun upsert(nostrEventRelay: to.curare.compose.database.model.NostrEventRelay) + +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/NostrNip17Dao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrNip17Dao.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/NostrNip17Dao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrNip17Dao.kt index 76bed3d7..87f0d379 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/NostrNip17Dao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/NostrNip17Dao.kt @@ -1,19 +1,19 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Transaction -import com.it.curated.compose.database.GENESIS_AT -import com.it.curated.compose.database.model.BroadcastNostrEventRequest -import com.it.curated.compose.database.model.ChatMessageBroadcastNostrEventRequestRelation -import com.it.curated.compose.database.model.ChatMessageNostrEventRelation -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.GiftWrapMessage -import com.it.curated.compose.database.model.GiftWrapPayload -import com.it.curated.compose.database.model.GiftWrapSeal -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Participant -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.nostr.Relays +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 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: com.it.curated.compose.database.CuratedDatabase + private val database: to.curare.compose.database.CurareDatabase ) { val logger = Logger.withTag(TAG) diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ParticipantDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ParticipantDao.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ParticipantDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ParticipantDao.kt index 45acbda4..92a1e094 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ParticipantDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ParticipantDao.kt @@ -1,10 +1,10 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Delete import androidx.room3.Query import androidx.room3.Upsert -import com.it.curated.compose.database.model.Participant +import to.curare.compose.database.model.Participant @Dao interface ParticipantDao { 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 new file mode 100644 index 00000000..c17e50b0 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/PostDao.kt @@ -0,0 +1,21 @@ +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/com/it/curated/compose/database/dao/ProfileDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ProfileDao.kt similarity index 81% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ProfileDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ProfileDao.kt index 9fab1fee..2beb670e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ProfileDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ProfileDao.kt @@ -1,11 +1,11 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Insert import androidx.room3.Query import androidx.room3.Upsert -import com.it.curated.compose.database.GENESIS_AT -import com.it.curated.compose.database.model.Profile +import to.curare.compose.database.GENESIS_AT +import to.curare.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/com/it/curated/compose/database/dao/QuotedRelationDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/QuotedRelationDao.kt similarity index 57% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/QuotedRelationDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/QuotedRelationDao.kt index c6570c50..c18954b0 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/QuotedRelationDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/QuotedRelationDao.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.dao +package to.curare.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): com.it.curated.compose.database.model.QuotedRelation? + suspend fun getRepostByQuotingNostrEventId(quotingNostrEventId: String): to.curare.compose.database.model.QuotedRelation? @Query("SELECT * FROM QuotedRelation WHERE quotedNostrEventId = :quotedNostrEventId") - suspend fun getRepostByQuotedNostrEventId(quotedNostrEventId: String): com.it.curated.compose.database.model.QuotedRelation? + suspend fun getRepostByQuotedNostrEventId(quotedNostrEventId: String): to.curare.compose.database.model.QuotedRelation? @Insert - suspend fun insert(quotedRelation: com.it.curated.compose.database.model.QuotedRelation) + suspend fun insert(quotedRelation: to.curare.compose.database.model.QuotedRelation) @Upsert - suspend fun upsert(quotedRelation: com.it.curated.compose.database.model.QuotedRelation) + suspend fun upsert(quotedRelation: to.curare.compose.database.model.QuotedRelation) } \ 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 new file mode 100644 index 00000000..c97541fd --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ReactionDao.kt @@ -0,0 +1,18 @@ +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 new file mode 100644 index 00000000..5e93e5e1 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/RecentSearchDao.kt @@ -0,0 +1,22 @@ +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 new file mode 100644 index 00000000..97eb7377 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/RelayDao.kt @@ -0,0 +1,19 @@ +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/com/it/curated/compose/database/dao/RepostedRelationDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/RepostedRelationDao.kt similarity index 58% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/RepostedRelationDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/RepostedRelationDao.kt index b7d35d1c..bd2bdbd0 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/RepostedRelationDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/RepostedRelationDao.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.dao +package to.curare.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): com.it.curated.compose.database.model.RepostedRelation? + suspend fun getRepostByRepostingId(repostingNostrEventId: String): to.curare.compose.database.model.RepostedRelation? @Query("SELECT * FROM RepostedRelation WHERE repostedNostrEventId = :repostedNostrEventId") - suspend fun getRepostByRepostedId(repostedNostrEventId: String): com.it.curated.compose.database.model.RepostedRelation? + suspend fun getRepostByRepostedId(repostedNostrEventId: String): to.curare.compose.database.model.RepostedRelation? @Upsert - suspend fun upsert(repostedRelation: com.it.curated.compose.database.model.RepostedRelation) + suspend fun upsert(repostedRelation: to.curare.compose.database.model.RepostedRelation) } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/SynchronizeNostrEventRequestDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/SynchronizeNostrEventRequestDao.kt similarity index 69% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/SynchronizeNostrEventRequestDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/SynchronizeNostrEventRequestDao.kt index d832aad8..18ab4f38 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/SynchronizeNostrEventRequestDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/SynchronizeNostrEventRequestDao.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Insert @@ -12,14 +12,14 @@ 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 @Query("SELECT COUNT(*) FROM SynchronizeNostrEventRequest WHERE purpose = :purpose AND status IN (:status)") fun observeSynchronizeNostrEventRequestByPurposeAndStatusCount(purpose: String, status: List): Flow @Upsert - suspend fun upsert(synchronizeNostrEventRequest: com.it.curated.compose.database.model.SynchronizeNostrEventRequest) + suspend fun upsert(synchronizeNostrEventRequest: to.curare.compose.database.model.SynchronizeNostrEventRequest) @Insert - suspend fun insert(synchronizeNostrEventRequests: List) + suspend fun insert(synchronizeNostrEventRequests: List) } \ 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 new file mode 100644 index 00000000..905fac9f --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/SynchronizeNostrEventResultDao.kt @@ -0,0 +1,10 @@ +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/com/it/curated/compose/database/dao/UnsignedNostrEventDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/UnsignedNostrEventDao.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/UnsignedNostrEventDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/UnsignedNostrEventDao.kt index b3fc5ef5..0decaed6 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/UnsignedNostrEventDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/UnsignedNostrEventDao.kt @@ -1,13 +1,13 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Insert import androidx.room3.Query import androidx.room3.Transaction import androidx.room3.Upsert -import com.it.curated.compose.database.model.intermdiate.LocalAccount +import to.curare.compose.database.model.intermdiate.LocalAccount import kotlinx.coroutines.flow.Flow -import com.it.curated.compose.database.model.UnsignedNostrEvent +import to.curare.compose.database.model.UnsignedNostrEvent @Dao interface UnsignedNostrEventDao { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ZapDao.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ZapDao.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ZapDao.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ZapDao.kt index f19f1e22..90ed491d 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/dao/ZapDao.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/dao/ZapDao.kt @@ -1,9 +1,9 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Dao import androidx.room3.Query import androidx.room3.Upsert -import com.it.curated.compose.database.model.Zap +import to.curare.compose.database.model.Zap import kotlinx.coroutines.flow.Flow @Dao diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/migrations/ChronicleRenameMigration.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/migrations/ChronicleRenameMigration.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/migrations/ChronicleRenameMigration.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/migrations/ChronicleRenameMigration.kt index e1c93abc..08af1d8f 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/migrations/ChronicleRenameMigration.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/migrations/ChronicleRenameMigration.kt @@ -1,9 +1,9 @@ -package com.it.curated.compose.database.migrations +package to.curare.compose.database.migrations import androidx.room3.migration.Migration import androidx.sqlite.SQLiteConnection import androidx.sqlite.execSQL -import com.it.curated.compose.database.model.ChatMessage +import to.curare.compose.database.model.ChatMessage /** * Renames the group's signed record from "archive" to "chronicle", everywhere the diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/migrations/DkgApprovalRequestMigration.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/migrations/DkgApprovalRequestMigration.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/migrations/DkgApprovalRequestMigration.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/migrations/DkgApprovalRequestMigration.kt index c4bbdbba..587e028e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/migrations/DkgApprovalRequestMigration.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/migrations/DkgApprovalRequestMigration.kt @@ -1,9 +1,9 @@ -package com.it.curated.compose.database.migrations +package to.curare.compose.database.migrations import androidx.room3.migration.Migration import androidx.sqlite.SQLiteConnection import androidx.sqlite.execSQL -import com.it.curated.compose.database.model.ChatMessage +import to.curare.compose.database.model.ChatMessage /** * Splits the single `dkgApprovalNeeded` chat line into one type per ritual step. diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/migrations/FrostSigningItemMigration.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/migrations/FrostSigningItemMigration.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/migrations/FrostSigningItemMigration.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/migrations/FrostSigningItemMigration.kt index 837aa592..fa236a5a 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/migrations/FrostSigningItemMigration.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/migrations/FrostSigningItemMigration.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.migrations +package to.curare.compose.database.migrations import androidx.room3.migration.Migration import androidx.sqlite.SQLiteConnection diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/migrations/JoinedGroupAtMigration.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/migrations/JoinedGroupAtMigration.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/migrations/JoinedGroupAtMigration.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/migrations/JoinedGroupAtMigration.kt index 91162cea..0086806c 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/migrations/JoinedGroupAtMigration.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/migrations/JoinedGroupAtMigration.kt @@ -1,9 +1,9 @@ -package com.it.curated.compose.database.migrations +package to.curare.compose.database.migrations import androidx.room3.migration.Migration import androidx.sqlite.SQLiteConnection import androidx.sqlite.execSQL -import com.it.curated.compose.database.model.ChatMessage +import to.curare.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/com/it/curated/compose/database/model/BroadcastNostrEventReceipt.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/BroadcastNostrEventReceipt.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/BroadcastNostrEventReceipt.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/BroadcastNostrEventReceipt.kt index b87a7edf..bd93a06d 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/BroadcastNostrEventReceipt.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/BroadcastNostrEventReceipt.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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 -): com.it.curated.compose.database.model.traits.NostrEventEntity, - com.it.curated.compose.database.model.traits.UnsignedNostrEventEntity \ No newline at end of file +): to.curare.compose.database.model.traits.NostrEventEntity, + to.curare.compose.database.model.traits.UnsignedNostrEventEntity \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/BroadcastNostrEventRequest.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/BroadcastNostrEventRequest.kt similarity index 81% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/BroadcastNostrEventRequest.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/BroadcastNostrEventRequest.kt index 10b4507e..e7b6ed89 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/BroadcastNostrEventRequest.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/BroadcastNostrEventRequest.kt @@ -1,12 +1,12 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.Index import androidx.room3.PrimaryKey -import com.it.curated.compose.database.model.traits.NostrEventEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity -import com.it.curated.compose.database.model.traits.UnsignedNostrEventEntity +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.vitorpamplona.quartz.nip01Core.core.HexKey import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/ChatMessage.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessage.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/ChatMessage.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessage.kt index 713e65a0..6486b51c 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/ChatMessage.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessage.kt @@ -1,20 +1,20 @@ -package com.it.curated.compose.database.model +package to.curare.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 com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.model.traits.LocalStoreEntity -import com.it.curated.compose.database.model.traits.SoftDeletableEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity -import com.it.curated.compose.database.model.traits.UserViewableEntity -import com.it.curated.compose.exceptions.MarmotUnprocessableInnerEventException -import com.it.curated.compose.managers.ChronicleManager -import com.it.curated.compose.managers.GroupKeyStateManager -import com.it.curated.compose.managers.SubgroupManager -import com.it.curated.compose.extensions.toHex +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.vitorpamplona.quartz.marmot.GroupEventResult import com.vitorpamplona.quartz.marmot.mip03GroupMessages.GroupEvent import com.vitorpamplona.quartz.nip01Core.core.Event @@ -22,31 +22,31 @@ 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 com.it.curated.compose.nostr.GroupNostrProfile -import com.it.curated.compose.nostr.GroupRelaySet +import to.curare.compose.nostr.GroupNostrProfile +import to.curare.compose.nostr.GroupRelaySet import com.vitorpamplona.quartz.nipC7Chats.ChatEvent -import com.it.curated.compose.nostr.dkg.DkgRitualEvents -import com.it.curated.compose.nostr.frost.FrostSigningEvents -import com.it.curated.compose.nostr.frost.GroupKeyStateEvent -import com.it.curated.compose.nostr.subgroup.SubgroupBirthCertificateEvent -import com.it.curated.compose.nostr.nip30303.ArtifactEvent -import com.it.curated.compose.nostr.nip30303.ArtifactVersionEvent -import com.it.curated.compose.nostr.nip30303.ChapterEvent -import com.it.curated.compose.nostr.nip30303.ChunkEvent -import com.it.curated.compose.nostr.nip30303.DialectEvent -import com.it.curated.compose.nostr.chronicle.ChronicleEvent -import com.it.curated.compose.nostr.chronicle.ChronicleRequestEvent -import com.it.curated.compose.nostr.nip30303.SubmissionEvent -import com.it.curated.compose.nostr.nip30303.TranslationArtifactVersionContributorListEvent -import com.it.curated.compose.nostr.nip30303.TranslationArtifactVersionEvent -import com.it.curated.compose.nostr.nip30303.TranslationChapterEvent -import com.it.curated.compose.nostr.nip30303.TranslationChunkEvent -import com.it.curated.compose.nostr.nip30303.TranslationContributorListEvent -import com.it.curated.compose.nostr.nip30303.TranslationEvent +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 co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.firstTagValue import com.vitorpamplona.quartz.nip59Giftwrap.wraps.GiftWrapEvent -import com.it.curated.compose.nostr.MarmotDirectMessage +import to.curare.compose.nostr.MarmotDirectMessage import kotlin.time.Clock import kotlin.time.Instant @@ -637,7 +637,7 @@ data class ChatMessage( * this turns it into rows. See docs/marmot-direct-messages.md. */ private suspend fun directMessage( - database: CuratedDatabase, + database: CurareDatabase, activeKeyPair: KeyPair, groupEvent: GroupEvent, chatRoomId: String, @@ -749,7 +749,7 @@ data class ChatMessage( * which yields false, exactly as before. */ suspend fun fromGroupEventResult( - database: CuratedDatabase, + database: CurareDatabase, activeKeyPair: KeyPair, groupEvent: GroupEvent, groupEventResult: GroupEventResult, @@ -980,7 +980,7 @@ data class ChatMessage( * writes carries it. */ internal suspend fun applyInnerEvent( - database: CuratedDatabase, + database: CurareDatabase, groupId: String, event: Event, marmotGroupEventId: HexKey?, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/ChatMessageBroadcastNostrEventReceiptRelation.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessageBroadcastNostrEventReceiptRelation.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/ChatMessageBroadcastNostrEventReceiptRelation.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessageBroadcastNostrEventReceiptRelation.kt index 049eb242..442a03b5 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/ChatMessageBroadcastNostrEventReceiptRelation.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessageBroadcastNostrEventReceiptRelation.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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() -): com.it.curated.compose.database.model.traits.TimestampedEntity, - com.it.curated.compose.database.model.traits.LocalStoreEntity +): to.curare.compose.database.model.traits.TimestampedEntity, + to.curare.compose.database.model.traits.LocalStoreEntity diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/ChatMessageBroadcastNostrEventRequestRelation.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessageBroadcastNostrEventRequestRelation.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/ChatMessageBroadcastNostrEventRequestRelation.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessageBroadcastNostrEventRequestRelation.kt index e05598b0..962c7194 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/ChatMessageBroadcastNostrEventRequestRelation.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessageBroadcastNostrEventRequestRelation.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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() -): com.it.curated.compose.database.model.traits.TimestampedEntity, - com.it.curated.compose.database.model.traits.LocalStoreEntity +): to.curare.compose.database.model.traits.TimestampedEntity, + to.curare.compose.database.model.traits.LocalStoreEntity diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/ChatMessageNostrEventRelation.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessageNostrEventRelation.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/ChatMessageNostrEventRelation.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessageNostrEventRelation.kt index 010a7aaf..f1e7bf74 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/ChatMessageNostrEventRelation.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatMessageNostrEventRelation.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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(), -): com.it.curated.compose.database.model.traits.TimestampedEntity, - com.it.curated.compose.database.model.traits.LocalStoreEntity +): to.curare.compose.database.model.traits.TimestampedEntity, + to.curare.compose.database.model.traits.LocalStoreEntity diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/ChatRoom.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatRoom.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/ChatRoom.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatRoom.kt index 4aeefea8..948441b1 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/ChatRoom.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/ChatRoom.kt @@ -1,13 +1,13 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.Ignore import androidx.room3.PrimaryKey -import com.it.curated.compose.database.model.traits.LocalStoreEntity -import com.it.curated.compose.database.model.traits.SoftDeletableEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity -import com.it.curated.compose.database.model.traits.UserViewableEntity +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 co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.mls.group.MlsGroup import com.vitorpamplona.quartz.marmot.mls.group.MlsGroupState diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/Connection.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Connection.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/Connection.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Connection.kt index 32255bda..8606bf60 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/Connection.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Connection.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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, -): com.it.curated.compose.database.model.traits.NostrEventEntity, - com.it.curated.compose.database.model.traits.TimestampedEntity, - com.it.curated.compose.database.model.traits.LocalStoreEntity, - com.it.curated.compose.database.model.traits.BroadcastableEntity, - com.it.curated.compose.database.model.traits.SoftDeletableEntity +): 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 diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/DkgParticipantMessage.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/DkgParticipantMessage.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/DkgParticipantMessage.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/DkgParticipantMessage.kt index da1c7032..bbf77f24 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/DkgParticipantMessage.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/DkgParticipantMessage.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/DkgSession.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/DkgSession.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/DkgSession.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/DkgSession.kt index 4795542d..248ce59b 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/DkgSession.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/DkgSession.kt @@ -1,13 +1,13 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.Index import androidx.room3.PrimaryKey -import com.it.curated.compose.database.model.traits.LocalStoreEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity -import com.it.curated.compose.database.model.types.DkgApprovalStep -import com.it.curated.compose.database.model.types.DkgRitualStage +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.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray import fr.acinq.bitcoin.ByteVector diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/FrostSignerMessage.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/FrostSignerMessage.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/FrostSignerMessage.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/FrostSignerMessage.kt index 3697333a..c248efb3 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/FrostSignerMessage.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/FrostSignerMessage.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/FrostSigningItem.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/FrostSigningItem.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/FrostSigningItem.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/FrostSigningItem.kt index ee2bdbf9..e9ff8bd9 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/FrostSigningItem.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/FrostSigningItem.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/FrostSigningSession.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/FrostSigningSession.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/FrostSigningSession.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/FrostSigningSession.kt index f755ef2c..5f58e6b3 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/FrostSigningSession.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/FrostSigningSession.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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 com.it.curated.compose.database.model.traits.LocalStoreEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity -import com.it.curated.compose.database.model.types.FrostSigningStage -import com.it.curated.compose.managers.SharedKeyDerivation +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 /** * One FROST signing session, as this device sees it. diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/GiftWrapMessage.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GiftWrapMessage.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/GiftWrapMessage.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GiftWrapMessage.kt index e499e4ab..984488cb 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/GiftWrapMessage.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GiftWrapMessage.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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) -): com.it.curated.compose.database.model.traits.NostrEventEntity, - com.it.curated.compose.database.model.traits.TimestampedEntity, - com.it.curated.compose.database.model.traits.LocalStoreEntity, - com.it.curated.compose.database.model.traits.UserViewableEntity, - com.it.curated.compose.database.model.traits.SoftDeletableEntity { +): 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 { @Ignore private val logger = Logger.withTag("GiftWrapMessage") diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/GiftWrapPayload.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GiftWrapPayload.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/GiftWrapPayload.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GiftWrapPayload.kt index b0f8001b..e35a31d1 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/GiftWrapPayload.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GiftWrapPayload.kt @@ -1,13 +1,13 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.Ignore import androidx.room3.PrimaryKey -import com.it.curated.compose.database.model.traits.LocalStoreEntity -import com.it.curated.compose.database.model.traits.SoftDeletableEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity -import com.it.curated.compose.database.model.traits.UserViewableEntity +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 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/com/it/curated/compose/database/model/GiftWrapSeal.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GiftWrapSeal.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/GiftWrapSeal.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GiftWrapSeal.kt index cb42e543..48ac2acd 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/GiftWrapSeal.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GiftWrapSeal.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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) -): com.it.curated.compose.database.model.traits.TimestampedEntity, - com.it.curated.compose.database.model.traits.LocalStoreEntity, - com.it.curated.compose.database.model.traits.UserViewableEntity, - com.it.curated.compose.database.model.traits.SoftDeletableEntity { +): 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 { @Ignore private val logger = Logger.withTag("GiftWrapMessage") diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/GroupKeyState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GroupKeyState.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/GroupKeyState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GroupKeyState.kt index 31cdc608..c6cdae78 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/GroupKeyState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GroupKeyState.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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 com.it.curated.compose.database.model.traits.LocalStoreEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity -import com.it.curated.compose.managers.SharedKeyDerivation +import to.curare.compose.database.model.traits.LocalStoreEntity +import to.curare.compose.database.model.traits.TimestampedEntity +import to.curare.compose.managers.SharedKeyDerivation /** * Which shared key a room signs with, as the group itself has said. diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/GroupSignedEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GroupSignedEvent.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/GroupSignedEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GroupSignedEvent.kt index 09d4eb82..3ed00423 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/GroupSignedEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/GroupSignedEvent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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 com.it.curated.compose.database.model.traits.LocalStoreEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity -import com.it.curated.compose.managers.SharedKeyDerivation -import com.it.curated.compose.nostr.frost.GroupKeyStateEvent +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 /** * An event the group's own key put a signature to, kept as the group made it. diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/InReplyToRelation.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/InReplyToRelation.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/InReplyToRelation.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/InReplyToRelation.kt index dc93e8f4..d1b68a6c 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/InReplyToRelation.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/InReplyToRelation.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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, -): com.it.curated.compose.database.model.traits.TimestampedEntity, - com.it.curated.compose.database.model.traits.LocalStoreEntity, - com.it.curated.compose.database.model.traits.UserViewableEntity, - com.it.curated.compose.database.model.traits.SoftDeletableEntity \ No newline at end of file +): 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 diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraArtifact.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraArtifact.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraArtifact.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraArtifact.kt index 4800f5da..ca01b385 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraArtifact.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraArtifact.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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 com.it.curated.compose.database.model.traits.OptionalNostrEventEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity -import com.it.curated.compose.nostr.nip30303.ArtifactEvent -import com.it.curated.compose.nostr.nip30303.tags.ArtifactVersionMetadataTag -import com.it.curated.compose.nostr.nip30303.tags.DialectIdTag -import com.it.curated.compose.nostr.nip30303.tags.LicenseTag -import com.it.curated.compose.nostr.nip30303.tags.UrlTag -import com.it.curated.compose.nostr.nip30303.tags.VisibilityTag +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 kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraArtifactVersion.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraArtifactVersion.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraArtifactVersion.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraArtifactVersion.kt index 32ce06ad..d451391f 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraArtifactVersion.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraArtifactVersion.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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 com.it.curated.compose.database.model.traits.OptionalNostrEventEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity -import com.it.curated.compose.nostr.nip30303.ArtifactVersionEvent -import com.it.curated.compose.nostr.nip30303.tags.ArtifactIdTag +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 kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraChapter.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraChapter.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraChapter.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraChapter.kt index 0c2be95c..b60937fd 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraChapter.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraChapter.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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 com.it.curated.compose.database.model.traits.OptionalNostrEventEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity -import com.it.curated.compose.nostr.nip30303.ChapterEvent -import com.it.curated.compose.nostr.nip30303.tags.ArtifactVersionIdTag -import com.it.curated.compose.nostr.nip30303.tags.IndexTag -import com.it.curated.compose.nostr.nip30303.tags.NameTag -import com.it.curated.compose.nostr.nip30303.tags.OriginalTextTag -import com.it.curated.compose.nostr.nip30303.tags.WordStatisticsTag +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 kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraChunk.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraChunk.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraChunk.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraChunk.kt index 2bc02d56..8c1ceebf 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraChunk.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraChunk.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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 com.it.curated.compose.database.model.traits.OptionalNostrEventEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity -import com.it.curated.compose.nostr.nip30303.ChunkEvent -import com.it.curated.compose.nostr.nip30303.tags.ChapterIdTag -import com.it.curated.compose.nostr.nip30303.tags.IndexTag -import com.it.curated.compose.nostr.nip30303.tags.WordStatisticsTag +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 kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraDialect.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraDialect.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraDialect.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraDialect.kt index a0456916..dcf997f8 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraDialect.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraDialect.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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 com.it.curated.compose.database.model.traits.OptionalNostrEventEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity -import com.it.curated.compose.nostr.nip30303.DialectEvent -import com.it.curated.compose.nostr.nip30303.tags.CountryTag -import com.it.curated.compose.nostr.nip30303.tags.LanguageTag -import com.it.curated.compose.nostr.nip30303.tags.NameTag +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 kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslation.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslation.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslation.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslation.kt index b8d1fce4..a55002e3 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslation.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslation.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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 com.it.curated.compose.database.model.traits.OptionalNostrEventEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity -import com.it.curated.compose.nostr.nip30303.TranslationEvent -import com.it.curated.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag -import com.it.curated.compose.nostr.nip30303.tags.TranslationChunkIdTag +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 kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslationArtifactVersion.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationArtifactVersion.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslationArtifactVersion.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationArtifactVersion.kt index 5ceafdd9..85308d41 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslationArtifactVersion.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationArtifactVersion.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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 com.it.curated.compose.database.model.traits.OptionalNostrEventEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity -import com.it.curated.compose.nostr.nip30303.TranslationArtifactVersionEvent -import com.it.curated.compose.nostr.nip30303.tags.ArtifactVersionIdTag -import com.it.curated.compose.nostr.nip30303.tags.DialectIdTag -import com.it.curated.compose.nostr.nip30303.tags.LicenseTag -import com.it.curated.compose.nostr.nip30303.tags.NameTag -import com.it.curated.compose.nostr.nip30303.tags.VisibilityTag +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 kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslationArtifactVersionContributor.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationArtifactVersionContributor.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslationArtifactVersionContributor.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationArtifactVersionContributor.kt index c50d0260..5ed6d046 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslationArtifactVersionContributor.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationArtifactVersionContributor.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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 com.it.curated.compose.database.model.traits.OptionalNostrEventEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity -import com.it.curated.compose.nostr.nip30303.TranslationArtifactVersionContributorListEvent -import com.it.curated.compose.nostr.nip30303.tags.ContributorTag -import com.it.curated.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag +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 kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslationChapter.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChapter.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslationChapter.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChapter.kt index 86c6f909..cab8b543 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslationChapter.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChapter.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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 com.it.curated.compose.database.model.traits.OptionalNostrEventEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity -import com.it.curated.compose.nostr.nip30303.TranslationChapterEvent -import com.it.curated.compose.nostr.nip30303.tags.ChapterIdTag -import com.it.curated.compose.nostr.nip30303.tags.IndexTag -import com.it.curated.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag +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 kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslationChapterContributor.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChapterContributor.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslationChapterContributor.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChapterContributor.kt index c0dfc596..79e5c894 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslationChapterContributor.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChapterContributor.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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 com.it.curated.compose.database.model.traits.OptionalNostrEventEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity -import com.it.curated.compose.nostr.nip30303.TranslationChapterContributorListEvent -import com.it.curated.compose.nostr.nip30303.tags.ContributorTag -import com.it.curated.compose.nostr.nip30303.tags.TranslationChapterIdTag +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 kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslationChunk.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChunk.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslationChunk.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChunk.kt index 5e5713b2..a7404d86 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslationChunk.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChunk.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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 com.it.curated.compose.database.model.traits.OptionalNostrEventEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity -import com.it.curated.compose.nostr.nip30303.TranslationChunkEvent -import com.it.curated.compose.nostr.nip30303.tags.ChunkIdTag -import com.it.curated.compose.nostr.nip30303.tags.IndexTag -import com.it.curated.compose.nostr.nip30303.tags.TranslationChapterIdTag +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 kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslationChunkProposal.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChunkProposal.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslationChunkProposal.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChunkProposal.kt index 3c4a2b4e..21560984 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslationChunkProposal.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationChunkProposal.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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 com.it.curated.compose.database.model.traits.OptionalNostrEventEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity -import com.it.curated.compose.nostr.nip30303.TranslationChunkEvent -import com.it.curated.compose.nostr.nip30303.tags.ChunkIdTag -import com.it.curated.compose.nostr.nip30303.tags.IndexTag -import com.it.curated.compose.nostr.nip30303.tags.TranslationChapterIdTag +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 kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslationContributor.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationContributor.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslationContributor.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationContributor.kt index c69dd580..235a1cfc 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslationContributor.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MantraTranslationContributor.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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 com.it.curated.compose.database.model.traits.OptionalNostrEventEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity -import com.it.curated.compose.nostr.nip30303.TranslationContributorListEvent -import com.it.curated.compose.nostr.nip30303.tags.ContributorTag +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 kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MarmotCommitResult.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotCommitResult.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MarmotCommitResult.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotCommitResult.kt index 290e6595..50ccaf45 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MarmotCommitResult.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotCommitResult.kt @@ -1,12 +1,12 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import androidx.room3.Entity import androidx.room3.Ignore import androidx.room3.PrimaryKey -import com.it.curated.compose.database.model.traits.LocalStoreEntity -import com.it.curated.compose.database.model.traits.SoftDeletableEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity -import com.it.curated.compose.database.model.traits.UserViewableEntity +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 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/com/it/curated/compose/database/model/MarmotGroupEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotGroupEvent.kt similarity index 78% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MarmotGroupEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotGroupEvent.kt index ab40c237..91ceee7c 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MarmotGroupEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotGroupEvent.kt @@ -1,12 +1,12 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.PrimaryKey -import com.it.curated.compose.database.model.traits.BroadcastableEntity -import com.it.curated.compose.database.model.traits.LocalStoreEntity -import com.it.curated.compose.database.model.traits.SoftDeletableEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity +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.vitorpamplona.quartz.marmot.mip03GroupMessages.GroupEvent import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlin.time.Clock diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MarmotInnerEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotInnerEvent.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MarmotInnerEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotInnerEvent.kt index 7abf1c57..4c90689b 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MarmotInnerEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotInnerEvent.kt @@ -1,13 +1,13 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.Ignore import androidx.room3.PrimaryKey -import com.it.curated.compose.database.model.traits.LocalStoreEntity -import com.it.curated.compose.database.model.traits.SoftDeletableEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity -import com.it.curated.compose.database.model.traits.UserViewableEntity +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 co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.mip01Groups.MarmotGroupData import com.vitorpamplona.quartz.marmot.mls.group.MlsGroup diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MarmotKeyPackage.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotKeyPackage.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MarmotKeyPackage.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotKeyPackage.kt index fa88ceee..7072192b 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MarmotKeyPackage.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotKeyPackage.kt @@ -1,12 +1,12 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.PrimaryKey -import com.it.curated.compose.database.model.traits.BroadcastableEntity -import com.it.curated.compose.database.model.traits.LocalStoreEntity -import com.it.curated.compose.database.model.traits.SoftDeletableEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity +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.vitorpamplona.quartz.nip01Core.core.HexKey import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MarmotKeyPackageBundle.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotKeyPackageBundle.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MarmotKeyPackageBundle.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotKeyPackageBundle.kt index aacdd2f2..58f831bb 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MarmotKeyPackageBundle.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotKeyPackageBundle.kt @@ -1,12 +1,12 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import androidx.room3.Entity import androidx.room3.Index import androidx.room3.PrimaryKey -import com.it.curated.compose.database.model.traits.BroadcastableEntity -import com.it.curated.compose.database.model.traits.LocalStoreEntity -import com.it.curated.compose.database.model.traits.SoftDeletableEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity +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.vitorpamplona.quartz.nip01Core.core.HexKey import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MarmotRetainedEpochSecret.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotRetainedEpochSecret.kt similarity index 82% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MarmotRetainedEpochSecret.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotRetainedEpochSecret.kt index 82f9e220..3d8db96f 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MarmotRetainedEpochSecret.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/MarmotRetainedEpochSecret.kt @@ -1,9 +1,9 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey -import com.it.curated.compose.database.model.traits.LocalStoreEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity +import to.curare.compose.database.model.traits.LocalStoreEntity +import to.curare.compose.database.model.traits.TimestampedEntity import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/Mention.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Mention.kt similarity index 78% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/Mention.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Mention.kt index 06fe224a..22e8cbd6 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/Mention.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Mention.kt @@ -1,12 +1,12 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.PrimaryKey -import com.it.curated.compose.database.model.traits.BroadcastableEntity -import com.it.curated.compose.database.model.traits.LocalStoreEntity -import com.it.curated.compose.database.model.traits.SoftDeletableEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity +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.vitorpamplona.quartz.nip01Core.core.HexKey import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/NegentropySynchronizeRequest.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/NegentropySynchronizeRequest.kt similarity index 82% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/NegentropySynchronizeRequest.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/NegentropySynchronizeRequest.kt index d70afc81..4ea02735 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/NegentropySynchronizeRequest.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/NegentropySynchronizeRequest.kt @@ -1,10 +1,10 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.Index import androidx.room3.PrimaryKey -import com.it.curated.compose.network.serialization.encodeToJsonString +import to.curare.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,13 +40,13 @@ data class NegentropySynchronizeRequest( val level: Int, - val synchronizationFilter: com.it.curated.compose.database.model.types.SynchronizationFilter, + val synchronizationFilter: to.curare.compose.database.model.types.SynchronizationFilter, override val nostrEventId: HexKey? = null, override val createdAt: Instant = Clock.System.now(), override val updatedAt: Instant = createdAt, -): com.it.curated.compose.database.model.traits.OptionalNostrEventEntity, - com.it.curated.compose.database.model.traits.TimestampedEntity { +): to.curare.compose.database.model.traits.OptionalNostrEventEntity, + to.curare.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... @@ -69,7 +69,7 @@ data class NegentropySynchronizeRequest( companion object { fun computeId( relayURL: String, - synchronizationFilter: com.it.curated.compose.database.model.types.SynchronizationFilter, + synchronizationFilter: to.curare.compose.database.model.types.SynchronizationFilter, ): String { return sha256( data = relayURL.toByteArray() diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/NegentropySynchronizeResult.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/NegentropySynchronizeResult.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/NegentropySynchronizeResult.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/NegentropySynchronizeResult.kt index d34b09da..494faf2b 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/NegentropySynchronizeResult.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/NegentropySynchronizeResult.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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, -): com.it.curated.compose.database.model.traits.TimestampedEntity \ No newline at end of file +): to.curare.compose.database.model.traits.TimestampedEntity \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/NostrEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/NostrEvent.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/NostrEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/NostrEvent.kt index 75d749ff..b28815c6 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/NostrEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/NostrEvent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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, -): com.it.curated.compose.database.model.traits.UnsignedNostrEventEntity, - com.it.curated.compose.database.model.traits.TimestampedEntity, - com.it.curated.compose.database.model.traits.LocalStoreEntity, - com.it.curated.compose.database.model.traits.BroadcastableEntity, - com.it.curated.compose.database.model.traits.SoftDeletableEntity { +): 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 { @Ignore private val logger = Logger.withTag("NostrEvent") @@ -384,8 +384,8 @@ data class NostrEvent( } } - val quotedNotes = com.it.curated.compose.ui.composable.widgets.content.ContentParser.parse(content.trimEnd('\n', '\r'), emptyMap(), emptyMap(), trimBlankLines = true) - .filterIsInstance() + val quotedNotes = to.curare.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/com/it/curated/compose/database/model/NostrEventRelay.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/NostrEventRelay.kt similarity index 78% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/NostrEventRelay.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/NostrEventRelay.kt index f032a598..ef2665d9 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/NostrEventRelay.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/NostrEventRelay.kt @@ -1,10 +1,10 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.Index -import com.it.curated.compose.database.model.traits.NostrEventEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity +import to.curare.compose.database.model.traits.NostrEventEntity +import to.curare.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/com/it/curated/compose/database/model/Participant.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Participant.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/Participant.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Participant.kt index 7f3a12b6..c2fac1c4 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/Participant.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Participant.kt @@ -1,12 +1,12 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.PrimaryKey -import com.it.curated.compose.database.model.traits.BroadcastableEntity -import com.it.curated.compose.database.model.traits.LocalStoreEntity -import com.it.curated.compose.database.model.traits.SoftDeletableEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity +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.vitorpamplona.quartz.marmot.mls.group.MlsGroup import com.vitorpamplona.quartz.marmot.mls.tree.Credential import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/Post.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Post.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/Post.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Post.kt index ac333101..c8fadace 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/Post.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Post.kt @@ -1,17 +1,17 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.Index import androidx.room3.PrimaryKey -import com.it.curated.compose.database.model.traits.BroadcastableEntity -import com.it.curated.compose.database.model.traits.LocalStoreEntity -import com.it.curated.compose.database.model.traits.NostrEventEntity -import com.it.curated.compose.database.model.traits.ProfilePublicKeyEntity -import com.it.curated.compose.database.model.traits.ReplyingToEntity -import com.it.curated.compose.database.model.traits.SoftDeletableEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity -import com.it.curated.compose.database.model.traits.UserViewableEntity +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.vitorpamplona.quartz.nip01Core.core.HexKey import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/Profile.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Profile.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/Profile.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Profile.kt index 65ecc0a9..3cae3c5f 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/Profile.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Profile.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -20,13 +20,13 @@ import androidx.room3.Index import androidx.room3.PrimaryKey import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip51Lists.relayLists.RelayFeedsListEvent -import com.it.curated.compose.ui.composable.navigation.routes.NostrEventDetailRoute -import com.it.curated.compose.ui.composable.widgets.profile.ProfileAvatar -import com.it.curated.compose.ui.composable.widgets.profile.ProfileColor -import com.it.curated.compose.ui.theme.CuratedTheme +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 kotlin.time.Clock import kotlin.time.Instant -import com.it.curated.compose.ui.theme.ConformancePreviews +import to.curare.compose.ui.theme.ConformancePreviews @Entity( foreignKeys = [ @@ -66,12 +66,12 @@ data class Profile( override val viewedAt: Instant? = null, override val deletedAt: Instant? = null, override val broadcastedAt: Instant? = null, -): com.it.curated.compose.database.model.traits.NostrEventEntity, - com.it.curated.compose.database.model.traits.TimestampedEntity, - com.it.curated.compose.database.model.traits.LocalStoreEntity, - com.it.curated.compose.database.model.traits.UserViewableEntity, - com.it.curated.compose.database.model.traits.BroadcastableEntity, - com.it.curated.compose.database.model.traits.SoftDeletableEntity { +): 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 { fun humanReadableNameOrPubkey(): String { return if (!displayName.isNullOrBlank()) { displayName @@ -99,7 +99,7 @@ data class Profile( } suspend fun profilePublicRelays( - nostrRepository: com.it.curated.compose.repository.NostrRepository + nostrRepository: to.curare.compose.repository.NostrRepository ): List? { val relays = nostrRepository.getNostrEvent( publicKey, @@ -127,7 +127,7 @@ data class Profile( @Composable fun RenderAsListItem( activeUserPublicKey: String, - onNavigateToEvent: (com.it.curated.compose.ui.composable.navigation.routes.Route) -> Unit + onNavigateToEvent: (to.curare.compose.ui.composable.navigation.routes.Route) -> Unit ) { Card( modifier = Modifier.fillMaxWidth().padding( @@ -180,7 +180,7 @@ fun ProfileRenderAsListItemPreview() { about = "I am the stone that the builder refused.", nostrEventId = "nostrEventId" ) - CuratedTheme { + CurareTheme { Surface( modifier = Modifier.padding(20.dp) ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/QuotedRelation.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/QuotedRelation.kt similarity index 79% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/QuotedRelation.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/QuotedRelation.kt index 45fcd523..4c73778e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/QuotedRelation.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/QuotedRelation.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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, -): com.it.curated.compose.database.model.traits.TimestampedEntity, - com.it.curated.compose.database.model.traits.LocalStoreEntity, - com.it.curated.compose.database.model.traits.UserViewableEntity, - com.it.curated.compose.database.model.traits.BroadcastableEntity, - com.it.curated.compose.database.model.traits.SoftDeletableEntity \ No newline at end of file +): 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 diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/Reaction.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Reaction.kt similarity index 73% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/Reaction.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Reaction.kt index 11144cad..2e692f64 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/Reaction.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Reaction.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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, -): com.it.curated.compose.database.model.traits.NostrEventEntity, - com.it.curated.compose.database.model.traits.ReplyingToEntity, - com.it.curated.compose.database.model.traits.ProfilePublicKeyEntity, - com.it.curated.compose.database.model.traits.TimestampedEntity, - com.it.curated.compose.database.model.traits.LocalStoreEntity, - com.it.curated.compose.database.model.traits.UserViewableEntity, - com.it.curated.compose.database.model.traits.BroadcastableEntity, - com.it.curated.compose.database.model.traits.SoftDeletableEntity +): 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 diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/RecentSearch.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/RecentSearch.kt similarity index 82% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/RecentSearch.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/RecentSearch.kt index 0b3c2270..70ae4a42 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/RecentSearch.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/RecentSearch.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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, -): com.it.curated.compose.database.model.traits.TimestampedEntity { +): to.curare.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/com/it/curated/compose/database/model/Relay.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Relay.kt similarity index 83% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/Relay.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Relay.kt index 7771b3b9..7c1ada2d 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/Relay.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Relay.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import androidx.room3.Entity diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/RepostedRelation.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/RepostedRelation.kt similarity index 79% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/RepostedRelation.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/RepostedRelation.kt index 4ae39bd7..4dd94ffc 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/RepostedRelation.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/RepostedRelation.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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, -): com.it.curated.compose.database.model.traits.TimestampedEntity, - com.it.curated.compose.database.model.traits.LocalStoreEntity, - com.it.curated.compose.database.model.traits.UserViewableEntity, - com.it.curated.compose.database.model.traits.BroadcastableEntity, - com.it.curated.compose.database.model.traits.SoftDeletableEntity \ No newline at end of file +): 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 diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/SynchronizeNostrEventRequest.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/SynchronizeNostrEventRequest.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/SynchronizeNostrEventRequest.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/SynchronizeNostrEventRequest.kt index e1f00abb..29752194 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/SynchronizeNostrEventRequest.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/SynchronizeNostrEventRequest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey @@ -41,15 +41,15 @@ data class SynchronizeNostrEventRequest( val level: Int, - val synchronizationFilters: Array, + val synchronizationFilters: Array, override val nostrEventId: HexKey? = null, override val unsignedNostrEventId: Long? = null, override val createdAt: Instant = Clock.System.now(), override val updatedAt: Instant = createdAt, -): com.it.curated.compose.database.model.traits.OptionalNostrEventEntity, - com.it.curated.compose.database.model.traits.UnsignedNostrEventEntity, - com.it.curated.compose.database.model.traits.TimestampedEntity { +): to.curare.compose.database.model.traits.OptionalNostrEventEntity, + to.curare.compose.database.model.traits.UnsignedNostrEventEntity, + to.curare.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/com/it/curated/compose/database/model/SynchronizeNostrEventResult.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/SynchronizeNostrEventResult.kt similarity index 79% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/SynchronizeNostrEventResult.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/SynchronizeNostrEventResult.kt index 6d2ad5b2..15cef7df 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/SynchronizeNostrEventResult.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/SynchronizeNostrEventResult.kt @@ -1,11 +1,11 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import androidx.room3.Entity import androidx.room3.ForeignKey import androidx.room3.Index import androidx.room3.PrimaryKey -import com.it.curated.compose.database.model.traits.OptionalNostrEventEntity -import com.it.curated.compose.database.model.traits.TimestampedEntity +import to.curare.compose.database.model.traits.OptionalNostrEventEntity +import to.curare.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/com/it/curated/compose/database/model/UnsignedNostrEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/UnsignedNostrEvent.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/UnsignedNostrEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/UnsignedNostrEvent.kt index 07895e63..96ab86bb 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/UnsignedNostrEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/UnsignedNostrEvent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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, -): com.it.curated.compose.database.model.traits.TimestampedEntity, - com.it.curated.compose.database.model.traits.LocalStoreEntity, - com.it.curated.compose.database.model.traits.BroadcastableEntity, - com.it.curated.compose.database.model.traits.SoftDeletableEntity { +): 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 { override fun equals(other: Any?): Boolean { if (this === other) return true diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/Zap.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Zap.kt similarity index 80% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/Zap.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Zap.kt index a6453f5b..9428e7b9 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/Zap.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/Zap.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.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, -) : com.it.curated.compose.database.model.traits.NostrEventEntity, - com.it.curated.compose.database.model.traits.TimestampedEntity, - com.it.curated.compose.database.model.traits.LocalStoreEntity, - com.it.curated.compose.database.model.traits.UserViewableEntity, - com.it.curated.compose.database.model.traits.BroadcastableEntity, - com.it.curated.compose.database.model.traits.SoftDeletableEntity +) : 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 diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/ChatRoomLastMessage.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/ChatRoomLastMessage.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/ChatRoomLastMessage.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/ChatRoomLastMessage.kt index 9a7337f9..3d5e8675 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/ChatRoomLastMessage.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/ChatRoomLastMessage.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model.intermdiate +package to.curare.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 [com.it.curated.compose.database.model.ChatMessage] itself: embedding the entity + * Not the [to.curare.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/LocalAccount.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalAccount.kt new file mode 100644 index 00000000..732059d5 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalAccount.kt @@ -0,0 +1,39 @@ +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 new file mode 100644 index 00000000..211aa313 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalBroadcastNostrEventRequest.kt @@ -0,0 +1,14 @@ +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 new file mode 100644 index 00000000..6fca08b1 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalChatMessage.kt @@ -0,0 +1,34 @@ +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/com/it/curated/compose/database/model/intermdiate/LocalChatRoom.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalChatRoom.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalChatRoom.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalChatRoom.kt index cadc4868..50b9e340 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalChatRoom.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalChatRoom.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model.intermdiate +package to.curare.compose.database.model.intermdiate import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -9,11 +9,11 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.withStyle import androidx.room3.Embedded import androidx.room3.Relation -import com.it.curated.compose.database.model.ChatMessage -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.Participant -import com.it.curated.compose.extensions.memberName -import com.it.curated.compose.ui.composable.widgets.profile.ProfileColor +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.extensions.memberName +import to.curare.compose.ui.composable.widgets.profile.ProfileColor import com.vitorpamplona.quartz.nip01Core.core.HexKey data class LocalChatRoom( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalFrostSigningSession.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalFrostSigningSession.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalFrostSigningSession.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalFrostSigningSession.kt index 4a7ae916..f10351f4 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalFrostSigningSession.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalFrostSigningSession.kt @@ -1,10 +1,10 @@ -package com.it.curated.compose.database.model.intermdiate +package to.curare.compose.database.model.intermdiate import androidx.room3.Embedded import androidx.room3.Relation -import com.it.curated.compose.database.model.FrostSigningItem -import com.it.curated.compose.database.model.FrostSigningSession -import com.it.curated.compose.database.model.Profile +import to.curare.compose.database.model.FrostSigningItem +import to.curare.compose.database.model.FrostSigningSession +import to.curare.compose.database.model.Profile /** * One signing session with everything a list of them has to show. diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalInReplyToNostrEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalInReplyToNostrEvent.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalInReplyToNostrEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalInReplyToNostrEvent.kt index 2be2a644..d8ca84bb 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalInReplyToNostrEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalInReplyToNostrEvent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model.intermdiate +package to.curare.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 com.it.curated.compose.extensions.toFormattedTimeAndDateString -import com.it.curated.compose.ui.composable.widgets.profile.ProfileAvatar +import to.curare.compose.extensions.toFormattedTimeAndDateString +import to.curare.compose.ui.composable.widgets.profile.ProfileAvatar data class LocalInReplyToNostrEvent( - @Embedded val inReplyToRelation: com.it.curated.compose.database.model.InReplyToRelation, + @Embedded val inReplyToRelation: to.curare.compose.database.model.InReplyToRelation, @Relation( parentColumns = ["inReplyToNostrEventId"], entityColumns = ["id"] ) - val nostrEvent: com.it.curated.compose.database.model.NostrEvent, + val nostrEvent: to.curare.compose.database.model.NostrEvent, @Relation( parentColumns = ["inReplyToProfilePublicKey"], entityColumns = ["publicKey"] ) - val profile: com.it.curated.compose.database.model.Profile?, + val profile: to.curare.compose.database.model.Profile?, @Relation( - entity = com.it.curated.compose.database.model.Mention::class, + entity = to.curare.compose.database.model.Mention::class, parentColumns = ["inReplyToNostrEventId"], entityColumns = ["mentioningNostrEventId"], ) diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalMention.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalMention.kt similarity index 50% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalMention.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalMention.kt index b05b0520..774300e2 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalMention.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalMention.kt @@ -1,14 +1,14 @@ -package com.it.curated.compose.database.model.intermdiate +package to.curare.compose.database.model.intermdiate import androidx.room3.Embedded import androidx.room3.Relation data class LocalMention( - @Embedded val mention: com.it.curated.compose.database.model.Mention, + @Embedded val mention: to.curare.compose.database.model.Mention, @Relation( parentColumns = ["mentionedPublicKey"], entityColumns = ["publicKey"] ) - val profile: com.it.curated.compose.database.model.Profile?, + val profile: to.curare.compose.database.model.Profile?, ) diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalNostrEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalNostrEvent.kt similarity index 82% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalNostrEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalNostrEvent.kt index cc923f76..26efdb30 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalNostrEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalNostrEvent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model.intermdiate +package to.curare.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 com.it.curated.compose.extensions.toFormattedTimeAndDateString +import to.curare.compose.extensions.toFormattedTimeAndDateString import com.vitorpamplona.quartz.nip01Core.core.HexKey -import com.it.curated.compose.ui.composable.widgets.content.RichContent -import com.it.curated.compose.ui.composable.widgets.profile.ProfileAvatar +import to.curare.compose.ui.composable.widgets.content.RichContent +import to.curare.compose.ui.composable.widgets.profile.ProfileAvatar data class LocalNostrEvent( - @Embedded val nostrEvent: com.it.curated.compose.database.model.NostrEvent, + @Embedded val nostrEvent: to.curare.compose.database.model.NostrEvent, @Relation( parentColumns = ["pubKey"], entityColumns = ["publicKey"] ) - val profile: com.it.curated.compose.database.model.Profile?, + val profile: to.curare.compose.database.model.Profile?, @Relation( - entity = com.it.curated.compose.database.model.RepostedRelation::class, + entity = to.curare.compose.database.model.RepostedRelation::class, parentColumns = ["id"], entityColumns = ["repostingNostrEventId"] ) val localRepostedNostrEvent: LocalRepostedNostrEvent? = null, @Relation( - entity = com.it.curated.compose.database.model.QuotedRelation::class, + entity = to.curare.compose.database.model.QuotedRelation::class, parentColumns = ["id"], entityColumns = ["quotingNostrEventId"] ) val localQuotedNostrEvent: LocalQuotedNostrEvent? = null, @Relation( - entity = com.it.curated.compose.database.model.InReplyToRelation::class, + entity = to.curare.compose.database.model.InReplyToRelation::class, parentColumns = ["id"], entityColumns = ["replyingNostrEventId"] ) val localInReplyToNostrEvent: LocalInReplyToNostrEvent? = null, @Relation( - entity = com.it.curated.compose.database.model.Mention::class, + entity = to.curare.compose.database.model.Mention::class, parentColumns = ["id"], entityColumns = ["mentioningNostrEventId"], ) diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalParticipant.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalParticipant.kt similarity index 50% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalParticipant.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalParticipant.kt index 874bcde5..53853429 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalParticipant.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalParticipant.kt @@ -1,14 +1,14 @@ -package com.it.curated.compose.database.model.intermdiate +package to.curare.compose.database.model.intermdiate import androidx.room3.Embedded import androidx.room3.Relation data class LocalParticipant( - @Embedded val participant: com.it.curated.compose.database.model.Participant, + @Embedded val participant: to.curare.compose.database.model.Participant, @Relation( parentColumns = ["participantPublicKey"], entityColumns = ["publicKey"] ) - val profile: com.it.curated.compose.database.model.Profile?, + val profile: to.curare.compose.database.model.Profile?, ) diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalPost.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalPost.kt similarity index 60% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalPost.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalPost.kt index ff11dffb..e636b124 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalPost.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalPost.kt @@ -1,9 +1,9 @@ -package com.it.curated.compose.database.model.intermdiate +package to.curare.compose.database.model.intermdiate import androidx.room3.Embedded import androidx.room3.Relation -import com.it.curated.compose.database.model.Post -import com.it.curated.compose.database.model.Profile +import to.curare.compose.database.model.Post +import to.curare.compose.database.model.Profile data class LocalPost( @Embedded val post: Post, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalProfile.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalProfile.kt similarity index 60% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalProfile.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalProfile.kt index e816e7b2..1ab64ac4 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalProfile.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalProfile.kt @@ -1,9 +1,9 @@ -package com.it.curated.compose.database.model.intermdiate +package to.curare.compose.database.model.intermdiate import androidx.room3.Embedded import androidx.room3.Relation -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile +import to.curare.compose.database.model.NostrEvent +import to.curare.compose.database.model.Profile data class LocalProfile( @Embedded val nostrEvent: NostrEvent, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalProfileWithFollowers.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalProfileWithFollowers.kt similarity index 57% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalProfileWithFollowers.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalProfileWithFollowers.kt index 4c3ce532..d2630a26 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalProfileWithFollowers.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalProfileWithFollowers.kt @@ -1,26 +1,26 @@ -package com.it.curated.compose.database.model.intermdiate +package to.curare.compose.database.model.intermdiate import androidx.room3.Embedded import androidx.room3.Junction import androidx.room3.Relation data class LocalProfileWithFollowers( - @Embedded val nostrEvent: com.it.curated.compose.database.model.NostrEvent, + @Embedded val nostrEvent: to.curare.compose.database.model.NostrEvent, @Relation( parentColumns = ["pubKey"], entityColumns = ["publicKey"] ) - val profile: com.it.curated.compose.database.model.Profile, + val profile: to.curare.compose.database.model.Profile, @Relation( parentColumns = ["pubKey"], entityColumns = ["publicKey"], associateBy = Junction( - value = com.it.curated.compose.database.model.Connection::class, + value = to.curare.compose.database.model.Connection::class, parentColumns = ["destinationPublicKey"], entityColumns = ["sourcePublicKey"] ) ) - val followers: List + val followers: List ) diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalProfileWithFollowing.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalProfileWithFollowing.kt similarity index 57% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalProfileWithFollowing.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalProfileWithFollowing.kt index d0a95a2a..a62d52eb 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalProfileWithFollowing.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalProfileWithFollowing.kt @@ -1,26 +1,26 @@ -package com.it.curated.compose.database.model.intermdiate +package to.curare.compose.database.model.intermdiate import androidx.room3.Embedded import androidx.room3.Junction import androidx.room3.Relation data class LocalProfileWithFollowing( - @Embedded val nostrEvent: com.it.curated.compose.database.model.NostrEvent, + @Embedded val nostrEvent: to.curare.compose.database.model.NostrEvent, @Relation( parentColumns = ["pubKey"], entityColumns = ["publicKey"] ) - val profile: com.it.curated.compose.database.model.Profile, + val profile: to.curare.compose.database.model.Profile, @Relation( parentColumns = ["pubKey"], entityColumns = ["publicKey"], associateBy = Junction( - value = com.it.curated.compose.database.model.Connection::class, + value = to.curare.compose.database.model.Connection::class, parentColumns = ["sourcePublicKey"], entityColumns = ["destinationPublicKey"] ) ) - val following: List + val following: List ) diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalQuotedNostrEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalQuotedNostrEvent.kt similarity index 82% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalQuotedNostrEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalQuotedNostrEvent.kt index c8e7b2f8..1c09dda7 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalQuotedNostrEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalQuotedNostrEvent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model.intermdiate +package to.curare.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 com.it.curated.compose.extensions.toFormattedTimeAndDateString +import to.curare.compose.extensions.toFormattedTimeAndDateString import com.vitorpamplona.quartz.nip01Core.core.HexKey -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.QuotedRelation -import com.it.curated.compose.ui.composable.widgets.content.RichContent -import com.it.curated.compose.ui.composable.widgets.profile.ProfileAvatar -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.theme.ConformancePreviews +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 data class LocalQuotedNostrEvent( - @Embedded val quotedRelation: com.it.curated.compose.database.model.QuotedRelation, + @Embedded val quotedRelation: to.curare.compose.database.model.QuotedRelation, @Relation( parentColumns = ["quotedNostrEventId"], entityColumns = ["id"] ) - val nostrEvent: com.it.curated.compose.database.model.NostrEvent, + val nostrEvent: to.curare.compose.database.model.NostrEvent, @Relation( parentColumns = ["quotedProfilePublicKey"], entityColumns = ["publicKey"] ) - val profile: com.it.curated.compose.database.model.Profile?, + val profile: to.curare.compose.database.model.Profile?, @Relation( - entity = com.it.curated.compose.database.model.Mention::class, + entity = to.curare.compose.database.model.Mention::class, parentColumns = ["quotedNostrEventId"], entityColumns = ["mentioningNostrEventId"], ) @@ -79,7 +79,7 @@ data class LocalQuotedNostrEvent( Text( text = staticIdentifier, style = MaterialTheme.typography.bodySmall, - color = com.it.curated.compose.ui.composable.widgets.profile.ProfileColor.fromProfile(profile) + color = to.curare.compose.ui.composable.widgets.profile.ProfileColor.fromProfile(profile) ) } } @@ -113,7 +113,7 @@ data class LocalQuotedNostrEvent( @ConformancePreviews @Composable private fun LocalQuotedNostrEventPreview() { - CuratedTheme { + CurareTheme { Surface( modifier = Modifier.padding(20.dp) ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalRepostedNostrEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalRepostedNostrEvent.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalRepostedNostrEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalRepostedNostrEvent.kt index a8af1e89..f5ceb57e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/intermdiate/LocalRepostedNostrEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/intermdiate/LocalRepostedNostrEvent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model.intermdiate +package to.curare.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 com.it.curated.compose.extensions.toFormattedTimeAndDateString -import com.it.curated.compose.ui.composable.widgets.profile.ProfileAvatar +import to.curare.compose.extensions.toFormattedTimeAndDateString +import to.curare.compose.ui.composable.widgets.profile.ProfileAvatar data class LocalRepostedNostrEvent( - @Embedded val repostedRelation: com.it.curated.compose.database.model.RepostedRelation, + @Embedded val repostedRelation: to.curare.compose.database.model.RepostedRelation, @Relation( parentColumns = ["repostedNostrEventId"], entityColumns = ["id"] ) - val nostrEvent: com.it.curated.compose.database.model.NostrEvent, + val nostrEvent: to.curare.compose.database.model.NostrEvent, @Relation( parentColumns = ["repostedProfilePublicKey"], entityColumns = ["publicKey"] ) - val profile: com.it.curated.compose.database.model.Profile?, + val profile: to.curare.compose.database.model.Profile?, @Relation( - entity = com.it.curated.compose.database.model.Mention::class, + entity = to.curare.compose.database.model.Mention::class, parentColumns = ["repostedNostrEventId"], entityColumns = ["mentioningNostrEventId"], ) diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/BroadcastableEntity.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/BroadcastableEntity.kt similarity index 63% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/BroadcastableEntity.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/BroadcastableEntity.kt index 3e2b84d6..94c814f9 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/BroadcastableEntity.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/BroadcastableEntity.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model.traits +package to.curare.compose.database.model.traits import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/LocalStoreEntity.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/LocalStoreEntity.kt similarity index 60% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/LocalStoreEntity.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/LocalStoreEntity.kt index 71ae1086..382c83e0 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/LocalStoreEntity.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/LocalStoreEntity.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model.traits +package to.curare.compose.database.model.traits import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/NostrEventEntity.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/NostrEventEntity.kt similarity index 67% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/NostrEventEntity.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/NostrEventEntity.kt index 7f6289ef..415b4b56 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/NostrEventEntity.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/NostrEventEntity.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model.traits +package to.curare.compose.database.model.traits import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/OptionalNostrEventEntity.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/OptionalNostrEventEntity.kt similarity index 69% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/OptionalNostrEventEntity.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/OptionalNostrEventEntity.kt index d6fd3480..c5dfa6ba 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/OptionalNostrEventEntity.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/OptionalNostrEventEntity.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model.traits +package to.curare.compose.database.model.traits import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/ProfilePublicKeyEntity.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/ProfilePublicKeyEntity.kt similarity index 69% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/ProfilePublicKeyEntity.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/ProfilePublicKeyEntity.kt index 91ff2107..33d4b63c 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/ProfilePublicKeyEntity.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/ProfilePublicKeyEntity.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model.traits +package to.curare.compose.database.model.traits import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/ReplyingToEntity.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/ReplyingToEntity.kt similarity index 67% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/ReplyingToEntity.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/ReplyingToEntity.kt index 1a7bbc68..05d0963e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/ReplyingToEntity.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/ReplyingToEntity.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model.traits +package to.curare.compose.database.model.traits import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/SoftDeletableEntity.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/SoftDeletableEntity.kt similarity index 62% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/SoftDeletableEntity.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/SoftDeletableEntity.kt index c56854c9..9b924f28 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/SoftDeletableEntity.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/SoftDeletableEntity.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model.traits +package to.curare.compose.database.model.traits import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/TimestampedEntity.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/TimestampedEntity.kt similarity index 67% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/TimestampedEntity.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/TimestampedEntity.kt index b36e8033..16369ee6 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/TimestampedEntity.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/TimestampedEntity.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model.traits +package to.curare.compose.database.model.traits import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/UnsignedNostrEventEntity.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/UnsignedNostrEventEntity.kt similarity index 57% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/UnsignedNostrEventEntity.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/UnsignedNostrEventEntity.kt index 7b3a5f07..0977d328 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/UnsignedNostrEventEntity.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/UnsignedNostrEventEntity.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model.traits +package to.curare.compose.database.model.traits interface UnsignedNostrEventEntity { val unsignedNostrEventId: Long? diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/UserViewableEntity.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/UserViewableEntity.kt similarity index 61% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/UserViewableEntity.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/UserViewableEntity.kt index 1fb26a9a..4f68f15f 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/traits/UserViewableEntity.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/traits/UserViewableEntity.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model.traits +package to.curare.compose.database.model.traits import kotlin.time.Instant 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 new file mode 100644 index 00000000..43156dac --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/typealiases/HexArray.kt @@ -0,0 +1,4 @@ +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 new file mode 100644 index 00000000..34c7592a --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/typealiases/KindArray.kt @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..bd852363 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/typealiases/SynchronizationFilterArray.kt @@ -0,0 +1,3 @@ +package to.curare.compose.database.model.typealiases + +typealias SynchronizationFilterArray = Array \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/types/ChatRoomType.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/ChatRoomType.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/types/ChatRoomType.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/ChatRoomType.kt index e6a738df..9ffe7ff8 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/types/ChatRoomType.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/ChatRoomType.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model.types +package to.curare.compose.database.model.types import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/types/DkgApprovalStep.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/DkgApprovalStep.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/types/DkgApprovalStep.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/DkgApprovalStep.kt index 709a1450..6e36527d 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/types/DkgApprovalStep.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/DkgApprovalStep.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model.types +package to.curare.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/com/it/curated/compose/database/model/types/DkgRitualStage.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/DkgRitualStage.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/types/DkgRitualStage.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/DkgRitualStage.kt index 1b0fa0c5..b3f896ad 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/types/DkgRitualStage.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/DkgRitualStage.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model.types +package to.curare.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/com/it/curated/compose/database/model/types/FrostSigningStage.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/FrostSigningStage.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/types/FrostSigningStage.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/FrostSigningStage.kt index a0be44a9..e081c750 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/types/FrostSigningStage.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/FrostSigningStage.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model.types +package to.curare.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/com/it/curated/compose/database/model/types/MarmotReindexReport.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/MarmotReindexReport.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/types/MarmotReindexReport.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/MarmotReindexReport.kt index e28eb7b9..0dc786e6 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/types/MarmotReindexReport.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/MarmotReindexReport.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model.types +package to.curare.compose.database.model.types /** * What a replay of a room's stored kind:445 events did. diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/types/SynchronizationFilter.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/SynchronizationFilter.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/types/SynchronizationFilter.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/SynchronizationFilter.kt index 38772554..14c1f991 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/types/SynchronizationFilter.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/model/types/SynchronizationFilter.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model.types +package to.curare.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/com/it/curated/compose/database/query/NostrEventFilterQuery.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/query/NostrEventFilterQuery.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/query/NostrEventFilterQuery.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/query/NostrEventFilterQuery.kt index 4135e3aa..c65c27d0 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/query/NostrEventFilterQuery.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/query/NostrEventFilterQuery.kt @@ -1,8 +1,8 @@ -package com.it.curated.compose.database.query +package to.curare.compose.database.query import androidx.room3.RoomRawQuery import androidx.sqlite.SQLiteStatement -import com.it.curated.compose.database.model.types.SynchronizationFilter +import to.curare.compose.database.model.types.SynchronizationFilter import kotlinx.serialization.json.Json /** diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabaseChatRepository.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseChatRepository.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabaseChatRepository.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseChatRepository.kt index d06b8e34..c8b399aa 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabaseChatRepository.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseChatRepository.kt @@ -1,27 +1,27 @@ -package com.it.curated.compose.database.repository +package to.curare.compose.database.repository -import com.it.curated.compose.database.GENESIS_AT -import com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.model.GroupKeyState -import com.it.curated.compose.database.model.GroupSignedEvent -import com.it.curated.compose.managers.ChronicleManager -import com.it.curated.compose.managers.FrostSigningManager -import com.it.curated.compose.managers.GroupKeyStateManager -import com.it.curated.compose.managers.MarmotGroupCreation -import com.it.curated.compose.managers.SubgroupManager -import com.it.curated.compose.nostr.GroupNostrProfile -import com.it.curated.compose.nostr.GroupPost -import com.it.curated.compose.nostr.GroupRelayList -import com.it.curated.compose.nostr.GroupRelaySet -import com.it.curated.compose.database.model.ChatMessage -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.GiftWrapPayload -import com.it.curated.compose.database.model.MarmotInnerEvent -import com.it.curated.compose.database.model.MarmotKeyPackage -import com.it.curated.compose.database.model.Participant -import com.it.curated.compose.database.model.intermdiate.LocalChatMessage -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.types.MarmotReindexReport +import to.curare.compose.database.GENESIS_AT +import to.curare.compose.database.CurareDatabase +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.GroupPost +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 co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.mip02Welcome.WelcomeEvent import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -48,9 +48,9 @@ import kotlin.time.Clock import kotlin.time.Instant class DatabaseChatRepository( - private val database: CuratedDatabase, + private val database: CurareDatabase, private val scope: CoroutineScope -): com.it.curated.compose.repository.ChatRepository { +): to.curare.compose.repository.ChatRepository { val logger = Logger.withTag(TAG) override suspend fun createMarmotGroup( @@ -478,7 +478,7 @@ class DatabaseChatRepository( override fun updateChatRoomSubject( publicKey: String, subject: String - ): com.it.curated.compose.database.model.ChatRoom? { + ): to.curare.compose.database.model.ChatRoom? { // TODO: Update chatRoom with subject... return null } diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabaseDkgRepository.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseDkgRepository.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabaseDkgRepository.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseDkgRepository.kt index f92b0f77..c08da542 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabaseDkgRepository.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseDkgRepository.kt @@ -1,22 +1,22 @@ -package com.it.curated.compose.database.repository +package to.curare.compose.database.repository -import com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.model.DkgParticipantMessage -import com.it.curated.compose.database.model.DkgSession -import com.it.curated.compose.database.model.types.DkgRitualStage -import com.it.curated.compose.database.model.FrostSigningSession -import com.it.curated.compose.database.model.GroupKeyState -import com.it.curated.compose.database.model.GroupSignedEvent -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.intermdiate.LocalFrostSigningSession -import com.it.curated.compose.database.model.types.DkgApprovalStep -import com.it.curated.compose.managers.ChillDkgRitualManager -import com.it.curated.compose.managers.GroupKeyStateManager -import com.it.curated.compose.managers.SubgroupManager -import com.it.curated.compose.managers.SharedKeyDerivation -import com.it.curated.compose.nostr.frost.GroupKeyStateEvent -import com.it.curated.compose.nostr.subgroup.SubgroupBirthCertificateEvent -import com.it.curated.compose.repository.DkgRepository +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 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: CuratedDatabase, + private val database: CurareDatabase, private val scope: CoroutineScope ): DkgRepository { private val logger = Logger.withTag(TAG) diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabaseFrostSigningRepository.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseFrostSigningRepository.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabaseFrostSigningRepository.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseFrostSigningRepository.kt index 2ed20ca2..ed728c30 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabaseFrostSigningRepository.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseFrostSigningRepository.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.repository +package to.curare.compose.database.repository import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.Event @@ -7,17 +7,17 @@ import com.vitorpamplona.quartz.nip01Core.core.Kind import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow -import com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.model.FrostSignerMessage -import com.it.curated.compose.database.model.FrostSigningItem -import com.it.curated.compose.database.model.FrostSigningSession -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.intermdiate.LocalFrostSigningSession -import com.it.curated.compose.managers.FrostSigningManager -import com.it.curated.compose.repository.FrostSigningRepository +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.LocalChatRoom +import to.curare.compose.database.model.intermdiate.LocalFrostSigningSession +import to.curare.compose.managers.FrostSigningManager +import to.curare.compose.repository.FrostSigningRepository class DatabaseFrostSigningRepository( - private val database: CuratedDatabase, + private val database: CurareDatabase, private val scope: CoroutineScope ): FrostSigningRepository { private val logger = Logger.withTag(TAG) diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabaseMantraRepository.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseMantraRepository.kt similarity index 81% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabaseMantraRepository.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseMantraRepository.kt index b307a603..393e95cd 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabaseMantraRepository.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseMantraRepository.kt @@ -1,23 +1,23 @@ -package com.it.curated.compose.database.repository +package to.curare.compose.database.repository import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.CoroutineScope -import com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.model.MantraArtifact -import com.it.curated.compose.database.model.MantraArtifactVersion -import com.it.curated.compose.database.model.MantraChapter -import com.it.curated.compose.database.model.MantraChunk -import com.it.curated.compose.database.model.MantraDialect -import com.it.curated.compose.database.model.MantraTranslationArtifactVersion -import com.it.curated.compose.database.model.MantraTranslationChapter -import com.it.curated.compose.database.model.MantraTranslationChunk -import com.it.curated.compose.database.model.MarmotInnerEvent -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.repository.MantraRepository +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 class DatabaseMantraRepository( - val database: CuratedDatabase, + val database: CurareDatabase, val scope: CoroutineScope ): MantraRepository { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabaseMarmotRepository.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseMarmotRepository.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabaseMarmotRepository.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseMarmotRepository.kt index 558f9be5..db2643b9 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabaseMarmotRepository.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseMarmotRepository.kt @@ -1,13 +1,13 @@ -package com.it.curated.compose.database.repository +package to.curare.compose.database.repository -import com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.model.MarmotInnerEvent -import com.it.curated.compose.database.model.MarmotKeyPackageBundle -import com.it.curated.compose.database.model.UnsignedNostrEvent -import com.it.curated.compose.exceptions.MarmotMissingChatGroupException -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.nostr.Relays -import com.it.curated.compose.repository.MarmotRepository +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 co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageEvent import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageRotationManager.Companion.KEY_PACKAGE_LIFETIME_SECONDS @@ -37,7 +37,7 @@ import kotlin.time.Instant * Based on MlsGroupManager in quarts... */ class DatabaseMarmotRepository( - val database: CuratedDatabase, + val database: CurareDatabase, val scope: CoroutineScope ): MarmotRepository { private val logger = Logger.withTag(TAG) diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabaseNostrRepository.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseNostrRepository.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabaseNostrRepository.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseNostrRepository.kt index dd1f9866..e6263de2 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/database/repository/DatabaseNostrRepository.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseNostrRepository.kt @@ -1,17 +1,17 @@ -package com.it.curated.compose.database.repository +package to.curare.compose.database.repository -import com.it.curated.compose.database.GENESIS_AT -import com.it.curated.compose.database.model.BroadcastNostrEventRequest -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.UnsignedNostrEvent -import com.it.curated.compose.database.model.intermdiate.LocalAccount -import com.it.curated.compose.database.model.intermdiate.LocalBroadcastNostrEventRequest -import com.it.curated.compose.database.model.types.SynchronizationFilter -import com.it.curated.compose.database.dao.NostrEventDao -import com.it.curated.compose.database.query.NostrEventFilterQuery -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.nostr.Relays +import to.curare.compose.database.GENESIS_AT +import to.curare.compose.database.model.BroadcastNostrEventRequest +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 co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageRelayListEvent import com.vitorpamplona.quartz.marmot.mip03GroupMessages.GroupEvent @@ -56,9 +56,9 @@ import kotlin.time.Clock import kotlin.time.Instant class DatabaseNostrRepository( - private val database: com.it.curated.compose.database.CuratedDatabase, + private val database: to.curare.compose.database.CurareDatabase, private val scope: CoroutineScope -): com.it.curated.compose.repository.NostrRepository, com.it.curated.compose.repository.RelayRepository { +): to.curare.compose.repository.NostrRepository, to.curare.compose.repository.RelayRepository { companion object { const val TAG = "DatabaseNostrRepository" @@ -89,14 +89,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: com.it.curated.compose.database.model.Connection) { + override suspend fun deleteConnection(connection: to.curare.compose.database.model.Connection) { database.connectionDao().delete(connection) } @@ -108,11 +108,11 @@ class DatabaseNostrRepository( return database.broadcastNostrEventRequestDao().observeBroadcastNostrEventRequestsByStatus("pending") } - override suspend fun observePendingSynchronizeNostrEventRequests(): Flow { + override suspend fun observePendingSynchronizeNostrEventRequests(): Flow { return database.synchronizeNostrEventRequestDao().observeSynchronizeNostrEventRequestsByStatus("pending") } - override suspend fun observePendingNegentropySynchronizeRequests(): Flow { + override suspend fun observePendingNegentropySynchronizeRequests(): Flow { return database.negentropySynchronizeRequestDao().observeNegentropySynchronizeRequestsByStatus("pending") } @@ -232,8 +232,8 @@ class DatabaseNostrRepository( publicKey: HexKey, mentionedPublicKeys: List, textInput: String, - inReplyToNostrEvent: com.it.curated.compose.database.model.intermdiate.LocalNostrEvent?, - quotedNostrEvent: com.it.curated.compose.database.model.intermdiate.LocalNostrEvent?, + inReplyToNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent?, + quotedNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent?, onError: () -> Unit, onSuccess: () -> Unit ) { @@ -410,7 +410,7 @@ class DatabaseNostrRepository( if (status == "published") { val broadcastNostrEventReceiptId = database.broadcastNostrEventReceiptDao().upsert( - com.it.curated.compose.database.model.BroadcastNostrEventReceipt( + to.curare.compose.database.model.BroadcastNostrEventReceipt( nostrEventId = broadcastNostrEventRequest.nostrEventId, unsignedNostrEventId = broadcastNostrEventRequest.unsignedNostrEventId, isAccepted = true, @@ -423,7 +423,7 @@ class DatabaseNostrRepository( )?.let { chatMessageBroadcastNostrEventRequestRelation -> // This is actually a chatMessage related broadcast event... database.chatMessageBroadcastNostrEventReceiptRelationDao().upsert( - com.it.curated.compose.database.model.ChatMessageBroadcastNostrEventReceiptRelation( + to.curare.compose.database.model.ChatMessageBroadcastNostrEventReceiptRelation( chatMessageId = chatMessageBroadcastNostrEventRequestRelation.chatMessageId, broadcastNostrEventReceiptId = broadcastNostrEventReceiptId ) @@ -486,7 +486,7 @@ class DatabaseNostrRepository( } } - override suspend fun synchronizeNostrEventRequestProcessed(synchronizeNostrEventRequest: com.it.curated.compose.database.model.SynchronizeNostrEventRequest) { + override suspend fun synchronizeNostrEventRequestProcessed(synchronizeNostrEventRequest: to.curare.compose.database.model.SynchronizeNostrEventRequest) { database.synchronizeNostrEventRequestDao().upsert( synchronizeNostrEventRequest.copy( status = "sent", @@ -495,7 +495,7 @@ class DatabaseNostrRepository( ) } - override suspend fun negentropySynchronizeRequestProcessed(negentropySynchronizeRequest: com.it.curated.compose.database.model.NegentropySynchronizeRequest) { + override suspend fun negentropySynchronizeRequestProcessed(negentropySynchronizeRequest: to.curare.compose.database.model.NegentropySynchronizeRequest) { database.negentropySynchronizeRequestDao().upsert( negentropySynchronizeRequest.copy( status = "sent", @@ -504,7 +504,7 @@ class DatabaseNostrRepository( ) } - override suspend fun saveBroadcastReceipt(broadcastNostrEventReceipt: com.it.curated.compose.database.model.BroadcastNostrEventReceipt) { + override suspend fun saveBroadcastReceipt(broadcastNostrEventReceipt: to.curare.compose.database.model.BroadcastNostrEventReceipt) { database.broadcastNostrEventReceiptDao().upsert( broadcastNostrEventReceipt ) @@ -512,7 +512,7 @@ class DatabaseNostrRepository( override suspend fun saveNostrEvent( nostrEvent: NostrEvent, - synchronizeNostrEventRequest: com.it.curated.compose.database.model.SynchronizeNostrEventRequest, + synchronizeNostrEventRequest: to.curare.compose.database.model.SynchronizeNostrEventRequest, synchronizationRelayURLs: List, activeKeyPair: KeyPair, ) { @@ -544,7 +544,7 @@ class DatabaseNostrRepository( override suspend fun saveNostrEvent( nostrEvent: NostrEvent, - negentropySynchronizeRequest: com.it.curated.compose.database.model.NegentropySynchronizeRequest, + negentropySynchronizeRequest: to.curare.compose.database.model.NegentropySynchronizeRequest, synchronizationRelayURLs: List, activeKeyPair: KeyPair ) { @@ -600,14 +600,14 @@ class DatabaseNostrRepository( } override suspend fun queueSynchronizeNostrEvent( - synchronizeNostrEventRequests: List, + synchronizeNostrEventRequests: List, ) { database.synchronizeNostrEventRequestDao().insert( synchronizeNostrEventRequests ) } - override suspend fun queueNegentropySynchronizeRequest(negentropySynchronizeRequests: List) { + override suspend fun queueNegentropySynchronizeRequest(negentropySynchronizeRequests: List) { database.negentropySynchronizeRequestDao().insert( negentropySynchronizeRequests ) @@ -627,7 +627,7 @@ class DatabaseNostrRepository( ) } - override suspend fun observeNostrFeed(): Flow> { + override suspend fun observeNostrFeed(): Flow> { return database.nostrEventDao().observeNostrEvents( kinds = arrayOf( TextNoteEvent.KIND, @@ -638,7 +638,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") @@ -770,50 +770,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: com.it.curated.compose.database.model.RecentSearch) { + override suspend fun removeRecentSearch(recentSearch: to.curare.compose.database.model.RecentSearch) { database.recentSearchDao().deleteRecentSearch(recentSearch) } override suspend fun saveSearchQuery( query: String, - synchronizationFilterArray: com.it.curated.compose.database.model.typealiases.SynchronizationFilterArray? + synchronizationFilterArray: to.curare.compose.database.model.typealiases.SynchronizationFilterArray? ) { database.recentSearchDao().upsert( - com.it.curated.compose.database.model.RecentSearch( + to.curare.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/to/curare/compose/database/repository/DatabasePostRepository.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabasePostRepository.kt new file mode 100644 index 00000000..bef10167 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabasePostRepository.kt @@ -0,0 +1,5 @@ +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 new file mode 100644 index 00000000..99debbb5 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/database/repository/DatabaseSearchRepository.kt @@ -0,0 +1,12 @@ +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 new file mode 100644 index 00000000..ca4964bd --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/GiftWrapImpersonationException.kt @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..9253f892 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/GiftWrapPayloadUnsupportedException.kt @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..cebb5048 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/GiftWrapSealDecryptionException.kt @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..21aadeef --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/GiftWrapUnsealException.kt @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..431dcfbf --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/InvalidNostrPrivateKeyException.kt @@ -0,0 +1,3 @@ +package to.curare.compose.exceptions + +class InvalidNostrPrivateKeyException: RuntimeException() \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/MarmotMissingChatGroupException.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingChatGroupException.kt similarity index 73% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/MarmotMissingChatGroupException.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingChatGroupException.kt index c7651a63..463092db 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/MarmotMissingChatGroupException.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingChatGroupException.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.exceptions +package to.curare.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/com/it/curated/compose/exceptions/MarmotMissingKeyPackageBundleException.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingKeyPackageBundleException.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/MarmotMissingKeyPackageBundleException.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingKeyPackageBundleException.kt index 3a2c9107..75499fe8 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/MarmotMissingKeyPackageBundleException.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingKeyPackageBundleException.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.exceptions +package to.curare.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/com/it/curated/compose/exceptions/MarmotMissingKeyPackageEventIdException.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingKeyPackageEventIdException.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/MarmotMissingKeyPackageEventIdException.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingKeyPackageEventIdException.kt index 837e08bb..6974701d 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/MarmotMissingKeyPackageEventIdException.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingKeyPackageEventIdException.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.exceptions +package to.curare.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/com/it/curated/compose/exceptions/MarmotMissingNostrGroupDataExtension.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingNostrGroupDataExtension.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/MarmotMissingNostrGroupDataExtension.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingNostrGroupDataExtension.kt index b357020c..bc7b7095 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/MarmotMissingNostrGroupDataExtension.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingNostrGroupDataExtension.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.exceptions +package to.curare.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/com/it/curated/compose/exceptions/MarmotMissingRetainedExporterSecretsException.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingRetainedExporterSecretsException.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/MarmotMissingRetainedExporterSecretsException.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingRetainedExporterSecretsException.kt index 697b30ee..a39d1f36 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/MarmotMissingRetainedExporterSecretsException.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotMissingRetainedExporterSecretsException.kt @@ -1,3 +1,3 @@ -package com.it.curated.compose.exceptions +package to.curare.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/com/it/curated/compose/exceptions/MarmotNotMemberOfChatGroupException.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotNotMemberOfChatGroupException.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/MarmotNotMemberOfChatGroupException.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotNotMemberOfChatGroupException.kt index 5c3f88a4..e7631f77 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/MarmotNotMemberOfChatGroupException.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotNotMemberOfChatGroupException.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.exceptions +package to.curare.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/com/it/curated/compose/exceptions/MarmotUnprocessableInnerEventException.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotUnprocessableInnerEventException.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/MarmotUnprocessableInnerEventException.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotUnprocessableInnerEventException.kt index 7f328cbe..86016f56 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/MarmotUnprocessableInnerEventException.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotUnprocessableInnerEventException.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.exceptions +package to.curare.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/com/it/curated/compose/exceptions/MarmotUnsupportedWireFormatException.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotUnsupportedWireFormatException.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/MarmotUnsupportedWireFormatException.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotUnsupportedWireFormatException.kt index 7839ee58..d8618bfd 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/MarmotUnsupportedWireFormatException.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotUnsupportedWireFormatException.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.exceptions +package to.curare.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/com/it/curated/compose/exceptions/MarmotWelcomeEventMissingKeyPackageEventIdException.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotWelcomeEventMissingKeyPackageEventIdException.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/MarmotWelcomeEventMissingKeyPackageEventIdException.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotWelcomeEventMissingKeyPackageEventIdException.kt index 454723f2..65abb9ee 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/MarmotWelcomeEventMissingKeyPackageEventIdException.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotWelcomeEventMissingKeyPackageEventIdException.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.exceptions +package to.curare.compose.exceptions class MarmotWelcomeEventMissingKeyPackageEventIdException(message: String? = null, cause: Throwable? = null) : Exception(message, cause) { } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/MarmotWelcomeMismatchedGroupIdException.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotWelcomeMismatchedGroupIdException.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/MarmotWelcomeMismatchedGroupIdException.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotWelcomeMismatchedGroupIdException.kt index 391da009..b326a267 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/MarmotWelcomeMismatchedGroupIdException.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotWelcomeMismatchedGroupIdException.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.exceptions +package to.curare.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/com/it/curated/compose/exceptions/MarmotWelcomeMissingGroupIdException.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotWelcomeMissingGroupIdException.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/MarmotWelcomeMissingGroupIdException.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotWelcomeMissingGroupIdException.kt index e4090ef1..a115d486 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/MarmotWelcomeMissingGroupIdException.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/MarmotWelcomeMissingGroupIdException.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.exceptions +package to.curare.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/com/it/curated/compose/exceptions/NetworkException.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/NetworkException.kt similarity index 51% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/NetworkException.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/NetworkException.kt index e19bd406..7af971a1 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/NetworkException.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/NetworkException.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.exceptions +package to.curare.compose.exceptions class NetworkException( message: String? = null, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/NostrNoticeException.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/NostrNoticeException.kt similarity index 51% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/NostrNoticeException.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/NostrNoticeException.kt index 95b91672..7472eebf 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/NostrNoticeException.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/NostrNoticeException.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.exceptions +package to.curare.compose.exceptions class NostrNoticeException( val reason: String?, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/NostrPublishException.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/NostrPublishException.kt similarity index 64% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/NostrPublishException.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/NostrPublishException.kt index fa26dba7..14cb843e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/NostrPublishException.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/NostrPublishException.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.exceptions +package to.curare.compose.exceptions class NostrPublishException( override val cause: Throwable? = null, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/SignatureException.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/SignatureException.kt new file mode 100644 index 00000000..954c9c75 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/SignatureException.kt @@ -0,0 +1,3 @@ +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/com/it/curated/compose/exceptions/SigningKeyNotFoundException.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/SigningKeyNotFoundException.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/SigningKeyNotFoundException.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/SigningKeyNotFoundException.kt index 00c3d0cd..1650da98 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/exceptions/SigningKeyNotFoundException.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/SigningKeyNotFoundException.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.exceptions +package to.curare.compose.exceptions class SigningKeyNotFoundException(message: String? = null, cause: Throwable? = null) : SignatureException( message, diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/SigningRejectedException.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/SigningRejectedException.kt new file mode 100644 index 00000000..c55b1aca --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/exceptions/SigningRejectedException.kt @@ -0,0 +1,3 @@ +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/com/it/curated/compose/extensions/Credentials.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Credentials.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/extensions/Credentials.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Credentials.kt index 62eb7678..f4701968 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/extensions/Credentials.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Credentials.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.extensions +package to.curare.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 com.it.curated.compose.exceptions.InvalidNostrPrivateKeyException() + throw to.curare.compose.exceptions.InvalidNostrPrivateKeyException() } } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/extensions/Instant.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Instant.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/extensions/Instant.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Instant.kt index a3d2389c..6e3f3ad1 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/extensions/Instant.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Instant.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.extensions +package to.curare.compose.extensions import kotlinx.datetime.LocalDate import kotlinx.datetime.LocalDateTime diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/extensions/Member.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Member.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/extensions/Member.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Member.kt index d9a0a2eb..ce913336 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/extensions/Member.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Member.kt @@ -1,6 +1,6 @@ -package com.it.curated.compose.extensions +package to.curare.compose.extensions -import com.it.curated.compose.database.model.intermdiate.LocalParticipant +import to.curare.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/com/it/curated/compose/extensions/MlsGroupExtensions.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/extensions/MlsGroupExtensions.kt similarity index 80% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/extensions/MlsGroupExtensions.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/extensions/MlsGroupExtensions.kt index c0aecdd7..078af351 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/extensions/MlsGroupExtensions.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/extensions/MlsGroupExtensions.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.extensions +package to.curare.compose.extensions import com.vitorpamplona.quartz.marmot.mls.group.MlsGroup diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/extensions/Phoenix.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Phoenix.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/extensions/Phoenix.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Phoenix.kt index 0b94d2ad..bd4b8d99 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/extensions/Phoenix.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Phoenix.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.extensions +package to.curare.compose.extensions import fr.acinq.phoenix.PhoenixGlobal import fr.acinq.phoenix.data.StartBusinessResult diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/extensions/WalletManagerExtension.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/extensions/WalletManagerExtension.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/extensions/WalletManagerExtension.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/extensions/WalletManagerExtension.kt index 591dccec..18151fd6 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/extensions/WalletManagerExtension.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/extensions/WalletManagerExtension.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.extensions +package to.curare.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/managers/AuxDatabaseManager.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/AuxDatabaseManager.kt new file mode 100644 index 00000000..59fdbd92 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/AuxDatabaseManager.kt @@ -0,0 +1,26 @@ +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/com/it/curated/compose/managers/ChillDkgRitualManager.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/ChillDkgRitualManager.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/ChillDkgRitualManager.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/managers/ChillDkgRitualManager.kt index e7bd801b..0d326413 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/ChillDkgRitualManager.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/ChillDkgRitualManager.kt @@ -1,17 +1,17 @@ -package com.it.curated.compose.managers +package to.curare.compose.managers -import com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.model.ChatMessage -import com.it.curated.compose.database.model.DkgParticipantMessage -import com.it.curated.compose.database.model.DkgSession -import com.it.curated.compose.database.model.GiftWrapPayload -import com.it.curated.compose.database.model.MarmotInnerEvent -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.types.ChatRoomType -import com.it.curated.compose.database.model.types.DkgApprovalStep -import com.it.curated.compose.database.model.types.DkgRitualStage -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.nostr.dkg.DkgRitualEvents +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 co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -92,8 +92,9 @@ 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 survived the rebrand to Curated on purpose. It is an input - * to the hash, so renaming it derives a different host key from the same seed -- + * 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 + * 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. */ @@ -175,7 +176,7 @@ object ChillDkgRitualManager { * user error. */ suspend fun proposeRitual( - database: CuratedDatabase, + database: CurareDatabase, localChatRoom: LocalChatRoom, userPublicKey: HexKey, nostrPrivateKey: ByteArray, @@ -334,7 +335,7 @@ object ChillDkgRitualManager { * signature on the payload. */ suspend fun processRitualPayload( - database: CuratedDatabase, + database: CurareDatabase, localChatRoom: LocalChatRoom, innerEvent: Event, userPublicKey: HexKey, @@ -389,7 +390,7 @@ object ChillDkgRitualManager { * session, whether it was just created or already known. */ private suspend fun acceptProposal( - database: CuratedDatabase, + database: CurareDatabase, localChatRoom: LocalChatRoom, innerEvent: Event, sessionId: String, @@ -503,7 +504,7 @@ object ChillDkgRitualManager { * in the wrong one is a stall with nothing to blame it on. */ private suspend fun replayStoredMessages( - database: CuratedDatabase, + database: CurareDatabase, localChatRoom: LocalChatRoom, session: DkgSession ) { @@ -562,7 +563,7 @@ object ChillDkgRitualManager { * clobber each other's columns. */ private suspend fun record( - database: CuratedDatabase, + database: CurareDatabase, session: DkgSession, innerEvent: Event ): Boolean { @@ -665,7 +666,7 @@ object ChillDkgRitualManager { * message is delivered twice — repeats no work and skips none. */ private suspend fun advance( - database: CuratedDatabase, + database: CurareDatabase, localChatRoom: LocalChatRoom, sessionId: String, nostrPrivateKey: ByteArray @@ -841,7 +842,7 @@ object ChillDkgRitualManager { * threshold, and hashes them into the session identity itself. */ private suspend fun hostPublicKeys( - database: CuratedDatabase, + database: CurareDatabase, session: DkgSession ): List? { val hostKeys = database.dkgSessionDao().getMessagesByKind(session.id, DkgRitualEvents.HOST_KEY) @@ -916,7 +917,7 @@ object ChillDkgRitualManager { * coordinator steps require exactly `n` entries. */ private suspend fun orderedPayloads( - database: CuratedDatabase, + database: CurareDatabase, session: DkgSession, kind: Kind ): List? { @@ -950,7 +951,7 @@ object ChillDkgRitualManager { /** This device's own message of [kind], if it has published one. */ private suspend fun ownMessage( - database: CuratedDatabase, + database: CurareDatabase, session: DkgSession, kind: Kind ): DkgParticipantMessage? = database.dkgSessionDao().getMessage( @@ -967,7 +968,7 @@ object ChillDkgRitualManager { * copying from a stale snapshot. */ private suspend fun update( - database: CuratedDatabase, + database: CurareDatabase, session: DkgSession, transform: (DkgSession) -> DkgSession ): DkgSession { @@ -988,7 +989,7 @@ object ChillDkgRitualManager { * out of order cannot walk the UI back down the ladder. */ private suspend fun moveTo( - database: CuratedDatabase, + database: CurareDatabase, session: DkgSession, stage: DkgRitualStage ): DkgSession = update(database, session) { current -> @@ -998,7 +999,7 @@ object ChillDkgRitualManager { } private suspend fun fail( - database: CuratedDatabase, + database: CurareDatabase, session: DkgSession, reason: String, // Whoever ended it. A member who sent FAILURE, or this device when it hit a @@ -1029,7 +1030,7 @@ object ChillDkgRitualManager { ) } - private suspend fun announceStarted(database: CuratedDatabase, session: DkgSession) = announce( + private suspend fun announceStarted(database: CurareDatabase, session: DkgSession) = announce( database = database, session = session, messageType = ChatMessage.TYPE_DKG_STARTED, @@ -1064,7 +1065,7 @@ object ChillDkgRitualManager { * screen offers an approval that does nothing, or none while the ritual sits * still. */ - suspend fun pendingApproval(database: CuratedDatabase, session: DkgSession): DkgApprovalStep? { + suspend fun pendingApproval(database: CurareDatabase, session: DkgSession): DkgApprovalStep? { if (session.stage == DkgRitualStage.COMPLETE || session.stage == DkgRitualStage.FAILED) return null if (session.hostKeyApprovedAt == null) return DkgApprovalStep.HOST_KEY @@ -1096,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: CuratedDatabase, + database: CurareDatabase, localChatRoom: LocalChatRoom, sessionId: String, step: DkgApprovalStep, @@ -1141,7 +1142,7 @@ object ChillDkgRitualManager { * one. */ private suspend fun announceApprovalNeeded( - database: CuratedDatabase, + database: CurareDatabase, session: DkgSession, step: DkgApprovalStep ) { @@ -1193,7 +1194,7 @@ object ChillDkgRitualManager { * cannot. */ private suspend fun announceStep( - database: CuratedDatabase, + database: CurareDatabase, session: DkgSession, kind: Kind, actor: HexKey @@ -1233,7 +1234,7 @@ object ChillDkgRitualManager { } /** The stored session, for reading a column back before overwriting it. */ - private suspend fun current(database: CuratedDatabase, session: DkgSession): DkgSession = + private suspend fun current(database: CurareDatabase, session: DkgSession): DkgSession = database.dkgSessionDao().getSessionById(session.id) ?: session /** @@ -1253,7 +1254,7 @@ object ChillDkgRitualManager { * write over. Those guards are what keep the transcript honest. */ private suspend fun announce( - database: CuratedDatabase, + database: CurareDatabase, session: DkgSession, messageType: String, content: String, @@ -1278,7 +1279,7 @@ object ChillDkgRitualManager { } private suspend fun publishHostKey( - database: CuratedDatabase, + database: CurareDatabase, localChatRoom: LocalChatRoom, session: DkgSession ) = publishOwn(database, localChatRoom, session, DkgRitualEvents.HOST_KEY, session.hostPublicKey) @@ -1294,7 +1295,7 @@ object ChillDkgRitualManager { * group waits on forever. */ private suspend fun publishOwn( - database: CuratedDatabase, + database: CurareDatabase, localChatRoom: LocalChatRoom, session: DkgSession, kind: Kind, @@ -1344,7 +1345,7 @@ object ChillDkgRitualManager { * invite the whole parent into the child's key. */ private suspend fun broadcast( - database: CuratedDatabase, + database: CurareDatabase, localChatRoom: LocalChatRoom, session: DkgSession, kind: Kind, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/ChronicleManager.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/ChronicleManager.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/ChronicleManager.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/managers/ChronicleManager.kt index 276a24df..6c9d895e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/ChronicleManager.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/ChronicleManager.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.managers +package to.curare.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 com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.model.ChatMessage -import com.it.curated.compose.database.model.GroupSignedEvent -import com.it.curated.compose.database.model.MarmotInnerEvent -import com.it.curated.compose.extensions.toHex +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 kotlin.time.Clock import kotlin.time.Instant -import com.it.curated.compose.nostr.chronicle.ChronicleEvent -import com.it.curated.compose.nostr.chronicle.ChronicleRequestEvent -import com.it.curated.compose.nostr.frost.GroupKeyStateEvent -import com.it.curated.compose.nostr.nip30303.TranslationChunkEvent +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 /** * 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: CuratedDatabase, + database: CurareDatabase, 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: CuratedDatabase, + database: CurareDatabase, chatRoomId: String, userPublicKey: HexKey, ): Boolean { @@ -213,7 +213,7 @@ object ChronicleManager { * would look like an answer. */ suspend fun sendTo( - database: CuratedDatabase, + database: CurareDatabase, chatRoomId: String, userPublicKey: HexKey, recipient: HexKey, @@ -267,7 +267,7 @@ object ChronicleManager { * [ChatMessage.CHRONICLE_TYPES]. */ private suspend fun announce( - database: CuratedDatabase, + database: CurareDatabase, 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: CuratedDatabase, + database: CurareDatabase, chatRoomId: String, userPublicKey: HexKey, kind: Int, @@ -369,7 +369,7 @@ object ChronicleManager { * builds the list. */ suspend fun receive( - database: CuratedDatabase, + database: CurareDatabase, 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: CuratedDatabase, + database: CurareDatabase, 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: CuratedDatabase, + database: CurareDatabase, chatRoomId: String, stored: MarmotInnerEvent, ): Outcome { @@ -628,7 +628,7 @@ object ChronicleManager { * written in. */ private suspend fun signedEventsOf( - database: CuratedDatabase, + database: CurareDatabase, chatRoomId: String, ): List { val recorded = database.groupSignedEventDao() @@ -750,7 +750,7 @@ object ChronicleManager { "in docs/member-chronicle.md." ) private suspend fun rebuiltEventsOf( - database: CuratedDatabase, + database: CurareDatabase, chatRoomId: String, ): List = buildList { database.mantraDialectDao().getDialectsByChatRoomId(chatRoomId).forEach { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/FrostSigningManager.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/FrostSigningManager.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/FrostSigningManager.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/managers/FrostSigningManager.kt index 3bcae8ec..6c1b8ef1 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/FrostSigningManager.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/FrostSigningManager.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.managers +package to.curare.compose.managers import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.Event @@ -22,22 +22,22 @@ import fr.acinq.bitcoin.utils.Either import kotlin.time.Clock import kotlin.time.Instant import kotlinx.coroutines.CancellationException -import com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.model.ChatMessage -import com.it.curated.compose.database.model.DkgSession -import com.it.curated.compose.database.model.FrostSignerMessage -import com.it.curated.compose.database.model.FrostSigningItem -import com.it.curated.compose.database.model.FrostSigningSession -import com.it.curated.compose.database.model.GiftWrapPayload -import com.it.curated.compose.database.model.GroupKeyState -import com.it.curated.compose.database.model.GroupSignedEvent -import com.it.curated.compose.database.model.MarmotInnerEvent -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.types.DkgRitualStage -import com.it.curated.compose.database.model.types.FrostSigningStage -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.nostr.dkg.DkgRitualEvents -import com.it.curated.compose.nostr.frost.FrostSigningEvents +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 /** * Signs a nostr event with a group's FROST threshold key, in one of its rooms. @@ -165,7 +165,7 @@ object FrostSigningManager { * got; anything else falls back as though none was given. */ suspend fun proposeSigning( - database: CuratedDatabase, + database: CurareDatabase, localChatRoom: LocalChatRoom, userPublicKey: HexKey, kind: Kind, @@ -202,7 +202,7 @@ object FrostSigningManager { * session by construction. */ suspend fun proposeSigningBatch( - database: CuratedDatabase, + database: CurareDatabase, localChatRoom: LocalChatRoom, userPublicKey: HexKey, events: List>, @@ -237,7 +237,7 @@ object FrostSigningManager { * chunk row whose chapter does not exist yet is a foreign key violation. */ suspend fun proposeSigningBatch( - database: CuratedDatabase, + database: CurareDatabase, localChatRoom: LocalChatRoom, userPublicKey: HexKey, lead: EventTemplate<*>, @@ -314,7 +314,7 @@ object FrostSigningManager { * and every step recomputed from stored inputs. */ suspend fun processSigningPayload( - database: CuratedDatabase, + database: CurareDatabase, localChatRoom: LocalChatRoom, innerEvent: Event, userPublicKey: HexKey @@ -365,7 +365,7 @@ object FrostSigningManager { * enough to make it happen. */ private suspend fun acceptProposal( - database: CuratedDatabase, + database: CurareDatabase, localChatRoom: LocalChatRoom, innerEvent: Event, sessionId: String, @@ -499,7 +499,7 @@ object FrostSigningManager { * in the wrong one is a stall with nothing to blame it on. */ private suspend fun replayStoredMessages( - database: CuratedDatabase, + database: CurareDatabase, localChatRoom: LocalChatRoom, session: FrostSigningSession ) { @@ -554,7 +554,7 @@ object FrostSigningManager { * so the caller stops rather than trying to advance a dead one. */ private suspend fun record( - database: CuratedDatabase, + database: CurareDatabase, session: FrostSigningSession, innerEvent: Event ): Boolean { @@ -661,7 +661,7 @@ object FrostSigningManager { * message is delivered twice — repeats no work and skips none. */ private suspend fun advance( - database: CuratedDatabase, + database: CurareDatabase, localChatRoom: LocalChatRoom, sessionId: String ) { @@ -889,7 +889,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: CuratedDatabase, session: FrostSigningSession) { + private suspend fun complete(database: CurareDatabase, session: FrostSigningSession) { val items = database.frostSigningSessionDao().getItems(session.id) if (items.isEmpty() || items.any { !it.isSigned() }) return @@ -959,7 +959,7 @@ object FrostSigningManager { * this returns a boolean rather than nothing. */ private suspend fun recordSignedEvents( - database: CuratedDatabase, + database: CurareDatabase, session: FrostSigningSession, signedEvents: List ): Boolean = try { @@ -995,7 +995,7 @@ object FrostSigningManager { * succeeded. It is logged and the session still completes. */ private suspend fun applySignedEvent( - database: CuratedDatabase, + database: CurareDatabase, session: FrostSigningSession, signedEvent: Event, recorded: Boolean @@ -1079,7 +1079,7 @@ object FrostSigningManager { * set on a batch that is entirely ready. */ private suspend fun applyAggregate( - database: CuratedDatabase, + database: CurareDatabase, session: FrostSigningSession, signerIds: List, aggregatedNonces: List @@ -1111,7 +1111,7 @@ object FrostSigningManager { * signature against the old ones. */ private suspend fun applySignatures( - database: CuratedDatabase, + database: CurareDatabase, session: FrostSigningSession, signatures: List ): Boolean { @@ -1138,7 +1138,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: CuratedDatabase, session: FrostSigningSession): Boolean { + private suspend fun isSigned(database: CurareDatabase, session: FrostSigningSession): Boolean { val total = database.frostSigningSessionDao().countItems(session.id) return total > 0 && database.frostSigningSessionDao().countSignedItems(session.id) == total @@ -1157,7 +1157,7 @@ object FrostSigningManager { * aggregate. */ private suspend fun orderedNonces( - database: CuratedDatabase, + database: CurareDatabase, session: FrostSigningSession, items: Int ): List>>? { @@ -1194,7 +1194,7 @@ object FrostSigningManager { * matched to the set the session was created with. */ private suspend fun orderedPartialSignatures( - database: CuratedDatabase, + database: CurareDatabase, session: FrostSigningSession, signerIds: List, items: Int @@ -1248,7 +1248,7 @@ object FrostSigningManager { /** [splitPayload] against the number of events this session signs. */ private suspend fun splitForSession( - database: CuratedDatabase, + database: CurareDatabase, session: FrostSigningSession, payload: String ): List? { @@ -1273,7 +1273,7 @@ object FrostSigningManager { * with the ceremony that made the key. */ private suspend fun signerIds( - database: CuratedDatabase, + database: CurareDatabase, key: DkgSession ): Map { val hostKeys = database.dkgSessionDao() @@ -1288,7 +1288,7 @@ object FrostSigningManager { } private suspend fun signerIdOf( - database: CuratedDatabase, + database: CurareDatabase, key: DkgSession, member: HexKey ): Int? = signerIds(database, key)[member] @@ -1336,7 +1336,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: CuratedDatabase, chatRoomId: String): DkgSession? { + suspend fun completedKey(database: CurareDatabase, chatRoomId: String): DkgSession? { GroupKeyStateManager.keyStateFor(database, chatRoomId)?.let { state -> database.dkgSessionDao().getSessionById(state.dkgSessionId)?.takeIf { key -> key.stage == DkgRitualStage.COMPLETE && @@ -1358,7 +1358,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: CuratedDatabase, chatRoomId: String): Boolean = + suspend fun canSign(database: CurareDatabase, chatRoomId: String): Boolean = completedKey(database, chatRoomId) != null /** @@ -1412,7 +1412,7 @@ object FrostSigningManager { * signs as the group's threshold key, which is what it always did. */ private suspend fun signingPath( - database: CuratedDatabase, + database: CurareDatabase, localChatRoom: LocalChatRoom, key: DkgSession ): List? { @@ -1500,7 +1500,7 @@ object FrostSigningManager { /** This device's own message of [kind], if it has published one. */ private suspend fun ownMessage( - database: CuratedDatabase, + database: CurareDatabase, session: FrostSigningSession, kind: Kind ): FrostSignerMessage? = database.frostSigningSessionDao().getMessage( @@ -1517,7 +1517,7 @@ object FrostSigningManager { * copying from a stale snapshot. */ private suspend fun update( - database: CuratedDatabase, + database: CurareDatabase, session: FrostSigningSession, transform: (FrostSigningSession) -> FrostSigningSession ): FrostSigningSession { @@ -1538,7 +1538,7 @@ object FrostSigningManager { * walk the UI back down the ladder. */ private suspend fun moveTo( - database: CuratedDatabase, + database: CurareDatabase, session: FrostSigningSession, stage: FrostSigningStage ): FrostSigningSession = update(database, session) { current -> @@ -1549,7 +1549,7 @@ object FrostSigningManager { } private suspend fun fail( - database: CuratedDatabase, + database: CurareDatabase, session: FrostSigningSession, reason: String, culprit: HexKey = session.userPublicKey @@ -1574,7 +1574,7 @@ object FrostSigningManager { /** The stored session, for reading a column back before overwriting it. */ private suspend fun current( - database: CuratedDatabase, + database: CurareDatabase, session: FrostSigningSession ): FrostSigningSession = database.frostSigningSessionDao().getSessionById(session.id) ?: session @@ -1611,7 +1611,7 @@ object FrostSigningManager { * stale screen left open across a redelivery should not publish anything. */ suspend fun approve( - database: CuratedDatabase, + database: CurareDatabase, localChatRoom: LocalChatRoom, sessionId: String ) { @@ -1639,7 +1639,7 @@ object FrostSigningManager { * Silence is indistinguishable from a phone in a pocket. */ suspend fun decline( - database: CuratedDatabase, + database: CurareDatabase, localChatRoom: LocalChatRoom, sessionId: String ) { @@ -1663,7 +1663,7 @@ object FrostSigningManager { ) } - private suspend fun announceStarted(database: CuratedDatabase, session: FrostSigningSession) { + private suspend fun announceStarted(database: CurareDatabase, session: FrostSigningSession) { val count = database.frostSigningSessionDao().countItems(session.id) announce( @@ -1686,7 +1686,7 @@ object FrostSigningManager { * each one. */ private suspend fun announceApprovalNeeded( - database: CuratedDatabase, + database: CurareDatabase, session: FrostSigningSession ) { if (current(database, session).approvalRequestedAt != null) return @@ -1715,7 +1715,7 @@ object FrostSigningManager { * than what it is called. */ private suspend fun announceStep( - database: CuratedDatabase, + database: CurareDatabase, session: FrostSigningSession, kind: Kind, actor: HexKey @@ -1773,7 +1773,7 @@ object FrostSigningManager { * see [ChatMessage.frostSigningSessionId]. */ private suspend fun announce( - database: CuratedDatabase, + database: CurareDatabase, session: FrostSigningSession, messageType: String, content: String, @@ -1805,7 +1805,7 @@ object FrostSigningManager { * group waits on forever. */ private suspend fun publishOwn( - database: CuratedDatabase, + database: CurareDatabase, localChatRoom: LocalChatRoom, session: FrostSigningSession, kind: Kind, @@ -1851,7 +1851,7 @@ object FrostSigningManager { * failing to tag somebody only stops them hearing. */ private suspend fun broadcast( - database: CuratedDatabase, + database: CurareDatabase, localChatRoom: LocalChatRoom, session: FrostSigningSession, kind: Kind, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/GroupKeyStateManager.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/GroupKeyStateManager.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/GroupKeyStateManager.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/managers/GroupKeyStateManager.kt index 7ab73688..6e5085fb 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/GroupKeyStateManager.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/GroupKeyStateManager.kt @@ -1,19 +1,19 @@ -package com.it.curated.compose.managers +package to.curare.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 com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.model.DkgSession -import com.it.curated.compose.database.model.FrostSigningSession -import com.it.curated.compose.database.model.GroupKeyState -import com.it.curated.compose.database.model.GroupSignedEvent -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.nostr.frost.GroupKeyStateEvent -import com.it.curated.compose.nostr.subgroup.SubgroupBirthCertificateEvent -import com.it.curated.compose.nostr.subgroup.SubgroupParentage +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 /** * 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: CuratedDatabase, chatRoomId: String): GroupKeyState? = + suspend fun keyStateFor(database: CurareDatabase, chatRoomId: String): GroupKeyState? = database.groupKeyStateDao().getByChatRoomId(chatRoomId) /** @@ -107,7 +107,7 @@ object GroupKeyStateManager { * that dialect's aggregation succeeding. */ suspend fun propose( - database: CuratedDatabase, + database: CurareDatabase, localChatRoom: LocalChatRoom, userPublicKey: HexKey, key: DkgSession, @@ -198,7 +198,7 @@ object GroupKeyStateManager { * signed event waits on file in the meantime. */ suspend fun record( - database: CuratedDatabase, + database: CurareDatabase, 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: CuratedDatabase, chatRoomId: String): GroupKeyState? { + suspend fun adopt(database: CurareDatabase, 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: CuratedDatabase, chatRoomId: String): GroupKeyState? = + suspend fun signedStateFor(database: CurareDatabase, 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: CuratedDatabase, + database: CurareDatabase, chatRoomId: String ): GroupSignedEvent? = signedAmong(database.groupSignedEventDao().getByKind(GroupKeyStateEvent.KIND), chatRoomId) diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/LiveSubscriptionManager.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/LiveSubscriptionManager.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/LiveSubscriptionManager.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/managers/LiveSubscriptionManager.kt index 9a012879..dac22b86 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/LiveSubscriptionManager.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/LiveSubscriptionManager.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.managers +package to.curare.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 com.it.curated.compose.database.model.NegentropySynchronizeRequest -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.types.SynchronizationFilter -import com.it.curated.compose.network.relays.LiveSubscriptionTransport -import com.it.curated.compose.network.relays.isRelayBackPressure -import com.it.curated.compose.network.sockets.NostrIncomingMessage -import com.it.curated.compose.network.sockets.endsLiveSubscription -import com.it.curated.compose.nostr.MemberProfileSync -import com.it.curated.compose.nostr.Nip17Filters -import com.it.curated.compose.nostr.Relays -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.NostrRepository +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 kotlin.concurrent.Volatile import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.minutes diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/MarmotGroupCreation.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotGroupCreation.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/MarmotGroupCreation.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotGroupCreation.kt index 75c05e98..99b529e2 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/MarmotGroupCreation.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotGroupCreation.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.managers +package to.curare.compose.managers import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.mip01Groups.MarmotGroupData @@ -13,12 +13,12 @@ import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.first import kotlin.time.Clock import kotlinx.coroutines.withTimeoutOrNull -import com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.model.MarmotKeyPackage -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.nostr.Relays -import com.it.curated.compose.repository.ChatRepository +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 /** * Creating a Marmot room at an id the group's key derives, once, for every flow @@ -103,7 +103,7 @@ object MarmotGroupCreation { * convention cannot be forgotten. */ suspend fun create( - database: CuratedDatabase, + database: CurareDatabase, chatRepository: ChatRepository, groupId: String, name: String, @@ -226,7 +226,7 @@ object MarmotGroupCreation { * anything being wrong. */ private suspend fun stampAdmins( - database: CuratedDatabase, + database: CurareDatabase, groupId: String, adminPublicKeys: Set ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/MarmotGroupName.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotGroupName.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/MarmotGroupName.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotGroupName.kt index c8e25d76..0bbf7825 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/MarmotGroupName.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotGroupName.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.managers +package to.curare.compose.managers /** * What a Marmot room is called: a `#`, then the name. diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/MarmotInboundManager.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotInboundManager.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/MarmotInboundManager.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotInboundManager.kt index dceb011f..d01f4ddf 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/MarmotInboundManager.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotInboundManager.kt @@ -1,12 +1,12 @@ -package com.it.curated.compose.managers +package to.curare.compose.managers -import com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.model.Participant -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.exceptions.MarmotMissingChatGroupException -import com.it.curated.compose.exceptions.MarmotUnsupportedWireFormatException -import com.it.curated.compose.extensions.exporterSecret -import com.it.curated.compose.extensions.toHex +import to.curare.compose.database.CurareDatabase +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 co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.GroupEventResult import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageEvent @@ -33,12 +33,12 @@ import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip17Dm.settings.ChatMessageRelayListEvent import com.vitorpamplona.quartz.nip59Giftwrap.wraps.GiftWrapEvent -import com.it.curated.compose.database.GENESIS_AT -import com.it.curated.compose.database.model.NegentropySynchronizeRequest -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.types.SynchronizationFilter -import com.it.curated.compose.nostr.MarmotDirectMessage -import com.it.curated.compose.nostr.Relays +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 kotlin.time.Clock object MarmotInboundManager { @@ -103,7 +103,7 @@ object MarmotInboundManager { } suspend fun processGroupMembershipChanges( - database: CuratedDatabase, + database: CurareDatabase, localChatRoom: LocalChatRoom, mlsGroup: MlsGroup, ) { @@ -221,7 +221,7 @@ object MarmotInboundManager { } suspend fun processGroupEvent( - database: CuratedDatabase, + database: CurareDatabase, activeKeyPair: KeyPair, localChatRoom: LocalChatRoom, mlsGroup: MlsGroup, @@ -288,7 +288,7 @@ object MarmotInboundManager { suspend fun processPrivateMessage( - database: CuratedDatabase, + database: CurareDatabase, mlsGroup: MlsGroup, mlsMessage: MlsMessage, groupEvent: GroupEvent @@ -349,7 +349,7 @@ object MarmotInboundManager { } private suspend fun decryptMessageBytes( - database: CuratedDatabase, + database: CurareDatabase, mlsGroup: MlsGroup, messageBytes: ByteArray, ): DecryptedMessage { @@ -395,7 +395,7 @@ object MarmotInboundManager { } public suspend fun processPublicMessage( - database: CuratedDatabase, + database: CurareDatabase, mlsGroup: MlsGroup, mlsMessage: MlsMessage, groupEvent: GroupEvent @@ -439,7 +439,7 @@ object MarmotInboundManager { } private suspend fun handleCommitEvent( - database: CuratedDatabase, + database: CurareDatabase, mlsGroup: MlsGroup, groupEvent: GroupEvent ): GroupEventResult { @@ -490,7 +490,7 @@ object MarmotInboundManager { } private suspend fun applyCommit( - database: CuratedDatabase, + database: CurareDatabase, mlsGroup: MlsGroup, commitEvent: GroupEvent, ): GroupEventResult = @@ -631,7 +631,7 @@ object MarmotInboundManager { * @param confirmationTag optional confirmation tag for verification */ suspend fun processCommit( - database: CuratedDatabase, + database: CurareDatabase, mlsGroup: MlsGroup, commitBytes: ByteArray, senderLeafIndex: Int, @@ -704,7 +704,7 @@ object MarmotInboundManager { } private suspend fun persistGroup( - database: CuratedDatabase, + database: CurareDatabase, mlsGroup: MlsGroup ) { val nostrGroupId = mlsGroup.currentMarmotData()?.nostrGroupId ?: mlsGroup.groupId.toHex() diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/MarmotReindexSweep.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotReindexSweep.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/MarmotReindexSweep.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotReindexSweep.kt index c53f87d5..d834bf32 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/MarmotReindexSweep.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MarmotReindexSweep.kt @@ -1,8 +1,8 @@ -package com.it.curated.compose.managers +package to.curare.compose.managers import co.touchlab.kermit.Logger import kotlinx.coroutines.CancellationException -import com.it.curated.compose.database.model.types.MarmotReindexReport +import to.curare.compose.database.model.types.MarmotReindexReport /** * Reads a backlog of group events again, repeatedly, until repeating stops helping. diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/MlsGroupCache.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MlsGroupCache.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/MlsGroupCache.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/managers/MlsGroupCache.kt index 0916871e..12b96f8c 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/MlsGroupCache.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/MlsGroupCache.kt @@ -1,8 +1,8 @@ -package com.it.curated.compose.managers +package to.curare.compose.managers import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.mls.group.MlsGroup -import com.it.curated.compose.extensions.toHex +import to.curare.compose.extensions.toHex import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/SharedKeyDerivation.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/SharedKeyDerivation.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/SharedKeyDerivation.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/managers/SharedKeyDerivation.kt index 024e817f..237d0445 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/SharedKeyDerivation.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/SharedKeyDerivation.kt @@ -1,6 +1,6 @@ -package com.it.curated.compose.managers +package to.curare.compose.managers -import com.it.curated.compose.extensions.toHex +import to.curare.compose.extensions.toHex import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray import fr.acinq.bitcoin.ByteVector @@ -62,12 +62,13 @@ object SharedKeyDerivation { * coexist with keys already derived under this one, and distinct from any other * use of the same threshold key. * - * The `mantra/` prefix survived the rebrand to Curated on purpose, 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 Curated off from any Mantra peer - * sharing a group -- the two would derive different keys from the same threshold - * key and their partial signatures would aggregate to nothing that verifies. + * 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 + * 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 + * 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. */ private const val TWEAK_TAG = "mantra/shared-key/tweak/v1" @@ -133,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 [com.it.curated.compose.nostr.frost.tags.FrostDerivationPathTag], + * `GroupKeyStateEvent`'s [to.curare.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/com/it/curated/compose/managers/SubgroupManager.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/SubgroupManager.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/SubgroupManager.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/managers/SubgroupManager.kt index 0fa4b5d3..1af11eec 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/SubgroupManager.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/SubgroupManager.kt @@ -1,17 +1,17 @@ -package com.it.curated.compose.managers +package to.curare.compose.managers import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey -import com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.model.DkgSession -import com.it.curated.compose.database.model.FrostSigningSession -import com.it.curated.compose.database.model.GroupKeyState -import com.it.curated.compose.database.model.GroupSignedEvent -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.types.DkgRitualStage -import com.it.curated.compose.nostr.subgroup.SubgroupBirthCertificateEvent -import com.it.curated.compose.nostr.subgroup.SubgroupParentage +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 /** * 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 [com.it.curated.compose.database.model.types.ChatRoomType.MINIMUM_ROBUST_GROUP_SIZE] + * The same floor [to.curare.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: CuratedDatabase, + database: CurareDatabase, parentRoom: LocalChatRoom, adminPublicKeys: Set, coordinatorPublicKey: HexKey @@ -194,7 +194,7 @@ object SubgroupManager { * this depends on it. */ suspend fun proposeBirthCertificate( - database: CuratedDatabase, + database: CurareDatabase, parentRoom: LocalChatRoom, userPublicKey: HexKey, key: DkgSession, @@ -261,7 +261,7 @@ object SubgroupManager { * than an accumulation, which is what it is for. */ suspend fun certificateFor( - database: CuratedDatabase, + database: CurareDatabase, subgroupChatRoomId: String, parentChatRoomId: String ): GroupSignedEvent? = @@ -296,7 +296,7 @@ object SubgroupManager { * a statement nobody will keep. */ suspend fun proposeSubgroupKeyState( - database: CuratedDatabase, + database: CurareDatabase, ceremonyRoom: LocalChatRoom, userPublicKey: HexKey, key: DkgSession, @@ -371,7 +371,7 @@ object SubgroupManager { * child replaces the first rather than standing beside it. */ suspend fun subgroupsOf( - database: CuratedDatabase, + database: CurareDatabase, parentChatRoomId: String ): List = database.groupSignedEventDao() @@ -417,7 +417,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: CuratedDatabase, chatRoomId: String): HexKey? = + suspend fun parentOf(database: CurareDatabase, chatRoomId: String): HexKey? = database.groupKeyStateDao().getByChatRoomId(chatRoomId)?.parentChatRoomId /** @@ -436,7 +436,7 @@ object SubgroupManager { * refusal. */ suspend fun record( - database: CuratedDatabase, + database: CurareDatabase, chatRoomId: String, innerEvent: Event ): GroupSignedEvent? { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/TranslationScaffold.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/TranslationScaffold.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/TranslationScaffold.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/managers/TranslationScaffold.kt index 7a418d07..2d7ea0ad 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/TranslationScaffold.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/managers/TranslationScaffold.kt @@ -1,10 +1,10 @@ -package com.it.curated.compose.managers +package to.curare.compose.managers import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate -import com.it.curated.compose.database.model.MantraChapter -import com.it.curated.compose.database.model.MantraTranslationChapter -import com.it.curated.compose.nostr.nip30303.TranslationChapterEvent +import to.curare.compose.database.model.MantraChapter +import to.curare.compose.database.model.MantraTranslationChapter +import to.curare.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/network/UserAgent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/network/UserAgent.kt new file mode 100644 index 00000000..9ba0e36e --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/network/UserAgent.kt @@ -0,0 +1,11 @@ +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/com/it/curated/compose/network/dto/RelayDTO.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/network/dto/RelayDTO.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/network/dto/RelayDTO.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/network/dto/RelayDTO.kt index d77c2caa..5e96970d 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/dto/RelayDTO.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/network/dto/RelayDTO.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.network.dto +package to.curare.compose.network.dto import kotlinx.serialization.Serializable @@ -29,7 +29,7 @@ data class RelayDTO( } } -fun com.it.curated.compose.database.model.Relay.mapToRelayDTO() = +fun to.curare.compose.database.model.Relay.mapToRelayDTO() = RelayDTO( url = this.url, read = this.read, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/relays/FallbackRelays.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/FallbackRelays.kt similarity index 72% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/network/relays/FallbackRelays.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/FallbackRelays.kt index 03f23d10..48a6e24c 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/relays/FallbackRelays.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/FallbackRelays.kt @@ -1,6 +1,6 @@ -package com.it.curated.compose.network.relays +package to.curare.compose.network.relays -import com.it.curated.compose.network.dto.toRelayDTO +import to.curare.compose.network.dto.toRelayDTO val FALLBACK_RELAYS = listOf( "wss://relay.primal.net", diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/relays/LiveSubscriptionTransport.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/LiveSubscriptionTransport.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/network/relays/LiveSubscriptionTransport.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/LiveSubscriptionTransport.kt index aa3b8d53..c2ec67a8 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/relays/LiveSubscriptionTransport.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/LiveSubscriptionTransport.kt @@ -1,8 +1,8 @@ -package com.it.curated.compose.network.relays +package to.curare.compose.network.relays import com.vitorpamplona.quartz.nip01Core.relay.commands.toRelay.ReqCmd import kotlinx.coroutines.flow.Flow -import com.it.curated.compose.network.sockets.NostrIncomingMessage +import to.curare.compose.network.sockets.NostrIncomingMessage /** * The slice of the relay layer a subscription that stays open needs. diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/relays/NostrPublishResult.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/NostrPublishResult.kt similarity index 55% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/network/relays/NostrPublishResult.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/NostrPublishResult.kt index 6ea26d9f..ee82313e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/relays/NostrPublishResult.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/NostrPublishResult.kt @@ -1,6 +1,6 @@ -package com.it.curated.compose.network.relays +package to.curare.compose.network.relays -import com.it.curated.compose.network.sockets.NostrIncomingMessage +import to.curare.compose.network.sockets.NostrIncomingMessage data class NostrPublishResult( val result: NostrIncomingMessage? = null, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/relays/RelayBackPressure.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelayBackPressure.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/network/relays/RelayBackPressure.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelayBackPressure.kt index 7c21a307..3827e952 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/relays/RelayBackPressure.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelayBackPressure.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.network.relays +package to.curare.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/com/it/curated/compose/network/relays/RelayPool.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelayPool.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/network/relays/RelayPool.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelayPool.kt index 3c1ffbac..b7a27ba9 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/relays/RelayPool.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelayPool.kt @@ -1,10 +1,10 @@ -package com.it.curated.compose.network.relays +package to.curare.compose.network.relays import androidx.annotation.VisibleForTesting -import com.it.curated.compose.network.dto.toRelayDTO -import com.it.curated.compose.network.sockets.filterByEventId -import com.it.curated.compose.network.sockets.filterBySubscriptionId -import com.it.curated.compose.network.sockets.completeOnSubscriptionEnd +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 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: com.it.curated.compose.network.sockets.NostrSocketClientFactory, - private val cachingImportRepository: com.it.curated.compose.repository.CachingImportRepository, + private val nostrSocketClientFactory: to.curare.compose.network.sockets.NostrSocketClientFactory, + private val cachingImportRepository: to.curare.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: com.it.curated.compose.network.sockets.SocketConnectionOpenedCallback = { url -> + private val onSocketConnectionOpenedCallback: to.curare.compose.network.sockets.SocketConnectionOpenedCallback = { url -> updateRelayStatus(url = url, connected = true) } - private val onSocketConnectionClosedCallback: com.it.curated.compose.network.sockets.SocketConnectionClosedCallback = { url, _ -> + private val onSocketConnectionClosedCallback: to.curare.compose.network.sockets.SocketConnectionClosedCallback = { url, _ -> updateRelayStatus(url = url, connected = false) } - private val onSocketConnectionReopenedCallback: com.it.curated.compose.network.sockets.SocketConnectionReopenedCallback = { url -> + private val onSocketConnectionReopenedCallback: to.curare.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): com.it.curated.compose.network.sockets.NostrSocketClient? { + private fun socketClientFor(relayUrl: String): to.curare.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(com.it.curated.compose.exceptions.NostrPublishException::class) - suspend fun publishEvent(nostrEvent: com.it.curated.compose.database.model.NostrEvent, relays: Set = emptySet()): Flow { + @Throws(to.curare.compose.exceptions.NostrPublishException::class) + suspend fun publishEvent(nostrEvent: to.curare.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 com.it.curated.compose.exceptions.NetworkException("$relayUrl is not connected") + throw to.curare.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 com.it.curated.compose.exceptions.NetworkException("$relayUrl is not connected") + ?: throw to.curare.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 com.it.curated.compose.exceptions.NetworkException("$relayUrl is not connected") + throw to.curare.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 com.it.curated.compose.exceptions.NetworkException("$relayUrl is not connected") + ?: throw to.curare.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 com.it.curated.compose.exceptions.NetworkException("$relayUrl is not connected") + throw to.curare.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 com.it.curated.compose.exceptions.NetworkException("$relayUrl is not connected") + throw to.curare.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 com.it.curated.compose.network.sockets.NostrIncomingMessage.EventMessage || it is com.it.curated.compose.network.sockets.NostrIncomingMessage.EventsMessage + it is to.curare.compose.network.sockets.NostrIncomingMessage.EventMessage || it is to.curare.compose.network.sockets.NostrIncomingMessage.EventsMessage } @OptIn(FlowPreview::class) - private suspend fun com.it.curated.compose.network.sockets.NostrSocketClient.queryAsFlow(subscriptionId: String): Flow { + private suspend fun to.curare.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: com.it.curated.compose.database.model.NostrEvent): Flow { + private suspend fun handlePublishEventToRelays(relayConnections: Set, nostrEvent: to.curare.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}" } - com.it.curated.compose.exceptions.NostrPublishException( + to.curare.compose.exceptions.NostrPublishException( message = it.message ?: "rejected by $socketUrl" ) } else { @@ -562,15 +562,15 @@ class RelayPool( } @FlowPreview - private suspend fun com.it.curated.compose.network.sockets.NostrSocketClient.collectPublishResponse(eventId: String): com.it.curated.compose.network.sockets.NostrIncomingMessage.OkMessage { + private suspend fun to.curare.compose.network.sockets.NostrSocketClient.collectPublishResponse(eventId: String): to.curare.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 com.it.curated.compose.network.sockets.NostrIncomingMessage.OkMessage && result.success + return result is to.curare.compose.network.sockets.NostrIncomingMessage.OkMessage && result.success } } diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/relays/RelaysSocketManager.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelaysSocketManager.kt similarity index 81% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/network/relays/RelaysSocketManager.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelaysSocketManager.kt index 875b1f45..df70abf7 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/relays/RelaysSocketManager.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/RelaysSocketManager.kt @@ -1,6 +1,6 @@ -package com.it.curated.compose.network.relays +package to.curare.compose.network.relays -import com.it.curated.compose.network.dto.mapToRelayDTO +import to.curare.compose.network.dto.mapToRelayDTO import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.relay.commands.toRelay.CloseCmd @@ -20,7 +20,7 @@ import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock -import com.it.curated.compose.extensions.nostrPublicKey +import to.curare.compose.extensions.nostrPublicKey /** @@ -30,9 +30,9 @@ import com.it.curated.compose.extensions.nostrPublicKey */ class RelaysSocketManager( private val activeWalletStateFlow: StateFlow, - private val nostrSocketClientFactory: com.it.curated.compose.network.sockets.NostrSocketClientFactory, - private val cachingImportRepository: com.it.curated.compose.repository.CachingImportRepository, - private val relayRepository: com.it.curated.compose.repository.RelayRepository, + 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, ) : LiveSubscriptionTransport { val logger = Logger.withTag("RelaysSocketManager") private val scope = CoroutineScope(Dispatchers.IO) @@ -49,7 +49,7 @@ class RelaysSocketManager( /** * Logical relayPool */ - private val userRelays = mutableSetOf() + private val userRelays = mutableSetOf() val userRelayPoolStatus = relayPool.relayPoolStatus @@ -88,7 +88,7 @@ class RelaysSocketManager( } } - private suspend fun updateRelayPools(regularRelays: List?) { + private suspend fun updateRelayPools(regularRelays: List?) { relayPoolsMutex.withLock { val userRelaysChanged = relayPool.relays != regularRelays if (userRelaysChanged && !regularRelays.isNullOrEmpty()) { @@ -102,8 +102,8 @@ class RelaysSocketManager( relayPool.closePool() } - @Throws(com.it.curated.compose.exceptions.NostrPublishException::class) - suspend fun publishEvent(nostrEvent: com.it.curated.compose.database.model.NostrEvent): Flow { + @Throws(to.curare.compose.exceptions.NostrPublishException::class) + suspend fun publishEvent(nostrEvent: to.curare.compose.database.model.NostrEvent): Flow { return if (userRelays.isNotEmpty()) { relayPool.publishEvent( nostrEvent = nostrEvent, @@ -117,8 +117,8 @@ class RelaysSocketManager( } } - @Throws(com.it.curated.compose.exceptions.NostrPublishException::class) - suspend fun publishEvent(nostrEvent: com.it.curated.compose.database.model.NostrEvent, relays: Set): Flow { + @Throws(to.curare.compose.exceptions.NostrPublishException::class) + suspend fun publishEvent(nostrEvent: to.curare.compose.database.model.NostrEvent, relays: Set): Flow { logger.d("publishEvent: $nostrEvent") return relayPool.publishEvent( nostrEvent = nostrEvent, @@ -138,7 +138,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 @@ -146,7 +146,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 @@ -174,7 +174,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/com/it/curated/compose/network/relays/broadcast/BroadcastEventResponse.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/broadcast/BroadcastEventResponse.kt similarity index 80% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/network/relays/broadcast/BroadcastEventResponse.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/broadcast/BroadcastEventResponse.kt index e5273f43..35fa0078 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/relays/broadcast/BroadcastEventResponse.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/broadcast/BroadcastEventResponse.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.network.relays.broadcast +package to.curare.compose.network.relays.broadcast import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/relays/broadcast/BroadcastRequestBody.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/broadcast/BroadcastRequestBody.kt similarity index 78% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/network/relays/broadcast/BroadcastRequestBody.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/broadcast/BroadcastRequestBody.kt index 4047c49a..6723aba5 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/relays/broadcast/BroadcastRequestBody.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/network/relays/broadcast/BroadcastRequestBody.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.network.relays.broadcast +package to.curare.compose.network.relays.broadcast import com.vitorpamplona.quartz.nip01Core.core.Event import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/serialization/CommonJson.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/network/serialization/CommonJson.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/network/serialization/CommonJson.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/network/serialization/CommonJson.kt index d181447c..004705fb 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/serialization/CommonJson.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/network/serialization/CommonJson.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.network.serialization +package to.curare.compose.network.serialization import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonBuilder diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/serialization/SocketsJson.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/network/serialization/SocketsJson.kt similarity index 79% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/network/serialization/SocketsJson.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/network/serialization/SocketsJson.kt index fe00e196..01c3cfe7 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/serialization/SocketsJson.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/network/serialization/SocketsJson.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.network.serialization +package to.curare.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(): com.it.curated.compose.database.model.NostrEvent? { +fun JsonObject?.asNostrEventOrNull(): to.curare.compose.database.model.NostrEvent? { return try { if (this != null) SocketsJson.decodeFromJsonElement(this) else null } catch (error: IllegalArgumentException) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrIncomingMessage.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrIncomingMessage.kt similarity index 81% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrIncomingMessage.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrIncomingMessage.kt index c9626a4a..234e0bb7 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrIncomingMessage.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrIncomingMessage.kt @@ -1,10 +1,10 @@ -package com.it.curated.compose.network.sockets +package to.curare.compose.network.sockets sealed class NostrIncomingMessage { data class EventMessage( val subscriptionId: String, - val nostrEvent: com.it.curated.compose.database.model.NostrEvent? = null, + val nostrEvent: to.curare.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 com.it.curated.compose.exceptions.NetworkException("No messages received.") + throw to.curare.compose.exceptions.NetworkException("No messages received.") } if (this is NostrIncomingMessage.NoticeMessage) { - throw com.it.curated.compose.exceptions.NostrNoticeException( + throw to.curare.compose.exceptions.NostrNoticeException( reason = this.message, subscriptionId = subscriptionId, ) diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrIncomingMessageExt.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrIncomingMessageExt.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrIncomingMessageExt.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrIncomingMessageExt.kt index b59507f0..31639bc7 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrIncomingMessageExt.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrIncomingMessageExt.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.network.sockets +package to.curare.compose.network.sockets import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filter diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrIncomingMessageParser.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrIncomingMessageParser.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrIncomingMessageParser.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrIncomingMessageParser.kt index ed0e21b6..d09d10a5 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrIncomingMessageParser.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrIncomingMessageParser.kt @@ -1,6 +1,6 @@ -package com.it.curated.compose.network.sockets +package to.curare.compose.network.sockets -import com.it.curated.compose.network.serialization.decodeFromStringOrNull +import to.curare.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 = com.it.curated.compose.network.serialization.SocketsJson.decodeFromStringOrNull(this) + val jsonArray = to.curare.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 = com.it.curated.compose.database.model.NostrEvent.fromEvent( + val nostrEvent = to.curare.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 -> - com.it.curated.compose.database.model.NostrEvent.fromEvent( + to.curare.compose.database.model.NostrEvent.fromEvent( Event.fromJson( jsonEvent.toString() ) diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrOutgoingMessageBuilder.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrOutgoingMessageBuilder.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrOutgoingMessageBuilder.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrOutgoingMessageBuilder.kt index 4ed5f077..2a6fcdfe 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrOutgoingMessageBuilder.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrOutgoingMessageBuilder.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.network.sockets +package to.curare.compose.network.sockets import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.add diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrSocketClient.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClient.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrSocketClient.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClient.kt index 6a0e15d2..f52b7543 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrSocketClient.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClient.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.network.sockets +package to.curare.compose.network.sockets import kotlinx.coroutines.flow.SharedFlow import kotlinx.serialization.json.JsonObject diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrSocketClientFactory.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClientFactory.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrSocketClientFactory.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClientFactory.kt index b5082934..6dbd8b26 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrSocketClientFactory.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClientFactory.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.network.sockets +package to.curare.compose.network.sockets import io.ktor.client.HttpClient import io.ktor.client.plugins.websocket.WebSockets @@ -20,7 +20,7 @@ internal val defaultSocketsHttpClient by lazy { /** - * How [com.it.curated.compose.network.relays.RelayPool] gets a socket for a relay. + * How [to.curare.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/com/it/curated/compose/network/sockets/NostrSocketClientImpl.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClientImpl.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrSocketClientImpl.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClientImpl.kt index 855f4672..3c08027b 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrSocketClientImpl.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrSocketClientImpl.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.network.sockets +package to.curare.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 com.it.curated.compose.exceptions.NetworkException(cause = error) + throw to.curare.compose.exceptions.NetworkException(cause = error) } } diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrVerb.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrVerb.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrVerb.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrVerb.kt index 0f818256..1e7b7476 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrVerb.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/NostrVerb.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.network.sockets +package to.curare.compose.network.sockets import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/ReconnectBackoff.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/ReconnectBackoff.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/ReconnectBackoff.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/ReconnectBackoff.kt index 65c2d7a6..0f533d33 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/ReconnectBackoff.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/ReconnectBackoff.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.network.sockets +package to.curare.compose.network.sockets import kotlin.math.min import kotlin.math.pow diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/SocketConnectionCallbacks.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/SocketConnectionCallbacks.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/SocketConnectionCallbacks.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/SocketConnectionCallbacks.kt index 683b196d..0cccd156 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/SocketConnectionCallbacks.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/network/sockets/SocketConnectionCallbacks.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.network.sockets +package to.curare.compose.network.sockets typealias SocketConnectionOpenedCallback = (url: String) -> Unit typealias SocketConnectionClosedCallback = (url: String, error: Throwable?) -> Unit diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/GroupNostrProfile.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupNostrProfile.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/GroupNostrProfile.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupNostrProfile.kt index 32ad8467..65d0857d 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/GroupNostrProfile.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupNostrProfile.kt @@ -1,6 +1,6 @@ -package com.it.curated.compose.nostr +package to.curare.compose.nostr -import com.it.curated.compose.database.model.GroupSignedEvent +import to.curare.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/com/it/curated/compose/nostr/GroupPost.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupPost.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/GroupPost.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupPost.kt index ec13f39c..3d60a7fd 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/GroupPost.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupPost.kt @@ -1,6 +1,6 @@ -package com.it.curated.compose.nostr +package to.curare.compose.nostr -import com.it.curated.compose.database.model.GroupSignedEvent +import to.curare.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/com/it/curated/compose/nostr/GroupRelayList.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupRelayList.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/GroupRelayList.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupRelayList.kt index 3ef8eeca..595b80a3 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/GroupRelayList.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/GroupRelayList.kt @@ -1,6 +1,6 @@ -package com.it.curated.compose.nostr +package to.curare.compose.nostr -import com.it.curated.compose.database.model.GroupSignedEvent +import to.curare.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/com/it/curated/compose/nostr/MarmotDelivery.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/MarmotDelivery.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/MarmotDelivery.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/MarmotDelivery.kt index caa5ffa2..aa633e9b 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/MarmotDelivery.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/MarmotDelivery.kt @@ -1,9 +1,9 @@ -package com.it.curated.compose.nostr +package to.curare.compose.nostr import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl -import com.it.curated.compose.database.model.BroadcastNostrEventRequest -import com.it.curated.compose.database.model.ChatMessage +import to.curare.compose.database.model.BroadcastNostrEventRequest +import to.curare.compose.database.model.ChatMessage /** * What has to be written once a queued inner event has been encrypted into a @@ -15,8 +15,8 @@ import com.it.curated.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 [com.it.curated.compose.nostr.frost.FrostSigningEvents] kind and for - * [com.it.curated.compose.nostr.frost.GroupKeyStateEvent], and + * every [to.curare.compose.nostr.frost.FrostSigningEvents] kind and for + * [to.curare.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/com/it/curated/compose/nostr/MarmotDirectMessage.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/MarmotDirectMessage.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/MarmotDirectMessage.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/MarmotDirectMessage.kt index ce53c4fa..d87c6a9f 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/MarmotDirectMessage.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/MarmotDirectMessage.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr +package to.curare.compose.nostr import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/MemberProfileSync.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/MemberProfileSync.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/MemberProfileSync.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/MemberProfileSync.kt index 6b4397d0..7c4a32c9 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/MemberProfileSync.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/MemberProfileSync.kt @@ -1,11 +1,11 @@ -package com.it.curated.compose.nostr +package to.curare.compose.nostr import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent -import com.it.curated.compose.database.GENESIS_AT -import com.it.curated.compose.database.model.NegentropySynchronizeRequest -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.types.SynchronizationFilter +import to.curare.compose.database.GENESIS_AT +import to.curare.compose.database.model.NegentropySynchronizeRequest +import to.curare.compose.database.model.intermdiate.LocalChatRoom +import to.curare.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/com/it/curated/compose/nostr/Nip17Filters.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/Nip17Filters.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/Nip17Filters.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/Nip17Filters.kt index bdaa77d3..01f0d33b 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/Nip17Filters.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/Nip17Filters.kt @@ -1,9 +1,9 @@ -package com.it.curated.compose.nostr +package to.curare.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 com.it.curated.compose.database.model.types.SynchronizationFilter +import to.curare.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/com/it/curated/compose/nostr/Relays.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/Relays.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/Relays.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/Relays.kt index d18e8383..05963c57 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/Relays.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/Relays.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr +package to.curare.compose.nostr import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer import com.vitorpamplona.quartz.nip28PublicChat.list.tags.ChannelTag @@ -6,10 +6,11 @@ import com.vitorpamplona.quartz.nip65RelayList.tags.AdvertisedRelayInfo import com.vitorpamplona.quartz.nip65RelayList.tags.AdvertisedRelayType object Relays { - // Still on the mantra.press host after the rebrand to Curated: 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 Curated relay exists to swap it for. + // 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 + // 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 + // swap it for. val ephemeral = RelayUrlNormalizer.normalize("wss://ephemeral.mantra.press") val nos = RelayUrlNormalizer.normalize("wss://nos.lol") diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/chronicle/ChronicleEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/ChronicleEvent.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/chronicle/ChronicleEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/ChronicleEvent.kt index a4e95306..eb5c5669 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/chronicle/ChronicleEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/ChronicleEvent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.chronicle +package to.curare.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 com.it.curated.compose.network.serialization.CommonJson -import com.it.curated.compose.nostr.chronicle.tags.ChronicleIdTag -import com.it.curated.compose.nostr.chronicle.tags.ChroniclePageTag -import com.it.curated.compose.nostr.chronicle.tags.ChronicleRecipientTag -import com.it.curated.compose.nostr.nip30303.ArtifactEvent -import com.it.curated.compose.nostr.nip30303.ArtifactVersionEvent -import com.it.curated.compose.nostr.nip30303.ChapterEvent -import com.it.curated.compose.nostr.nip30303.ChunkEvent -import com.it.curated.compose.nostr.nip30303.DialectEvent -import com.it.curated.compose.nostr.nip30303.TranslationArtifactVersionEvent -import com.it.curated.compose.nostr.nip30303.TranslationChapterEvent -import com.it.curated.compose.nostr.nip30303.TranslationChunkEvent +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 /** * 30327 @@ -45,7 +45,7 @@ import com.it.curated.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 [com.it.curated.compose.nostr.nip30303.SubmissionEvent] each + * ### Why not a [to.curare.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/com/it/curated/compose/nostr/chronicle/ChronicleRequestEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/ChronicleRequestEvent.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/chronicle/ChronicleRequestEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/ChronicleRequestEvent.kt index 931f07af..f8264b87 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/chronicle/ChronicleRequestEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/ChronicleRequestEvent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.chronicle +package to.curare.compose.nostr.chronicle import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Event diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/chronicle/tags/ChronicleIdTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/tags/ChronicleIdTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/chronicle/tags/ChronicleIdTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/tags/ChronicleIdTag.kt index 4e466174..114382de 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/chronicle/tags/ChronicleIdTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/tags/ChronicleIdTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.chronicle.tags +package to.curare.compose.nostr.chronicle.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/chronicle/tags/ChroniclePageTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/tags/ChroniclePageTag.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/chronicle/tags/ChroniclePageTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/tags/ChroniclePageTag.kt index 71f5e780..179757a5 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/chronicle/tags/ChroniclePageTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/tags/ChroniclePageTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.chronicle.tags +package to.curare.compose.nostr.chronicle.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/chronicle/tags/ChronicleRecipientTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/tags/ChronicleRecipientTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/chronicle/tags/ChronicleRecipientTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/tags/ChronicleRecipientTag.kt index bc741559..01e4079f 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/chronicle/tags/ChronicleRecipientTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/chronicle/tags/ChronicleRecipientTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.chronicle.tags +package to.curare.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/com/it/curated/compose/nostr/dkg/DkgRitualEvents.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/dkg/DkgRitualEvents.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/dkg/DkgRitualEvents.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/dkg/DkgRitualEvents.kt index f853bc67..dfd1328e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/dkg/DkgRitualEvents.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/dkg/DkgRitualEvents.kt @@ -1,10 +1,10 @@ -package com.it.curated.compose.nostr.dkg +package to.curare.compose.nostr.dkg -import com.it.curated.compose.nostr.dkg.tags.DkgSessionIdTag -import com.it.curated.compose.nostr.dkg.tags.DkgThresholdTag +import to.curare.compose.nostr.dkg.tags.DkgSessionIdTag +import to.curare.compose.nostr.dkg.tags.DkgThresholdTag import com.vitorpamplona.quartz.nip01Core.core.Kind import com.vitorpamplona.quartz.nip14Subject.SubjectTag -import com.it.curated.compose.nostr.subgroup.tags.SubgroupParentTag +import to.curare.compose.nostr.subgroup.tags.SubgroupParentTag /** * The nostr kinds a ChillDKG ritual is carried on. diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/dkg/tags/DkgSessionIdTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/dkg/tags/DkgSessionIdTag.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/dkg/tags/DkgSessionIdTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/dkg/tags/DkgSessionIdTag.kt index fe940095..1f037b52 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/dkg/tags/DkgSessionIdTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/dkg/tags/DkgSessionIdTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.dkg.tags +package to.curare.compose.nostr.dkg.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/dkg/tags/DkgThresholdTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/dkg/tags/DkgThresholdTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/dkg/tags/DkgThresholdTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/dkg/tags/DkgThresholdTag.kt index 083a04c5..73f1d764 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/dkg/tags/DkgThresholdTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/dkg/tags/DkgThresholdTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.dkg.tags +package to.curare.compose.nostr.dkg.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/frost/FrostSigningEvents.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/FrostSigningEvents.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/frost/FrostSigningEvents.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/FrostSigningEvents.kt index a0067b4f..0fa1107c 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/frost/FrostSigningEvents.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/FrostSigningEvents.kt @@ -1,12 +1,12 @@ -package com.it.curated.compose.nostr.frost +package to.curare.compose.nostr.frost import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.Kind import kotlinx.serialization.json.jsonArray -import com.it.curated.compose.network.serialization.CommonJson -import com.it.curated.compose.nostr.frost.tags.FrostKeyTag -import com.it.curated.compose.nostr.frost.tags.FrostSessionIdTag -import com.it.curated.compose.nostr.frost.tags.FrostSignerIdsTag +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 /** * The nostr kinds a FROST signing session is carried on. @@ -39,7 +39,7 @@ import com.it.curated.compose.nostr.frost.tags.FrostSignerIdsTag * ### Why 3032x * * These share the inner-event space with the nip30303 document kinds, which run - * 30300 up to [com.it.curated.compose.nostr.nip30303.SubmissionEvent] at 30312 -- + * 30300 up to [to.curare.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/com/it/curated/compose/nostr/frost/GroupKeyStateEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/GroupKeyStateEvent.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/frost/GroupKeyStateEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/GroupKeyStateEvent.kt index d00c272e..64a5d4f3 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/frost/GroupKeyStateEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/GroupKeyStateEvent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.frost +package to.curare.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 com.it.curated.compose.managers.SharedKeyDerivation -import com.it.curated.compose.nostr.frost.tags.FrostDerivationPathTag -import com.it.curated.compose.nostr.frost.tags.FrostKeyTag -import com.it.curated.compose.nostr.subgroup.SubgroupBirthCertificateEvent -import com.it.curated.compose.nostr.subgroup.SubgroupParentage -import com.it.curated.compose.nostr.subgroup.tags.SubgroupBirthCertificateTag -import com.it.curated.compose.nostr.subgroup.tags.SubgroupParentTag +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 /** * What key a Marmot room signs with, signed by the group whose key it is. diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/frost/tags/FrostDerivationPathTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostDerivationPathTag.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/frost/tags/FrostDerivationPathTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostDerivationPathTag.kt index 24c27699..61624cef 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/frost/tags/FrostDerivationPathTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostDerivationPathTag.kt @@ -1,8 +1,8 @@ -package com.it.curated.compose.nostr.frost.tags +package to.curare.compose.nostr.frost.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure -import com.it.curated.compose.managers.SharedKeyDerivation +import to.curare.compose.managers.SharedKeyDerivation /** * The path the room's id was derived at, `m/9420/0/0` style. diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/frost/tags/FrostKeyTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostKeyTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/frost/tags/FrostKeyTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostKeyTag.kt index 73150d96..4b02439e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/frost/tags/FrostKeyTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostKeyTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.frost.tags +package to.curare.compose.nostr.frost.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/frost/tags/FrostSessionIdTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostSessionIdTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/frost/tags/FrostSessionIdTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostSessionIdTag.kt index 85dcc7ac..2551a739 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/frost/tags/FrostSessionIdTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostSessionIdTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.frost.tags +package to.curare.compose.nostr.frost.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/frost/tags/FrostSignerIdsTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostSignerIdsTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/frost/tags/FrostSignerIdsTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostSignerIdsTag.kt index 43d97884..87f50d44 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/frost/tags/FrostSignerIdsTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/frost/tags/FrostSignerIdsTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.frost.tags +package to.curare.compose.nostr.frost.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/ArtifactEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/ArtifactEvent.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/ArtifactEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/ArtifactEvent.kt index 820ec331..b67c94d7 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/ArtifactEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/ArtifactEvent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303 +package to.curare.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 com.it.curated.compose.nostr.nip30303.tags.ArtifactVersionMetadataTag -import com.it.curated.compose.nostr.nip30303.tags.DialectIdTag -import com.it.curated.compose.nostr.nip30303.tags.LicenseTag -import com.it.curated.compose.nostr.nip30303.tags.UrlTag -import com.it.curated.compose.nostr.nip30303.tags.VisibilityTag +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 @Immutable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/ArtifactVersionEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/ArtifactVersionEvent.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/ArtifactVersionEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/ArtifactVersionEvent.kt index 3fc18341..07edae4f 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/ArtifactVersionEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/ArtifactVersionEvent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303 +package to.curare.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 com.it.curated.compose.nostr.nip30303.tags.ArtifactIdTag -import com.it.curated.compose.nostr.nip30303.tags.ArtifactVersionMetadataTag +import to.curare.compose.nostr.nip30303.tags.ArtifactIdTag +import to.curare.compose.nostr.nip30303.tags.ArtifactVersionMetadataTag @Immutable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/ChapterEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/ChapterEvent.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/ChapterEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/ChapterEvent.kt index 142306b1..9d2b7fd8 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/ChapterEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/ChapterEvent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303 +package to.curare.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 com.it.curated.compose.nostr.nip30303.tags.ArtifactVersionIdTag -import com.it.curated.compose.nostr.nip30303.tags.IndexTag -import com.it.curated.compose.nostr.nip30303.tags.NameTag -import com.it.curated.compose.nostr.nip30303.tags.OriginalTextTag -import com.it.curated.compose.nostr.nip30303.tags.WordStatisticsTag +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 @Immutable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/ChunkEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/ChunkEvent.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/ChunkEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/ChunkEvent.kt index 7e35bf3e..af4d5e5f 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/ChunkEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/ChunkEvent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303 +package to.curare.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 com.it.curated.compose.nostr.nip30303.tags.ChapterIdTag -import com.it.curated.compose.nostr.nip30303.tags.IndexTag -import com.it.curated.compose.nostr.nip30303.tags.WordStatisticsTag -import com.it.curated.compose.text.Markdown +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 @Immutable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/DialectEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/DialectEvent.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/DialectEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/DialectEvent.kt index ad8b87a5..c22391b0 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/DialectEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/DialectEvent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303 +package to.curare.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 com.it.curated.compose.nostr.nip30303.tags.CountryTag -import com.it.curated.compose.nostr.nip30303.tags.LanguageTag -import com.it.curated.compose.nostr.nip30303.tags.NameTag +import to.curare.compose.nostr.nip30303.tags.CountryTag +import to.curare.compose.nostr.nip30303.tags.LanguageTag +import to.curare.compose.nostr.nip30303.tags.NameTag @Immutable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/SubmissionEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/SubmissionEvent.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/SubmissionEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/SubmissionEvent.kt index a9ff97b6..94598747 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/SubmissionEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/SubmissionEvent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303 +package to.curare.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 com.it.curated.compose.nostr.nip30303.tags.PayloadIdTag -import com.it.curated.compose.nostr.nip30303.tags.PayloadKindTag +import to.curare.compose.nostr.nip30303.tags.PayloadIdTag +import to.curare.compose.nostr.nip30303.tags.PayloadKindTag /** * 30312 diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/TranslationArtifactVersionContributorListEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationArtifactVersionContributorListEvent.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/TranslationArtifactVersionContributorListEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationArtifactVersionContributorListEvent.kt index 94b61f8c..937afce2 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/TranslationArtifactVersionContributorListEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationArtifactVersionContributorListEvent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303 +package to.curare.compose.nostr.nip30303 import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Event diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/TranslationArtifactVersionEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationArtifactVersionEvent.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/TranslationArtifactVersionEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationArtifactVersionEvent.kt index a07982a1..c398ebca 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/TranslationArtifactVersionEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationArtifactVersionEvent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303 +package to.curare.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 com.it.curated.compose.nostr.nip30303.tags.ArtifactVersionIdTag -import com.it.curated.compose.nostr.nip30303.tags.DialectIdTag -import com.it.curated.compose.nostr.nip30303.tags.LicenseTag -import com.it.curated.compose.nostr.nip30303.tags.NameTag -import com.it.curated.compose.nostr.nip30303.tags.VisibilityTag +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 @Immutable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/TranslationChapterContributorListEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationChapterContributorListEvent.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/TranslationChapterContributorListEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationChapterContributorListEvent.kt index caf7cad8..a517177e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/TranslationChapterContributorListEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationChapterContributorListEvent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303 +package to.curare.compose.nostr.nip30303 import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Event diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/TranslationChapterEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationChapterEvent.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/TranslationChapterEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationChapterEvent.kt index c966d41a..665a0a5a 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/TranslationChapterEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationChapterEvent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303 +package to.curare.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 com.it.curated.compose.nostr.nip30303.tags.ChapterIdTag -import com.it.curated.compose.nostr.nip30303.tags.IndexTag -import com.it.curated.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag +import to.curare.compose.nostr.nip30303.tags.ChapterIdTag +import to.curare.compose.nostr.nip30303.tags.IndexTag +import to.curare.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag @Immutable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/TranslationChunkEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationChunkEvent.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/TranslationChunkEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationChunkEvent.kt index b22def0d..d64cc0b7 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/TranslationChunkEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationChunkEvent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303 +package to.curare.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 com.it.curated.compose.nostr.nip30303.tags.ChunkIdTag -import com.it.curated.compose.nostr.nip30303.tags.IndexTag -import com.it.curated.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag -import com.it.curated.compose.nostr.nip30303.tags.TranslationChapterIdTag +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 @Immutable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/TranslationChunkProposalEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationChunkProposalEvent.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/TranslationChunkProposalEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationChunkProposalEvent.kt index a0566b37..98eef07b 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/TranslationChunkProposalEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationChunkProposalEvent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303 +package to.curare.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 com.it.curated.compose.nostr.nip30303.tags.ChunkIdTag -import com.it.curated.compose.nostr.nip30303.tags.IndexTag -import com.it.curated.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag -import com.it.curated.compose.nostr.nip30303.tags.TranslationChapterIdTag +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 @Immutable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/TranslationContributorListEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationContributorListEvent.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/TranslationContributorListEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationContributorListEvent.kt index 01e60a5e..e9c51901 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/TranslationContributorListEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationContributorListEvent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303 +package to.curare.compose.nostr.nip30303 import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Event diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/TranslationEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationEvent.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/TranslationEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationEvent.kt index a43ba64d..b09b315f 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/TranslationEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/TranslationEvent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303 +package to.curare.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 com.it.curated.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag -import com.it.curated.compose.nostr.nip30303.tags.TranslationChunkIdTag +import to.curare.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag +import to.curare.compose.nostr.nip30303.tags.TranslationChunkIdTag @Immutable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/ArtifactIdTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ArtifactIdTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/ArtifactIdTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ArtifactIdTag.kt index 3bf6b346..2523ba42 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/ArtifactIdTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ArtifactIdTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303.tags +package to.curare.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/com/it/curated/compose/nostr/nip30303/tags/ArtifactVersionIdTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ArtifactVersionIdTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/ArtifactVersionIdTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ArtifactVersionIdTag.kt index e85614ab..8ae76e74 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/ArtifactVersionIdTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ArtifactVersionIdTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303.tags +package to.curare.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/com/it/curated/compose/nostr/nip30303/tags/ArtifactVersionMetadataTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ArtifactVersionMetadataTag.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/ArtifactVersionMetadataTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ArtifactVersionMetadataTag.kt index b864c44f..560abb5b 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/ArtifactVersionMetadataTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ArtifactVersionMetadataTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303.tags +package to.curare.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/ChapterIdTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ChapterIdTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/ChapterIdTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ChapterIdTag.kt index 00b9455c..4417ed81 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/ChapterIdTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ChapterIdTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303.tags +package to.curare.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/com/it/curated/compose/nostr/nip30303/tags/ChunkIdTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ChunkIdTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/ChunkIdTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ChunkIdTag.kt index 2c16a3b8..45ea0e8b 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/ChunkIdTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ChunkIdTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303.tags +package to.curare.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/com/it/curated/compose/nostr/nip30303/tags/ContributorTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ContributorTag.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/ContributorTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ContributorTag.kt index 6de56fe0..fc329aab 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/ContributorTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/ContributorTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303.tags +package to.curare.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/com/it/curated/compose/nostr/nip30303/tags/CountryTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/CountryTag.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/CountryTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/CountryTag.kt index 429ceb63..b144a38f 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/CountryTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/CountryTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303.tags +package to.curare.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/DialectIdTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/DialectIdTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/DialectIdTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/DialectIdTag.kt index 90c846e1..f1b2c7c1 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/DialectIdTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/DialectIdTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303.tags +package to.curare.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/com/it/curated/compose/nostr/nip30303/tags/IndexTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/IndexTag.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/IndexTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/IndexTag.kt index d6751503..75b5406e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/IndexTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/IndexTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303.tags +package to.curare.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/LanguageTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/LanguageTag.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/LanguageTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/LanguageTag.kt index 384cb269..81a11baf 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/LanguageTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/LanguageTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303.tags +package to.curare.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/LicenseTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/LicenseTag.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/LicenseTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/LicenseTag.kt index 9ca95e1d..3f2ed738 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/LicenseTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/LicenseTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303.tags +package to.curare.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/NameTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/NameTag.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/NameTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/NameTag.kt index 0d619c6d..0257751b 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/NameTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/NameTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303.tags +package to.curare.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/OriginalTextTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/OriginalTextTag.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/OriginalTextTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/OriginalTextTag.kt index 460d5188..c9df8b4b 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/OriginalTextTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/OriginalTextTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303.tags +package to.curare.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/PayloadIdTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/PayloadIdTag.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/PayloadIdTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/PayloadIdTag.kt index d924f1c4..c7fe7745 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/PayloadIdTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/PayloadIdTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303.tags +package to.curare.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/com/it/curated/compose/nostr/nip30303/tags/PayloadKindTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/PayloadKindTag.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/PayloadKindTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/PayloadKindTag.kt index 232ae440..20f57d4a 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/PayloadKindTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/PayloadKindTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303.tags +package to.curare.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/TranslationArtifactVersionIdTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/TranslationArtifactVersionIdTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/TranslationArtifactVersionIdTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/TranslationArtifactVersionIdTag.kt index e75303be..f1883350 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/TranslationArtifactVersionIdTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/TranslationArtifactVersionIdTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303.tags +package to.curare.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/com/it/curated/compose/nostr/nip30303/tags/TranslationChapterIdTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/TranslationChapterIdTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/TranslationChapterIdTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/TranslationChapterIdTag.kt index 30798921..8e6b5c86 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/TranslationChapterIdTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/TranslationChapterIdTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303.tags +package to.curare.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/com/it/curated/compose/nostr/nip30303/tags/TranslationChunkIdTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/TranslationChunkIdTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/TranslationChunkIdTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/TranslationChunkIdTag.kt index e6415378..3c7e879b 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/TranslationChunkIdTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/TranslationChunkIdTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303.tags +package to.curare.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/com/it/curated/compose/nostr/nip30303/tags/TranslationIdTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/TranslationIdTag.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/TranslationIdTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/TranslationIdTag.kt index eeeb9879..2ee05db2 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/TranslationIdTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/TranslationIdTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303.tags +package to.curare.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/com/it/curated/compose/nostr/nip30303/tags/UrlTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/UrlTag.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/UrlTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/UrlTag.kt index 102e6411..3bc57751 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/UrlTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/UrlTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303.tags +package to.curare.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/VisibilityTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/VisibilityTag.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/VisibilityTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/VisibilityTag.kt index 4772be30..a1526d30 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/VisibilityTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/VisibilityTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303.tags +package to.curare.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/WordStatisticsTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/WordStatisticsTag.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/WordStatisticsTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/WordStatisticsTag.kt index 64abd5c0..c3758f86 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/nip30303/tags/WordStatisticsTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/nip30303/tags/WordStatisticsTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303.tags +package to.curare.compose.nostr.nip30303.tags import com.vitorpamplona.quartz.nip01Core.core.has import com.vitorpamplona.quartz.utils.ensure diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/subgroup/SubgroupBirthCertificateEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/SubgroupBirthCertificateEvent.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/subgroup/SubgroupBirthCertificateEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/SubgroupBirthCertificateEvent.kt index 3e738cee..a13d0c9c 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/subgroup/SubgroupBirthCertificateEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/SubgroupBirthCertificateEvent.kt @@ -1,15 +1,15 @@ -package com.it.curated.compose.nostr.subgroup +package to.curare.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 com.it.curated.compose.managers.SharedKeyDerivation -import com.it.curated.compose.nostr.frost.GroupKeyStateEvent -import com.it.curated.compose.nostr.frost.tags.FrostDerivationPathTag -import com.it.curated.compose.nostr.subgroup.tags.SubgroupKeyTag -import com.it.curated.compose.nostr.subgroup.tags.SubgroupParentTag +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 /** * A group saying, with a quorum, that another group is its child. diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/subgroup/SubgroupParentage.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/SubgroupParentage.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/subgroup/SubgroupParentage.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/SubgroupParentage.kt index 6614e834..f2ba0b59 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/subgroup/SubgroupParentage.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/SubgroupParentage.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.subgroup +package to.curare.compose.nostr.subgroup import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/subgroup/tags/SubgroupBirthCertificateTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/tags/SubgroupBirthCertificateTag.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/subgroup/tags/SubgroupBirthCertificateTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/tags/SubgroupBirthCertificateTag.kt index 5e8045fc..87c1c25c 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/subgroup/tags/SubgroupBirthCertificateTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/tags/SubgroupBirthCertificateTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.subgroup.tags +package to.curare.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/com/it/curated/compose/nostr/subgroup/tags/SubgroupKeyTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/tags/SubgroupKeyTag.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/subgroup/tags/SubgroupKeyTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/tags/SubgroupKeyTag.kt index 1b0b86a1..670d9971 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/subgroup/tags/SubgroupKeyTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/tags/SubgroupKeyTag.kt @@ -1,9 +1,9 @@ -package com.it.curated.compose.nostr.subgroup.tags +package to.curare.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 com.it.curated.compose.nostr.frost.GroupKeyStateEvent +import to.curare.compose.nostr.frost.GroupKeyStateEvent /** * The subgroup's own ChillDKG threshold public key, 33-byte compressed hex. diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/subgroup/tags/SubgroupParentTag.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/tags/SubgroupParentTag.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/subgroup/tags/SubgroupParentTag.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/tags/SubgroupParentTag.kt index 93da2873..753d5738 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/nostr/subgroup/tags/SubgroupParentTag.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/nostr/subgroup/tags/SubgroupParentTag.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.subgroup.tags +package to.curare.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/to/curare/compose/repository/CachingImportRepository.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/CachingImportRepository.kt new file mode 100644 index 00000000..8a4ab244 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/CachingImportRepository.kt @@ -0,0 +1,40 @@ +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/com/it/curated/compose/repository/ChatRepository.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/ChatRepository.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/ChatRepository.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/repository/ChatRepository.kt index 52b12662..d510ed8b 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/ChatRepository.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/ChatRepository.kt @@ -1,21 +1,21 @@ -package com.it.curated.compose.repository +package to.curare.compose.repository -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.GiftWrapPayload -import com.it.curated.compose.database.model.GroupKeyState -import com.it.curated.compose.database.model.GroupSignedEvent +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.vitorpamplona.quartz.nip01Core.crypto.KeyPair -import com.it.curated.compose.database.model.MarmotKeyPackage -import com.it.curated.compose.managers.SharedKeyDerivation -import com.it.curated.compose.managers.MarmotGroupCreation -import com.it.curated.compose.managers.SubgroupManager -import com.it.curated.compose.nostr.GroupNostrProfile -import com.it.curated.compose.nostr.GroupPost -import com.it.curated.compose.nostr.GroupRelayList -import com.it.curated.compose.database.model.Participant -import com.it.curated.compose.database.model.intermdiate.LocalChatMessage -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.types.MarmotReindexReport +import to.curare.compose.database.model.MarmotKeyPackage +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.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.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/com/it/curated/compose/repository/DkgRepository.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/DkgRepository.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/DkgRepository.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/repository/DkgRepository.kt index 52f1bcba..30387290 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/DkgRepository.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/DkgRepository.kt @@ -1,13 +1,13 @@ -package com.it.curated.compose.repository +package to.curare.compose.repository -import com.it.curated.compose.database.model.DkgParticipantMessage -import com.it.curated.compose.database.model.DkgSession -import com.it.curated.compose.database.model.FrostSigningSession -import com.it.curated.compose.database.model.GroupKeyState -import com.it.curated.compose.database.model.GroupSignedEvent -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.intermdiate.LocalFrostSigningSession -import com.it.curated.compose.database.model.types.DkgApprovalStep +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.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/FrostSigningRepository.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/FrostSigningRepository.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/FrostSigningRepository.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/repository/FrostSigningRepository.kt index e399b78b..f1f3487a 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/FrostSigningRepository.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/FrostSigningRepository.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.repository +package to.curare.compose.repository import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -6,11 +6,11 @@ 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 com.it.curated.compose.database.model.FrostSignerMessage -import com.it.curated.compose.database.model.FrostSigningItem -import com.it.curated.compose.database.model.FrostSigningSession -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.intermdiate.LocalFrostSigningSession +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.LocalFrostSigningSession /** * Reads, opens and answers FROST signing sessions. diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/MantraRepository.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/MantraRepository.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/MantraRepository.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/repository/MantraRepository.kt index 0cf9937a..7292596e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/MantraRepository.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/MantraRepository.kt @@ -1,15 +1,15 @@ -package com.it.curated.compose.repository +package to.curare.compose.repository import com.vitorpamplona.quartz.nip01Core.core.HexKey -import com.it.curated.compose.database.model.MantraArtifact -import com.it.curated.compose.database.model.MantraArtifactVersion -import com.it.curated.compose.database.model.MantraChapter -import com.it.curated.compose.database.model.MantraChunk -import com.it.curated.compose.database.model.MantraDialect -import com.it.curated.compose.database.model.MantraTranslationArtifactVersion -import com.it.curated.compose.database.model.MantraTranslationChapter -import com.it.curated.compose.database.model.MantraTranslationChunk -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom +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 interface MantraRepository { suspend fun getArtifacts(chatRoomId: String): List diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/MarmotRepository.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/MarmotRepository.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/MarmotRepository.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/repository/MarmotRepository.kt index e6f4f083..803685e5 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/MarmotRepository.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/MarmotRepository.kt @@ -1,7 +1,7 @@ -package com.it.curated.compose.repository +package to.curare.compose.repository -import com.it.curated.compose.database.model.MarmotInnerEvent -import com.it.curated.compose.database.model.MarmotKeyPackageBundle +import to.curare.compose.database.model.MarmotInnerEvent +import to.curare.compose.database.model.MarmotKeyPackageBundle import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync import kotlinx.coroutines.flow.Flow diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/NostrNotaryRepository.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/NostrNotaryRepository.kt similarity index 67% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/NostrNotaryRepository.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/repository/NostrNotaryRepository.kt index 93a57413..693802e9 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/NostrNotaryRepository.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/NostrNotaryRepository.kt @@ -1,7 +1,7 @@ -package com.it.curated.compose.repository +package to.curare.compose.repository -import com.it.curated.compose.cryptography.signOrThrow -import com.it.curated.compose.network.asClientTag +import to.curare.compose.cryptography.signOrThrow +import to.curare.compose.network.asClientTag import com.vitorpamplona.quartz.nip19Bech32.toNsec import com.vitorpamplona.quartz.nip51Lists.relayLists.RelayFeedsListEvent import fr.acinq.phoenix.managers.WalletManager @@ -36,10 +36,10 @@ class NostrNotaryRepository( private val _responses = Channel() private fun setResponse(response: SignResult) = scope.launch { _responses.send(response) } - suspend fun signNostrEvent(unsignedNostrEvent: com.it.curated.compose.database.model.UnsignedNostrEvent): SignResult { + suspend fun signNostrEvent(unsignedNostrEvent: to.curare.compose.database.model.UnsignedNostrEvent): SignResult { val result = try { signNostrEvent(publicKey = unsignedNostrEvent.pubKey, event = unsignedNostrEvent) - } catch (error: com.it.curated.compose.exceptions.SignatureException) { + } catch (error: to.curare.compose.exceptions.SignatureException) { return SignResult.Rejected(error) } @@ -53,24 +53,24 @@ class NostrNotaryRepository( } } - fun verifySignature(nostrEvent: com.it.curated.compose.database.model.NostrEvent): Boolean { + fun verifySignature(nostrEvent: to.curare.compose.database.model.NostrEvent): Boolean { throw NotImplementedError() } - fun onSuccess(nostrEvent: com.it.curated.compose.database.model.NostrEvent) { + fun onSuccess(nostrEvent: to.curare.compose.database.model.NostrEvent) { setResponse(SignResult.Signed(nostrEvent)) } fun onFailure() { - setResponse(SignResult.Rejected(com.it.curated.compose.exceptions.SigningRejectedException())) + setResponse(SignResult.Rejected(to.curare.compose.exceptions.SigningRejectedException())) } private fun findNsecOrThrow(activeUserPublicKey: String): String = runCatching { walletManager.keyManager.value?.nostrPrivateKey()?.value?.toByteArray()?.toNsec() - }.getOrNull() ?: throw com.it.curated.compose.exceptions.SigningKeyNotFoundException() + }.getOrNull() ?: throw to.curare.compose.exceptions.SigningKeyNotFoundException() - private fun signNostrEvent(publicKey: String, event: com.it.curated.compose.database.model.UnsignedNostrEvent): com.it.curated.compose.database.model.NostrEvent { + private fun signNostrEvent(publicKey: String, event: to.curare.compose.database.model.UnsignedNostrEvent): to.curare.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 = com.it.curated.compose.database.model.UnsignedNostrEvent( + unsignedNostrEvent = to.curare.compose.database.model.UnsignedNostrEvent( pubKey = userId, content = "", kind = RelayFeedsListEvent.KIND, @@ -100,20 +100,20 @@ class NostrNotaryRepository( } ) } - .toTypedArray() + listOf(com.it.curated.compose.network.UserAgent.CLIENT_NAME.asClientTag()), + .toTypedArray() + listOf(to.curare.compose.network.UserAgent.CLIENT_NAME.asClientTag()), ), ) } sealed class NotarySideEffect { - data class RequestSignature(val unsignedEvent: com.it.curated.compose.database.model.UnsignedNostrEvent) : NotarySideEffect() + data class RequestSignature(val unsignedEvent: to.curare.compose.database.model.UnsignedNostrEvent) : NotarySideEffect() } sealed class SignResult { - data class Signed(val event: com.it.curated.compose.database.model.NostrEvent) : SignResult() - data class Rejected(val error: com.it.curated.compose.exceptions.SignatureException) : SignResult() + data class Signed(val event: to.curare.compose.database.model.NostrEvent) : SignResult() + data class Rejected(val error: to.curare.compose.exceptions.SignatureException) : SignResult() - fun unwrapOrThrow(onFailure: ((com.it.curated.compose.exceptions.SignatureException) -> Unit)? = null): com.it.curated.compose.database.model.NostrEvent = + fun unwrapOrThrow(onFailure: ((to.curare.compose.exceptions.SignatureException) -> Unit)? = null): to.curare.compose.database.model.NostrEvent = when (this) { is Rejected -> { onFailure?.invoke(this.error) @@ -125,7 +125,7 @@ class NostrNotaryRepository( } } - fun getOrNull(onFailure: ((com.it.curated.compose.exceptions.SignatureException) -> Unit)? = null): com.it.curated.compose.database.model.NostrEvent? = + fun getOrNull(onFailure: ((to.curare.compose.exceptions.SignatureException) -> Unit)? = null): to.curare.compose.database.model.NostrEvent? = when (this) { is Rejected -> { onFailure?.invoke(this.error) diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/NostrPublisherRepository.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/NostrPublisherRepository.kt similarity index 69% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/NostrPublisherRepository.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/repository/NostrPublisherRepository.kt index 80334d18..c0818d35 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/NostrPublisherRepository.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/NostrPublisherRepository.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.repository +package to.curare.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: com.it.curated.compose.network.relays.RelaysSocketManager, + private val relaysSocketManager: to.curare.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: com.it.curated.compose.database.model.NostrEvent) { + private fun importEvent(event: to.curare.compose.database.model.NostrEvent) { scope.launch { runCatching { cachingImportRepository.importEvents(events = listOf(event)) @@ -30,8 +30,8 @@ class NostrPublisherRepository( } } - @Throws(com.it.curated.compose.exceptions.NostrPublishException::class) - private suspend fun publishAndImportEvent(signedNostrEvent: com.it.curated.compose.database.model.NostrEvent, outboxRelays: List = emptyList()) { + @Throws(to.curare.compose.exceptions.NostrPublishException::class) + private suspend fun publishAndImportEvent(signedNostrEvent: to.curare.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 { - com.it.curated.compose.network.dto.RelayDTO( + to.curare.compose.network.dto.RelayDTO( url = it, read = false, write = true @@ -52,19 +52,19 @@ class NostrPublisherRepository( } } - @Throws(com.it.curated.compose.exceptions.NostrPublishException::class, com.it.curated.compose.exceptions.SignatureException::class) + @Throws(to.curare.compose.exceptions.NostrPublishException::class, to.curare.compose.exceptions.SignatureException::class) suspend fun signPublishImportNostrEvent( - unsignedNostrEvent: com.it.curated.compose.database.model.UnsignedNostrEvent, + unsignedNostrEvent: to.curare.compose.database.model.UnsignedNostrEvent, outboxRelays: List, - ): com.it.curated.compose.database.model.NostrEvent { + ): to.curare.compose.database.model.NostrEvent { val signedNostrEvent = nostrNotary.signNostrEvent(unsignedNostrEvent = unsignedNostrEvent).unwrapOrThrow() publishAndImportEvent(signedNostrEvent = signedNostrEvent, outboxRelays = outboxRelays) return signedNostrEvent } - @Throws(com.it.curated.compose.exceptions.NostrPublishException::class, com.it.curated.compose.exceptions.SignatureException::class) - suspend fun publishRelayList(userId: String, relays: List): com.it.curated.compose.database.model.NostrEvent { + @Throws(to.curare.compose.exceptions.NostrPublishException::class, to.curare.compose.exceptions.SignatureException::class) + suspend fun publishRelayList(userId: String, relays: List): to.curare.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/com/it/curated/compose/repository/NostrRepository.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/NostrRepository.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/NostrRepository.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/repository/NostrRepository.kt index f637a434..168c5fdb 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/NostrRepository.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/NostrRepository.kt @@ -1,21 +1,21 @@ -package com.it.curated.compose.repository +package to.curare.compose.repository -import com.it.curated.compose.database.model.BroadcastNostrEventReceipt -import com.it.curated.compose.database.model.BroadcastNostrEventRequest -import com.it.curated.compose.database.model.Connection -import com.it.curated.compose.database.model.NegentropySynchronizeRequest -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.RecentSearch -import com.it.curated.compose.database.model.SynchronizeNostrEventRequest -import com.it.curated.compose.database.model.UnsignedNostrEvent -import com.it.curated.compose.database.model.intermdiate.LocalAccount -import com.it.curated.compose.database.model.intermdiate.LocalBroadcastNostrEventRequest -import com.it.curated.compose.database.model.intermdiate.LocalNostrEvent -import com.it.curated.compose.database.model.intermdiate.LocalProfile -import com.it.curated.compose.database.model.intermdiate.LocalProfileWithFollowers -import com.it.curated.compose.database.model.intermdiate.LocalProfileWithFollowing -import com.it.curated.compose.database.model.types.SynchronizationFilter +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.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.Kind import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair @@ -169,7 +169,7 @@ interface NostrRepository { suspend fun removeRecentSearch(recentSearch: RecentSearch) - suspend fun saveSearchQuery(query: String, synchronizationFilterArray: com.it.curated.compose.database.model.typealiases.SynchronizationFilterArray? = null) + suspend fun saveSearchQuery(query: String, synchronizationFilterArray: to.curare.compose.database.model.typealiases.SynchronizationFilterArray? = null) suspend fun rescheduleBroadcastNostrEventRequests(broadcastNostrEventRequests: List) @@ -378,7 +378,7 @@ interface NostrRepository { override suspend fun saveSearchQuery( query: String, - synchronizationFilterArray: com.it.curated.compose.database.model.typealiases.SynchronizationFilterArray? + synchronizationFilterArray: to.curare.compose.database.model.typealiases.SynchronizationFilterArray? ) { TODO("Not yet implemented") } diff --git a/composeApp/src/commonMain/kotlin/to/curare/compose/repository/PostRepository.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/PostRepository.kt new file mode 100644 index 00000000..7597ea61 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/PostRepository.kt @@ -0,0 +1,3 @@ +package to.curare.compose.repository + +interface PostRepository \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/RelayRepository.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/RelayRepository.kt similarity index 58% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/RelayRepository.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/repository/RelayRepository.kt index 8d2e8255..d5015510 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/RelayRepository.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/RelayRepository.kt @@ -1,7 +1,7 @@ -package com.it.curated.compose.repository +package to.curare.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/com/it/curated/compose/repository/SearchRepository.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/SearchRepository.kt similarity index 54% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/SearchRepository.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/repository/SearchRepository.kt index e5326a99..8b6bf14e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/repository/SearchRepository.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/repository/SearchRepository.kt @@ -1,14 +1,14 @@ -package com.it.curated.compose.repository +package to.curare.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/com/it/curated/compose/text/Markdown.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/text/Markdown.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/text/Markdown.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/text/Markdown.kt index e953ed4b..3c3752b0 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/text/Markdown.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/text/Markdown.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.text +package to.curare.compose.text /** * Lightweight helpers for the markdown original text of chapters/chunks. diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/text/ProposedEvent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/text/ProposedEvent.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/text/ProposedEvent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/text/ProposedEvent.kt index 0941646f..570df051 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/text/ProposedEvent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/text/ProposedEvent.kt @@ -1,16 +1,16 @@ -package com.it.curated.compose.text +package to.curare.compose.text import com.vitorpamplona.quartz.nip01Core.core.Event -import com.it.curated.compose.managers.SharedKeyDerivation -import com.it.curated.compose.nostr.frost.GroupKeyStateEvent -import com.it.curated.compose.nostr.subgroup.SubgroupBirthCertificateEvent -import com.it.curated.compose.nostr.nip30303.ArtifactEvent -import com.it.curated.compose.nostr.nip30303.ArtifactVersionEvent -import com.it.curated.compose.nostr.nip30303.ChapterEvent -import com.it.curated.compose.nostr.nip30303.DialectEvent -import com.it.curated.compose.nostr.nip30303.TranslationArtifactVersionEvent -import com.it.curated.compose.nostr.nip30303.TranslationChapterEvent -import com.it.curated.compose.nostr.nip30303.TranslationChunkEvent +import to.curare.compose.managers.SharedKeyDerivation +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 /** * An event a group is being asked to sign, said in words. diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/BlurHashDecoder.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/BlurHashDecoder.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/BlurHashDecoder.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/BlurHashDecoder.kt index 7f07af4f..12f825cb 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/BlurHashDecoder.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/BlurHashDecoder.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui +package to.curare.compose.ui import coil3.Bitmap import kotlin.math.pow diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ActiveProfileScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ActiveProfileScreen.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ActiveProfileScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ActiveProfileScreen.kt index 781701a1..592b0136 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ActiveProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ActiveProfileScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -36,43 +36,43 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.intermdiate.LocalNostrEvent -import com.it.curated.compose.extensions.hexToNpubHrp -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import com.it.curated.compose.ui.composable.navigation.routes.KeyPackageManagementRoute -import com.it.curated.compose.ui.composable.navigation.routes.KeyRecoveryRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.navigation.routes.ShareProfileRoute -import com.it.curated.compose.ui.composable.widgets.Decorative -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.composable.widgets.profile.ProfileAvatar -import com.it.curated.compose.ui.view.model.ActiveProfileViewModel -import com.it.curated.compose.ui.view.state.ActiveProfileUIState +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.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.change_account -import curated.composeapp.generated.resources.edit_profile -import curated.composeapp.generated.resources.key_package_management -import curated.composeapp.generated.resources.network_relays -import curated.composeapp.generated.resources.profile -import curated.composeapp.generated.resources.key_recovery -import curated.composeapp.generated.resources.share_profile -import curated.composeapp.generated.resources.sign_out -import curated.composeapp.generated.resources.something_went_wrong -import curated.composeapp.generated.resources.we_couldn_t_find_the_local_profile_please -import com.it.curated.compose.ui.composable.widgets.ErrorState +import curare.composeapp.generated.resources.change_account +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.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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState +import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState import androidx.compose.material3.FilledTonalButton import androidx.compose.material3.ButtonDefaults -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.composable.widgets.ScreenStateTransition -import com.it.curated.compose.ui.theme.ConformancePreviews +import to.curare.compose.ui.theme.readableContent +import to.curare.compose.ui.composable.widgets.ScreenStateTransition +import to.curare.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class) @Composable @@ -395,7 +395,7 @@ fun ActiveProfileScreen( @ConformancePreviews @Composable private fun UnannouncedProfileScreenPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { @@ -414,7 +414,7 @@ It has survived not only five centuries, but also the leap into electronic types sig = "", kind = MetadataEvent.KIND ), - profile = com.it.curated.compose.database.model.Profile( + profile = to.curare.compose.database.model.Profile( publicKey = "84dee6e676e5bb67b4ad4e042cf70cbd8681155db535942fcc6a0533858a7240", displayName = "John Doe", nostrEventId = "nostrEventId", diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/AddArtifactScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddArtifactScreen.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/AddArtifactScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddArtifactScreen.kt index 87616608..7457d11e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/AddArtifactScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddArtifactScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -51,42 +51,42 @@ import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.ui.composable.navigation.routes.ChatRoomDetailRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.view.state.ChatRoomMessagingUIState +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.vitorpamplona.quartz.nip01Core.core.HexKey -import com.it.curated.compose.repository.MantraRepository -import com.it.curated.compose.ui.composable.navigation.routes.FrostSigningRoute -import com.it.curated.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import com.it.curated.compose.ui.view.model.AddArtifactViewModel -import com.it.curated.compose.ui.view.state.AddArtifactUIState -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +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 org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.add_artifact_to_the_group_library -import curated.composeapp.generated.resources.direct_message_detail -import curated.composeapp.generated.resources.direct_message_functionality_will_be_here -import curated.composeapp.generated.resources.eg_first_edition -import curated.composeapp.generated.resources.eg_https_harper_com_2_kill_bird -import curated.composeapp.generated.resources.eg_to_kill_a_mocking_bird -import curated.composeapp.generated.resources.initial_version_label -import curated.composeapp.generated.resources.name_of_artifact -import curated.composeapp.generated.resources.no_dialects_have_been_defined_in_this_group -import curated.composeapp.generated.resources.propose_artifact -import curated.composeapp.generated.resources.source_dialect -import curated.composeapp.generated.resources.url +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.composable.widgets.ScreenStateTransition -import com.it.curated.compose.ui.theme.ConformancePreviews +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.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class) @Composable @@ -405,7 +405,7 @@ fun AddArtifactScreen( @ConformancePreviews @Composable private fun AddArtifactScreenPreview() { - CuratedTheme { + CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/AddChapterScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddChapterScreen.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/AddChapterScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddChapterScreen.kt index de4272b7..0f525a8f 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/AddChapterScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddChapterScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -37,37 +37,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 com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.MantraArtifact -import com.it.curated.compose.database.model.MantraArtifactVersion -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.repository.MantraRepository -import com.it.curated.compose.text.Markdown -import com.it.curated.compose.ui.composable.navigation.routes.FrostSigningRoute -import com.it.curated.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.view.model.AddChapterViewModel -import com.it.curated.compose.ui.view.state.AddChapterUIState -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +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 org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.add_chapter -import curated.composeapp.generated.resources.chapter_name -import curated.composeapp.generated.resources.eg_chapter_1_the_beginning -import curated.composeapp.generated.resources.original_text_markdown -import curated.composeapp.generated.resources.paste_the_chapter_s_markdown_blank_lines -import curated.composeapp.generated.resources.propose_chapter -import curated.composeapp.generated.resources.this_artifact_has_no_version_for_a_chapter -import curated.composeapp.generated.resources.add_chapter_to +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.composable.widgets.ScreenStateTransition -import com.it.curated.compose.ui.theme.ConformancePreviews +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.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -313,7 +313,7 @@ fun AddChapterScreen( @ConformancePreviews @Composable private fun AddChapterScreenPreview() { - CuratedTheme { + CurareTheme { Surface(modifier = Modifier.fillMaxSize()) { AddChapterScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/AddDialectScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddDialectScreen.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/AddDialectScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddDialectScreen.kt index 339c2652..1831b038 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/AddDialectScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddDialectScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -42,35 +42,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 com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.ui.composable.navigation.routes.FrostSigningRoute -import com.it.curated.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.view.model.AddDialectViewModel -import com.it.curated.compose.ui.view.state.AddDialectUIState -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +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 org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.add_a_dialect_the_group_can_translate_into -import curated.composeapp.generated.resources.add_dialect -import curated.composeapp.generated.resources.country -import curated.composeapp.generated.resources.dialect_name -import curated.composeapp.generated.resources.eg_lesotho -import curated.composeapp.generated.resources.eg_sesotho -import curated.composeapp.generated.resources.eg_st -import curated.composeapp.generated.resources.language -import curated.composeapp.generated.resources.propose_dialect +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.composable.widgets.ScreenStateTransition -import com.it.curated.compose.ui.theme.ConformancePreviews +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.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class) @Composable @@ -340,7 +340,7 @@ fun AddDialectScreen( @ConformancePreviews @Composable private fun AddDialectScreenPreview() { - CuratedTheme { + CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/AddGroupPostScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddGroupPostScreen.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/AddGroupPostScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddGroupPostScreen.kt index 824fd9cb..32ce3afc 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/AddGroupPostScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddGroupPostScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -43,33 +43,33 @@ import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.lifecycle.viewmodel.compose.viewModel -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.ui.composable.navigation.routes.FrostSigningRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.widgets.ErrorState -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.composable.widgets.ScreenStateTransition -import com.it.curated.compose.ui.composable.widgets.profile.ProfileAvatar -import com.it.curated.compose.ui.composable.widgets.rememberNotifier -import com.it.curated.compose.ui.theme.ConformancePreviews -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.theme.spacing -import com.it.curated.compose.ui.view.model.AddGroupPostViewModel -import com.it.curated.compose.ui.view.state.AddGroupPostUIState +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.ScreenStateTransition +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.vitorpamplona.quartz.nip01Core.core.HexKey -import curated.composeapp.generated.resources.Res -import curated.composeapp.generated.resources.a_post_needs_something_to_say -import curated.composeapp.generated.resources.add_post -import curated.composeapp.generated.resources.could_not_ask_the_group_to_sign_this_post -import curated.composeapp.generated.resources.propose_post -import curated.composeapp.generated.resources.the_group_signs_a_post_so_it_takes_a_quorum -import curated.composeapp.generated.resources.this_group_has_no_shared_key_to_sign_a_post -import curated.composeapp.generated.resources.what_should_the_group_say +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 org.jetbrains.compose.resources.stringResource /** @@ -303,7 +303,7 @@ fun AddGroupPostScreen( @ConformancePreviews @Composable private fun AddGroupPostScreenPreview() { - CuratedTheme { + CurareTheme { Surface(modifier = Modifier.fillMaxSize()) { AddGroupPostScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt index c30634ea..42b84c21 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -25,31 +25,31 @@ 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 com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.MarmotKeyPackage -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.view.model.AddMemberToChatRoomConfirmationViewModel -import com.it.curated.compose.ui.view.state.AddMemberToChatRoomConfirmationUIState +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.vitorpamplona.quartz.nip01Core.core.HexKey -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.direct_message_detail -import curated.composeapp.generated.resources.direct_message_functionality_will_be_here -import curated.composeapp.generated.resources.invite -import curated.composeapp.generated.resources.invite_2 -import curated.composeapp.generated.resources.once_invited_will_be_able_to_receive_and -import curated.composeapp.generated.resources.to_join_the_chat_room +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.once_invited_will_be_able_to_receive_and +import curare.composeapp.generated.resources.to_join_the_chat_room import androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.composable.widgets.ScreenStateTransition -import com.it.curated.compose.ui.theme.ConformancePreviews +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.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class) @Composable @@ -217,7 +217,7 @@ fun AddMemberToChatRoomConfirmationScreen( @ConformancePreviews @Composable private fun ChatRoomDetailScreenPreview() { - CuratedTheme { + CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { @@ -227,7 +227,7 @@ private fun ChatRoomDetailScreenPreview() { chatRoomId = "publicKey", relayHint = null, initialChatRoomDetailUIState = -// AddMemberToChatRoomConfirmationUIState.Error("Profile missing key package event.\n\nTry again later or tell Person to use Curated."), +// AddMemberToChatRoomConfirmationUIState.Error("Profile missing key package event.\n\nTry again later or tell Person to use Curare."), AddMemberToChatRoomConfirmationUIState.Loaded( localChatRoom = LocalChatRoom( chatRoom = ChatRoom( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/AddTranslationArtifactVersionScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddTranslationArtifactVersionScreen.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/AddTranslationArtifactVersionScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddTranslationArtifactVersionScreen.kt index c693b5c4..ce35a625 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/AddTranslationArtifactVersionScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/AddTranslationArtifactVersionScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -40,35 +40,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 com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.MantraArtifact -import com.it.curated.compose.database.model.MantraArtifactVersion -import com.it.curated.compose.database.model.MantraDialect -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.managers.FrostSigningManager -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.repository.MantraRepository -import com.it.curated.compose.ui.composable.navigation.routes.FrostSigningRoute -import com.it.curated.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.view.model.AddTranslationArtifactVersionViewModel -import com.it.curated.compose.ui.view.state.AddTranslationArtifactVersionUIState -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +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 org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.add_translation -import curated.composeapp.generated.resources.propose_translation -import curated.composeapp.generated.resources.this_artifact_has_no_version_for_a -import curated.composeapp.generated.resources.translate_into_which_dialect -import curated.composeapp.generated.resources.translate +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.composable.widgets.ScreenStateTransition -import com.it.curated.compose.ui.theme.ConformancePreviews +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.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class) @Composable @@ -317,7 +317,7 @@ fun AddTranslationArtifactVersionScreen( @ConformancePreviews @Composable private fun AddTranslationArtifactVersionScreenPreview() { - CuratedTheme { + CurareTheme { Surface(modifier = Modifier.fillMaxSize()) { AddTranslationArtifactVersionScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ArtifactDetailScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ArtifactDetailScreen.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ArtifactDetailScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ArtifactDetailScreen.kt index 4afb4ff0..c3aa7b56 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ArtifactDetailScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ArtifactDetailScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -35,39 +35,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 com.it.curated.compose.database.model.MantraArtifact -import com.it.curated.compose.repository.MantraRepository -import com.it.curated.compose.ui.composable.widgets.DetailRow -import com.it.curated.compose.ui.composable.navigation.routes.AddChapterRoute -import com.it.curated.compose.ui.composable.navigation.routes.AddTranslationRoute -import com.it.curated.compose.ui.composable.navigation.routes.ChapterDetailRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.navigation.routes.TranslationArtifactVersionDetailRoute -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.view.model.ArtifactDetailViewModel -import com.it.curated.compose.ui.view.state.ArtifactDetailUIState -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +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 org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.add_chapter -import curated.composeapp.generated.resources.add_translation -import curated.composeapp.generated.resources.artifact_detail -import curated.composeapp.generated.resources.chapters -import curated.composeapp.generated.resources.details -import curated.composeapp.generated.resources.no_chapters_yet -import curated.composeapp.generated.resources.no_translations_yet -import curated.composeapp.generated.resources.no_versions -import curated.composeapp.generated.resources.translations -import curated.composeapp.generated.resources.version -import curated.composeapp.generated.resources.versions -import curated.composeapp.generated.resources.chapter -import curated.composeapp.generated.resources.words_characters +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.composable.widgets.ScreenStateTransition -import com.it.curated.compose.ui.theme.ConformancePreviews +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.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -333,7 +333,7 @@ fun ArtifactDetailScreen( @ConformancePreviews @Composable private fun ArtifactDetailScreenPreview() { - CuratedTheme { + CurareTheme { Surface(modifier = Modifier.fillMaxSize()) { ArtifactDetailScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ChapterDetailScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ChapterDetailScreen.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ChapterDetailScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ChapterDetailScreen.kt index 28fb5dc3..d60f3a9a 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ChapterDetailScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ChapterDetailScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -31,27 +31,27 @@ 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 com.it.curated.compose.database.model.MantraChapter -import com.it.curated.compose.repository.MantraRepository -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.view.model.ChapterDetailViewModel -import com.it.curated.compose.ui.view.state.ChapterDetailUIState -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +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 org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.chapter_detail -import curated.composeapp.generated.resources.no_chunks -import curated.composeapp.generated.resources.original_text -import curated.composeapp.generated.resources.chapter_words_characters -import curated.composeapp.generated.resources.chunk -import curated.composeapp.generated.resources.chunks -import curated.composeapp.generated.resources.words_characters +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.composable.widgets.ScreenStateTransition -import com.it.curated.compose.ui.theme.ConformancePreviews +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.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -199,7 +199,7 @@ fun ChapterDetailScreen( @ConformancePreviews @Composable private fun ChapterDetailScreenPreview() { - CuratedTheme { + CurareTheme { Surface(modifier = Modifier.fillMaxSize()) { ChapterDetailScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ChatRoomCreationScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ChatRoomCreationScreen.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ChatRoomCreationScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ChatRoomCreationScreen.kt index 2a4e2c5f..6150eb0b 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ChatRoomCreationScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ChatRoomCreationScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -24,23 +24,23 @@ 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 com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.view.model.ChatRoomCreationViewModel +import to.curare.compose.ui.composable.navigation.routes.Route +import to.curare.compose.ui.view.model.ChatRoomCreationViewModel import com.vitorpamplona.quartz.nip01Core.core.HexKey -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.choose_who_to_chat_with -import curated.composeapp.generated.resources.enter_the_name_you_want_to_use_for_your -import curated.composeapp.generated.resources.name_eg_group_discussions -import curated.composeapp.generated.resources.this_will_be_shown_when_people_open_the_chat -import curated.composeapp.generated.resources.this_will_be_the_display_name_for_this_chat -import curated.composeapp.generated.resources.what_should_people_know_about_you -import curated.composeapp.generated.resources.what_will_be_discussed_in_this_chat_room +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.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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.theme.ConformancePreviews +import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState +import to.curare.compose.ui.theme.readableContent +import to.curare.compose.ui.theme.ConformancePreviews @Composable fun ChatRoomCreationScreen( @@ -175,7 +175,7 @@ fun ChatRoomCreationScreen( @ConformancePreviews @Composable private fun LoadingScreenPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ChatRoomDetailScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ChatRoomDetailScreen.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ChatRoomDetailScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ChatRoomDetailScreen.kt index 0cccfc40..180fda6e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ChatRoomDetailScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ChatRoomDetailScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -60,113 +60,113 @@ 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 com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.GroupKeyState -import com.it.curated.compose.database.model.GroupSignedEvent -import com.it.curated.compose.database.model.Participant -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.intermdiate.LocalParticipant -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.MantraRepository -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.navigation.routes.DkgRitualRoute -import com.it.curated.compose.ui.composable.navigation.routes.AddGroupPostRoute -import com.it.curated.compose.ui.composable.navigation.routes.EditGroupNostrProfileRoute -import com.it.curated.compose.ui.composable.navigation.routes.EditGroupRelaysRoute -import com.it.curated.compose.ui.composable.navigation.routes.ProposalListRoute -import com.it.curated.compose.ui.composable.navigation.routes.SearchMemberToAddToChatRoomRoute -import com.it.curated.compose.extensions.toFormattedTimeAndDateString -import com.it.curated.compose.ui.composable.widgets.Decorative -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.composable.widgets.dialogs.ModalBottomSheet -import com.it.curated.compose.ui.composable.widgets.rememberNotifier -import com.it.curated.compose.ui.composable.widgets.profile.ProfileAvatar -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.view.model.ChatRoomDetailViewModel -import com.it.curated.compose.ui.view.state.ChatRoomDetailUIState +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.ImplementationPendingRoute +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.AddGroupPostRoute +import to.curare.compose.ui.composable.navigation.routes.EditGroupNostrProfileRoute +import to.curare.compose.ui.composable.navigation.routes.EditGroupRelaysRoute +import to.curare.compose.ui.composable.navigation.routes.ProposalListRoute +import to.curare.compose.ui.composable.navigation.routes.SearchMemberToAddToChatRoomRoute +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.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip01Core.metadata.UserMetadata -import com.it.curated.compose.ui.composable.navigation.routes.AddArtifactRoute -import com.it.curated.compose.ui.composable.navigation.routes.AddDialectRoute -import com.it.curated.compose.ui.composable.navigation.routes.ArtifactDetailRoute -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.run_by_members -import curated.composeapp.generated.resources.nostr_profile -import curated.composeapp.generated.resources.relays -import curated.composeapp.generated.resources.posts -import curated.composeapp.generated.resources.add_post -import curated.composeapp.generated.resources.a_reply -import curated.composeapp.generated.resources.posted_on -import curated.composeapp.generated.resources.this_group_has_not_posted_anything_yet -import curated.composeapp.generated.resources.edit_relays -import curated.composeapp.generated.resources.not_set_yet -import curated.composeapp.generated.resources.no_relays_in_this_list -import curated.composeapp.generated.resources.relay_set_general -import curated.composeapp.generated.resources.relay_set_messages -import curated.composeapp.generated.resources.relay_set_search -import curated.composeapp.generated.resources.relay_set_blocked -import curated.composeapp.generated.resources.no_name_on_this_profile -import curated.composeapp.generated.resources.edit_nostr_profile -import curated.composeapp.generated.resources.signed_by_the_group_on -import curated.composeapp.generated.resources.this_group_has_not_said_anything_about_itself -import curated.composeapp.generated.resources.parent_group -import curated.composeapp.generated.resources.a_subgroup -import curated.composeapp.generated.resources.created_you_are_not_a_member -import curated.composeapp.generated.resources.certified_not_yet_created -import curated.composeapp.generated.resources.no_subgroups_have_been_made_by_this_group -import curated.composeapp.generated.resources.add_subgroup -import curated.composeapp.generated.resources.subgroups -import com.it.curated.compose.ui.composable.navigation.routes.SelectSubgroupAdminsRoute -import com.it.curated.compose.ui.composable.navigation.routes.NostrEventDetailRoute -import com.it.curated.compose.ui.composable.navigation.routes.ChatRoomDetailRoute -import com.it.curated.compose.managers.SubgroupManager -import com.it.curated.compose.nostr.GroupNostrProfile -import com.it.curated.compose.nostr.GroupPost -import com.it.curated.compose.nostr.GroupRelayList -import com.it.curated.compose.nostr.GroupRelaySet -import curated.composeapp.generated.resources.Res +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.ArtifactDetailRoute +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.add_post +import curare.composeapp.generated.resources.a_reply +import curare.composeapp.generated.resources.posted_on +import curare.composeapp.generated.resources.this_group_has_not_posted_anything_yet +import curare.composeapp.generated.resources.edit_relays +import curare.composeapp.generated.resources.not_set_yet +import curare.composeapp.generated.resources.no_relays_in_this_list +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.relay_set_blocked +import curare.composeapp.generated.resources.no_name_on_this_profile +import curare.composeapp.generated.resources.edit_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 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.GroupPost +import to.curare.compose.nostr.GroupRelayList +import to.curare.compose.nostr.GroupRelaySet +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.add_artifact_to_library -import curated.composeapp.generated.resources.add_dialect -import curated.composeapp.generated.resources.create_project -import curated.composeapp.generated.resources.delete_group -import curated.composeapp.generated.resources.dialects -import curated.composeapp.generated.resources.direct_message_detail -import curated.composeapp.generated.resources.direct_message_functionality_will_be_here -import curated.composeapp.generated.resources.invite_new_member -import curated.composeapp.generated.resources.leave_group -import curated.composeapp.generated.resources.library -import curated.composeapp.generated.resources.members_2 -import curated.composeapp.generated.resources.no_artifacts_exists_in_this_groups_library -import curated.composeapp.generated.resources.no_dialects_have_been_defined_in_this_group_2 -import curated.composeapp.generated.resources.no_projects_exists_in_this_group -import curated.composeapp.generated.resources.projects -import curated.composeapp.generated.resources.proposals -import curated.composeapp.generated.resources.reindex_events -import curated.composeapp.generated.resources.shared_key -import curated.composeapp.generated.resources.signing_key -import curated.composeapp.generated.resources.the_key_this_room_signs_as -import curated.composeapp.generated.resources.what_the_group_signed -import curated.composeapp.generated.resources.this_room_signs_as -import curated.composeapp.generated.resources.derivation_path -import curated.composeapp.generated.resources.key_ceremony -import curated.composeapp.generated.resources.agreed_on -import curated.composeapp.generated.resources.the_signed_event -import curated.composeapp.generated.resources.copy_the_signed_event -import curated.composeapp.generated.resources.copied_the_signed_event -import curated.composeapp.generated.resources.this_device_does_not_hold_the_event -import curated.composeapp.generated.resources.event_s_still_unreadable -import curated.composeapp.generated.resources.recovered_of_event_s -import curated.composeapp.generated.resources.recovered_of_still_unreadable +import curare.composeapp.generated.resources.add_artifact_to_library +import curare.composeapp.generated.resources.add_dialect +import curare.composeapp.generated.resources.create_project +import curare.composeapp.generated.resources.delete_group +import curare.composeapp.generated.resources.dialects +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.library +import curare.composeapp.generated.resources.members_2 +import curare.composeapp.generated.resources.no_artifacts_exists_in_this_groups_library +import curare.composeapp.generated.resources.no_dialects_have_been_defined_in_this_group_2 +import curare.composeapp.generated.resources.no_projects_exists_in_this_group +import curare.composeapp.generated.resources.projects +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.composable.widgets.ScreenStateTransition -import com.it.curated.compose.ui.theme.ConformancePreviews +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.theme.ConformancePreviews import kotlin.time.Instant @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class) @@ -1635,7 +1635,7 @@ private fun ReindexMarmotGroupEventsButton( @ConformancePreviews @Composable private fun ChatRoomMessagingScreenPreview() { - CuratedTheme { + CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ChatRoomMessagingScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ChatRoomMessagingScreen.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ChatRoomMessagingScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ChatRoomMessagingScreen.kt index e74cf190..cb3c8adf 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ChatRoomMessagingScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ChatRoomMessagingScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -40,38 +40,38 @@ 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 com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.DkgRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.ui.composable.navigation.routes.ChatRoomDetailRoute -import com.it.curated.compose.ui.composable.navigation.routes.DkgRitualRoute -import com.it.curated.compose.ui.composable.navigation.routes.FrostSigningRoute -import com.it.curated.compose.ui.composable.navigation.routes.ProposalListRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.view.model.ChatRoomMessagingViewModel -import com.it.curated.compose.ui.view.state.ChatRoomMessagingUIState +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.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 com.vitorpamplona.quartz.nip01Core.core.HexKey -import com.it.curated.compose.ui.composable.widgets.chat.ChatTranscript -import com.it.curated.compose.ui.theme.spacing -import com.it.curated.compose.ui.composable.widgets.Decorative -import curated.composeapp.generated.resources.Res +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 org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.creating_new_chat -import curated.composeapp.generated.resources.direct_message_detail -import curated.composeapp.generated.resources.direct_message_functionality_will_be_here -import curated.composeapp.generated.resources.say_what_now -import curated.composeapp.generated.resources.private_message_to -import curated.composeapp.generated.resources.private_to +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.composable.widgets.ScreenStateTransition -import com.it.curated.compose.ui.theme.ConformancePreviews +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.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class) @Composable @@ -116,8 +116,8 @@ fun ChatRoomMessagingScreen( is ChatRoomMessagingUIState.Loaded -> { val textFieldState = rememberTextFieldState() - val chatMessageListViewModel: com.it.curated.compose.ui.view.model.ChatMessageListViewModel = viewModel( - factory = com.it.curated.compose.ui.view.model.ChatMessageListViewModel.factory( + val chatMessageListViewModel: to.curare.compose.ui.view.model.ChatMessageListViewModel = viewModel( + factory = to.curare.compose.ui.view.model.ChatMessageListViewModel.factory( localChatRoom = chatRoomDetailUIState.localChatRoom, nostrRepository = nostrRepository, chatRepository = chatRepository, @@ -466,7 +466,7 @@ fun ChatRoomMessagingScreen( @ConformancePreviews @Composable private fun ChatRoomMessagingScreenPreview() { - CuratedTheme { + CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/CreateProfileScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/CreateProfileScreen.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/CreateProfileScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/CreateProfileScreen.kt index 3a845ef0..226efae1 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/CreateProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/CreateProfileScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -31,44 +31,44 @@ 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 com.it.curated.compose.repository.MarmotRepository -import com.it.curated.compose.ui.theme.LocalExtendedColors -import com.it.curated.compose.ui.view.model.CreateProfileViewModel -import com.it.curated.compose.ui.view.state.CreateProfileUIState -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.repository.MarmotRepository +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 org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.after_this_there_is_no_turning_back -import curated.composeapp.generated.resources.bio -import curated.composeapp.generated.resources.create_profile -import curated.composeapp.generated.resources.end_this -import curated.composeapp.generated.resources.enter_the_name_you_want_to_use_for_your_2 -import curated.composeapp.generated.resources.introduce_yourself -import curated.composeapp.generated.resources.it_is_cryptographical_secure_and -import curated.composeapp.generated.resources.name -import curated.composeapp.generated.resources.name_eg_alan_turing -import curated.composeapp.generated.resources.next -import curated.composeapp.generated.resources.profile_is_ready -import curated.composeapp.generated.resources.see_how_deep_the_rabbit_hole_goes -import curated.composeapp.generated.resources.something_went_wrong_and_we_were_unable_to_2 -import curated.composeapp.generated.resources.start -import curated.composeapp.generated.resources.the_above_will_be_your_profile -import curated.composeapp.generated.resources.this_will_be_shown_when_people_open_your -import curated.composeapp.generated.resources.this_will_be_the_display_name_for_your -import curated.composeapp.generated.resources.what_should_people_know_about_you -import curated.composeapp.generated.resources.you_are_about_to_create_a_nostr_profile -import curated.composeapp.generated.resources.you_will_be_in_full_control_of_this_profile +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.end_this +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.theme.ConformancePreviews +import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState +import to.curare.compose.ui.theme.readableContent +import to.curare.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable fun CreateProfileScreen( initialCreateProfileUIState: CreateProfileUIState = CreateProfileUIState.Declaration, onNavigateToEndThis: () -> Unit, - nostrRepository: com.it.curated.compose.repository.NostrRepository, + nostrRepository: to.curare.compose.repository.NostrRepository, marmotRepository: MarmotRepository, writeSeed: (mnemonics: List, onSeedWritten: () -> Unit, onSeedWriteError: () -> Unit) -> Unit ) { @@ -396,7 +396,7 @@ fun CreateProfileScreen( @ConformancePreviews @Composable fun CreateAccountScreenPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { @@ -429,8 +429,8 @@ fun CreateAccountScreenPreview() { // name = "Alan Turing", // bio = "Polyglot: Math... is my middle name, computer scientist. cryptographer, and gold hider." // ), -// com.it.curated.compose.ui.view.state.CreateProfileUIState.ProfileReady( -// profile = com.it.curated.compose.database.model.Profile( +// to.curare.compose.ui.view.state.CreateProfileUIState.ProfileReady( +// profile = to.curare.compose.database.model.Profile( // publicKey = "", // nostrEventId = "", // displayName = "Alan Turing", @@ -439,7 +439,7 @@ fun CreateAccountScreenPreview() { // ), onNavigateToEndThis = {}, writeSeed = { _, _, _ -> }, - nostrRepository = com.it.curated.compose.repository.NostrRepository.NO_OP_NOSTR_REPOSITORY, + nostrRepository = to.curare.compose.repository.NostrRepository.NO_OP_NOSTR_REPOSITORY, marmotRepository = MarmotRepository.NO_OP_MARMOT_KEY_PACKAGE_BUNDLE ) } diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/DkgApprovalScaffold.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgApprovalScaffold.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/DkgApprovalScaffold.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgApprovalScaffold.kt index 7f209740..b877ef66 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/DkgApprovalScaffold.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgApprovalScaffold.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -29,23 +29,23 @@ 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 com.it.curated.compose.database.model.types.DkgApprovalStep -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.DkgRepository -import com.it.curated.compose.ui.view.model.DkgRitualViewModel -import com.it.curated.compose.ui.view.state.DkgRitualUIState +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.vitorpamplona.quartz.nip01Core.core.HexKey import fr.acinq.phoenix.data.ActiveWallet import kotlinx.coroutines.flow.StateFlow -import com.it.curated.compose.ui.theme.spacing -import com.it.curated.compose.ui.composable.widgets.Decorative -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import to.curare.compose.ui.composable.widgets.Decorative +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.back -import curated.composeapp.generated.resources.not_now +import curare.composeapp.generated.resources.back +import curare.composeapp.generated.resources.not_now import androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent +import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState +import to.curare.compose.ui.theme.readableContent /** * The frame every ChillDKG approval screen sits in: the view model, the states diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/DkgJoinApprovalScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgJoinApprovalScreen.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/DkgJoinApprovalScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgJoinApprovalScreen.kt index 82b81ab6..c2da84ce 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/DkgJoinApprovalScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgJoinApprovalScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.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 com.it.curated.compose.database.model.types.DkgApprovalStep -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.DkgRepository +import to.curare.compose.database.model.types.DkgApprovalStep +import to.curare.compose.repository.ChatRepository +import to.curare.compose.repository.DkgRepository import com.vitorpamplona.quartz.nip01Core.core.HexKey import fr.acinq.phoenix.data.ActiveWallet import kotlinx.coroutines.flow.StateFlow -import com.it.curated.compose.ui.theme.spacing +import to.curare.compose.ui.theme.spacing /** * Asks whether to join a shared key ceremony somebody else opened. diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/DkgRitualScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgRitualScreen.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/DkgRitualScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgRitualScreen.kt index abe2ead8..ef934b99 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/DkgRitualScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgRitualScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -51,72 +51,72 @@ 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 com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.DkgSession -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.intermdiate.LocalParticipant -import com.it.curated.compose.database.model.types.DkgRitualStage -import com.it.curated.compose.database.model.types.FrostSigningStage -import com.it.curated.compose.extensions.memberName -import com.it.curated.compose.managers.ChillDkgRitualManager -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.DkgRepository -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.composable.widgets.profile.ProfileColor -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.database.model.types.DkgApprovalStep -import com.it.curated.compose.ui.composable.navigation.routes.DkgJoinApprovalRoute -import com.it.curated.compose.ui.composable.navigation.routes.DkgRound1ApprovalRoute -import com.it.curated.compose.ui.composable.navigation.routes.DkgRound2ApprovalRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.view.model.DkgRitualViewModel -import com.it.curated.compose.ui.view.state.DkgRitualUIState +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.vitorpamplona.quartz.nip01Core.core.HexKey -import com.it.curated.compose.database.model.FrostSigningSession +import to.curare.compose.database.model.FrostSigningSession import fr.acinq.phoenix.data.ActiveWallet import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import com.it.curated.compose.ui.theme.spacing -import com.it.curated.compose.ui.composable.widgets.Decorative -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import to.curare.compose.ui.composable.widgets.Decorative +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.create_the_admin_room +import curare.composeapp.generated.resources.create_the_admin_room import androidx.compose.material.icons.filled.AccountTree -import curated.composeapp.generated.resources.create_the_subgroup -import curated.composeapp.generated.resources.ask_the_parent_group_to_certify -import curated.composeapp.generated.resources.before_the_subgroup_exists_its_parent_signs -import curated.composeapp.generated.resources.the_parent_group_is_certifying_this_subgroup -import curated.composeapp.generated.resources.the_parent_group_could_not_certify_this_subgroup -import curated.composeapp.generated.resources.the_parent_group_has_certified_this_subgroup -import curated.composeapp.generated.resources.how_many_members_will_it_take_to_sign -import curated.composeapp.generated.resources.key -import curated.composeapp.generated.resources.members -import curated.composeapp.generated.resources.nothing_was_created_and_no_key_exists_it_is -import curated.composeapp.generated.resources.review_and_confirm -import curated.composeapp.generated.resources.review_and_contribute -import curated.composeapp.generated.resources.review_and_join -import curated.composeapp.generated.resources.shared_key -import curated.composeapp.generated.resources.start_key_ceremony -import curated.composeapp.generated.resources.the_ceremony_was_abandoned -import curated.composeapp.generated.resources.the_group_can_hold_one_key_together_split_so -import curated.composeapp.generated.resources.the_group_has_a_shared_key -import curated.composeapp.generated.resources.the_group_has_agreed_what_the_admin_room -import curated.composeapp.generated.resources.the_group_could_not_agree_what_the_admin -import curated.composeapp.generated.resources.the_group_is_agreeing_what_the_admin_room -import curated.composeapp.generated.resources.agree_the_groups_signing_key -import curated.composeapp.generated.resources.before_the_room_exists_the_group_signs -import curated.composeapp.generated.resources.this_is_fixed_once_the_ceremony_runs -import curated.composeapp.generated.resources.try_again -import curated.composeapp.generated.resources.your_share_of_it_is_on_this_device_only_your -import curated.composeapp.generated.resources.everyone_has_to_be_online_at_the_same_time -import curated.composeapp.generated.resources.of -import curated.composeapp.generated.resources.of_members_will_be_needed_to_sign_with_this -import curated.composeapp.generated.resources.shared_key_for +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.composable.widgets.ScreenStateTransition -import com.it.curated.compose.ui.theme.ConformancePreviews +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.theme.ConformancePreviews /** * The shared-key ceremony: a ChillDKG ritual run across the group's NIP-17 @@ -865,7 +865,7 @@ private fun QuorumStepper( @ConformancePreviews @Composable private fun DkgRitualScreenPreview() { - CuratedTheme { + CurareTheme { Surface(modifier = Modifier.fillMaxSize()) { DkgRitualScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/DkgRound1ApprovalScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgRound1ApprovalScreen.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/DkgRound1ApprovalScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgRound1ApprovalScreen.kt index ae77c229..339fac3b 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/DkgRound1ApprovalScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgRound1ApprovalScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.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 com.it.curated.compose.database.model.types.DkgApprovalStep -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.DkgRepository +import to.curare.compose.database.model.types.DkgApprovalStep +import to.curare.compose.repository.ChatRepository +import to.curare.compose.repository.DkgRepository import com.vitorpamplona.quartz.nip01Core.core.HexKey import fr.acinq.phoenix.data.ActiveWallet import kotlinx.coroutines.flow.StateFlow -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.taking_part_with_these_members -import curated.composeapp.generated.resources.you +import curare.composeapp.generated.resources.taking_part_with_these_members +import curare.composeapp.generated.resources.you /** * Asks whether to contribute to the key itself. diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/DkgRound2ApprovalScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgRound2ApprovalScreen.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/DkgRound2ApprovalScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgRound2ApprovalScreen.kt index 8b77910f..8f819d29 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/DkgRound2ApprovalScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/DkgRound2ApprovalScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.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 com.it.curated.compose.database.model.types.DkgApprovalStep -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.DkgRepository +import to.curare.compose.database.model.types.DkgApprovalStep +import to.curare.compose.repository.ChatRepository +import to.curare.compose.repository.DkgRepository import com.vitorpamplona.quartz.nip01Core.core.HexKey import fr.acinq.phoenix.data.ActiveWallet import kotlinx.coroutines.flow.StateFlow -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.this_is_the_last_thing_the_ceremony_needs +import curare.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/com/it/curated/compose/ui/composable/EditGroupNostrProfileScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/EditGroupNostrProfileScreen.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/EditGroupNostrProfileScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/EditGroupNostrProfileScreen.kt index 7ba4c32f..12cb886f 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/EditGroupNostrProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/EditGroupNostrProfileScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -50,43 +50,43 @@ import androidx.compose.ui.semantics.disabled import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.style.TextAlign import androidx.lifecycle.viewmodel.compose.viewModel -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.ui.composable.navigation.routes.FrostSigningRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.widgets.ErrorState -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.composable.widgets.ScreenStateTransition -import com.it.curated.compose.ui.composable.widgets.rememberNotifier -import com.it.curated.compose.ui.theme.ConformancePreviews -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.theme.spacing -import com.it.curated.compose.ui.view.model.EditGroupNostrProfileViewModel -import com.it.curated.compose.ui.view.state.EditGroupNostrProfileUIState +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.ScreenStateTransition +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.vitorpamplona.quartz.nip01Core.core.HexKey -import curated.composeapp.generated.resources.Res -import curated.composeapp.generated.resources.about -import curated.composeapp.generated.resources.could_not_ask_the_group_to_sign_this_profile -import curated.composeapp.generated.resources.edit_nostr_profile -import curated.composeapp.generated.resources.eg_a_group_translating_hard_books -import curated.composeapp.generated.resources.eg_group_example_com -import curated.composeapp.generated.resources.eg_group_getalby_com -import curated.composeapp.generated.resources.eg_https_example_com -import curated.composeapp.generated.resources.eg_https_example_com_group_png -import curated.composeapp.generated.resources.eg_translation_collective -import curated.composeapp.generated.resources.lightning_address -import curated.composeapp.generated.resources.name -import curated.composeapp.generated.resources.nostr_address -import curated.composeapp.generated.resources.picture_url -import curated.composeapp.generated.resources.propose_nostr_profile -import curated.composeapp.generated.resources.the_group_signs_its_profile_so_it_takes_a_quorum -import curated.composeapp.generated.resources.this_group_has_no_shared_key_to_sign_a_profile -import curated.composeapp.generated.resources.website -import curated.composeapp.generated.resources.what_the_group_says_about_itself_on_nostr +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 org.jetbrains.compose.resources.stringResource /** @@ -391,7 +391,7 @@ private fun NostrProfileField( @ConformancePreviews @Composable private fun EditGroupNostrProfileScreenPreview() { - CuratedTheme { + CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/EditGroupRelaysScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/EditGroupRelaysScreen.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/EditGroupRelaysScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/EditGroupRelaysScreen.kt index aec2756e..fcd06595 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/EditGroupRelaysScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/EditGroupRelaysScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -54,54 +54,54 @@ import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.nostr.GroupRelay -import com.it.curated.compose.nostr.GroupRelayList -import com.it.curated.compose.nostr.GroupRelaySet -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.ui.composable.navigation.routes.FrostSigningRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.widgets.Decorative -import com.it.curated.compose.ui.composable.widgets.EmptyState -import com.it.curated.compose.ui.composable.widgets.ErrorState -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.composable.widgets.ScreenStateTransition -import com.it.curated.compose.ui.composable.widgets.rememberNotifier -import com.it.curated.compose.ui.theme.ConformancePreviews -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.theme.spacing -import com.it.curated.compose.ui.view.model.EditGroupRelaysViewModel -import com.it.curated.compose.ui.view.state.EditGroupRelaysUIState +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.ScreenStateTransition +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.vitorpamplona.quartz.nip01Core.core.HexKey -import curated.composeapp.generated.resources.Res -import curated.composeapp.generated.resources.add_relay -import curated.composeapp.generated.resources.could_not_ask_the_group_to_sign_these_relays -import curated.composeapp.generated.resources.edit_relays -import curated.composeapp.generated.resources.eg_wss_relay_example_com -import curated.composeapp.generated.resources.no_relays_in_this_list -import curated.composeapp.generated.resources.nothing_has_changed_to_propose -import curated.composeapp.generated.resources.propose_relays -import curated.composeapp.generated.resources.relay_read -import curated.composeapp.generated.resources.relay_set_blocked -import curated.composeapp.generated.resources.relay_set_blocked_purpose -import curated.composeapp.generated.resources.relay_set_general -import curated.composeapp.generated.resources.relay_set_general_purpose -import curated.composeapp.generated.resources.relay_set_messages -import curated.composeapp.generated.resources.relay_set_messages_purpose -import curated.composeapp.generated.resources.relay_set_search -import curated.composeapp.generated.resources.relay_set_search_purpose -import curated.composeapp.generated.resources.relay_url -import curated.composeapp.generated.resources.relay_write -import curated.composeapp.generated.resources.relays_are_public_a_group_cannot_encrypt -import curated.composeapp.generated.resources.that_is_not_a_relay_address -import curated.composeapp.generated.resources.that_relay_is_already_in_this_list -import curated.composeapp.generated.resources.the_group_signs_each_list_so_it_takes_a_quorum -import curated.composeapp.generated.resources.this_group_has_no_shared_key_to_sign_relays -import curated.composeapp.generated.resources.where_the_group_lives_on_nostr +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 org.jetbrains.compose.resources.StringResource import org.jetbrains.compose.resources.stringResource @@ -542,7 +542,7 @@ private fun RelayRow( @ConformancePreviews @Composable private fun EditGroupRelaysScreenPreview() { - CuratedTheme { + CurareTheme { Surface(modifier = Modifier.fillMaxSize()) { EditGroupRelaysScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/FrostSigningScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/FrostSigningScreen.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/FrostSigningScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/FrostSigningScreen.kt index f6fb9305..ad01ccd3 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/FrostSigningScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/FrostSigningScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -43,35 +43,35 @@ 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 com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.FrostSigningSession -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.types.FrostSigningStage -import com.it.curated.compose.managers.FrostSigningManager -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.text.ProposedEvent -import com.it.curated.compose.ui.composable.widgets.profile.ProfileAvatar -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.view.model.FrostSigningViewModel -import com.it.curated.compose.ui.view.state.FrostSigningUIState -import com.it.curated.compose.ui.theme.spacing -import com.it.curated.compose.ui.composable.widgets.Decorative -import curated.composeapp.generated.resources.Res +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 org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.don_t_sign -import curated.composeapp.generated.resources.has_not_taken_part_yet -import curated.composeapp.generated.resources.members -import curated.composeapp.generated.resources.read_to_the_end_of_the_list_to_sign -import curated.composeapp.generated.resources.ready_to_sign -import curated.composeapp.generated.resources.sign -import curated.composeapp.generated.resources.sign_with_the_group_s_key -import curated.composeapp.generated.resources.signed_their_part -import curated.composeapp.generated.resources.events_signed_together +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.theme.ConformancePreviews +import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState +import to.curare.compose.ui.theme.readableContent +import to.curare.compose.ui.theme.ConformancePreviews /** * One signing session, and the member's decision about it. @@ -410,7 +410,7 @@ private fun statusOf(session: FrostSigningSession): String = when (session.stage @ConformancePreviews @Composable private fun FrostSigningScreenPreview() { - CuratedTheme { + CurareTheme { Surface(modifier = Modifier.fillMaxSize()) { FrostSigningScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/HomeScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/HomeScreen.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/HomeScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/HomeScreen.kt index 0ef402ba..bb649d46 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/HomeScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/HomeScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -39,43 +39,43 @@ import androidx.compose.ui.platform.testTag import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.intermdiate.LocalProfileWithFollowing -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.composable.widgets.dialogs.NewChatBottomSheetDialog -import com.it.curated.compose.ui.composable.widgets.dialogs.StartDirectMessageToNpubOrNip05Dialog -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.view.model.ChatRoomListViewModel -import com.it.curated.compose.ui.view.model.HomeScreenType -import com.it.curated.compose.ui.view.model.HomeViewModel -import com.it.curated.compose.ui.view.state.HomeScreenUIState +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.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.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent import kotlinx.coroutines.launch -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.curated -import curated.composeapp.generated.resources.new_chat -import com.it.curated.compose.ui.composable.widgets.ErrorState +import curare.composeapp.generated.resources.curare +import curare.composeapp.generated.resources.new_chat +import to.curare.compose.ui.composable.widgets.ErrorState import androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState +import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState import androidx.compose.ui.Alignment -import com.it.curated.compose.repository.DkgRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute -import com.it.curated.compose.ui.composable.widgets.Decorative -import com.it.curated.compose.ui.composable.widgets.EmptyState -import com.it.curated.compose.ui.theme.breakpoint -import com.it.curated.compose.ui.theme.listPaneWidthFor -import com.it.curated.compose.ui.theme.readableContent -import curated.composeapp.generated.resources.pick_a_conversation_to_read_it_here -import com.it.curated.compose.ui.composable.widgets.ScreenStateTransition -import com.it.curated.compose.ui.theme.ConformancePreviews +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 to.curare.compose.ui.composable.widgets.ScreenStateTransition +import to.curare.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class) @Composable @@ -153,13 +153,14 @@ fun HomeScreen( // default is `surface`/`onSurface` and needs no help. TopAppBar( title = { - // "Curated". The launcher label, the desktop window title, the + // "Curare". 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 - // brand before that one is gone from live code too -- `TorchTheme` - // is `CuratedTheme`, and no error string still names it. - Text(stringResource(Res.string.curated)) + // the wire, as the `client` tag on a published relay list. The two + // 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)) }, // 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 @@ -218,7 +219,7 @@ fun HomeScreen( val chatRoomListViewModel: ChatRoomListViewModel = viewModel( key = homeScreenTypeType.name, factory = ChatRoomListViewModel.factory( - initialChatRoomListUIState = com.it.curated.compose.ui.view.state.ChatRoomListUIState.Loading, + initialChatRoomListUIState = to.curare.compose.ui.view.state.ChatRoomListUIState.Loading, publicKey = homeScreenUIState.profileWithFollowing.profile.publicKey, nostrRepository = nostrRepository, chatRepository = chatRepository @@ -350,7 +351,7 @@ fun HomeScreen( @ConformancePreviews @Composable private fun HomeScreenPreview() { - CuratedTheme { + CurareTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ImplementationPendingScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ImplementationPendingScreen.kt similarity index 77% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ImplementationPendingScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ImplementationPendingScreen.kt index 7e9effe3..a9820b68 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ImplementationPendingScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ImplementationPendingScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -12,14 +12,14 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.functionality_coming_soon_2 +import curare.composeapp.generated.resources.functionality_coming_soon_2 import androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.theme.ConformancePreviews +import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState +import to.curare.compose.ui.theme.readableContent +import to.curare.compose.ui.theme.ConformancePreviews @Composable fun ImplementationPendingScreen( @@ -47,7 +47,7 @@ fun ImplementationPendingScreen( @ConformancePreviews @Composable private fun ImplementationPendingScreenPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/KeyPackageManagementScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/KeyPackageManagementScreen.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/KeyPackageManagementScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/KeyPackageManagementScreen.kt index 6a561515..0a0790a8 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/KeyPackageManagementScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/KeyPackageManagementScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -34,32 +34,32 @@ 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 com.it.curated.compose.database.model.MarmotKeyPackageBundle -import com.it.curated.compose.extensions.toFormattedTimeAndDateString -import com.it.curated.compose.repository.MarmotRepository -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.view.model.KeyPackageManagementViewModel -import com.it.curated.compose.ui.view.state.KeyPackageManagementUIState +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.ui.view.state.KeyPackageManagementUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.key_package_management -import curated.composeapp.generated.resources.publish_new_key_package -import curated.composeapp.generated.resources.something_went_wrong -import curated.composeapp.generated.resources.we_couldn_t_find_the_local_profile_please -import curated.composeapp.generated.resources.key_packages -import com.it.curated.compose.ui.composable.widgets.ErrorState +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState +import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState import androidx.compose.runtime.rememberCoroutineScope -import com.it.curated.compose.ui.composable.widgets.rememberNotifier -import curated.composeapp.generated.resources.key_package_published -import curated.composeapp.generated.resources.key_package_rotated -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.composable.widgets.ScreenStateTransition -import com.it.curated.compose.ui.theme.ConformancePreviews +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.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class) @Composable @@ -246,7 +246,7 @@ fun KeyPackageManagementScreen( @ConformancePreviews @Composable private fun UnannouncedProfileScreenPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/KeyRecoveryScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/KeyRecoveryScreen.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/KeyRecoveryScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/KeyRecoveryScreen.kt index eeda7ba2..41bd8b58 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/KeyRecoveryScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/KeyRecoveryScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -45,33 +45,33 @@ import fr.acinq.phoenix.data.ActiveWallet import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.flowOf -import curated.composeapp.generated.resources.Res -import curated.composeapp.generated.resources.cloud_backup -import curated.composeapp.generated.resources.download_and_securely_store_everything -import curated.composeapp.generated.resources.emergency_kit -import curated.composeapp.generated.resources.encrypt_and_back_your_recovery_information -import curated.composeapp.generated.resources.key_recovery -import curated.composeapp.generated.resources.not_backed_up_yet -import curated.composeapp.generated.resources.recovery_phrase -import curated.composeapp.generated.resources.these_are_your_keys_keep_them_safe_so_they -import curated.composeapp.generated.resources.write_down_and_secure_the_12_word_phrase -import curated.composeapp.generated.resources.yolo -import curated.composeapp.generated.resources.you_only_live_once_lose_this_phone_and_the -import curated.composeapp.generated.resources.you_said_you_wrote_it_down +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.recovery_phrase +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 org.jetbrains.compose.resources.stringResource -import com.it.curated.compose.extensions.hexToNpubHrp -import com.it.curated.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import com.it.curated.compose.ui.composable.navigation.routes.RecoveryPhraseRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.widgets.Decorative -import com.it.curated.compose.ui.theme.ConformancePreviews -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.theme.spacing +import to.curare.compose.extensions.hexToNpubHrp +import to.curare.compose.ui.composable.navigation.routes.ImplementationPendingRoute +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.theme.ConformancePreviews +import to.curare.compose.ui.theme.readableContent +import to.curare.compose.ui.theme.spacing /** * Everything that can put this profile back on another phone. * - * A Curated profile is its key: the npub that signs, and the wallet that holds + * A Curare profile is its key: the npub that signs, and the wallet that holds * coins, both come out of one seed that never leaves the device. There is no * account to reset, so this screen is the only thing standing between a lost * phone and a lost identity -- it exists to get the user to take a backup while @@ -299,7 +299,7 @@ private fun KeyRecoveryOption( @ConformancePreviews @Composable private fun KeyRecoveryScreenPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/LandingScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/LandingScreen.kt similarity index 81% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/LandingScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/LandingScreen.kt index cf58aa73..6e7f7e04 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/LandingScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/LandingScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.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 com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.create_profile -import curated.composeapp.generated.resources.if_you_are_new_to_torch_or_just_want_to -import curated.composeapp.generated.resources.keep_the_feed_alive -import curated.composeapp.generated.resources.learn_more -import curated.composeapp.generated.resources.curated -import curated.composeapp.generated.resources.sign_in -import curated.composeapp.generated.resources.sign_in_to_torch_via_nsec_or_remote_signer +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_to_torch_via_nsec_or_remote_signer import androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.theme.ConformancePreviews +import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState +import to.curare.compose.ui.theme.readableContent +import to.curare.compose.ui.theme.ConformancePreviews @Composable fun LandingScreen( @@ -50,7 +50,7 @@ fun LandingScreen( horizontalAlignment = Alignment.CenterHorizontally ) { Text( - text = stringResource(Res.string.curated), + text = stringResource(Res.string.curare), style = MaterialTheme.typography.headlineLarge ) @@ -115,7 +115,7 @@ fun LandingScreen( @ConformancePreviews @Composable private fun LandingScreenPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/LoadingScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/LoadingScreen.kt similarity index 71% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/LoadingScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/LoadingScreen.kt index 90d627c5..a4a6c6f9 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/LoadingScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/LoadingScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.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 com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.theme.ConformancePreviews +import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState +import to.curare.compose.ui.theme.readableContent +import to.curare.compose.ui.theme.ConformancePreviews @Composable fun LoadingScreen( @@ -21,7 +21,7 @@ fun LoadingScreen( modifier = Modifier.padding(innerPadding) .readableContent() ) { - com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator( + to.curare.compose.ui.composable.widgets.LoadingDataIndicator( text = text ) } @@ -31,7 +31,7 @@ fun LoadingScreen( @ConformancePreviews @Composable private fun LoadingScreenPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/NostrEventDetailScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/NostrEventDetailScreen.kt similarity index 83% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/NostrEventDetailScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/NostrEventDetailScreen.kt index 2c9be869..91241db2 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/NostrEventDetailScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/NostrEventDetailScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -15,34 +15,34 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.intermdiate.LocalNostrEvent -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.composable.widgets.detail.MetadataEventDetail -import com.it.curated.compose.ui.composable.widgets.detail.TextNoteEventDetail -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.view.model.NostrEventDetailViewModel -import com.it.curated.compose.ui.view.state.NostrEventDetailUIState +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.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 com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.functionality_coming_soon -import curated.composeapp.generated.resources.post_functionality_coming_soon -import curated.composeapp.generated.resources.something_went_wrong -import curated.composeapp.generated.resources.we_couldn_t_find_your_nostr_event_please_try -import com.it.curated.compose.ui.composable.widgets.ErrorState +import curare.composeapp.generated.resources.functionality_coming_soon +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.composable.widgets.ScreenStateTransition -import com.it.curated.compose.ui.theme.ConformancePreviews +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.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -149,7 +149,7 @@ fun NostrEventDetailScreen( @ConformancePreviews @Composable private fun NostrEventDetailScreenPreview() { - CuratedTheme { + CurareTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ProposalListScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ProposalListScreen.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ProposalListScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ProposalListScreen.kt index 328349fe..e3fa3f92 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ProposalListScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ProposalListScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -40,32 +40,32 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import com.vitorpamplona.quartz.nip01Core.core.HexKey -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.FrostSigningSession -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.types.FrostSigningStage -import com.it.curated.compose.extensions.toFormattedTimeAndDateString -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.text.ProposedEvent -import com.it.curated.compose.ui.composable.navigation.routes.FrostSigningRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.view.model.ProposalListViewModel -import com.it.curated.compose.ui.view.state.ProposalListUIState -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +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.ProposalListUIState +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.everything_else -import curated.composeapp.generated.resources.proposals -import curated.composeapp.generated.resources.review -import curated.composeapp.generated.resources.this_group_has_not_been_asked_to_sign -import curated.composeapp.generated.resources.waiting_for_you -import curated.composeapp.generated.resources.of_them_could_not_be_read +import curare.composeapp.generated.resources.everything_else +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.theme.ConformancePreviews +import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState +import to.curare.compose.ui.theme.readableContent +import to.curare.compose.ui.theme.ConformancePreviews /** * Everything the group has asked its shared key to sign. @@ -418,7 +418,7 @@ private fun ProposalListScreenPreview() { signerId = 1 ) - CuratedTheme { + CurareTheme { Surface(modifier = Modifier.fillMaxSize()) { ProposalListScreen( activeUserPublicKey = "u".repeat(64), diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/RecoveryPhraseScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/RecoveryPhraseScreen.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/RecoveryPhraseScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/RecoveryPhraseScreen.kt index f41922fb..46afd657 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/RecoveryPhraseScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/RecoveryPhraseScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -44,33 +44,33 @@ import androidx.lifecycle.viewmodel.compose.viewModel import fr.acinq.phoenix.PhoenixGlobal import fr.acinq.phoenix.data.ActiveWallet import kotlinx.coroutines.flow.StateFlow -import curated.composeapp.generated.resources.Res -import curated.composeapp.generated.resources.backup_confirmation -import curated.composeapp.generated.resources.bip39_seed_with_the_standard_bip84 -import curated.composeapp.generated.resources.could_not_unlock_your_phrase_please_try -import curated.composeapp.generated.resources.display_recovery_phrase -import curated.composeapp.generated.resources.hide -import curated.composeapp.generated.resources.i_have_saved_my_recovery_phrase_somewhere -import curated.composeapp.generated.resources.i_understand_that_if_i_lose_this_phone_and -import curated.composeapp.generated.resources.keep_this_phrase_safe_do_not_share_it -import curated.composeapp.generated.resources.loading_preferences -import curated.composeapp.generated.resources.lose_this_phone_before_you_do_and_the -import curated.composeapp.generated.resources.no_wallet_is_open_on_this_device_so_there -import curated.composeapp.generated.resources.recovery_phrase -import curated.composeapp.generated.resources.the_recovery_phrase_sometimes_called_a_seed -import curated.composeapp.generated.resources.this_device_holds_no_phrase_for_the_profile -import curated.composeapp.generated.resources.unlocking_your_phrase -import curated.composeapp.generated.resources.word_position -import curated.composeapp.generated.resources.you_have_not_backed_up_your_recovery_phrase +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 org.jetbrains.compose.resources.stringResource -import com.it.curated.compose.ui.composable.widgets.Decorative -import com.it.curated.compose.ui.composable.widgets.ErrorState -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.theme.ConformancePreviews -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.theme.spacing -import com.it.curated.compose.ui.view.model.RecoveryPhraseViewModel -import com.it.curated.compose.ui.view.state.RecoveryPhraseUIState +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.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 /** * The twelve words behind this profile, shown once and on request. @@ -460,7 +460,7 @@ private fun RecoveryPhraseCheckbox( @ConformancePreviews @Composable private fun RecoveryPhraseScreenPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { @@ -487,7 +487,7 @@ private fun RecoveryPhraseScreenPreview() { @ConformancePreviews @Composable private fun RecoveryPhraseScreenHiddenPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt index 9e23a170..2b7395db 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -26,30 +26,30 @@ 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 com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.ui.composable.navigation.routes.AddMemberToChatRoomConfirmationRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.composable.widgets.profile.ProfileAvatar -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.view.model.SearchMemberToAddToChatRoomViewModel -import com.it.curated.compose.ui.view.state.SearchMemberToAddToChatRoomUIState +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.vitorpamplona.quartz.nip01Core.core.HexKey -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.currently_no_contacts_please_search_and_chat -import curated.composeapp.generated.resources.search_member_functionality -import curated.composeapp.generated.resources.search_message_functionality_will_be_here +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.composable.widgets.ScreenStateTransition -import com.it.curated.compose.ui.theme.ConformancePreviews +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.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class) @Composable @@ -226,7 +226,7 @@ fun SearchMemberToAddToChatRoomScreen( @ConformancePreviews @Composable private fun ChatRoomDetailScreenPreview() { - CuratedTheme { + CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SearchResultScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SearchResultScreen.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SearchResultScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SearchResultScreen.kt index a6c70017..53a14f4f 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SearchResultScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SearchResultScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.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 com.it.curated.compose.ui.composable.widgets.feed.ListView -import com.it.curated.compose.ui.view.model.SearchResultType -import com.it.curated.compose.ui.view.model.SearchResultViewModel -import com.it.curated.compose.ui.view.state.SearchResultListUIState +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 kotlinx.coroutines.launch -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.profiles -import curated.composeapp.generated.resources.search -import curated.composeapp.generated.resources.something_went_wrong -import curated.composeapp.generated.resources.searching_for_on -import curated.composeapp.generated.resources.nothing_matched_that_search -import com.it.curated.compose.ui.composable.widgets.ErrorState -import com.it.curated.compose.ui.composable.widgets.EmptyState +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.ConformancePreviews +import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState +import to.curare.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class) @Composable fun SearchResultScreen( activeUserPublicKey: String, searchQuery: String, - nostrRepository: com.it.curated.compose.repository.NostrRepository, - searchRepository: com.it.curated.compose.repository.SearchRepository, + nostrRepository: to.curare.compose.repository.NostrRepository, + searchRepository: to.curare.compose.repository.SearchRepository, onNavigateBack: () -> Unit, - onNavigateToEvent: (com.it.curated.compose.ui.composable.navigation.routes.Route) -> Unit + onNavigateToEvent: (to.curare.compose.ui.composable.navigation.routes.Route) -> Unit ) { val scope = rememberCoroutineScope() @@ -237,7 +237,7 @@ fun SearchResultScreen( localNostrEvent.ListView( onNavigateToEvent = { nostrEventId -> onNavigateToEvent.invoke( - com.it.curated.compose.ui.composable.navigation.routes.NostrEventDetailRoute( + to.curare.compose.ui.composable.navigation.routes.NostrEventDetailRoute( activeUserPublicKey = activeUserPublicKey, nostrEventId = nostrEventId ) @@ -284,15 +284,15 @@ fun SearchResultScreen( @ConformancePreviews @Composable private fun SearchResultScreenPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { SearchResultScreen( activeUserPublicKey = "", searchQuery = "What happened...", - nostrRepository = com.it.curated.compose.repository.NostrRepository.NO_OP_NOSTR_REPOSITORY, - searchRepository = com.it.curated.compose.repository.SearchRepository.NO_OP_SEARCH_REPOSITORY, + nostrRepository = to.curare.compose.repository.NostrRepository.NO_OP_NOSTR_REPOSITORY, + searchRepository = to.curare.compose.repository.SearchRepository.NO_OP_SEARCH_REPOSITORY, onNavigateBack = {}, onNavigateToEvent = {} ) diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SearchScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SearchScreen.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SearchScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SearchScreen.kt index 123d7739..d0ee9312 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SearchScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SearchScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.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 com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.repository.SearchRepository -import com.it.curated.compose.ui.composable.navigation.routes.NostrEventDetailRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.navigation.routes.SearchResultRoute -import com.it.curated.compose.ui.composable.widgets.profile.ProfileAvatar -import com.it.curated.compose.ui.composable.widgets.profile.ProfileColor -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.view.model.SearchViewModel -import com.it.curated.compose.ui.view.state.SearchUIState -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +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 org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.profiles -import curated.composeapp.generated.resources.recents -import curated.composeapp.generated.resources.search -import curated.composeapp.generated.resources.search_hashtags -import curated.composeapp.generated.resources.trending_notes_functionality_coming_soon_in +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.ConformancePreviews +import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState +import to.curare.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class) @Composable @@ -426,7 +426,7 @@ fun SearchScreen( @ConformancePreviews @Composable private fun SearchScreenPreview() { - CuratedTheme { + CurareTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SelectChatRoomMembersScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SelectChatRoomMembersScreen.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SelectChatRoomMembersScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SelectChatRoomMembersScreen.kt index bcbfcce3..b8aa8cae 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SelectChatRoomMembersScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SelectChatRoomMembersScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -32,31 +32,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 com.it.curated.compose.database.model.Profile -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.composable.widgets.profile.ProfileAvatar -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.view.model.SelectChatRoomMembersViewModel -import com.it.curated.compose.ui.view.state.SelectChatRoomMembersUIState +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.vitorpamplona.quartz.nip01Core.core.HexKey -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.next -import curated.composeapp.generated.resources.no_one_selected_yet -import curated.composeapp.generated.resources.no_one_to_add_yet -import curated.composeapp.generated.resources.search_for_people_and_chat_with_them_first -import curated.composeapp.generated.resources.you_can_still_carry_on_and_invite_people -import curated.composeapp.generated.resources.add_people_to -import curated.composeapp.generated.resources.next_with -import curated.composeapp.generated.resources.selected +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.composable.widgets.ScreenStateTransition -import com.it.curated.compose.ui.theme.ConformancePreviews +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.theme.ConformancePreviews /** * Second step of group creation: pick who is in the group. @@ -283,7 +283,7 @@ fun SelectChatRoomMembersScreen( @ConformancePreviews @Composable private fun SelectChatRoomMembersScreenPreview() { - CuratedTheme { + CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SelectChatRoomTypeScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SelectChatRoomTypeScreen.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SelectChatRoomTypeScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SelectChatRoomTypeScreen.kt index ecd8fdc3..3fb7baf3 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SelectChatRoomTypeScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SelectChatRoomTypeScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -40,40 +40,40 @@ 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 com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.types.ChatRoomType -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.DkgRepository -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.view.model.SelectChatRoomTypeViewModel -import com.it.curated.compose.ui.view.state.SelectChatRoomTypeUIState +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.vitorpamplona.quartz.nip01Core.core.HexKey import fr.acinq.phoenix.data.ActiveWallet import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import com.it.curated.compose.ui.theme.spacing -import com.it.curated.compose.ui.composable.widgets.Decorative -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import to.curare.compose.ui.composable.widgets.Decorative +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.create_chat -import curated.composeapp.generated.resources.how_many_admins_have_to_approve_a_change -import curated.composeapp.generated.resources.just_you_for_now -import curated.composeapp.generated.resources.open_chat -import curated.composeapp.generated.resources.this_decides_who_can_change_the_group_later -import curated.composeapp.generated.resources.you_and_1_other -import curated.composeapp.generated.resources.how_should_be_run -import curated.composeapp.generated.resources.of -import curated.composeapp.generated.resources.was_created_but_couldn_t_be_added_yet_invite -import curated.composeapp.generated.resources.was_created_but_its_shared_key_ceremony -import curated.composeapp.generated.resources.you_and_others +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.composable.widgets.ScreenStateTransition -import com.it.curated.compose.ui.theme.ConformancePreviews +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.theme.ConformancePreviews /** * Last step of group creation: convenient (one admin) or robust (everyone @@ -465,7 +465,7 @@ private fun QuorumPicker( @ConformancePreviews @Composable private fun SelectChatRoomTypeScreenPreview() { - CuratedTheme { + CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SelectSubgroupAdminsScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SelectSubgroupAdminsScreen.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SelectSubgroupAdminsScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SelectSubgroupAdminsScreen.kt index d2114d11..76150958 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SelectSubgroupAdminsScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SelectSubgroupAdminsScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -38,35 +38,35 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import fr.acinq.phoenix.data.ActiveWallet import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch -import curated.composeapp.generated.resources.Res -import curated.composeapp.generated.resources.a_subgroup_needs_at_least_three_admins -import curated.composeapp.generated.resources.admin_of_this_group -import curated.composeapp.generated.resources.anyone_in_this_group_can_run_a_subgroup -import curated.composeapp.generated.resources.has_no_key_package_yet -import curated.composeapp.generated.resources.how_many_admins_have_to_approve_a_change -import curated.composeapp.generated.resources.new_subgroup -import curated.composeapp.generated.resources.of -import curated.composeapp.generated.resources.start_the_key_ceremony -import curated.composeapp.generated.resources.what_is_the_subgroup_called -import curated.composeapp.generated.resources.who_runs_the_subgroup -import curated.composeapp.generated.resources.you_coordinate_this_subgroup +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 org.jetbrains.compose.resources.stringResource -import com.it.curated.compose.managers.MarmotGroupName -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.DkgRepository -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.widgets.Decorative -import com.it.curated.compose.ui.composable.widgets.ErrorState -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.composable.widgets.ScreenStateTransition -import com.it.curated.compose.ui.composable.widgets.profile.ProfileAvatar -import com.it.curated.compose.ui.theme.ConformancePreviews -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.theme.spacing -import com.it.curated.compose.ui.view.model.SelectSubgroupAdminsViewModel -import com.it.curated.compose.ui.view.state.SelectSubgroupAdminsUIState +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.ScreenStateTransition +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 /** * Picks who runs a subgroup, what it is called, and on what quorum. @@ -326,7 +326,7 @@ private fun QuorumStepper( @ConformancePreviews @Composable private fun SelectSubgroupAdminsScreenPreview() { - CuratedTheme { + CurareTheme { Surface(modifier = Modifier.fillMaxSize()) { SelectSubgroupAdminsScreen( activeUserPublicKey = "a".repeat(64), diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ShareProfileScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ShareProfileScreen.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ShareProfileScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ShareProfileScreen.kt index cf9c6226..3102027e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/ShareProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/ShareProfileScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -31,31 +31,31 @@ 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 com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.intermdiate.LocalNostrEvent -import com.it.curated.compose.extensions.hexToNpubHrp -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.composable.widgets.QRCodeView -import com.it.curated.compose.ui.composable.widgets.profile.ProfileAvatar -import com.it.curated.compose.ui.view.model.ShareProfileViewModel -import com.it.curated.compose.ui.view.state.ShareProfileUIState +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.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.profile -import curated.composeapp.generated.resources.re_broadcast -import curated.composeapp.generated.resources.something_went_wrong -import curated.composeapp.generated.resources.we_couldn_t_find_the_local_profile_please -import com.it.curated.compose.ui.composable.widgets.ErrorState +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.composable.widgets.ScreenStateTransition -import com.it.curated.compose.ui.theme.ConformancePreviews +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.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class) @Composable @@ -230,7 +230,7 @@ fun ShareProfileScreen( @ConformancePreviews @Composable private fun UnannouncedProfileScreenPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { @@ -249,7 +249,7 @@ It has survived not only five centuries, but also the leap into electronic types sig = "", kind = MetadataEvent.KIND ), - profile = com.it.curated.compose.database.model.Profile( + profile = to.curare.compose.database.model.Profile( publicKey = "84dee6e676e5bb67b4ad4e042cf70cbd8681155db535942fcc6a0533858a7240", displayName = "John Doe", nostrEventId = "nostrEventId", diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SignInScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SignInScreen.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SignInScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SignInScreen.kt index b7dc8a0a..9d9ba5af 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SignInScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SignInScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -13,13 +13,13 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.sign_in_is_not_yet_available_while_curated_is -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.theme.ConformancePreviews +import curare.composeapp.generated.resources.sign_in_is_not_yet_available_while_curare_is +import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState +import to.curare.compose.ui.theme.readableContent +import to.curare.compose.ui.theme.ConformancePreviews // The message is the whole screen while sign in is held back, so it is centred in // the window rather than given the leading edge the readable column normally keeps. @@ -34,7 +34,7 @@ fun SignInToProfileScreen() { verticalArrangement = Arrangement.Center ) { Text( - text = stringResource(Res.string.sign_in_is_not_yet_available_while_curated_is), + text = stringResource(Res.string.sign_in_is_not_yet_available_while_curare_is), style = MaterialTheme.typography.bodyLarge, textAlign = TextAlign.Center ) @@ -45,7 +45,7 @@ fun SignInToProfileScreen() { @ConformancePreviews @Composable private fun SignInToProfileScreenPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SocialPreconditionScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SocialPreconditionScreen.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SocialPreconditionScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SocialPreconditionScreen.kt index fe5d3c78..c4bf10cf 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SocialPreconditionScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SocialPreconditionScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -21,19 +21,19 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.invite_a_friend -import curated.composeapp.generated.resources.skip_for_now -import curated.composeapp.generated.resources.tell_friends_to_join_you_so_your_feed_stays -import curated.composeapp.generated.resources.view_and_accept_invites_you_may_have -import curated.composeapp.generated.resources.view_invites -import curated.composeapp.generated.resources.who_will_you_be_passing_the_aux_to +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.theme.ConformancePreviews +import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState +import to.curare.compose.ui.theme.readableContent +import to.curare.compose.ui.theme.ConformancePreviews @Composable fun SocialPreconditionScreen( @@ -127,7 +127,7 @@ fun SocialPreconditionScreen( @ConformancePreviews @Composable private fun SocialPreconditionScreenPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SovereignWalletStartupScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SovereignWalletStartupScreen.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SovereignWalletStartupScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SovereignWalletStartupScreen.kt index 27f59563..0ca677a2 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/SovereignWalletStartupScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/SovereignWalletStartupScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.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 com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator +import to.curare.compose.ui.composable.widgets.LoadingDataIndicator import fr.acinq.phoenix.data.ListWalletState import fr.acinq.phoenix.data.UserWallet import fr.acinq.phoenix.data.WalletId @@ -26,22 +26,22 @@ 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 com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.lock_prompt_coming_soon -import curated.composeapp.generated.resources.select_a_wallet -import curated.composeapp.generated.resources.startup_error +import curare.composeapp.generated.resources.lock_prompt_coming_soon +import curare.composeapp.generated.resources.select_a_wallet +import curare.composeapp.generated.resources.startup_error @Composable fun SovereignWalletStartupScreen( - sovereignWalletViewModel: com.it.curated.compose.ui.view.model.SovereignWalletViewModel, + sovereignWalletViewModel: to.curare.compose.ui.view.model.SovereignWalletViewModel, onNavigateToWalletLandingPage: () -> Unit, onSuccessfulStartup: () -> Unit, forceWalletId: WalletId?, ) { - val sovereignWalletStartupViewModel = viewModel( - factory = com.it.curated.compose.ui.view.model.SovereignWalletStartupViewModel.factory( + val sovereignWalletStartupViewModel = viewModel( + factory = to.curare.compose.ui.view.model.SovereignWalletStartupViewModel.factory( phoenixGlobal = sovereignWalletViewModel.phoenixGlobal, ) ) @@ -110,7 +110,7 @@ fun SovereignWalletStartupScreen( } else -> { when (val startupState = sovereignWalletStartupViewModel.state.value) { - is com.it.curated.compose.ui.view.model.StartupViewState.Init -> { + is to.curare.compose.ui.view.model.StartupViewState.Init -> { var loadingWallet by remember { mutableStateOf( when { @@ -125,7 +125,7 @@ fun SovereignWalletStartupScreen( } when (val wallet = loadingWallet) { null -> { - com.it.curated.compose.ui.composable.widgets.wallet.WalletsSelector( + to.curare.compose.ui.composable.widgets.wallet.WalletsSelector( wallets = availableWallets, globalPrefs = globalPrefs, walletsMetadata = availableWalletMetadata, @@ -182,17 +182,17 @@ fun SovereignWalletStartupScreen( } } } - is com.it.curated.compose.ui.view.model.StartupViewState.StartingBusiness -> { + is to.curare.compose.ui.view.model.StartupViewState.StartingBusiness -> { LoadingDataIndicator( text = "Starting wallet" ) } - is com.it.curated.compose.ui.view.model.StartupViewState.BusinessActive -> { + is to.curare.compose.ui.view.model.StartupViewState.BusinessActive -> { LoadingDataIndicator( text = "Opening wallet" ) } - is com.it.curated.compose.ui.view.model.StartupViewState.Error -> { + is to.curare.compose.ui.view.model.StartupViewState.Error -> { Column(horizontalAlignment = Alignment.CenterHorizontally) { Text( @@ -200,7 +200,7 @@ fun SovereignWalletStartupScreen( ) when (startupState) { - is com.it.curated.compose.ui.view.model.StartupViewState.Error.Generic -> { + is to.curare.compose.ui.view.model.StartupViewState.Error.Generic -> { startupState.cause?.message?.let { message -> Text( text = message, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/TranslateChunkScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/TranslateChunkScreen.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/TranslateChunkScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/TranslateChunkScreen.kt index b15e5660..973f9cee 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/TranslateChunkScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/TranslateChunkScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -39,33 +39,33 @@ 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 com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.MantraChunk -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.repository.MantraRepository -import com.it.curated.compose.ui.composable.navigation.routes.FrostSigningRoute -import com.it.curated.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.view.model.TranslateChunkViewModel -import com.it.curated.compose.ui.view.state.TranslateChunkUIState -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +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 org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.enter_the_translation_for_this_chunk -import curated.composeapp.generated.resources.original -import curated.composeapp.generated.resources.propose_translation -import curated.composeapp.generated.resources.translate_chunk -import curated.composeapp.generated.resources.translated_text -import curated.composeapp.generated.resources.translation +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.composable.widgets.ScreenStateTransition -import com.it.curated.compose.ui.theme.ConformancePreviews +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.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -270,7 +270,7 @@ fun TranslateChunkScreen( @ConformancePreviews @Composable private fun TranslateChunkScreenPreview() { - CuratedTheme { + CurareTheme { Surface(modifier = Modifier.fillMaxSize()) { TranslateChunkScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/TranslationArtifactVersionDetailScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/TranslationArtifactVersionDetailScreen.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/TranslationArtifactVersionDetailScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/TranslationArtifactVersionDetailScreen.kt index cbb97f66..b4df5271 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/TranslationArtifactVersionDetailScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/TranslationArtifactVersionDetailScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -33,34 +33,34 @@ 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 com.it.curated.compose.database.model.MantraTranslationArtifactVersion -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.repository.MantraRepository -import com.it.curated.compose.ui.composable.navigation.routes.FrostSigningRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.navigation.routes.TranslationChapterRoute -import com.it.curated.compose.ui.composable.widgets.DetailRow -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.view.model.TranslationArtifactVersionDetailViewModel -import com.it.curated.compose.ui.view.state.TranslationArtifactVersionDetailUIState -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +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 org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.chapters -import curated.composeapp.generated.resources.details -import curated.composeapp.generated.resources.no_chapters -import curated.composeapp.generated.resources.propose -import curated.composeapp.generated.resources.this_group_has_no_shared_key_so_it_cannot -import curated.composeapp.generated.resources.translation_detail -import curated.composeapp.generated.resources.chapter -import curated.composeapp.generated.resources.chunks_translated +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.composable.widgets.ScreenStateTransition -import com.it.curated.compose.ui.theme.ConformancePreviews +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.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -287,7 +287,7 @@ fun TranslationArtifactVersionDetailScreen( @ConformancePreviews @Composable private fun TranslationArtifactVersionDetailScreenPreview() { - CuratedTheme { + CurareTheme { Surface(modifier = Modifier.fillMaxSize()) { TranslationArtifactVersionDetailScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/TranslationChapterScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/TranslationChapterScreen.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/TranslationChapterScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/TranslationChapterScreen.kt index e9de6c19..e469063b 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/TranslationChapterScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/TranslationChapterScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -37,25 +37,25 @@ 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 com.it.curated.compose.database.model.MantraChunk -import com.it.curated.compose.repository.MantraRepository -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.navigation.routes.TranslateChunkRoute -import com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.view.model.TranslationChapterViewModel -import com.it.curated.compose.ui.view.state.ChunkTranslationPair -import com.it.curated.compose.ui.view.state.TranslationChapterUIState -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +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 org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.chapter_translation -import curated.composeapp.generated.resources.this_chapter_has_no_chunks +import curare.composeapp.generated.resources.chapter_translation +import curare.composeapp.generated.resources.this_chapter_has_no_chunks import androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.composable.widgets.ScreenStateTransition -import com.it.curated.compose.ui.theme.ConformancePreviews +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.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -245,7 +245,7 @@ private fun TableRow( @ConformancePreviews @Composable private fun TranslationChapterScreenPreview() { - CuratedTheme { + CurareTheme { Surface(modifier = Modifier.fillMaxSize()) { TranslationChapterScreen( activeUserPublicKey = "", diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/UnannouncedProfileScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnannouncedProfileScreen.kt similarity index 80% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/UnannouncedProfileScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnannouncedProfileScreen.kt index f2531373..6d185bc5 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/UnannouncedProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnannouncedProfileScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.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 com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.everything_is_cryptographical_sound_just -import curated.composeapp.generated.resources.torch_will_be_broadcast_what_you_publish_to +import curare.composeapp.generated.resources.everything_is_cryptographical_sound_just +import curare.composeapp.generated.resources.torch_will_be_broadcast_what_you_publish_to import androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.theme.ConformancePreviews +import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState +import to.curare.compose.ui.theme.readableContent +import to.curare.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable @@ -61,7 +61,7 @@ fun UnannouncedProfileScreen() { Spacer( modifier = Modifier.weight(1f) ) - com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator( + to.curare.compose.ui.composable.widgets.LoadingDataIndicator( fillScreen = false ) @@ -79,7 +79,7 @@ fun UnannouncedProfileScreen() { @ConformancePreviews @Composable private fun UnannouncedProfileScreenPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/UnindexedProfileScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnindexedProfileScreen.kt similarity index 80% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/UnindexedProfileScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnindexedProfileScreen.kt index f2de3437..33f72bc2 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/UnindexedProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnindexedProfileScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.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 com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.events_are_indexed_so_that_we_can_deliver_a -import curated.composeapp.generated.resources.everything_is_cryptographical_sound_just_2 +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.theme.ConformancePreviews +import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState +import to.curare.compose.ui.theme.readableContent +import to.curare.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable @@ -61,7 +61,7 @@ fun UnindexedProfileScreen() { Spacer( modifier = Modifier.weight(1f) ) - com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator( + to.curare.compose.ui.composable.widgets.LoadingDataIndicator( fillScreen = false ) @@ -79,7 +79,7 @@ fun UnindexedProfileScreen() { @ConformancePreviews @Composable private fun UnannouncedProfileScreenPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/UnqueuedProfileScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnqueuedProfileScreen.kt similarity index 80% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/UnqueuedProfileScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnqueuedProfileScreen.kt index d2ef5cc4..57583466 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/UnqueuedProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnqueuedProfileScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.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 com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.all_broadcasts_are_queued_so_that_we_can -import curated.composeapp.generated.resources.everything_is_cryptographical_sound_just_3 +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.theme.ConformancePreviews +import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState +import to.curare.compose.ui.theme.readableContent +import to.curare.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable @@ -61,7 +61,7 @@ fun UnqueuedProfileScreen() { Spacer( modifier = Modifier.weight(1f) ) - com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator( + to.curare.compose.ui.composable.widgets.LoadingDataIndicator( fillScreen = false ) @@ -79,7 +79,7 @@ fun UnqueuedProfileScreen() { @ConformancePreviews @Composable private fun UnannouncedProfileScreenPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/UnqueuedProfileSynchronizationScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnqueuedProfileSynchronizationScreen.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/UnqueuedProfileSynchronizationScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnqueuedProfileSynchronizationScreen.kt index a9893224..701a0aca 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/UnqueuedProfileSynchronizationScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnqueuedProfileSynchronizationScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.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 com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.we_are_looking_for_your_profile_on_as_many -import curated.composeapp.generated.resources.we_are_searching_the_internet_to_find_your +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.theme.ConformancePreviews +import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState +import to.curare.compose.ui.theme.readableContent +import to.curare.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable fun UnqueuedProfileSynchronizationScreen( unsignedNostrEventId: Long, profilePublicKey: String, - nostrRepository: com.it.curated.compose.repository.NostrRepository + nostrRepository: to.curare.compose.repository.NostrRepository ) { - val unqueuedProfileSynchronizationViewModel: com.it.curated.compose.ui.view.model.UnqueuedProfileSynchronizationViewModel = viewModel( - factory = com.it.curated.compose.ui.view.model.UnqueuedProfileSynchronizationViewModel.factory( + val unqueuedProfileSynchronizationViewModel: to.curare.compose.ui.view.model.UnqueuedProfileSynchronizationViewModel = viewModel( + factory = to.curare.compose.ui.view.model.UnqueuedProfileSynchronizationViewModel.factory( unsignedNostrEventId = unsignedNostrEventId, profilePublicKey = profilePublicKey, nostrRepository = nostrRepository @@ -72,7 +72,7 @@ fun UnqueuedProfileSynchronizationScreen( textAlign = TextAlign.Center ) - com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator( + to.curare.compose.ui.composable.widgets.LoadingDataIndicator( fillScreen = false ) @@ -91,14 +91,14 @@ fun UnqueuedProfileSynchronizationScreen( @ConformancePreviews @Composable private fun UnqueuedProfileSynchronizationScreenPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { UnqueuedProfileSynchronizationScreen( unsignedNostrEventId = 2, profilePublicKey = "npub is for living.", - nostrRepository = com.it.curated.compose.repository.NostrRepository.NO_OP_NOSTR_REPOSITORY + nostrRepository = to.curare.compose.repository.NostrRepository.NO_OP_NOSTR_REPOSITORY ) } } diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/UnsignedProfileScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnsignedProfileScreen.kt similarity index 79% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/UnsignedProfileScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnsignedProfileScreen.kt index 4426fc7c..d181f86c 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/UnsignedProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnsignedProfileScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.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 com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.as_long_as_you_control_your_keys_there_can -import curated.composeapp.generated.resources.your_profile_is_almost_ready_just_getting_it +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.theme.ConformancePreviews +import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState +import to.curare.compose.ui.theme.readableContent +import to.curare.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable @@ -58,7 +58,7 @@ fun UnsignedProfileScreen() { textAlign = TextAlign.Center ) - com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator( + to.curare.compose.ui.composable.widgets.LoadingDataIndicator( fillScreen = false ) @@ -73,7 +73,7 @@ fun UnsignedProfileScreen() { @ConformancePreviews @Composable private fun UnsignedProfileScreenPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/UnsyncedProfileScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnsyncedProfileScreen.kt similarity index 80% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/UnsyncedProfileScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnsyncedProfileScreen.kt index d4250f1b..287935d2 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/UnsyncedProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/UnsyncedProfileScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.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 com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.we_are_looking_for_your_profile_on_as_many -import curated.composeapp.generated.resources.we_are_searching_the_internet_to_find_your +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.theme.ConformancePreviews +import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState +import to.curare.compose.ui.theme.readableContent +import to.curare.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable @@ -60,7 +60,7 @@ fun UnsyncedProfileScreen( textAlign = TextAlign.Center ) - com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator( + to.curare.compose.ui.composable.widgets.LoadingDataIndicator( fillScreen = false ) @@ -75,7 +75,7 @@ fun UnsyncedProfileScreen( @ConformancePreviews @Composable private fun UnsyncedProfileScreenPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/WriteNewNoteScreen.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/WriteNewNoteScreen.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/WriteNewNoteScreen.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/WriteNewNoteScreen.kt index b7a0dfaf..66c12a2a 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/WriteNewNoteScreen.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/WriteNewNoteScreen.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.layout.Arrangement @@ -39,40 +39,40 @@ 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 com.it.curated.compose.extensions.toFormattedTimeAndDateString +import to.curare.compose.extensions.toFormattedTimeAndDateString import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent import kotlin.time.Clock -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.next -import curated.composeapp.generated.resources.something_went_wrong_and_we_were_unable_to_3 -import curated.composeapp.generated.resources.the_above_will_be_your_new_note -import curated.composeapp.generated.resources.transmit_note -import curated.composeapp.generated.resources.type_out_what_you_would_like_to_publish -import curated.composeapp.generated.resources.what_s_your_comment_on_the_below -import curated.composeapp.generated.resources.what_s_your_reply_to_the_above -import curated.composeapp.generated.resources.what_vibrations_do_you_want_to_send_out -import curated.composeapp.generated.resources.replying_to +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.theme.ConformancePreviews +import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState +import to.curare.compose.ui.theme.readableContent +import to.curare.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalFoundationApi::class) @Composable fun WriteNewNoteScreen( activeUserPublicKey: HexKey, - initialWriteNewNoteUIState: com.it.curated.compose.ui.view.state.WriteNewNoteUIState = com.it.curated.compose.ui.view.state.WriteNewNoteUIState.Loading, + initialWriteNewNoteUIState: to.curare.compose.ui.view.state.WriteNewNoteUIState = to.curare.compose.ui.view.state.WriteNewNoteUIState.Loading, replyToNostrEventId: HexKey?, quotedNostrEventId: HexKey?, onNostrEventPublished: () -> Unit, onNavigateToNostrEvent: (HexKey) -> Unit, - nostrRepository: com.it.curated.compose.repository.NostrRepository + nostrRepository: to.curare.compose.repository.NostrRepository ) { - val writeNewNoteViewModel: com.it.curated.compose.ui.view.model.WriteNewNoteViewModel = viewModel ( - factory = com.it.curated.compose.ui.view.model.WriteNewNoteViewModel.factory( + val writeNewNoteViewModel: to.curare.compose.ui.view.model.WriteNewNoteViewModel = viewModel ( + factory = to.curare.compose.ui.view.model.WriteNewNoteViewModel.factory( activeUserPublicKey = activeUserPublicKey, replyToNostrEventId = replyToNostrEventId, quotedNostrEventId = quotedNostrEventId, @@ -99,10 +99,10 @@ fun WriteNewNoteScreen( ) { when (val writeNewNoteUIState = writeNewNoteViewModel.writeNewNoteUIState) { - is com.it.curated.compose.ui.view.state.WriteNewNoteUIState.Loading -> { - com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator() + is to.curare.compose.ui.view.state.WriteNewNoteUIState.Loading -> { + to.curare.compose.ui.composable.widgets.LoadingDataIndicator() } - is com.it.curated.compose.ui.view.state.WriteNewNoteUIState.InputPrompt -> { + is to.curare.compose.ui.view.state.WriteNewNoteUIState.InputPrompt -> { val listState = rememberLazyListState() @@ -181,7 +181,7 @@ fun WriteNewNoteScreen( ) }, leadingIcon = { - com.it.curated.compose.ui.composable.widgets.profile.ProfileAvatar( + to.curare.compose.ui.composable.widgets.profile.ProfileAvatar( profile = writeNewNoteUIState.localProfile.profile, size = 35.dp ) @@ -198,8 +198,8 @@ fun WriteNewNoteScreen( }, outputTransformation = OutputTransformation { val content = originalText.toString() - val nostrProfiles = com.it.curated.compose.ui.composable.widgets.content.ContentParser.parse(content.trimEnd('\n', '\r'), emptyMap(), emptyMap(), trimBlankLines = true) - .filterIsInstance() + val nostrProfiles = to.curare.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()) { @@ -215,7 +215,7 @@ fun WriteNewNoteScreen( addStyle( SpanStyle( - color = com.it.curated.compose.ui.composable.widgets.profile.ProfileColor.fromPublicKey(mentionedProfile.publicKey) + color = to.curare.compose.ui.composable.widgets.profile.ProfileColor.fromPublicKey(mentionedProfile.publicKey) ), nostrProfile.startIndex, nostrProfile.startIndex + profileMention.length @@ -242,7 +242,7 @@ fun WriteNewNoteScreen( ) }, leadingIcon = { - com.it.curated.compose.ui.composable.widgets.profile.ProfileAvatar( + to.curare.compose.ui.composable.widgets.profile.ProfileAvatar( profile = profile ) }, @@ -297,7 +297,7 @@ fun WriteNewNoteScreen( } } - is com.it.curated.compose.ui.view.state.WriteNewNoteUIState.ConfirmNote-> { + is to.curare.compose.ui.view.state.WriteNewNoteUIState.ConfirmNote-> { val listState = rememberLazyListState() @@ -347,7 +347,7 @@ fun WriteNewNoteScreen( ) } - com.it.curated.compose.ui.composable.widgets.profile.ProfileAvatar( + to.curare.compose.ui.composable.widgets.profile.ProfileAvatar( profile = writeNewNoteUIState.localProfile.profile ) @@ -359,9 +359,9 @@ fun WriteNewNoteScreen( ) } - com.it.curated.compose.ui.composable.widgets.content.RichContent( + to.curare.compose.ui.composable.widgets.content.RichContent( // Hack to have the thing rendered for a preview... - nostrEvent = com.it.curated.compose.database.model.NostrEvent( + nostrEvent = to.curare.compose.database.model.NostrEvent( id = "", content = writeNewNoteUIState.text, sig = "", @@ -372,8 +372,8 @@ fun WriteNewNoteScreen( ), localQuotedNostrEvent = null, mentionedProfiles = writeNewNoteViewModel.mentionableProfiles.map { - com.it.curated.compose.database.model.intermdiate.LocalMention( - mention = com.it.curated.compose.database.model.Mention( + to.curare.compose.database.model.intermdiate.LocalMention( + mention = to.curare.compose.database.model.Mention( mentionedPublicKey = it.publicKey, mentioningNostrEventId = "" ), @@ -442,7 +442,7 @@ fun WriteNewNoteScreen( } } - is com.it.curated.compose.ui.view.state.WriteNewNoteUIState.Error -> { + is to.curare.compose.ui.view.state.WriteNewNoteUIState.Error -> { Spacer( modifier = Modifier.weight(1f) ) @@ -468,7 +468,7 @@ fun WriteNewNoteScreen( @ConformancePreviews @Composable private fun WriteNewNoteScreenPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { @@ -477,10 +477,10 @@ private fun WriteNewNoteScreenPreview() { replyToNostrEventId = null, quotedNostrEventId = null, initialWriteNewNoteUIState = - com.it.curated.compose.ui.view.state.WriteNewNoteUIState.InputPrompt( + to.curare.compose.ui.view.state.WriteNewNoteUIState.InputPrompt( // text = "Yes, I did it. So WHAT?!", - inReplyToNostrEvent = com.it.curated.compose.database.model.intermdiate.LocalNostrEvent( - nostrEvent = com.it.curated.compose.database.model.NostrEvent( + inReplyToNostrEvent = to.curare.compose.database.model.intermdiate.LocalNostrEvent( + nostrEvent = to.curare.compose.database.model.NostrEvent( id = "eventId", pubKey = "publicKey", content = """Lorem Ipsum is simply dummy text of the printing and typesetting industry. @@ -492,14 +492,14 @@ It has survived not only five centuries, but also the leap into electronic types sig = "", kind = TextNoteEvent.KIND ), - profile = com.it.curated.compose.database.model.Profile( + profile = to.curare.compose.database.model.Profile( publicKey = "pubKey", displayName = "John Doe", nostrEventId = "nostrEventId" ), ), - localProfile = com.it.curated.compose.database.model.intermdiate.LocalProfileWithFollowing( - nostrEvent = com.it.curated.compose.database.model.NostrEvent( + localProfile = to.curare.compose.database.model.intermdiate.LocalProfileWithFollowing( + nostrEvent = to.curare.compose.database.model.NostrEvent( id = "eventId", pubKey = "publicKey", content = """Lorem Ipsum is simply dummy text of the printing and typesetting industry. @@ -511,7 +511,7 @@ It has survived not only five centuries, but also the leap into electronic types sig = "", kind = TextNoteEvent.KIND ), - profile = com.it.curated.compose.database.model.Profile( + profile = to.curare.compose.database.model.Profile( publicKey = "pubKey", displayName = "John Doe", nip05 = "john@doe.com", @@ -522,7 +522,7 @@ It has survived not only five centuries, but also the leap into electronic types ), onNostrEventPublished = {}, onNavigateToNostrEvent = {}, - nostrRepository = com.it.curated.compose.repository.NostrRepository.NO_OP_NOSTR_REPOSITORY + nostrRepository = to.curare.compose.repository.NostrRepository.NO_OP_NOSTR_REPOSITORY ) } } diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/CuratedNavHost.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/CurareNavHost.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/CuratedNavHost.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/CurareNavHost.kt index 7288432a..ade11584 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/CuratedNavHost.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/CurareNavHost.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation +package to.curare.compose.ui.composable.navigation import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material3.Surface @@ -12,7 +12,7 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import com.it.curated.compose.AppLifecycle +import to.curare.compose.AppLifecycle import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleEventObserver import androidx.lifecycle.compose.LocalLifecycleOwner @@ -22,97 +22,97 @@ import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.toRoute -import com.it.curated.compose.CuratedGlobal -import com.it.curated.compose.database.repository.DatabaseChatRepository -import com.it.curated.compose.database.repository.DatabaseDkgRepository -import com.it.curated.compose.database.repository.DatabaseFrostSigningRepository -import com.it.curated.compose.database.repository.DatabaseMarmotRepository -import com.it.curated.compose.database.repository.DatabaseNostrRepository -import com.it.curated.compose.database.repository.DatabaseSearchRepository -import com.it.curated.compose.managers.AuxDatabaseManager -import com.it.curated.compose.ui.composable.ActiveProfileScreen -import com.it.curated.compose.ui.composable.AddMemberToChatRoomConfirmationScreen -import com.it.curated.compose.ui.composable.ChatRoomCreationScreen -import com.it.curated.compose.ui.composable.ChatRoomDetailScreen -import com.it.curated.compose.ui.composable.ChatRoomMessagingScreen -import com.it.curated.compose.ui.composable.CreateProfileScreen -import com.it.curated.compose.ui.composable.DkgJoinApprovalScreen -import com.it.curated.compose.ui.composable.DkgRitualScreen -import com.it.curated.compose.ui.composable.DkgRound1ApprovalScreen -import com.it.curated.compose.ui.composable.DkgRound2ApprovalScreen -import com.it.curated.compose.ui.composable.EditGroupNostrProfileScreen -import com.it.curated.compose.ui.composable.AddGroupPostScreen -import com.it.curated.compose.ui.composable.EditGroupRelaysScreen -import com.it.curated.compose.ui.composable.HomeScreen -import com.it.curated.compose.ui.composable.ImplementationPendingScreen -import com.it.curated.compose.ui.composable.KeyPackageManagementScreen -import com.it.curated.compose.ui.composable.KeyRecoveryScreen -import com.it.curated.compose.ui.composable.LandingScreen -import com.it.curated.compose.ui.composable.LoadingScreen -import com.it.curated.compose.ui.composable.NostrEventDetailScreen -import com.it.curated.compose.ui.composable.RecoveryPhraseScreen -import com.it.curated.compose.ui.composable.SearchMemberToAddToChatRoomScreen -import com.it.curated.compose.ui.composable.SearchResultScreen -import com.it.curated.compose.ui.composable.SearchScreen -import com.it.curated.compose.ui.composable.SelectChatRoomMembersScreen -import com.it.curated.compose.ui.composable.SelectChatRoomTypeScreen -import com.it.curated.compose.ui.composable.ShareProfileScreen -import com.it.curated.compose.ui.composable.SignInToProfileScreen -import com.it.curated.compose.ui.composable.SocialPreconditionScreen -import com.it.curated.compose.ui.composable.SovereignWalletStartupScreen -import com.it.curated.compose.ui.composable.UnannouncedProfileScreen -import com.it.curated.compose.ui.composable.UnindexedProfileScreen -import com.it.curated.compose.ui.composable.UnqueuedProfileScreen -import com.it.curated.compose.ui.composable.UnqueuedProfileSynchronizationScreen -import com.it.curated.compose.ui.composable.UnsignedProfileScreen -import com.it.curated.compose.ui.composable.UnsyncedProfileScreen -import com.it.curated.compose.ui.composable.WriteNewNoteScreen -import com.it.curated.compose.ui.composable.navigation.routes.ActiveProfileRoute -import com.it.curated.compose.ui.composable.navigation.routes.AddMemberToChatRoomConfirmationRoute -import com.it.curated.compose.ui.composable.navigation.routes.BlankRoute -import com.it.curated.compose.ui.composable.navigation.routes.ChatRoomCreationRoute -import com.it.curated.compose.ui.composable.navigation.routes.ChatRoomDetailRoute -import com.it.curated.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute -import com.it.curated.compose.ui.composable.navigation.routes.CreateProfileRoute -import com.it.curated.compose.ui.composable.navigation.routes.DkgJoinApprovalRoute -import com.it.curated.compose.ui.composable.navigation.routes.DkgRitualRoute -import com.it.curated.compose.ui.composable.navigation.routes.DkgRound1ApprovalRoute -import com.it.curated.compose.ui.composable.navigation.routes.DkgRound2ApprovalRoute -import com.it.curated.compose.ui.composable.navigation.routes.HomeRoute -import com.it.curated.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import com.it.curated.compose.ui.composable.navigation.routes.KeyPackageManagementRoute -import com.it.curated.compose.ui.composable.navigation.routes.KeyRecoveryRoute -import com.it.curated.compose.ui.composable.navigation.routes.LandingRoute -import com.it.curated.compose.ui.composable.navigation.routes.LoadingRoute -import com.it.curated.compose.ui.composable.navigation.routes.NostrEventDetailRoute -import com.it.curated.compose.ui.composable.navigation.routes.RecoveryPhraseRoute -import com.it.curated.compose.ui.composable.navigation.routes.SearchMemberToAddToChatRoomRoute -import com.it.curated.compose.ui.composable.navigation.routes.SearchResultRoute -import com.it.curated.compose.ui.composable.navigation.routes.SearchRoute -import com.it.curated.compose.ui.composable.navigation.routes.SelectChatRoomMembersRoute -import com.it.curated.compose.ui.composable.navigation.routes.SelectSubgroupAdminsRoute -import com.it.curated.compose.ui.composable.SelectSubgroupAdminsScreen -import com.it.curated.compose.ui.composable.navigation.routes.SelectChatRoomTypeRoute -import com.it.curated.compose.ui.composable.navigation.routes.ShareProfileRoute -import com.it.curated.compose.ui.composable.navigation.routes.SignInRoute -import com.it.curated.compose.ui.composable.navigation.routes.SocialPreconditionRoute -import com.it.curated.compose.ui.composable.navigation.routes.SovereignWalletStartupRoute -import com.it.curated.compose.ui.composable.navigation.routes.UnannouncedProfileRoute -import com.it.curated.compose.ui.composable.navigation.routes.UnindexedProfileRoute -import com.it.curated.compose.ui.composable.navigation.routes.UnqueuedProfileRoute -import com.it.curated.compose.ui.composable.navigation.routes.UnqueuedProfileSynchronizationRoute -import com.it.curated.compose.ui.composable.navigation.routes.UnsignedProfileRoute -import com.it.curated.compose.ui.composable.navigation.routes.UnsyncedProfileRoute -import com.it.curated.compose.ui.composable.navigation.routes.WriteNewNoteRoute -import com.it.curated.compose.ui.view.model.NavigationViewModel -import com.it.curated.compose.ui.view.model.NotaryViewModel -import com.it.curated.compose.ui.view.model.SovereignWalletViewModel -import com.it.curated.compose.ui.view.model.SynchronizationViewModel -import com.it.curated.compose.ui.view.state.NavigationUIState -import com.it.curated.compose.ui.view.state.NostrEventDetailUIState -import com.it.curated.compose.ui.view.state.SearchUIState -import com.it.curated.compose.ui.theme.NavigationMotion -import com.it.curated.compose.ui.theme.breakpoint +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.EditGroupRelaysScreen +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.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.RecoveryPhraseRoute +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.theme.breakpoint import co.touchlab.kermit.Logger import fr.acinq.phoenix.PhoenixGlobal import kotlinx.coroutines.CoroutineExceptionHandler @@ -121,40 +121,40 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.launch -import com.it.curated.compose.database.repository.DatabaseMantraRepository -import com.it.curated.compose.ui.composable.AddArtifactScreen -import com.it.curated.compose.ui.composable.navigation.routes.AddArtifactRoute -import com.it.curated.compose.ui.composable.navigation.routes.AddDialectRoute -import com.it.curated.compose.ui.composable.navigation.routes.EditGroupNostrProfileRoute -import com.it.curated.compose.ui.composable.navigation.routes.AddGroupPostRoute -import com.it.curated.compose.ui.composable.navigation.routes.EditGroupRelaysRoute -import com.it.curated.compose.ui.composable.navigation.routes.FrostSigningRoute -import com.it.curated.compose.ui.composable.navigation.routes.ProposalListRoute -import com.it.curated.compose.ui.composable.navigation.routes.AddChapterRoute -import com.it.curated.compose.ui.composable.navigation.routes.AddTranslationRoute -import com.it.curated.compose.ui.composable.navigation.routes.ArtifactDetailRoute -import com.it.curated.compose.ui.composable.navigation.routes.ChapterDetailRoute -import com.it.curated.compose.ui.composable.navigation.routes.TranslateChunkRoute -import com.it.curated.compose.ui.composable.navigation.routes.TranslationChapterRoute -import com.it.curated.compose.ui.composable.navigation.routes.TranslationArtifactVersionDetailRoute -import com.it.curated.compose.ui.composable.ArtifactDetailScreen -import com.it.curated.compose.ui.composable.AddChapterScreen -import com.it.curated.compose.ui.composable.AddDialectScreen -import com.it.curated.compose.ui.composable.FrostSigningScreen -import com.it.curated.compose.ui.composable.ProposalListScreen -import com.it.curated.compose.ui.composable.AddTranslationArtifactVersionScreen -import com.it.curated.compose.ui.composable.ChapterDetailScreen -import com.it.curated.compose.ui.composable.TranslateChunkScreen -import com.it.curated.compose.ui.composable.TranslationChapterScreen -import com.it.curated.compose.ui.composable.TranslationArtifactVersionDetailScreen +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.EditGroupRelaysRoute +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 @Composable -fun CuratedNavHost( - curatedGlobal: CuratedGlobal, +fun CurareNavHost( + curareGlobal: CurareGlobal, phoenixGlobal: PhoenixGlobal, navController: NavHostController ) { - val logger = Logger.withTag("CuratedNavHost") + val logger = Logger.withTag("CurareNavHost") val exceptionHandler = remember { CoroutineExceptionHandler { _, throwable -> @@ -168,7 +168,7 @@ fun CuratedNavHost( val lifecycleOwner = LocalLifecycleOwner.current val auxDatabaseManager = remember { - AuxDatabaseManager(curatedGlobal) + AuxDatabaseManager(curareGlobal) } val databaseNostrRepository = remember { @@ -408,7 +408,7 @@ fun CuratedNavHost( } } - CuratedNavigationSuite( + CurareNavigationSuite( navController = navController, breakpoint = MaterialTheme.breakpoint, activeUserPublicKey = activeUserPublicKey, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/CuratedNavigationSuite.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/CurareNavigationSuite.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/CuratedNavigationSuite.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/CurareNavigationSuite.kt index 0496e1fc..fa37f6c9 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/CuratedNavigationSuite.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/CurareNavigationSuite.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation +package to.curare.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 com.it.curated.compose.ui.composable.widgets.Decorative -import com.it.curated.compose.ui.composable.navigation.routes.HomeRoute -import com.it.curated.compose.ui.theme.Breakpoint +import to.curare.compose.ui.composable.widgets.Decorative +import to.curare.compose.ui.composable.navigation.routes.HomeRoute +import to.curare.compose.ui.theme.Breakpoint /** * The navigation bar, collapsed rail or expanded rail, around whatever the nav host draws. @@ -52,7 +52,7 @@ import com.it.curated.compose.ui.theme.Breakpoint */ @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable -fun CuratedNavigationSuite( +fun CurareNavigationSuite( navController: NavHostController, breakpoint: Breakpoint, activeUserPublicKey: String?, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/TopLevelDestination.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/TopLevelDestination.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/TopLevelDestination.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/TopLevelDestination.kt index cfe2c1ab..c11adfb1 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/TopLevelDestination.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/TopLevelDestination.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation +package to.curare.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 curated.composeapp.generated.resources.Res -import curated.composeapp.generated.resources.messages -import curated.composeapp.generated.resources.profile -import curated.composeapp.generated.resources.search +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 org.jetbrains.compose.resources.StringResource -import com.it.curated.compose.ui.composable.navigation.routes.ActiveProfileRoute -import com.it.curated.compose.ui.composable.navigation.routes.HomeRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.navigation.routes.SearchRoute +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 /** * The three destinations the navigation component switches between. diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ActiveProfileRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ActiveProfileRoute.kt similarity index 68% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ActiveProfileRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ActiveProfileRoute.kt index 8b9e7d57..da96b698 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ActiveProfileRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ActiveProfileRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/AddArtifactRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddArtifactRoute.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/AddArtifactRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddArtifactRoute.kt index c3e39677..5c61f85e 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/AddArtifactRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddArtifactRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/AddChapterRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddChapterRoute.kt similarity index 77% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/AddChapterRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddChapterRoute.kt index 2a97dfd0..44f69b58 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/AddChapterRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddChapterRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/AddDialectRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddDialectRoute.kt similarity index 77% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/AddDialectRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddDialectRoute.kt index a49be54a..002465b1 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/AddDialectRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddDialectRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/AddGroupPostRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddGroupPostRoute.kt similarity index 78% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/AddGroupPostRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddGroupPostRoute.kt index d9ea9722..aa4389b5 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/AddGroupPostRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddGroupPostRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/AddMemberToChatRoomConfirmationRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddMemberToChatRoomConfirmationRoute.kt similarity index 81% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/AddMemberToChatRoomConfirmationRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddMemberToChatRoomConfirmationRoute.kt index 0e6b0da3..d3220ab0 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/AddMemberToChatRoomConfirmationRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddMemberToChatRoomConfirmationRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/AddTranslationRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddTranslationRoute.kt similarity index 77% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/AddTranslationRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddTranslationRoute.kt index cdc7fe24..a2daae49 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/AddTranslationRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AddTranslationRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ArtifactDetailRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ArtifactDetailRoute.kt similarity index 77% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ArtifactDetailRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ArtifactDetailRoute.kt index 2550e20e..cd374d0e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ArtifactDetailRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ArtifactDetailRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable 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 new file mode 100644 index 00000000..5dc855f9 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/AuthenticatedProfileRoute.kt @@ -0,0 +1,6 @@ +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 new file mode 100755 index 00000000..0ee86f81 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/BlankRoute.kt @@ -0,0 +1,6 @@ +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/com/it/curated/compose/ui/composable/navigation/routes/ChapterDetailRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ChapterDetailRoute.kt similarity index 77% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ChapterDetailRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ChapterDetailRoute.kt index 5d211041..5df48309 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ChapterDetailRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ChapterDetailRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ChatRoomCreationRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ChatRoomCreationRoute.kt similarity index 63% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ChatRoomCreationRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ChatRoomCreationRoute.kt index 67c5a9c8..9a8fee95 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ChatRoomCreationRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ChatRoomCreationRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ChatRoomDetailRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ChatRoomDetailRoute.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ChatRoomDetailRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ChatRoomDetailRoute.kt index 44e13760..e5342ce8 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ChatRoomDetailRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ChatRoomDetailRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ChatRoomMessagingRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ChatRoomMessagingRoute.kt similarity index 75% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ChatRoomMessagingRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ChatRoomMessagingRoute.kt index a2b4b31d..83a96266 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ChatRoomMessagingRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ChatRoomMessagingRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/CreateProfileRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/CreateProfileRoute.kt similarity index 63% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/CreateProfileRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/CreateProfileRoute.kt index b610a345..da2e8090 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/CreateProfileRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/CreateProfileRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/DkgJoinApprovalRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/DkgJoinApprovalRoute.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/DkgJoinApprovalRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/DkgJoinApprovalRoute.kt index b9264eb2..1ba70fac 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/DkgJoinApprovalRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/DkgJoinApprovalRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/DkgRitualRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/DkgRitualRoute.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/DkgRitualRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/DkgRitualRoute.kt index 081e3694..b4e12afc 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/DkgRitualRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/DkgRitualRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/DkgRound1ApprovalRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/DkgRound1ApprovalRoute.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/DkgRound1ApprovalRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/DkgRound1ApprovalRoute.kt index 38aa82fa..11d00c7e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/DkgRound1ApprovalRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/DkgRound1ApprovalRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/DkgRound2ApprovalRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/DkgRound2ApprovalRoute.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/DkgRound2ApprovalRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/DkgRound2ApprovalRoute.kt index a0e8344f..d38ea47e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/DkgRound2ApprovalRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/DkgRound2ApprovalRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/EditGroupNostrProfileRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/EditGroupNostrProfileRoute.kt similarity index 78% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/EditGroupNostrProfileRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/EditGroupNostrProfileRoute.kt index 53d314a4..57653fb7 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/EditGroupNostrProfileRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/EditGroupNostrProfileRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/EditGroupRelaysRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/EditGroupRelaysRoute.kt similarity index 78% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/EditGroupRelaysRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/EditGroupRelaysRoute.kt index 682e192d..ad6f62d5 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/EditGroupRelaysRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/EditGroupRelaysRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/FrostSigningRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/FrostSigningRoute.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/FrostSigningRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/FrostSigningRoute.kt index 7d8822c4..31b450a6 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/FrostSigningRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/FrostSigningRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/HomeRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/HomeRoute.kt similarity index 61% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/HomeRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/HomeRoute.kt index 89a27f96..e3b889c8 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/HomeRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/HomeRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ImplementationPendingRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ImplementationPendingRoute.kt similarity index 61% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ImplementationPendingRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ImplementationPendingRoute.kt index b78e2e55..35e82ed2 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ImplementationPendingRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ImplementationPendingRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/KeyPackageManagementRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/KeyPackageManagementRoute.kt similarity index 69% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/KeyPackageManagementRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/KeyPackageManagementRoute.kt index 4f851614..3acfe4d0 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/KeyPackageManagementRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/KeyPackageManagementRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/KeyRecoveryRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/KeyRecoveryRoute.kt similarity index 68% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/KeyRecoveryRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/KeyRecoveryRoute.kt index 1a58bbd5..a943ace6 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/KeyRecoveryRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/KeyRecoveryRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable 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 new file mode 100755 index 00000000..4fb0596a --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/LandingRoute.kt @@ -0,0 +1,6 @@ +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/com/it/curated/compose/ui/composable/navigation/routes/LoadingRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/LoadingRoute.kt similarity index 60% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/LoadingRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/LoadingRoute.kt index eacdad29..5bc683ab 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/LoadingRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/LoadingRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/NostrEventDetailRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/NostrEventDetailRoute.kt similarity index 68% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/NostrEventDetailRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/NostrEventDetailRoute.kt index e9e8c9eb..a1c40f8f 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/NostrEventDetailRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/NostrEventDetailRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ProposalListRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ProposalListRoute.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ProposalListRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ProposalListRoute.kt index 1bc3a6d3..dcf10aa6 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ProposalListRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ProposalListRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/RecoveryPhraseRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/RecoveryPhraseRoute.kt similarity index 61% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/RecoveryPhraseRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/RecoveryPhraseRoute.kt index 2fbd33f4..df721fd7 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/RecoveryPhraseRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/RecoveryPhraseRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable 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 new file mode 100755 index 00000000..e19b8b2e --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/Route.kt @@ -0,0 +1,3 @@ +package to.curare.compose.ui.composable.navigation.routes + +abstract class Route \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SearchMemberToAddToChatRoomRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SearchMemberToAddToChatRoomRoute.kt similarity index 75% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SearchMemberToAddToChatRoomRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SearchMemberToAddToChatRoomRoute.kt index cc5ab236..6c23c2aa 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SearchMemberToAddToChatRoomRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SearchMemberToAddToChatRoomRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SearchResultRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SearchResultRoute.kt similarity index 66% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SearchResultRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SearchResultRoute.kt index 007801aa..b9747a2d 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SearchResultRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SearchResultRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SearchRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SearchRoute.kt similarity index 61% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SearchRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SearchRoute.kt index 552b519d..813abf28 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SearchRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SearchRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SelectChatRoomMembersRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SelectChatRoomMembersRoute.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SelectChatRoomMembersRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SelectChatRoomMembersRoute.kt index 61f86035..8569e7fa 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SelectChatRoomMembersRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SelectChatRoomMembersRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SelectChatRoomTypeRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SelectChatRoomTypeRoute.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SelectChatRoomTypeRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SelectChatRoomTypeRoute.kt index 1f4949d3..1dc18706 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SelectChatRoomTypeRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SelectChatRoomTypeRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SelectSubgroupAdminsRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SelectSubgroupAdminsRoute.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SelectSubgroupAdminsRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SelectSubgroupAdminsRoute.kt index 3fb0cb4e..0efef117 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SelectSubgroupAdminsRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SelectSubgroupAdminsRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ShareProfileRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ShareProfileRoute.kt similarity index 67% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ShareProfileRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ShareProfileRoute.kt index 3f616c2c..ee484233 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/ShareProfileRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/ShareProfileRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable 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 new file mode 100755 index 00000000..94459fe1 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SignInRoute.kt @@ -0,0 +1,6 @@ +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/com/it/curated/compose/ui/composable/navigation/routes/SocialPreconditionRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SocialPreconditionRoute.kt similarity index 63% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SocialPreconditionRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SocialPreconditionRoute.kt index 257e0c1e..fd32ac60 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/SocialPreconditionRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SocialPreconditionRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable 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 new file mode 100644 index 00000000..faddfbe5 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/SovereignWalletStartupRoute.kt @@ -0,0 +1,6 @@ +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/com/it/curated/compose/ui/composable/navigation/routes/TranslateChunkRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/TranslateChunkRoute.kt similarity index 80% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/TranslateChunkRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/TranslateChunkRoute.kt index c2fae9a1..e58f10f7 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/TranslateChunkRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/TranslateChunkRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/TranslationArtifactVersionDetailRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/TranslationArtifactVersionDetailRoute.kt similarity index 80% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/TranslationArtifactVersionDetailRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/TranslationArtifactVersionDetailRoute.kt index c2958b67..5bab28e4 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/TranslationArtifactVersionDetailRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/TranslationArtifactVersionDetailRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/TranslationChapterRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/TranslationChapterRoute.kt similarity index 78% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/TranslationChapterRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/TranslationChapterRoute.kt index 8d788380..29d0f573 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/TranslationChapterRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/TranslationChapterRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/UnannouncedProfileRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnannouncedProfileRoute.kt similarity index 62% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/UnannouncedProfileRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnannouncedProfileRoute.kt index 3fb6d4e0..54632513 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/UnannouncedProfileRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnannouncedProfileRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/UnindexedProfileRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnindexedProfileRoute.kt similarity index 62% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/UnindexedProfileRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnindexedProfileRoute.kt index c3fb9d6f..931038a1 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/UnindexedProfileRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnindexedProfileRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/UnqueuedProfileRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnqueuedProfileRoute.kt similarity index 62% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/UnqueuedProfileRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnqueuedProfileRoute.kt index aa9681ef..6d4239a6 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/UnqueuedProfileRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnqueuedProfileRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/UnqueuedProfileSynchronizationRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnqueuedProfileSynchronizationRoute.kt similarity index 69% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/UnqueuedProfileSynchronizationRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnqueuedProfileSynchronizationRoute.kt index d94b2ba6..2e49e704 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/UnqueuedProfileSynchronizationRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnqueuedProfileSynchronizationRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/UnsignedProfileRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnsignedProfileRoute.kt similarity index 63% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/UnsignedProfileRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnsignedProfileRoute.kt index fe944943..0aec8c2d 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/UnsignedProfileRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnsignedProfileRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/UnsyncedProfileRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnsyncedProfileRoute.kt similarity index 61% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/UnsyncedProfileRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnsyncedProfileRoute.kt index b94e9376..1dbaa8d5 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/UnsyncedProfileRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/UnsyncedProfileRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/WriteNewNoteRoute.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/WriteNewNoteRoute.kt similarity index 73% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/WriteNewNoteRoute.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/WriteNewNoteRoute.kt index 80451593..983b18ac 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/navigation/routes/WriteNewNoteRoute.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/navigation/routes/WriteNewNoteRoute.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation.routes +package to.curare.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/DetailRow.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/DetailRow.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/DetailRow.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/DetailRow.kt index f23acaa3..d584a60d 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/DetailRow.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/DetailRow.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets +package to.curare.compose.ui.composable.widgets import androidx.compose.material3.ListItem import androidx.compose.material3.Text diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/LoadingDataIndicator.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/LoadingDataIndicator.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/LoadingDataIndicator.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/LoadingDataIndicator.kt index 16b40609..944f7cbe 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/LoadingDataIndicator.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/LoadingDataIndicator.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets +package to.curare.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 com.it.curated.compose.ui.theme.spacing -import com.it.curated.compose.ui.theme.ConformancePreviews +import to.curare.compose.ui.theme.spacing +import to.curare.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() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface(modifier = Modifier.fillMaxSize()) { LoadingDataIndicator( text = "Starting up" diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/QRCodeView.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/QRCodeView.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/QRCodeView.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/QRCodeView.kt index 3b5c50ed..216aeca8 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/QRCodeView.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/QRCodeView.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets +package to.curare.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 com.it.curated.compose.ui.theme.LocalExtendedColors +import to.curare.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 curated.composeapp.generated.resources.Res -import curated.composeapp.generated.resources.compose_multiplatform +import curare.composeapp.generated.resources.Res +import curare.composeapp.generated.resources.compose_multiplatform class QRCodeBackgroundPainter( private val painter: Painter, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/ScreenState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/ScreenState.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/ScreenState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/ScreenState.kt index 4f848d93..b44ceb6d 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/ScreenState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/ScreenState.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets +package to.curare.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 curated.composeapp.generated.resources.Res -import curated.composeapp.generated.resources.something_went_wrong -import curated.composeapp.generated.resources.try_again +import curare.composeapp.generated.resources.Res +import curare.composeapp.generated.resources.something_went_wrong +import curare.composeapp.generated.resources.try_again import org.jetbrains.compose.resources.stringResource -import com.it.curated.compose.ui.theme.reducedMotion -import com.it.curated.compose.ui.theme.spacing +import to.curare.compose.ui.theme.reducedMotion +import to.curare.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/com/it/curated/compose/ui/composable/widgets/Semantics.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/Semantics.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/Semantics.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/Semantics.kt index 6d5c3982..ca3aaff7 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/Semantics.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/Semantics.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets +package to.curare.compose.ui.composable.widgets /** * An icon or image that adds nothing a screen reader user would miss. diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/Snackbars.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/Snackbars.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/Snackbars.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/Snackbars.kt index 6f630b1d..67412b51 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/Snackbars.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/Snackbars.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets +package to.curare.compose.ui.composable.widgets import androidx.compose.material3.SnackbarDuration import androidx.compose.material3.SnackbarHostState diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/buttons/Clickable.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/buttons/Clickable.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/buttons/Clickable.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/buttons/Clickable.kt index 1e2d12b4..55c47c33 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/buttons/Clickable.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/buttons/Clickable.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.it.curated.compose.ui.composable.widgets.buttons +package to.curare.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 com.it.curated.compose.ui.theme.spacing +import to.curare.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 `com.it.curated` from the `com.machankura` + * Two things were changed when it moved into `to.curare` from the `com.machankura` * package it was still declaring: * * - **`minimumInteractiveComponentSize()` is applied unconditionally.** Its defaults are diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/chat/ChatTranscript.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/chat/ChatTranscript.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/chat/ChatTranscript.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/chat/ChatTranscript.kt index d0bedb90..bda4af15 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/chat/ChatTranscript.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/chat/ChatTranscript.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.chat +package to.curare.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 curated.composeapp.generated.resources.open -import curated.composeapp.generated.resources.the_group_has_its_key_finish_setting_it_up -import curated.composeapp.generated.resources.check_the_combined_result -import curated.composeapp.generated.resources.send_your_contribution_to_the_key -import curated.composeapp.generated.resources.join_the_ceremony_by_publishing_your_key -import curated.composeapp.generated.resources.the_subgroups_key_ceremony_needs_you -import curated.composeapp.generated.resources.the_key_ceremony_needs_you -import curated.composeapp.generated.resources.ceremonies_need_you -import com.it.curated.compose.database.model.types.DkgApprovalStep +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 androidx.compose.material.icons.filled.AccessTime import androidx.compose.material.icons.filled.Check import androidx.compose.material.icons.filled.CheckCircle @@ -65,29 +65,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 com.it.curated.compose.database.model.ChatMessage -import com.it.curated.compose.database.model.intermdiate.LocalChatMessage -import com.it.curated.compose.extensions.shortened -import com.it.curated.compose.extensions.toFormattedTimeAndDateString -import com.it.curated.compose.ui.composable.widgets.profile.ProfileColor -import com.it.curated.compose.ui.view.model.ChatMessageListViewModel -import com.it.curated.compose.ui.view.state.ChatMessageListUIState -import com.it.curated.compose.ui.theme.spacing -import com.it.curated.compose.ui.composable.widgets.Decorative -import curated.composeapp.generated.resources.Res +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 org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.currently_no_messages_have_been_shared -import curated.composeapp.generated.resources.loading -import curated.composeapp.generated.resources.no_chat_message_relays_were_found_for_this -import curated.composeapp.generated.resources.private_to_you -import curated.composeapp.generated.resources.review -import curated.composeapp.generated.resources.waiting_for_your_signature -import curated.composeapp.generated.resources.you -import curated.composeapp.generated.resources.private_to -import curated.composeapp.generated.resources.proposals_are_waiting_for_your_signature -import curated.composeapp.generated.resources.reply_privately_to -import curated.composeapp.generated.resources.sent_a_private_message_to -import com.it.curated.compose.ui.composable.widgets.ErrorState +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 /** * A chat room's transcript: its messages, the notices between them, and the standing ask diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/coil/forwardingPainter.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/coil/forwardingPainter.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/coil/forwardingPainter.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/coil/forwardingPainter.kt index 600815a5..999dd354 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/coil/forwardingPainter.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/coil/forwardingPainter.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.coil +package to.curare.compose.ui.composable.widgets.coil import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.DefaultAlpha diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/ArticleCard.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/ArticleCard.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/ArticleCard.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/ArticleCard.kt index ca7d2c62..d5777c77 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/ArticleCard.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/ArticleCard.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.content +package to.curare.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 com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.article -import curated.composeapp.generated.resources.loading_article -import curated.composeapp.generated.resources.untitled_article +import curare.composeapp.generated.resources.article +import curare.composeapp.generated.resources.loading_article +import curare.composeapp.generated.resources.untitled_article @Composable private fun ArticleCard( - localNostrEvent: com.it.curated.compose.database.model.intermdiate.LocalNostrEvent, + localNostrEvent: to.curare.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) ) { - com.it.curated.compose.ui.composable.widgets.profile.ProfileAvatar( + to.curare.compose.ui.composable.widgets.profile.ProfileAvatar( profile = profile, publicKey = localNostrEvent.nostrEvent.pubKey, size = 20.dp diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/Constants.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/Constants.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/Constants.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/Constants.kt index b3ea2c7e..5e190f26 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/Constants.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/Constants.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.content +package to.curare.compose.ui.composable.widgets.content import androidx.collection.LruCache diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/ContentParser.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/ContentParser.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/ContentParser.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/ContentParser.kt index e093629a..1d7427cc 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/ContentParser.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/ContentParser.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.content +package to.curare.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/com/it/curated/compose/ui/composable/widgets/content/ContentSegment.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/ContentSegment.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/ContentSegment.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/ContentSegment.kt index 341e834d..a43b135e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/ContentSegment.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/ContentSegment.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.content +package to.curare.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/com/it/curated/compose/ui/composable/widgets/content/FullScreenImageViewer.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/FullScreenImageViewer.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/FullScreenImageViewer.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/FullScreenImageViewer.kt index d89cd9d9..4982ed9d 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/FullScreenImageViewer.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/FullScreenImageViewer.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.content +package to.curare.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 com.it.curated.compose.ui.theme.spacing +import to.curare.compose.ui.theme.spacing @Composable fun FullScreenImageViewer( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/Helpers.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/Helpers.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/Helpers.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/Helpers.kt index 8d3af875..09a0c2a3 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/Helpers.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/Helpers.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.content +package to.curare.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: com.it.curated.compose.database.model.NostrEvent): Boolean = event.kind in arrayOf( + fun isGalleryEvent(event: to.curare.compose.database.model.NostrEvent): Boolean = event.kind in arrayOf( PictureEvent.KIND, VideoNormalEvent.KIND, VideoShortEvent.KIND diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/ImageWithContextMenu.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/ImageWithContextMenu.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/ImageWithContextMenu.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/ImageWithContextMenu.kt index 2a8da034..1509673c 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/ImageWithContextMenu.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/ImageWithContextMenu.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.content +package to.curare.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 com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.copy_url -import curated.composeapp.generated.resources.download -import curated.composeapp.generated.resources.tap_to_load +import curare.composeapp.generated.resources.copy_url +import curare.composeapp.generated.resources.download +import curare.composeapp.generated.resources.tap_to_load @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/InvoicePayState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/InvoicePayState.kt similarity index 54% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/InvoicePayState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/InvoicePayState.kt index 6490b6bf..9923af09 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/InvoicePayState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/InvoicePayState.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.content +package to.curare.compose.ui.composable.widgets.content internal enum class InvoicePayState { Idle, Paying, Success, Failed diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/LightningInvoiceCard.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LightningInvoiceCard.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/LightningInvoiceCard.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LightningInvoiceCard.kt index 4387aba3..44f40ad7 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/LightningInvoiceCard.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LightningInvoiceCard.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.content +package to.curare.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 com.it.curated.compose.ui.theme.spacing -import com.it.curated.compose.ui.composable.widgets.Decorative -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import to.curare.compose.ui.composable.widgets.Decorative +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.any_amount -import curated.composeapp.generated.resources.cancel -import curated.composeapp.generated.resources.expired -import curated.composeapp.generated.resources.failed -import curated.composeapp.generated.resources.lightning_invoice -import curated.composeapp.generated.resources.paid -import curated.composeapp.generated.resources.pay -import curated.composeapp.generated.resources.pay_now +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 @Composable internal fun LightningInvoiceCard( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/LinkPreview.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LinkPreview.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/LinkPreview.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LinkPreview.kt index 32814198..a7c82d0b 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/LinkPreview.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LinkPreview.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.content +package to.curare.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 com.it.curated.compose.ui.theme.spacing -import com.it.curated.compose.ui.composable.widgets.Decorative +import to.curare.compose.ui.theme.spacing +import to.curare.compose.ui.composable.widgets.Decorative @Composable internal fun LinkPreview(url: String) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/LiveStreamCard.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LiveStreamCard.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/LiveStreamCard.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LiveStreamCard.kt index 652f0983..af857b1b 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/LiveStreamCard.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LiveStreamCard.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.content +package to.curare.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 com.it.curated.compose.ui.theme.spacing +import to.curare.compose.ui.theme.spacing @Composable private fun LiveStreamCard( - localNostrEvent: com.it.curated.compose.database.model.intermdiate.LocalNostrEvent, + localNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent, dTag: String, author: String, relayHints: List, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/LiveStreamCardContent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LiveStreamCardContent.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/LiveStreamCardContent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LiveStreamCardContent.kt index 6c5fefd7..82068c54 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/LiveStreamCardContent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LiveStreamCardContent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.content +package to.curare.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 com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.ended -import curated.composeapp.generated.resources.live -import curated.composeapp.generated.resources.live_stream -import curated.composeapp.generated.resources.loading_stream +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 @Composable internal fun LiveStreamCardContent( - event: com.it.curated.compose.database.model.NostrEvent?, + event: to.curare.compose.database.model.NostrEvent?, streamUrl: String?, image: String?, title: String?, summary: String?, status: String?, - profile: com.it.curated.compose.database.model.Profile?, + profile: to.curare.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) ) { - com.it.curated.compose.ui.composable.widgets.profile.ProfileAvatar( + to.curare.compose.ui.composable.widgets.profile.ProfileAvatar( profile = profile, publicKey = event.pubKey, size = 20.dp diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/LoadingAsyncImage.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LoadingAsyncImage.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/LoadingAsyncImage.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LoadingAsyncImage.kt index bf14f4d9..db7d33a4 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/LoadingAsyncImage.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/LoadingAsyncImage.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.content +package to.curare.compose.ui.composable.widgets.content import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.combinedClickable diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/MediaMeta.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/MediaMeta.kt similarity index 70% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/MediaMeta.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/MediaMeta.kt index 97068119..7c4b111a 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/MediaMeta.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/MediaMeta.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.content +package to.curare.compose.ui.composable.widgets.content data class MediaMeta( val url: String, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/NoteActions.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/NoteActions.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/NoteActions.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/NoteActions.kt index 44a15daa..ad22c133 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/NoteActions.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/NoteActions.kt @@ -1,6 +1,6 @@ -package com.it.curated.compose.ui.composable.widgets.content +package to.curare.compose.ui.composable.widgets.content -import com.it.curated.compose.database.model.NostrEvent +import to.curare.compose.database.model.NostrEvent data class NoteActions( val onReply: (NostrEvent) -> Unit = {}, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/OgData.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/OgData.kt similarity index 68% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/OgData.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/OgData.kt index 3d44fbaa..084d363e 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/OgData.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/OgData.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.content +package to.curare.compose.ui.composable.widgets.content internal data class OgData( val title: String?, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/QuotedAddressableNote.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/QuotedAddressableNote.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/QuotedAddressableNote.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/QuotedAddressableNote.kt index ebb77d10..f061aa98 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/QuotedAddressableNote.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/QuotedAddressableNote.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.content +package to.curare.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 com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.loading_note +import curare.composeapp.generated.resources.loading_note @Composable internal fun QuotedAddressableNote( - localQuotedNostrEvent: com.it.curated.compose.database.model.intermdiate.LocalQuotedNostrEvent?, + localQuotedNostrEvent: to.curare.compose.database.model.intermdiate.LocalQuotedNostrEvent?, kind: Int, dTag: String, author: String, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/QuotedNote.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/QuotedNote.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/QuotedNote.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/QuotedNote.kt index 644209e8..4e6c4573 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/QuotedNote.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/QuotedNote.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.content +package to.curare.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 com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.loading_note -import com.it.curated.compose.ui.theme.ConformancePreviews +import curare.composeapp.generated.resources.loading_note +import to.curare.compose.ui.theme.ConformancePreviews @Composable fun QuotedNote( - localQuotedNostrEvent: com.it.curated.compose.database.model.intermdiate.LocalQuotedNostrEvent? = null, + localQuotedNostrEvent: to.curare.compose.database.model.intermdiate.LocalQuotedNostrEvent? = null, onNavigateToEvent:(HexKey) -> Unit, noteActions: NoteActions? = null ) { @@ -120,14 +120,14 @@ fun QuotedNote( @ConformancePreviews @Composable private fun QuotedNotePreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { QuotedNote( - localQuotedNostrEvent = com.it.curated.compose.database.model.intermdiate.LocalQuotedNostrEvent( - nostrEvent = com.it.curated.compose.database.model.NostrEvent( + localQuotedNostrEvent = to.curare.compose.database.model.intermdiate.LocalQuotedNostrEvent( + nostrEvent = to.curare.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 = com.it.curated.compose.database.model.QuotedRelation( + quotedRelation = to.curare.compose.database.model.QuotedRelation( quotingNostrEventId = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a520", quotedProfilePublicKey = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a522", quotedNostrEventId = "1c7213118d4e17c6bad5c6b11125f005619bc3e43374affb9cd6483f665fd5e6" ), - profile = com.it.curated.compose.database.model.Profile( + profile = to.curare.compose.database.model.Profile( publicKey = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a522", nostrEventId = "referenced", displayName = "Steve Biko" diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/RichContent.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/RichContent.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/RichContent.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/RichContent.kt index 645cab75..72a32dea 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/RichContent.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/RichContent.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.content +package to.curare.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 com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.nostr -import curated.composeapp.generated.resources.nostr_2 -import com.it.curated.compose.ui.theme.ConformancePreviews +import curare.composeapp.generated.resources.nostr +import curare.composeapp.generated.resources.nostr_2 +import to.curare.compose.ui.theme.ConformancePreviews @Composable fun RichContent( - nostrEvent: com.it.curated.compose.database.model.NostrEvent, - localQuotedNostrEvent: com.it.curated.compose.database.model.intermdiate.LocalQuotedNostrEvent?, - mentionedProfiles: List, + nostrEvent: to.curare.compose.database.model.NostrEvent, + localQuotedNostrEvent: to.curare.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 = com.it.curated.compose.ui.composable.widgets.profile.ProfileColor.fromPublicKey(seg.pubkey), textDecoration = linkDecoration)) { + withStyle(SpanStyle(color = to.curare.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() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { @@ -410,7 +410,7 @@ private fun RichContentPreview() { ) { RichContent( modifier = Modifier.padding(MaterialTheme.spacing.space125), - nostrEvent = com.it.curated.compose.database.model.NostrEvent( + nostrEvent = to.curare.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 = com.it.curated.compose.database.model.intermdiate.LocalQuotedNostrEvent( - nostrEvent = com.it.curated.compose.database.model.NostrEvent( + localQuotedNostrEvent = to.curare.compose.database.model.intermdiate.LocalQuotedNostrEvent( + nostrEvent = to.curare.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 = com.it.curated.compose.database.model.QuotedRelation( + quotedRelation = to.curare.compose.database.model.QuotedRelation( quotingNostrEventId = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a520", quotedProfilePublicKey = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a522", quotedNostrEventId = "1c7213118d4e17c6bad5c6b11125f005619bc3e43374affb9cd6483f665fd5e6" ), - profile = com.it.curated.compose.database.model.Profile( + profile = to.curare.compose.database.model.Profile( publicKey = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a522", nostrEventId = "referenced", displayName = "Steve Biko" ), ), mentionedProfiles = listOf( - com.it.curated.compose.database.model.intermdiate.LocalMention( - mention = com.it.curated.compose.database.model.Mention( + to.curare.compose.database.model.intermdiate.LocalMention( + mention = to.curare.compose.database.model.Mention( id = 1, mentionedPublicKey = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a522", ), - profile = com.it.curated.compose.database.model.Profile( + profile = to.curare.compose.database.model.Profile( publicKey = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a522", nostrEventId = "referenced", displayName = "Frank Talk" diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/UnsupportedKindBadge.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/UnsupportedKindBadge.kt similarity index 81% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/UnsupportedKindBadge.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/UnsupportedKindBadge.kt index 275c36e1..114139cb 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/content/UnsupportedKindBadge.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/content/UnsupportedKindBadge.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.content +package to.curare.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 com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.unsupported_event_kind -import curated.composeapp.generated.resources.unsupported_event_kind_2 +import curare.composeapp.generated.resources.unsupported_event_kind +import curare.composeapp.generated.resources.unsupported_event_kind_2 @Composable internal fun UnsupportedKindBadge(kind: Int?, style: TextStyle) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/detail/MetadataEventDetail.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/detail/MetadataEventDetail.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/detail/MetadataEventDetail.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/detail/MetadataEventDetail.kt index 51f6e478..017258ad 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/detail/MetadataEventDetail.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/detail/MetadataEventDetail.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.detail +package to.curare.compose.ui.composable.widgets.detail import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -42,34 +42,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 com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.intermdiate.LocalNostrEvent -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute -import com.it.curated.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.widgets.profile.ProfileAvatar -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.view.model.MetadataEventDetailType -import com.it.curated.compose.ui.view.model.MetadataEventDetailViewModel -import com.it.curated.compose.ui.view.state.MetadataEventDetailUIState +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.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.add_to_group -import curated.composeapp.generated.resources.block_user -import curated.composeapp.generated.resources.edit_profile -import curated.composeapp.generated.resources.follow -import curated.composeapp.generated.resources.follow_back -import curated.composeapp.generated.resources.send_message -import curated.composeapp.generated.resources.unfollow +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.theme.ConformancePreviews +import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState +import to.curare.compose.ui.theme.readableContent +import to.curare.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class) @Composable @@ -326,7 +326,7 @@ fun MetadataEventDetail( @Composable private fun MetadataEventEventDetailPreview() { - CuratedTheme { + CurareTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/detail/TextNoteEventDetail.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/detail/TextNoteEventDetail.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/detail/TextNoteEventDetail.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/detail/TextNoteEventDetail.kt index 81d5c618..faf984e2 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/detail/TextNoteEventDetail.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/detail/TextNoteEventDetail.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.detail +package to.curare.compose.ui.composable.widgets.detail import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -44,39 +44,39 @@ 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 com.it.curated.compose.extensions.toFormattedTimeAndDateString +import to.curare.compose.extensions.toFormattedTimeAndDateString import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.be_the_first_to_comment -import curated.composeapp.generated.resources.post -import curated.composeapp.generated.resources.something_went_wrong -import curated.composeapp.generated.resources.reply_to -import com.it.curated.compose.ui.composable.widgets.ErrorState +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 androidx.compose.material3.SnackbarHost -import com.it.curated.compose.ui.composable.widgets.LocalSnackbarHostState -import com.it.curated.compose.ui.theme.readableContent -import com.it.curated.compose.ui.theme.ConformancePreviews +import to.curare.compose.ui.composable.widgets.LocalSnackbarHostState +import to.curare.compose.ui.theme.readableContent +import to.curare.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class) @Composable fun TextNoteEventDetail( - localNostrEvent: com.it.curated.compose.database.model.intermdiate.LocalNostrEvent, + localNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent, onNavigateBack: () -> Unit, - nostrRepository: com.it.curated.compose.repository.NostrRepository, + nostrRepository: to.curare.compose.repository.NostrRepository, onNavigateToWriteAReply: (String) -> Unit, onNavigateToNostrEvent: (HexKey) -> Unit, ) { val scrollBehavior = BottomAppBarDefaults.exitAlwaysScrollBehavior() - val inReplyToNostrEventFeedListViewModel: com.it.curated.compose.ui.view.model.InReplyToViewModel = viewModel( + val inReplyToNostrEventFeedListViewModel: to.curare.compose.ui.view.model.InReplyToViewModel = viewModel( key = "replies-${localNostrEvent.nostrEvent.id}", - factory = com.it.curated.compose.ui.view.model.InReplyToViewModel.factory( + factory = to.curare.compose.ui.view.model.InReplyToViewModel.factory( nostrEvent = localNostrEvent.nostrEvent, profile = localNostrEvent.profile, - initialFeedListUIState = com.it.curated.compose.ui.view.state.FeedListUIState.Loading, + initialFeedListUIState = to.curare.compose.ui.view.state.FeedListUIState.Loading, nostrRepository = nostrRepository, createdAt = localNostrEvent.nostrEvent.createdAt ), @@ -135,7 +135,7 @@ fun TextNoteEventDetail( Icon( Icons.Default.Person, contentDescription = "User profile", - tint = com.it.curated.compose.ui.composable.widgets.profile.ProfileColor.fromPublicKey("profile") + tint = to.curare.compose.ui.composable.widgets.profile.ProfileColor.fromPublicKey("profile") ) // ProfileAvatar( // profile = localProfile.profile, @@ -219,7 +219,7 @@ fun TextNoteEventDetail( ) { val profile = localNostrEvent.profile - com.it.curated.compose.ui.composable.widgets.profile.ProfileAvatar( + to.curare.compose.ui.composable.widgets.profile.ProfileAvatar( profile = localNostrEvent.profile, publicKey = localNostrEvent.nostrEvent.pubKey ) @@ -236,7 +236,7 @@ fun TextNoteEventDetail( Text( text = staticIdentifier, style = MaterialTheme.typography.labelMedium, - color = com.it.curated.compose.ui.composable.widgets.profile.ProfileColor.fromProfile( + color = to.curare.compose.ui.composable.widgets.profile.ProfileColor.fromProfile( profile ) ) @@ -266,7 +266,7 @@ fun TextNoteEventDetail( } } - com.it.curated.compose.ui.composable.widgets.content.RichContent( + to.curare.compose.ui.composable.widgets.content.RichContent( modifier = Modifier.fillMaxWidth().padding( horizontal = MaterialTheme.spacing.space250 ), @@ -353,7 +353,7 @@ fun TextNoteEventDetail( } when (val inReplyToFeedListUIState = inReplyToNostrEventFeedListViewModel.inReplyToFeedListUIState) { - is com.it.curated.compose.ui.view.state.FeedListUIState.Loaded -> { + is to.curare.compose.ui.view.state.FeedListUIState.Loaded -> { if (inReplyToFeedListUIState.localNostrEvents.isEmpty()) { item { Text( @@ -371,10 +371,10 @@ fun TextNoteEventDetail( } } } - com.it.curated.compose.ui.view.state.FeedListUIState.Error -> { + to.curare.compose.ui.view.state.FeedListUIState.Error -> { item { ErrorState() } } - com.it.curated.compose.ui.view.state.FeedListUIState.Loading -> { + to.curare.compose.ui.view.state.FeedListUIState.Loading -> { item { LoadingIndicator() } @@ -393,13 +393,13 @@ fun TextNoteEventDetail( @Composable private fun TextNoteEventDetailPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { TextNoteEventDetail( - localNostrEvent = com.it.curated.compose.database.model.intermdiate.LocalNostrEvent( - nostrEvent = com.it.curated.compose.database.model.NostrEvent( + localNostrEvent = to.curare.compose.database.model.intermdiate.LocalNostrEvent( + nostrEvent = to.curare.compose.database.model.NostrEvent( id = "eventId", pubKey = "publicKey", content = """Lorem Ipsum is simply dummy text of the printing and typesetting industry. @@ -411,7 +411,7 @@ It has survived not only five centuries, but also the leap into electronic types sig = "", kind = TextNoteEvent.KIND ), - profile = com.it.curated.compose.database.model.Profile( + profile = to.curare.compose.database.model.Profile( publicKey = "pubKey", displayName = "John Doe", nip05 = "john@doe.me", @@ -421,7 +421,7 @@ It has survived not only five centuries, but also the leap into electronic types onNavigateBack = {}, onNavigateToWriteAReply = {}, onNavigateToNostrEvent = {}, - nostrRepository = com.it.curated.compose.repository.NostrRepository.NO_OP_NOSTR_REPOSITORY + nostrRepository = to.curare.compose.repository.NostrRepository.NO_OP_NOSTR_REPOSITORY ) } } diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/dialogs/BottomSheetDialog.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/dialogs/BottomSheetDialog.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/dialogs/BottomSheetDialog.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/dialogs/BottomSheetDialog.kt index e13fb083..a28c68f3 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/dialogs/BottomSheetDialog.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/dialogs/BottomSheetDialog.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.it.curated.compose.ui.composable.widgets.dialogs +package to.curare.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 com.it.curated.compose.ui.theme.spacing +import to.curare.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/com/it/curated/compose/ui/composable/widgets/dialogs/NewChatBottomSheetDialog.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/dialogs/NewChatBottomSheetDialog.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/dialogs/NewChatBottomSheetDialog.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/dialogs/NewChatBottomSheetDialog.kt index 69728086..73e5db06 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/dialogs/NewChatBottomSheetDialog.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/dialogs/NewChatBottomSheetDialog.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.dialogs +package to.curare.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 com.it.curated.compose.ui.composable.navigation.routes.Route +import to.curare.compose.ui.composable.navigation.routes.Route import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.close -import curated.composeapp.generated.resources.create_new_chat -import curated.composeapp.generated.resources.direct_message_via_npub -import curated.composeapp.generated.resources.start_a_group_chat +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 @OptIn(ExperimentalMaterial3Api::class) diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05Dialog.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05Dialog.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05Dialog.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05Dialog.kt index d4a39b72..5d51ad84 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05Dialog.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/dialogs/StartDirectMessageToNpubOrNip05Dialog.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.dialogs +package to.curare.compose.ui.composable.widgets.dialogs import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -32,25 +32,25 @@ 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 com.it.curated.compose.extensions.bech32ToHexOrNull -import com.it.curated.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute -import com.it.curated.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.theme.CuratedTheme +import to.curare.compose.extensions.bech32ToHexOrNull +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.theme.CurareTheme import com.vitorpamplona.quartz.nip01Core.core.HexKey import fr.acinq.phoenix.utils.Parser import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch -import com.it.curated.compose.ui.theme.spacing +import to.curare.compose.ui.theme.spacing import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester -import curated.composeapp.generated.resources.Res +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.input_npub_or_nip05 -import curated.composeapp.generated.resources.start_chat -import curated.composeapp.generated.resources.start_chat_via_npub_or_nip05 -import com.it.curated.compose.ui.theme.ConformancePreviews +import curare.composeapp.generated.resources.input_npub_or_nip05 +import curare.composeapp.generated.resources.start_chat +import curare.composeapp.generated.resources.start_chat_via_npub_or_nip05 +import to.curare.compose.ui.theme.ConformancePreviews @Composable fun StartDirectMessageToNpubOrNip05Dialog( @@ -190,7 +190,7 @@ fun StartDirectMessageToNpubOrNip05Dialog( @ConformancePreviews @Composable private fun StartDirectMessageToNpubOrNip05DialogPreview() { - CuratedTheme { + CurareTheme { Surface( modifier = Modifier.fillMaxSize() ) { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/feed/EventListView.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/feed/EventListView.kt similarity index 79% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/feed/EventListView.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/feed/EventListView.kt index 62f946f0..2b517798 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/feed/EventListView.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/feed/EventListView.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.feed +package to.curare.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 com.it.curated.compose.extensions.toFormattedTimeAndDateString +import to.curare.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 com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.loading_author_information_2 -import curated.composeapp.generated.resources.malformed_note -import curated.composeapp.generated.resources.reposted -import com.it.curated.compose.ui.theme.ConformancePreviews +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 @Composable -fun com.it.curated.compose.database.model.intermdiate.LocalNostrEvent.ListView( +fun to.curare.compose.database.model.intermdiate.LocalNostrEvent.ListView( onNavigateToEvent: (HexKey) -> Unit ) { when (nostrEvent.kind) { @@ -68,7 +68,7 @@ fun com.it.curated.compose.database.model.intermdiate.LocalNostrEvent.ListView( Text( text = profile?.humanReadableNameOrPubkey() ?: nostrEvent.pubKey, style = MaterialTheme.typography.labelSmall, - color = com.it.curated.compose.ui.composable.widgets.profile.ProfileColor.fromPublicKey(profile?.publicKey ?: nostrEvent.pubKey) + color = to.curare.compose.ui.composable.widgets.profile.ProfileColor.fromPublicKey(profile?.publicKey ?: nostrEvent.pubKey) ) Text( text = stringResource(Res.string.reposted), @@ -129,12 +129,12 @@ fun com.it.curated.compose.database.model.intermdiate.LocalNostrEvent.ListView( @ConformancePreviews @Composable private fun EventListViewRepostedPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { - com.it.curated.compose.database.model.intermdiate.LocalNostrEvent( - nostrEvent = com.it.curated.compose.database.model.NostrEvent( + to.curare.compose.database.model.intermdiate.LocalNostrEvent( + nostrEvent = to.curare.compose.database.model.NostrEvent( id = "hex", content = "Reposting", pubKey = "hexpubkeypubkeypubkeypubkey", @@ -142,13 +142,13 @@ private fun EventListViewRepostedPreview() { sig = "hexsig", tags = emptyArray() ), - localRepostedNostrEvent = com.it.curated.compose.database.model.intermdiate.LocalRepostedNostrEvent( - repostedRelation = com.it.curated.compose.database.model.RepostedRelation( + localRepostedNostrEvent = to.curare.compose.database.model.intermdiate.LocalRepostedNostrEvent( + repostedRelation = to.curare.compose.database.model.RepostedRelation( repostingNostrEventId = "hex", repostedNostrEventId = "repostedhex", repostedProfilePublicKey = "reposterHex" ), - nostrEvent = com.it.curated.compose.database.model.NostrEvent( + nostrEvent = to.curare.compose.database.model.NostrEvent( id = "hex", content = "Something something something", pubKey = "hexpubkeypubkeypubkeypubkey", @@ -156,7 +156,7 @@ private fun EventListViewRepostedPreview() { sig = "hexsig", tags = emptyArray() ), - profile = com.it.curated.compose.database.model.Profile( + profile = to.curare.compose.database.model.Profile( publicKey = "hesd", nostrEventId = "referenced", displayName = "Frank Talk", @@ -164,7 +164,7 @@ private fun EventListViewRepostedPreview() { ), mentionedProfiles = emptyList() ), - profile = com.it.curated.compose.database.model.Profile( + profile = to.curare.compose.database.model.Profile( publicKey = "", nostrEventId = "referenced", displayName = "Steve Biko", @@ -180,12 +180,12 @@ private fun EventListViewRepostedPreview() { @ConformancePreviews @Composable private fun EventListViewInReplyPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { - com.it.curated.compose.database.model.intermdiate.LocalNostrEvent( - nostrEvent = com.it.curated.compose.database.model.NostrEvent( + to.curare.compose.database.model.intermdiate.LocalNostrEvent( + nostrEvent = to.curare.compose.database.model.NostrEvent( id = "hex", content = "Reposting", pubKey = "hexpubkeypubkeypubkeypubkey", @@ -193,15 +193,15 @@ private fun EventListViewInReplyPreview() { sig = "hexsig", tags = emptyArray() ), - localInReplyToNostrEvent = com.it.curated.compose.database.model.intermdiate.LocalInReplyToNostrEvent( - inReplyToRelation = com.it.curated.compose.database.model.InReplyToRelation( + localInReplyToNostrEvent = to.curare.compose.database.model.intermdiate.LocalInReplyToNostrEvent( + inReplyToRelation = to.curare.compose.database.model.InReplyToRelation( inReplyToNostrEventId = "nostrEvent", inReplyToRootNostrEventId = "rootId", inReplyToProfilePublicKey = "inReplyToProfileKey", inReplyToRootProfilePublicKey = "rootPubKey", replyingNostrEventId = "hex" ), - nostrEvent = com.it.curated.compose.database.model.NostrEvent( + nostrEvent = to.curare.compose.database.model.NostrEvent( id = "hex", content = "Something something something", pubKey = "hexpubkeypubkeypubkeypubkey", @@ -209,7 +209,7 @@ private fun EventListViewInReplyPreview() { sig = "hexsig", tags = emptyArray() ), - profile = com.it.curated.compose.database.model.Profile( + profile = to.curare.compose.database.model.Profile( publicKey = "hesd", nostrEventId = "referenced", displayName = "Frank Talk", @@ -217,7 +217,7 @@ private fun EventListViewInReplyPreview() { ), mentionedProfiles = emptyList() ), - profile = com.it.curated.compose.database.model.Profile( + profile = to.curare.compose.database.model.Profile( publicKey = "", nostrEventId = "referenced", displayName = "Steve Biko", diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/feed/TextNoteFeedItem.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/feed/TextNoteFeedItem.kt similarity index 80% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/feed/TextNoteFeedItem.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/feed/TextNoteFeedItem.kt index c0acfbf0..836bb13b 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/feed/TextNoteFeedItem.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/feed/TextNoteFeedItem.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.feed +package to.curare.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 com.it.curated.compose.extensions.toFormattedTimeAndDateString +import to.curare.compose.extensions.toFormattedTimeAndDateString import com.vitorpamplona.quartz.nip01Core.core.HexKey -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.loading_author_information -import curated.composeapp.generated.resources.loading_information -import com.it.curated.compose.ui.theme.ConformancePreviews +import curare.composeapp.generated.resources.loading_author_information +import curare.composeapp.generated.resources.loading_information +import to.curare.compose.ui.theme.ConformancePreviews @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable internal fun TextNoteFeedItem( - nostrEvent: com.it.curated.compose.database.model.NostrEvent, - profile: com.it.curated.compose.database.model.Profile?, - localInReplyToNostrEvent: com.it.curated.compose.database.model.intermdiate.LocalInReplyToNostrEvent?, - localQuotedNostrEvent: com.it.curated.compose.database.model.intermdiate.LocalQuotedNostrEvent?, - mentionedProfiles: List, + 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, onNavigateToEvent: (HexKey) -> Unit ) { val expended = mutableStateOf(false) @@ -66,7 +66,7 @@ internal fun TextNoteFeedItem( } ), style = MaterialTheme.typography.labelLargeEmphasized, - color = com.it.curated.compose.ui.composable.widgets.profile.ProfileColor.fromPublicKey(localInReplyToNostrEvent.nostrEvent.pubKey), + color = to.curare.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 ) { - com.it.curated.compose.ui.composable.widgets.profile.ProfileAvatar( + to.curare.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 = com.it.curated.compose.ui.composable.widgets.profile.ProfileColor.fromProfile(profile) + color = to.curare.compose.ui.composable.widgets.profile.ProfileColor.fromProfile(profile) ) } } @@ -124,7 +124,7 @@ internal fun TextNoteFeedItem( ) } - com.it.curated.compose.ui.composable.widgets.content.RichContent( + to.curare.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() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { TextNoteFeedItem( - nostrEvent = com.it.curated.compose.database.model.NostrEvent( + nostrEvent = to.curare.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 = com.it.curated.compose.database.model.Profile( + profile = to.curare.compose.database.model.Profile( publicKey = "", nostrEventId = "referenced", displayName = "Frank Talk", @@ -218,12 +218,12 @@ private fun TextNoteFeedItemPreview() { @ConformancePreviews @Composable private fun TextNoteFeedItemInReplyToPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { TextNoteFeedItem( - nostrEvent = com.it.curated.compose.database.model.NostrEvent( + nostrEvent = to.curare.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 = com.it.curated.compose.database.model.Profile( + profile = to.curare.compose.database.model.Profile( publicKey = "", nostrEventId = "referenced", displayName = "Frank Talk", nip05 = "frank@talk.at" ), localQuotedNostrEvent = null, - localInReplyToNostrEvent = com.it.curated.compose.database.model.intermdiate.LocalInReplyToNostrEvent( - inReplyToRelation = com.it.curated.compose.database.model.InReplyToRelation( + localInReplyToNostrEvent = to.curare.compose.database.model.intermdiate.LocalInReplyToNostrEvent( + inReplyToRelation = to.curare.compose.database.model.InReplyToRelation( inReplyToNostrEventId = "nostrEvent", inReplyToRootNostrEventId = "rootId", inReplyToProfilePublicKey = "inReplyToProfileKey", inReplyToRootProfilePublicKey = "rootPubKey", replyingNostrEventId = "hex" ), - nostrEvent = com.it.curated.compose.database.model.NostrEvent( + nostrEvent = to.curare.compose.database.model.NostrEvent( id = "hex", content = "Something something something", pubKey = "hexie", @@ -254,7 +254,7 @@ private fun TextNoteFeedItemInReplyToPreview() { sig = "hexsig", tags = emptyArray() ), - profile = com.it.curated.compose.database.model.Profile( + profile = to.curare.compose.database.model.Profile( publicKey = "hesd", nostrEventId = "referenced", displayName = "Steve Biko", @@ -272,12 +272,12 @@ private fun TextNoteFeedItemInReplyToPreview() { @ConformancePreviews @Composable private fun TextNoteFeedItemQuoteNostrEventPreview() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { TextNoteFeedItem( - nostrEvent = com.it.curated.compose.database.model.NostrEvent( + nostrEvent = to.curare.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 = com.it.curated.compose.database.model.Profile( + profile = to.curare.compose.database.model.Profile( publicKey = "", nostrEventId = "referenced", displayName = "Frank Talk", nip05 = "frank@talk.at" ), - localQuotedNostrEvent = com.it.curated.compose.database.model.intermdiate.LocalQuotedNostrEvent( - nostrEvent = com.it.curated.compose.database.model.NostrEvent( + localQuotedNostrEvent = to.curare.compose.database.model.intermdiate.LocalQuotedNostrEvent( + nostrEvent = to.curare.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 = com.it.curated.compose.database.model.QuotedRelation( + quotedRelation = to.curare.compose.database.model.QuotedRelation( quotingNostrEventId = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a520", quotedProfilePublicKey = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a522", quotedNostrEventId = "1c7213118d4e17c6bad5c6b11125f005619bc3e43374affb9cd6483f665fd5e6" ), - profile = com.it.curated.compose.database.model.Profile( + profile = to.curare.compose.database.model.Profile( publicKey = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a522", nostrEventId = "referenced", displayName = "Steve Biko" ), ), - localInReplyToNostrEvent = com.it.curated.compose.database.model.intermdiate.LocalInReplyToNostrEvent( - inReplyToRelation = com.it.curated.compose.database.model.InReplyToRelation( + localInReplyToNostrEvent = to.curare.compose.database.model.intermdiate.LocalInReplyToNostrEvent( + inReplyToRelation = to.curare.compose.database.model.InReplyToRelation( inReplyToNostrEventId = "nostrEvent", inReplyToRootNostrEventId = "rootId", inReplyToProfilePublicKey = "inReplyToProfileKey", inReplyToRootProfilePublicKey = "rootPubKey", replyingNostrEventId = "hex" ), - nostrEvent = com.it.curated.compose.database.model.NostrEvent( + nostrEvent = to.curare.compose.database.model.NostrEvent( id = "hex", content = "Something something something", pubKey = "hexie", @@ -328,7 +328,7 @@ private fun TextNoteFeedItemQuoteNostrEventPreview() { sig = "hexsig", tags = emptyArray() ), - profile = com.it.curated.compose.database.model.Profile( + profile = to.curare.compose.database.model.Profile( publicKey = "hesd", nostrEventId = "referenced", displayName = "Steve Biko", @@ -337,12 +337,12 @@ private fun TextNoteFeedItemQuoteNostrEventPreview() { mentionedProfiles = emptyList() ), mentionedProfiles = listOf( - com.it.curated.compose.database.model.intermdiate.LocalMention( - mention = com.it.curated.compose.database.model.Mention( + to.curare.compose.database.model.intermdiate.LocalMention( + mention = to.curare.compose.database.model.Mention( mentioningNostrEventId = "000067b3f15cac88ba066b28c370083a4fc80dacc054e554ab1dc0def974c89c", mentionedPublicKey = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a522" ), - profile = com.it.curated.compose.database.model.Profile( + profile = to.curare.compose.database.model.Profile( publicKey = "e5e3ad0272d1fbeead8e439a4ad3453374ca4969c8d2be84025ba4ef8ae5a522", nostrEventId = "referenced", displayName = "Steve Biko", diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/profile/ProfileAvatar.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/profile/ProfileAvatar.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/profile/ProfileAvatar.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/profile/ProfileAvatar.kt index 36a6847b..72a164bf 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/profile/ProfileAvatar.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/profile/ProfileAvatar.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.profile +package to.curare.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 com.it.curated.compose.ui.theme.spacing -import com.it.curated.compose.ui.theme.ConformancePreviews +import to.curare.compose.ui.theme.spacing +import to.curare.compose.ui.theme.ConformancePreviews @Composable fun ProfileAvatar( size: Dp = 55.dp, shape: Shape = CircleShape, - profile: com.it.curated.compose.database.model.Profile + profile: to.curare.compose.database.model.Profile ) { ProfileAvatar( size = size, @@ -42,7 +42,7 @@ fun ProfileAvatar( size: Dp = 55.dp, shape: Shape = CircleShape, publicKey: String, - profile: com.it.curated.compose.database.model.Profile? + profile: to.curare.compose.database.model.Profile? ) { ProfileAvatar( size = size, @@ -89,18 +89,18 @@ fun ProfileAvatar( } else { // Load image... val placeHolderGraphic = - com.it.curated.compose.ui.composable.widgets.coil.forwardingPainter( + to.curare.compose.ui.composable.widgets.coil.forwardingPainter( painter = rememberVectorPainter(Icons.Default.Face5), colorFilter = ColorFilter.tint(tintColor) ) val fallbackGraphic = - com.it.curated.compose.ui.composable.widgets.coil.forwardingPainter( + to.curare.compose.ui.composable.widgets.coil.forwardingPainter( painter = rememberVectorPainter(Icons.Default.Face5), colorFilter = ColorFilter.tint(tintColor) ) val errorGraphic = - com.it.curated.compose.ui.composable.widgets.coil.forwardingPainter( + to.curare.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() { - com.it.curated.compose.ui.theme.CuratedTheme { + to.curare.compose.ui.theme.CurareTheme { Surface( modifier = Modifier.padding(MaterialTheme.spacing.space250) ) { ProfileAvatar( publicKey = "hwgwefwase", - profile = com.it.curated.compose.database.model.Profile( + profile = to.curare.compose.database.model.Profile( publicKey = "", nostrEventId = "referenced", displayName = "Frank Talk", diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/profile/ProfileColor.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/profile/ProfileColor.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/profile/ProfileColor.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/profile/ProfileColor.kt index d1649683..4626f0ee 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/profile/ProfileColor.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/profile/ProfileColor.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets.profile +package to.curare.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: com.it.curated.compose.database.model.Profile): Color { + fun fromProfile(profile: to.curare.compose.database.model.Profile): Color { return fromPublicKey( profile.publicKey ) diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/wallet/WalletAvatar.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/wallet/WalletAvatar.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/wallet/WalletAvatar.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/wallet/WalletAvatar.kt index 3ee7eed9..9472a9c1 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/wallet/WalletAvatar.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/wallet/WalletAvatar.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.it.curated.compose.ui.composable.widgets.wallet +package to.curare.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 com.it.curated.compose.ui.composable.widgets.buttons.Clickable -import com.it.curated.compose.ui.composable.widgets.dialogs.ModalBottomSheet -import com.it.curated.compose.ui.theme.spacing +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 object WalletAvatars { val list = listOf( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/wallet/WalletsSelector.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/wallet/WalletsSelector.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/wallet/WalletsSelector.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/wallet/WalletsSelector.kt index 7241da03..af6956e8 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/composable/widgets/wallet/WalletsSelector.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/composable/widgets/wallet/WalletsSelector.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.it.curated.compose.ui.composable.widgets.wallet +package to.curare.compose.ui.composable.widgets.wallet import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -43,13 +43,13 @@ 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 com.it.curated.compose.ui.composable.widgets.buttons.Clickable +import to.curare.compose.ui.composable.widgets.buttons.Clickable import fr.acinq.phoenix.data.UserWallet import fr.acinq.phoenix.data.WalletId import fr.acinq.phoenix.utils.preferences.GlobalPrefs import fr.acinq.phoenix.utils.preferences.UserWalletMetadata import fr.acinq.phoenix.utils.preferences.getByWalletIdOrDefault -import com.it.curated.compose.ui.theme.spacing +import to.curare.compose.ui.theme.spacing @Composable fun WalletsSelector( @@ -117,7 +117,7 @@ private fun AvailableWalletView( ) { var showWalletEditDialog by remember { mutableStateOf(false) } if (showWalletEditDialog) { - com.it.curated.compose.ui.composable.widgets.LoadingDataIndicator( + to.curare.compose.ui.composable.widgets.LoadingDataIndicator( text = "Edit function coming soon" ) // EditWalletDialog( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/Breakpoint.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Breakpoint.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/Breakpoint.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Breakpoint.kt index 612fcd18..d2c58423 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/Breakpoint.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Breakpoint.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.theme +package to.curare.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 - * [CuratedTheme] on every composition, and a desktop window reports a zero size for + * [CurareTheme] 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 [CuratedTheme] as [LocalBreakpoint], so screens read + * Provided by [CurareTheme] 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 [CuratedTheme], which wraps every `@Preview` in the tree, and a preview context is + * from [CurareTheme], 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 [CuratedTheme] + * screen in this app was written against: a composable that never reaches a [CurareTheme] * should render as it did before breakpoints existed, not fail. */ val LocalBreakpoint = staticCompositionLocalOf { Breakpoint.Compact } diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/Color.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Color.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/Color.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Color.kt index 182d3f1d..67a2901a 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/Color.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Color.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.theme +package to.curare.compose.ui.theme import androidx.compose.ui.graphics.Color diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/ConformancePreviews.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/ConformancePreviews.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/ConformancePreviews.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/ConformancePreviews.kt index f345d34e..0f4932b4 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/ConformancePreviews.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/ConformancePreviews.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.theme +package to.curare.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 - * `CuratedTheme(contrast = …)` in the body. [ThemeGallery] covers the schemes once, over + * `CurareTheme(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/com/it/curated/compose/ui/theme/Motion.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Motion.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/Motion.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Motion.kt index 8bf13061..22f188c5 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/Motion.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Motion.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.theme +package to.curare.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 [CuratedTheme] as [LocalReducedMotion]; the transitions below read it, so a + * Provided by [CurareTheme] 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/com/it/curated/compose/ui/theme/Panes.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Panes.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/Panes.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Panes.kt index f0966771..f19d4d58 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/Panes.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Panes.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.theme +package to.curare.compose.ui.theme import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/ReadableMeasure.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/ReadableMeasure.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/ReadableMeasure.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/ReadableMeasure.kt index f5c3b7b4..2df4976a 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/ReadableMeasure.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/ReadableMeasure.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.theme +package to.curare.compose.ui.theme import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.widthIn diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/Shape.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Shape.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/Shape.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Shape.kt index d0abb259..069d3826 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/Shape.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Shape.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.theme +package to.curare.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 CuratedShapes = Shapes() +val CurareShapes = Shapes() diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/Spacing.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Spacing.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/Spacing.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Spacing.kt index 37843e5e..01529dc2 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/Spacing.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Spacing.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.theme +package to.curare.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. [CuratedTheme] provides it. + * same way [ExtendedColors] does. [CurareTheme] 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/com/it/curated/compose/ui/theme/Theme.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Theme.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/Theme.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Theme.kt index 4e44d91e..4aeebcc2 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/Theme.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Theme.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.theme +package to.curare.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 [CuratedTheme] + * ride alongside -- so they travel on their own composition local, provided by [CurareTheme] * 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 [CuratedTheme] renders a real colour instead of nothing. That should not + * composing outside [CurareTheme] 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 CuratedTheme( +fun CurareTheme( darkTheme: Boolean = isSystemInDarkTheme(), contrast: ThemeContrast = platformThemeContrast(), // Dynamic color is available on Android 12+ @@ -531,7 +531,7 @@ fun CuratedTheme( // `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 = CuratedShapes, + shapes = CurareShapes, typography = AuxTypography, content = content ) diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/ThemeGallery.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/ThemeGallery.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/ThemeGallery.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/ThemeGallery.kt index 81ac3d28..d4a5f002 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/ThemeGallery.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/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 com.it.curated.compose.ui.theme +package to.curare.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 com.it.curated.compose.ui.composable.widgets.Decorative +import to.curare.compose.ui.composable.widgets.Decorative /** * All six schemes, side by side, over the components that carry text. @@ -44,7 +44,7 @@ import com.it.curated.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 `CuratedTheme` + // One render holding all six, not six renders. The contrast step is a `CurareTheme` // 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) { - CuratedTheme(darkTheme = darkTheme, contrast = contrast, dynamicColor = false) { + CurareTheme(darkTheme = darkTheme, contrast = contrast, dynamicColor = false) { Surface { Column( modifier = Modifier.padding(MaterialTheme.spacing.compactPadding), diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/Type.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Type.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/Type.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Type.kt index dbba9b1f..f60182c4 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/Type.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/theme/Type.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.theme +package to.curare.compose.ui.theme import androidx.compose.material3.Typography diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ActiveProfileViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ActiveProfileViewModel.kt similarity index 69% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ActiveProfileViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ActiveProfileViewModel.kt index cb270004..919e2a29 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ActiveProfileViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ActiveProfileViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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: com.it.curated.compose.ui.view.state.ActiveProfileUIState, - val nostrRepository: com.it.curated.compose.repository.NostrRepository + initialActiveProfileUIState: to.curare.compose.ui.view.state.ActiveProfileUIState, + val nostrRepository: to.curare.compose.repository.NostrRepository ): ViewModel() { - var activeProfileUIState: com.it.curated.compose.ui.view.state.ActiveProfileUIState by mutableStateOf(initialActiveProfileUIState) + var activeProfileUIState: to.curare.compose.ui.view.state.ActiveProfileUIState by mutableStateOf(initialActiveProfileUIState) private set fun retryLoad() { - activeProfileUIState = com.it.curated.compose.ui.view.state.ActiveProfileUIState.Loading + activeProfileUIState = to.curare.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) { - com.it.curated.compose.ui.view.state.ActiveProfileUIState.Loaded( + to.curare.compose.ui.view.state.ActiveProfileUIState.Loaded( localNostrEvent = localNostrEvent ) } else { - com.it.curated.compose.ui.view.state.ActiveProfileUIState.Error + to.curare.compose.ui.view.state.ActiveProfileUIState.Error } } } @@ -53,8 +53,8 @@ class ActiveProfileViewModel( fun factory( nostrEventId: HexKey, activeUserPublicKey: HexKey, - initialActiveProfileUIState: com.it.curated.compose.ui.view.state.ActiveProfileUIState = com.it.curated.compose.ui.view.state.ActiveProfileUIState.Loading, - nostrRepository: com.it.curated.compose.repository.NostrRepository, + initialActiveProfileUIState: to.curare.compose.ui.view.state.ActiveProfileUIState = to.curare.compose.ui.view.state.ActiveProfileUIState.Loading, + nostrRepository: to.curare.compose.repository.NostrRepository, ): ViewModelProvider.Factory = viewModelFactory { initializer { ActiveProfileViewModel( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/AddArtifactViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddArtifactViewModel.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/AddArtifactViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddArtifactViewModel.kt index 683648be..c627c858 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/AddArtifactViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddArtifactViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.NostrRepository +import to.curare.compose.repository.ChatRepository +import to.curare.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 com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.nostr.nip30303.ArtifactEvent -import com.it.curated.compose.nostr.nip30303.ArtifactVersionEvent -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.repository.MantraRepository -import com.it.curated.compose.ui.view.state.AddArtifactUIState +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 class AddArtifactViewModel( val chatRoomId: String, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/AddChapterViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddChapterViewModel.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/AddChapterViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddChapterViewModel.kt index 9905f544..fd88aa90 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/AddChapterViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddChapterViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.database.model.MantraArtifactVersion -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.managers.FrostSigningManager -import com.it.curated.compose.managers.TranslationScaffold -import com.it.curated.compose.nostr.nip30303.ChapterEvent -import com.it.curated.compose.nostr.nip30303.ChunkEvent -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.repository.MantraRepository -import com.it.curated.compose.text.Markdown -import com.it.curated.compose.ui.view.state.AddChapterUIState +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 class AddChapterViewModel( val artifactId: String, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/AddDialectViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddDialectViewModel.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/AddDialectViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddDialectViewModel.kt index 5d8a3833..7575b455 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/AddDialectViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddDialectViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.nostr.nip30303.DialectEvent -import com.it.curated.compose.ui.view.state.AddDialectUIState +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 class AddDialectViewModel( val chatRoomId: String, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/AddGroupPostViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddGroupPostViewModel.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/AddGroupPostViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddGroupPostViewModel.kt index c6a2c363..61efb393 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/AddGroupPostViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddGroupPostViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.nostr.GroupPost -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.ui.view.state.AddGroupPostUIState +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.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/AddMemberToChatRoomConfirmationViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddMemberToChatRoomConfirmationViewModel.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/AddMemberToChatRoomConfirmationViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddMemberToChatRoomConfirmationViewModel.kt index 60af86f7..24932b56 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/AddMemberToChatRoomConfirmationViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddMemberToChatRoomConfirmationViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue @@ -9,14 +9,14 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import com.it.curated.compose.database.model.MarmotKeyPackage -import com.it.curated.compose.database.model.NegentropySynchronizeRequest -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.types.SynchronizationFilter -import com.it.curated.compose.nostr.Relays -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.ui.view.state.AddMemberToChatRoomConfirmationUIState +import to.curare.compose.database.model.MarmotKeyPackage +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 co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageEvent import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -74,7 +74,7 @@ class AddMemberToChatRoomConfirmationViewModel( val lookupTimeout = launch { delay(RELAY_LOOKUP_TIMEOUT) addMemberToChatRoomConfirmationUIState = - AddMemberToChatRoomConfirmationUIState.Error("Profile missing key package event. Try again later or tell ${profile.humanReadableNameOrPubkey()} to use Curated.") + AddMemberToChatRoomConfirmationUIState.Error("Profile missing key package event. Try again later or tell ${profile.humanReadableNameOrPubkey()} to use Curare.") } // Observe rather than read once: the key package usually lands a moment after diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/AddTranslationArtifactVersionViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddTranslationArtifactVersionViewModel.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/AddTranslationArtifactVersionViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddTranslationArtifactVersionViewModel.kt index 2dbd4219..198c8688 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/AddTranslationArtifactVersionViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/AddTranslationArtifactVersionViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.database.model.MantraArtifact -import com.it.curated.compose.database.model.MantraArtifactVersion -import com.it.curated.compose.database.model.MantraChapter -import com.it.curated.compose.database.model.MantraDialect -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.managers.FrostSigningManager -import com.it.curated.compose.managers.TranslationScaffold -import com.it.curated.compose.nostr.nip30303.TranslationArtifactVersionEvent -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.repository.MantraRepository -import com.it.curated.compose.ui.view.state.AddTranslationArtifactVersionUIState +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 class AddTranslationArtifactVersionViewModel( val artifactId: String, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ArtifactDetailViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ArtifactDetailViewModel.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ArtifactDetailViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ArtifactDetailViewModel.kt index bd73188d..fb37cefb 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ArtifactDetailViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ArtifactDetailViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.repository.MantraRepository -import com.it.curated.compose.ui.view.state.ArtifactDetailUIState +import to.curare.compose.repository.MantraRepository +import to.curare.compose.ui.view.state.ArtifactDetailUIState class ArtifactDetailViewModel( val artifactId: String, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ChapterDetailViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChapterDetailViewModel.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ChapterDetailViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChapterDetailViewModel.kt index 717ae19f..b7c584df 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ChapterDetailViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChapterDetailViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.repository.MantraRepository -import com.it.curated.compose.ui.view.state.ChapterDetailUIState +import to.curare.compose.repository.MantraRepository +import to.curare.compose.ui.view.state.ChapterDetailUIState class ChapterDetailViewModel( val chapterId: String, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ChatMessageListViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatMessageListViewModel.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ChatMessageListViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatMessageListViewModel.kt index b57af3a8..8c67a925 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ChatMessageListViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatMessageListViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.database.model.NegentropySynchronizeRequest -import com.it.curated.compose.database.model.Participant -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.types.SynchronizationFilter -import com.it.curated.compose.extensions.shortened -import com.it.curated.compose.managers.FrostSigningManager -import com.it.curated.compose.nostr.MemberProfileSync -import com.it.curated.compose.nostr.Nip17Filters -import com.it.curated.compose.nostr.Relays -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.database.model.types.DkgRitualStage -import com.it.curated.compose.database.model.types.DkgApprovalStep -import com.it.curated.compose.repository.DkgRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.text.ProposedEvent -import com.it.curated.compose.ui.view.state.ChatMessageListUIState +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 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/com/it/curated/compose/ui/view/model/ChatRoomCreationViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomCreationViewModel.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ChatRoomCreationViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomCreationViewModel.kt index 422a6a9c..f66c76c9 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ChatRoomCreationViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomCreationViewModel.kt @@ -1,12 +1,12 @@ -package com.it.curated.compose.ui.view.model +package to.curare.compose.ui.view.model import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.navigation.routes.SelectChatRoomMembersRoute -import com.it.curated.compose.ui.view.state.form.ChatRoomCreationFormState +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 co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ChatRoomDetailViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomDetailViewModel.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ChatRoomDetailViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomDetailViewModel.kt index e3436aeb..86d12fc4 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ChatRoomDetailViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomDetailViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue @@ -9,20 +9,20 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.MantraRepository -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.ui.composable.navigation.routes.HomeRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.view.state.ChatRoomDetailUIState +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 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 com.it.curated.compose.database.model.types.MarmotReindexReport +import to.curare.compose.database.model.types.MarmotReindexReport class ChatRoomDetailViewModel( val chatRoomId: String, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ChatRoomListViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomListViewModel.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ChatRoomListViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomListViewModel.kt index b7c4231a..f4416ced 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ChatRoomListViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomListViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.database.model.NegentropySynchronizeRequest -import com.it.curated.compose.database.model.types.SynchronizationFilter -import com.it.curated.compose.extensions.toChatListTimestampString -import com.it.curated.compose.nostr.Nip17Filters -import com.it.curated.compose.nostr.Relays -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.ui.view.state.ChatRoomListUIState +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 co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.mip03GroupMessages.GroupEvent import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.launch -import com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.loading -import curated.composeapp.generated.resources.no_messages_go_to_a_profile_and_send_them_a -import curated.composeapp.generated.resources.something_went_wrong -import com.it.curated.compose.ui.composable.widgets.ErrorState +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 class ChatRoomListViewModel( initialChatRoomListUIState: ChatRoomListUIState, @@ -144,7 +144,7 @@ class ChatRoomListViewModel( @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable fun RenderFeed( - onNavigateToDirectMessageDetail: (com.it.curated.compose.ui.composable.navigation.routes.Route) -> Unit + onNavigateToDirectMessageDetail: (to.curare.compose.ui.composable.navigation.routes.Route) -> Unit ) { Column( modifier = Modifier.fillMaxWidth(), @@ -178,7 +178,7 @@ class ChatRoomListViewModel( modifier = Modifier.fillMaxWidth(), onClick = { onNavigateToDirectMessageDetail.invoke( - com.it.curated.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute( + to.curare.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/com/it/curated/compose/ui/view/model/ChatRoomMessagingViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomMessagingViewModel.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ChatRoomMessagingViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomMessagingViewModel.kt index 95bd5e33..d00ff55a 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ChatRoomMessagingViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ChatRoomMessagingViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue @@ -9,15 +9,15 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import com.it.curated.compose.database.GENESIS_AT -import com.it.curated.compose.database.model.NegentropySynchronizeRequest -import com.it.curated.compose.database.model.types.SynchronizationFilter -import com.it.curated.compose.nostr.Relays -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.view.state.ChatRoomMessagingUIState +import to.curare.compose.database.GENESIS_AT +import to.curare.compose.database.model.NegentropySynchronizeRequest +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.composable.navigation.routes.ChatRoomMessagingRoute +import to.curare.compose.ui.composable.navigation.routes.Route +import to.curare.compose.ui.view.state.ChatRoomMessagingUIState import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.mip00KeyPackages.KeyPackageEvent import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -123,7 +123,7 @@ class ChatRoomMessagingViewModel( val lookupTimeout = viewModelScope.launch { delay(RELAY_LOOKUP_TIMEOUT) chatRoomMessagingUIState = ChatRoomMessagingUIState.Error( - "Couldn't find this profile's chat details on the relays yet. They may not have finished setting up Curated." + "Couldn't find this profile's chat details on the relays yet. They may not have finished setting up Curare." ) } diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/CreateProfileViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/CreateProfileViewModel.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/CreateProfileViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/CreateProfileViewModel.kt index c0d1afb3..2aa049b2 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/CreateProfileViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/CreateProfileViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.repository.MarmotRepository -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.ui.view.state.CreateProfileUIState -import com.it.curated.compose.ui.view.state.form.CreateProfileFormState +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 co.touchlab.kermit.Logger import fr.acinq.bitcoin.MnemonicCode import fr.acinq.bitcoin.byteVector @@ -24,7 +24,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import com.it.curated.compose.extensions.nostrPublicKey +import to.curare.compose.extensions.nostrPublicKey import kotlin.time.Duration.Companion.seconds class CreateProfileViewModel( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/DkgRitualViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/DkgRitualViewModel.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/DkgRitualViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/DkgRitualViewModel.kt index 2b9edb98..35625549 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/DkgRitualViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/DkgRitualViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue @@ -9,25 +9,25 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import com.it.curated.compose.database.model.types.DkgApprovalStep -import com.it.curated.compose.database.model.types.DkgRitualStage -import com.it.curated.compose.database.model.types.FrostSigningStage -import com.it.curated.compose.database.model.types.ChatRoomType -import com.it.curated.compose.managers.ChillDkgRitualManager -import com.it.curated.compose.managers.MarmotGroupCreation -import com.it.curated.compose.managers.SharedKeyDerivation -import com.it.curated.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route +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.vitorpamplona.quartz.nip01Core.crypto.KeyPair import kotlinx.coroutines.flow.first import kotlinx.coroutines.withContext import kotlinx.coroutines.Dispatchers.Main -import com.it.curated.compose.nostr.dkg.DkgRitualEvents -import com.it.curated.compose.nostr.frost.GroupKeyStateEvent -import com.it.curated.compose.nostr.subgroup.SubgroupBirthCertificateEvent -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.DkgRepository -import com.it.curated.compose.ui.view.state.DkgRitualUIState +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 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/com/it/curated/compose/ui/view/model/EditGroupNostrProfileViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/EditGroupNostrProfileViewModel.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/EditGroupNostrProfileViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/EditGroupNostrProfileViewModel.kt index 538fa803..5abf5adc 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/EditGroupNostrProfileViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/EditGroupNostrProfileViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.nostr.GroupNostrProfile -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.ui.view.state.EditGroupNostrProfileUIState +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.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/EditGroupRelaysViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/EditGroupRelaysViewModel.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/EditGroupRelaysViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/EditGroupRelaysViewModel.kt index bc1138ed..a24c0277 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/EditGroupRelaysViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/EditGroupRelaysViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.nostr.GroupRelay -import com.it.curated.compose.nostr.GroupRelayList -import com.it.curated.compose.nostr.GroupRelaySet -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.ui.view.state.EditGroupRelaysUIState +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.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/FeedListViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/FeedListViewModel.kt similarity index 83% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/FeedListViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/FeedListViewModel.kt index 69841611..bdbf38c7 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/FeedListViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/FeedListViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.database.model.NegentropySynchronizeRequest -import com.it.curated.compose.ui.composable.widgets.feed.ListView -import com.it.curated.compose.ui.view.state.FeedListUIState +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 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 com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.loading -import curated.composeapp.generated.resources.something_went_wrong -import curated.composeapp.generated.resources.nothing_in_this_feed_yet -import com.it.curated.compose.ui.composable.widgets.ErrorState -import com.it.curated.compose.ui.composable.widgets.EmptyState +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 class FeedListViewModel( initialFeedListUIState: FeedListUIState, - val synchronizationFilter: com.it.curated.compose.database.model.types.SynchronizationFilter, - val nostrRepository: com.it.curated.compose.repository.NostrRepository + val synchronizationFilter: to.curare.compose.database.model.types.SynchronizationFilter, + val nostrRepository: to.curare.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 = com.it.curated.compose.nostr.Relays.DefaultDMRelayList.shuffled().map { normalizedRelayUrl -> + val negentropySynchronizeRequests = to.curare.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: (com.it.curated.compose.ui.composable.navigation.routes.Route) -> Unit + onNavigateToEvent: (to.curare.compose.ui.composable.navigation.routes.Route) -> Unit ) { Column( modifier = Modifier.fillMaxWidth(), @@ -138,7 +138,7 @@ class FeedListViewModel( localNostrEvent.ListView( onNavigateToEvent = { nostrEventId -> onNavigateToEvent.invoke( - com.it.curated.compose.ui.composable.navigation.routes.NostrEventDetailRoute( + to.curare.compose.ui.composable.navigation.routes.NostrEventDetailRoute( activeUserPublicKey = activeUserPublicKey, nostrEventId = nostrEventId ) @@ -178,8 +178,8 @@ class FeedListViewModel( fun factory( initialFeedListUIState: FeedListUIState = FeedListUIState.Loading, - synchronizationFilter: com.it.curated.compose.database.model.types.SynchronizationFilter, - nostrRepository: com.it.curated.compose.repository.NostrRepository, + synchronizationFilter: to.curare.compose.database.model.types.SynchronizationFilter, + nostrRepository: to.curare.compose.repository.NostrRepository, ): ViewModelProvider.Factory = viewModelFactory { initializer { FeedListViewModel( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/FollowersListViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/FollowersListViewModel.kt similarity index 75% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/FollowersListViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/FollowersListViewModel.kt index 53cca5d5..fd3fd524 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/FollowersListViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/FollowersListViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.loading -import curated.composeapp.generated.resources.something_went_wrong -import curated.composeapp.generated.resources.nobody_following_you_yet -import com.it.curated.compose.ui.composable.widgets.ErrorState -import com.it.curated.compose.ui.composable.widgets.EmptyState +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 class FollowersListViewModel( - initialFollowingListUIState: com.it.curated.compose.ui.view.state.FollowersListUIState, + initialFollowingListUIState: to.curare.compose.ui.view.state.FollowersListUIState, val publicKey: String, - val synchronizationFilter: com.it.curated.compose.database.model.types.SynchronizationFilter, - val nostrRepository: com.it.curated.compose.repository.NostrRepository + val synchronizationFilter: to.curare.compose.database.model.types.SynchronizationFilter, + val nostrRepository: to.curare.compose.repository.NostrRepository ): ViewModel() { val logger = Logger.withTag(TAG) - var followersListUIState: com.it.curated.compose.ui.view.state.FollowersListUIState by mutableStateOf(initialFollowingListUIState) + var followersListUIState: to.curare.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 = com.it.curated.compose.ui.view.state.FollowersListUIState.Loaded( + followersListUIState = to.curare.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( - com.it.curated.compose.nostr.Relays.DefaultDMRelayList.shuffled().map { normalizedRelayUrl -> - com.it.curated.compose.database.model.NegentropySynchronizeRequest( - id = com.it.curated.compose.database.model.NegentropySynchronizeRequest.computeId( + to.curare.compose.nostr.Relays.DefaultDMRelayList.shuffled().map { normalizedRelayUrl -> + to.curare.compose.database.model.NegentropySynchronizeRequest( + id = to.curare.compose.database.model.NegentropySynchronizeRequest.computeId( relayURL = normalizedRelayUrl.url, synchronizationFilter = synchronizationFilter ), @@ -106,17 +106,17 @@ class FollowersListViewModel( @Composable fun RenderFeed( activeUserPublicKey: String, - onNavigateToEvent: (com.it.curated.compose.ui.composable.navigation.routes.Route) -> Unit + onNavigateToEvent: (to.curare.compose.ui.composable.navigation.routes.Route) -> Unit ) { Column( modifier = Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally ) { when (val followersListUIState = followersListUIState) { - com.it.curated.compose.ui.view.state.FollowersListUIState.Error -> { + to.curare.compose.ui.view.state.FollowersListUIState.Error -> { ErrorState() } - is com.it.curated.compose.ui.view.state.FollowersListUIState.Loaded -> { + is to.curare.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( } } - com.it.curated.compose.ui.view.state.FollowersListUIState.Loading -> { + to.curare.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: com.it.curated.compose.ui.view.state.FollowersListUIState = com.it.curated.compose.ui.view.state.FollowersListUIState.Loading, + initialFeedListUIState: to.curare.compose.ui.view.state.FollowersListUIState = to.curare.compose.ui.view.state.FollowersListUIState.Loading, publicKey: String, - synchronizationFilter: com.it.curated.compose.database.model.types.SynchronizationFilter, - nostrRepository: com.it.curated.compose.repository.NostrRepository, + synchronizationFilter: to.curare.compose.database.model.types.SynchronizationFilter, + nostrRepository: to.curare.compose.repository.NostrRepository, ): ViewModelProvider.Factory = viewModelFactory { initializer { FollowersListViewModel( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/FollowingListViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/FollowingListViewModel.kt similarity index 75% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/FollowingListViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/FollowingListViewModel.kt index b3b85846..dda47753 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/FollowingListViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/FollowingListViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.loading -import curated.composeapp.generated.resources.something_went_wrong -import curated.composeapp.generated.resources.not_following_anyone_yet -import com.it.curated.compose.ui.composable.widgets.ErrorState -import com.it.curated.compose.ui.composable.widgets.EmptyState +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 class FollowingListViewModel( - initialFollowingListUIState: com.it.curated.compose.ui.view.state.FollowingListUIState, + initialFollowingListUIState: to.curare.compose.ui.view.state.FollowingListUIState, val publicKey: String, - val synchronizationFilter: com.it.curated.compose.database.model.types.SynchronizationFilter, - val nostrRepository: com.it.curated.compose.repository.NostrRepository + val synchronizationFilter: to.curare.compose.database.model.types.SynchronizationFilter, + val nostrRepository: to.curare.compose.repository.NostrRepository ): ViewModel() { val logger = Logger.withTag(TAG) - var followingListUIState: com.it.curated.compose.ui.view.state.FollowingListUIState by mutableStateOf(initialFollowingListUIState) + var followingListUIState: to.curare.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 = com.it.curated.compose.ui.view.state.FollowingListUIState.Loaded( + followingListUIState = to.curare.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( - com.it.curated.compose.nostr.Relays.DefaultDMRelayList.shuffled().map { normalizedRelayUrl -> - com.it.curated.compose.database.model.NegentropySynchronizeRequest( - id = com.it.curated.compose.database.model.NegentropySynchronizeRequest.computeId( + to.curare.compose.nostr.Relays.DefaultDMRelayList.shuffled().map { normalizedRelayUrl -> + to.curare.compose.database.model.NegentropySynchronizeRequest( + id = to.curare.compose.database.model.NegentropySynchronizeRequest.computeId( relayURL = normalizedRelayUrl.url, synchronizationFilter = synchronizationFilter ), @@ -105,17 +105,17 @@ class FollowingListViewModel( @Composable fun RenderFeed( activeUserPublicKey: String, - onNavigateToEvent: (com.it.curated.compose.ui.composable.navigation.routes.Route) -> Unit + onNavigateToEvent: (to.curare.compose.ui.composable.navigation.routes.Route) -> Unit ) { Column( modifier = Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally ) { when (val feedListUIState = followingListUIState) { - com.it.curated.compose.ui.view.state.FollowingListUIState.Error -> { + to.curare.compose.ui.view.state.FollowingListUIState.Error -> { ErrorState() } - is com.it.curated.compose.ui.view.state.FollowingListUIState.Loaded -> { + is to.curare.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( } } - com.it.curated.compose.ui.view.state.FollowingListUIState.Loading -> { + to.curare.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: com.it.curated.compose.ui.view.state.FollowingListUIState = com.it.curated.compose.ui.view.state.FollowingListUIState.Loading, + initialFeedListUIState: to.curare.compose.ui.view.state.FollowingListUIState = to.curare.compose.ui.view.state.FollowingListUIState.Loading, publicKey: String, - synchronizationFilter: com.it.curated.compose.database.model.types.SynchronizationFilter, - nostrRepository: com.it.curated.compose.repository.NostrRepository, + synchronizationFilter: to.curare.compose.database.model.types.SynchronizationFilter, + nostrRepository: to.curare.compose.repository.NostrRepository, ): ViewModelProvider.Factory = viewModelFactory { initializer { FollowingListViewModel( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/FrostSigningViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/FrostSigningViewModel.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/FrostSigningViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/FrostSigningViewModel.kt index ee29f5bc..d8f63f36 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/FrostSigningViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/FrostSigningViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue @@ -16,12 +16,12 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.flow.combine import kotlinx.coroutines.launch -import com.it.curated.compose.database.model.FrostSigningItem -import com.it.curated.compose.database.model.FrostSigningSession -import com.it.curated.compose.nostr.frost.FrostSigningEvents -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.ui.view.state.FrostSigningUIState +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 class FrostSigningViewModel( val chatRoomId: String, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/HomeViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/HomeViewModel.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/HomeViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/HomeViewModel.kt index e276a428..842f58ad 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/HomeViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/HomeViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.ui.view.state.HomeScreenUIState +import to.curare.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: com.it.curated.compose.repository.NostrRepository, + val nostrRepository: to.curare.compose.repository.NostrRepository, val pagerState: PagerState ): ViewModel() { @@ -60,7 +60,7 @@ class HomeViewModel( fun factory( activeUserPublicKey: HexKey, initialHomeScreenUIState: HomeScreenUIState, - nostrRepository: com.it.curated.compose.repository.NostrRepository, + nostrRepository: to.curare.compose.repository.NostrRepository, pagerState: PagerState ): ViewModelProvider.Factory = viewModelFactory { initializer { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/InReplyToViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/InReplyToViewModel.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/InReplyToViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/InReplyToViewModel.kt index c675ad67..a14931ad 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/InReplyToViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/InReplyToViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.ui.composable.widgets.feed.ListView +import to.curare.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 com.it.curated.compose.ui.theme.spacing -import curated.composeapp.generated.resources.Res +import to.curare.compose.ui.theme.spacing +import curare.composeapp.generated.resources.Res import org.jetbrains.compose.resources.stringResource -import curated.composeapp.generated.resources.loading -import curated.composeapp.generated.resources.something_went_wrong -import curated.composeapp.generated.resources.no_replies_to_this_yet -import com.it.curated.compose.ui.composable.widgets.ErrorState -import com.it.curated.compose.ui.composable.widgets.EmptyState +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 class InReplyToViewModel( - val nostrEvent: com.it.curated.compose.database.model.NostrEvent, - val profile: com.it.curated.compose.database.model.Profile?, - initialFeedListUIState: com.it.curated.compose.ui.view.state.FeedListUIState, - val synchronizationFilter: com.it.curated.compose.database.model.types.SynchronizationFilter, - val nostrRepository: com.it.curated.compose.repository.NostrRepository + 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 ): ViewModel() { val logger = Logger.withTag(TAG) - var inReplyToFeedListUIState: com.it.curated.compose.ui.view.state.FeedListUIState by mutableStateOf(initialFeedListUIState) + var inReplyToFeedListUIState: to.curare.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 = com.it.curated.compose.ui.view.state.FeedListUIState.Loaded( + inReplyToFeedListUIState = to.curare.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 - ) ?: com.it.curated.compose.nostr.Relays.DefaultDMRelayList + ) ?: to.curare.compose.nostr.Relays.DefaultDMRelayList nostrRepository.queueNegentropySynchronizeRequest( publicRelays.take(3).map { normalizedRelayUrl -> - com.it.curated.compose.database.model.NegentropySynchronizeRequest( - id = com.it.curated.compose.database.model.NegentropySynchronizeRequest.computeId( + to.curare.compose.database.model.NegentropySynchronizeRequest( + id = to.curare.compose.database.model.NegentropySynchronizeRequest.computeId( relayURL = normalizedRelayUrl.url, synchronizationFilter = synchronizationFilter ), @@ -116,17 +116,17 @@ class InReplyToViewModel( @Composable fun RenderFeed( activeUserPublicKey: String, - onNavigateToEvent: (com.it.curated.compose.ui.composable.navigation.routes.Route) -> Unit + onNavigateToEvent: (to.curare.compose.ui.composable.navigation.routes.Route) -> Unit ) { Column( modifier = Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally ) { when (val feedListUIState = inReplyToFeedListUIState) { - com.it.curated.compose.ui.view.state.FeedListUIState.Error -> { + to.curare.compose.ui.view.state.FeedListUIState.Error -> { ErrorState() } - is com.it.curated.compose.ui.view.state.FeedListUIState.Loaded -> { + is to.curare.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( - com.it.curated.compose.ui.composable.navigation.routes.NostrEventDetailRoute( + to.curare.compose.ui.composable.navigation.routes.NostrEventDetailRoute( activeUserPublicKey = activeUserPublicKey, nostrEventId = nostrEventId ) @@ -154,7 +154,7 @@ class InReplyToViewModel( } } - com.it.curated.compose.ui.view.state.FeedListUIState.Loading -> { + to.curare.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: com.it.curated.compose.database.model.NostrEvent, - profile: com.it.curated.compose.database.model.Profile?, + nostrEvent: to.curare.compose.database.model.NostrEvent, + profile: to.curare.compose.database.model.Profile?, createdAt: Instant, - initialFeedListUIState: com.it.curated.compose.ui.view.state.FeedListUIState = com.it.curated.compose.ui.view.state.FeedListUIState.Loading, - synchronizationFilter: com.it.curated.compose.database.model.types.SynchronizationFilter = com.it.curated.compose.database.model.types.SynchronizationFilter( + 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( kinds = arrayOf( TextNoteEvent.KIND, ReactionEvent.KIND, @@ -198,7 +198,7 @@ class InReplyToViewModel( ), since = createdAt ), - nostrRepository: com.it.curated.compose.repository.NostrRepository, + nostrRepository: to.curare.compose.repository.NostrRepository, ): ViewModelProvider.Factory = viewModelFactory { initializer { InReplyToViewModel( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/KeyPackageManagementViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/KeyPackageManagementViewModel.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/KeyPackageManagementViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/KeyPackageManagementViewModel.kt index 84f92234..662aa270 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/KeyPackageManagementViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/KeyPackageManagementViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.database.model.MarmotKeyPackageBundle -import com.it.curated.compose.repository.MarmotRepository -import com.it.curated.compose.ui.view.state.KeyPackageManagementUIState +import to.curare.compose.database.model.MarmotKeyPackageBundle +import to.curare.compose.repository.MarmotRepository +import to.curare.compose.ui.view.state.KeyPackageManagementUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/MetadataEventDetailViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/MetadataEventDetailViewModel.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/MetadataEventDetailViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/MetadataEventDetailViewModel.kt index 9d7b0c3e..1c4fc465 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/MetadataEventDetailViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/MetadataEventDetailViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.database.model.NegentropySynchronizeRequest -import com.it.curated.compose.database.model.types.SynchronizationFilter -import com.it.curated.compose.nostr.Relays +import to.curare.compose.database.model.NegentropySynchronizeRequest +import to.curare.compose.database.model.types.SynchronizationFilter +import to.curare.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: com.it.curated.compose.ui.view.state.MetadataEventDetailUIState = com.it.curated.compose.ui.view.state.MetadataEventDetailUIState.Loading, + initialMetadataEventDetailUIState: to.curare.compose.ui.view.state.MetadataEventDetailUIState = to.curare.compose.ui.view.state.MetadataEventDetailUIState.Loading, val activeUserPublicKey: HexKey, val eventPublicKey: HexKey, - val nostrRepository: com.it.curated.compose.repository.NostrRepository, + val nostrRepository: to.curare.compose.repository.NostrRepository, val pagerState: PagerState ): ViewModel() { val isActionPending: MutableState = mutableStateOf(false) - var metadataEventDetailUIState: com.it.curated.compose.ui.view.state.MetadataEventDetailUIState by mutableStateOf(initialMetadataEventDetailUIState) + var metadataEventDetailUIState: to.curare.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 = com.it.curated.compose.ui.view.state.MetadataEventDetailUIState.Loaded( + metadataEventDetailUIState = to.curare.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 -> { - com.it.curated.compose.database.model.types.SynchronizationFilter( + to.curare.compose.database.model.types.SynchronizationFilter( authors = arrayOf( eventPublicKey ), @@ -139,7 +139,7 @@ class MetadataEventDetailViewModel( ) } MetadataEventDetailType.Replies -> { - com.it.curated.compose.database.model.types.SynchronizationFilter( + to.curare.compose.database.model.types.SynchronizationFilter( authors = arrayOf( eventPublicKey ), @@ -152,7 +152,7 @@ class MetadataEventDetailViewModel( ) } MetadataEventDetailType.Articles -> { - com.it.curated.compose.database.model.types.SynchronizationFilter( + to.curare.compose.database.model.types.SynchronizationFilter( authors = arrayOf( eventPublicKey ), @@ -163,7 +163,7 @@ class MetadataEventDetailViewModel( ) } MetadataEventDetailType.Followers -> { - com.it.curated.compose.database.model.types.SynchronizationFilter( + to.curare.compose.database.model.types.SynchronizationFilter( authors = arrayOf( eventPublicKey ), @@ -175,7 +175,7 @@ class MetadataEventDetailViewModel( ) } MetadataEventDetailType.Following -> { - com.it.curated.compose.database.model.types.SynchronizationFilter( + to.curare.compose.database.model.types.SynchronizationFilter( authors = arrayOf( eventPublicKey ), @@ -186,7 +186,7 @@ class MetadataEventDetailViewModel( ) } MetadataEventDetailType.Zaps -> { - com.it.curated.compose.database.model.types.SynchronizationFilter( + to.curare.compose.database.model.types.SynchronizationFilter( authors = arrayOf( eventPublicKey ), @@ -198,7 +198,7 @@ class MetadataEventDetailViewModel( ) } MetadataEventDetailType.Photos -> { - com.it.curated.compose.database.model.types.SynchronizationFilter( + to.curare.compose.database.model.types.SynchronizationFilter( authors = arrayOf( eventPublicKey ), @@ -209,7 +209,7 @@ class MetadataEventDetailViewModel( ) } MetadataEventDetailType.Shorts -> { - com.it.curated.compose.database.model.types.SynchronizationFilter( + to.curare.compose.database.model.types.SynchronizationFilter( authors = arrayOf( eventPublicKey ), @@ -220,7 +220,7 @@ class MetadataEventDetailViewModel( ) } MetadataEventDetailType.Videos -> { - com.it.curated.compose.database.model.types.SynchronizationFilter( + to.curare.compose.database.model.types.SynchronizationFilter( authors = arrayOf( eventPublicKey ), @@ -231,7 +231,7 @@ class MetadataEventDetailViewModel( ) } MetadataEventDetailType.Bookmarks -> { - com.it.curated.compose.database.model.types.SynchronizationFilter( + to.curare.compose.database.model.types.SynchronizationFilter( authors = arrayOf( eventPublicKey ), @@ -242,7 +242,7 @@ class MetadataEventDetailViewModel( ) } MetadataEventDetailType.Reports -> { - com.it.curated.compose.database.model.types.SynchronizationFilter( + to.curare.compose.database.model.types.SynchronizationFilter( authors = arrayOf( eventPublicKey ), @@ -253,7 +253,7 @@ class MetadataEventDetailViewModel( ) } MetadataEventDetailType.Relays -> { - com.it.curated.compose.database.model.types.SynchronizationFilter( + to.curare.compose.database.model.types.SynchronizationFilter( authors = arrayOf( eventPublicKey ), @@ -297,7 +297,7 @@ class MetadataEventDetailViewModel( val contactListTagList = followUsers.map { it } nostrRepository.saveUnsignedNostrEvent( - com.it.curated.compose.database.model.UnsignedNostrEvent( + to.curare.compose.database.model.UnsignedNostrEvent( pubKey = activeUserPublicKey, kind = ContactListEvent.KIND, tags = contactListTagList.toTypedArray(), @@ -309,7 +309,7 @@ class MetadataEventDetailViewModel( } } - fun unfollow(connection: com.it.curated.compose.database.model.Connection) { + fun unfollow(connection: to.curare.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( - com.it.curated.compose.database.model.UnsignedNostrEvent( + to.curare.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: com.it.curated.compose.repository.NostrRepository, + nostrRepository: to.curare.compose.repository.NostrRepository, pagerState: PagerState ): ViewModelProvider.Factory = viewModelFactory { initializer { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/NavigationViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/NavigationViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.kt index 3424b6ac..472c7b1a 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/NavigationViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.kt @@ -1,12 +1,12 @@ -package com.it.curated.compose.ui.view.model +package to.curare.compose.ui.view.model import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import com.it.curated.compose.database.model.intermdiate.LocalAccount -import com.it.curated.compose.ui.composable.navigation.routes.SovereignWalletStartupRoute -import com.it.curated.compose.ui.view.state.NavigationUIState +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 co.touchlab.kermit.Logger import fr.acinq.phoenix.data.ActiveWallet import kotlinx.coroutines.CoroutineScope @@ -21,13 +21,13 @@ import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.flow.getAndUpdate import kotlinx.coroutines.launch -import com.it.curated.compose.extensions.nostrPublicKey +import to.curare.compose.extensions.nostrPublicKey import kotlin.time.Duration.Companion.milliseconds class NavigationViewModel( val activeWalletStateFlow: StateFlow, initialNavigationUIState: NavigationUIState, - val nostrRepository: com.it.curated.compose.repository.NostrRepository, + val nostrRepository: to.curare.compose.repository.NostrRepository, val scope: CoroutineScope, ): ViewModel() { @@ -40,7 +40,7 @@ class NavigationViewModel( fun factory( activeWallet: StateFlow, initialNavigationUIState: NavigationUIState, - nostrRepository: com.it.curated.compose.repository.NostrRepository, + nostrRepository: to.curare.compose.repository.NostrRepository, scope: CoroutineScope, ): ViewModelProvider.Factory = viewModelFactory { initializer { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/NostrEventDetailViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NostrEventDetailViewModel.kt similarity index 72% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/NostrEventDetailViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NostrEventDetailViewModel.kt index ad7df1c6..0af8f9d4 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/NostrEventDetailViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NostrEventDetailViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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: com.it.curated.compose.ui.view.state.NostrEventDetailUIState, - val nostrRepository: com.it.curated.compose.repository.NostrRepository + initialNostrEventDetailUIState: to.curare.compose.ui.view.state.NostrEventDetailUIState, + val nostrRepository: to.curare.compose.repository.NostrRepository ): ViewModel() { - var nostrEventDetailUIState: com.it.curated.compose.ui.view.state.NostrEventDetailUIState by mutableStateOf(initialNostrEventDetailUIState) + var nostrEventDetailUIState: to.curare.compose.ui.view.state.NostrEventDetailUIState by mutableStateOf(initialNostrEventDetailUIState) private set fun retryLoad() { - nostrEventDetailUIState = com.it.curated.compose.ui.view.state.NostrEventDetailUIState.Loading + nostrEventDetailUIState = to.curare.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( - com.it.curated.compose.nostr.Relays.DefaultDMRelayList.take(1).map { normalizedRelay -> // TODO: Sync from all relays instead of 1 - com.it.curated.compose.database.model.SynchronizeNostrEventRequest( + to.curare.compose.nostr.Relays.DefaultDMRelayList.take(1).map { normalizedRelay -> // TODO: Sync from all relays instead of 1 + to.curare.compose.database.model.SynchronizeNostrEventRequest( purpose = "detail", synchronizationFilters = arrayOf( - com.it.curated.compose.database.model.types.SynchronizationFilter( + to.curare.compose.database.model.types.SynchronizationFilter( kinds = arrayOf( TextNoteEvent.KIND, RepostEvent.KIND, @@ -69,11 +69,11 @@ class NostrEventDetailViewModel( nostrEventId ).collectLatest { localNostrEvent -> nostrEventDetailUIState = if (localNostrEvent != null) { - com.it.curated.compose.ui.view.state.NostrEventDetailUIState.Loaded( + to.curare.compose.ui.view.state.NostrEventDetailUIState.Loaded( localNostrEvent = localNostrEvent ) } else { - com.it.curated.compose.ui.view.state.NostrEventDetailUIState.Error + to.curare.compose.ui.view.state.NostrEventDetailUIState.Error } } } @@ -85,8 +85,8 @@ class NostrEventDetailViewModel( fun factory( nostrEventId: HexKey, activeUserPublicKey: HexKey, - initialNostrEventDetailUIState: com.it.curated.compose.ui.view.state.NostrEventDetailUIState = com.it.curated.compose.ui.view.state.NostrEventDetailUIState.Loading, - nostrRepository: com.it.curated.compose.repository.NostrRepository, + initialNostrEventDetailUIState: to.curare.compose.ui.view.state.NostrEventDetailUIState = to.curare.compose.ui.view.state.NostrEventDetailUIState.Loading, + nostrRepository: to.curare.compose.repository.NostrRepository, ): ViewModelProvider.Factory = viewModelFactory { initializer { NostrEventDetailViewModel( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/NotaryViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NotaryViewModel.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/NotaryViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NotaryViewModel.kt index f417171a..0332dc6d 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/NotaryViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/NotaryViewModel.kt @@ -1,10 +1,10 @@ -package com.it.curated.compose.ui.view.model +package to.curare.compose.ui.view.model import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import com.it.curated.compose.repository.MarmotRepository +import to.curare.compose.repository.MarmotRepository import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.toHexKey @@ -26,14 +26,14 @@ import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch -import com.it.curated.compose.database.model.NostrEvent +import to.curare.compose.database.model.NostrEvent import kotlin.time.Duration.Companion.seconds import kotlin.time.Instant class NotaryViewModel( val activeWalletStateFlow: StateFlow, - val nostrRepository: com.it.curated.compose.repository.NostrRepository, - val chatRepository: com.it.curated.compose.repository.ChatRepository, + val nostrRepository: to.curare.compose.repository.NostrRepository, + val chatRepository: to.curare.compose.repository.ChatRepository, val marmotRepository: MarmotRepository, val scope: CoroutineScope, ): ViewModel() { @@ -44,8 +44,8 @@ class NotaryViewModel( fun factory( activeWalletStateFlow: StateFlow, - nostrRepository: com.it.curated.compose.repository.NostrRepository, - chatRepository: com.it.curated.compose.repository.ChatRepository, + nostrRepository: to.curare.compose.repository.NostrRepository, + chatRepository: to.curare.compose.repository.ChatRepository, marmotRepository: MarmotRepository, scope: CoroutineScope, ): ViewModelProvider.Factory = viewModelFactory { @@ -163,7 +163,7 @@ class NotaryViewModel( sig = event.sig, unsignedNostrEventId = unsignedNostrEvent.id ), - relayURLs = com.it.curated.compose.nostr.Relays.DefaultDMRelayList.map { normalizedRelayUrl -> normalizedRelayUrl.url }, + relayURLs = to.curare.compose.nostr.Relays.DefaultDMRelayList.map { normalizedRelayUrl -> normalizedRelayUrl.url }, activeKeyPair = keyPair ) } diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ProposalListViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ProposalListViewModel.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ProposalListViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ProposalListViewModel.kt index 53e7760b..0eb7c6c9 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ProposalListViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ProposalListViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.compose.ui.view.model import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -13,13 +13,13 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.launch -import com.it.curated.compose.database.model.intermdiate.LocalFrostSigningSession -import com.it.curated.compose.extensions.shortened -import com.it.curated.compose.managers.FrostSigningManager -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.text.ProposedEvent -import com.it.curated.compose.ui.view.state.ProposalListUIState +import to.curare.compose.database.model.intermdiate.LocalFrostSigningSession +import to.curare.compose.extensions.shortened +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.view.state.ProposalListUIState /** * Everything a group has asked its shared key to sign. diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/RecoveryPhraseViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/RecoveryPhraseViewModel.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/RecoveryPhraseViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/RecoveryPhraseViewModel.kt index 45678add..b88d4993 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/RecoveryPhraseViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/RecoveryPhraseViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.compose.ui.view.model import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider @@ -22,7 +22,7 @@ import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import com.it.curated.compose.ui.view.state.RecoveryPhraseUIState +import to.curare.compose.ui.view.state.RecoveryPhraseUIState /** * Reads back the twelve words this device's keys are made of. diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SearchMemberToAddToChatRoomViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SearchMemberToAddToChatRoomViewModel.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SearchMemberToAddToChatRoomViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SearchMemberToAddToChatRoomViewModel.kt index 8c896d71..015edff5 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SearchMemberToAddToChatRoomViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SearchMemberToAddToChatRoomViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.database.model.NegentropySynchronizeRequest -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.types.SynchronizationFilter -import com.it.curated.compose.nostr.Relays -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.ui.view.state.SearchMemberToAddToChatRoomUIState +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 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/com/it/curated/compose/ui/view/model/SearchResultViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SearchResultViewModel.kt similarity index 85% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SearchResultViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SearchResultViewModel.kt index 1ce1dba1..1ff831ca 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SearchResultViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SearchResultViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.database.model.types.SynchronizationFilter -import com.it.curated.compose.extensions.bech32ToHexOrNull -import com.it.curated.compose.ui.view.state.SearchResultListUIState +import to.curare.compose.database.model.types.SynchronizationFilter +import to.curare.compose.extensions.bech32ToHexOrNull +import to.curare.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: com.it.curated.compose.repository.NostrRepository, - val searchRepository: com.it.curated.compose.repository.SearchRepository, + val nostrRepository: to.curare.compose.repository.NostrRepository, + val searchRepository: to.curare.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( - com.it.curated.compose.nostr.Relays.eventFinderRelaySet.map { normalizedRelay -> // TODO: Search all relays instead of the first - com.it.curated.compose.database.model.SynchronizeNostrEventRequest( + to.curare.compose.nostr.Relays.eventFinderRelaySet.map { normalizedRelay -> // TODO: Search all relays instead of the first + to.curare.compose.database.model.SynchronizeNostrEventRequest( purpose = "search", synchronizationFilters = arrayOf( synchronizationFilter @@ -133,8 +133,8 @@ class SearchResultViewModel( fun factory( initialSearchResultType: SearchResultType = SearchResultType.Profiles, searchQuery: String, - nostrRepository: com.it.curated.compose.repository.NostrRepository, - searchRepository: com.it.curated.compose.repository.SearchRepository, + nostrRepository: to.curare.compose.repository.NostrRepository, + searchRepository: to.curare.compose.repository.SearchRepository, ): ViewModelProvider.Factory = viewModelFactory { initializer { SearchResultViewModel( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SearchViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SearchViewModel.kt similarity index 66% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SearchViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SearchViewModel.kt index 68a9983f..d0209600 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SearchViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SearchViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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: com.it.curated.compose.ui.view.state.SearchUIState, - val nostrRepository: com.it.curated.compose.repository.NostrRepository, - val searchRepository: com.it.curated.compose.repository.SearchRepository, + initialSearchUIState: to.curare.compose.ui.view.state.SearchUIState, + val nostrRepository: to.curare.compose.repository.NostrRepository, + val searchRepository: to.curare.compose.repository.SearchRepository, ): ViewModel() { val logger = Logger.withTag(TAG) - var searchUIState: com.it.curated.compose.ui.view.state.SearchUIState by mutableStateOf(initialSearchUIState) + var searchUIState: to.curare.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: com.it.curated.compose.database.model.RecentSearch) { + fun removeRecentSearch(recentSearch: to.curare.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: com.it.curated.compose.ui.view.state.SearchUIState = com.it.curated.compose.ui.view.state.SearchUIState.Prompt, - nostrRepository: com.it.curated.compose.repository.NostrRepository, - searchRepository: com.it.curated.compose.repository.SearchRepository, + 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, ): ViewModelProvider.Factory = viewModelFactory { initializer { SearchViewModel( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SelectChatRoomMembersViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SelectChatRoomMembersViewModel.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SelectChatRoomMembersViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SelectChatRoomMembersViewModel.kt index e8b2e3e1..b824b349 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SelectChatRoomMembersViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SelectChatRoomMembersViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.database.model.NegentropySynchronizeRequest -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.types.SynchronizationFilter -import com.it.curated.compose.nostr.Relays -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.composable.navigation.routes.SelectChatRoomTypeRoute -import com.it.curated.compose.ui.view.state.SelectChatRoomMembersUIState +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 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/com/it/curated/compose/ui/view/model/SelectChatRoomTypeViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SelectChatRoomTypeViewModel.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SelectChatRoomTypeViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SelectChatRoomTypeViewModel.kt index 20861d94..52bea015 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SelectChatRoomTypeViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SelectChatRoomTypeViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue @@ -10,18 +10,18 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.types.ChatRoomType -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.managers.MarmotGroupName -import com.it.curated.compose.nostr.Relays -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.DkgRepository -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute -import com.it.curated.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.view.state.SelectChatRoomTypeUIState +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.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 co.touchlab.kermit.Logger import com.vitorpamplona.quartz.marmot.mip01Groups.MarmotGroupData import com.vitorpamplona.quartz.marmot.mls.crypto.Ed25519 diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SelectSubgroupAdminsViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SelectSubgroupAdminsViewModel.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SelectSubgroupAdminsViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SelectSubgroupAdminsViewModel.kt index f20bfd9e..db22f631 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SelectSubgroupAdminsViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SelectSubgroupAdminsViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue @@ -19,13 +19,13 @@ import kotlinx.coroutines.IO import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import com.it.curated.compose.database.model.types.ChatRoomType -import com.it.curated.compose.managers.MarmotGroupCreation -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.DkgRepository -import com.it.curated.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute -import com.it.curated.compose.ui.composable.navigation.routes.Route -import com.it.curated.compose.ui.view.state.SelectSubgroupAdminsUIState +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 /** * Who runs a subgroup, what it is called, and on what quorum. diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ShareProfileViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ShareProfileViewModel.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ShareProfileViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ShareProfileViewModel.kt index f5e7e31f..061a9e4a 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/ShareProfileViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/ShareProfileViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.database.model.BroadcastNostrEventRequest -import com.it.curated.compose.database.model.intermdiate.LocalNostrEvent -import com.it.curated.compose.nostr.Relays -import com.it.curated.compose.ui.view.state.ShareProfileUIState +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.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: com.it.curated.compose.repository.NostrRepository + val nostrRepository: to.curare.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: com.it.curated.compose.repository.NostrRepository, + nostrRepository: to.curare.compose.repository.NostrRepository, ): ViewModelProvider.Factory = viewModelFactory { initializer { ShareProfileViewModel( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SignInToProfileViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SignInToProfileViewModel.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SignInToProfileViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SignInToProfileViewModel.kt index 59457ccb..89980d2f 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SignInToProfileViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SignInToProfileViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf @@ -17,16 +17,16 @@ import kotlinx.coroutines.IO import kotlinx.coroutines.launch class SignInToProfileViewModel( - initialWriteNewNoteUIState: com.it.curated.compose.ui.view.state.SignInToProfileUIState, - val signInToProfileFormState: com.it.curated.compose.ui.view.state.form.SignInToProfileFormState = com.it.curated.compose.ui.view.state.form.SignInToProfileFormState(), - val nostrRepository: com.it.curated.compose.repository.NostrRepository + initialWriteNewNoteUIState: to.curare.compose.ui.view.state.SignInToProfileUIState, + val signInToProfileFormState: to.curare.compose.ui.view.state.form.SignInToProfileFormState = to.curare.compose.ui.view.state.form.SignInToProfileFormState(), + val nostrRepository: to.curare.compose.repository.NostrRepository ): ViewModel() { companion object { private const val TAG = "SignInToProfileViewModel" fun factory( - initialWriteNewNoteUIState: com.it.curated.compose.ui.view.state.SignInToProfileUIState, - nostrRepository: com.it.curated.compose.repository.NostrRepository + initialWriteNewNoteUIState: to.curare.compose.ui.view.state.SignInToProfileUIState, + nostrRepository: to.curare.compose.repository.NostrRepository ): ViewModelProvider.Factory = viewModelFactory { initializer { SignInToProfileViewModel( @@ -41,7 +41,7 @@ class SignInToProfileViewModel( val isActionPending: MutableState = mutableStateOf(false) - var signInToProfileUIState: MutableState = mutableStateOf( + var signInToProfileUIState: MutableState = mutableStateOf( initialWriteNewNoteUIState ) @@ -78,7 +78,7 @@ class SignInToProfileViewModel( } else -> { // TODO: Might want to give reasons for the error. - signInToProfileUIState.value = com.it.curated.compose.ui.view.state.SignInToProfileUIState.Error + signInToProfileUIState.value = to.curare.compose.ui.view.state.SignInToProfileUIState.Error } } diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SovereignWalletStartupViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SovereignWalletStartupViewModel.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SovereignWalletStartupViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SovereignWalletStartupViewModel.kt index 7402af36..2e3a8c36 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SovereignWalletStartupViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SovereignWalletStartupViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 = - com.it.curated.compose.extensions.platformStartupLogic( + to.curare.compose.extensions.platformStartupLogic( words ) - com.it.curated.compose.extensions.schedulePlatformLogic( + to.curare.compose.extensions.schedulePlatformLogic( phoenixGlobal = phoenixGlobal, ) when (startResult) { @@ -69,7 +69,7 @@ class SovereignWalletStartupViewModel( } fun getShowIntroFlow(): Flow { - return com.it.curated.compose.extensions.getShowIntroFlow(phoenixGlobal) + return to.curare.compose.extensions.getShowIntroFlow(phoenixGlobal) } companion object { diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SovereignWalletViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SovereignWalletViewModel.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SovereignWalletViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SovereignWalletViewModel.kt index 161c9dc1..2af806d6 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SovereignWalletViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SovereignWalletViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.compose.ui.view.model import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -90,17 +90,17 @@ class SovereignWalletViewModel( val exchangeRates = phoenixGlobal.currencyManager.ratesFlow .stateIn(viewModelScope, started = SharingStarted.Lazily, initialValue = emptyList()) - var walletUIState: com.it.curated.compose.ui.view.state.SovereignWalletUIState by mutableStateOf( - com.it.curated.compose.ui.view.state.SovereignWalletUIState.Loading) + var walletUIState: to.curare.compose.ui.view.state.SovereignWalletUIState by mutableStateOf( + to.curare.compose.ui.view.state.SovereignWalletUIState.Loading) private set fun retryLoad() { - walletUIState = com.it.curated.compose.ui.view.state.SovereignWalletUIState.Loading + walletUIState = to.curare.compose.ui.view.state.SovereignWalletUIState.Loading } fun loadSovereignData(walletId: WalletId) { - walletUIState = com.it.curated.compose.ui.view.state.SovereignWalletUIState.Success( + walletUIState = to.curare.compose.ui.view.state.SovereignWalletUIState.Success( publicKey = walletId.nodeIdHash, balanceInSatoshis = 0 // TODO: Get balance... ) @@ -167,7 +167,7 @@ class SovereignWalletViewModel( phoenixGlobal = phoenixGlobal, walletId = walletId, name = null, - avatar = com.it.curated.compose.ui.composable.widgets.wallet.WalletAvatars.list.random(), + avatar = to.curare.compose.ui.composable.widgets.wallet.WalletAvatars.list.random(), isHidden = false ) } @@ -222,7 +222,7 @@ class SovereignWalletViewModel( } fun getGlobalPrefs(): GlobalPrefs { - return com.it.curated.compose.extensions.getGlobalPrefs( + return to.curare.compose.extensions.getGlobalPrefs( phoenixGlobal ) } diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SynchronizationViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SynchronizationViewModel.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SynchronizationViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SynchronizationViewModel.kt index 42bb4e08..7685e06f 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SynchronizationViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/SynchronizationViewModel.kt @@ -1,24 +1,24 @@ -package com.it.curated.compose.ui.view.model +package to.curare.compose.ui.view.model import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import com.it.curated.compose.database.model.BroadcastNostrEventRequest -import com.it.curated.compose.database.model.SynchronizeNostrEventRequest -import com.it.curated.compose.database.model.types.SynchronizationFilter -import com.it.curated.compose.network.dto.toRelayDTO -import com.it.curated.compose.AppLifecycle -import com.it.curated.compose.managers.LiveSubscriptionManager -import com.it.curated.compose.network.relays.RelayPool -import com.it.curated.compose.network.relays.RelaysSocketManager -import com.it.curated.compose.network.relays.isRelayBackPressure -import com.it.curated.compose.network.sockets.NostrIncomingMessage -import com.it.curated.compose.network.sockets.DefaultNostrSocketClientFactory -import com.it.curated.compose.repository.CachingImportRepository -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.repository.RelayRepository +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 co.touchlab.kermit.Logger import com.vitorpamplona.negentropy.Negentropy import com.vitorpamplona.negentropy.storage.StorageVector @@ -606,7 +606,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) @@ -638,7 +638,7 @@ class SynchronizationViewModel( * we have. */ private suspend fun applyReconciliation( - negentropySynchronizeRequest: com.it.curated.compose.database.model.NegentropySynchronizeRequest, + negentropySynchronizeRequest: to.curare.compose.database.model.NegentropySynchronizeRequest, needIds: Set, sendIds: Set, localEventIds: Set, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/TranslateChunkViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/TranslateChunkViewModel.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/TranslateChunkViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/TranslateChunkViewModel.kt index 934bb58d..b0b9cd3d 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/TranslateChunkViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/TranslateChunkViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.database.model.MantraChunk -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.nostr.nip30303.TranslationChunkEvent -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.repository.MantraRepository -import com.it.curated.compose.ui.view.state.TranslateChunkUIState +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 class TranslateChunkViewModel( val translationChapterId: String, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/TranslationArtifactVersionDetailViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/TranslationArtifactVersionDetailViewModel.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/TranslationArtifactVersionDetailViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/TranslationArtifactVersionDetailViewModel.kt index 5c0aa30c..0af34bc8 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/TranslationArtifactVersionDetailViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/TranslationArtifactVersionDetailViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.database.model.MantraChapter -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.managers.FrostSigningManager -import com.it.curated.compose.managers.TranslationScaffold -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.repository.MantraRepository -import com.it.curated.compose.ui.view.state.TranslationChapterProgress -import com.it.curated.compose.ui.view.state.TranslationArtifactVersionDetailUIState +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 class TranslationArtifactVersionDetailViewModel( val translationArtifactVersionId: String, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/TranslationChapterViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/TranslationChapterViewModel.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/TranslationChapterViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/TranslationChapterViewModel.kt index 645ca37e..4633ff6b 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/TranslationChapterViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/TranslationChapterViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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 com.it.curated.compose.repository.MantraRepository -import com.it.curated.compose.ui.view.state.ChunkTranslationPair -import com.it.curated.compose.ui.view.state.TranslationChapterUIState +import to.curare.compose.repository.MantraRepository +import to.curare.compose.ui.view.state.ChunkTranslationPair +import to.curare.compose.ui.view.state.TranslationChapterUIState class TranslationChapterViewModel( val translationChapterId: String, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/UnqueuedProfileSynchronizationViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/UnqueuedProfileSynchronizationViewModel.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/UnqueuedProfileSynchronizationViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/UnqueuedProfileSynchronizationViewModel.kt index a12fec21..b3dc8d93 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/UnqueuedProfileSynchronizationViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/UnqueuedProfileSynchronizationViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.compose.ui.view.model import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf @@ -24,7 +24,7 @@ import kotlinx.coroutines.launch class UnqueuedProfileSynchronizationViewModel( val unsignedNostrEventId: Long, val profilePublicKey: String, - val nostrRepository: com.it.curated.compose.repository.NostrRepository + val nostrRepository: to.curare.compose.repository.NostrRepository ): ViewModel() { companion object { private const val TAG = "UnqueuedProfileSynchronizationViewModel" @@ -32,7 +32,7 @@ class UnqueuedProfileSynchronizationViewModel( fun factory( unsignedNostrEventId: Long, profilePublicKey: String, - nostrRepository: com.it.curated.compose.repository.NostrRepository + nostrRepository: to.curare.compose.repository.NostrRepository ): ViewModelProvider.Factory = viewModelFactory { initializer { UnqueuedProfileSynchronizationViewModel( @@ -55,11 +55,11 @@ class UnqueuedProfileSynchronizationViewModel( delay(2_000) nostrRepository.queueSynchronizeNostrEvent( - com.it.curated.compose.nostr.Relays.DefaultDMRelayList.map { normalizedRelayUrl -> - com.it.curated.compose.database.model.SynchronizeNostrEventRequest( + to.curare.compose.nostr.Relays.DefaultDMRelayList.map { normalizedRelayUrl -> + to.curare.compose.database.model.SynchronizeNostrEventRequest( purpose = "sign-in", synchronizationFilters = arrayOf( - com.it.curated.compose.database.model.types.SynchronizationFilter( + to.curare.compose.database.model.types.SynchronizationFilter( authors = arrayOf(profilePublicKey), kinds = arrayOf( MetadataEvent.KIND, diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/WriteNewNoteViewModel.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/WriteNewNoteViewModel.kt similarity index 73% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/WriteNewNoteViewModel.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/WriteNewNoteViewModel.kt index 14761a71..75e495d3 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/WriteNewNoteViewModel.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/model/WriteNewNoteViewModel.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.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: com.it.curated.compose.ui.view.state.WriteNewNoteUIState, - val writeNewNoteFormState: com.it.curated.compose.ui.view.state.form.WriteNewNoteFormState = com.it.curated.compose.ui.view.state.form.WriteNewNoteFormState(), - val nostrRepository: com.it.curated.compose.repository.NostrRepository + 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 ): ViewModel() { companion object { private const val TAG = "WriteNewNoteViewModel" @@ -35,8 +35,8 @@ class WriteNewNoteViewModel( activeUserPublicKey: HexKey, replyToNostrEventId: HexKey?, quotedNostrEventId: HexKey?, - initialWriteNewNoteUIState: com.it.curated.compose.ui.view.state.WriteNewNoteUIState, - nostrRepository: com.it.curated.compose.repository.NostrRepository, + initialWriteNewNoteUIState: to.curare.compose.ui.view.state.WriteNewNoteUIState, + nostrRepository: to.curare.compose.repository.NostrRepository, ): ViewModelProvider.Factory = viewModelFactory { initializer { WriteNewNoteViewModel( @@ -54,13 +54,13 @@ class WriteNewNoteViewModel( val isActionPending: MutableState = mutableStateOf(false) - var writeNewNoteUIState: com.it.curated.compose.ui.view.state.WriteNewNoteUIState by mutableStateOf(initialWriteNewNoteUIState) + var writeNewNoteUIState: to.curare.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: com.it.curated.compose.database.model.Profile) { + fun addProfileToMentionedProfiles(profile: to.curare.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) { - com.it.curated.compose.ui.view.state.WriteNewNoteUIState.InputPrompt( + to.curare.compose.ui.view.state.WriteNewNoteUIState.InputPrompt( localProfile = profileWithFollowing, inReplyToNostrEvent = nostrEventBeingRepliedTo, quotedNostrEvent = nostrEventBeingQuoted ) } else { - com.it.curated.compose.ui.view.state.WriteNewNoteUIState.Error + to.curare.compose.ui.view.state.WriteNewNoteUIState.Error } } } } fun confirmNote( - localProfile: com.it.curated.compose.database.model.intermdiate.LocalProfileWithFollowing, - inReplyToNostrEvent: com.it.curated.compose.database.model.intermdiate.LocalNostrEvent?, - quotedNostrEvent: com.it.curated.compose.database.model.intermdiate.LocalNostrEvent? + localProfile: to.curare.compose.database.model.intermdiate.LocalProfileWithFollowing, + inReplyToNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent?, + quotedNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent? ) { validateInput().let { isInputValid -> if (isInputValid) { writeNewNoteUIState = - com.it.curated.compose.ui.view.state.WriteNewNoteUIState.ConfirmNote( + to.curare.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: com.it.curated.compose.database.model.intermdiate.LocalNostrEvent? = null, - quotedNostrEvent: com.it.curated.compose.database.model.intermdiate.LocalNostrEvent? = null, + inReplyToNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent? = null, + quotedNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent? = null, ) { logger.d { "createAccount" } isActionPending.value = true viewModelScope.launch(Dispatchers.IO) { - val mentionedPublicKeys = com.it.curated.compose.ui.composable.widgets.content.ContentParser.parse( + val mentionedPublicKeys = to.curare.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 = com.it.curated.compose.ui.view.state.WriteNewNoteUIState.Error + writeNewNoteUIState = to.curare.compose.ui.view.state.WriteNewNoteUIState.Error }, onSuccess = onNostrEventPublished ) diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ActiveProfileUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ActiveProfileUIState.kt similarity index 62% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ActiveProfileUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ActiveProfileUIState.kt index 606a77c4..ddbdf19a 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ActiveProfileUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ActiveProfileUIState.kt @@ -1,8 +1,8 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state sealed interface ActiveProfileUIState { data class Loaded( - val localNostrEvent: com.it.curated.compose.database.model.intermdiate.LocalNostrEvent + val localNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent ): ActiveProfileUIState data object Error: ActiveProfileUIState diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/AddArtifactUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddArtifactUIState.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/AddArtifactUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddArtifactUIState.kt index cac0ba03..1e6ffec5 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/AddArtifactUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddArtifactUIState.kt @@ -1,7 +1,7 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state -import com.it.curated.compose.database.model.MantraDialect -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom +import to.curare.compose.database.model.MantraDialect +import to.curare.compose.database.model.intermdiate.LocalChatRoom sealed interface AddArtifactUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/AddChapterUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddChapterUIState.kt similarity index 78% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/AddChapterUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddChapterUIState.kt index 58e7c85e..9c88be0a 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/AddChapterUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddChapterUIState.kt @@ -1,8 +1,8 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state -import com.it.curated.compose.database.model.MantraArtifact -import com.it.curated.compose.database.model.MantraArtifactVersion -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom +import to.curare.compose.database.model.MantraArtifact +import to.curare.compose.database.model.MantraArtifactVersion +import to.curare.compose.database.model.intermdiate.LocalChatRoom sealed interface AddChapterUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/AddDialectUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddDialectUIState.kt similarity index 81% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/AddDialectUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddDialectUIState.kt index fe7aa1c5..94372452 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/AddDialectUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddDialectUIState.kt @@ -1,6 +1,6 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom +import to.curare.compose.database.model.intermdiate.LocalChatRoom sealed interface AddDialectUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/AddGroupPostUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddGroupPostUIState.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/AddGroupPostUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddGroupPostUIState.kt index 63b22fbe..d53a0454 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/AddGroupPostUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddGroupPostUIState.kt @@ -1,7 +1,7 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.nostr.GroupNostrProfile +import to.curare.compose.database.model.intermdiate.LocalChatRoom +import to.curare.compose.nostr.GroupNostrProfile sealed interface AddGroupPostUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/AddMemberToChatRoomConfirmationUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddMemberToChatRoomConfirmationUIState.kt similarity index 64% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/AddMemberToChatRoomConfirmationUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddMemberToChatRoomConfirmationUIState.kt index bfddf48c..d013f15e 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/AddMemberToChatRoomConfirmationUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddMemberToChatRoomConfirmationUIState.kt @@ -1,8 +1,8 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state -import com.it.curated.compose.database.model.MarmotKeyPackage -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom +import to.curare.compose.database.model.MarmotKeyPackage +import to.curare.compose.database.model.Profile +import to.curare.compose.database.model.intermdiate.LocalChatRoom sealed interface AddMemberToChatRoomConfirmationUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/AddTranslationArtifactVersionUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddTranslationArtifactVersionUIState.kt similarity index 82% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/AddTranslationArtifactVersionUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddTranslationArtifactVersionUIState.kt index ffcf489b..94db5d1c 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/AddTranslationArtifactVersionUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/AddTranslationArtifactVersionUIState.kt @@ -1,10 +1,10 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state -import com.it.curated.compose.database.model.MantraArtifact -import com.it.curated.compose.database.model.MantraArtifactVersion -import com.it.curated.compose.database.model.MantraChapter -import com.it.curated.compose.database.model.MantraDialect -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom +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 sealed interface AddTranslationArtifactVersionUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ArtifactDetailUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ArtifactDetailUIState.kt similarity index 60% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ArtifactDetailUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ArtifactDetailUIState.kt index cfd2fc7e..7023d467 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ArtifactDetailUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ArtifactDetailUIState.kt @@ -1,9 +1,9 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state -import com.it.curated.compose.database.model.MantraArtifact -import com.it.curated.compose.database.model.MantraArtifactVersion -import com.it.curated.compose.database.model.MantraChapter -import com.it.curated.compose.database.model.MantraTranslationArtifactVersion +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 sealed interface ArtifactDetailUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ChapterDetailUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChapterDetailUIState.kt similarity index 65% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ChapterDetailUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChapterDetailUIState.kt index f10fd506..91f818db 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ChapterDetailUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChapterDetailUIState.kt @@ -1,7 +1,7 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state -import com.it.curated.compose.database.model.MantraChapter -import com.it.curated.compose.database.model.MantraChunk +import to.curare.compose.database.model.MantraChapter +import to.curare.compose.database.model.MantraChunk sealed interface ChapterDetailUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ChatMessageListUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChatMessageListUIState.kt similarity index 67% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ChatMessageListUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChatMessageListUIState.kt index fd12a2a0..aff772b6 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ChatMessageListUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChatMessageListUIState.kt @@ -1,6 +1,6 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state -import com.it.curated.compose.database.model.intermdiate.LocalChatMessage +import to.curare.compose.database.model.intermdiate.LocalChatMessage sealed interface ChatMessageListUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ChatRoomDetailUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChatRoomDetailUIState.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ChatRoomDetailUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChatRoomDetailUIState.kt index c55b9135..c985d6c3 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ChatRoomDetailUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChatRoomDetailUIState.kt @@ -1,15 +1,15 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state import com.vitorpamplona.quartz.nip01Core.core.HexKey -import com.it.curated.compose.database.model.GroupKeyState -import com.it.curated.compose.managers.SubgroupManager -import com.it.curated.compose.database.model.GroupSignedEvent -import com.it.curated.compose.database.model.MantraArtifact -import com.it.curated.compose.database.model.MantraDialect -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.nostr.GroupNostrProfile -import com.it.curated.compose.nostr.GroupPost -import com.it.curated.compose.nostr.GroupRelayList +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.MantraArtifact +import to.curare.compose.database.model.MantraDialect +import to.curare.compose.database.model.intermdiate.LocalChatRoom +import to.curare.compose.nostr.GroupNostrProfile +import to.curare.compose.nostr.GroupPost +import to.curare.compose.nostr.GroupRelayList sealed interface ChatRoomDetailUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ChatRoomListUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChatRoomListUIState.kt similarity index 56% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ChatRoomListUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChatRoomListUIState.kt index c24c2827..ea73d001 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ChatRoomListUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChatRoomListUIState.kt @@ -1,8 +1,8 @@ -package com.it.curated.compose.ui.view.state +package to.curare.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/com/it/curated/compose/ui/view/state/ChatRoomMessagingUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChatRoomMessagingUIState.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ChatRoomMessagingUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChatRoomMessagingUIState.kt index e24076be..f88dfe25 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ChatRoomMessagingUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ChatRoomMessagingUIState.kt @@ -1,6 +1,6 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom +import to.curare.compose.database.model.intermdiate.LocalChatRoom sealed interface ChatRoomMessagingUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/CreateProfileUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/CreateProfileUIState.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/CreateProfileUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/CreateProfileUIState.kt index dcba535f..952546f3 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/CreateProfileUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/CreateProfileUIState.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state abstract class CreateProfileUIState { data object Error: CreateProfileUIState() @@ -13,6 +13,6 @@ abstract class CreateProfileUIState { ) : CreateProfileUIState() data class ProfileReady( - val profile: com.it.curated.compose.database.model.Profile + val profile: to.curare.compose.database.model.Profile ) : CreateProfileUIState() } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/DkgRitualUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/DkgRitualUIState.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/DkgRitualUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/DkgRitualUIState.kt index b3244559..fcdb0e25 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/DkgRitualUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/DkgRitualUIState.kt @@ -1,14 +1,14 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state -import com.it.curated.compose.database.model.DkgSession -import com.it.curated.compose.database.model.FrostSigningSession -import com.it.curated.compose.database.model.GroupKeyState -import com.it.curated.compose.database.model.Participant -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.intermdiate.LocalParticipant -import com.it.curated.compose.database.model.types.DkgApprovalStep +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.vitorpamplona.quartz.nip01Core.core.HexKey -import com.it.curated.compose.managers.ChillDkgRitualManager +import to.curare.compose.managers.ChillDkgRitualManager sealed interface DkgRitualUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/EditGroupNostrProfileUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/EditGroupNostrProfileUIState.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/EditGroupNostrProfileUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/EditGroupNostrProfileUIState.kt index 2fa67dfe..49a370b2 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/EditGroupNostrProfileUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/EditGroupNostrProfileUIState.kt @@ -1,7 +1,7 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.nostr.GroupNostrProfile +import to.curare.compose.database.model.intermdiate.LocalChatRoom +import to.curare.compose.nostr.GroupNostrProfile sealed interface EditGroupNostrProfileUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/EditGroupRelaysUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/EditGroupRelaysUIState.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/EditGroupRelaysUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/EditGroupRelaysUIState.kt index 46855ca1..d0060792 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/EditGroupRelaysUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/EditGroupRelaysUIState.kt @@ -1,7 +1,7 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.nostr.GroupRelayList +import to.curare.compose.database.model.intermdiate.LocalChatRoom +import to.curare.compose.nostr.GroupRelayList sealed interface EditGroupRelaysUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/FeedListUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/FeedListUIState.kt similarity index 53% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/FeedListUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/FeedListUIState.kt index 3186ff0d..c18dfe53 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/FeedListUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/FeedListUIState.kt @@ -1,8 +1,8 @@ -package com.it.curated.compose.ui.view.state +package to.curare.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/com/it/curated/compose/ui/view/state/FollowersListUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/FollowersListUIState.kt similarity index 60% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/FollowersListUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/FollowersListUIState.kt index bc9fbd6e..e83763e4 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/FollowersListUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/FollowersListUIState.kt @@ -1,8 +1,8 @@ -package com.it.curated.compose.ui.view.state +package to.curare.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/com/it/curated/compose/ui/view/state/FollowingListUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/FollowingListUIState.kt similarity index 60% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/FollowingListUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/FollowingListUIState.kt index 114e09a1..5ea51e2d 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/FollowingListUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/FollowingListUIState.kt @@ -1,8 +1,8 @@ -package com.it.curated.compose.ui.view.state +package to.curare.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/com/it/curated/compose/ui/view/state/FrostSigningUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/FrostSigningUIState.kt similarity index 79% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/FrostSigningUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/FrostSigningUIState.kt index 9103ab04..b659281a 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/FrostSigningUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/FrostSigningUIState.kt @@ -1,9 +1,9 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state import com.vitorpamplona.quartz.nip01Core.core.HexKey -import com.it.curated.compose.database.model.FrostSigningItem -import com.it.curated.compose.database.model.FrostSigningSession -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom +import to.curare.compose.database.model.FrostSigningItem +import to.curare.compose.database.model.FrostSigningSession +import to.curare.compose.database.model.intermdiate.LocalChatRoom sealed interface FrostSigningUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/HomeScreenUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/HomeScreenUIState.kt similarity index 53% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/HomeScreenUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/HomeScreenUIState.kt index d023f097..536f24be 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/HomeScreenUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/HomeScreenUIState.kt @@ -1,9 +1,9 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state sealed interface HomeScreenUIState { data class Loaded( - val profileWithFollowing: com.it.curated.compose.database.model.intermdiate.LocalProfileWithFollowing + val profileWithFollowing: to.curare.compose.database.model.intermdiate.LocalProfileWithFollowing ): HomeScreenUIState data object Error: HomeScreenUIState diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/KeyPackageManagementUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/KeyPackageManagementUIState.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/KeyPackageManagementUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/KeyPackageManagementUIState.kt index 7d04648a..9687208d 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/KeyPackageManagementUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/KeyPackageManagementUIState.kt @@ -1,6 +1,6 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state -import com.it.curated.compose.database.model.MarmotKeyPackageBundle +import to.curare.compose.database.model.MarmotKeyPackageBundle sealed interface KeyPackageManagementUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/MetadataEventDetailUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/MetadataEventDetailUIState.kt similarity index 51% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/MetadataEventDetailUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/MetadataEventDetailUIState.kt index 2d2c44ef..dd2839c4 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/MetadataEventDetailUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/MetadataEventDetailUIState.kt @@ -1,11 +1,11 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state sealed interface MetadataEventDetailUIState { data class Loaded( val isActiveUser: Boolean, - val followingActiveUserConnection: com.it.curated.compose.database.model.Connection?, - val followedByActiveUserConnection: com.it.curated.compose.database.model.Connection?, + val followingActiveUserConnection: to.curare.compose.database.model.Connection?, + val followedByActiveUserConnection: to.curare.compose.database.model.Connection?, ): MetadataEventDetailUIState data object Error: MetadataEventDetailUIState diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/NavigationUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/NavigationUIState.kt similarity index 56% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/NavigationUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/NavigationUIState.kt index 493e4969..270e9e31 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/NavigationUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/NavigationUIState.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.state +package to.curare.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: com.it.curated.compose.database.model.UnsignedNostrEvent, + val unsignedNostrEvent: to.curare.compose.database.model.UnsignedNostrEvent, ) : NavigationUIState() data class UnsyncedProfile( - val unsignedNostrEvent: com.it.curated.compose.database.model.UnsignedNostrEvent, + val unsignedNostrEvent: to.curare.compose.database.model.UnsignedNostrEvent, ) : NavigationUIState() data class UnqueuedProfileSynchronization( - val unsignedNostrEvent: com.it.curated.compose.database.model.UnsignedNostrEvent, + val unsignedNostrEvent: to.curare.compose.database.model.UnsignedNostrEvent, ) : NavigationUIState() data class UnindexedProfile( - val nostrEvent: com.it.curated.compose.database.model.NostrEvent, + val nostrEvent: to.curare.compose.database.model.NostrEvent, ) : NavigationUIState() data class UnqueuedProfile( - val profile: com.it.curated.compose.database.model.Profile, + val profile: to.curare.compose.database.model.Profile, ) : NavigationUIState() data class UnannouncedProfile( - val broadcastNostrEventRequest: com.it.curated.compose.database.model.BroadcastNostrEventRequest, + val broadcastNostrEventRequest: to.curare.compose.database.model.BroadcastNostrEventRequest, ) : NavigationUIState() diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/NostrEventDetailUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/NostrEventDetailUIState.kt similarity index 63% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/NostrEventDetailUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/NostrEventDetailUIState.kt index e49841ef..be570a85 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/NostrEventDetailUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/NostrEventDetailUIState.kt @@ -1,8 +1,8 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state sealed interface NostrEventDetailUIState { data class Loaded( - val localNostrEvent: com.it.curated.compose.database.model.intermdiate.LocalNostrEvent + val localNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent ): NostrEventDetailUIState data object Error: NostrEventDetailUIState diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ProposalListUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ProposalListUIState.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ProposalListUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ProposalListUIState.kt index b5da922b..18af4659 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ProposalListUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ProposalListUIState.kt @@ -1,8 +1,8 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state -import com.it.curated.compose.database.model.FrostSigningSession -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.text.ProposedEvent +import to.curare.compose.database.model.FrostSigningSession +import to.curare.compose.database.model.intermdiate.LocalChatRoom +import to.curare.compose.text.ProposedEvent sealed interface ProposalListUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/RecoveryPhraseUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/RecoveryPhraseUIState.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/RecoveryPhraseUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/RecoveryPhraseUIState.kt index 23faece3..02bfa0bc 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/RecoveryPhraseUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/RecoveryPhraseUIState.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state /** * What the recovery phrase screen is showing. diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/SearchMemberToAddToChatRoomUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SearchMemberToAddToChatRoomUIState.kt similarity index 67% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/SearchMemberToAddToChatRoomUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SearchMemberToAddToChatRoomUIState.kt index 10ca9527..0dec6b79 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/SearchMemberToAddToChatRoomUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SearchMemberToAddToChatRoomUIState.kt @@ -1,7 +1,7 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom +import to.curare.compose.database.model.Profile +import to.curare.compose.database.model.intermdiate.LocalChatRoom sealed interface SearchMemberToAddToChatRoomUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/SearchResultListUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SearchResultListUIState.kt similarity index 57% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/SearchResultListUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SearchResultListUIState.kt index 8898f2eb..0da15e48 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/SearchResultListUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SearchResultListUIState.kt @@ -1,8 +1,8 @@ -package com.it.curated.compose.ui.view.state +package to.curare.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/com/it/curated/compose/ui/view/state/SearchUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SearchUIState.kt similarity index 58% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/SearchUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SearchUIState.kt index 75307fc4..4ccd5d06 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/SearchUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SearchUIState.kt @@ -1,8 +1,8 @@ -package com.it.curated.compose.ui.view.state +package to.curare.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/com/it/curated/compose/ui/view/state/SelectChatRoomMembersUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SelectChatRoomMembersUIState.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/SelectChatRoomMembersUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SelectChatRoomMembersUIState.kt index e25a7acb..7f1384fe 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/SelectChatRoomMembersUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SelectChatRoomMembersUIState.kt @@ -1,6 +1,6 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state -import com.it.curated.compose.database.model.Profile +import to.curare.compose.database.model.Profile sealed interface SelectChatRoomMembersUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/SelectChatRoomTypeUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SelectChatRoomTypeUIState.kt similarity index 77% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/SelectChatRoomTypeUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SelectChatRoomTypeUIState.kt index ee9de145..75540016 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/SelectChatRoomTypeUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SelectChatRoomTypeUIState.kt @@ -1,6 +1,6 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state -import com.it.curated.compose.database.model.Profile +import to.curare.compose.database.model.Profile sealed interface SelectChatRoomTypeUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/SelectSubgroupAdminsUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SelectSubgroupAdminsUIState.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/SelectSubgroupAdminsUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SelectSubgroupAdminsUIState.kt index 62b9c1ed..3741ffb3 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/SelectSubgroupAdminsUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SelectSubgroupAdminsUIState.kt @@ -1,8 +1,8 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state import com.vitorpamplona.quartz.nip01Core.core.HexKey -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.intermdiate.LocalParticipant +import to.curare.compose.database.model.intermdiate.LocalChatRoom +import to.curare.compose.database.model.intermdiate.LocalParticipant sealed interface SelectSubgroupAdminsUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ShareProfileUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ShareProfileUIState.kt similarity index 61% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ShareProfileUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ShareProfileUIState.kt index a5427259..efd2f20f 100755 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/ShareProfileUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/ShareProfileUIState.kt @@ -1,8 +1,8 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state sealed interface ShareProfileUIState { data class Loaded( - val localNostrEvent: com.it.curated.compose.database.model.intermdiate.LocalNostrEvent + val localNostrEvent: to.curare.compose.database.model.intermdiate.LocalNostrEvent ): ShareProfileUIState data object Error: ShareProfileUIState diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/SignInToProfileUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SignInToProfileUIState.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/SignInToProfileUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SignInToProfileUIState.kt index 2342bcab..45ec51aa 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/SignInToProfileUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SignInToProfileUIState.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/SovereignWalletUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SovereignWalletUIState.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/SovereignWalletUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SovereignWalletUIState.kt index cc9d5f1b..d4fe9202 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/SovereignWalletUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/SovereignWalletUIState.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state sealed interface SovereignWalletUIState { data object Uninitialized: SovereignWalletUIState diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/TranslateChunkUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/TranslateChunkUIState.kt similarity index 78% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/TranslateChunkUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/TranslateChunkUIState.kt index c66834d1..c466a1b2 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/TranslateChunkUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/TranslateChunkUIState.kt @@ -1,7 +1,7 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state -import com.it.curated.compose.database.model.MantraChunk -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom +import to.curare.compose.database.model.MantraChunk +import to.curare.compose.database.model.intermdiate.LocalChatRoom sealed interface TranslateChunkUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/TranslationArtifactVersionDetailUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/TranslationArtifactVersionDetailUIState.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/TranslationArtifactVersionDetailUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/TranslationArtifactVersionDetailUIState.kt index 8c668aa5..92600822 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/TranslationArtifactVersionDetailUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/TranslationArtifactVersionDetailUIState.kt @@ -1,9 +1,9 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state -import com.it.curated.compose.database.model.MantraChapter -import com.it.curated.compose.database.model.MantraTranslationArtifactVersion -import com.it.curated.compose.database.model.MantraTranslationChapter -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom +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 /** A translation chapter with how many of its chunks have been translated. */ data class TranslationChapterProgress( diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/TranslationChapterUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/TranslationChapterUIState.kt similarity index 81% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/TranslationChapterUIState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/TranslationChapterUIState.kt index 78fb0d6c..5d766290 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/TranslationChapterUIState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/TranslationChapterUIState.kt @@ -1,7 +1,7 @@ -package com.it.curated.compose.ui.view.state +package to.curare.compose.ui.view.state -import com.it.curated.compose.database.model.MantraChunk -import com.it.curated.compose.database.model.MantraTranslationChunk +import to.curare.compose.database.model.MantraChunk +import to.curare.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/WriteNewNoteUIState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/WriteNewNoteUIState.kt new file mode 100644 index 00000000..3f662004 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/WriteNewNoteUIState.kt @@ -0,0 +1,24 @@ +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/commonMain/kotlin/com/it/curated/compose/ui/view/state/form/ChatRoomCreationFormState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/ChatRoomCreationFormState.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/form/ChatRoomCreationFormState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/ChatRoomCreationFormState.kt index aa266ebd..ed8110f1 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/form/ChatRoomCreationFormState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/ChatRoomCreationFormState.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.state.form +package to.curare.compose.ui.view.state.form data class ChatRoomCreationFormState( val nameField: TextFieldForm = TextFieldForm(), diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/form/CreateProfileFormState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/CreateProfileFormState.kt similarity index 73% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/form/CreateProfileFormState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/CreateProfileFormState.kt index f5a2c747..45b7679d 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/form/CreateProfileFormState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/CreateProfileFormState.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.state.form +package to.curare.compose.ui.view.state.form data class CreateProfileFormState( val nameField: TextFieldForm = TextFieldForm(), diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/form/SignInToProfileFormState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/SignInToProfileFormState.kt similarity index 64% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/form/SignInToProfileFormState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/SignInToProfileFormState.kt index d14904d4..105e746b 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/form/SignInToProfileFormState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/SignInToProfileFormState.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.state.form +package to.curare.compose.ui.view.state.form data class SignInToProfileFormState( val textFieldForm: TextFieldForm = TextFieldForm(), diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/form/TextFieldForm.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/TextFieldForm.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/form/TextFieldForm.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/TextFieldForm.kt index 0b46513b..08489f30 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/form/TextFieldForm.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/TextFieldForm.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.state.form +package to.curare.compose.ui.view.state.form import androidx.compose.foundation.text.input.TextFieldState import androidx.compose.runtime.MutableState diff --git a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/form/WriteNewNoteFormState.kt b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/WriteNewNoteFormState.kt similarity index 64% rename from composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/form/WriteNewNoteFormState.kt rename to composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/WriteNewNoteFormState.kt index 6f220afa..d427e694 100644 --- a/composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/state/form/WriteNewNoteFormState.kt +++ b/composeApp/src/commonMain/kotlin/to/curare/compose/ui/view/state/form/WriteNewNoteFormState.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.state.form +package to.curare.compose.ui.view.state.form data class WriteNewNoteFormState( val textFieldForm: TextFieldForm = TextFieldForm(), diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/ComposeAppCommonTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/ComposeAppCommonTest.kt similarity index 82% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/ComposeAppCommonTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/ComposeAppCommonTest.kt index 22b27f47..d51d1ea9 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/ComposeAppCommonTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/ComposeAppCommonTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose +package to.curare.compose import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/database/model/ChatRoomMembershipWindowTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/ChatRoomMembershipWindowTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/database/model/ChatRoomMembershipWindowTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/database/model/ChatRoomMembershipWindowTest.kt index 6874c28d..99b276a9 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/database/model/ChatRoomMembershipWindowTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/ChatRoomMembershipWindowTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/database/model/GiftWrapMessageTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/GiftWrapMessageTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/database/model/GiftWrapMessageTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/database/model/GiftWrapMessageTest.kt index dbaf9bf9..af5f0b44 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/database/model/GiftWrapMessageTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/GiftWrapMessageTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import com.vitorpamplona.quartz.nip01Core.core.toHexKey import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/database/model/MarmotChatLineReconciliationTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/MarmotChatLineReconciliationTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/database/model/MarmotChatLineReconciliationTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/database/model/MarmotChatLineReconciliationTest.kt index b9564a4e..17beb812 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/database/model/MarmotChatLineReconciliationTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/MarmotChatLineReconciliationTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/database/model/MarmotCommitResultMappingTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/MarmotCommitResultMappingTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/database/model/MarmotCommitResultMappingTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/database/model/MarmotCommitResultMappingTest.kt index 76e2d88c..203177fa 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/database/model/MarmotCommitResultMappingTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/MarmotCommitResultMappingTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import com.vitorpamplona.quartz.marmot.mls.messages.CommitResult import kotlin.test.Test diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/database/model/MarmotGroupEventRoomFilterTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/MarmotGroupEventRoomFilterTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/database/model/MarmotGroupEventRoomFilterTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/database/model/MarmotGroupEventRoomFilterTest.kt index c7e5f467..7ec2d772 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/database/model/MarmotGroupEventRoomFilterTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/MarmotGroupEventRoomFilterTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/database/model/RumorIdAgreementTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/RumorIdAgreementTest.kt similarity index 91% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/database/model/RumorIdAgreementTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/database/model/RumorIdAgreementTest.kt index db94d8da..168344be 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/database/model/RumorIdAgreementTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/RumorIdAgreementTest.kt @@ -1,18 +1,18 @@ -package com.it.curated.compose.database.model +package to.curare.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 com.it.curated.compose.nostr.nip30303.ArtifactEvent -import com.it.curated.compose.nostr.nip30303.ArtifactVersionEvent -import com.it.curated.compose.nostr.nip30303.ChapterEvent -import com.it.curated.compose.nostr.nip30303.ChunkEvent -import com.it.curated.compose.nostr.nip30303.DialectEvent -import com.it.curated.compose.nostr.nip30303.SubmissionEvent -import com.it.curated.compose.nostr.nip30303.TranslationArtifactVersionEvent -import com.it.curated.compose.nostr.nip30303.tags.ArtifactIdTag +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 /** * The row on disk and the payload on the wire have to be the same event. diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/database/model/TranscriptRequestStateTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/TranscriptRequestStateTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/database/model/TranscriptRequestStateTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/database/model/TranscriptRequestStateTest.kt index af3a9653..399e7359 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/database/model/TranscriptRequestStateTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/TranscriptRequestStateTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.model +package to.curare.compose.database.model import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/database/model/intermdiate/ChatRoomLastMessagePreviewTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/intermdiate/ChatRoomLastMessagePreviewTest.kt similarity index 96% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/database/model/intermdiate/ChatRoomLastMessagePreviewTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/database/model/intermdiate/ChatRoomLastMessagePreviewTest.kt index 4b8a21de..34496259 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/database/model/intermdiate/ChatRoomLastMessagePreviewTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/database/model/intermdiate/ChatRoomLastMessagePreviewTest.kt @@ -1,9 +1,9 @@ -package com.it.curated.compose.database.model.intermdiate +package to.curare.compose.database.model.intermdiate -import com.it.curated.compose.database.model.ChatMessage -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.Participant -import com.it.curated.compose.database.model.Profile +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 kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNull diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/database/query/NostrEventFilterQueryTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/database/query/NostrEventFilterQueryTest.kt similarity index 97% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/database/query/NostrEventFilterQueryTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/database/query/NostrEventFilterQueryTest.kt index 3a6dc77a..cabb3d42 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/database/query/NostrEventFilterQueryTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/database/query/NostrEventFilterQueryTest.kt @@ -1,7 +1,7 @@ -package com.it.curated.compose.database.query +package to.curare.compose.database.query import androidx.sqlite.SQLiteStatement -import com.it.curated.compose.database.model.types.SynchronizationFilter +import to.curare.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 = "curated")) + val query = NostrEventFilterQuery.build(SynchronizationFilter(search = "curare")) assertEquals( "SELECT * FROM NostrEvent WHERE content LIKE '%' || ? || '%' ORDER BY createdAt DESC, id DESC", query.sql, ) - assertEquals(listOf("curated"), query.boundValues()) + assertEquals(listOf("curare"), query.boundValues()) } private fun androidx.room3.RoomRawQuery.boundValues(): List = diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/extensions/ChatListTimestampTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/extensions/ChatListTimestampTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/extensions/ChatListTimestampTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/extensions/ChatListTimestampTest.kt index 9b2bb00b..0c3b0c34 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/extensions/ChatListTimestampTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/extensions/ChatListTimestampTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.extensions +package to.curare.compose.extensions import kotlinx.datetime.TimeZone import kotlinx.datetime.atStartOfDayIn diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/ChillDkgRitualOrderingTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/ChillDkgRitualOrderingTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/ChillDkgRitualOrderingTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/managers/ChillDkgRitualOrderingTest.kt index b8f86b16..ea4c9f12 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/ChillDkgRitualOrderingTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/ChillDkgRitualOrderingTest.kt @@ -1,6 +1,6 @@ -package com.it.curated.compose.managers +package to.curare.compose.managers -import com.it.curated.compose.extensions.toHex +import to.curare.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/com/it/curated/compose/managers/FrostSigningRoundTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/FrostSigningRoundTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/FrostSigningRoundTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/managers/FrostSigningRoundTest.kt index 30fa93d2..c68f2bb0 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/FrostSigningRoundTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/FrostSigningRoundTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.managers +package to.curare.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 com.it.curated.compose.database.model.DkgSession -import com.it.curated.compose.database.model.FrostSigningItem -import com.it.curated.compose.database.model.FrostSigningSession -import com.it.curated.compose.database.model.types.FrostSigningStage -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.nostr.frost.FrostSigningEvents +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 /** * The two rounds a signing session runs, against real FROST. diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/GroupKeyStateTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/GroupKeyStateTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/GroupKeyStateTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/managers/GroupKeyStateTest.kt index 4daeb4d9..74400052 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/GroupKeyStateTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/GroupKeyStateTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.managers +package to.curare.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 com.it.curated.compose.database.model.FrostSigningItem -import com.it.curated.compose.database.model.GroupKeyState -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.nostr.frost.GroupKeyStateEvent -import com.it.curated.compose.nostr.subgroup.SubgroupBirthCertificateEvent -import com.it.curated.compose.nostr.subgroup.SubgroupParentage -import com.it.curated.compose.nostr.nip30303.ArtifactEvent -import com.it.curated.compose.nostr.nip30303.ChapterEvent -import com.it.curated.compose.nostr.nip30303.DialectEvent +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 /** * What a room's key state is allowed to convince a member of. diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/LiveInstanceCacheTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/LiveInstanceCacheTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/LiveInstanceCacheTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/managers/LiveInstanceCacheTest.kt index 519a05ee..9df4acb8 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/LiveInstanceCacheTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/LiveInstanceCacheTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.managers +package to.curare.compose.managers import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/LiveSubscriptionPlanTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/LiveSubscriptionPlanTest.kt similarity index 84% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/LiveSubscriptionPlanTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/managers/LiveSubscriptionPlanTest.kt index fbd9bd07..6301b000 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/LiveSubscriptionPlanTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/LiveSubscriptionPlanTest.kt @@ -1,20 +1,20 @@ -package com.it.curated.compose.managers +package to.curare.compose.managers import com.vitorpamplona.quartz.marmot.mip03GroupMessages.GroupEvent import com.vitorpamplona.quartz.nip59Giftwrap.wraps.GiftWrapEvent -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.managers.LiveSubscriptionManager.Companion.GIFT_WRAP_SUB_ID -import com.it.curated.compose.managers.LiveSubscriptionManager.Companion.GROUP_SUB_ID_PREFIX -import com.it.curated.compose.managers.LiveSubscriptionManager.Companion.giftWrapFilter -import com.it.curated.compose.managers.LiveSubscriptionManager.Companion.groupChunks -import com.it.curated.compose.managers.LiveSubscriptionManager.Companion.groupFilter -import com.it.curated.compose.managers.LiveSubscriptionManager.Companion.groupIdsFrom -import com.it.curated.compose.managers.LiveSubscriptionManager.Companion.groupSubId -import com.it.curated.compose.managers.LiveSubscriptionManager.Companion.subscriptionIndex -import com.it.curated.compose.managers.LiveSubscriptionManager.Companion.subscriptionKey -import com.it.curated.compose.network.sockets.NostrIncomingMessage -import com.it.curated.compose.network.sockets.endsLiveSubscription +import to.curare.compose.database.model.ChatRoom +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 kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/LiveSubscriptionReconcileTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/LiveSubscriptionReconcileTest.kt similarity index 95% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/LiveSubscriptionReconcileTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/managers/LiveSubscriptionReconcileTest.kt index 8d0ac55f..d79bd9a0 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/LiveSubscriptionReconcileTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/LiveSubscriptionReconcileTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.managers +package to.curare.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 com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.NegentropySynchronizeRequest -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.managers.LiveSubscriptionManager.Companion.GIFT_WRAP_SUB_ID -import com.it.curated.compose.managers.LiveSubscriptionManager.Companion.groupSubId -import com.it.curated.compose.network.relays.LiveSubscriptionTransport -import com.it.curated.compose.network.sockets.NostrIncomingMessage -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.NostrRepository +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 kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/MarmotGroupNameTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/MarmotGroupNameTest.kt similarity index 97% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/MarmotGroupNameTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/managers/MarmotGroupNameTest.kt index ac711f4c..28fecf89 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/MarmotGroupNameTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/MarmotGroupNameTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.managers +package to.curare.compose.managers import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/MarmotMip03CarveOutTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/MarmotMip03CarveOutTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/MarmotMip03CarveOutTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/managers/MarmotMip03CarveOutTest.kt index e00371a7..4d0de745 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/MarmotMip03CarveOutTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/MarmotMip03CarveOutTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.managers +package to.curare.compose.managers import com.vitorpamplona.quartz.nip59Giftwrap.wraps.GiftWrapEvent import com.vitorpamplona.quartz.nip17Dm.messages.ChatMessageEvent diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/MarmotReindexSweepTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/MarmotReindexSweepTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/MarmotReindexSweepTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/managers/MarmotReindexSweepTest.kt index 8c49369b..e3f20463 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/MarmotReindexSweepTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/MarmotReindexSweepTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.managers +package to.curare.compose.managers import kotlinx.coroutines.test.runTest import kotlin.test.Test diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/SharedKeyDerivationTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/SharedKeyDerivationTest.kt similarity index 97% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/SharedKeyDerivationTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/managers/SharedKeyDerivationTest.kt index 40a500a6..12363402 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/SharedKeyDerivationTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/SharedKeyDerivationTest.kt @@ -1,6 +1,6 @@ -package com.it.curated.compose.managers +package to.curare.compose.managers -import com.it.curated.compose.extensions.toHex +import to.curare.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 com.it.curated.compose.database.model.FrostSigningSession +import to.curare.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/com/it/curated/compose/managers/SignedArtifactTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/SignedArtifactTest.kt similarity index 96% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/SignedArtifactTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/managers/SignedArtifactTest.kt index eb80d6f5..e0ee7076 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/SignedArtifactTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/SignedArtifactTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.managers +package to.curare.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 com.it.curated.compose.database.model.FrostSigningItem -import com.it.curated.compose.database.model.MantraArtifact -import com.it.curated.compose.database.model.MantraArtifactVersion -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.nostr.nip30303.ArtifactEvent -import com.it.curated.compose.nostr.nip30303.ArtifactVersionEvent +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 /** * An artifact the group signed, from proposal to rows, against real FROST. diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/SignedChapterTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/SignedChapterTest.kt similarity index 97% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/SignedChapterTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/managers/SignedChapterTest.kt index cf3b7a95..8903b84c 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/SignedChapterTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/SignedChapterTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.managers +package to.curare.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 com.it.curated.compose.database.model.FrostSigningItem -import com.it.curated.compose.database.model.MantraChapter -import com.it.curated.compose.database.model.MantraChunk -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.nostr.nip30303.ChapterEvent -import com.it.curated.compose.nostr.nip30303.ChunkEvent +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 /** * A chapter and its chunks the group signed, from proposal to rows, against diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/TranslationScaffoldTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/TranslationScaffoldTest.kt similarity index 93% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/TranslationScaffoldTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/managers/TranslationScaffoldTest.kt index ed2ec417..7fcc3526 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/managers/TranslationScaffoldTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/managers/TranslationScaffoldTest.kt @@ -1,14 +1,14 @@ -package com.it.curated.compose.managers +package to.curare.compose.managers import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue -import com.it.curated.compose.database.model.MantraChapter -import com.it.curated.compose.database.model.MantraTranslationChapter -import com.it.curated.compose.nostr.nip30303.TranslationChapterEvent -import com.it.curated.compose.nostr.nip30303.tags.ChapterIdTag -import com.it.curated.compose.nostr.nip30303.tags.IndexTag -import com.it.curated.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag +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 /** * The join between a translation and the chapters it is of, as a pure function. diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/network/relays/RelayBackPressureTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/network/relays/RelayBackPressureTest.kt similarity index 97% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/network/relays/RelayBackPressureTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/network/relays/RelayBackPressureTest.kt index 7697911f..c65dc40c 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/network/relays/RelayBackPressureTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/network/relays/RelayBackPressureTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.network.relays +package to.curare.compose.network.relays import kotlin.test.Test import kotlin.test.assertFalse diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/network/relays/RelayPoolSubscriptionTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/network/relays/RelayPoolSubscriptionTest.kt similarity index 96% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/network/relays/RelayPoolSubscriptionTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/network/relays/RelayPoolSubscriptionTest.kt index 4a4108d8..afb11f48 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/network/relays/RelayPoolSubscriptionTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/network/relays/RelayPoolSubscriptionTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.network.relays +package to.curare.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 com.it.curated.compose.network.dto.RelayDTO -import com.it.curated.compose.network.sockets.NostrIncomingMessage -import com.it.curated.compose.network.sockets.NostrSocketClient -import com.it.curated.compose.network.sockets.NostrSocketClientFactory -import com.it.curated.compose.network.sockets.SocketConnectionClosedCallback -import com.it.curated.compose.network.sockets.SocketConnectionOpenedCallback -import com.it.curated.compose.network.sockets.SocketConnectionReopenedCallback -import com.it.curated.compose.repository.CachingImportRepository +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 kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/network/sockets/ReconnectBackoffTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/network/sockets/ReconnectBackoffTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/network/sockets/ReconnectBackoffTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/network/sockets/ReconnectBackoffTest.kt index f984af82..b1793f2d 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/network/sockets/ReconnectBackoffTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/network/sockets/ReconnectBackoffTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.network.sockets +package to.curare.compose.network.sockets import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/GroupNostrProfileTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupNostrProfileTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/GroupNostrProfileTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupNostrProfileTest.kt index b2f1455f..51f76940 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/GroupNostrProfileTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupNostrProfileTest.kt @@ -1,8 +1,8 @@ -package com.it.curated.compose.nostr +package to.curare.compose.nostr -import com.it.curated.compose.database.model.GroupSignedEvent -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.managers.SharedKeyDerivation +import to.curare.compose.database.model.GroupSignedEvent +import to.curare.compose.extensions.toHex +import to.curare.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/com/it/curated/compose/nostr/GroupPostTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupPostTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/GroupPostTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupPostTest.kt index b290928e..e69b7d9c 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/GroupPostTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupPostTest.kt @@ -1,8 +1,8 @@ -package com.it.curated.compose.nostr +package to.curare.compose.nostr -import com.it.curated.compose.database.model.GroupSignedEvent -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.managers.SharedKeyDerivation +import to.curare.compose.database.model.GroupSignedEvent +import to.curare.compose.extensions.toHex +import to.curare.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/com/it/curated/compose/nostr/GroupRelayListTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupRelayListTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/GroupRelayListTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupRelayListTest.kt index 3cdef983..07cfdb1c 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/GroupRelayListTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/GroupRelayListTest.kt @@ -1,8 +1,8 @@ -package com.it.curated.compose.nostr +package to.curare.compose.nostr -import com.it.curated.compose.database.model.GroupSignedEvent -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.managers.SharedKeyDerivation +import to.curare.compose.database.model.GroupSignedEvent +import to.curare.compose.extensions.toHex +import to.curare.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/com/it/curated/compose/nostr/MarmotDeliveryTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MarmotDeliveryTest.kt similarity index 97% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/MarmotDeliveryTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MarmotDeliveryTest.kt index 2f28bbc1..e3d5dce5 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/MarmotDeliveryTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MarmotDeliveryTest.kt @@ -1,6 +1,6 @@ -package com.it.curated.compose.nostr +package to.curare.compose.nostr -import com.it.curated.compose.database.model.ChatMessage +import to.curare.compose.database.model.ChatMessage import kotlin.test.Test import kotlin.test.assertContentEquals import kotlin.test.assertEquals diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/MarmotDirectMessageDeliveryTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MarmotDirectMessageDeliveryTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/MarmotDirectMessageDeliveryTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MarmotDirectMessageDeliveryTest.kt index e7657531..47a8ed51 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/MarmotDirectMessageDeliveryTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MarmotDirectMessageDeliveryTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr +package to.curare.compose.nostr import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.toHexKey diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/MarmotDirectMessageTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MarmotDirectMessageTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/MarmotDirectMessageTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MarmotDirectMessageTest.kt index 0930acfd..01d1fe3b 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/MarmotDirectMessageTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MarmotDirectMessageTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr +package to.curare.compose.nostr import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.firstTagValue diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/MemberProfileSyncTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MemberProfileSyncTest.kt similarity index 93% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/MemberProfileSyncTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MemberProfileSyncTest.kt index 728f2b42..474df567 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/MemberProfileSyncTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/MemberProfileSyncTest.kt @@ -1,13 +1,13 @@ -package com.it.curated.compose.nostr +package to.curare.compose.nostr import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent -import com.it.curated.compose.database.GENESIS_AT -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.Participant -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.intermdiate.LocalParticipant +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 kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/Nip17FiltersTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/Nip17FiltersTest.kt similarity index 95% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/Nip17FiltersTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/nostr/Nip17FiltersTest.kt index 16c7a5a2..f5342cb2 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/Nip17FiltersTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/Nip17FiltersTest.kt @@ -1,7 +1,7 @@ -package com.it.curated.compose.nostr +package to.curare.compose.nostr -import com.it.curated.compose.database.query.NostrEventFilterQuery -import com.it.curated.compose.network.serialization.encodeToJsonString +import to.curare.compose.database.query.NostrEventFilterQuery +import to.curare.compose.network.serialization.encodeToJsonString import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNull diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/chronicle/ChronicleEventTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/chronicle/ChronicleEventTest.kt similarity index 93% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/chronicle/ChronicleEventTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/nostr/chronicle/ChronicleEventTest.kt index 0c4537df..53c28523 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/chronicle/ChronicleEventTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/chronicle/ChronicleEventTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.chronicle +package to.curare.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 com.it.curated.compose.nostr.chronicle.tags.ChronicleIdTag -import com.it.curated.compose.nostr.chronicle.tags.ChroniclePageTag -import com.it.curated.compose.nostr.chronicle.tags.ChronicleRecipientTag -import com.it.curated.compose.nostr.frost.FrostSigningEvents -import com.it.curated.compose.nostr.frost.GroupKeyStateEvent -import com.it.curated.compose.nostr.subgroup.SubgroupBirthCertificateEvent -import com.it.curated.compose.nostr.nip30303.ArtifactEvent -import com.it.curated.compose.nostr.nip30303.ArtifactVersionEvent -import com.it.curated.compose.nostr.nip30303.ChapterEvent -import com.it.curated.compose.nostr.nip30303.ChunkEvent -import com.it.curated.compose.nostr.nip30303.DialectEvent -import com.it.curated.compose.nostr.nip30303.SubmissionEvent -import com.it.curated.compose.nostr.nip30303.TranslationArtifactVersionContributorListEvent -import com.it.curated.compose.nostr.nip30303.TranslationArtifactVersionEvent -import com.it.curated.compose.nostr.nip30303.TranslationChapterContributorListEvent -import com.it.curated.compose.nostr.nip30303.TranslationChapterEvent -import com.it.curated.compose.nostr.nip30303.TranslationChunkEvent -import com.it.curated.compose.nostr.nip30303.TranslationContributorListEvent -import com.it.curated.compose.nostr.nip30303.TranslationEvent +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 /** * The envelope a chronicle travels in: what it carries, what it refuses, and the diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/chronicle/ChronicleRoundTripTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/chronicle/ChronicleRoundTripTest.kt similarity index 92% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/chronicle/ChronicleRoundTripTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/nostr/chronicle/ChronicleRoundTripTest.kt index 58aa1e29..878d7899 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/chronicle/ChronicleRoundTripTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/chronicle/ChronicleRoundTripTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.chronicle +package to.curare.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 com.it.curated.compose.database.model.MantraArtifact -import com.it.curated.compose.database.model.MantraArtifactVersion -import com.it.curated.compose.database.model.MantraChapter -import com.it.curated.compose.database.model.MantraChunk -import com.it.curated.compose.database.model.MantraDialect -import com.it.curated.compose.database.model.MantraTranslationArtifactVersion -import com.it.curated.compose.database.model.MantraTranslationChapter -import com.it.curated.compose.database.model.MantraTranslationChunk -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.managers.SharedKeyDerivation -import com.it.curated.compose.nostr.frost.GroupKeyStateEvent -import com.it.curated.compose.nostr.nip30303.ArtifactEvent -import com.it.curated.compose.nostr.nip30303.ArtifactVersionEvent -import com.it.curated.compose.nostr.nip30303.ChapterEvent -import com.it.curated.compose.nostr.nip30303.ChunkEvent -import com.it.curated.compose.nostr.nip30303.DialectEvent -import com.it.curated.compose.nostr.nip30303.TranslationArtifactVersionEvent -import com.it.curated.compose.nostr.nip30303.TranslationChapterEvent -import com.it.curated.compose.nostr.nip30303.TranslationChunkEvent +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 /** * The assumption the chronicle's *fallback* rests on: a row can be turned back diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/frost/FrostProposalCodecTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/frost/FrostProposalCodecTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/frost/FrostProposalCodecTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/nostr/frost/FrostProposalCodecTest.kt index e5668ee6..bbc2afe0 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/frost/FrostProposalCodecTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/frost/FrostProposalCodecTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.frost +package to.curare.compose.nostr.frost import com.vitorpamplona.quartz.nip01Core.core.Event import kotlin.test.Test diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/nip30303/ArtifactEventTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/nip30303/ArtifactEventTest.kt similarity index 97% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/nip30303/ArtifactEventTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/nostr/nip30303/ArtifactEventTest.kt index be5130f8..c494aaa0 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/nip30303/ArtifactEventTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/nip30303/ArtifactEventTest.kt @@ -1,11 +1,11 @@ -package com.it.curated.compose.nostr.nip30303 +package to.curare.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 com.it.curated.compose.nostr.nip30303.tags.ArtifactVersionMetadataTag +import to.curare.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/com/it/curated/compose/nostr/nip30303/ChapterChunkSplitTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/nip30303/ChapterChunkSplitTest.kt similarity index 97% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/nip30303/ChapterChunkSplitTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/nostr/nip30303/ChapterChunkSplitTest.kt index c8f6b70b..921541f2 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/nip30303/ChapterChunkSplitTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/nip30303/ChapterChunkSplitTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303 +package to.curare.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 com.it.curated.compose.nostr.nip30303.tags.OriginalTextTag -import com.it.curated.compose.text.Markdown +import to.curare.compose.nostr.nip30303.tags.OriginalTextTag +import to.curare.compose.text.Markdown /** * The chunks a chapter is proposed with are cut from the chapter itself. diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/nip30303/InitialArtifactVersionTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/nip30303/InitialArtifactVersionTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/nip30303/InitialArtifactVersionTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/nostr/nip30303/InitialArtifactVersionTest.kt index aa234936..c0e6f5b7 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/nip30303/InitialArtifactVersionTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/nip30303/InitialArtifactVersionTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303 +package to.curare.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 com.it.curated.compose.nostr.nip30303.tags.ArtifactVersionMetadataTag +import to.curare.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/com/it/curated/compose/nostr/nip30303/SubmissionEventTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/nip30303/SubmissionEventTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/nip30303/SubmissionEventTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/nostr/nip30303/SubmissionEventTest.kt index 5de825f3..bb70781d 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/nip30303/SubmissionEventTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/nip30303/SubmissionEventTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.nip30303 +package to.curare.compose.nostr.nip30303 import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.crypto.EventHasher diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/subgroup/SubgroupBirthCertificateEventTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/subgroup/SubgroupBirthCertificateEventTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/subgroup/SubgroupBirthCertificateEventTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/nostr/subgroup/SubgroupBirthCertificateEventTest.kt index caf864d9..01bf1b07 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/subgroup/SubgroupBirthCertificateEventTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/nostr/subgroup/SubgroupBirthCertificateEventTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.nostr.subgroup +package to.curare.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 com.it.curated.compose.extensions.toHex -import com.it.curated.compose.managers.SharedKeyDerivation +import to.curare.compose.extensions.toHex +import to.curare.compose.managers.SharedKeyDerivation /** * What a birth certificate is allowed to convince a member of. diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/ui/composable/navigation/NavigationSuiteTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/ui/composable/navigation/NavigationSuiteTest.kt similarity index 92% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/ui/composable/navigation/NavigationSuiteTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/ui/composable/navigation/NavigationSuiteTest.kt index df65b5de..ef680270 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/ui/composable/navigation/NavigationSuiteTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/ui/composable/navigation/NavigationSuiteTest.kt @@ -1,11 +1,11 @@ -package com.it.curated.compose.ui.composable.navigation +package to.curare.compose.ui.composable.navigation import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteType -import com.it.curated.compose.ui.composable.navigation.routes.ActiveProfileRoute -import com.it.curated.compose.ui.composable.navigation.routes.HomeRoute -import com.it.curated.compose.ui.composable.navigation.routes.SearchRoute -import com.it.curated.compose.ui.theme.Breakpoint +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 kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNull diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/ui/theme/AppColorSchemeSelectionTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/AppColorSchemeSelectionTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/ui/theme/AppColorSchemeSelectionTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/AppColorSchemeSelectionTest.kt index 9bdd2ab2..c1cb6f14 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/ui/theme/AppColorSchemeSelectionTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/AppColorSchemeSelectionTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.theme +package to.curare.compose.ui.theme import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/ui/theme/BreakpointTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/BreakpointTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/ui/theme/BreakpointTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/BreakpointTest.kt index 9ed3aeb9..90315ea5 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/ui/theme/BreakpointTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/BreakpointTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.theme +package to.curare.compose.ui.theme import androidx.compose.ui.unit.dp import kotlin.test.Test diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/ui/theme/ColorSchemeContrastTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/ColorSchemeContrastTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/ui/theme/ColorSchemeContrastTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/ColorSchemeContrastTest.kt index 797ff745..fd425310 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/ui/theme/ColorSchemeContrastTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/ColorSchemeContrastTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.theme +package to.curare.compose.ui.theme import androidx.compose.material3.ColorScheme import androidx.compose.ui.graphics.Color diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/ui/theme/PanesTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/PanesTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/ui/theme/PanesTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/PanesTest.kt index d53bf5e5..17ffbbb4 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/ui/theme/PanesTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/PanesTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.theme +package to.curare.compose.ui.theme import androidx.compose.ui.unit.dp import kotlin.test.Test diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/ui/theme/ReadableMeasureTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/ReadableMeasureTest.kt similarity index 98% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/ui/theme/ReadableMeasureTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/ReadableMeasureTest.kt index 2203d039..de6146f0 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/ui/theme/ReadableMeasureTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/ReadableMeasureTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.theme +package to.curare.compose.ui.theme import androidx.compose.ui.unit.dp import kotlin.test.Test diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/ui/theme/SpacingScaleTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/SpacingScaleTest.kt similarity index 99% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/ui/theme/SpacingScaleTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/SpacingScaleTest.kt index e6a632b2..9c054cbc 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/ui/theme/SpacingScaleTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/ui/theme/SpacingScaleTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.theme +package to.curare.compose.ui.theme import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp diff --git a/composeApp/src/commonTest/kotlin/com/it/curated/compose/ui/view/model/NavigationRoutingTest.kt b/composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/model/NavigationRoutingTest.kt similarity index 93% rename from composeApp/src/commonTest/kotlin/com/it/curated/compose/ui/view/model/NavigationRoutingTest.kt rename to composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/model/NavigationRoutingTest.kt index debeaee9..9b41c32f 100644 --- a/composeApp/src/commonTest/kotlin/com/it/curated/compose/ui/view/model/NavigationRoutingTest.kt +++ b/composeApp/src/commonTest/kotlin/to/curare/compose/ui/view/model/NavigationRoutingTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.view.model +package to.curare.compose.ui.view.model import com.vitorpamplona.quartz.nip01Core.core.HexKey import fr.acinq.phoenix.data.ActiveWallet @@ -9,12 +9,12 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.test.runTest -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.UnsignedNostrEvent -import com.it.curated.compose.database.model.intermdiate.LocalAccount -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.ui.composable.navigation.routes.SovereignWalletStartupRoute -import com.it.curated.compose.ui.view.state.NavigationUIState +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 kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotEquals diff --git a/composeApp/src/iosMain/kotlin/com/it/curated/compose/PlatformContext.ios.kt b/composeApp/src/iosMain/kotlin/com/it/curated/compose/PlatformContext.ios.kt deleted file mode 100644 index c200e968..00000000 --- a/composeApp/src/iosMain/kotlin/com/it/curated/compose/PlatformContext.ios.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.it.curated.compose - -actual class PlatformContext \ No newline at end of file diff --git a/composeApp/src/iosMain/kotlin/com/it/curated/compose/AppVersion.ios.kt b/composeApp/src/iosMain/kotlin/to/curare/compose/AppVersion.ios.kt similarity index 92% rename from composeApp/src/iosMain/kotlin/com/it/curated/compose/AppVersion.ios.kt rename to composeApp/src/iosMain/kotlin/to/curare/compose/AppVersion.ios.kt index 59e5c415..e71b2fb8 100644 --- a/composeApp/src/iosMain/kotlin/com/it/curated/compose/AppVersion.ios.kt +++ b/composeApp/src/iosMain/kotlin/to/curare/compose/AppVersion.ios.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose +package to.curare.compose import platform.Foundation.NSBundle diff --git a/composeApp/src/iosMain/kotlin/com/it/curated/compose/MainViewController.kt b/composeApp/src/iosMain/kotlin/to/curare/compose/MainViewController.kt similarity index 84% rename from composeApp/src/iosMain/kotlin/com/it/curated/compose/MainViewController.kt rename to composeApp/src/iosMain/kotlin/to/curare/compose/MainViewController.kt index 8de4a61e..a214ccda 100644 --- a/composeApp/src/iosMain/kotlin/com/it/curated/compose/MainViewController.kt +++ b/composeApp/src/iosMain/kotlin/to/curare/compose/MainViewController.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose +package to.curare.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() - CuratedApp( + CurareApp( navController = navController, - curatedGlobal = CuratedGlobal( + curareGlobal = CurareGlobal( platformContext = PlatformContext() ), phoenixGlobal = PhoenixGlobal( diff --git a/composeApp/src/iosMain/kotlin/com/it/curated/compose/Platform.ios.kt b/composeApp/src/iosMain/kotlin/to/curare/compose/Platform.ios.kt similarity index 72% rename from composeApp/src/iosMain/kotlin/com/it/curated/compose/Platform.ios.kt rename to composeApp/src/iosMain/kotlin/to/curare/compose/Platform.ios.kt index 9925fdc4..96998d3c 100644 --- a/composeApp/src/iosMain/kotlin/com/it/curated/compose/Platform.ios.kt +++ b/composeApp/src/iosMain/kotlin/to/curare/compose/Platform.ios.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose +package to.curare.compose import platform.UIKit.UIDevice import kotlin.native.Platform diff --git a/composeApp/src/iosMain/kotlin/to/curare/compose/PlatformContext.ios.kt b/composeApp/src/iosMain/kotlin/to/curare/compose/PlatformContext.ios.kt new file mode 100644 index 00000000..a78759ed --- /dev/null +++ b/composeApp/src/iosMain/kotlin/to/curare/compose/PlatformContext.ios.kt @@ -0,0 +1,3 @@ +package to.curare.compose + +actual class PlatformContext \ No newline at end of file diff --git a/composeApp/src/iosMain/kotlin/com/it/curated/compose/database/builder/PlatformDatabaseBuilder.ios.kt b/composeApp/src/iosMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.ios.kt similarity index 76% rename from composeApp/src/iosMain/kotlin/com/it/curated/compose/database/builder/PlatformDatabaseBuilder.ios.kt rename to composeApp/src/iosMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.ios.kt index 0482f0dc..a270c0fa 100644 --- a/composeApp/src/iosMain/kotlin/com/it/curated/compose/database/builder/PlatformDatabaseBuilder.ios.kt +++ b/composeApp/src/iosMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.ios.kt @@ -1,18 +1,18 @@ -package com.it.curated.compose.database.builder +package to.curare.compose.database.builder import androidx.room3.Room import androidx.room3.RoomDatabase -import com.it.curated.compose.PlatformContext -import com.it.curated.compose.database.CuratedDatabase +import to.curare.compose.PlatformContext +import to.curare.compose.database.CurareDatabase 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/com/it/curated/compose/extensions/Phoenix.ios.kt b/composeApp/src/iosMain/kotlin/to/curare/compose/extensions/Phoenix.ios.kt similarity index 96% rename from composeApp/src/iosMain/kotlin/com/it/curated/compose/extensions/Phoenix.ios.kt rename to composeApp/src/iosMain/kotlin/to/curare/compose/extensions/Phoenix.ios.kt index 8775d2e0..e0305b28 100644 --- a/composeApp/src/iosMain/kotlin/com/it/curated/compose/extensions/Phoenix.ios.kt +++ b/composeApp/src/iosMain/kotlin/to/curare/compose/extensions/Phoenix.ios.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.extensions +package to.curare.compose.extensions import co.touchlab.kermit.Logger import fr.acinq.bitcoin.Chain diff --git a/composeApp/src/iosMain/kotlin/com/it/curated/compose/ui/theme/Motion.ios.kt b/composeApp/src/iosMain/kotlin/to/curare/compose/ui/theme/Motion.ios.kt similarity index 97% rename from composeApp/src/iosMain/kotlin/com/it/curated/compose/ui/theme/Motion.ios.kt rename to composeApp/src/iosMain/kotlin/to/curare/compose/ui/theme/Motion.ios.kt index cfb70d17..83d96a98 100644 --- a/composeApp/src/iosMain/kotlin/com/it/curated/compose/ui/theme/Motion.ios.kt +++ b/composeApp/src/iosMain/kotlin/to/curare/compose/ui/theme/Motion.ios.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.theme +package to.curare.compose.ui.theme import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect diff --git a/composeApp/src/iosMain/kotlin/com/it/curated/compose/ui/theme/Theme.ios.kt b/composeApp/src/iosMain/kotlin/to/curare/compose/ui/theme/Theme.ios.kt similarity index 98% rename from composeApp/src/iosMain/kotlin/com/it/curated/compose/ui/theme/Theme.ios.kt rename to composeApp/src/iosMain/kotlin/to/curare/compose/ui/theme/Theme.ios.kt index 26051c74..e18615d7 100644 --- a/composeApp/src/iosMain/kotlin/com/it/curated/compose/ui/theme/Theme.ios.kt +++ b/composeApp/src/iosMain/kotlin/to/curare/compose/ui/theme/Theme.ios.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.theme +package to.curare.compose.ui.theme import androidx.compose.material3.ColorScheme import androidx.compose.runtime.Composable diff --git a/composeApp/src/iosMain/kotlin/com/it/curated/compose/ui/view/model/NavigationViewModel.ios.kt b/composeApp/src/iosMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.ios.kt similarity index 98% rename from composeApp/src/iosMain/kotlin/com/it/curated/compose/ui/view/model/NavigationViewModel.ios.kt rename to composeApp/src/iosMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.ios.kt index 0aae3f78..d084720a 100644 --- a/composeApp/src/iosMain/kotlin/com/it/curated/compose/ui/view/model/NavigationViewModel.ios.kt +++ b/composeApp/src/iosMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.ios.kt @@ -1,6 +1,6 @@ -package com.it.curated.compose.ui.view.model +package to.curare.compose.ui.view.model -import com.it.curated.compose.AppVersion +import to.curare.compose.AppVersion import co.touchlab.kermit.Logger import fr.acinq.bitcoin.Chain import fr.acinq.bitcoin.MnemonicCode diff --git a/composeApp/src/jvmMain/kotlin/com/it/curated/compose/AppVersion.jvm.kt b/composeApp/src/jvmMain/kotlin/to/curare/compose/AppVersion.jvm.kt similarity index 95% rename from composeApp/src/jvmMain/kotlin/com/it/curated/compose/AppVersion.jvm.kt rename to composeApp/src/jvmMain/kotlin/to/curare/compose/AppVersion.jvm.kt index 87e33968..ed220d2d 100644 --- a/composeApp/src/jvmMain/kotlin/com/it/curated/compose/AppVersion.jvm.kt +++ b/composeApp/src/jvmMain/kotlin/to/curare/compose/AppVersion.jvm.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose +package to.curare.compose /** * Android reads these from `BuildConfig`, which the android plugin generates. There is no diff --git a/composeApp/src/jvmMain/kotlin/com/it/curated/compose/Platform.jvm.kt b/composeApp/src/jvmMain/kotlin/to/curare/compose/Platform.jvm.kt similarity index 84% rename from composeApp/src/jvmMain/kotlin/com/it/curated/compose/Platform.jvm.kt rename to composeApp/src/jvmMain/kotlin/to/curare/compose/Platform.jvm.kt index 6c8d76b4..b10b0d11 100644 --- a/composeApp/src/jvmMain/kotlin/com/it/curated/compose/Platform.jvm.kt +++ b/composeApp/src/jvmMain/kotlin/to/curare/compose/Platform.jvm.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose +package to.curare.compose class JvmPlatform : Platform { override val name: String = "Java ${System.getProperty("java.version")}" diff --git a/composeApp/src/jvmMain/kotlin/com/it/curated/compose/PlatformContext.jvm.kt b/composeApp/src/jvmMain/kotlin/to/curare/compose/PlatformContext.jvm.kt similarity index 67% rename from composeApp/src/jvmMain/kotlin/com/it/curated/compose/PlatformContext.jvm.kt rename to composeApp/src/jvmMain/kotlin/to/curare/compose/PlatformContext.jvm.kt index 626bd88b..3f0fd9b4 100644 --- a/composeApp/src/jvmMain/kotlin/com/it/curated/compose/PlatformContext.jvm.kt +++ b/composeApp/src/jvmMain/kotlin/to/curare/compose/PlatformContext.jvm.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose +package to.curare.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 = defaultCuratedDir(), + val applicationDir: File = defaultCurareDir(), ) /** @@ -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 defaultCuratedDir(): File { +internal fun defaultCurareDir(): File { val home = File(System.getProperty("user.home")) val os = System.getProperty("os.name").orEmpty().lowercase(Locale.ROOT) return when { @@ -44,4 +44,16 @@ internal fun defaultCuratedDir(): File { } } +/** + * The directory name kept the old brand through the rebrand to Curare, 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 + * silently starts a new one beside it, and the old chat history and the old seed stay + * in a directory nothing reads any more. + * + * 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. + */ private const val APP_DIR_NAME = "curated" diff --git a/composeApp/src/jvmMain/kotlin/com/it/curated/compose/database/builder/PlatformDatabaseBuilder.jvm.kt b/composeApp/src/jvmMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.jvm.kt similarity index 67% rename from composeApp/src/jvmMain/kotlin/com/it/curated/compose/database/builder/PlatformDatabaseBuilder.jvm.kt rename to composeApp/src/jvmMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.jvm.kt index f7aa37ae..b3acbd99 100644 --- a/composeApp/src/jvmMain/kotlin/com/it/curated/compose/database/builder/PlatformDatabaseBuilder.jvm.kt +++ b/composeApp/src/jvmMain/kotlin/to/curare/compose/database/builder/PlatformDatabaseBuilder.jvm.kt @@ -1,21 +1,21 @@ -package com.it.curated.compose.database.builder +package to.curare.compose.database.builder import androidx.room3.Room import androidx.room3.RoomDatabase -import com.it.curated.compose.PlatformContext -import com.it.curated.compose.database.CuratedDatabase +import to.curare.compose.PlatformContext +import to.curare.compose.database.CurareDatabase 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/com/it/curated/compose/extensions/Phoenix.jvm.kt b/composeApp/src/jvmMain/kotlin/to/curare/compose/extensions/Phoenix.jvm.kt similarity index 98% rename from composeApp/src/jvmMain/kotlin/com/it/curated/compose/extensions/Phoenix.jvm.kt rename to composeApp/src/jvmMain/kotlin/to/curare/compose/extensions/Phoenix.jvm.kt index b5e55791..d379a489 100644 --- a/composeApp/src/jvmMain/kotlin/com/it/curated/compose/extensions/Phoenix.jvm.kt +++ b/composeApp/src/jvmMain/kotlin/to/curare/compose/extensions/Phoenix.jvm.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.extensions +package to.curare.compose.extensions import co.touchlab.kermit.Logger import fr.acinq.bitcoin.Chain diff --git a/composeApp/src/jvmMain/kotlin/com/it/curated/compose/ui/theme/Motion.jvm.kt b/composeApp/src/jvmMain/kotlin/to/curare/compose/ui/theme/Motion.jvm.kt similarity index 96% rename from composeApp/src/jvmMain/kotlin/com/it/curated/compose/ui/theme/Motion.jvm.kt rename to composeApp/src/jvmMain/kotlin/to/curare/compose/ui/theme/Motion.jvm.kt index e3d69dd3..fd85a640 100644 --- a/composeApp/src/jvmMain/kotlin/com/it/curated/compose/ui/theme/Motion.jvm.kt +++ b/composeApp/src/jvmMain/kotlin/to/curare/compose/ui/theme/Motion.jvm.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.theme +package to.curare.compose.ui.theme import androidx.compose.runtime.Composable diff --git a/composeApp/src/jvmMain/kotlin/com/it/curated/compose/ui/theme/Theme.jvm.kt b/composeApp/src/jvmMain/kotlin/to/curare/compose/ui/theme/Theme.jvm.kt similarity index 98% rename from composeApp/src/jvmMain/kotlin/com/it/curated/compose/ui/theme/Theme.jvm.kt rename to composeApp/src/jvmMain/kotlin/to/curare/compose/ui/theme/Theme.jvm.kt index 101b540c..21540e9e 100644 --- a/composeApp/src/jvmMain/kotlin/com/it/curated/compose/ui/theme/Theme.jvm.kt +++ b/composeApp/src/jvmMain/kotlin/to/curare/compose/ui/theme/Theme.jvm.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.theme +package to.curare.compose.ui.theme import androidx.compose.material3.ColorScheme import androidx.compose.runtime.Composable diff --git a/composeApp/src/jvmMain/kotlin/com/it/curated/compose/ui/view/model/NavigationViewModel.jvm.kt b/composeApp/src/jvmMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.jvm.kt similarity index 98% rename from composeApp/src/jvmMain/kotlin/com/it/curated/compose/ui/view/model/NavigationViewModel.jvm.kt rename to composeApp/src/jvmMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.jvm.kt index 27a4e0c2..181e5e8a 100644 --- a/composeApp/src/jvmMain/kotlin/com/it/curated/compose/ui/view/model/NavigationViewModel.jvm.kt +++ b/composeApp/src/jvmMain/kotlin/to/curare/compose/ui/view/model/NavigationViewModel.jvm.kt @@ -6,9 +6,9 @@ // intermediate source set between iosMain and jvmMain, which is a change to how the module // is wired rather than to what it does. -package com.it.curated.compose.ui.view.model +package to.curare.compose.ui.view.model -import com.it.curated.compose.AppVersion +import to.curare.compose.AppVersion import co.touchlab.kermit.Logger import fr.acinq.bitcoin.Chain import fr.acinq.bitcoin.MnemonicCode diff --git a/composeApp/src/jvmMain/kotlin/com/it/curated/desktop/Main.kt b/composeApp/src/jvmMain/kotlin/to/curare/desktop/Main.kt similarity index 89% rename from composeApp/src/jvmMain/kotlin/com/it/curated/desktop/Main.kt rename to composeApp/src/jvmMain/kotlin/to/curare/desktop/Main.kt index 55e69131..cc2c13ad 100644 --- a/composeApp/src/jvmMain/kotlin/com/it/curated/desktop/Main.kt +++ b/composeApp/src/jvmMain/kotlin/to/curare/desktop/Main.kt @@ -1,4 +1,4 @@ -package com.it.curated.desktop +package to.curare.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 com.it.curated.compose.CuratedApp -import com.it.curated.compose.CuratedGlobal -import com.it.curated.compose.PlatformContext -import com.it.curated.compose.defaultCuratedDir -import com.it.curated.compose.ui.theme.CuratedTheme +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 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 curated and the phoenix context, so a single install + * - one directory is handed to both the curare 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 { defaultCuratedDir().apply { mkdirs() } } + val appDir = remember { defaultCurareDir().apply { mkdirs() } } Window( onCloseRequest = ::exitApplication, - title = "Curated", + title = "Curare", // 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) } - // CuratedTheme wraps both branches, not just the app. PassphraseGate used to sit - // beside CuratedApp -- which applies the theme itself -- so it composed under the + // CurareTheme wraps both branches, not just the app. PassphraseGate used to sit + // beside CurareApp -- 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. // - // CuratedApp still applies CuratedTheme, so the unlocked branch is wrapped twice. - // That is deliberate: android and ios enter through CuratedApp and would lose the + // CurareApp still applies CurareTheme, so the unlocked branch is wrapped twice. + // That is deliberate: android and ios enter through CurareApp and would lose the // theme entirely if it moved out, and a second application of the same values // costs one composition of a CompositionLocalProvider. - CuratedTheme { + CurareTheme { if (unlocked) { val navController = rememberNavController() - CuratedApp( + CurareApp( navController = navController, - curatedGlobal = CuratedGlobal(platformContext = PlatformContext(appDir)), + curareGlobal = CurareGlobal(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 Curated", style = MaterialTheme.typography.headlineSmall) + Text("Unlock Curare", 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/com/it/curated/compose/database/CuratedDatabaseJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/CurareDatabaseJvmTest.kt similarity index 90% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/CuratedDatabaseJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/database/CurareDatabaseJvmTest.kt index 8ca08cd2..2565a3cd 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/CuratedDatabaseJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/CurareDatabaseJvmTest.kt @@ -1,16 +1,16 @@ -package com.it.curated.compose.database +package to.curare.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 com.it.curated.compose.PlatformContext -import com.it.curated.compose.database.builder.PlatformDatabaseBuilder -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile +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 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 `CuratedDatabaseConstructor` gives Room a way to instantiate + * uses is available here because `CurareDatabaseConstructor` gives Room a way to instantiate * without reflection. */ -class CuratedDatabaseJvmTest { +class CurareDatabaseJvmTest { - private val db: CuratedDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: CurareDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest @@ -143,7 +143,7 @@ class CuratedDatabaseJvmTest { */ @Test fun `the on-disk builder writes where the context says`() = runBlocking { - val dir = Files.createTempDirectory("curated-db-test").toFile() + val dir = Files.createTempDirectory("curare-db-test").toFile() try { val onDisk = getRoomDatabase( PlatformDatabaseBuilder.getDatabaseBuilder(PlatformContext(dir)) diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/BroadcastNostrEventRequestDaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/BroadcastNostrEventRequestDaoJvmTest.kt similarity index 95% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/BroadcastNostrEventRequestDaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/BroadcastNostrEventRequestDaoJvmTest.kt index 372dfd1b..757a4146 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/BroadcastNostrEventRequestDaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/BroadcastNostrEventRequestDaoJvmTest.kt @@ -1,12 +1,12 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Room import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking -import com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.BroadcastNostrEventRequest -import com.it.curated.compose.database.model.NostrEvent +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 kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -26,8 +26,8 @@ import kotlin.time.Instant */ class BroadcastNostrEventRequestDaoJvmTest { - private val db: CuratedDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: CurareDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/ChatMessageDaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/ChatMessageDaoJvmTest.kt similarity index 95% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/ChatMessageDaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/ChatMessageDaoJvmTest.kt index ad5001c4..393dff84 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/ChatMessageDaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/ChatMessageDaoJvmTest.kt @@ -1,15 +1,15 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Room import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking -import com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.ChatMessage -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.MarmotGroupEvent -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile +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 kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -31,8 +31,8 @@ import kotlin.time.Instant */ class ChatMessageDaoJvmTest { - private val db: CuratedDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: CurareDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/ChatRoomDaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/ChatRoomDaoJvmTest.kt similarity index 90% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/ChatRoomDaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/ChatRoomDaoJvmTest.kt index a7cf69df..db37d8c9 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/ChatRoomDaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/ChatRoomDaoJvmTest.kt @@ -1,13 +1,13 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Room import kotlinx.coroutines.runBlocking -import com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.ChatMessage -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile +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 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 [com.it.curated.compose.database.model.intermdiate.LocalChatRoom]'s + * in. What the picked row is then rendered as is [to.curare.compose.database.model.intermdiate.LocalChatRoom]'s * own business and is tested against it directly. */ class ChatRoomDaoJvmTest { - private val db: CuratedDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: CurareDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/DkgSessionDaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/DkgSessionDaoJvmTest.kt similarity index 93% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/DkgSessionDaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/DkgSessionDaoJvmTest.kt index 544986dc..073ae184 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/DkgSessionDaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/DkgSessionDaoJvmTest.kt @@ -1,17 +1,17 @@ -package com.it.curated.compose.database.dao +package to.curare.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 com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.DkgParticipantMessage -import com.it.curated.compose.database.model.DkgSession -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.types.DkgRitualStage +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 kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -35,8 +35,8 @@ import kotlin.time.Instant */ class DkgSessionDaoJvmTest { - private val db: CuratedDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: CurareDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/FrostSigningSessionDaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/FrostSigningSessionDaoJvmTest.kt similarity index 95% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/FrostSigningSessionDaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/FrostSigningSessionDaoJvmTest.kt index 58af0702..5f1ae5d2 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/FrostSigningSessionDaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/FrostSigningSessionDaoJvmTest.kt @@ -1,19 +1,19 @@ -package com.it.curated.compose.database.dao +package to.curare.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 com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.FrostSignerMessage -import com.it.curated.compose.database.model.FrostSigningItem -import com.it.curated.compose.database.model.FrostSigningSession -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.types.FrostSigningStage +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.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 kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -35,8 +35,8 @@ import kotlin.time.Instant */ class FrostSigningSessionDaoJvmTest { - private val db: CuratedDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: CurareDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/GroupSignedEventDaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/GroupSignedEventDaoJvmTest.kt similarity index 93% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/GroupSignedEventDaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/GroupSignedEventDaoJvmTest.kt index b7310c73..fa8ed154 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/GroupSignedEventDaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/GroupSignedEventDaoJvmTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.dao +package to.curare.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 com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.ChatMessage -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.GroupSignedEvent -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.managers.SharedKeyDerivation -import com.it.curated.compose.nostr.nip30303.ArtifactEvent -import com.it.curated.compose.nostr.nip30303.DialectEvent +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 /** * The table that keeps what a quorum signed, checked against a real quorum. @@ -46,7 +46,7 @@ import com.it.curated.compose.nostr.nip30303.DialectEvent * failing to round-trip. */ class GroupSignedEventDaoJvmTest { - private val db: CuratedDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) + private val db: CurareDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) @AfterTest fun closeDb() = db.close() diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/MantraDaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MantraDaoJvmTest.kt similarity index 90% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/MantraDaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MantraDaoJvmTest.kt index e23b3c1b..56e6258f 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/MantraDaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MantraDaoJvmTest.kt @@ -1,17 +1,17 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Room import kotlinx.coroutines.runBlocking -import com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.MantraArtifact -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.nostr.nip30303.DialectEvent -import com.it.curated.compose.nostr.nip30303.SubmissionEvent -import com.it.curated.compose.repository.MantraRepository +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 kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -32,8 +32,8 @@ import kotlin.test.assertTrue */ class MantraDaoJvmTest { - private val db: CuratedDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: CurareDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/MarmotKeyPackageFixture.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotKeyPackageFixture.kt similarity index 96% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/MarmotKeyPackageFixture.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotKeyPackageFixture.kt index 921a30f6..7e981de5 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/MarmotKeyPackageFixture.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotKeyPackageFixture.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import com.vitorpamplona.quartz.marmot.mls.crypto.Ed25519 import com.vitorpamplona.quartz.marmot.mls.crypto.MlsCryptoProvider @@ -13,7 +13,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 com.it.curated.compose.database.model.MarmotKeyPackage +import to.curare.compose.database.model.MarmotKeyPackage /** * A real MLS key package for [publicKey], built the same way diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/MarmotOutboundDaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotOutboundDaoJvmTest.kt similarity index 94% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/MarmotOutboundDaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotOutboundDaoJvmTest.kt index 0c172347..81276a87 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/MarmotOutboundDaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotOutboundDaoJvmTest.kt @@ -1,23 +1,23 @@ -package com.it.curated.compose.database.dao +package to.curare.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 com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.ChatMessage -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.MarmotKeyPackage -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.nostr.Relays +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.vitorpamplona.quartz.marmot.mip01Groups.MarmotGroupData import com.vitorpamplona.quartz.marmot.mls.group.MlsGroup import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray -import com.it.curated.compose.exceptions.MarmotMissingChatGroupException +import to.curare.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: CuratedDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: CurareDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/MarmotOutboundQueueJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotOutboundQueueJvmTest.kt similarity index 94% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/MarmotOutboundQueueJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotOutboundQueueJvmTest.kt index 9f38fbd8..5f3b8295 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/MarmotOutboundQueueJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotOutboundQueueJvmTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.dao +package to.curare.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 com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.MarmotInnerEvent -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.repository.DatabaseMarmotRepository -import com.it.curated.compose.exceptions.MarmotMissingChatGroupException -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.nostr.Relays +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 kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -47,8 +47,8 @@ import kotlin.time.Instant */ class MarmotOutboundQueueJvmTest { - private val db: CuratedDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: CurareDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/MarmotPreJoinIndexingJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotPreJoinIndexingJvmTest.kt similarity index 92% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/MarmotPreJoinIndexingJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotPreJoinIndexingJvmTest.kt index b735f601..ff5fc663 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/MarmotPreJoinIndexingJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotPreJoinIndexingJvmTest.kt @@ -1,15 +1,15 @@ -package com.it.curated.compose.database.dao +package to.curare.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 com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.ChatMessage -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile +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 kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -37,8 +37,8 @@ import kotlin.time.Instant */ class MarmotPreJoinIndexingJvmTest { - private val db: CuratedDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: CurareDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/MarmotRetainedEpochSecretDaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotRetainedEpochSecretDaoJvmTest.kt similarity index 93% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/MarmotRetainedEpochSecretDaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotRetainedEpochSecretDaoJvmTest.kt index c047bfab..0ba5c056 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/MarmotRetainedEpochSecretDaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/MarmotRetainedEpochSecretDaoJvmTest.kt @@ -1,13 +1,13 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Room import kotlinx.coroutines.runBlocking -import com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.MarmotRetainedEpochSecret -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile +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 kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertContentEquals @@ -25,8 +25,8 @@ import kotlin.test.assertTrue */ class MarmotRetainedEpochSecretDaoJvmTest { - private val db: CuratedDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: CurareDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/NostrDaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/NostrDaoJvmTest.kt similarity index 94% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/NostrDaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/NostrDaoJvmTest.kt index 56fbb29c..9958103c 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/NostrDaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/NostrDaoJvmTest.kt @@ -1,16 +1,16 @@ -package com.it.curated.compose.database.dao +package to.curare.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 com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.BroadcastNostrEventRequest -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.UnsignedNostrEvent +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 kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -32,8 +32,8 @@ import kotlin.time.Instant */ class NostrDaoJvmTest { - private val db: CuratedDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: CurareDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest @@ -296,7 +296,7 @@ class NostrDaoJvmTest { event(marmotGroupEventId, Instant.fromEpochSeconds(1_000), kind = 445) ) db.marmotGroupEventDao().upsert( - com.it.curated.compose.database.model.MarmotGroupEvent( + to.curare.compose.database.model.MarmotGroupEvent( id = marmotGroupEventId, userPublicKey = author, publicKey = author, @@ -307,7 +307,7 @@ class NostrDaoJvmTest { ) ) db.chatMessageDao().upsert( - com.it.curated.compose.database.model.ChatMessage( + to.curare.compose.database.model.ChatMessage( content = "a sent message", chatRoomId = roomId, senderPublicKey = author, diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/NostrEventDaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/NostrEventDaoJvmTest.kt similarity index 96% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/NostrEventDaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/NostrEventDaoJvmTest.kt index 267a2731..1e755ef2 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/NostrEventDaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/NostrEventDaoJvmTest.kt @@ -1,11 +1,11 @@ -package com.it.curated.compose.database.dao +package to.curare.compose.database.dao import androidx.room3.Room import kotlinx.coroutines.runBlocking -import com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.MarmotGroupEvent -import com.it.curated.compose.database.model.NostrEvent +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 kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -25,8 +25,8 @@ import kotlin.time.Instant */ class NostrEventDaoJvmTest { - private val db: CuratedDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: CurareDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/NostrNip17DaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/NostrNip17DaoJvmTest.kt similarity index 96% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/NostrNip17DaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/NostrNip17DaoJvmTest.kt index dcb6cf10..079c3a61 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/NostrNip17DaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/NostrNip17DaoJvmTest.kt @@ -1,14 +1,14 @@ -package com.it.curated.compose.database.dao +package to.curare.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 com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile +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 kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -32,8 +32,8 @@ import kotlin.test.assertTrue */ class NostrNip17DaoJvmTest { - private val db: CuratedDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: CurareDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/SubgroupDaoJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/SubgroupDaoJvmTest.kt similarity index 94% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/SubgroupDaoJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/SubgroupDaoJvmTest.kt index 2e567dba..f9fcaa6b 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/SubgroupDaoJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/SubgroupDaoJvmTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.dao +package to.curare.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 com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.DkgSession -import com.it.curated.compose.database.model.GroupKeyState -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.types.DkgRitualStage +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 /** * What schema 17 has to survive, and the one thing it must refuse to do. @@ -44,8 +44,8 @@ import com.it.curated.compose.database.model.types.DkgRitualStage */ class SubgroupDaoJvmTest { - private val db: CuratedDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: CurareDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/UnsignedNostrEventQueueJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/UnsignedNostrEventQueueJvmTest.kt similarity index 96% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/UnsignedNostrEventQueueJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/UnsignedNostrEventQueueJvmTest.kt index 3b63e108..8f7d692b 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/dao/UnsignedNostrEventQueueJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/dao/UnsignedNostrEventQueueJvmTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.dao +package to.curare.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 com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.UnsignedNostrEvent +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 kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -45,8 +45,8 @@ import kotlin.time.Instant */ class UnsignedNostrEventQueueJvmTest { - private val db: CuratedDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: CurareDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/migrations/ChronicleRenameMigrationJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/migrations/ChronicleRenameMigrationJvmTest.kt similarity index 98% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/migrations/ChronicleRenameMigrationJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/database/migrations/ChronicleRenameMigrationJvmTest.kt index b215df7f..37eec2c0 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/migrations/ChronicleRenameMigrationJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/migrations/ChronicleRenameMigrationJvmTest.kt @@ -1,10 +1,10 @@ -package com.it.curated.compose.database.migrations +package to.curare.compose.database.migrations import androidx.sqlite.SQLiteConnection import androidx.sqlite.driver.bundled.BundledSQLiteDriver import androidx.sqlite.execSQL import kotlinx.coroutines.runBlocking -import com.it.curated.compose.database.model.ChatMessage +import to.curare.compose.database.model.ChatMessage import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/migrations/FrostSigningItemMigrationJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/migrations/FrostSigningItemMigrationJvmTest.kt similarity index 99% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/migrations/FrostSigningItemMigrationJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/database/migrations/FrostSigningItemMigrationJvmTest.kt index c68e9352..29b51288 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/migrations/FrostSigningItemMigrationJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/migrations/FrostSigningItemMigrationJvmTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.migrations +package to.curare.compose.database.migrations import androidx.sqlite.SQLiteConnection import androidx.sqlite.driver.bundled.BundledSQLiteDriver diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/migrations/JoinedGroupAtMigrationJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/migrations/JoinedGroupAtMigrationJvmTest.kt similarity index 99% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/migrations/JoinedGroupAtMigrationJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/database/migrations/JoinedGroupAtMigrationJvmTest.kt index eebc180d..3491f0ad 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/migrations/JoinedGroupAtMigrationJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/migrations/JoinedGroupAtMigrationJvmTest.kt @@ -1,10 +1,10 @@ -package com.it.curated.compose.database.migrations +package to.curare.compose.database.migrations import androidx.sqlite.SQLiteConnection import androidx.sqlite.driver.bundled.BundledSQLiteDriver import androidx.sqlite.execSQL import kotlinx.coroutines.runBlocking -import com.it.curated.compose.database.model.ChatMessage +import to.curare.compose.database.model.ChatMessage import kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/model/TranslationChunkApplyJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/model/TranslationChunkApplyJvmTest.kt similarity index 96% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/model/TranslationChunkApplyJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/database/model/TranslationChunkApplyJvmTest.kt index 05b064d1..0920e6c7 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/model/TranslationChunkApplyJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/model/TranslationChunkApplyJvmTest.kt @@ -1,12 +1,12 @@ -package com.it.curated.compose.database.model +package to.curare.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 com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.nostr.nip30303.TranslationChunkEvent +import to.curare.compose.database.CurareDatabase +import to.curare.compose.database.builder.getRoomDatabase +import to.curare.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: CuratedDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: CurareDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/query/NostrEventFilterQueryExecutionTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/query/NostrEventFilterQueryExecutionTest.kt similarity index 95% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/query/NostrEventFilterQueryExecutionTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/database/query/NostrEventFilterQueryExecutionTest.kt index 02be4536..07d23eb8 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/query/NostrEventFilterQueryExecutionTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/query/NostrEventFilterQueryExecutionTest.kt @@ -1,11 +1,11 @@ -package com.it.curated.compose.database.query +package to.curare.compose.database.query import androidx.room3.Room import kotlinx.coroutines.runBlocking -import com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.types.SynchronizationFilter +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 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`; - * `CuratedConverters.instantToTimestamp` writes the `createdAt` column as `epochSeconds`. Change + * `CurareConverters.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: CuratedDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: CurareDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/repository/DatabaseChatRepositoryJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/repository/DatabaseChatRepositoryJvmTest.kt similarity index 85% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/repository/DatabaseChatRepositoryJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/database/repository/DatabaseChatRepositoryJvmTest.kt index 24c839b1..b334c561 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/database/repository/DatabaseChatRepositoryJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/database/repository/DatabaseChatRepositoryJvmTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.database.repository +package to.curare.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 com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.ChatMessage -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.MarmotKeyPackage -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.exceptions.MarmotMissingChatGroupException +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 kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertFailsWith @@ -33,8 +33,8 @@ import kotlin.test.assertTrue */ class DatabaseChatRepositoryJvmTest { - private val db: CuratedDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: CurareDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/ChapterBatchProposalJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/ChapterBatchProposalJvmTest.kt similarity index 90% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/ChapterBatchProposalJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/managers/ChapterBatchProposalJvmTest.kt index 988d3548..0fd0c272 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/ChapterBatchProposalJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/ChapterBatchProposalJvmTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.managers +package to.curare.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 com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.DkgParticipantMessage -import com.it.curated.compose.database.model.DkgSession -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.types.DkgRitualStage -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.nostr.dkg.DkgRitualEvents -import com.it.curated.compose.nostr.nip30303.ChapterEvent -import com.it.curated.compose.nostr.nip30303.ChunkEvent -import com.it.curated.compose.text.Markdown +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 /** * 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: CuratedDatabase + private lateinit var db: CurareDatabase 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/com/it/curated/compose/managers/ChronicleApplyJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/ChronicleApplyJvmTest.kt similarity index 94% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/ChronicleApplyJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/managers/ChronicleApplyJvmTest.kt index 2e7b41e1..c17f9a74 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/ChronicleApplyJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/ChronicleApplyJvmTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.managers +package to.curare.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 com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.ChatMessage -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.MarmotInnerEvent -import com.it.curated.compose.database.model.MarmotKeyPackage -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.nostr.chronicle.ChronicleEvent -import com.it.curated.compose.nostr.chronicle.ChronicleRequestEvent -import com.it.curated.compose.nostr.chronicle.tags.ChronicleIdTag -import com.it.curated.compose.nostr.chronicle.tags.ChroniclePageTag -import com.it.curated.compose.nostr.chronicle.tags.ChronicleRecipientTag +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.vitorpamplona.quartz.marmot.mip02Welcome.WelcomeEvent -import com.it.curated.compose.nostr.frost.GroupKeyStateEvent -import com.it.curated.compose.nostr.nip30303.ArtifactEvent -import com.it.curated.compose.nostr.nip30303.ArtifactVersionEvent -import com.it.curated.compose.nostr.nip30303.ChapterEvent -import com.it.curated.compose.nostr.nip30303.ChunkEvent -import com.it.curated.compose.nostr.nip30303.DialectEvent -import com.it.curated.compose.nostr.nip30303.TranslationArtifactVersionEvent -import com.it.curated.compose.nostr.nip30303.TranslationChapterEvent -import com.it.curated.compose.nostr.nip30303.TranslationChunkEvent +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 /** * Two devices, two databases: one that did the work and one that arrived after @@ -65,10 +65,10 @@ import com.it.curated.compose.nostr.nip30303.TranslationChunkEvent */ class ChronicleApplyJvmTest { /** The member who did the work. */ - private val sender: CuratedDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) + private val sender: CurareDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) /** The member who arrived afterwards. No share, no sessions, no history. */ - private val receiver: CuratedDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) + private val receiver: CurareDatabase = 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: CuratedDatabase, user: String) { + private suspend fun seedRoom(db: CurareDatabase, 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: CuratedDatabase, event: Event) { + private suspend fun apply(db: CurareDatabase, 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: CuratedDatabase): Map { + private suspend fun rowCounts(db: CurareDatabase): 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: CuratedDatabase): List> { + private suspend fun rowFingerprints(db: CurareDatabase): 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: CuratedDatabase, kind: Int) = db.marmotInnerEventDao() + private suspend fun queued(db: CurareDatabase, kind: Int) = db.marmotInnerEventDao() .getByChatRoomAndKinds(chatRoomId, listOf(kind)) .filter { it.marmotGroupEventId == null } diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/ChronicleAssemblyJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/ChronicleAssemblyJvmTest.kt similarity index 95% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/ChronicleAssemblyJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/managers/ChronicleAssemblyJvmTest.kt index d9eeb2b9..6fa8833d 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/ChronicleAssemblyJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/ChronicleAssemblyJvmTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.managers +package to.curare.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 com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.ChatMessage -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.GroupSignedEvent -import com.it.curated.compose.database.model.MantraDialect -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.nostr.chronicle.ChronicleEvent -import com.it.curated.compose.nostr.frost.GroupKeyStateEvent -import com.it.curated.compose.nostr.nip30303.SubmissionEvent -import com.it.curated.compose.nostr.nip30303.ArtifactEvent -import com.it.curated.compose.nostr.nip30303.ArtifactVersionEvent -import com.it.curated.compose.nostr.nip30303.ChapterEvent -import com.it.curated.compose.nostr.nip30303.ChunkEvent -import com.it.curated.compose.nostr.nip30303.DialectEvent -import com.it.curated.compose.nostr.nip30303.TranslationArtifactVersionEvent -import com.it.curated.compose.nostr.nip30303.TranslationChapterEvent -import com.it.curated.compose.nostr.nip30303.TranslationChunkEvent +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 /** * Assembling a room's chronicle out of the rows a device actually holds. @@ -51,7 +51,7 @@ import com.it.curated.compose.nostr.nip30303.TranslationChunkEvent * differs from what was signed, and rows assembled by hand would hide it. */ class ChronicleAssemblyJvmTest { - private val db: CuratedDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) + private val db: CurareDatabase = getRoomDatabase(Room.inMemoryDatabaseBuilder()) @AfterTest fun closeDb() = db.close() diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/MarmotGroupCreationJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/MarmotGroupCreationJvmTest.kt similarity index 92% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/MarmotGroupCreationJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/managers/MarmotGroupCreationJvmTest.kt index 6c2c977c..008093ec 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/MarmotGroupCreationJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/MarmotGroupCreationJvmTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.managers +package to.curare.compose.managers import androidx.room3.Room import com.vitorpamplona.quartz.nip01Core.core.toHexKey @@ -13,12 +13,12 @@ import kotlin.test.assertEquals import kotlin.test.assertIs import kotlin.test.assertNotNull import kotlin.test.assertTrue -import com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.repository.DatabaseChatRepository -import com.it.curated.compose.extensions.toHex +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 /** * What the device that *creates* a room knows about it afterwards. @@ -39,8 +39,8 @@ import com.it.curated.compose.extensions.toHex */ class MarmotGroupCreationJvmTest { - private val db: CuratedDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: CurareDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/RobustRoomKeyCeremonyTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/RobustRoomKeyCeremonyTest.kt similarity index 96% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/RobustRoomKeyCeremonyTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/managers/RobustRoomKeyCeremonyTest.kt index 5772503a..f8dee2a8 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/RobustRoomKeyCeremonyTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/RobustRoomKeyCeremonyTest.kt @@ -1,18 +1,18 @@ -package com.it.curated.compose.managers +package to.curare.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 com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.ChatMessage -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.types.DkgRitualStage -import com.it.curated.compose.nostr.dkg.DkgRitualEvents +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 kotlin.test.AfterTest import kotlin.test.Test import kotlin.test.assertEquals @@ -45,8 +45,8 @@ import kotlin.test.assertTrue */ class RobustRoomKeyCeremonyTest { - private val db: CuratedDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: CurareDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/SignedGroupKeyStateTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/SignedGroupKeyStateTest.kt similarity index 97% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/SignedGroupKeyStateTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/managers/SignedGroupKeyStateTest.kt index 5b92f804..97487901 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/SignedGroupKeyStateTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/SignedGroupKeyStateTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.managers +package to.curare.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 com.it.curated.compose.nostr.subgroup.SubgroupParentage -import com.it.curated.compose.nostr.subgroup.SubgroupBirthCertificateEvent +import to.curare.compose.nostr.subgroup.SubgroupParentage +import to.curare.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 com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.model.ChatMessage -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.repository.DatabaseDkgRepository -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.DkgParticipantMessage -import com.it.curated.compose.database.model.DkgSession -import com.it.curated.compose.database.model.FrostSigningSession -import com.it.curated.compose.database.model.GiftWrapPayload -import com.it.curated.compose.database.model.MarmotInnerEvent -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Participant -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.types.DkgRitualStage -import com.it.curated.compose.database.model.types.FrostSigningStage -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.nostr.dkg.DkgRitualEvents -import com.it.curated.compose.nostr.frost.FrostSigningEvents -import com.it.curated.compose.nostr.frost.GroupKeyStateEvent -import com.it.curated.compose.nostr.nip30303.DialectEvent +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 /** * 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: CuratedDatabase, + val db: CurareDatabase, 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/com/it/curated/compose/managers/SubgroupCeremonyInParentRoomTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/SubgroupCeremonyInParentRoomTest.kt similarity index 94% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/SubgroupCeremonyInParentRoomTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/managers/SubgroupCeremonyInParentRoomTest.kt index 47311ea7..2e0eecc4 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/SubgroupCeremonyInParentRoomTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/SubgroupCeremonyInParentRoomTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.managers +package to.curare.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 com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.DkgParticipantMessage -import com.it.curated.compose.database.model.DkgSession -import com.it.curated.compose.database.model.MarmotInnerEvent -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Participant -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.types.DkgApprovalStep -import com.it.curated.compose.database.model.types.DkgRitualStage -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.nostr.Relays -import com.it.curated.compose.nostr.dkg.DkgRitualEvents +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 /** * A subgroup's key ceremony, held in the room of the group making it. @@ -64,13 +64,13 @@ import com.it.curated.compose.nostr.dkg.DkgRitualEvents */ class SubgroupCeremonyInParentRoomTest { - private val parent: CuratedDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val parent: CurareDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) /** A second device's database, so a proposal can be received rather than made. */ - private val receiver: CuratedDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val receiver: CurareDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest @@ -122,7 +122,7 @@ class SubgroupCeremonyInParentRoomTest { subject = "Translation" ) - private suspend fun innerEvents(database: CuratedDatabase) = database.marmotInnerEventDao() + private suspend fun innerEvents(database: CurareDatabase) = 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: CuratedDatabase, publicKey: String) { + private suspend fun seedProfile(database: CurareDatabase, publicKey: String) { if (database.profileDao().getProfileByPublicKey(publicKey) != null) return val nostrEventId = publicKey.take(63) + "f" diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/SubgroupManagerJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/SubgroupManagerJvmTest.kt similarity index 96% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/SubgroupManagerJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/managers/SubgroupManagerJvmTest.kt index a8b7fb36..e638a3a4 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/SubgroupManagerJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/SubgroupManagerJvmTest.kt @@ -1,10 +1,10 @@ -package com.it.curated.compose.managers +package to.curare.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 com.it.curated.compose.nostr.Relays +import to.curare.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 com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.DkgParticipantMessage -import com.it.curated.compose.database.model.DkgSession -import com.it.curated.compose.database.model.types.DkgRitualStage -import com.it.curated.compose.database.model.GroupSignedEvent -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Participant -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.nostr.dkg.DkgRitualEvents -import com.it.curated.compose.nostr.subgroup.SubgroupBirthCertificateEvent +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 /** * What a parent's own record says about its children, and what it refuses to say. @@ -66,8 +66,8 @@ import com.it.curated.compose.nostr.subgroup.SubgroupBirthCertificateEvent */ class SubgroupManagerJvmTest { - private val db: CuratedDatabase = getRoomDatabase( - Room.inMemoryDatabaseBuilder() + private val db: CurareDatabase = getRoomDatabase( + Room.inMemoryDatabaseBuilder() ) @AfterTest diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/TranslationBatchProposalJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/TranslationBatchProposalJvmTest.kt similarity index 93% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/TranslationBatchProposalJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/managers/TranslationBatchProposalJvmTest.kt index 6b8c5627..c8546daa 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/TranslationBatchProposalJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/managers/TranslationBatchProposalJvmTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.managers +package to.curare.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 com.it.curated.compose.database.CuratedDatabase -import com.it.curated.compose.database.builder.getRoomDatabase -import com.it.curated.compose.database.model.ChatMessage -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.DkgParticipantMessage -import com.it.curated.compose.database.model.DkgSession -import com.it.curated.compose.database.model.MantraChapter -import com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.types.DkgRitualStage -import com.it.curated.compose.extensions.toHex -import com.it.curated.compose.nostr.dkg.DkgRitualEvents -import com.it.curated.compose.nostr.nip30303.ChapterEvent -import com.it.curated.compose.nostr.nip30303.ChunkEvent -import com.it.curated.compose.nostr.nip30303.TranslationArtifactVersionEvent -import com.it.curated.compose.nostr.nip30303.TranslationChapterEvent -import com.it.curated.compose.text.Markdown -import com.it.curated.compose.ui.view.model.AddChapterViewModel -import com.it.curated.compose.ui.view.model.AddTranslationArtifactVersionViewModel +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 /** * 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: CuratedDatabase + private lateinit var db: CurareDatabase 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/com/it/curated/compose/ui/StringCatalogueJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/StringCatalogueJvmTest.kt similarity index 85% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/ui/StringCatalogueJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/ui/StringCatalogueJvmTest.kt index 463e7eed..5ddc7b11 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/ui/StringCatalogueJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/StringCatalogueJvmTest.kt @@ -1,13 +1,13 @@ -package com.it.curated.compose.ui +package to.curare.compose.ui import kotlinx.coroutines.runBlocking -import curated.composeapp.generated.resources.Res -import curated.composeapp.generated.resources.currently_no_messages_have_been_shared -import curated.composeapp.generated.resources.don_t_sign -import curated.composeapp.generated.resources.something_went_wrong -import curated.composeapp.generated.resources.add_chapter_to -import curated.composeapp.generated.resources.chapter_words_characters -import curated.composeapp.generated.resources.sent_a_private_message_to +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 org.jetbrains.compose.resources.getString import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/ui/composable/ChatPaneLayoutJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ChatPaneLayoutJvmTest.kt similarity index 87% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/ui/composable/ChatPaneLayoutJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ChatPaneLayoutJvmTest.kt index 99365b01..6b0b1195 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/ui/composable/ChatPaneLayoutJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/ChatPaneLayoutJvmTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.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 com.it.curated.compose.database.model.NostrEvent -import com.it.curated.compose.database.model.Profile -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.database.model.intermdiate.LocalProfileWithFollowing -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.DkgRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.ui.composable.widgets.ProvideSnackbarHost -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.view.state.HomeScreenUIState +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.vitorpamplona.quartz.nip10Notes.TextNoteEvent import kotlin.test.Test @@ -83,7 +83,7 @@ class ChatPaneLayoutJvmTest { @androidx.compose.runtime.Composable private fun Home() { - CuratedTheme { + CurareTheme { // 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/com/it/curated/compose/ui/composable/GroupKeyStateSheetLayoutJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupKeyStateSheetLayoutJvmTest.kt similarity index 91% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/ui/composable/GroupKeyStateSheetLayoutJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupKeyStateSheetLayoutJvmTest.kt index cc7eeded..d20c75c8 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/ui/composable/GroupKeyStateSheetLayoutJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupKeyStateSheetLayoutJvmTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.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 com.it.curated.compose.database.model.GroupKeyState -import com.it.curated.compose.database.model.GroupSignedEvent -import com.it.curated.compose.nostr.frost.GroupKeyStateEvent -import com.it.curated.compose.ui.composable.widgets.ProvideSnackbarHost -import com.it.curated.compose.ui.theme.CuratedTheme +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 /** * 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 { - CuratedTheme { + CurareTheme { // 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 { - CuratedTheme { + CurareTheme { ProvideSnackbarHost { Box(modifier = Modifier.width(phoneWidth).testTag(SHEET)) { GroupKeyStateSheetContent( diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/ui/composable/GroupNostrProfileSectionJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupNostrProfileSectionJvmTest.kt similarity index 93% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/ui/composable/GroupNostrProfileSectionJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupNostrProfileSectionJvmTest.kt index 6005122b..a049a3cd 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/ui/composable/GroupNostrProfileSectionJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/GroupNostrProfileSectionJvmTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable +package to.curare.compose.ui.composable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize @@ -11,22 +11,22 @@ import androidx.compose.ui.test.assertCountEquals import androidx.compose.ui.test.onAllNodesWithText import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.runDesktopComposeUiTest -import com.it.curated.compose.database.model.ChatRoom -import com.it.curated.compose.database.model.GroupKeyState -import com.it.curated.compose.database.model.GroupSignedEvent -import com.it.curated.compose.database.model.intermdiate.LocalChatRoom -import com.it.curated.compose.nostr.GroupNostrProfile -import com.it.curated.compose.nostr.GroupPost -import com.it.curated.compose.nostr.GroupRelay -import com.it.curated.compose.nostr.GroupRelayList -import com.it.curated.compose.nostr.GroupRelaySet +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.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 com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.MantraRepository -import com.it.curated.compose.repository.NostrRepository -import com.it.curated.compose.ui.composable.widgets.ProvideSnackbarHost -import com.it.curated.compose.ui.theme.CuratedTheme -import com.it.curated.compose.ui.view.state.ChatRoomDetailUIState +import to.curare.compose.repository.ChatRepository +import to.curare.compose.repository.MantraRepository +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.ChatRoomDetailUIState import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent import com.vitorpamplona.quartz.nip01Core.metadata.UserMetadata @@ -325,7 +325,7 @@ class GroupNostrProfileSectionJvmTest { assertions: ComposeUiTest.() -> Unit ) = runDesktopComposeUiTest(width = 400, height = 4000) { setContent { - CuratedTheme { + CurareTheme { ProvideSnackbarHost { Box(modifier = Modifier.fillMaxSize()) { ChatRoomDetailScreen( diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/ui/composable/navigation/NavigationSuiteRenderJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/navigation/NavigationSuiteRenderJvmTest.kt similarity index 91% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/ui/composable/navigation/NavigationSuiteRenderJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/navigation/NavigationSuiteRenderJvmTest.kt index ad86f56a..2696f4f5 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/ui/composable/navigation/NavigationSuiteRenderJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/navigation/NavigationSuiteRenderJvmTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.navigation +package to.curare.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 com.it.curated.compose.ui.composable.navigation.routes.ActiveProfileRoute -import com.it.curated.compose.ui.composable.navigation.routes.ChatRoomMessagingRoute -import com.it.curated.compose.ui.composable.navigation.routes.HomeRoute -import com.it.curated.compose.ui.composable.navigation.routes.SearchRoute -import com.it.curated.compose.ui.theme.Breakpoint -import com.it.curated.compose.ui.theme.CuratedTheme +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 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: `CuratedNavHost` builds + * A stand-in for the app's graph rather than the graph itself: `CurareNavHost` 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(), ) { - CuratedTheme { - CuratedNavigationSuite( + CurareTheme { + CurareNavigationSuite( navController = navController, breakpoint = Breakpoint.Large, activeUserPublicKey = publicKey, diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/ui/composable/widgets/ScreenStateTransitionJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/widgets/ScreenStateTransitionJvmTest.kt similarity index 92% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/ui/composable/widgets/ScreenStateTransitionJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/widgets/ScreenStateTransitionJvmTest.kt index a0ac878e..6380166d 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/ui/composable/widgets/ScreenStateTransitionJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/composable/widgets/ScreenStateTransitionJvmTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.composable.widgets +package to.curare.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 com.it.curated.compose.ui.theme.CuratedTheme +import to.curare.compose.ui.theme.CurareTheme 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 { CuratedTheme { ScreenStateTransition(state) { Render(it) } } } + setContent { CurareTheme { 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 { CuratedTheme { ScreenStateTransition(state) { Render(it) } } } + setContent { CurareTheme { ScreenStateTransition(state) { Render(it) } } } mainClock.advanceTimeBy(16) onNodeWithText("first").assertIsDisplayed() diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/ui/theme/NavigationMotionJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/theme/NavigationMotionJvmTest.kt similarity index 95% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/ui/theme/NavigationMotionJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/ui/theme/NavigationMotionJvmTest.kt index 159c7fec..42919bbc 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/ui/theme/NavigationMotionJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/theme/NavigationMotionJvmTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.theme +package to.curare.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 - // `CuratedTheme` silently overwrote it -- the reduced case read 54dp of - // slide. That is also why `reducedMotion` is a `CuratedTheme` parameter + // `CurareTheme` silently overwrote it -- the reduced case read 54dp of + // slide. That is also why `reducedMotion` is a `CurareTheme` 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. - CuratedTheme(reducedMotion = reducedMotion) { + CurareTheme(reducedMotion = reducedMotion) { NavHost( navController = controller, startDestination = First, diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/ui/theme/ReadableContentLayoutJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/theme/ReadableContentLayoutJvmTest.kt similarity index 98% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/ui/theme/ReadableContentLayoutJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/ui/theme/ReadableContentLayoutJvmTest.kt index 1071fec9..27048b83 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/ui/theme/ReadableContentLayoutJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/theme/ReadableContentLayoutJvmTest.kt @@ -1,4 +1,4 @@ -package com.it.curated.compose.ui.theme +package to.curare.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 { - CuratedTheme { + CurareTheme { seen = MaterialTheme.breakpoint margin = MaterialTheme.spacing.screenMargin } @@ -109,7 +109,7 @@ class ReadableContentLayoutJvmTest { @Composable private fun TaggedContent() { - CuratedTheme { + CurareTheme { Box(Modifier.readableContent()) { Box(Modifier.fillMaxWidth().height(8.dp).testTag(Content)) } diff --git a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/ui/view/model/EditGroupRelaysViewModelJvmTest.kt b/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/EditGroupRelaysViewModelJvmTest.kt similarity index 94% rename from composeApp/src/jvmTest/kotlin/com/it/curated/compose/ui/view/model/EditGroupRelaysViewModelJvmTest.kt rename to composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/EditGroupRelaysViewModelJvmTest.kt index 62265bd9..bfba37ec 100644 --- a/composeApp/src/jvmTest/kotlin/com/it/curated/compose/ui/view/model/EditGroupRelaysViewModelJvmTest.kt +++ b/composeApp/src/jvmTest/kotlin/to/curare/compose/ui/view/model/EditGroupRelaysViewModelJvmTest.kt @@ -1,13 +1,13 @@ -package com.it.curated.compose.ui.view.model +package to.curare.compose.ui.view.model -import com.it.curated.compose.database.model.GroupSignedEvent -import com.it.curated.compose.nostr.GroupRelay -import com.it.curated.compose.nostr.GroupRelayList -import com.it.curated.compose.nostr.GroupRelaySet -import com.it.curated.compose.nostr.Relays -import com.it.curated.compose.repository.ChatRepository -import com.it.curated.compose.repository.FrostSigningRepository -import com.it.curated.compose.ui.view.state.EditGroupRelaysUIState +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.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer import kotlin.test.Test import kotlin.test.assertEquals diff --git a/docs/README.md b/docs/README.md index 7a330b16..b7ff266e 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,4 +1,4 @@ -# curated docs +# curare docs Notes on the parts of this app whose behaviour is not recoverable by reading the code alone — where the reasoning lives in a protocol, a failure mode that is diff --git a/docs/dead-code.md b/docs/dead-code.md index 3e6839a7..f799fd78 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/com/it/curated/compose/ui/view/model/ChatRoomListViewModel.kt:80) +[ChatRoomListViewModel.kt:80](composeApp/src/commonMain/kotlin/to/curare/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/com/it/curated/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/it/curated/compose/network/relays/RelayPool.kt:171) | never called | -| `RelayPool.transformWhileEventsAreIncoming` | [RelayPool.kt:486](composeApp/src/commonMain/kotlin/com/it/curated/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/it/curated/compose/network/relays/RelayPool.kt:547) | the only thing keeping `import kotlinx.coroutines.flow.transform` ([:30](composeApp/src/commonMain/kotlin/com/it/curated/compose/network/relays/RelayPool.kt:30)) alive | -| `RelaysSocketManager.clearRelayPools` | [RelaysSocketManager.kt:100](composeApp/src/commonMain/kotlin/com/it/curated/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/it/curated/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/it/curated/compose/network/relays/RelaysSocketManager.kt:139) | | -| `NostrIncomingMessage?.verifyOrThrow` | [NostrIncomingMessage.kt:59](composeApp/src/commonMain/kotlin/com/it/curated/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/it/curated/compose/network/serialization/CommonJson.kt:37) | never called | -| `NostrSocketClientImpl.compressMessage` | [NostrSocketClientImpl.kt:368](composeApp/src/commonMain/kotlin/com/it/curated/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/it/curated/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/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` | ### `RelaysSocketManager.userRelays` is a field that is never written -[RelaysSocketManager.kt:52](composeApp/src/commonMain/kotlin/com/it/curated/compose/network/relays/RelaysSocketManager.kt:52) +[RelaysSocketManager.kt:52](composeApp/src/commonMain/kotlin/to/curare/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/com/it/curated/compose/network/relays/RelaysSocketManager.kt:83) +The `userRelays` at [:83](composeApp/src/commonMain/kotlin/to/curare/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/com/it/curated/compose/network/relays/RelaysSocketManager.kt:107): +only ever read, at [:107](composeApp/src/commonMain/kotlin/to/curare/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/com/it/curated/compose/network/sockets/NostrSocketClient.kt:37) | [:349](composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrSocketClientImpl.kt:333) | -| `sendCLOSE` [:31](composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrSocketClient.kt:31) | [:361](composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrSocketClientImpl.kt:345) | -| `sendCOUNT` [:33](composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrSocketClient.kt:33) | [:354](composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrSocketClientImpl.kt:338) | -| `sendAUTH` [:29](composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrSocketClient.kt:29) | [:365](composeApp/src/commonMain/kotlin/com/it/curated/compose/network/sockets/NostrSocketClientImpl.kt:349) | +| `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) | 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/com/it/curated/compose/network/sockets/NostrIncomingMessage.kt:34)) + ([:34](composeApp/src/commonMain/kotlin/to/curare/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/com/it/curated/compose/network/sockets/NostrIncomingMessage.kt:38)) +- **`sendCOUNT` and `CountMessage`** ([:38](composeApp/src/commonMain/kotlin/to/curare/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/com/it/curated/compose/repository/NostrPublisherRepository.kt:15) +[NostrPublisherRepository.kt:15](composeApp/src/commonMain/kotlin/to/curare/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/com/it/curated/compose/database/model/SynchronizeNostrEventRequest.kt:40) +[SynchronizeNostrEventRequest.kt:40](composeApp/src/commonMain/kotlin/to/curare/compose/database/model/SynchronizeNostrEventRequest.kt:40) and -[NegentropySynchronizeRequest.kt:39](composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/NegentropySynchronizeRequest.kt:39) +[NegentropySynchronizeRequest.kt:39](composeApp/src/commonMain/kotlin/to/curare/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/com/it/curated/compose/extensions/Credentials.kt) — + [Credentials.kt](composeApp/src/commonMain/kotlin/to/curare/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 24318138..270d8bf3 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/com/it/curated/compose/managers/FrostSigningManager.kt) +[FrostSigningManager](../composeApp/src/commonMain/kotlin/to/curare/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/com/it/curated/compose/database/model/FrostSigningSession.kt) +[FrostSigningSession](../composeApp/src/commonMain/kotlin/to/curare/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 -[CuratedDatabase.kt:175](../composeApp/src/commonMain/kotlin/com/it/curated/compose/database/CuratedDatabase.kt), +[CurareDatabase.kt:175](../composeApp/src/commonMain/kotlin/to/curare/compose/database/CurareDatabase.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/com/it/curated/compose/database/dao/FrostSigningSessionDaoJvmTest.kt) +[FrostSigningSessionDaoJvmTest](../composeApp/src/jvmTest/kotlin/to/curare/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/com/it/curated/compose/managers/FrostSigningManager.kt): +In [FrostSigningManager.advance](../composeApp/src/commonMain/kotlin/to/curare/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/com/it/curated/compose/managers/FrostSigningRoundTest.kt) +[FrostSigningRoundTest](../composeApp/src/commonTest/kotlin/to/curare/compose/managers/FrostSigningRoundTest.kt) and -[SignedGroupKeyStateTest](../composeApp/src/jvmTest/kotlin/com/it/curated/compose/managers/SignedGroupKeyStateTest.kt) +[SignedGroupKeyStateTest](../composeApp/src/jvmTest/kotlin/to/curare/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: CuratedDatabase, + database: CurareDatabase, 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/com/it/curated/compose/ui/view/model/AddDialectViewModel.kt), -[AddArtifactViewModel](../composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/AddArtifactViewModel.kt) +[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) and -[GroupKeyStateManager.propose](../composeApp/src/commonMain/kotlin/com/it/curated/compose/managers/GroupKeyStateManager.kt) +[GroupKeyStateManager.propose](../composeApp/src/commonMain/kotlin/to/curare/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/com/it/curated/compose/repository/FrostSigningRepository.kt), +[FrostSigningRepository](../composeApp/src/commonMain/kotlin/to/curare/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/com/it/curated/compose/ui/view/model/FrostSigningViewModel.kt) +- [FrostSigningViewModel](../composeApp/src/commonMain/kotlin/to/curare/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/com/it/curated/compose/ui/composable/FrostSigningScreen.kt) +- [FrostSigningScreen](../composeApp/src/commonMain/kotlin/to/curare/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/com/it/curated/compose/database/model/ChatMessage.kt) +[ChatMessage.kt:220](../composeApp/src/commonMain/kotlin/to/curare/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/com/it/curated/compose/managers/SignedGroupKeyStateTest.kt), +[SignedGroupKeyStateTest](../composeApp/src/jvmTest/kotlin/to/curare/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/com/it/curated/compose/managers/FrostSigningRoundTest.kt), +[FrostSigningRoundTest](../composeApp/src/commonTest/kotlin/to/curare/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/jvm-target.md b/docs/jvm-target.md index 99491e1c..751d3016 100644 --- a/docs/jvm-target.md +++ b/docs/jvm-target.md @@ -1,6 +1,6 @@ # Bringing up the JVM target -What it would actually take to build Curated for desktop, phased, with the +What it would actually take to build Curare for desktop, phased, with the blocking work separated from the mechanical work. The headline is not what you would expect. The four-deep native chain — secp256k1 @@ -10,7 +10,7 @@ set in our own phoenix fork. One scoping note before anything else: **none of this is needed to test the DAOs.** Host-speed Room tests run under `androidUnitTest` today, given one extra -dependency. The JVM target is a product decision — a desktop Curated — not a +dependency. The JVM target is a product decision — a desktop Curare — not a testing prerequisite. See [Room DAO tests](#appendix-room-dao-tests-do-not-need-this) at the end. @@ -63,7 +63,7 @@ expects, and both of them are the template's own. So **23 JVM actuals are missing**, one level down from us, and `lightning-kmp-app/library/build.gradle.kts:18` has `jvm()` commented out because -of it. Curated cannot declare `jvm()` — commented out in turn at +of it. Curare cannot declare `jvm()` — commented out in turn at [composeApp/build.gradle.kts:46](../composeApp/build.gradle.kts) — until phoenix does. @@ -142,7 +142,7 @@ check with `git submodule status` in each — and worth being careful about when they do not. Then the fresh clones need `local.properties`, which is gitignored and therefore -absent, at **five** levels — the curated root and each of the four nested builds +absent, at **five** levels — the curare root and each of the four nested builds down to secp256k1-kmp. Without it configuration fails at `:lightning-kmp-app:lightning-kmp:bitcoin-kmp:secp256k1-kmp:jni:android` with "SDK location not found": @@ -163,7 +163,7 @@ done **~1–2 days. Blocked by nothing. Do this first.** **Start by turning on `jvm()` in the library** — -`lightning-kmp-app/library/build.gradle.kts:18`, not curated's, which still waits +`lightning-kmp-app/library/build.gradle.kts:18`, not curare's, which still waits for Phase 4. Without it `library/src/jvmMain/` is an orphan source set that nothing compiles, and every actual in Phases 1–3 would be written blind. With it, `./gradlew :library:compileKotlinJvm` prints the remaining expects by name, and @@ -227,7 +227,7 @@ TechnicalExtensions.kt gracefulSingleSeedDecryption, gracefulMultiSeedDecryption ``` Anything else in that list means something in this phase is wrong. Also re-run -`./gradlew :composeApp:compileDebugKotlinAndroid` from the curated root: adding a +`./gradlew :composeApp:compileDebugKotlinAndroid` from the curare root: adding a jvm target to the library must not disturb how the android target resolves it. --- @@ -413,7 +413,7 @@ those copies. --- -## Phase 4 — curated's own actuals +## Phase 4 — curare's own actuals **~1–2 days. Blocked by Phases 1–3.** @@ -455,17 +455,17 @@ unit tests, not just the compile. ### Then the actuals -Curated declares 16 expects across 8 files. They split cleanly: +Curare declares 16 expects across 8 files. They split cleanly: -**Six platform basics.** `getPlatform` ([Platform.kt](../composeApp/src/commonMain/kotlin/com/it/curated/compose/Platform.kt)), +**Six platform basics.** `getPlatform` ([Platform.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/Platform.kt)), `PlatformContext`, `AppVersion`, `themeColorScheme` -([Theme.kt](../composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/theme/Theme.kt)), +([Theme.kt](../composeApp/src/commonMain/kotlin/to/curare/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 `com.it.curated.compose`, +are a working skeleton for five of these — repackage to `to.curare.compose`, update Room 2 → Room 3 (`androidx.room` → `androidx.room3`), and point at -`CuratedDatabase` instead of `AuxDatabase`. +`CurareDatabase` instead of `AuxDatabase`. -`CuratedDatabaseConstructor` needs no hand-written actual; Room's KSP generates it +`CurareDatabaseConstructor` needs no hand-written actual; Room's KSP generates it once `kspJvm` is wired above. For `PlatformDatabaseBuilder.getDatabaseBuilder`, use the real application data @@ -477,7 +477,7 @@ systems. at the top of this document are `expect` declarations, and the compiler lists those for you. `BusinessManager` is not one — it exists as a plain object in `androidMain` and again in `iosMain`, with no common declaration, so nothing flags its absence until -curated's own actual tries to import it. +curare's own actual tries to import it. The ios one turns out to contain no ios API whatever: no `platform.*`, no cinterop, no `NSObject`. It ports to `jvmMain` on a package rename alone and compiles unchanged. It @@ -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/com/it/curated/compose/extensions/Phoenix.kt) +[Phoenix.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/extensions/Phoenix.kt) (`platformStartupLogic`, `schedulePlatformLogic`, `getShowIntroFlow`, `getGlobalPrefs`) and five declared in -[SovereignWalletViewModel.kt](../composeApp/src/commonMain/kotlin/com/it/curated/compose/ui/view/model/SovereignWalletViewModel.kt) +[SovereignWalletViewModel.kt](../composeApp/src/commonMain/kotlin/to/curare/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 -`com.it.curated.desktop.MainKt` as the desktop main class. **That file does not +`to.curare.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. `CuratedDatabaseJvmTest` covers what +gate stops before anything touches the database. `CurareDatabaseJvmTest` 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 @@ -564,7 +564,7 @@ Note that a gradle `run` killed with SIGTERM reports `BUILD FAILED` with exit va | 1 | phoenix: mechanical actuals (14) | 1–2 | — | | 2 | phoenix: drivers + network (4) | 2–3 | — | | 3 | phoenix: key storage (4) | **decision** | — | -| 4 | curated actuals (16) | 1–2 | 1, 2, 3 | +| 4 | curare actuals (16) | 1–2 | 1, 2, 3 | | 5 | desktop entry point + shakeout | 1–2 | 4 | Phases 0–5 are now implemented. What each phase actually turned out to require, as @@ -577,7 +577,7 @@ step the `expect` signature cannot express, which lands in Phase 5 rather than 3 **Roughly one focused week to a launchable desktop build**, assuming Phase 3 takes the passphrase-derived KEK and the build is marked dev-only. Real desktop key storage is separate work that should not be folded into this estimate, and -should land before anyone holds funds on a desktop Curated. +should land before anyone holds funds on a desktop Curare. Phases 1, 2 and 3 are independent of each other and can go in parallel if more than one person is on it. Phase 4 cannot start until all three are done, because @@ -607,8 +607,8 @@ no-`Context` builder overload: inMemoryDatabaseBuilder(kotlin.jvm.functions.Function0) ``` -and [CuratedDatabaseConstructor.kt](../composeApp/src/commonMain/kotlin/com/it/curated/compose/database/CuratedDatabaseConstructor.kt) -already supplies what it needs. So `Room.inMemoryDatabaseBuilder()` +and [CurareDatabaseConstructor.kt](../composeApp/src/commonMain/kotlin/to/curare/compose/database/CurareDatabaseConstructor.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 642be6f5..23e76e52 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/com/it/curated/compose/managers/LiveSubscriptionManager.kt), +The code is [`LiveSubscriptionManager`](composeApp/src/commonMain/kotlin/to/curare/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/com/it/curated/compose/database/repository/DatabaseChatRepository.kt:344)), +([`DatabaseChatRepository.kt:344`](composeApp/src/commonMain/kotlin/to/curare/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/com/it/curated/compose/database/dao/MarmotOutboundDao.kt:578)), +([`MarmotOutboundDao.kt:578`](composeApp/src/commonMain/kotlin/to/curare/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 `CuratedNavHost`. A singleton rather than something threaded through the +in `CurareNavHost`. 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/material-design-conformance.md b/docs/material-design-conformance.md index 956ac030..23d852f3 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/com/it/curated/compose/ui` +Counts below are over `composeApp/src/commonMain/kotlin/to/curare/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`; `CuratedTheme` only ever selects `darkScheme` or `lightScheme`. + `private val`; `CurareTheme` 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/com/it/curated/desktop/Main.kt:126` — - `PassphraseGate` sits in the `else` branch beside `CuratedApp`, so it composes +- `composeApp/src/jvmMain/kotlin/to/curare/desktop/Main.kt:126` — + `PassphraseGate` sits in the `else` branch beside `CurareApp`, 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 `CuratedTheme` by hand, +- `Profile.kt:183` and 50 other `@Preview` bodies wrap in `CurareTheme` 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.* `CuratedTheme` takes a `ThemeContrast` +2. **Reach the contrast schemes.** *Built.* `CurareTheme` 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 `CuratedTheme` calls `MaterialExpressiveTheme` with all four - slots passed explicitly — colour, `MotionScheme.expressive()`, `CuratedShapes`, + **expressive**, so `CurareTheme` calls `MaterialExpressiveTheme` with all four + slots passed explicitly — colour, `MotionScheme.expressive()`, `CurareShapes`, `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`). - `CuratedShapes` is baseline `Shapes()`, and `Shape.kt` records why: the corners + `CurareShapes` 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 - `com.it.curated.compose.ui.theme`. It stays baseline-derived, but it becomes a + `to.curare.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 `CuratedTheme` outside the +6. **Wrap the desktop gate.** *Built.* `Main.kt` moves `CurareTheme` outside the `unlocked` branch, so `PassphraseGate` — the first screen a desktop user sees — - stops composing under the default `MaterialTheme`. `CuratedApp` keeps its own - `CuratedTheme`, so the unlocked branch is wrapped twice: android and ios enter - through `CuratedApp` and would lose the theme entirely if it moved out, and a + 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 second application of the same values costs one `CompositionLocalProvider`. - `Type.kt` also left `com.example.ui.theme` for `com.it.curated.compose.ui.theme`, + `Type.kt` also left `com.example.ui.theme` for `to.curare.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 `com.it.curated`; no composable in the tree renders under a default +lives under `to.curare`; no composable in the tree renders under a default `MaterialTheme`. **Risk:** medium. Adding the fixed roles cannot regress anything (nothing reads @@ -653,12 +653,13 @@ 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` now say -"Curated", so the `client` tag on a published relay list names the client that published -it. `TorchTheme` became `CuratedTheme` in the same change, and the two error strings that -told a user to install Torch now name Curated, 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. +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 +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. --- @@ -735,13 +736,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. `CuratedTheme` classifies + thresholds are assertable without a Compose runtime. `CurareTheme` 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 `CuratedTheme`, + on android, `WindowInfoTracker` and an activity. This call sits in `CurareTheme`, which wraps all 51 `@Preview` bodies in the tree, and a preview context is not an activity. @@ -956,9 +957,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 `CuratedTheme` +slide at first, because the test provided `LocalReducedMotion` around `CurareTheme` and the theme overwrote it. The fix is not in the test: `reducedMotion` is now a -`CuratedTheme` parameter defaulted to the platform, exactly as `contrast` is, +`CurareTheme` 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. @@ -1023,7 +1024,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 - `CuratedTheme(contrast = …)` in the body. `ThemeGallery` covers the six once, + `CurareTheme(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. @@ -1110,7 +1111,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.** `CuratedTheme` defaults +- **Whether dynamic colour should keep overriding the brand.** `CurareTheme` 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 @@ -1133,7 +1134,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.** `com.it.curated`, `com.example.ui.theme` and +- **The three package namespaces.** `to.curare`, `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 4f61112f..5ccafe1b 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/com/it/curated/compose/nostr/frost/GroupKeyStateEvent.kt), +In [GroupKeyStateEvent.kt](../composeApp/src/commonMain/kotlin/to/curare/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, `com.it.curated.compose.nostr.chronicle`, with `ChronicleEvents.kt` +A new package, `to.curare.compose.nostr.chronicle`, with `ChronicleEvents.kt` holding the kinds -- mirroring `FrostSigningEvents`. ``` @@ -653,7 +653,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/com/it/curated/compose/managers/ChronicleApplyJvmTest.kt), +[ChronicleApplyJvmTest](../composeApp/src/jvmTest/kotlin/to/curare/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 @@ -684,7 +684,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/com/it/curated/compose/nostr/chronicle/ChronicleRoundTripTest.kt), +[ChronicleRoundTripTest](../composeApp/src/commonTest/kotlin/to/curare/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 @@ -774,17 +774,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/com/it/curated/compose/managers/ChronicleManager.kt) -- the tree walk, and the version-label recovery inside it | +| `rebuiltEventsOf` | [ChronicleManager.kt](../composeApp/src/commonMain/kotlin/to/curare/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/com/it/curated/compose/database/model/MantraDialect.kt) | -| `MantraArtifact.toArtifactEvent` | [MantraArtifact.kt](../composeApp/src/commonMain/kotlin/com/it/curated/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/it/curated/compose/database/model/MantraArtifactVersion.kt) | -| `MantraChapter.toChapterEvent` | [MantraChapter.kt](../composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraChapter.kt) | -| `MantraChunk.toChunkEvent` | [MantraChunk.kt](../composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraChunk.kt) | -| `MantraTranslationArtifactVersion.toTranslationArtifactVersionEvent` | [MantraTranslationArtifactVersion.kt](../composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslationArtifactVersion.kt) | -| `MantraTranslationChapter.toTranslationChapterEvent` | [MantraTranslationChapter.kt](../composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslationChapter.kt) | -| `MantraTranslationChunk.toTranslationChunkEvent` | [MantraTranslationChunk.kt](../composeApp/src/commonMain/kotlin/com/it/curated/compose/database/model/MantraTranslationChunk.kt) | -| `ChronicleRoundTripTest`, all ten cases | [ChronicleRoundTripTest.kt](../composeApp/src/commonTest/kotlin/com/it/curated/compose/nostr/chronicle/ChronicleRoundTripTest.kt) -- it exists to hold the rebuild up and covers nothing else | +| `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 | | 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/scripts/m3-audit.sh b/docs/scripts/m3-audit.sh index 7c0357eb..7acdc6a7 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/com/it/curated/compose/ui +UI=composeApp/src/commonMain/kotlin/to/curare/compose/ui THEME="$UI/theme" # --------------------------------------------------------------------------- diff --git a/docs/scripts/m3-extract-formatted.py b/docs/scripts/m3-extract-formatted.py index 37851c74..835d7bbe 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 curated.composeapp.generated.resources.Res', + for imp in (['import curare.composeapp.generated.resources.Res', 'import org.jetbrains.compose.resources.stringResource'] - + [f'import curated.composeapp.generated.resources.{n}' for n in need]): + + [f'import curare.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 17fb4303..0a741a32 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/com/it/curated/compose/ui' +UI = 'composeApp/src/commonMain/kotlin/to/curare/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 curated.composeapp.generated.resources.Res', + for imp in ('import curare.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 curated.composeapp.generated.resources.{nm}' + imp = f'import curare.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 8b7b9a87..a602f11c 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/com/it/curated/compose/ui' +UI = 'composeApp/src/commonMain/kotlin/to/curare/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 com.it.curated.compose.ui.theme.spacing' not in text and \ + if 'import to.curare.compose.ui.theme.spacing' not in text and \ not path.endswith('theme/Spacing.kt'): lines = text.split('\n') idx = max(i for i, l in enumerate(lines) if l.startswith('import ')) - lines.insert(idx + 1, 'import com.it.curated.compose.ui.theme.spacing') + lines.insert(idx + 1, 'import to.curare.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 bb00049a..3c35ec02 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/com/it/curated/compose/ui' +UI = 'composeApp/src/commonMain/kotlin/to/curare/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 bd333fee..d488d092 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/com/it/curated/compose/ui' +UI = 'composeApp/src/commonMain/kotlin/to/curare/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 59384403..f204aedf 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/com/it/curated/compose/ui' +UI = 'composeApp/src/commonMain/kotlin/to/curare/compose/ui' def offenders(): diff --git a/docs/shared-key-derivation.md b/docs/shared-key-derivation.md index facb75f0..24895e5c 100644 --- a/docs/shared-key-derivation.md +++ b/docs/shared-key-derivation.md @@ -66,10 +66,11 @@ be reordered or replayed at a different depth to reach the same key. `listOf(0L)` and `listOf(0L, 0L, 0L)` do not collide — there is a test for it. The `mantra/` prefix is deliberate and did not change when the app was rebranded to -Curated. The string is an input to the hash, so renaming it derives different keys -from the same threshold key — orphaning every room already created, and splitting -Curated off from any Mantra peer in a shared group. A rename is a protocol fork and -would need a `v2` tag, not an edit to this one. +Curated, nor again when Curated was rebranded to Curare. The string is an input to the +hash, so renaming it derives different keys from the same threshold key — orphaning +every room already created, and splitting Curare off from any peer still running either +older build. A rename is a protocol fork and would need a `v2` tag, not an edit to this +one. ### What avoiding BIP32 also avoids diff --git a/docs/subgroups.md b/docs/subgroups.md index fabe8836..8a6c6384 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 `CuratedDatabase`. +joins the list in `CurareDatabase`. | 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: CuratedDatabase, + database: CurareDatabase, 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: CuratedDatabase, + database: CurareDatabase, 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: CuratedDatabase, parentChatRoomId: String): List + suspend fun subgroupsOf(database: CurareDatabase, parentChatRoomId: String): List /** Files a certificate that arrived, or drops it and says why. */ - suspend fun record(database: CuratedDatabase, chatRoomId: String, innerEvent: Event): GroupSignedEvent? + suspend fun record(database: CurareDatabase, chatRoomId: String, innerEvent: Event): GroupSignedEvent? } ``` @@ -628,7 +628,7 @@ So it moves, unchanged in behaviour, to `managers/MarmotGroupCreation.kt`: ```kotlin suspend fun create( - database: CuratedDatabase, + database: CurareDatabase, chatRepository: ChatRepository, groupId: String, name: String, diff --git a/iosApp/Configuration/Config.xcconfig b/iosApp/Configuration/Config.xcconfig index 5a29ad13..2761b04f 100644 --- a/iosApp/Configuration/Config.xcconfig +++ b/iosApp/Configuration/Config.xcconfig @@ -1,7 +1,7 @@ TEAM_ID= -PRODUCT_NAME=Curated -PRODUCT_BUNDLE_IDENTIFIER=com.it.curated$(TEAM_ID) +PRODUCT_NAME=Curare +PRODUCT_BUNDLE_IDENTIFIER=to.curare.ios$(TEAM_ID) CURRENT_PROJECT_VERSION=1 MARKETING_VERSION=1.0 \ No newline at end of file diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj index 37b7ca3d..3dcba763 100644 --- a/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/iosApp/iosApp.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXFileReference section */ - 41CB266BF907B985085BE6EC /* Curated.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Curated.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 41CB266BF907B985085BE6EC /* Curare.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Curare.app; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ @@ -59,7 +59,7 @@ ECDAFDDED408A506DEFE0AF1 /* Products */ = { isa = PBXGroup; children = ( - 41CB266BF907B985085BE6EC /* Curated.app */, + 41CB266BF907B985085BE6EC /* Curare.app */, ); name = Products; sourceTree = ""; @@ -87,7 +87,7 @@ packageProductDependencies = ( ); productName = iosApp; - productReference = 41CB266BF907B985085BE6EC /* Curated.app */; + productReference = 41CB266BF907B985085BE6EC /* Curare.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ diff --git a/settings.gradle.kts b/settings.gradle.kts index b72c990a..fba80a81 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,4 +1,4 @@ -rootProject.name = "Curated" +rootProject.name = "Curare" enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") pluginManagement {