From 4a2ddbc4f27b1fc727e06544bb3507a817ff1a66 Mon Sep 17 00:00:00 2001 From: Kgothatso Ngako Date: Tue, 21 Apr 2026 23:46:45 +0200 Subject: [PATCH] Correct the namespace and introduce an android specific namespace --- composeApp/build.gradle.kts | 8 +- .../1.json | 0 .../src/androidMain/AndroidManifest.xml | 2 +- .../auxiliary/android}/MainActivity.kt | 10 +-- .../auxiliary}/compose/Platform.android.kt | 2 +- .../compose/PlatformContext.android.kt | 2 +- .../PlatformDatabaseBuilder.android.kt | 6 +- .../compose/ui/theme/Theme.android.kt | 2 +- .../kotlin/ac/aux/compose/Platform.kt | 7 -- .../kotlin/ac/aux/compose/PlatformContext.kt | 3 - .../ac/aux/compose/database/AuxDatabase.kt | 89 ------------------ .../dao/SynchronizeNostrEventResultDao.kt | 14 --- .../LocalBroadcastNostrEventRequest.kt | 19 ---- .../model/intermdiate/LocalProfile.kt | 20 ----- .../database/model/typealiases/HexArray.kt | 4 - .../database/model/typealiases/KindArray.kt | 3 - .../typealiases/SynchronizationFilterArray.kt | 5 -- .../repository/DatabasePostRepository.kt | 11 --- .../InvalidNostrPrivateKeyException.kt | 3 - .../ac/aux/compose/network/UserAgent.kt | 15 ---- .../aux/compose/repository/PostRepository.kt | 6 -- .../navigation/routes/BlankRoute.kt | 6 -- .../navigation/routes/CreateProfileRoute.kt | 12 --- .../composable/navigation/routes/FeedRoute.kt | 6 -- .../navigation/routes/LandingRoute.kt | 6 -- .../navigation/routes/LoadingRoute.kt | 6 -- .../routes/NostrEventDetailRoute.kt | 12 --- .../ui/composable/navigation/routes/Route.kt | 3 - .../navigation/routes/SearchRoute.kt | 6 -- .../navigation/routes/SignInRoute.kt | 6 -- .../routes/SocialPreconditionRoute.kt | 6 -- .../routes/UnannouncedProfileRoute.kt | 13 --- .../routes/UnindexedProfileRoute.kt | 13 --- .../navigation/routes/UnqueuedProfileRoute.kt | 13 --- .../navigation/routes/UnsignedProfileRoute.kt | 12 --- .../navigation/routes/WriteNewNoteRoute.kt | 12 --- .../ui/composable/widgets/feed/Dummy.kt | 6 -- .../composable/widgets/feed/FeedListItem.kt | 20 ----- .../{aux => cord/auxiliary}/compose/AuxApp.kt | 7 +- .../auxiliary}/compose/AuxGlobal.kt | 2 +- .../ac/cord/auxiliary/compose/Platform.kt | 7 ++ .../cord/auxiliary/compose/PlatformContext.kt | 3 + .../compose/cryptography/Extensions.kt | 6 +- .../auxiliary/compose/database/AuxDatabase.kt | 89 ++++++++++++++++++ .../database/AuxDatabaseConstructor.kt | 2 +- .../builder/PlatformDatabaseBuilder.kt | 6 +- .../compose/database/converters/Converters.kt | 9 +- .../dao/BroadcastNostrEventReceiptDao.kt | 5 +- .../dao/BroadcastNostrEventRequestDao.kt | 6 +- .../compose/database/dao/NostrDao.kt | 23 +++-- .../compose/database/dao/NostrEventDao.kt | 9 +- .../compose/database/dao/PostDao.kt | 10 +-- .../compose/database/dao/ProfileDao.kt | 7 +- .../compose/database/dao/ReactionDao.kt | 5 +- .../compose/database/dao/RecentSearchDao.kt | 6 +- .../compose/database/dao/RelayDao.kt | 5 +- .../compose/database/dao/RepostDao.kt | 5 +- .../dao/SynchronizeNostrEventRequestDao.kt | 4 +- .../dao/SynchronizeNostrEventResultDao.kt | 11 +++ .../database/dao/UnsignedNostrEventDao.kt | 6 +- .../auxiliary}/compose/database/dao/ZapDao.kt | 5 +- .../model/BroadcastNostrEventReceipt.kt | 6 +- .../model/BroadcastNostrEventRequest.kt | 6 +- .../compose/database/model/NostrEvent.kt | 14 ++- .../auxiliary}/compose/database/model/Post.kt | 20 ++--- .../compose/database/model/Profile.kt | 14 +-- .../compose/database/model/Reaction.kt | 20 ++--- .../compose/database/model/RecentSearch.kt | 6 +- .../compose/database/model/Relay.kt | 2 +- .../compose/database/model/Repost.kt | 16 ++-- .../model/SynchronizeNostrEventRequest.kt | 10 +-- .../model/SynchronizeNostrEventResult.kt | 8 +- .../database/model/UnsignedNostrEvent.kt | 18 ++-- .../auxiliary}/compose/database/model/Zap.kt | 14 +-- .../model/intermdiate/LocalAccount.kt | 14 +-- .../LocalBroadcastNostrEventRequest.kt | 16 ++++ .../model/intermdiate/LocalNostrEvent.kt | 9 +- .../database/model/intermdiate/LocalPost.kt | 6 +- .../model/intermdiate/LocalProfile.kt | 16 ++++ .../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 | 5 ++ .../model/types/SynchronizationFilter.kt | 4 +- .../repository/DatabaseNostrRepository.kt | 42 +++++---- .../repository/DatabasePostRepository.kt | 10 +++ .../repository/DatabaseSearchRepository.kt | 9 +- .../InvalidNostrPrivateKeyException.kt | 3 + .../compose/exceptions/NetworkException.kt | 2 +- .../exceptions/NostrNoticeException.kt | 2 +- .../exceptions/NostrPublishException.kt | 2 +- .../compose/exceptions/SignatureException.kt | 2 +- .../exceptions/SigningKeyNotFoundException.kt | 2 +- .../exceptions/SigningRejectedException.kt | 2 +- .../auxiliary}/compose/extensions/Instant.kt | 2 +- .../compose/managers/CredentialsManager.kt | 4 +- .../compose/managers/DatabaseManager.kt | 10 +-- .../compose/managers/SeedManager.kt | 2 +- .../auxiliary/compose/network/UserAgent.kt | 11 +++ .../compose/network/dto/RelayDTO.kt | 4 +- .../compose/network/relays/FallbackRelays.kt | 4 +- .../network/relays/NostrPublishResult.kt | 4 +- .../compose/network/relays/RelayPool.kt | 31 ++++--- .../network/relays/RelaysSocketManager.kt | 24 +++-- .../broadcast/BroadcastEventResponse.kt | 2 +- .../relays/broadcast/BroadcastRequestBody.kt | 2 +- .../network/serialization/CommonJson.kt | 2 +- .../network/serialization/SocketsJson.kt | 5 +- .../network/sockets/NostrIncomingMessage.kt | 8 +- .../sockets/NostrIncomingMessageExt.kt | 2 +- .../sockets/NostrIncomingMessageParser.kt | 8 +- .../sockets/NostrOutgoingMessageBuilder.kt | 2 +- .../network/sockets/NostrSocketClient.kt | 2 +- .../sockets/NostrSocketClientFactory.kt | 2 +- .../network/sockets/NostrSocketClientImpl.kt | 4 +- .../compose/network/sockets/NostrVerb.kt | 2 +- .../sockets/SocketConnectionCallbacks.kt | 2 +- .../auxiliary}/compose/nostr/Relays.kt | 2 +- .../repository/CachingImportRepository.kt | 6 +- .../repository/NostrNotaryRepository.kt | 26 +++--- .../repository/NostrPublisherRepository.kt | 14 +-- .../compose/repository/NostrRepository.kt | 28 +++--- .../compose/repository/PostRepository.kt | 4 + .../compose/repository/RelayRepository.kt | 4 +- .../compose/repository/SearchRepository.kt | 4 +- .../ui/composable/CreateProfileScreen.kt | 18 ++-- .../compose/ui/composable/FeedScreen.kt | 19 ++-- .../composable/ImplementationPendingScreen.kt | 4 +- .../compose/ui/composable/LandingScreen.kt | 4 +- .../compose/ui/composable/LoadingScreen.kt | 17 +--- .../ui/composable/NostrEventDetailScreen.kt | 24 ++--- .../ui/composable/SearchResultScreen.kt | 20 ++--- .../compose/ui/composable/SearchScreen.kt | 37 ++------ .../compose/ui/composable/SignInScreen.kt | 10 +-- .../ui/composable/SocialPreconditionScreen.kt | 4 +- .../ui/composable/UnannouncedProfileScreen.kt | 27 +----- .../ui/composable/UnindexedProfileScreen.kt | 27 +----- .../ui/composable/UnqueuedProfileScreen.kt | 27 +----- .../UnqueuedProfileSynchronizationScreen.kt | 11 ++- .../ui/composable/UnsignedProfileScreen.kt | 29 +----- .../ui/composable/UnsyncedProfileScreen.kt | 29 +----- .../ui/composable/WriteNewNoteScreen.kt | 21 ++--- .../ui/composable/navigation/AuxNavHost.kt | 90 +++++++++---------- .../navigation/routes/BlankRoute.kt | 6 ++ .../navigation/routes/CreateProfileRoute.kt | 9 ++ .../composable/navigation/routes/FeedRoute.kt | 6 ++ .../routes/ImplementationPendingRoute.kt | 2 +- .../navigation/routes/LandingRoute.kt | 6 ++ .../navigation/routes/LoadingRoute.kt | 6 ++ .../routes/NostrEventDetailRoute.kt | 9 ++ .../ui/composable/navigation/routes/Route.kt | 3 + .../navigation/routes/SearchResultRoute.kt | 2 +- .../navigation/routes/SearchRoute.kt | 6 ++ .../navigation/routes/SignInRoute.kt | 6 ++ .../routes/SocialPreconditionRoute.kt | 6 ++ .../routes/UnannouncedProfileRoute.kt | 9 ++ .../routes/UnindexedProfileRoute.kt | 10 +++ .../navigation/routes/UnqueuedProfileRoute.kt | 10 +++ .../UnqueuedProfileSynchronizationRoute.kt | 2 +- .../navigation/routes/UnsignedProfileRoute.kt | 9 ++ .../navigation/routes/UnsyncedProfileRoute.kt | 2 +- .../navigation/routes/WriteNewNoteRoute.kt | 9 ++ .../widgets/LoadingDataIndicator.kt | 4 +- .../widgets/coil/forwardingPainter.kt | 2 +- .../widgets/detail/MetadataEventDetail.kt | 31 +++---- .../widgets/detail/TextNoteEventDetail.kt | 12 +-- .../ui/composable/widgets/feed/Dummy.kt | 2 + .../composable/widgets/feed/EventListView.kt | 22 ++--- .../composable/widgets/feed/FeedListItem.kt | 15 ++++ .../widgets/profile/ProfileAvatar.kt | 10 +-- .../auxiliary}/compose/ui/theme/Color.kt | 2 +- .../auxiliary}/compose/ui/theme/Theme.kt | 2 +- .../auxiliary}/compose/ui/theme/Type.kt | 0 .../ui/view/model/CreateProfileViewModel.kt | 12 +-- .../ui/view/model/FeedListViewModel.kt | 14 +-- .../model/MetadataEventDetailViewModel.kt | 14 ++- .../ui/view/model/NavigationViewModel.kt | 26 +++--- .../view/model/NostrEventDetailViewModel.kt | 14 +-- .../ui/view/model/SearchResultViewModel.kt | 14 +-- .../compose/ui/view/model/SearchViewModel.kt | 12 +-- .../ui/view/model/SignInToProfileViewModel.kt | 10 +-- ...UnqueuedProfileSynchronizationViewModel.kt | 11 ++- .../ui/view/model/WriteNewNoteViewModel.kt | 11 ++- .../ui/view/state/CreateProfileUIState.kt | 6 +- .../compose/ui/view/state/FeedListUIState.kt | 5 +- .../ui/view/state/NavigationUIState.kt | 11 ++- .../ui/view/state/NostrEventDetailUIState.kt | 5 +- .../ui/view/state/SearchResultListUIState.kt | 4 +- .../compose/ui/view/state/SearchUIState.kt | 4 +- .../ui/view/state/SignInToProfileUIState.kt | 2 +- .../ui/view/state/WriteNewNoteUIState.kt | 6 +- .../view/state/form/CreateProfileFormState.kt | 2 +- .../state/form/SignInToProfileFormState.kt | 2 +- .../compose/ui/view/state/form/TextField.kt | 2 +- .../view/state/form/WriteNewNoteFormState.kt | 2 +- .../compose/ComposeAppCommonTest.kt | 2 +- .../ac/aux/compose/PlatformContext.ios.kt | 3 - .../auxiliary}/compose/MainViewController.kt | 2 +- .../auxiliary}/compose/Platform.ios.kt | 2 +- .../auxiliary/compose/PlatformContext.ios.kt | 3 + .../builder/PlatformDatabaseBuilder.ios.kt | 6 +- .../auxiliary}/compose/ui/theme/Theme.ios.kt | 2 +- .../ac/aux/compose/PlatformContext.jvm.kt | 3 - .../auxiliary}/compose/Platform.jvm.kt | 2 +- .../auxiliary/compose/PlatformContext.jvm.kt | 3 + .../builder/PlatformDatabaseBuilder.jvm.kt | 6 +- .../{aux => cord/auxiliary}/compose/main.kt | 2 +- .../auxiliary}/compose/ui/theme/Theme.jvm.kt | 2 +- 217 files changed, 880 insertions(+), 1166 deletions(-) rename composeApp/schemas/{ac.aux.compose.database.AuxDatabase => ac.cord.auxiliary.compose.database.AuxDatabase}/1.json (100%) rename composeApp/src/androidMain/kotlin/ac/{aux/compose => cord/auxiliary/android}/MainActivity.kt (81%) rename composeApp/src/androidMain/kotlin/ac/{aux => cord/auxiliary}/compose/Platform.android.kt (59%) rename composeApp/src/androidMain/kotlin/ac/{aux => cord/auxiliary}/compose/PlatformContext.android.kt (73%) rename composeApp/src/androidMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/builder/PlatformDatabaseBuilder.android.kt (81%) rename composeApp/src/androidMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/theme/Theme.android.kt (94%) delete mode 100644 composeApp/src/commonMain/kotlin/ac/aux/compose/Platform.kt delete mode 100644 composeApp/src/commonMain/kotlin/ac/aux/compose/PlatformContext.kt delete mode 100644 composeApp/src/commonMain/kotlin/ac/aux/compose/database/AuxDatabase.kt delete mode 100644 composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/SynchronizeNostrEventResultDao.kt delete mode 100644 composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/intermdiate/LocalBroadcastNostrEventRequest.kt delete mode 100644 composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/intermdiate/LocalProfile.kt delete mode 100644 composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/typealiases/HexArray.kt delete mode 100644 composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/typealiases/KindArray.kt delete mode 100644 composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/typealiases/SynchronizationFilterArray.kt delete mode 100644 composeApp/src/commonMain/kotlin/ac/aux/compose/database/repository/DatabasePostRepository.kt delete mode 100644 composeApp/src/commonMain/kotlin/ac/aux/compose/exceptions/InvalidNostrPrivateKeyException.kt delete mode 100644 composeApp/src/commonMain/kotlin/ac/aux/compose/network/UserAgent.kt delete mode 100644 composeApp/src/commonMain/kotlin/ac/aux/compose/repository/PostRepository.kt delete mode 100755 composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/BlankRoute.kt delete mode 100755 composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/CreateProfileRoute.kt delete mode 100755 composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/FeedRoute.kt delete mode 100755 composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/LandingRoute.kt delete mode 100755 composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/LoadingRoute.kt delete mode 100755 composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/NostrEventDetailRoute.kt delete mode 100755 composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/Route.kt delete mode 100755 composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/SearchRoute.kt delete mode 100755 composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/SignInRoute.kt delete mode 100755 composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/SocialPreconditionRoute.kt delete mode 100755 composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/UnannouncedProfileRoute.kt delete mode 100755 composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/UnindexedProfileRoute.kt delete mode 100755 composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/UnqueuedProfileRoute.kt delete mode 100755 composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/UnsignedProfileRoute.kt delete mode 100755 composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/WriteNewNoteRoute.kt delete mode 100644 composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/feed/Dummy.kt delete mode 100644 composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/feed/FeedListItem.kt rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/AuxApp.kt (73%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/AuxGlobal.kt (64%) create mode 100644 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/Platform.kt create mode 100644 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/PlatformContext.kt rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/cryptography/Extensions.kt (87%) create mode 100644 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/AuxDatabase.kt rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/AuxDatabaseConstructor.kt (83%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/builder/PlatformDatabaseBuilder.kt (79%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/converters/Converters.kt (89%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/dao/BroadcastNostrEventReceiptDao.kt (81%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/dao/BroadcastNostrEventRequestDao.kt (78%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/dao/NostrDao.kt (95%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/dao/NostrEventDao.kt (87%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/dao/PostDao.kt (58%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/dao/ProfileDao.kt (76%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/dao/ReactionDao.kt (77%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/dao/RecentSearchDao.kt (79%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/dao/RelayDao.kt (74%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/dao/RepostDao.kt (77%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/dao/SynchronizeNostrEventRequestDao.kt (87%) create mode 100644 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/SynchronizeNostrEventResultDao.kt rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/dao/UnsignedNostrEventDao.kt (84%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/dao/ZapDao.kt (72%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/BroadcastNostrEventReceipt.kt (79%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/BroadcastNostrEventRequest.kt (79%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/NostrEvent.kt (95%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/Post.kt (75%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/Profile.kt (76%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/Reaction.kt (73%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/RecentSearch.kt (84%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/Relay.kt (82%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/Repost.kt (87%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/SynchronizeNostrEventRequest.kt (87%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/SynchronizeNostrEventResult.kt (72%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/UnsignedNostrEvent.kt (76%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/Zap.kt (80%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/intermdiate/LocalAccount.kt (65%) create mode 100644 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalBroadcastNostrEventRequest.kt rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/intermdiate/LocalNostrEvent.kt (73%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/intermdiate/LocalPost.kt (58%) create mode 100644 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalProfile.kt rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/traits/BroadcastableEntity.kt (62%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/traits/LocalStoreEntity.kt (59%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/traits/NostrEventEntity.kt (66%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/traits/OptionalNostrEventEntity.kt (68%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/traits/ProfilePublicKeyEntity.kt (68%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/traits/ReplyingToEntity.kt (66%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/traits/SoftDeletableEntity.kt (60%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/traits/TimestampedEntity.kt (66%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/traits/UnsignedNostrEventEntity.kt (56%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/traits/UserViewableEntity.kt (60%) create mode 100644 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/typealiases/HexArray.kt create mode 100644 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/typealiases/KindArray.kt create mode 100644 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/typealiases/SynchronizationFilterArray.kt rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/model/types/SynchronizationFilter.kt (92%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/repository/DatabaseNostrRepository.kt (91%) create mode 100644 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/repository/DatabasePostRepository.kt rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/repository/DatabaseSearchRepository.kt (58%) create mode 100644 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/exceptions/InvalidNostrPrivateKeyException.kt rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/exceptions/NetworkException.kt (50%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/exceptions/NostrNoticeException.kt (50%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/exceptions/NostrPublishException.kt (51%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/exceptions/SignatureException.kt (70%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/exceptions/SigningKeyNotFoundException.kt (74%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/exceptions/SigningRejectedException.kt (72%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/extensions/Instant.kt (93%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/managers/CredentialsManager.kt (97%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/managers/DatabaseManager.kt (70%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/managers/SeedManager.kt (93%) create mode 100644 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/UserAgent.kt rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/network/dto/RelayDTO.kt (74%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/network/relays/FallbackRelays.kt (73%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/network/relays/NostrPublishResult.kt (54%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/network/relays/RelayPool.kt (91%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/network/relays/RelaysSocketManager.kt (87%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/network/relays/broadcast/BroadcastEventResponse.kt (80%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/network/relays/broadcast/BroadcastRequestBody.kt (77%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/network/serialization/CommonJson.kt (95%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/network/serialization/SocketsJson.kt (82%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/network/sockets/NostrIncomingMessage.kt (84%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/network/sockets/NostrIncomingMessageExt.kt (93%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/network/sockets/NostrIncomingMessageParser.kt (95%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/network/sockets/NostrOutgoingMessageBuilder.kt (96%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/network/sockets/NostrSocketClient.kt (94%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/network/sockets/NostrSocketClientFactory.kt (97%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/network/sockets/NostrSocketClientImpl.kt (98%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/network/sockets/NostrVerb.kt (93%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/network/sockets/SocketConnectionCallbacks.kt (75%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/nostr/Relays.kt (98%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/repository/CachingImportRepository.kt (87%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/repository/NostrNotaryRepository.kt (87%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/repository/NostrPublisherRepository.kt (86%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/repository/NostrRepository.kt (87%) create mode 100644 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/PostRepository.kt rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/repository/RelayRepository.kt (58%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/repository/SearchRepository.kt (77%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/CreateProfileScreen.kt (97%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/FeedScreen.kt (93%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/ImplementationPendingScreen.kt (93%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/LandingScreen.kt (97%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/LoadingScreen.kt (54%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/NostrEventDetailScreen.kt (88%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/SearchResultScreen.kt (95%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/SearchScreen.kt (93%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/SignInScreen.kt (97%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/SocialPreconditionScreen.kt (97%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/UnannouncedProfileScreen.kt (68%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/UnindexedProfileScreen.kt (68%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/UnqueuedProfileScreen.kt (68%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/UnqueuedProfileSynchronizationScreen.kt (90%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/UnsignedProfileScreen.kt (64%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/UnsyncedProfileScreen.kt (65%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/WriteNewNoteScreen.kt (92%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/navigation/AuxNavHost.kt (79%) create mode 100755 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/BlankRoute.kt create mode 100755 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/CreateProfileRoute.kt create mode 100755 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/FeedRoute.kt rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/navigation/routes/ImplementationPendingRoute.kt (66%) create mode 100755 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/LandingRoute.kt create mode 100755 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/LoadingRoute.kt create mode 100755 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/NostrEventDetailRoute.kt create mode 100755 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/Route.kt rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/navigation/routes/SearchResultRoute.kt (59%) create mode 100755 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/SearchRoute.kt create mode 100755 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/SignInRoute.kt create mode 100755 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/SocialPreconditionRoute.kt create mode 100755 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/UnannouncedProfileRoute.kt create mode 100755 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/UnindexedProfileRoute.kt create mode 100755 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/UnqueuedProfileRoute.kt rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/navigation/routes/UnqueuedProfileSynchronizationRoute.kt (73%) create mode 100755 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/UnsignedProfileRoute.kt rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/navigation/routes/UnsyncedProfileRoute.kt (66%) create mode 100755 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/WriteNewNoteRoute.kt rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/widgets/LoadingDataIndicator.kt (92%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/widgets/coil/forwardingPainter.kt (96%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/widgets/detail/MetadataEventDetail.kt (93%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/widgets/detail/TextNoteEventDetail.kt (96%) create mode 100644 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/feed/Dummy.kt rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/widgets/feed/EventListView.kt (92%) create mode 100644 composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/feed/FeedListItem.kt rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/composable/widgets/profile/ProfileAvatar.kt (91%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/theme/Color.kt (99%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/theme/Theme.kt (99%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/theme/Type.kt (100%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/view/model/CreateProfileViewModel.kt (90%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/view/model/FeedListViewModel.kt (92%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/view/model/MetadataEventDetailViewModel.kt (95%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/view/model/NavigationViewModel.kt (95%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/view/model/NostrEventDetailViewModel.kt (89%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/view/model/SearchResultViewModel.kt (93%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/view/model/SearchViewModel.kt (88%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/view/model/SignInToProfileViewModel.kt (92%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/view/model/UnqueuedProfileSynchronizationViewModel.kt (88%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/view/model/WriteNewNoteViewModel.kt (88%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/view/state/CreateProfileUIState.kt (67%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/view/state/FeedListUIState.kt (59%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/view/state/NavigationUIState.kt (74%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/view/state/NostrEventDetailUIState.kt (66%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/view/state/SearchResultListUIState.kt (66%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/view/state/SearchUIState.kt (67%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/view/state/SignInToProfileUIState.kt (90%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/view/state/WriteNewNoteUIState.kt (54%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/view/state/form/CreateProfileFormState.kt (70%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/view/state/form/SignInToProfileFormState.kt (60%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/view/state/form/TextField.kt (82%) rename composeApp/src/commonMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/view/state/form/WriteNewNoteFormState.kt (59%) rename composeApp/src/commonTest/kotlin/ac/{aux => auxiliary}/compose/ComposeAppCommonTest.kt (83%) delete mode 100644 composeApp/src/iosMain/kotlin/ac/aux/compose/PlatformContext.ios.kt rename composeApp/src/iosMain/kotlin/ac/{aux => cord/auxiliary}/compose/MainViewController.kt (91%) rename composeApp/src/iosMain/kotlin/ac/{aux => cord/auxiliary}/compose/Platform.ios.kt (68%) create mode 100644 composeApp/src/iosMain/kotlin/ac/cord/auxiliary/compose/PlatformContext.ios.kt rename composeApp/src/iosMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/builder/PlatformDatabaseBuilder.ios.kt (88%) rename composeApp/src/iosMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/theme/Theme.ios.kt (88%) delete mode 100644 composeApp/src/jvmMain/kotlin/ac/aux/compose/PlatformContext.jvm.kt rename composeApp/src/jvmMain/kotlin/ac/{aux => cord/auxiliary}/compose/Platform.jvm.kt (56%) create mode 100644 composeApp/src/jvmMain/kotlin/ac/cord/auxiliary/compose/PlatformContext.jvm.kt rename composeApp/src/jvmMain/kotlin/ac/{aux => cord/auxiliary}/compose/database/builder/PlatformDatabaseBuilder.jvm.kt (80%) rename composeApp/src/jvmMain/kotlin/ac/{aux => cord/auxiliary}/compose/main.kt (93%) rename composeApp/src/jvmMain/kotlin/ac/{aux => cord/auxiliary}/compose/ui/theme/Theme.jvm.kt (88%) diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts index 81d40c6a..493e57ee 100644 --- a/composeApp/build.gradle.kts +++ b/composeApp/build.gradle.kts @@ -99,11 +99,11 @@ kotlin { } android { - namespace = "ac.aux.compose" + namespace = "ac.cord.auxiliary.android" compileSdk = libs.versions.android.compileSdk.get().toInt() defaultConfig { - applicationId = "ac.aux.compose" + applicationId = "ac.cord.auxiliary.android" minSdk = libs.versions.android.minSdk.get().toInt() targetSdk = libs.versions.android.targetSdk.get().toInt() versionCode = 1 @@ -146,11 +146,11 @@ room { compose.desktop { application { - mainClass = "ac.aux.compose.MainKt" + mainClass = "ac.cord.auxiliary.compose.MainKt" nativeDistributions { targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb) - packageName = "ac.aux.compose" + packageName = "ac.cord.auxiliary.compose" packageVersion = "1.0.0" } } diff --git a/composeApp/schemas/ac.aux.compose.database.AuxDatabase/1.json b/composeApp/schemas/ac.cord.auxiliary.compose.database.AuxDatabase/1.json similarity index 100% rename from composeApp/schemas/ac.aux.compose.database.AuxDatabase/1.json rename to composeApp/schemas/ac.cord.auxiliary.compose.database.AuxDatabase/1.json diff --git a/composeApp/src/androidMain/AndroidManifest.xml b/composeApp/src/androidMain/AndroidManifest.xml index 5fa9fe45..9581de76 100644 --- a/composeApp/src/androidMain/AndroidManifest.xml +++ b/composeApp/src/androidMain/AndroidManifest.xml @@ -13,7 +13,7 @@ android:theme="@android:style/Theme.Material.Light.NoActionBar"> + android:name="ac.cord.auxiliary.android.MainActivity"> diff --git a/composeApp/src/androidMain/kotlin/ac/aux/compose/MainActivity.kt b/composeApp/src/androidMain/kotlin/ac/cord/auxiliary/android/MainActivity.kt similarity index 81% rename from composeApp/src/androidMain/kotlin/ac/aux/compose/MainActivity.kt rename to composeApp/src/androidMain/kotlin/ac/cord/auxiliary/android/MainActivity.kt index 68ae41a9..c950c61a 100644 --- a/composeApp/src/androidMain/kotlin/ac/aux/compose/MainActivity.kt +++ b/composeApp/src/androidMain/kotlin/ac/cord/auxiliary/android/MainActivity.kt @@ -1,13 +1,13 @@ -package ac.aux.compose +package ac.cord.auxiliary.android +import ac.cord.auxiliary.compose.AuxApp +import ac.cord.auxiliary.compose.AuxGlobal +import ac.cord.auxiliary.compose.PlatformContext import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge -import androidx.compose.runtime.Composable -import androidx.compose.ui.tooling.preview.Preview import androidx.navigation.compose.rememberNavController -import com.vitorpamplona.quartz.utils.platform class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { @@ -27,4 +27,4 @@ class MainActivity : ComponentActivity() { ) } } -} +} \ No newline at end of file diff --git a/composeApp/src/androidMain/kotlin/ac/aux/compose/Platform.android.kt b/composeApp/src/androidMain/kotlin/ac/cord/auxiliary/compose/Platform.android.kt similarity index 59% rename from composeApp/src/androidMain/kotlin/ac/aux/compose/Platform.android.kt rename to composeApp/src/androidMain/kotlin/ac/cord/auxiliary/compose/Platform.android.kt index e16569be..9f83472f 100644 --- a/composeApp/src/androidMain/kotlin/ac/aux/compose/Platform.android.kt +++ b/composeApp/src/androidMain/kotlin/ac/cord/auxiliary/compose/Platform.android.kt @@ -1,4 +1,4 @@ -package ac.aux.compose +package ac.cord.auxiliary.compose import android.os.Build diff --git a/composeApp/src/androidMain/kotlin/ac/aux/compose/PlatformContext.android.kt b/composeApp/src/androidMain/kotlin/ac/cord/auxiliary/compose/PlatformContext.android.kt similarity index 73% rename from composeApp/src/androidMain/kotlin/ac/aux/compose/PlatformContext.android.kt rename to composeApp/src/androidMain/kotlin/ac/cord/auxiliary/compose/PlatformContext.android.kt index cc089f74..ae75a3fa 100644 --- a/composeApp/src/androidMain/kotlin/ac/aux/compose/PlatformContext.android.kt +++ b/composeApp/src/androidMain/kotlin/ac/cord/auxiliary/compose/PlatformContext.android.kt @@ -1,4 +1,4 @@ -package ac.aux.compose +package ac.cord.auxiliary.compose import android.content.Context diff --git a/composeApp/src/androidMain/kotlin/ac/aux/compose/database/builder/PlatformDatabaseBuilder.android.kt b/composeApp/src/androidMain/kotlin/ac/cord/auxiliary/compose/database/builder/PlatformDatabaseBuilder.android.kt similarity index 81% rename from composeApp/src/androidMain/kotlin/ac/aux/compose/database/builder/PlatformDatabaseBuilder.android.kt rename to composeApp/src/androidMain/kotlin/ac/cord/auxiliary/compose/database/builder/PlatformDatabaseBuilder.android.kt index 51397e17..1f98e112 100644 --- a/composeApp/src/androidMain/kotlin/ac/aux/compose/database/builder/PlatformDatabaseBuilder.android.kt +++ b/composeApp/src/androidMain/kotlin/ac/cord/auxiliary/compose/database/builder/PlatformDatabaseBuilder.android.kt @@ -1,7 +1,7 @@ -package ac.aux.compose.database.builder +package ac.cord.auxiliary.compose.database.builder -import ac.aux.compose.PlatformContext -import ac.aux.compose.database.AuxDatabase +import ac.cord.auxiliary.compose.PlatformContext +import ac.cord.auxiliary.compose.database.AuxDatabase import androidx.room.Room import androidx.room.RoomDatabase diff --git a/composeApp/src/androidMain/kotlin/ac/aux/compose/ui/theme/Theme.android.kt b/composeApp/src/androidMain/kotlin/ac/cord/auxiliary/compose/ui/theme/Theme.android.kt similarity index 94% rename from composeApp/src/androidMain/kotlin/ac/aux/compose/ui/theme/Theme.android.kt rename to composeApp/src/androidMain/kotlin/ac/cord/auxiliary/compose/ui/theme/Theme.android.kt index a889a118..0f6e1b44 100644 --- a/composeApp/src/androidMain/kotlin/ac/aux/compose/ui/theme/Theme.android.kt +++ b/composeApp/src/androidMain/kotlin/ac/cord/auxiliary/compose/ui/theme/Theme.android.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.ui.theme +package ac.cord.auxiliary.compose.ui.theme import android.os.Build import androidx.compose.material3.ColorScheme diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/Platform.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/Platform.kt deleted file mode 100644 index 40166042..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/Platform.kt +++ /dev/null @@ -1,7 +0,0 @@ -package ac.aux.compose - -interface Platform { - val name: String -} - -expect fun getPlatform(): Platform \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/PlatformContext.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/PlatformContext.kt deleted file mode 100644 index 459b47a2..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/PlatformContext.kt +++ /dev/null @@ -1,3 +0,0 @@ -package ac.aux.compose - -expect class PlatformContext \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/AuxDatabase.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/database/AuxDatabase.kt deleted file mode 100644 index e8c39fe1..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/AuxDatabase.kt +++ /dev/null @@ -1,89 +0,0 @@ -package ac.aux.compose.database - -import ac.aux.compose.database.converters.AuxConverters -import ac.aux.compose.database.dao.BroadcastNostrEventReceiptDao -import ac.aux.compose.database.dao.BroadcastNostrEventRequestDao -import ac.aux.compose.database.dao.NostrDao -import ac.aux.compose.database.dao.NostrEventDao -import ac.aux.compose.database.dao.PostDao -import ac.aux.compose.database.dao.ProfileDao -import ac.aux.compose.database.dao.ReactionDao -import ac.aux.compose.database.dao.RecentSearchDao -import ac.aux.compose.database.dao.RelayDao -import ac.aux.compose.database.dao.RepostDao -import ac.aux.compose.database.dao.SynchronizeNostrEventRequestDao -import ac.aux.compose.database.dao.SynchronizeNostrEventResultDao -import ac.aux.compose.database.dao.UnsignedNostrEventDao -import ac.aux.compose.database.dao.ZapDao -import ac.aux.compose.database.model.BroadcastNostrEventReceipt -import ac.aux.compose.database.model.BroadcastNostrEventRequest -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Post -import ac.aux.compose.database.model.Profile -import ac.aux.compose.database.model.Reaction -import ac.aux.compose.database.model.RecentSearch -import ac.aux.compose.database.model.Relay -import ac.aux.compose.database.model.Repost -import ac.aux.compose.database.model.SynchronizeNostrEventRequest -import ac.aux.compose.database.model.SynchronizeNostrEventResult -import ac.aux.compose.database.model.UnsignedNostrEvent -import ac.aux.compose.database.model.Zap -import androidx.room.Database -import androidx.room.RoomDatabase -import androidx.room.TypeConverters -import androidx.room.immediateTransaction -import androidx.room.useWriterConnection -import kotlin.time.Instant - -val GENESIS_AT = Instant.fromEpochMilliseconds(1231006505000L) - -@Database( - entities = [ - BroadcastNostrEventReceipt::class, - BroadcastNostrEventRequest::class, - NostrEvent::class, - Post::class, - Profile::class, - Reaction::class, - RecentSearch::class, - Relay::class, - Repost::class, - SynchronizeNostrEventRequest::class, - SynchronizeNostrEventResult::class, - UnsignedNostrEvent::class, - Zap::class - ], - version = 1 -) -@TypeConverters(AuxConverters::class) -abstract class AuxDatabase: RoomDatabase() { - abstract fun broadcastNostrEventReceiptDao(): BroadcastNostrEventReceiptDao - abstract fun broadcastNostrEventRequestDao(): BroadcastNostrEventRequestDao - abstract fun nostrDao(): NostrDao - - abstract fun nostrEventDao(): NostrEventDao - abstract fun postDao(): PostDao - abstract fun profileDao(): ProfileDao - abstract fun reactionDao(): ReactionDao - - abstract fun recentSearchDao(): RecentSearchDao - - abstract fun relayDao(): RelayDao - - abstract fun repostDao(): RepostDao - - abstract fun synchronizeNostrEventRequestDao(): SynchronizeNostrEventRequestDao - - abstract fun synchronizeNostrEventResultDao(): SynchronizeNostrEventResultDao - - abstract fun unsignedNostrEventDao(): UnsignedNostrEventDao - abstract fun zapDao(): ZapDao - - suspend fun wipeData() { - useWriterConnection { transactor -> - transactor.immediateTransaction { - // TODO: Actually delete the data... - } - } - } -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/SynchronizeNostrEventResultDao.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/SynchronizeNostrEventResultDao.kt deleted file mode 100644 index b8430827..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/SynchronizeNostrEventResultDao.kt +++ /dev/null @@ -1,14 +0,0 @@ -package ac.aux.compose.database.dao - -import ac.aux.compose.database.model.SynchronizeNostrEventRequest -import ac.aux.compose.database.model.SynchronizeNostrEventResult -import androidx.room.Dao -import androidx.room.Query -import androidx.room.Upsert -import kotlinx.coroutines.flow.Flow - -@Dao -interface SynchronizeNostrEventResultDao { - @Upsert - fun upsert(synchronizeNostrEventResult: SynchronizeNostrEventResult) -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/intermdiate/LocalBroadcastNostrEventRequest.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/intermdiate/LocalBroadcastNostrEventRequest.kt deleted file mode 100644 index f9621ea4..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/intermdiate/LocalBroadcastNostrEventRequest.kt +++ /dev/null @@ -1,19 +0,0 @@ -package ac.aux.compose.database.model.intermdiate - -import ac.aux.compose.database.model.BroadcastNostrEventReceipt -import ac.aux.compose.database.model.BroadcastNostrEventRequest -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Profile -import ac.aux.compose.database.model.UnsignedNostrEvent -import androidx.room.Embedded -import androidx.room.Relation - -data class LocalBroadcastNostrEventRequest( - @Embedded val broadcastNostrEventRequest: BroadcastNostrEventRequest, - - @Relation( - parentColumn = "nostrEventId", - entityColumn = "id" - ) - val nostrEvent: NostrEvent, -) diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/intermdiate/LocalProfile.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/intermdiate/LocalProfile.kt deleted file mode 100644 index a0905bf4..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/intermdiate/LocalProfile.kt +++ /dev/null @@ -1,20 +0,0 @@ -package ac.aux.compose.database.model.intermdiate - -import ac.aux.compose.database.model.BroadcastNostrEventReceipt -import ac.aux.compose.database.model.BroadcastNostrEventRequest -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Profile -import ac.aux.compose.database.model.SynchronizeNostrEventRequest -import ac.aux.compose.database.model.UnsignedNostrEvent -import androidx.room.Embedded -import androidx.room.Relation - -data class LocalProfile( - @Embedded val nostrEvent: NostrEvent, - - @Relation( - parentColumn = "pubKey", - entityColumn = "publicKey" - ) - val profile: Profile, -) diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/typealiases/HexArray.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/typealiases/HexArray.kt deleted file mode 100644 index fb08f2d7..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/typealiases/HexArray.kt +++ /dev/null @@ -1,4 +0,0 @@ -package ac.aux.compose.database.model.typealiases - -typealias HexArray = Array - diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/typealiases/KindArray.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/typealiases/KindArray.kt deleted file mode 100644 index 4bcfa0b4..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/typealiases/KindArray.kt +++ /dev/null @@ -1,3 +0,0 @@ -package ac.aux.compose.database.model.typealiases - -typealias KindArray = Array \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/typealiases/SynchronizationFilterArray.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/typealiases/SynchronizationFilterArray.kt deleted file mode 100644 index 879174d1..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/typealiases/SynchronizationFilterArray.kt +++ /dev/null @@ -1,5 +0,0 @@ -package ac.aux.compose.database.model.typealiases - -import ac.aux.compose.database.model.types.SynchronizationFilter - -typealias SynchronizationFilterArray = Array \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/repository/DatabasePostRepository.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/database/repository/DatabasePostRepository.kt deleted file mode 100644 index 08240b7c..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/repository/DatabasePostRepository.kt +++ /dev/null @@ -1,11 +0,0 @@ -package ac.aux.compose.database.repository - -import ac.aux.compose.database.AuxDatabase -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.repository.PostRepository - -class DatabasePostRepository( - private val database: AuxDatabase -): PostRepository { - -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/exceptions/InvalidNostrPrivateKeyException.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/exceptions/InvalidNostrPrivateKeyException.kt deleted file mode 100644 index 14f35500..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/exceptions/InvalidNostrPrivateKeyException.kt +++ /dev/null @@ -1,3 +0,0 @@ -package ac.aux.compose.exceptions - -class InvalidNostrPrivateKeyException: RuntimeException() \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/UserAgent.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/network/UserAgent.kt deleted file mode 100644 index 50e9038a..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/UserAgent.kt +++ /dev/null @@ -1,15 +0,0 @@ -package ac.aux.compose.network - -import kotlinx.serialization.json.JsonArray -import kotlinx.serialization.json.add -import kotlinx.serialization.json.buildJsonArray - -object UserAgent { - const val APP_NAME = "Aux" - const val CLIENT_NAME = "Aux" -} - -fun String.asClientTag(): Array = arrayOf( - "client", - this -) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/repository/PostRepository.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/repository/PostRepository.kt deleted file mode 100644 index 70516ea8..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/repository/PostRepository.kt +++ /dev/null @@ -1,6 +0,0 @@ -package ac.aux.compose.repository - -import ac.aux.compose.database.model.NostrEvent - -interface PostRepository { -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/BlankRoute.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/BlankRoute.kt deleted file mode 100755 index 99f6ebec..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/BlankRoute.kt +++ /dev/null @@ -1,6 +0,0 @@ -package ac.aux.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/ac/aux/compose/ui/composable/navigation/routes/CreateProfileRoute.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/CreateProfileRoute.kt deleted file mode 100755 index 303b69b9..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/CreateProfileRoute.kt +++ /dev/null @@ -1,12 +0,0 @@ -package ac.aux.compose.ui.composable.navigation.routes - -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Profile -import kotlinx.serialization.Serializable -import kotlin.time.Clock - -@Serializable -data class CreateProfileRoute( - val nostrEventId: String? = null, -): Route() { -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/FeedRoute.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/FeedRoute.kt deleted file mode 100755 index 3d357c7d..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/FeedRoute.kt +++ /dev/null @@ -1,6 +0,0 @@ -package ac.aux.compose.ui.composable.navigation.routes - -import kotlinx.serialization.Serializable - -@Serializable -object FeedRoute: Route() \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/LandingRoute.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/LandingRoute.kt deleted file mode 100755 index 320bb889..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/LandingRoute.kt +++ /dev/null @@ -1,6 +0,0 @@ -package ac.aux.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/ac/aux/compose/ui/composable/navigation/routes/LoadingRoute.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/LoadingRoute.kt deleted file mode 100755 index 59003b2a..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/LoadingRoute.kt +++ /dev/null @@ -1,6 +0,0 @@ -package ac.aux.compose.ui.composable.navigation.routes - -import kotlinx.serialization.Serializable - -@Serializable -object LoadingRoute: Route() \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/NostrEventDetailRoute.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/NostrEventDetailRoute.kt deleted file mode 100755 index 1d9a6e6c..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/NostrEventDetailRoute.kt +++ /dev/null @@ -1,12 +0,0 @@ -package ac.aux.compose.ui.composable.navigation.routes - -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Profile -import kotlinx.serialization.Serializable -import kotlin.time.Clock - -@Serializable -data class NostrEventDetailRoute( - val nostrEventId: String, -): Route() { -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/Route.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/Route.kt deleted file mode 100755 index 222ffd9e..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/Route.kt +++ /dev/null @@ -1,3 +0,0 @@ -package ac.aux.compose.ui.composable.navigation.routes - -abstract class Route \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/SearchRoute.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/SearchRoute.kt deleted file mode 100755 index a85b80d0..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/SearchRoute.kt +++ /dev/null @@ -1,6 +0,0 @@ -package ac.aux.compose.ui.composable.navigation.routes - -import kotlinx.serialization.Serializable - -@Serializable -object SearchRoute: Route() \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/SignInRoute.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/SignInRoute.kt deleted file mode 100755 index 285406e8..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/SignInRoute.kt +++ /dev/null @@ -1,6 +0,0 @@ -package ac.aux.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/ac/aux/compose/ui/composable/navigation/routes/SocialPreconditionRoute.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/SocialPreconditionRoute.kt deleted file mode 100755 index 5895a6b8..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/SocialPreconditionRoute.kt +++ /dev/null @@ -1,6 +0,0 @@ -package ac.aux.compose.ui.composable.navigation.routes - -import kotlinx.serialization.Serializable - -@Serializable -object SocialPreconditionRoute: Route() \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/UnannouncedProfileRoute.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/UnannouncedProfileRoute.kt deleted file mode 100755 index 7c58129a..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/UnannouncedProfileRoute.kt +++ /dev/null @@ -1,13 +0,0 @@ -package ac.aux.compose.ui.composable.navigation.routes - -import ac.aux.compose.database.GENESIS_AT -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Profile -import kotlinx.serialization.Serializable -import kotlin.time.Clock - -@Serializable -data class UnannouncedProfileRoute( - val nostrEventId: String, -): Route() { -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/UnindexedProfileRoute.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/UnindexedProfileRoute.kt deleted file mode 100755 index 161569a0..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/UnindexedProfileRoute.kt +++ /dev/null @@ -1,13 +0,0 @@ -package ac.aux.compose.ui.composable.navigation.routes - -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Profile -import kotlinx.serialization.Serializable -import kotlin.time.Clock - -@Serializable -data class UnindexedProfileRoute( - val nostrEventId: String, -): Route() { - -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/UnqueuedProfileRoute.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/UnqueuedProfileRoute.kt deleted file mode 100755 index 78fe58d1..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/UnqueuedProfileRoute.kt +++ /dev/null @@ -1,13 +0,0 @@ -package ac.aux.compose.ui.composable.navigation.routes - -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Profile -import kotlinx.serialization.Serializable -import kotlin.time.Clock - -@Serializable -data class UnqueuedProfileRoute( - val nostrEventId: String, -): Route() { - -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/UnsignedProfileRoute.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/UnsignedProfileRoute.kt deleted file mode 100755 index 778f11a4..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/UnsignedProfileRoute.kt +++ /dev/null @@ -1,12 +0,0 @@ -package ac.aux.compose.ui.composable.navigation.routes - -import ac.aux.compose.database.GENESIS_AT -import ac.aux.compose.database.model.UnsignedNostrEvent -import kotlinx.serialization.Serializable -import kotlin.time.Clock - -@Serializable -data class UnsignedProfileRoute( - val unsignedNostrEventId: Long, -): Route() { -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/WriteNewNoteRoute.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/WriteNewNoteRoute.kt deleted file mode 100755 index 90184554..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/WriteNewNoteRoute.kt +++ /dev/null @@ -1,12 +0,0 @@ -package ac.aux.compose.ui.composable.navigation.routes - -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Profile -import kotlinx.serialization.Serializable -import kotlin.time.Clock - -@Serializable -data class WriteNewNoteRoute( - val inReplyToEventId: String? = null, -): Route() { -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/feed/Dummy.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/feed/Dummy.kt deleted file mode 100644 index 7d82ef27..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/feed/Dummy.kt +++ /dev/null @@ -1,6 +0,0 @@ -package ac.aux.compose.ui.composable.widgets.feed - -import com.vitorpamplona.quartz.nip01Core.core.Event -import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair -import kotlin.time.Clock - diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/feed/FeedListItem.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/feed/FeedListItem.kt deleted file mode 100644 index e77fb120..00000000 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/feed/FeedListItem.kt +++ /dev/null @@ -1,20 +0,0 @@ -package ac.aux.compose.ui.composable.widgets.feed - -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.intermdiate.LocalNostrEvent -import androidx.compose.foundation.layout.padding -import androidx.compose.material3.ElevatedCard -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.unit.dp -import com.vitorpamplona.quartz.nip01Core.core.HexKey - -@Composable -fun FeedListItem( - localNostrEvent: LocalNostrEvent, - onNavigateToEvent: (HexKey) -> Unit -) { - localNostrEvent.ListView( - onNavigateToEvent = onNavigateToEvent - ) -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/AuxApp.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/AuxApp.kt similarity index 73% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/AuxApp.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/AuxApp.kt index 0ef844f1..516d4edb 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/AuxApp.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/AuxApp.kt @@ -1,8 +1,7 @@ -package ac.aux.compose +package ac.cord.auxiliary.compose -import ac.aux.compose.ui.composable.navigation.AuxNavHost -import ac.aux.compose.ui.composable.navigation.routes.LandingRoute -import ac.aux.compose.ui.theme.AuxTheme +import ac.cord.auxiliary.compose.ui.composable.navigation.AuxNavHost +import ac.cord.auxiliary.compose.ui.theme.AuxTheme import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material3.Surface import androidx.compose.runtime.* diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/AuxGlobal.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/AuxGlobal.kt similarity index 64% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/AuxGlobal.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/AuxGlobal.kt index eded1563..bf5e7b61 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/AuxGlobal.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/AuxGlobal.kt @@ -1,4 +1,4 @@ -package ac.aux.compose +package ac.cord.auxiliary.compose class AuxGlobal( val platformContext: PlatformContext diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/Platform.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/Platform.kt new file mode 100644 index 00000000..0e3d3bb2 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/Platform.kt @@ -0,0 +1,7 @@ +package ac.cord.auxiliary.compose + +interface Platform { + val name: String +} + +expect fun getPlatform(): Platform \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/PlatformContext.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/PlatformContext.kt new file mode 100644 index 00000000..0354337a --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/PlatformContext.kt @@ -0,0 +1,3 @@ +package ac.cord.auxiliary.compose + +expect class PlatformContext \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/cryptography/Extensions.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/cryptography/Extensions.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/cryptography/Extensions.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/cryptography/Extensions.kt index 0fa6b8d8..bd3d64ca 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/cryptography/Extensions.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/cryptography/Extensions.kt @@ -1,7 +1,7 @@ -package ac.aux.compose.cryptography +package ac.cord.auxiliary.compose.cryptography -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.UnsignedNostrEvent +import ac.cord.auxiliary.compose.database.model.NostrEvent +import ac.cord.auxiliary.compose.database.model.UnsignedNostrEvent import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/AuxDatabase.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/AuxDatabase.kt new file mode 100644 index 00000000..2b3a7fa3 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/AuxDatabase.kt @@ -0,0 +1,89 @@ +package ac.cord.auxiliary.compose.database + +import ac.cord.auxiliary.compose.database.converters.AuxConverters +import ac.cord.auxiliary.compose.database.dao.BroadcastNostrEventReceiptDao +import ac.cord.auxiliary.compose.database.dao.BroadcastNostrEventRequestDao +import ac.cord.auxiliary.compose.database.dao.NostrDao +import ac.cord.auxiliary.compose.database.dao.NostrEventDao +import ac.cord.auxiliary.compose.database.dao.PostDao +import ac.cord.auxiliary.compose.database.dao.ProfileDao +import ac.cord.auxiliary.compose.database.dao.ReactionDao +import ac.cord.auxiliary.compose.database.dao.RecentSearchDao +import ac.cord.auxiliary.compose.database.dao.RelayDao +import ac.cord.auxiliary.compose.database.dao.RepostDao +import ac.cord.auxiliary.compose.database.dao.SynchronizeNostrEventRequestDao +import ac.cord.auxiliary.compose.database.dao.SynchronizeNostrEventResultDao +import ac.cord.auxiliary.compose.database.dao.UnsignedNostrEventDao +import ac.cord.auxiliary.compose.database.dao.ZapDao +import ac.cord.auxiliary.compose.database.model.BroadcastNostrEventReceipt +import ac.cord.auxiliary.compose.database.model.BroadcastNostrEventRequest +import ac.cord.auxiliary.compose.database.model.NostrEvent +import ac.cord.auxiliary.compose.database.model.Post +import ac.cord.auxiliary.compose.database.model.Profile +import ac.cord.auxiliary.compose.database.model.Reaction +import ac.cord.auxiliary.compose.database.model.RecentSearch +import ac.cord.auxiliary.compose.database.model.Relay +import ac.cord.auxiliary.compose.database.model.Repost +import ac.cord.auxiliary.compose.database.model.SynchronizeNostrEventRequest +import ac.cord.auxiliary.compose.database.model.SynchronizeNostrEventResult +import ac.cord.auxiliary.compose.database.model.UnsignedNostrEvent +import ac.cord.auxiliary.compose.database.model.Zap +import androidx.room.Database +import androidx.room.RoomDatabase +import androidx.room.TypeConverters +import androidx.room.immediateTransaction +import androidx.room.useWriterConnection +import kotlin.time.Instant + +val GENESIS_AT = Instant.fromEpochMilliseconds(1231006505000L) + +@Database( + entities = [ + BroadcastNostrEventReceipt::class, + BroadcastNostrEventRequest::class, + NostrEvent::class, + Post::class, + Profile::class, + Reaction::class, + RecentSearch::class, + Relay::class, + Repost::class, + SynchronizeNostrEventRequest::class, + SynchronizeNostrEventResult::class, + UnsignedNostrEvent::class, + Zap::class + ], + version = 1 +) +@TypeConverters(AuxConverters::class) +abstract class AuxDatabase: RoomDatabase() { + abstract fun broadcastNostrEventReceiptDao(): BroadcastNostrEventReceiptDao + abstract fun broadcastNostrEventRequestDao(): BroadcastNostrEventRequestDao + abstract fun nostrDao(): NostrDao + + abstract fun nostrEventDao(): NostrEventDao + abstract fun postDao(): PostDao + abstract fun profileDao(): ProfileDao + abstract fun reactionDao(): ReactionDao + + abstract fun recentSearchDao(): RecentSearchDao + + abstract fun relayDao(): RelayDao + + abstract fun repostDao(): RepostDao + + abstract fun synchronizeNostrEventRequestDao(): SynchronizeNostrEventRequestDao + + abstract fun synchronizeNostrEventResultDao(): SynchronizeNostrEventResultDao + + abstract fun unsignedNostrEventDao(): UnsignedNostrEventDao + abstract fun zapDao(): ZapDao + + suspend fun wipeData() { + useWriterConnection { transactor -> + transactor.immediateTransaction { + // TODO: Actually delete the data... + } + } + } +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/AuxDatabaseConstructor.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/AuxDatabaseConstructor.kt similarity index 83% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/AuxDatabaseConstructor.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/AuxDatabaseConstructor.kt index 9d37d991..9fba8a64 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/AuxDatabaseConstructor.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/AuxDatabaseConstructor.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.database +package ac.cord.auxiliary.compose.database import androidx.room.RoomDatabaseConstructor diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/builder/PlatformDatabaseBuilder.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/builder/PlatformDatabaseBuilder.kt similarity index 79% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/builder/PlatformDatabaseBuilder.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/builder/PlatformDatabaseBuilder.kt index 8ddc7bc5..127e14c6 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/builder/PlatformDatabaseBuilder.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/builder/PlatformDatabaseBuilder.kt @@ -1,7 +1,7 @@ -package ac.aux.compose.database.builder +package ac.cord.auxiliary.compose.database.builder -import ac.aux.compose.PlatformContext -import ac.aux.compose.database.AuxDatabase +import ac.cord.auxiliary.compose.PlatformContext +import ac.cord.auxiliary.compose.database.AuxDatabase import androidx.room.RoomDatabase import androidx.sqlite.driver.bundled.BundledSQLiteDriver import kotlinx.coroutines.Dispatchers diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/converters/Converters.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/converters/Converters.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/converters/Converters.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/converters/Converters.kt index 52821a1f..616f3fca 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/converters/Converters.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/converters/Converters.kt @@ -1,11 +1,10 @@ -package ac.aux.compose.database.converters +package ac.cord.auxiliary.compose.database.converters -import ac.aux.compose.database.model.typealiases.SynchronizationFilterArray -import ac.aux.compose.database.model.typealiases.HexArray -import ac.aux.compose.database.model.typealiases.KindArray +import ac.cord.auxiliary.compose.database.model.typealiases.SynchronizationFilterArray +import ac.cord.auxiliary.compose.database.model.typealiases.HexArray +import ac.cord.auxiliary.compose.database.model.typealiases.KindArray import androidx.room.TypeConverter import co.touchlab.kermit.Logger -import com.vitorpamplona.quartz.nip01Core.core.OptimizedJsonMapper import com.vitorpamplona.quartz.nip01Core.core.TagArray import kotlinx.serialization.json.Json import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/BroadcastNostrEventReceiptDao.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/BroadcastNostrEventReceiptDao.kt similarity index 81% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/BroadcastNostrEventReceiptDao.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/BroadcastNostrEventReceiptDao.kt index cab796e1..10c4980c 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/BroadcastNostrEventReceiptDao.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/BroadcastNostrEventReceiptDao.kt @@ -1,7 +1,6 @@ -package ac.aux.compose.database.dao +package ac.cord.auxiliary.compose.database.dao -import ac.aux.compose.database.model.BroadcastNostrEventReceipt -import ac.aux.compose.database.model.BroadcastNostrEventRequest +import ac.cord.auxiliary.compose.database.model.BroadcastNostrEventReceipt import androidx.room.Dao import androidx.room.Query import androidx.room.Upsert diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/BroadcastNostrEventRequestDao.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/BroadcastNostrEventRequestDao.kt similarity index 78% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/BroadcastNostrEventRequestDao.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/BroadcastNostrEventRequestDao.kt index c2c197a5..1acae23d 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/BroadcastNostrEventRequestDao.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/BroadcastNostrEventRequestDao.kt @@ -1,7 +1,7 @@ -package ac.aux.compose.database.dao +package ac.cord.auxiliary.compose.database.dao -import ac.aux.compose.database.model.BroadcastNostrEventRequest -import ac.aux.compose.database.model.intermdiate.LocalBroadcastNostrEventRequest +import ac.cord.auxiliary.compose.database.model.BroadcastNostrEventRequest +import ac.cord.auxiliary.compose.database.model.intermdiate.LocalBroadcastNostrEventRequest import androidx.room.Dao import androidx.room.Query import androidx.room.Upsert diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/NostrDao.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/NostrDao.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/NostrDao.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/NostrDao.kt index bfc48507..1b5835ee 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/NostrDao.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/NostrDao.kt @@ -1,24 +1,21 @@ -package ac.aux.compose.database.dao +package ac.cord.auxiliary.compose.database.dao -import ac.aux.compose.database.AuxDatabase -import ac.aux.compose.database.GENESIS_AT -import ac.aux.compose.database.model.BroadcastNostrEventRequest -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Post -import ac.aux.compose.database.model.Profile -import ac.aux.compose.database.model.SynchronizeNostrEventRequest -import ac.aux.compose.database.model.UnsignedNostrEvent -import ac.aux.compose.database.model.types.SynchronizationFilter +import ac.cord.auxiliary.compose.database.AuxDatabase +import ac.cord.auxiliary.compose.database.GENESIS_AT +import ac.cord.auxiliary.compose.database.model.BroadcastNostrEventRequest +import ac.cord.auxiliary.compose.database.model.NostrEvent +import ac.cord.auxiliary.compose.database.model.Post +import ac.cord.auxiliary.compose.database.model.Profile +import ac.cord.auxiliary.compose.database.model.SynchronizeNostrEventRequest +import ac.cord.auxiliary.compose.database.model.UnsignedNostrEvent +import ac.cord.auxiliary.compose.database.model.types.SynchronizationFilter import androidx.room.Dao import androidx.room.Transaction import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip01Core.tags.events.taggedEvents import com.vitorpamplona.quartz.nip01Core.tags.people.taggedUsers -import com.vitorpamplona.quartz.nip37Drafts.DraftWrapEvent -import kotlin.math.log import kotlin.time.Clock -import kotlin.time.Instant @Dao abstract class NostrDao( diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/NostrEventDao.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/NostrEventDao.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/NostrEventDao.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/NostrEventDao.kt index 4208c70d..3c57c917 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/NostrEventDao.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/NostrEventDao.kt @@ -1,18 +1,15 @@ -package ac.aux.compose.database.dao +package ac.cord.auxiliary.compose.database.dao -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.intermdiate.LocalNostrEvent +import ac.cord.auxiliary.compose.database.model.NostrEvent +import ac.cord.auxiliary.compose.database.model.intermdiate.LocalNostrEvent import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy.Companion.IGNORE import androidx.room.Query -import androidx.room.RawQuery -import androidx.room.RoomRawQuery import androidx.room.Upsert import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.Kind import kotlinx.coroutines.flow.Flow -import kotlin.time.Instant @Dao interface NostrEventDao { diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/PostDao.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/PostDao.kt similarity index 58% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/PostDao.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/PostDao.kt index 2adf3df1..4912784b 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/PostDao.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/PostDao.kt @@ -1,15 +1,11 @@ -package ac.aux.compose.database.dao +package ac.cord.auxiliary.compose.database.dao -import ac.aux.compose.database.model.Post -import ac.aux.compose.database.model.Profile -import ac.aux.compose.database.model.intermdiate.LocalPost +import ac.cord.auxiliary.compose.database.model.Post +import ac.cord.auxiliary.compose.database.model.intermdiate.LocalPost import androidx.room.Dao -import androidx.room.Embedded import androidx.room.Insert import androidx.room.Query -import androidx.room.Relation import androidx.room.Upsert -import kotlinx.coroutines.flow.Flow @Dao interface PostDao { diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/ProfileDao.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/ProfileDao.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/ProfileDao.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/ProfileDao.kt index be023a80..e4f55b46 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/ProfileDao.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/ProfileDao.kt @@ -1,8 +1,7 @@ -package ac.aux.compose.database.dao +package ac.cord.auxiliary.compose.database.dao -import ac.aux.compose.database.model.Profile -import ac.aux.compose.database.model.intermdiate.LocalAccount -import ac.aux.compose.database.model.intermdiate.LocalProfile +import ac.cord.auxiliary.compose.database.model.Profile +import ac.cord.auxiliary.compose.database.model.intermdiate.LocalProfile import androidx.room.Dao import androidx.room.Insert import androidx.room.Query diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/ReactionDao.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/ReactionDao.kt similarity index 77% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/ReactionDao.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/ReactionDao.kt index fe4d979f..24954519 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/ReactionDao.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/ReactionDao.kt @@ -1,8 +1,7 @@ -package ac.aux.compose.database.dao +package ac.cord.auxiliary.compose.database.dao -import ac.aux.compose.database.model.Reaction +import ac.cord.auxiliary.compose.database.model.Reaction import androidx.room.Dao -import androidx.room.Insert import androidx.room.Query import androidx.room.Upsert import kotlinx.coroutines.flow.Flow diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/RecentSearchDao.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/RecentSearchDao.kt similarity index 79% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/RecentSearchDao.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/RecentSearchDao.kt index be736588..ea64d40b 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/RecentSearchDao.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/RecentSearchDao.kt @@ -1,10 +1,8 @@ -package ac.aux.compose.database.dao +package ac.cord.auxiliary.compose.database.dao -import ac.aux.compose.database.model.RecentSearch -import ac.aux.compose.database.model.Zap +import ac.cord.auxiliary.compose.database.model.RecentSearch import androidx.room.Dao import androidx.room.Delete -import androidx.room.Insert import androidx.room.Query import androidx.room.Upsert import kotlinx.coroutines.flow.Flow diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/RelayDao.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/RelayDao.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/RelayDao.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/RelayDao.kt index f6d30f7e..618a795b 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/RelayDao.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/RelayDao.kt @@ -1,7 +1,6 @@ -package ac.aux.compose.database.dao +package ac.cord.auxiliary.compose.database.dao -import ac.aux.compose.database.model.Relay -import ac.aux.compose.database.model.UnsignedNostrEvent +import ac.cord.auxiliary.compose.database.model.Relay import androidx.room.Dao import androidx.room.Query import androidx.room.Upsert diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/RepostDao.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/RepostDao.kt similarity index 77% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/RepostDao.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/RepostDao.kt index 9562ec3d..9651e693 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/RepostDao.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/RepostDao.kt @@ -1,8 +1,7 @@ -package ac.aux.compose.database.dao +package ac.cord.auxiliary.compose.database.dao -import ac.aux.compose.database.model.Repost +import ac.cord.auxiliary.compose.database.model.Repost import androidx.room.Dao -import androidx.room.Insert import androidx.room.Query import androidx.room.Upsert import kotlinx.coroutines.flow.Flow diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/SynchronizeNostrEventRequestDao.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/SynchronizeNostrEventRequestDao.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/SynchronizeNostrEventRequestDao.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/SynchronizeNostrEventRequestDao.kt index 70bb1cc7..7886e9bd 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/SynchronizeNostrEventRequestDao.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/SynchronizeNostrEventRequestDao.kt @@ -1,6 +1,6 @@ -package ac.aux.compose.database.dao +package ac.cord.auxiliary.compose.database.dao -import ac.aux.compose.database.model.SynchronizeNostrEventRequest +import ac.cord.auxiliary.compose.database.model.SynchronizeNostrEventRequest import androidx.room.Dao import androidx.room.Insert import androidx.room.Query diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/SynchronizeNostrEventResultDao.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/SynchronizeNostrEventResultDao.kt new file mode 100644 index 00000000..945e1c12 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/SynchronizeNostrEventResultDao.kt @@ -0,0 +1,11 @@ +package ac.cord.auxiliary.compose.database.dao + +import ac.cord.auxiliary.compose.database.model.SynchronizeNostrEventResult +import androidx.room.Dao +import androidx.room.Upsert + +@Dao +interface SynchronizeNostrEventResultDao { + @Upsert + fun upsert(synchronizeNostrEventResult: SynchronizeNostrEventResult) +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/UnsignedNostrEventDao.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/UnsignedNostrEventDao.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/UnsignedNostrEventDao.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/UnsignedNostrEventDao.kt index 87e417f6..b47510d8 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/UnsignedNostrEventDao.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/UnsignedNostrEventDao.kt @@ -1,7 +1,7 @@ -package ac.aux.compose.database.dao +package ac.cord.auxiliary.compose.database.dao -import ac.aux.compose.database.model.UnsignedNostrEvent -import ac.aux.compose.database.model.intermdiate.LocalAccount +import ac.cord.auxiliary.compose.database.model.UnsignedNostrEvent +import ac.cord.auxiliary.compose.database.model.intermdiate.LocalAccount import androidx.room.Dao import androidx.room.Query import androidx.room.Upsert diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/ZapDao.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/ZapDao.kt similarity index 72% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/ZapDao.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/ZapDao.kt index 022b19b0..c8cce07f 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/dao/ZapDao.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/ZapDao.kt @@ -1,8 +1,7 @@ -package ac.aux.compose.database.dao +package ac.cord.auxiliary.compose.database.dao -import ac.aux.compose.database.model.Zap +import ac.cord.auxiliary.compose.database.model.Zap import androidx.room.Dao -import androidx.room.Insert import androidx.room.Query import androidx.room.Upsert import kotlinx.coroutines.flow.Flow diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/BroadcastNostrEventReceipt.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/BroadcastNostrEventReceipt.kt similarity index 79% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/BroadcastNostrEventReceipt.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/BroadcastNostrEventReceipt.kt index 566f318b..75988e2a 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/BroadcastNostrEventReceipt.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/BroadcastNostrEventReceipt.kt @@ -1,7 +1,7 @@ -package ac.aux.compose.database.model +package ac.cord.auxiliary.compose.database.model -import ac.aux.compose.database.model.traits.NostrEventEntity -import ac.aux.compose.database.model.traits.UnsignedNostrEventEntity +import ac.cord.auxiliary.compose.database.model.traits.NostrEventEntity +import ac.cord.auxiliary.compose.database.model.traits.UnsignedNostrEventEntity import androidx.room.Entity import androidx.room.ForeignKey import androidx.room.Index diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/BroadcastNostrEventRequest.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/BroadcastNostrEventRequest.kt similarity index 79% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/BroadcastNostrEventRequest.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/BroadcastNostrEventRequest.kt index 3643037b..2c4c31cd 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/BroadcastNostrEventRequest.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/BroadcastNostrEventRequest.kt @@ -1,7 +1,7 @@ -package ac.aux.compose.database.model +package ac.cord.auxiliary.compose.database.model -import ac.aux.compose.database.model.traits.NostrEventEntity -import ac.aux.compose.database.model.traits.UnsignedNostrEventEntity +import ac.cord.auxiliary.compose.database.model.traits.NostrEventEntity +import ac.cord.auxiliary.compose.database.model.traits.UnsignedNostrEventEntity import androidx.room.Entity import androidx.room.ForeignKey import androidx.room.Index diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/NostrEvent.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/NostrEvent.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/NostrEvent.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/NostrEvent.kt index 1dc439ca..72508e94 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/NostrEvent.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/NostrEvent.kt @@ -1,10 +1,10 @@ -package ac.aux.compose.database.model +package ac.cord.auxiliary.compose.database.model -import ac.aux.compose.database.model.traits.BroadcastableEntity -import ac.aux.compose.database.model.traits.LocalStoreEntity -import ac.aux.compose.database.model.traits.SoftDeletableEntity -import ac.aux.compose.database.model.traits.TimestampedEntity -import ac.aux.compose.database.model.traits.UnsignedNostrEventEntity +import ac.cord.auxiliary.compose.database.model.traits.BroadcastableEntity +import ac.cord.auxiliary.compose.database.model.traits.LocalStoreEntity +import ac.cord.auxiliary.compose.database.model.traits.SoftDeletableEntity +import ac.cord.auxiliary.compose.database.model.traits.TimestampedEntity +import ac.cord.auxiliary.compose.database.model.traits.UnsignedNostrEventEntity import androidx.room.Entity import androidx.room.Ignore import androidx.room.Index @@ -13,10 +13,8 @@ import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.Kind -import com.vitorpamplona.quartz.nip01Core.core.OptimizedJsonMapper import com.vitorpamplona.quartz.nip01Core.core.TagArray import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent -import com.vitorpamplona.quartz.nip01Core.relay.commands.toRelay.EventCmd import com.vitorpamplona.quartz.nip01Core.tags.events.firstTaggedEvent import com.vitorpamplona.quartz.nip01Core.tags.people.firstTaggedUser import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/Post.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/Post.kt similarity index 75% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/Post.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/Post.kt index eb35a87c..95e3b05d 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/Post.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/Post.kt @@ -1,20 +1,18 @@ -package ac.aux.compose.database.model +package ac.cord.auxiliary.compose.database.model -import ac.aux.compose.database.model.traits.BroadcastableEntity -import ac.aux.compose.database.model.traits.LocalStoreEntity -import ac.aux.compose.database.model.traits.NostrEventEntity -import ac.aux.compose.database.model.traits.ProfilePublicKeyEntity -import ac.aux.compose.database.model.traits.ReplyingToEntity -import ac.aux.compose.database.model.traits.SoftDeletableEntity -import ac.aux.compose.database.model.traits.TimestampedEntity -import ac.aux.compose.database.model.traits.UserViewableEntity +import ac.cord.auxiliary.compose.database.model.traits.BroadcastableEntity +import ac.cord.auxiliary.compose.database.model.traits.LocalStoreEntity +import ac.cord.auxiliary.compose.database.model.traits.NostrEventEntity +import ac.cord.auxiliary.compose.database.model.traits.ProfilePublicKeyEntity +import ac.cord.auxiliary.compose.database.model.traits.ReplyingToEntity +import ac.cord.auxiliary.compose.database.model.traits.SoftDeletableEntity +import ac.cord.auxiliary.compose.database.model.traits.TimestampedEntity +import ac.cord.auxiliary.compose.database.model.traits.UserViewableEntity import androidx.room.Entity import androidx.room.ForeignKey import androidx.room.Index import androidx.room.PrimaryKey import com.vitorpamplona.quartz.nip01Core.core.HexKey -import com.vitorpamplona.quartz.nip01Core.core.Kind -import com.vitorpamplona.quartz.nip01Core.core.TagArray import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/Profile.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/Profile.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/Profile.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/Profile.kt index 6633a6f6..d8ab4fc7 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/Profile.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/Profile.kt @@ -1,11 +1,11 @@ -package ac.aux.compose.database.model +package ac.cord.auxiliary.compose.database.model -import ac.aux.compose.database.model.traits.BroadcastableEntity -import ac.aux.compose.database.model.traits.LocalStoreEntity -import ac.aux.compose.database.model.traits.NostrEventEntity -import ac.aux.compose.database.model.traits.SoftDeletableEntity -import ac.aux.compose.database.model.traits.TimestampedEntity -import ac.aux.compose.database.model.traits.UserViewableEntity +import ac.cord.auxiliary.compose.database.model.traits.BroadcastableEntity +import ac.cord.auxiliary.compose.database.model.traits.LocalStoreEntity +import ac.cord.auxiliary.compose.database.model.traits.NostrEventEntity +import ac.cord.auxiliary.compose.database.model.traits.SoftDeletableEntity +import ac.cord.auxiliary.compose.database.model.traits.TimestampedEntity +import ac.cord.auxiliary.compose.database.model.traits.UserViewableEntity import androidx.room.Entity import androidx.room.ForeignKey import androidx.room.Index diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/Reaction.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/Reaction.kt similarity index 73% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/Reaction.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/Reaction.kt index b3cb6406..2fe96343 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/Reaction.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/Reaction.kt @@ -1,20 +1,18 @@ -package ac.aux.compose.database.model +package ac.cord.auxiliary.compose.database.model -import ac.aux.compose.database.model.traits.BroadcastableEntity -import ac.aux.compose.database.model.traits.LocalStoreEntity -import ac.aux.compose.database.model.traits.NostrEventEntity -import ac.aux.compose.database.model.traits.ProfilePublicKeyEntity -import ac.aux.compose.database.model.traits.ReplyingToEntity -import ac.aux.compose.database.model.traits.SoftDeletableEntity -import ac.aux.compose.database.model.traits.TimestampedEntity -import ac.aux.compose.database.model.traits.UserViewableEntity +import ac.cord.auxiliary.compose.database.model.traits.BroadcastableEntity +import ac.cord.auxiliary.compose.database.model.traits.LocalStoreEntity +import ac.cord.auxiliary.compose.database.model.traits.NostrEventEntity +import ac.cord.auxiliary.compose.database.model.traits.ProfilePublicKeyEntity +import ac.cord.auxiliary.compose.database.model.traits.ReplyingToEntity +import ac.cord.auxiliary.compose.database.model.traits.SoftDeletableEntity +import ac.cord.auxiliary.compose.database.model.traits.TimestampedEntity +import ac.cord.auxiliary.compose.database.model.traits.UserViewableEntity import androidx.room.Entity import androidx.room.ForeignKey import androidx.room.Index import androidx.room.PrimaryKey import com.vitorpamplona.quartz.nip01Core.core.HexKey -import com.vitorpamplona.quartz.nip01Core.core.Kind -import com.vitorpamplona.quartz.nip01Core.core.TagArray import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/RecentSearch.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/RecentSearch.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/RecentSearch.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/RecentSearch.kt index 0c837743..f0ec0e31 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/RecentSearch.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/RecentSearch.kt @@ -1,7 +1,7 @@ -package ac.aux.compose.database.model +package ac.cord.auxiliary.compose.database.model -import ac.aux.compose.database.model.traits.TimestampedEntity -import ac.aux.compose.database.model.typealiases.SynchronizationFilterArray +import ac.cord.auxiliary.compose.database.model.traits.TimestampedEntity +import ac.cord.auxiliary.compose.database.model.typealiases.SynchronizationFilterArray import androidx.room.Entity import androidx.room.PrimaryKey import kotlin.time.Clock diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/Relay.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/Relay.kt similarity index 82% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/Relay.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/Relay.kt index 2a2fb8f2..67c9eb86 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/Relay.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/Relay.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.database.model +package ac.cord.auxiliary.compose.database.model import androidx.room.Entity diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/Repost.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/Repost.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/Repost.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/Repost.kt index e075f7ee..e3ed7229 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/Repost.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/Repost.kt @@ -1,12 +1,12 @@ -package ac.aux.compose.database.model +package ac.cord.auxiliary.compose.database.model -import ac.aux.compose.database.model.traits.BroadcastableEntity -import ac.aux.compose.database.model.traits.LocalStoreEntity -import ac.aux.compose.database.model.traits.NostrEventEntity -import ac.aux.compose.database.model.traits.ProfilePublicKeyEntity -import ac.aux.compose.database.model.traits.SoftDeletableEntity -import ac.aux.compose.database.model.traits.TimestampedEntity -import ac.aux.compose.database.model.traits.UserViewableEntity +import ac.cord.auxiliary.compose.database.model.traits.BroadcastableEntity +import ac.cord.auxiliary.compose.database.model.traits.LocalStoreEntity +import ac.cord.auxiliary.compose.database.model.traits.NostrEventEntity +import ac.cord.auxiliary.compose.database.model.traits.ProfilePublicKeyEntity +import ac.cord.auxiliary.compose.database.model.traits.SoftDeletableEntity +import ac.cord.auxiliary.compose.database.model.traits.TimestampedEntity +import ac.cord.auxiliary.compose.database.model.traits.UserViewableEntity import androidx.room.Entity import androidx.room.ForeignKey import androidx.room.Index diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/SynchronizeNostrEventRequest.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/SynchronizeNostrEventRequest.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/SynchronizeNostrEventRequest.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/SynchronizeNostrEventRequest.kt index 68f0e1b3..9f7f568f 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/SynchronizeNostrEventRequest.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/SynchronizeNostrEventRequest.kt @@ -1,9 +1,9 @@ -package ac.aux.compose.database.model +package ac.cord.auxiliary.compose.database.model -import ac.aux.compose.database.model.traits.OptionalNostrEventEntity -import ac.aux.compose.database.model.traits.TimestampedEntity -import ac.aux.compose.database.model.traits.UnsignedNostrEventEntity -import ac.aux.compose.database.model.typealiases.SynchronizationFilterArray +import ac.cord.auxiliary.compose.database.model.traits.OptionalNostrEventEntity +import ac.cord.auxiliary.compose.database.model.traits.TimestampedEntity +import ac.cord.auxiliary.compose.database.model.traits.UnsignedNostrEventEntity +import ac.cord.auxiliary.compose.database.model.typealiases.SynchronizationFilterArray import androidx.room.Entity import androidx.room.ForeignKey import androidx.room.Index diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/SynchronizeNostrEventResult.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/SynchronizeNostrEventResult.kt similarity index 72% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/SynchronizeNostrEventResult.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/SynchronizeNostrEventResult.kt index 0982835e..5c28f6db 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/SynchronizeNostrEventResult.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/SynchronizeNostrEventResult.kt @@ -1,9 +1,7 @@ -package ac.aux.compose.database.model +package ac.cord.auxiliary.compose.database.model -import ac.aux.compose.database.model.traits.NostrEventEntity -import ac.aux.compose.database.model.traits.OptionalNostrEventEntity -import ac.aux.compose.database.model.traits.TimestampedEntity -import ac.aux.compose.database.model.traits.UnsignedNostrEventEntity +import ac.cord.auxiliary.compose.database.model.traits.OptionalNostrEventEntity +import ac.cord.auxiliary.compose.database.model.traits.TimestampedEntity import androidx.room.Entity import androidx.room.ForeignKey import androidx.room.Index diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/UnsignedNostrEvent.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/UnsignedNostrEvent.kt similarity index 76% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/UnsignedNostrEvent.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/UnsignedNostrEvent.kt index e914a10e..84f95de3 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/UnsignedNostrEvent.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/UnsignedNostrEvent.kt @@ -1,23 +1,15 @@ -package ac.aux.compose.database.model +package ac.cord.auxiliary.compose.database.model -import ac.aux.compose.database.model.traits.BroadcastableEntity -import ac.aux.compose.database.model.traits.LocalStoreEntity -import ac.aux.compose.database.model.traits.SoftDeletableEntity -import ac.aux.compose.database.model.traits.TimestampedEntity +import ac.cord.auxiliary.compose.database.model.traits.BroadcastableEntity +import ac.cord.auxiliary.compose.database.model.traits.LocalStoreEntity +import ac.cord.auxiliary.compose.database.model.traits.SoftDeletableEntity +import ac.cord.auxiliary.compose.database.model.traits.TimestampedEntity import androidx.room.Entity -import androidx.room.ForeignKey import androidx.room.Index import androidx.room.PrimaryKey -import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.Kind import com.vitorpamplona.quartz.nip01Core.core.TagArray -import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent -import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent -import com.vitorpamplona.quartz.nip18Reposts.RepostEvent -import com.vitorpamplona.quartz.nip25Reactions.ReactionEvent -import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent -import com.vitorpamplona.quartz.utils.EventFactory import kotlin.String import kotlin.time.Clock import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/Zap.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/Zap.kt similarity index 80% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/Zap.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/Zap.kt index 9f78d5c1..28eb4381 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/Zap.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/Zap.kt @@ -1,11 +1,11 @@ -package ac.aux.compose.database.model +package ac.cord.auxiliary.compose.database.model -import ac.aux.compose.database.model.traits.BroadcastableEntity -import ac.aux.compose.database.model.traits.LocalStoreEntity -import ac.aux.compose.database.model.traits.NostrEventEntity -import ac.aux.compose.database.model.traits.SoftDeletableEntity -import ac.aux.compose.database.model.traits.TimestampedEntity -import ac.aux.compose.database.model.traits.UserViewableEntity +import ac.cord.auxiliary.compose.database.model.traits.BroadcastableEntity +import ac.cord.auxiliary.compose.database.model.traits.LocalStoreEntity +import ac.cord.auxiliary.compose.database.model.traits.NostrEventEntity +import ac.cord.auxiliary.compose.database.model.traits.SoftDeletableEntity +import ac.cord.auxiliary.compose.database.model.traits.TimestampedEntity +import ac.cord.auxiliary.compose.database.model.traits.UserViewableEntity import androidx.room.Entity import androidx.room.ForeignKey import androidx.room.Index diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/intermdiate/LocalAccount.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalAccount.kt similarity index 65% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/intermdiate/LocalAccount.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalAccount.kt index 4a7cfd82..d990e64e 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/intermdiate/LocalAccount.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalAccount.kt @@ -1,11 +1,11 @@ -package ac.aux.compose.database.model.intermdiate +package ac.cord.auxiliary.compose.database.model.intermdiate -import ac.aux.compose.database.model.BroadcastNostrEventReceipt -import ac.aux.compose.database.model.BroadcastNostrEventRequest -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Profile -import ac.aux.compose.database.model.SynchronizeNostrEventRequest -import ac.aux.compose.database.model.UnsignedNostrEvent +import ac.cord.auxiliary.compose.database.model.BroadcastNostrEventReceipt +import ac.cord.auxiliary.compose.database.model.BroadcastNostrEventRequest +import ac.cord.auxiliary.compose.database.model.NostrEvent +import ac.cord.auxiliary.compose.database.model.Profile +import ac.cord.auxiliary.compose.database.model.SynchronizeNostrEventRequest +import ac.cord.auxiliary.compose.database.model.UnsignedNostrEvent import androidx.room.Embedded import androidx.room.Relation diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalBroadcastNostrEventRequest.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalBroadcastNostrEventRequest.kt new file mode 100644 index 00000000..d943c63a --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalBroadcastNostrEventRequest.kt @@ -0,0 +1,16 @@ +package ac.cord.auxiliary.compose.database.model.intermdiate + +import ac.cord.auxiliary.compose.database.model.BroadcastNostrEventRequest +import ac.cord.auxiliary.compose.database.model.NostrEvent +import androidx.room.Embedded +import androidx.room.Relation + +data class LocalBroadcastNostrEventRequest( + @Embedded val broadcastNostrEventRequest: BroadcastNostrEventRequest, + + @Relation( + parentColumn = "nostrEventId", + entityColumn = "id" + ) + val nostrEvent: NostrEvent, +) diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/intermdiate/LocalNostrEvent.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalNostrEvent.kt similarity index 73% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/intermdiate/LocalNostrEvent.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalNostrEvent.kt index 4a4483fe..537d4e87 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/intermdiate/LocalNostrEvent.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalNostrEvent.kt @@ -1,9 +1,8 @@ -package ac.aux.compose.database.model.intermdiate +package ac.cord.auxiliary.compose.database.model.intermdiate -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Post -import ac.aux.compose.database.model.Profile -import ac.aux.compose.database.model.Repost +import ac.cord.auxiliary.compose.database.model.NostrEvent +import ac.cord.auxiliary.compose.database.model.Profile +import ac.cord.auxiliary.compose.database.model.Repost import androidx.room.Embedded import androidx.room.Relation diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/intermdiate/LocalPost.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalPost.kt similarity index 58% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/intermdiate/LocalPost.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalPost.kt index 269d82b3..492e1be7 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/intermdiate/LocalPost.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalPost.kt @@ -1,7 +1,7 @@ -package ac.aux.compose.database.model.intermdiate +package ac.cord.auxiliary.compose.database.model.intermdiate -import ac.aux.compose.database.model.Post -import ac.aux.compose.database.model.Profile +import ac.cord.auxiliary.compose.database.model.Post +import ac.cord.auxiliary.compose.database.model.Profile import androidx.room.Embedded import androidx.room.Relation diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalProfile.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalProfile.kt new file mode 100644 index 00000000..d12e1536 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalProfile.kt @@ -0,0 +1,16 @@ +package ac.cord.auxiliary.compose.database.model.intermdiate + +import ac.cord.auxiliary.compose.database.model.NostrEvent +import ac.cord.auxiliary.compose.database.model.Profile +import androidx.room.Embedded +import androidx.room.Relation + +data class LocalProfile( + @Embedded val nostrEvent: NostrEvent, + + @Relation( + parentColumn = "pubKey", + entityColumn = "publicKey" + ) + val profile: Profile, +) diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/BroadcastableEntity.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/BroadcastableEntity.kt similarity index 62% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/BroadcastableEntity.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/BroadcastableEntity.kt index 1ea78705..b9a0908e 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/BroadcastableEntity.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/BroadcastableEntity.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.database.model.traits +package ac.cord.auxiliary.compose.database.model.traits import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/LocalStoreEntity.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/LocalStoreEntity.kt similarity index 59% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/LocalStoreEntity.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/LocalStoreEntity.kt index e13630f5..84bbd235 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/LocalStoreEntity.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/LocalStoreEntity.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.database.model.traits +package ac.cord.auxiliary.compose.database.model.traits import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/NostrEventEntity.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/NostrEventEntity.kt similarity index 66% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/NostrEventEntity.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/NostrEventEntity.kt index 9b1605d6..a3b80dda 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/NostrEventEntity.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/NostrEventEntity.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.database.model.traits +package ac.cord.auxiliary.compose.database.model.traits import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/OptionalNostrEventEntity.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/OptionalNostrEventEntity.kt similarity index 68% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/OptionalNostrEventEntity.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/OptionalNostrEventEntity.kt index 6f8876ce..e386dec2 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/OptionalNostrEventEntity.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/OptionalNostrEventEntity.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.database.model.traits +package ac.cord.auxiliary.compose.database.model.traits import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/ProfilePublicKeyEntity.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/ProfilePublicKeyEntity.kt similarity index 68% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/ProfilePublicKeyEntity.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/ProfilePublicKeyEntity.kt index 000990bf..6d2ccb4a 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/ProfilePublicKeyEntity.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/ProfilePublicKeyEntity.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.database.model.traits +package ac.cord.auxiliary.compose.database.model.traits import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/ReplyingToEntity.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/ReplyingToEntity.kt similarity index 66% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/ReplyingToEntity.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/ReplyingToEntity.kt index 360ec8f1..d7a91e68 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/ReplyingToEntity.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/ReplyingToEntity.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.database.model.traits +package ac.cord.auxiliary.compose.database.model.traits import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/SoftDeletableEntity.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/SoftDeletableEntity.kt similarity index 60% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/SoftDeletableEntity.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/SoftDeletableEntity.kt index b49865f7..ad70a10a 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/SoftDeletableEntity.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/SoftDeletableEntity.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.database.model.traits +package ac.cord.auxiliary.compose.database.model.traits import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/TimestampedEntity.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/TimestampedEntity.kt similarity index 66% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/TimestampedEntity.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/TimestampedEntity.kt index d0e0123b..643deebb 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/TimestampedEntity.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/TimestampedEntity.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.database.model.traits +package ac.cord.auxiliary.compose.database.model.traits import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/UnsignedNostrEventEntity.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/UnsignedNostrEventEntity.kt similarity index 56% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/UnsignedNostrEventEntity.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/UnsignedNostrEventEntity.kt index b2836505..b791c106 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/UnsignedNostrEventEntity.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/UnsignedNostrEventEntity.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.database.model.traits +package ac.cord.auxiliary.compose.database.model.traits interface UnsignedNostrEventEntity { val unsignedNostrEventId: Long? diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/UserViewableEntity.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/UserViewableEntity.kt similarity index 60% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/UserViewableEntity.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/UserViewableEntity.kt index 5d2003bd..956ab671 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/traits/UserViewableEntity.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/traits/UserViewableEntity.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.database.model.traits +package ac.cord.auxiliary.compose.database.model.traits import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/typealiases/HexArray.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/typealiases/HexArray.kt new file mode 100644 index 00000000..c4712359 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/typealiases/HexArray.kt @@ -0,0 +1,4 @@ +package ac.cord.auxiliary.compose.database.model.typealiases + +typealias HexArray = Array + diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/typealiases/KindArray.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/typealiases/KindArray.kt new file mode 100644 index 00000000..015e68f3 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/typealiases/KindArray.kt @@ -0,0 +1,3 @@ +package ac.cord.auxiliary.compose.database.model.typealiases + +typealias KindArray = Array \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/typealiases/SynchronizationFilterArray.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/typealiases/SynchronizationFilterArray.kt new file mode 100644 index 00000000..cb062042 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/typealiases/SynchronizationFilterArray.kt @@ -0,0 +1,5 @@ +package ac.cord.auxiliary.compose.database.model.typealiases + +import ac.cord.auxiliary.compose.database.model.types.SynchronizationFilter + +typealias SynchronizationFilterArray = Array \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/types/SynchronizationFilter.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/types/SynchronizationFilter.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/types/SynchronizationFilter.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/types/SynchronizationFilter.kt index 1256548a..e4b163c5 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/model/types/SynchronizationFilter.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/types/SynchronizationFilter.kt @@ -1,9 +1,7 @@ -package ac.aux.compose.database.model.types +package ac.cord.auxiliary.compose.database.model.types -import androidx.sqlite.SQLiteStatement import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.Kind -import com.vitorpamplona.quartz.nip01Core.store.sqlite.bindAny import kotlinx.serialization.Serializable import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/repository/DatabaseNostrRepository.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/repository/DatabaseNostrRepository.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/repository/DatabaseNostrRepository.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/repository/DatabaseNostrRepository.kt index ea041cee..f84a4861 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/repository/DatabaseNostrRepository.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/repository/DatabaseNostrRepository.kt @@ -1,25 +1,24 @@ -package ac.aux.compose.database.repository +package ac.cord.auxiliary.compose.database.repository -import ac.aux.compose.database.AuxDatabase -import ac.aux.compose.database.GENESIS_AT -import ac.aux.compose.database.model.BroadcastNostrEventReceipt -import ac.aux.compose.database.model.BroadcastNostrEventRequest -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Profile -import ac.aux.compose.database.model.RecentSearch -import ac.aux.compose.database.model.Relay -import ac.aux.compose.database.model.SynchronizeNostrEventRequest -import ac.aux.compose.database.model.UnsignedNostrEvent -import ac.aux.compose.database.model.intermdiate.LocalBroadcastNostrEventRequest -import ac.aux.compose.database.model.intermdiate.LocalNostrEvent -import ac.aux.compose.database.model.intermdiate.LocalAccount -import ac.aux.compose.database.model.intermdiate.LocalProfile -import ac.aux.compose.database.model.typealiases.SynchronizationFilterArray -import ac.aux.compose.database.model.types.SynchronizationFilter -import ac.aux.compose.nostr.Relays -import ac.aux.compose.repository.NostrRepository -import ac.aux.compose.repository.RelayRepository -import androidx.room.RoomRawQuery +import ac.cord.auxiliary.compose.database.AuxDatabase +import ac.cord.auxiliary.compose.database.GENESIS_AT +import ac.cord.auxiliary.compose.database.model.BroadcastNostrEventReceipt +import ac.cord.auxiliary.compose.database.model.BroadcastNostrEventRequest +import ac.cord.auxiliary.compose.database.model.NostrEvent +import ac.cord.auxiliary.compose.database.model.Profile +import ac.cord.auxiliary.compose.database.model.RecentSearch +import ac.cord.auxiliary.compose.database.model.Relay +import ac.cord.auxiliary.compose.database.model.SynchronizeNostrEventRequest +import ac.cord.auxiliary.compose.database.model.UnsignedNostrEvent +import ac.cord.auxiliary.compose.database.model.intermdiate.LocalBroadcastNostrEventRequest +import ac.cord.auxiliary.compose.database.model.intermdiate.LocalNostrEvent +import ac.cord.auxiliary.compose.database.model.intermdiate.LocalAccount +import ac.cord.auxiliary.compose.database.model.intermdiate.LocalProfile +import ac.cord.auxiliary.compose.database.model.typealiases.SynchronizationFilterArray +import ac.cord.auxiliary.compose.database.model.types.SynchronizationFilter +import ac.cord.auxiliary.compose.nostr.Relays +import ac.cord.auxiliary.compose.repository.NostrRepository +import ac.cord.auxiliary.compose.repository.RelayRepository import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent @@ -40,7 +39,6 @@ import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent import kotlinx.coroutines.delay import kotlinx.coroutines.flow.Flow -import okio.Buffer import kotlin.collections.emptyMap import kotlin.collections.plus import kotlin.time.Clock diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/repository/DatabasePostRepository.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/repository/DatabasePostRepository.kt new file mode 100644 index 00000000..cc68d586 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/repository/DatabasePostRepository.kt @@ -0,0 +1,10 @@ +package ac.cord.auxiliary.compose.database.repository + +import ac.cord.auxiliary.compose.database.AuxDatabase +import ac.cord.auxiliary.compose.repository.PostRepository + +class DatabasePostRepository( + private val database: AuxDatabase +): PostRepository { + +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/repository/DatabaseSearchRepository.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/repository/DatabaseSearchRepository.kt similarity index 58% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/database/repository/DatabaseSearchRepository.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/repository/DatabaseSearchRepository.kt index a8b17775..cf1de96c 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/database/repository/DatabaseSearchRepository.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/repository/DatabaseSearchRepository.kt @@ -1,9 +1,8 @@ -package ac.aux.compose.database.repository +package ac.cord.auxiliary.compose.database.repository -import ac.aux.compose.database.AuxDatabase -import ac.aux.compose.database.model.Profile -import ac.aux.compose.database.model.SynchronizeNostrEventRequest -import ac.aux.compose.repository.SearchRepository +import ac.cord.auxiliary.compose.database.AuxDatabase +import ac.cord.auxiliary.compose.database.model.SynchronizeNostrEventRequest +import ac.cord.auxiliary.compose.repository.SearchRepository class DatabaseSearchRepository( private val database: AuxDatabase diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/exceptions/InvalidNostrPrivateKeyException.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/exceptions/InvalidNostrPrivateKeyException.kt new file mode 100644 index 00000000..cbd112cd --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/exceptions/InvalidNostrPrivateKeyException.kt @@ -0,0 +1,3 @@ +package ac.cord.auxiliary.compose.exceptions + +class InvalidNostrPrivateKeyException: RuntimeException() \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/exceptions/NetworkException.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/exceptions/NetworkException.kt similarity index 50% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/exceptions/NetworkException.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/exceptions/NetworkException.kt index 12bb3be7..17561c1c 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/exceptions/NetworkException.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/exceptions/NetworkException.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.exceptions +package ac.cord.auxiliary.compose.exceptions class NetworkException( message: String? = null, diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/exceptions/NostrNoticeException.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/exceptions/NostrNoticeException.kt similarity index 50% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/exceptions/NostrNoticeException.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/exceptions/NostrNoticeException.kt index 4deb4eb8..82b6562b 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/exceptions/NostrNoticeException.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/exceptions/NostrNoticeException.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.exceptions +package ac.cord.auxiliary.compose.exceptions class NostrNoticeException( val reason: String?, diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/exceptions/NostrPublishException.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/exceptions/NostrPublishException.kt similarity index 51% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/exceptions/NostrPublishException.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/exceptions/NostrPublishException.kt index 63044405..dcb4c436 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/exceptions/NostrPublishException.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/exceptions/NostrPublishException.kt @@ -1,3 +1,3 @@ -package ac.aux.compose.exceptions +package ac.cord.auxiliary.compose.exceptions class NostrPublishException(override val cause: Throwable?) : RuntimeException() \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/exceptions/SignatureException.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/exceptions/SignatureException.kt similarity index 70% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/exceptions/SignatureException.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/exceptions/SignatureException.kt index 4db85945..3dd164ba 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/exceptions/SignatureException.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/exceptions/SignatureException.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.exceptions +package ac.cord.auxiliary.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/ac/aux/compose/exceptions/SigningKeyNotFoundException.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/exceptions/SigningKeyNotFoundException.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/exceptions/SigningKeyNotFoundException.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/exceptions/SigningKeyNotFoundException.kt index ad24bd28..ed3d6825 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/exceptions/SigningKeyNotFoundException.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/exceptions/SigningKeyNotFoundException.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.exceptions +package ac.cord.auxiliary.compose.exceptions class SigningKeyNotFoundException(message: String? = null, cause: Throwable? = null) : SignatureException( message, diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/exceptions/SigningRejectedException.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/exceptions/SigningRejectedException.kt similarity index 72% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/exceptions/SigningRejectedException.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/exceptions/SigningRejectedException.kt index 5ce41615..b694a5ff 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/exceptions/SigningRejectedException.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/exceptions/SigningRejectedException.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.exceptions +package ac.cord.auxiliary.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/ac/aux/compose/extensions/Instant.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/extensions/Instant.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/extensions/Instant.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/extensions/Instant.kt index ca2d8b61..11ff8419 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/extensions/Instant.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/extensions/Instant.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.extensions +package ac.cord.auxiliary.compose.extensions import kotlinx.datetime.LocalDateTime import kotlinx.datetime.TimeZone diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/managers/CredentialsManager.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/managers/CredentialsManager.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/managers/CredentialsManager.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/managers/CredentialsManager.kt index 219110c7..089f220b 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/managers/CredentialsManager.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/managers/CredentialsManager.kt @@ -1,6 +1,6 @@ -package ac.aux.compose.managers +package ac.cord.auxiliary.compose.managers -import ac.aux.compose.exceptions.InvalidNostrPrivateKeyException +import ac.cord.auxiliary.compose.exceptions.InvalidNostrPrivateKeyException import androidx.datastore.core.DataStore import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip19Bech32.bech32.Bech32 diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/managers/DatabaseManager.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/managers/DatabaseManager.kt similarity index 70% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/managers/DatabaseManager.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/managers/DatabaseManager.kt index a956509d..75ff6492 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/managers/DatabaseManager.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/managers/DatabaseManager.kt @@ -1,10 +1,8 @@ -package ac.aux.compose.managers +package ac.cord.auxiliary.compose.managers -import ac.aux.compose.AuxGlobal -import ac.aux.compose.database.AuxDatabaseConstructor -import ac.aux.compose.database.builder.PlatformDatabaseBuilder -import ac.aux.compose.database.builder.getRoomDatabase -import androidx.room.Room +import ac.cord.auxiliary.compose.AuxGlobal +import ac.cord.auxiliary.compose.database.builder.PlatformDatabaseBuilder +import ac.cord.auxiliary.compose.database.builder.getRoomDatabase class DatabaseManager( auxGlobal: AuxGlobal diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/managers/SeedManager.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/managers/SeedManager.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/managers/SeedManager.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/managers/SeedManager.kt index bd869c90..88c0f658 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/managers/SeedManager.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/managers/SeedManager.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.managers +package ac.cord.auxiliary.compose.managers import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/UserAgent.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/UserAgent.kt new file mode 100644 index 00000000..151e30fe --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/UserAgent.kt @@ -0,0 +1,11 @@ +package ac.cord.auxiliary.compose.network + +object UserAgent { + const val APP_NAME = "Aux" + const val CLIENT_NAME = "Aux" +} + +fun String.asClientTag(): Array = arrayOf( + "client", + this +) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/dto/RelayDTO.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/dto/RelayDTO.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/network/dto/RelayDTO.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/dto/RelayDTO.kt index 1fe82a2a..aeafc745 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/dto/RelayDTO.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/dto/RelayDTO.kt @@ -1,6 +1,6 @@ -package ac.aux.compose.network.dto +package ac.cord.auxiliary.compose.network.dto -import ac.aux.compose.database.model.Relay +import ac.cord.auxiliary.compose.database.model.Relay import kotlinx.serialization.Serializable @Serializable diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/relays/FallbackRelays.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/relays/FallbackRelays.kt similarity index 73% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/network/relays/FallbackRelays.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/relays/FallbackRelays.kt index e9a26b43..55cdc6d1 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/relays/FallbackRelays.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/relays/FallbackRelays.kt @@ -1,6 +1,6 @@ -package ac.aux.compose.network.relays +package ac.cord.auxiliary.compose.network.relays -import ac.aux.compose.network.dto.toRelayDTO +import ac.cord.auxiliary.compose.network.dto.toRelayDTO val FALLBACK_RELAYS = listOf( "wss://relay.primal.net", diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/relays/NostrPublishResult.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/relays/NostrPublishResult.kt similarity index 54% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/network/relays/NostrPublishResult.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/relays/NostrPublishResult.kt index dc47f089..ca917685 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/relays/NostrPublishResult.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/relays/NostrPublishResult.kt @@ -1,6 +1,6 @@ -package ac.aux.compose.network.relays +package ac.cord.auxiliary.compose.network.relays -import ac.aux.compose.network.sockets.NostrIncomingMessage +import ac.cord.auxiliary.compose.network.sockets.NostrIncomingMessage data class NostrPublishResult( val result: NostrIncomingMessage? = null, diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/relays/RelayPool.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/relays/RelayPool.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/network/relays/RelayPool.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/relays/RelayPool.kt index 94577370..a2cb6731 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/relays/RelayPool.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/relays/RelayPool.kt @@ -1,9 +1,9 @@ -package ac.aux.compose.network.relays +package ac.cord.auxiliary.compose.network.relays -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.exceptions.NetworkException -import ac.aux.compose.exceptions.NostrNoticeException -import ac.aux.compose.network.dto.RelayDTO +import ac.cord.auxiliary.compose.database.model.NostrEvent +import ac.cord.auxiliary.compose.exceptions.NetworkException +import ac.cord.auxiliary.compose.exceptions.NostrNoticeException +import ac.cord.auxiliary.compose.network.dto.RelayDTO import androidx.annotation.VisibleForTesting import kotlin.time.Duration.Companion.milliseconds import kotlinx.coroutines.CoroutineScope @@ -13,22 +13,21 @@ import kotlinx.coroutines.IO import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow -import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.getAndUpdate import kotlinx.coroutines.flow.timeout import kotlinx.coroutines.flow.transform import kotlinx.coroutines.launch -import ac.aux.compose.exceptions.NostrPublishException -import ac.aux.compose.network.dto.toRelayDTO -import ac.aux.compose.network.sockets.NostrIncomingMessage -import ac.aux.compose.network.sockets.NostrSocketClient -import ac.aux.compose.network.sockets.NostrSocketClientFactory -import ac.aux.compose.network.sockets.SocketConnectionClosedCallback -import ac.aux.compose.network.sockets.SocketConnectionOpenedCallback -import ac.aux.compose.network.sockets.filterByEventId -import ac.aux.compose.network.sockets.filterBySubscriptionId -import ac.aux.compose.repository.CachingImportRepository +import ac.cord.auxiliary.compose.exceptions.NostrPublishException +import ac.cord.auxiliary.compose.network.dto.toRelayDTO +import ac.cord.auxiliary.compose.network.sockets.NostrIncomingMessage +import ac.cord.auxiliary.compose.network.sockets.NostrSocketClient +import ac.cord.auxiliary.compose.network.sockets.NostrSocketClientFactory +import ac.cord.auxiliary.compose.network.sockets.SocketConnectionClosedCallback +import ac.cord.auxiliary.compose.network.sockets.SocketConnectionOpenedCallback +import ac.cord.auxiliary.compose.network.sockets.filterByEventId +import ac.cord.auxiliary.compose.network.sockets.filterBySubscriptionId +import ac.cord.auxiliary.compose.repository.CachingImportRepository import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.OptimizedJsonMapper import com.vitorpamplona.quartz.nip01Core.relay.commands.toRelay.CloseCmd diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/relays/RelaysSocketManager.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/relays/RelaysSocketManager.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/network/relays/RelaysSocketManager.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/relays/RelaysSocketManager.kt index a48b5f0c..ed5ab73e 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/relays/RelaysSocketManager.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/relays/RelaysSocketManager.kt @@ -1,11 +1,11 @@ -package ac.aux.compose.network.relays +package ac.cord.auxiliary.compose.network.relays -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.network.dto.RelayDTO -import ac.aux.compose.network.dto.mapToRelayDTO -import ac.aux.compose.network.sockets.NostrSocketClientFactory -import ac.aux.compose.repository.CachingImportRepository -import ac.aux.compose.repository.RelayRepository +import ac.cord.auxiliary.compose.database.model.NostrEvent +import ac.cord.auxiliary.compose.network.dto.RelayDTO +import ac.cord.auxiliary.compose.network.dto.mapToRelayDTO +import ac.cord.auxiliary.compose.network.sockets.NostrSocketClientFactory +import ac.cord.auxiliary.compose.repository.CachingImportRepository +import ac.cord.auxiliary.compose.repository.RelayRepository import co.touchlab.kermit.Logger import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope @@ -15,12 +15,10 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.launch import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock -import ac.aux.compose.exceptions.NostrPublishException -import ac.aux.compose.managers.CredentialsManager -import ac.aux.compose.managers.SeedManager -import ac.aux.compose.managers.bech32ToHexOrNull -import ac.aux.compose.managers.toHex -import ac.aux.compose.network.sockets.NostrIncomingMessage +import ac.cord.auxiliary.compose.exceptions.NostrPublishException +import ac.cord.auxiliary.compose.managers.SeedManager +import ac.cord.auxiliary.compose.managers.toHex +import ac.cord.auxiliary.compose.network.sockets.NostrIncomingMessage import com.vitorpamplona.quartz.nip01Core.relay.commands.toRelay.CloseCmd import com.vitorpamplona.quartz.nip01Core.relay.commands.toRelay.ReqCmd import kotlinx.coroutines.flow.Flow diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/relays/broadcast/BroadcastEventResponse.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/relays/broadcast/BroadcastEventResponse.kt similarity index 80% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/network/relays/broadcast/BroadcastEventResponse.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/relays/broadcast/BroadcastEventResponse.kt index 4037edff..4f805bfd 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/relays/broadcast/BroadcastEventResponse.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/relays/broadcast/BroadcastEventResponse.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.network.relays.broadcast +package ac.cord.auxiliary.compose.network.relays.broadcast import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/relays/broadcast/BroadcastRequestBody.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/relays/broadcast/BroadcastRequestBody.kt similarity index 77% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/network/relays/broadcast/BroadcastRequestBody.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/relays/broadcast/BroadcastRequestBody.kt index 6f98034e..ef31ea9f 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/relays/broadcast/BroadcastRequestBody.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/relays/broadcast/BroadcastRequestBody.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.network.relays.broadcast +package ac.cord.auxiliary.compose.network.relays.broadcast import com.vitorpamplona.quartz.nip01Core.core.Event import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/serialization/CommonJson.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/serialization/CommonJson.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/network/serialization/CommonJson.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/serialization/CommonJson.kt index 9e9dd669..383c20fb 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/serialization/CommonJson.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/serialization/CommonJson.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.network.serialization +package ac.cord.auxiliary.compose.network.serialization import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonBuilder diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/serialization/SocketsJson.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/serialization/SocketsJson.kt similarity index 82% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/network/serialization/SocketsJson.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/serialization/SocketsJson.kt index 6fbe0dd2..11a9a183 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/serialization/SocketsJson.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/serialization/SocketsJson.kt @@ -1,8 +1,7 @@ -package ac.aux.compose.network.serialization +package ac.cord.auxiliary.compose.network.serialization -import ac.aux.compose.database.model.NostrEvent +import ac.cord.auxiliary.compose.database.model.NostrEvent import co.touchlab.kermit.Logger -import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.decodeFromJsonElement diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/NostrIncomingMessage.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrIncomingMessage.kt similarity index 84% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/NostrIncomingMessage.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrIncomingMessage.kt index 57d69f8b..1301b1a6 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/NostrIncomingMessage.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrIncomingMessage.kt @@ -1,8 +1,8 @@ -package ac.aux.compose.network.sockets +package ac.cord.auxiliary.compose.network.sockets -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.exceptions.NetworkException -import ac.aux.compose.exceptions.NostrNoticeException +import ac.cord.auxiliary.compose.database.model.NostrEvent +import ac.cord.auxiliary.compose.exceptions.NetworkException +import ac.cord.auxiliary.compose.exceptions.NostrNoticeException sealed class NostrIncomingMessage { diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/NostrIncomingMessageExt.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrIncomingMessageExt.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/NostrIncomingMessageExt.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrIncomingMessageExt.kt index 368ff850..8e007bc7 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/NostrIncomingMessageExt.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrIncomingMessageExt.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.network.sockets +package ac.cord.auxiliary.compose.network.sockets import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filter diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/NostrIncomingMessageParser.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrIncomingMessageParser.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/NostrIncomingMessageParser.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrIncomingMessageParser.kt index db5e8e94..356a1140 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/NostrIncomingMessageParser.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrIncomingMessageParser.kt @@ -1,8 +1,8 @@ -package ac.aux.compose.network.sockets +package ac.cord.auxiliary.compose.network.sockets -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.network.serialization.SocketsJson -import ac.aux.compose.network.serialization.decodeFromStringOrNull +import ac.cord.auxiliary.compose.database.model.NostrEvent +import ac.cord.auxiliary.compose.network.serialization.SocketsJson +import ac.cord.auxiliary.compose.network.serialization.decodeFromStringOrNull import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.Kind diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/NostrOutgoingMessageBuilder.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrOutgoingMessageBuilder.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/NostrOutgoingMessageBuilder.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrOutgoingMessageBuilder.kt index adf18e86..523b5a2c 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/NostrOutgoingMessageBuilder.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrOutgoingMessageBuilder.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.network.sockets +package ac.cord.auxiliary.compose.network.sockets import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.add diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/NostrSocketClient.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrSocketClient.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/NostrSocketClient.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrSocketClient.kt index 8f8eb8f4..022157fa 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/NostrSocketClient.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrSocketClient.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.network.sockets +package ac.cord.auxiliary.compose.network.sockets import kotlin.coroutines.cancellation.CancellationException import kotlinx.coroutines.flow.SharedFlow diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/NostrSocketClientFactory.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrSocketClientFactory.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/NostrSocketClientFactory.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrSocketClientFactory.kt index 9855c29b..1837b491 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/NostrSocketClientFactory.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrSocketClientFactory.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.network.sockets +package ac.cord.auxiliary.compose.network.sockets import io.ktor.client.HttpClient import io.ktor.client.plugins.websocket.WebSockets diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/NostrSocketClientImpl.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrSocketClientImpl.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/NostrSocketClientImpl.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrSocketClientImpl.kt index 7aaa0c7e..fd4ffc43 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/NostrSocketClientImpl.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrSocketClientImpl.kt @@ -1,6 +1,6 @@ -package ac.aux.compose.network.sockets +package ac.cord.auxiliary.compose.network.sockets -import ac.aux.compose.exceptions.NetworkException +import ac.cord.auxiliary.compose.exceptions.NetworkException import co.touchlab.kermit.Logger import io.ktor.client.HttpClient import io.ktor.client.plugins.websocket.webSocketSession diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/NostrVerb.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrVerb.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/NostrVerb.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrVerb.kt index 45b4b720..749e6c6e 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/NostrVerb.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrVerb.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.network.sockets +package ac.cord.auxiliary.compose.network.sockets import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/SocketConnectionCallbacks.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/SocketConnectionCallbacks.kt similarity index 75% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/SocketConnectionCallbacks.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/SocketConnectionCallbacks.kt index c6e97ef6..e0249e42 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/network/sockets/SocketConnectionCallbacks.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/SocketConnectionCallbacks.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.network.sockets +package ac.cord.auxiliary.compose.network.sockets typealias SocketConnectionOpenedCallback = (url: String) -> Unit typealias SocketConnectionClosedCallback = (url: String, error: Throwable?) -> Unit diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/nostr/Relays.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/nostr/Relays.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/nostr/Relays.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/nostr/Relays.kt index 53b210c5..fa83fe71 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/nostr/Relays.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/nostr/Relays.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.nostr +package ac.cord.auxiliary.compose.nostr import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer import com.vitorpamplona.quartz.nip28PublicChat.list.tags.ChannelTag diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/repository/CachingImportRepository.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/CachingImportRepository.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/repository/CachingImportRepository.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/CachingImportRepository.kt index 066b2889..1e7bd9b7 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/repository/CachingImportRepository.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/CachingImportRepository.kt @@ -1,7 +1,7 @@ -package ac.aux.compose.repository +package ac.cord.auxiliary.compose.repository -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.network.relays.broadcast.BroadcastEventResponse +import ac.cord.auxiliary.compose.database.model.NostrEvent +import ac.cord.auxiliary.compose.network.relays.broadcast.BroadcastEventResponse /** * As seen in Primal diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/repository/NostrNotaryRepository.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/NostrNotaryRepository.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/repository/NostrNotaryRepository.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/NostrNotaryRepository.kt index 8a44def6..718dd211 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/repository/NostrNotaryRepository.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/NostrNotaryRepository.kt @@ -1,21 +1,17 @@ -package ac.aux.compose.repository +package ac.cord.auxiliary.compose.repository -import ac.aux.compose.cryptography.signOrThrow -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.UnsignedNostrEvent -import ac.aux.compose.exceptions.SignatureException -import ac.aux.compose.exceptions.SigningKeyNotFoundException -import ac.aux.compose.exceptions.SigningRejectedException -import ac.aux.compose.managers.CredentialsManager -import ac.aux.compose.managers.SeedManager -import ac.aux.compose.managers.hexToNpubHrp -import ac.aux.compose.network.UserAgent -import ac.aux.compose.network.asClientTag -import ac.aux.compose.network.dto.RelayDTO -import com.vitorpamplona.quartz.nip19Bech32.toNpub +import ac.cord.auxiliary.compose.cryptography.signOrThrow +import ac.cord.auxiliary.compose.database.model.NostrEvent +import ac.cord.auxiliary.compose.database.model.UnsignedNostrEvent +import ac.cord.auxiliary.compose.exceptions.SignatureException +import ac.cord.auxiliary.compose.exceptions.SigningKeyNotFoundException +import ac.cord.auxiliary.compose.exceptions.SigningRejectedException +import ac.cord.auxiliary.compose.managers.SeedManager +import ac.cord.auxiliary.compose.network.UserAgent +import ac.cord.auxiliary.compose.network.asClientTag +import ac.cord.auxiliary.compose.network.dto.RelayDTO import com.vitorpamplona.quartz.nip19Bech32.toNsec import com.vitorpamplona.quartz.nip51Lists.relayLists.RelayFeedsListEvent -import fr.acinq.secp256k1.Hex import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.channels.Channel diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/repository/NostrPublisherRepository.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/NostrPublisherRepository.kt similarity index 86% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/repository/NostrPublisherRepository.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/NostrPublisherRepository.kt index 4c1fe7b0..e250d3b8 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/repository/NostrPublisherRepository.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/NostrPublisherRepository.kt @@ -1,17 +1,17 @@ -package ac.aux.compose.repository +package ac.cord.auxiliary.compose.repository -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.UnsignedNostrEvent -import ac.aux.compose.exceptions.SignatureException -import ac.aux.compose.network.dto.RelayDTO -import ac.aux.compose.network.relays.RelaysSocketManager +import ac.cord.auxiliary.compose.database.model.NostrEvent +import ac.cord.auxiliary.compose.database.model.UnsignedNostrEvent +import ac.cord.auxiliary.compose.exceptions.SignatureException +import ac.cord.auxiliary.compose.network.dto.RelayDTO +import ac.cord.auxiliary.compose.network.relays.RelaysSocketManager import co.touchlab.kermit.Logger import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.launch -import ac.aux.compose.exceptions.NostrPublishException +import ac.cord.auxiliary.compose.exceptions.NostrPublishException /** * As Seen in Primal diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/repository/NostrRepository.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/NostrRepository.kt similarity index 87% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/repository/NostrRepository.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/NostrRepository.kt index 7ae808a9..51dc2d5d 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/repository/NostrRepository.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/NostrRepository.kt @@ -1,18 +1,18 @@ -package ac.aux.compose.repository +package ac.cord.auxiliary.compose.repository -import ac.aux.compose.database.model.BroadcastNostrEventReceipt -import ac.aux.compose.database.model.BroadcastNostrEventRequest -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Profile -import ac.aux.compose.database.model.RecentSearch -import ac.aux.compose.database.model.SynchronizeNostrEventRequest -import ac.aux.compose.database.model.UnsignedNostrEvent -import ac.aux.compose.database.model.intermdiate.LocalBroadcastNostrEventRequest -import ac.aux.compose.database.model.intermdiate.LocalNostrEvent -import ac.aux.compose.database.model.intermdiate.LocalAccount -import ac.aux.compose.database.model.intermdiate.LocalProfile -import ac.aux.compose.database.model.typealiases.SynchronizationFilterArray -import ac.aux.compose.database.model.types.SynchronizationFilter +import ac.cord.auxiliary.compose.database.model.BroadcastNostrEventReceipt +import ac.cord.auxiliary.compose.database.model.BroadcastNostrEventRequest +import ac.cord.auxiliary.compose.database.model.NostrEvent +import ac.cord.auxiliary.compose.database.model.Profile +import ac.cord.auxiliary.compose.database.model.RecentSearch +import ac.cord.auxiliary.compose.database.model.SynchronizeNostrEventRequest +import ac.cord.auxiliary.compose.database.model.UnsignedNostrEvent +import ac.cord.auxiliary.compose.database.model.intermdiate.LocalBroadcastNostrEventRequest +import ac.cord.auxiliary.compose.database.model.intermdiate.LocalNostrEvent +import ac.cord.auxiliary.compose.database.model.intermdiate.LocalAccount +import ac.cord.auxiliary.compose.database.model.intermdiate.LocalProfile +import ac.cord.auxiliary.compose.database.model.typealiases.SynchronizationFilterArray +import ac.cord.auxiliary.compose.database.model.types.SynchronizationFilter import com.vitorpamplona.quartz.nip01Core.core.HexKey import kotlinx.coroutines.flow.Flow diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/PostRepository.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/PostRepository.kt new file mode 100644 index 00000000..e95a7d74 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/PostRepository.kt @@ -0,0 +1,4 @@ +package ac.cord.auxiliary.compose.repository + +interface PostRepository { +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/repository/RelayRepository.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/RelayRepository.kt similarity index 58% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/repository/RelayRepository.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/RelayRepository.kt index 0890b04d..20af3e0d 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/repository/RelayRepository.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/RelayRepository.kt @@ -1,6 +1,6 @@ -package ac.aux.compose.repository +package ac.cord.auxiliary.compose.repository -import ac.aux.compose.database.model.Relay +import ac.cord.auxiliary.compose.database.model.Relay import kotlinx.coroutines.flow.Flow interface RelayRepository { diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/repository/SearchRepository.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/SearchRepository.kt similarity index 77% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/repository/SearchRepository.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/SearchRepository.kt index db371af3..33e4ab87 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/repository/SearchRepository.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/SearchRepository.kt @@ -1,6 +1,6 @@ -package ac.aux.compose.repository +package ac.cord.auxiliary.compose.repository -import ac.aux.compose.database.model.SynchronizeNostrEventRequest +import ac.cord.auxiliary.compose.database.model.SynchronizeNostrEventRequest interface SearchRepository { diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/CreateProfileScreen.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/CreateProfileScreen.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/CreateProfileScreen.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/CreateProfileScreen.kt index 288430f2..ca4fcb67 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/CreateProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/CreateProfileScreen.kt @@ -1,14 +1,12 @@ -package ac.aux.compose.ui.composable +package ac.cord.auxiliary.compose.ui.composable -import ac.aux.compose.database.model.Profile -import ac.aux.compose.repository.NostrRepository -import ac.aux.compose.ui.composable.navigation.routes.UnannouncedProfileRoute -import ac.aux.compose.ui.composable.navigation.routes.UnsignedProfileRoute -import ac.aux.compose.ui.theme.AuxTheme -import ac.aux.compose.ui.theme.BluePill -import ac.aux.compose.ui.theme.RedPill -import ac.aux.compose.ui.view.model.CreateProfileViewModel -import ac.aux.compose.ui.view.state.CreateProfileUIState +import ac.cord.auxiliary.compose.database.model.Profile +import ac.cord.auxiliary.compose.repository.NostrRepository +import ac.cord.auxiliary.compose.ui.theme.AuxTheme +import ac.cord.auxiliary.compose.ui.theme.BluePill +import ac.cord.auxiliary.compose.ui.theme.RedPill +import ac.cord.auxiliary.compose.ui.view.model.CreateProfileViewModel +import ac.cord.auxiliary.compose.ui.view.state.CreateProfileUIState import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/FeedScreen.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/FeedScreen.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/FeedScreen.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/FeedScreen.kt index ce28db5b..67309154 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/FeedScreen.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/FeedScreen.kt @@ -1,12 +1,11 @@ -package ac.aux.compose.ui.composable +package ac.cord.auxiliary.compose.ui.composable -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.repository.NostrRepository -import ac.aux.compose.ui.composable.widgets.LoadingDataIndicator -import ac.aux.compose.ui.composable.widgets.feed.FeedListItem -import ac.aux.compose.ui.theme.AuxTheme -import ac.aux.compose.ui.view.model.FeedListViewModel -import ac.aux.compose.ui.view.state.FeedListUIState +import ac.cord.auxiliary.compose.repository.NostrRepository +import ac.cord.auxiliary.compose.ui.composable.widgets.LoadingDataIndicator +import ac.cord.auxiliary.compose.ui.composable.widgets.feed.FeedListItem +import ac.cord.auxiliary.compose.ui.theme.AuxTheme +import ac.cord.auxiliary.compose.ui.view.model.FeedListViewModel +import ac.cord.auxiliary.compose.ui.view.state.FeedListUIState import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -32,18 +31,14 @@ import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.LoadingIndicator import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.MediumTopAppBar import androidx.compose.material3.Scaffold import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar import androidx.compose.material3.TopAppBarDefaults -import androidx.compose.material3.rememberTopAppBarState import androidx.compose.runtime.Composable -import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/ImplementationPendingScreen.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/ImplementationPendingScreen.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/ImplementationPendingScreen.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/ImplementationPendingScreen.kt index 38bee8f5..4642a63d 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/ImplementationPendingScreen.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/ImplementationPendingScreen.kt @@ -1,6 +1,6 @@ -package ac.aux.compose.ui.composable +package ac.cord.auxiliary.compose.ui.composable -import ac.aux.compose.ui.theme.AuxTheme +import ac.cord.auxiliary.compose.ui.theme.AuxTheme import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/LandingScreen.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/LandingScreen.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/LandingScreen.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/LandingScreen.kt index 40342203..3ef53848 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/LandingScreen.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/LandingScreen.kt @@ -1,6 +1,6 @@ -package ac.aux.compose.ui.composable +package ac.cord.auxiliary.compose.ui.composable -import ac.aux.compose.ui.theme.AuxTheme +import ac.cord.auxiliary.compose.ui.theme.AuxTheme import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/LoadingScreen.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/LoadingScreen.kt similarity index 54% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/LoadingScreen.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/LoadingScreen.kt index bcaceadf..dfdc99d8 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/LoadingScreen.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/LoadingScreen.kt @@ -1,26 +1,15 @@ -package ac.aux.compose.ui.composable +package ac.cord.auxiliary.compose.ui.composable -import ac.aux.compose.ui.composable.widgets.LoadingDataIndicator -import ac.aux.compose.ui.theme.AuxTheme -import androidx.compose.foundation.layout.Arrangement +import ac.cord.auxiliary.compose.ui.composable.widgets.LoadingDataIndicator +import ac.cord.auxiliary.compose.ui.theme.AuxTheme import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding -import androidx.compose.material3.Button -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Surface -import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp @Composable fun LoadingScreen( diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/NostrEventDetailScreen.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/NostrEventDetailScreen.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/NostrEventDetailScreen.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/NostrEventDetailScreen.kt index f08549f0..4d180a3d 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/NostrEventDetailScreen.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/NostrEventDetailScreen.kt @@ -1,16 +1,16 @@ -package ac.aux.compose.ui.composable +package ac.cord.auxiliary.compose.ui.composable -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Profile -import ac.aux.compose.database.model.intermdiate.LocalNostrEvent -import ac.aux.compose.repository.NostrRepository -import ac.aux.compose.ui.composable.navigation.routes.Route -import ac.aux.compose.ui.composable.widgets.LoadingDataIndicator -import ac.aux.compose.ui.composable.widgets.detail.MetadataEventDetail -import ac.aux.compose.ui.composable.widgets.detail.TextNoteEventDetail -import ac.aux.compose.ui.theme.AuxTheme -import ac.aux.compose.ui.view.model.NostrEventDetailViewModel -import ac.aux.compose.ui.view.state.NostrEventDetailUIState +import ac.cord.auxiliary.compose.database.model.NostrEvent +import ac.cord.auxiliary.compose.database.model.Profile +import ac.cord.auxiliary.compose.database.model.intermdiate.LocalNostrEvent +import ac.cord.auxiliary.compose.repository.NostrRepository +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.Route +import ac.cord.auxiliary.compose.ui.composable.widgets.LoadingDataIndicator +import ac.cord.auxiliary.compose.ui.composable.widgets.detail.MetadataEventDetail +import ac.cord.auxiliary.compose.ui.composable.widgets.detail.TextNoteEventDetail +import ac.cord.auxiliary.compose.ui.theme.AuxTheme +import ac.cord.auxiliary.compose.ui.view.model.NostrEventDetailViewModel +import ac.cord.auxiliary.compose.ui.view.state.NostrEventDetailUIState import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/SearchResultScreen.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/SearchResultScreen.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/SearchResultScreen.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/SearchResultScreen.kt index 3a6b5e18..d37bbc6a 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/SearchResultScreen.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/SearchResultScreen.kt @@ -1,14 +1,14 @@ -package ac.aux.compose.ui.composable +package ac.cord.auxiliary.compose.ui.composable -import ac.aux.compose.repository.NostrRepository -import ac.aux.compose.repository.SearchRepository -import ac.aux.compose.ui.composable.navigation.routes.NostrEventDetailRoute -import ac.aux.compose.ui.composable.navigation.routes.Route -import ac.aux.compose.ui.composable.widgets.feed.ListView -import ac.aux.compose.ui.theme.AuxTheme -import ac.aux.compose.ui.view.model.SearchResultType -import ac.aux.compose.ui.view.model.SearchResultViewModel -import ac.aux.compose.ui.view.state.SearchResultListUIState +import ac.cord.auxiliary.compose.repository.NostrRepository +import ac.cord.auxiliary.compose.repository.SearchRepository +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.NostrEventDetailRoute +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.Route +import ac.cord.auxiliary.compose.ui.composable.widgets.feed.ListView +import ac.cord.auxiliary.compose.ui.theme.AuxTheme +import ac.cord.auxiliary.compose.ui.view.model.SearchResultType +import ac.cord.auxiliary.compose.ui.view.model.SearchResultViewModel +import ac.cord.auxiliary.compose.ui.view.state.SearchResultListUIState import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/SearchScreen.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/SearchScreen.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/SearchScreen.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/SearchScreen.kt index 2da283ab..c2762d30 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/SearchScreen.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/SearchScreen.kt @@ -1,21 +1,17 @@ -package ac.aux.compose.ui.composable +package ac.cord.auxiliary.compose.ui.composable -import ac.aux.compose.repository.NostrRepository -import ac.aux.compose.repository.SearchRepository -import ac.aux.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import ac.aux.compose.ui.composable.navigation.routes.NostrEventDetailRoute -import ac.aux.compose.ui.composable.navigation.routes.Route -import ac.aux.compose.ui.composable.navigation.routes.SearchResultRoute -import ac.aux.compose.ui.theme.AuxTheme -import ac.aux.compose.ui.view.model.FeedListViewModel -import ac.aux.compose.ui.view.model.SearchViewModel -import ac.aux.compose.ui.view.state.SearchUIState +import ac.cord.auxiliary.compose.repository.NostrRepository +import ac.cord.auxiliary.compose.repository.SearchRepository +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.NostrEventDetailRoute +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.Route +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.SearchResultRoute +import ac.cord.auxiliary.compose.ui.theme.AuxTheme +import ac.cord.auxiliary.compose.ui.view.model.SearchViewModel +import ac.cord.auxiliary.compose.ui.view.state.SearchUIState import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -25,25 +21,15 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyRow import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.itemsIndexed -import androidx.compose.foundation.rememberScrollState -import androidx.compose.foundation.text.input.TextFieldState import androidx.compose.foundation.text.input.rememberTextFieldState -import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.ArrowBackIosNew import androidx.compose.material.icons.filled.Close -import androidx.compose.material.icons.filled.ManageSearch import androidx.compose.material.icons.filled.Person import androidx.compose.material.icons.filled.Search import androidx.compose.material.icons.filled.Tag import androidx.compose.material.icons.filled.TravelExplore -import androidx.compose.material.icons.filled.Tune import androidx.compose.material.icons.filled.YoutubeSearchedFor -import androidx.compose.material3.AppBarWithSearch -import androidx.compose.material3.Button -import androidx.compose.material3.ButtonColors -import androidx.compose.material3.ButtonDefaults -import androidx.compose.material3.ExpandedFullScreenSearchBar import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.Icon @@ -52,7 +38,6 @@ import androidx.compose.material3.IconButtonDefaults import androidx.compose.material3.ListItem import androidx.compose.material3.ListItemDefaults import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Scaffold import androidx.compose.material3.SearchBar import androidx.compose.material3.SearchBarDefaults @@ -60,13 +45,9 @@ import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar import androidx.compose.material3.TopAppBarDefaults -import androidx.compose.material3.TopSearchBar -import androidx.compose.material3.rememberSearchBarState import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/SignInScreen.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/SignInScreen.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/SignInScreen.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/SignInScreen.kt index 448b04a6..e4c5d2c9 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/SignInScreen.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/SignInScreen.kt @@ -1,9 +1,9 @@ -package ac.aux.compose.ui.composable +package ac.cord.auxiliary.compose.ui.composable -import ac.aux.compose.repository.NostrRepository -import ac.aux.compose.ui.theme.AuxTheme -import ac.aux.compose.ui.view.model.SignInToProfileViewModel -import ac.aux.compose.ui.view.state.SignInToProfileUIState +import ac.cord.auxiliary.compose.repository.NostrRepository +import ac.cord.auxiliary.compose.ui.theme.AuxTheme +import ac.cord.auxiliary.compose.ui.view.model.SignInToProfileViewModel +import ac.cord.auxiliary.compose.ui.view.state.SignInToProfileUIState import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/SocialPreconditionScreen.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/SocialPreconditionScreen.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/SocialPreconditionScreen.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/SocialPreconditionScreen.kt index 07a1c37f..b289c1d6 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/SocialPreconditionScreen.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/SocialPreconditionScreen.kt @@ -1,6 +1,6 @@ -package ac.aux.compose.ui.composable +package ac.cord.auxiliary.compose.ui.composable -import ac.aux.compose.ui.theme.AuxTheme +import ac.cord.auxiliary.compose.ui.theme.AuxTheme import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/UnannouncedProfileScreen.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/UnannouncedProfileScreen.kt similarity index 68% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/UnannouncedProfileScreen.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/UnannouncedProfileScreen.kt index 7e50ebf9..c293fed8 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/UnannouncedProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/UnannouncedProfileScreen.kt @@ -1,45 +1,24 @@ -package ac.aux.compose.ui.composable +package ac.cord.auxiliary.compose.ui.composable -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Profile -import ac.aux.compose.database.model.UnsignedNostrEvent -import ac.aux.compose.repository.NostrRepository -import ac.aux.compose.ui.composable.widgets.LoadingDataIndicator -import ac.aux.compose.ui.theme.AuxTheme -import ac.aux.compose.ui.theme.BluePill -import ac.aux.compose.ui.theme.RedPill -import ac.aux.compose.ui.view.model.CreateProfileViewModel -import ac.aux.compose.ui.view.state.CreateProfileUIState +import ac.cord.auxiliary.compose.ui.composable.widgets.LoadingDataIndicator +import ac.cord.auxiliary.compose.ui.theme.AuxTheme import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.text.KeyboardOptions -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Badge -import androidx.compose.material.icons.filled.Description -import androidx.compose.material3.Button -import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi -import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.Icon -import androidx.compose.material3.LoadingIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.TextField import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import androidx.lifecycle.viewmodel.compose.viewModel @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/UnindexedProfileScreen.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/UnindexedProfileScreen.kt similarity index 68% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/UnindexedProfileScreen.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/UnindexedProfileScreen.kt index 9493e4db..7c4113f4 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/UnindexedProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/UnindexedProfileScreen.kt @@ -1,45 +1,24 @@ -package ac.aux.compose.ui.composable +package ac.cord.auxiliary.compose.ui.composable -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Profile -import ac.aux.compose.database.model.UnsignedNostrEvent -import ac.aux.compose.repository.NostrRepository -import ac.aux.compose.ui.composable.widgets.LoadingDataIndicator -import ac.aux.compose.ui.theme.AuxTheme -import ac.aux.compose.ui.theme.BluePill -import ac.aux.compose.ui.theme.RedPill -import ac.aux.compose.ui.view.model.CreateProfileViewModel -import ac.aux.compose.ui.view.state.CreateProfileUIState +import ac.cord.auxiliary.compose.ui.composable.widgets.LoadingDataIndicator +import ac.cord.auxiliary.compose.ui.theme.AuxTheme import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.text.KeyboardOptions -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Badge -import androidx.compose.material.icons.filled.Description -import androidx.compose.material3.Button -import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi -import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.Icon -import androidx.compose.material3.LoadingIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.TextField import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import androidx.lifecycle.viewmodel.compose.viewModel @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/UnqueuedProfileScreen.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/UnqueuedProfileScreen.kt similarity index 68% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/UnqueuedProfileScreen.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/UnqueuedProfileScreen.kt index 467927e5..2564c005 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/UnqueuedProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/UnqueuedProfileScreen.kt @@ -1,45 +1,24 @@ -package ac.aux.compose.ui.composable +package ac.cord.auxiliary.compose.ui.composable -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Profile -import ac.aux.compose.database.model.UnsignedNostrEvent -import ac.aux.compose.repository.NostrRepository -import ac.aux.compose.ui.composable.widgets.LoadingDataIndicator -import ac.aux.compose.ui.theme.AuxTheme -import ac.aux.compose.ui.theme.BluePill -import ac.aux.compose.ui.theme.RedPill -import ac.aux.compose.ui.view.model.CreateProfileViewModel -import ac.aux.compose.ui.view.state.CreateProfileUIState +import ac.cord.auxiliary.compose.ui.composable.widgets.LoadingDataIndicator +import ac.cord.auxiliary.compose.ui.theme.AuxTheme import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.text.KeyboardOptions -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Badge -import androidx.compose.material.icons.filled.Description -import androidx.compose.material3.Button -import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi -import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.Icon -import androidx.compose.material3.LoadingIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.TextField import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import androidx.lifecycle.viewmodel.compose.viewModel @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/UnqueuedProfileSynchronizationScreen.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/UnqueuedProfileSynchronizationScreen.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/UnqueuedProfileSynchronizationScreen.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/UnqueuedProfileSynchronizationScreen.kt index 33df6cc8..efbbd312 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/UnqueuedProfileSynchronizationScreen.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/UnqueuedProfileSynchronizationScreen.kt @@ -1,10 +1,9 @@ -package ac.aux.compose.ui.composable +package ac.cord.auxiliary.compose.ui.composable -import ac.aux.compose.repository.NostrRepository -import ac.aux.compose.ui.composable.widgets.LoadingDataIndicator -import ac.aux.compose.ui.theme.AuxTheme -import ac.aux.compose.ui.view.model.UnqueuedProfileSynchronizationViewModel -import ac.aux.compose.ui.view.model.WriteNewNoteViewModel +import ac.cord.auxiliary.compose.repository.NostrRepository +import ac.cord.auxiliary.compose.ui.composable.widgets.LoadingDataIndicator +import ac.cord.auxiliary.compose.ui.theme.AuxTheme +import ac.cord.auxiliary.compose.ui.view.model.UnqueuedProfileSynchronizationViewModel import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/UnsignedProfileScreen.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/UnsignedProfileScreen.kt similarity index 64% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/UnsignedProfileScreen.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/UnsignedProfileScreen.kt index d386c78d..898e0638 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/UnsignedProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/UnsignedProfileScreen.kt @@ -1,47 +1,24 @@ -package ac.aux.compose.ui.composable +package ac.cord.auxiliary.compose.ui.composable -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Profile -import ac.aux.compose.database.model.UnsignedNostrEvent -import ac.aux.compose.repository.NostrRepository -import ac.aux.compose.ui.composable.navigation.routes.UnannouncedProfileRoute -import ac.aux.compose.ui.composable.widgets.LoadingDataIndicator -import ac.aux.compose.ui.theme.AuxTheme -import ac.aux.compose.ui.theme.BluePill -import ac.aux.compose.ui.theme.RedPill -import ac.aux.compose.ui.view.model.CreateProfileViewModel -import ac.aux.compose.ui.view.state.CreateProfileUIState +import ac.cord.auxiliary.compose.ui.composable.widgets.LoadingDataIndicator +import ac.cord.auxiliary.compose.ui.theme.AuxTheme import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.text.KeyboardOptions -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Badge -import androidx.compose.material.icons.filled.Description -import androidx.compose.material3.Button -import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi -import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.Icon -import androidx.compose.material3.LoadingIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.TextField import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import androidx.lifecycle.viewmodel.compose.viewModel -import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/UnsyncedProfileScreen.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/UnsyncedProfileScreen.kt similarity index 65% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/UnsyncedProfileScreen.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/UnsyncedProfileScreen.kt index 098f330f..0e6b113c 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/UnsyncedProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/UnsyncedProfileScreen.kt @@ -1,47 +1,24 @@ -package ac.aux.compose.ui.composable +package ac.cord.auxiliary.compose.ui.composable -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Profile -import ac.aux.compose.database.model.UnsignedNostrEvent -import ac.aux.compose.repository.NostrRepository -import ac.aux.compose.ui.composable.navigation.routes.UnannouncedProfileRoute -import ac.aux.compose.ui.composable.widgets.LoadingDataIndicator -import ac.aux.compose.ui.theme.AuxTheme -import ac.aux.compose.ui.theme.BluePill -import ac.aux.compose.ui.theme.RedPill -import ac.aux.compose.ui.view.model.CreateProfileViewModel -import ac.aux.compose.ui.view.state.CreateProfileUIState +import ac.cord.auxiliary.compose.ui.composable.widgets.LoadingDataIndicator +import ac.cord.auxiliary.compose.ui.theme.AuxTheme import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.text.KeyboardOptions -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Badge -import androidx.compose.material.icons.filled.Description -import androidx.compose.material3.Button -import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi -import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.Icon -import androidx.compose.material3.LoadingIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.TextField import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import androidx.lifecycle.viewmodel.compose.viewModel -import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/WriteNewNoteScreen.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/WriteNewNoteScreen.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/WriteNewNoteScreen.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/WriteNewNoteScreen.kt index 93d9f553..f7930417 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/WriteNewNoteScreen.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/WriteNewNoteScreen.kt @@ -1,13 +1,9 @@ -package ac.aux.compose.ui.composable +package ac.cord.auxiliary.compose.ui.composable -import ac.aux.compose.database.model.Profile -import ac.aux.compose.repository.NostrRepository -import ac.aux.compose.ui.theme.AuxTheme -import ac.aux.compose.ui.theme.BluePill -import ac.aux.compose.ui.theme.RedPill -import ac.aux.compose.ui.view.model.WriteNewNoteViewModel -import ac.aux.compose.ui.view.state.CreateProfileUIState -import ac.aux.compose.ui.view.state.WriteNewNoteUIState +import ac.cord.auxiliary.compose.repository.NostrRepository +import ac.cord.auxiliary.compose.ui.theme.AuxTheme +import ac.cord.auxiliary.compose.ui.view.model.WriteNewNoteViewModel +import ac.cord.auxiliary.compose.ui.view.state.WriteNewNoteUIState import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -16,16 +12,10 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.NavigateNext -import androidx.compose.material.icons.filled.Badge import androidx.compose.material.icons.filled.Create -import androidx.compose.material.icons.filled.Description import androidx.compose.material.icons.filled.NavigateNext -import androidx.compose.material.icons.filled.NextPlan import androidx.compose.material3.Button -import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi -import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.LoadingIndicator import androidx.compose.material3.MaterialTheme @@ -36,7 +26,6 @@ import androidx.compose.material3.TextField import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/AuxNavHost.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/AuxNavHost.kt similarity index 79% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/AuxNavHost.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/AuxNavHost.kt index 4e62c7d9..edab2295 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/AuxNavHost.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/AuxNavHost.kt @@ -1,54 +1,54 @@ -package ac.aux.compose.ui.composable.navigation +package ac.cord.auxiliary.compose.ui.composable.navigation -import ac.aux.compose.AuxGlobal -import ac.aux.compose.database.repository.DatabaseNostrRepository -import ac.aux.compose.database.repository.DatabaseSearchRepository -import ac.aux.compose.managers.DatabaseManager -import ac.aux.compose.ui.composable.CreateProfileScreen -import ac.aux.compose.ui.composable.FeedScreen -import ac.aux.compose.ui.composable.ImplementationPendingScreen -import ac.aux.compose.ui.composable.LandingScreen -import ac.aux.compose.ui.composable.LoadingScreen -import ac.aux.compose.ui.composable.NostrEventDetailScreen -import ac.aux.compose.ui.composable.SearchResultScreen -import ac.aux.compose.ui.composable.SearchScreen -import ac.aux.compose.ui.composable.SignInToProfileScreen -import ac.aux.compose.ui.composable.SocialPreconditionScreen -import ac.aux.compose.ui.composable.UnannouncedProfileScreen -import ac.aux.compose.ui.composable.UnindexedProfileScreen -import ac.aux.compose.ui.composable.UnqueuedProfileScreen -import ac.aux.compose.ui.composable.UnqueuedProfileSynchronizationScreen -import ac.aux.compose.ui.composable.UnsignedProfileScreen -import ac.aux.compose.ui.composable.UnsyncedProfileScreen -import ac.aux.compose.ui.composable.WriteNewNoteScreen -import ac.aux.compose.ui.composable.navigation.routes.BlankRoute -import ac.aux.compose.ui.composable.navigation.routes.CreateProfileRoute -import ac.aux.compose.ui.composable.navigation.routes.FeedRoute -import ac.aux.compose.ui.composable.navigation.routes.ImplementationPendingRoute -import ac.aux.compose.ui.composable.navigation.routes.LandingRoute -import ac.aux.compose.ui.composable.navigation.routes.LoadingRoute -import ac.aux.compose.ui.composable.navigation.routes.NostrEventDetailRoute -import ac.aux.compose.ui.composable.navigation.routes.SearchResultRoute -import ac.aux.compose.ui.composable.navigation.routes.SearchRoute -import ac.aux.compose.ui.composable.navigation.routes.SignInRoute +import ac.cord.auxiliary.compose.AuxGlobal +import ac.cord.auxiliary.compose.database.repository.DatabaseNostrRepository +import ac.cord.auxiliary.compose.database.repository.DatabaseSearchRepository +import ac.cord.auxiliary.compose.managers.DatabaseManager +import ac.cord.auxiliary.compose.ui.composable.CreateProfileScreen +import ac.cord.auxiliary.compose.ui.composable.FeedScreen +import ac.cord.auxiliary.compose.ui.composable.ImplementationPendingScreen +import ac.cord.auxiliary.compose.ui.composable.LandingScreen +import ac.cord.auxiliary.compose.ui.composable.LoadingScreen +import ac.cord.auxiliary.compose.ui.composable.NostrEventDetailScreen +import ac.cord.auxiliary.compose.ui.composable.SearchResultScreen +import ac.cord.auxiliary.compose.ui.composable.SearchScreen +import ac.cord.auxiliary.compose.ui.composable.SignInToProfileScreen +import ac.cord.auxiliary.compose.ui.composable.SocialPreconditionScreen +import ac.cord.auxiliary.compose.ui.composable.UnannouncedProfileScreen +import ac.cord.auxiliary.compose.ui.composable.UnindexedProfileScreen +import ac.cord.auxiliary.compose.ui.composable.UnqueuedProfileScreen +import ac.cord.auxiliary.compose.ui.composable.UnqueuedProfileSynchronizationScreen +import ac.cord.auxiliary.compose.ui.composable.UnsignedProfileScreen +import ac.cord.auxiliary.compose.ui.composable.UnsyncedProfileScreen +import ac.cord.auxiliary.compose.ui.composable.WriteNewNoteScreen +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.BlankRoute +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.CreateProfileRoute +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.FeedRoute +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.ImplementationPendingRoute +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.LandingRoute +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.LoadingRoute +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.NostrEventDetailRoute +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.SearchResultRoute +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.SearchRoute +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.SignInRoute import androidx.compose.runtime.Composable import androidx.navigation.NavHostController import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.toRoute -import ac.aux.compose.ui.composable.navigation.routes.SocialPreconditionRoute -import ac.aux.compose.ui.composable.navigation.routes.UnannouncedProfileRoute -import ac.aux.compose.ui.composable.navigation.routes.UnindexedProfileRoute -import ac.aux.compose.ui.composable.navigation.routes.UnqueuedProfileRoute -import ac.aux.compose.ui.composable.navigation.routes.UnqueuedProfileSynchronizationRoute -import ac.aux.compose.ui.composable.navigation.routes.UnsignedProfileRoute -import ac.aux.compose.ui.composable.navigation.routes.UnsyncedProfileRoute -import ac.aux.compose.ui.composable.navigation.routes.WriteNewNoteRoute -import ac.aux.compose.ui.view.model.NavigationViewModel -import ac.aux.compose.ui.view.state.FeedListUIState -import ac.aux.compose.ui.view.state.NavigationUIState -import ac.aux.compose.ui.view.state.NostrEventDetailUIState -import ac.aux.compose.ui.view.state.SearchUIState +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.SocialPreconditionRoute +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.UnannouncedProfileRoute +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.UnindexedProfileRoute +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.UnqueuedProfileRoute +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.UnqueuedProfileSynchronizationRoute +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.UnsignedProfileRoute +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.UnsyncedProfileRoute +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.WriteNewNoteRoute +import ac.cord.auxiliary.compose.ui.view.model.NavigationViewModel +import ac.cord.auxiliary.compose.ui.view.state.FeedListUIState +import ac.cord.auxiliary.compose.ui.view.state.NavigationUIState +import ac.cord.auxiliary.compose.ui.view.state.NostrEventDetailUIState +import ac.cord.auxiliary.compose.ui.view.state.SearchUIState import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material3.Surface import androidx.compose.runtime.LaunchedEffect diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/BlankRoute.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/BlankRoute.kt new file mode 100755 index 00000000..33601a67 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/BlankRoute.kt @@ -0,0 +1,6 @@ +package ac.cord.auxiliary.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/ac/cord/auxiliary/compose/ui/composable/navigation/routes/CreateProfileRoute.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/CreateProfileRoute.kt new file mode 100755 index 00000000..7e6868c5 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/CreateProfileRoute.kt @@ -0,0 +1,9 @@ +package ac.cord.auxiliary.compose.ui.composable.navigation.routes + +import kotlinx.serialization.Serializable + +@Serializable +data class CreateProfileRoute( + val nostrEventId: String? = null, +): Route() { +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/FeedRoute.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/FeedRoute.kt new file mode 100755 index 00000000..db2b034c --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/FeedRoute.kt @@ -0,0 +1,6 @@ +package ac.cord.auxiliary.compose.ui.composable.navigation.routes + +import kotlinx.serialization.Serializable + +@Serializable +object FeedRoute: Route() \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/ImplementationPendingRoute.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/ImplementationPendingRoute.kt similarity index 66% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/ImplementationPendingRoute.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/ImplementationPendingRoute.kt index eedf1a34..5a593041 100755 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/ImplementationPendingRoute.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/ImplementationPendingRoute.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.ui.composable.navigation.routes +package ac.cord.auxiliary.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/LandingRoute.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/LandingRoute.kt new file mode 100755 index 00000000..cd6dd904 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/LandingRoute.kt @@ -0,0 +1,6 @@ +package ac.cord.auxiliary.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/ac/cord/auxiliary/compose/ui/composable/navigation/routes/LoadingRoute.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/LoadingRoute.kt new file mode 100755 index 00000000..7c892f08 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/LoadingRoute.kt @@ -0,0 +1,6 @@ +package ac.cord.auxiliary.compose.ui.composable.navigation.routes + +import kotlinx.serialization.Serializable + +@Serializable +object LoadingRoute: Route() \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/NostrEventDetailRoute.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/NostrEventDetailRoute.kt new file mode 100755 index 00000000..2d339b35 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/NostrEventDetailRoute.kt @@ -0,0 +1,9 @@ +package ac.cord.auxiliary.compose.ui.composable.navigation.routes + +import kotlinx.serialization.Serializable + +@Serializable +data class NostrEventDetailRoute( + val nostrEventId: String, +): Route() { +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/Route.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/Route.kt new file mode 100755 index 00000000..aa4f2ee1 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/Route.kt @@ -0,0 +1,3 @@ +package ac.cord.auxiliary.compose.ui.composable.navigation.routes + +abstract class Route \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/SearchResultRoute.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/SearchResultRoute.kt similarity index 59% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/SearchResultRoute.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/SearchResultRoute.kt index eb75f3aa..434fbd08 100755 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/SearchResultRoute.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/SearchResultRoute.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.ui.composable.navigation.routes +package ac.cord.auxiliary.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/SearchRoute.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/SearchRoute.kt new file mode 100755 index 00000000..ce5b61c3 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/SearchRoute.kt @@ -0,0 +1,6 @@ +package ac.cord.auxiliary.compose.ui.composable.navigation.routes + +import kotlinx.serialization.Serializable + +@Serializable +object SearchRoute: Route() \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/SignInRoute.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/SignInRoute.kt new file mode 100755 index 00000000..7d29cefb --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/SignInRoute.kt @@ -0,0 +1,6 @@ +package ac.cord.auxiliary.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/ac/cord/auxiliary/compose/ui/composable/navigation/routes/SocialPreconditionRoute.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/SocialPreconditionRoute.kt new file mode 100755 index 00000000..1530c194 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/SocialPreconditionRoute.kt @@ -0,0 +1,6 @@ +package ac.cord.auxiliary.compose.ui.composable.navigation.routes + +import kotlinx.serialization.Serializable + +@Serializable +object SocialPreconditionRoute: Route() \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/UnannouncedProfileRoute.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/UnannouncedProfileRoute.kt new file mode 100755 index 00000000..29e75a46 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/UnannouncedProfileRoute.kt @@ -0,0 +1,9 @@ +package ac.cord.auxiliary.compose.ui.composable.navigation.routes + +import kotlinx.serialization.Serializable + +@Serializable +data class UnannouncedProfileRoute( + val nostrEventId: String, +): Route() { +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/UnindexedProfileRoute.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/UnindexedProfileRoute.kt new file mode 100755 index 00000000..a286c58f --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/UnindexedProfileRoute.kt @@ -0,0 +1,10 @@ +package ac.cord.auxiliary.compose.ui.composable.navigation.routes + +import kotlinx.serialization.Serializable + +@Serializable +data class UnindexedProfileRoute( + val nostrEventId: String, +): Route() { + +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/UnqueuedProfileRoute.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/UnqueuedProfileRoute.kt new file mode 100755 index 00000000..a1cc60cf --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/UnqueuedProfileRoute.kt @@ -0,0 +1,10 @@ +package ac.cord.auxiliary.compose.ui.composable.navigation.routes + +import kotlinx.serialization.Serializable + +@Serializable +data class UnqueuedProfileRoute( + val nostrEventId: String, +): Route() { + +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/UnqueuedProfileSynchronizationRoute.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/UnqueuedProfileSynchronizationRoute.kt similarity index 73% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/UnqueuedProfileSynchronizationRoute.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/UnqueuedProfileSynchronizationRoute.kt index 528bd0e1..3a9c7357 100755 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/UnqueuedProfileSynchronizationRoute.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/UnqueuedProfileSynchronizationRoute.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.ui.composable.navigation.routes +package ac.cord.auxiliary.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/UnsignedProfileRoute.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/UnsignedProfileRoute.kt new file mode 100755 index 00000000..9ebaaee3 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/UnsignedProfileRoute.kt @@ -0,0 +1,9 @@ +package ac.cord.auxiliary.compose.ui.composable.navigation.routes + +import kotlinx.serialization.Serializable + +@Serializable +data class UnsignedProfileRoute( + val unsignedNostrEventId: Long, +): Route() { +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/UnsyncedProfileRoute.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/UnsyncedProfileRoute.kt similarity index 66% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/UnsyncedProfileRoute.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/UnsyncedProfileRoute.kt index cf9ec71a..11fe5e84 100755 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/routes/UnsyncedProfileRoute.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/UnsyncedProfileRoute.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.ui.composable.navigation.routes +package ac.cord.auxiliary.compose.ui.composable.navigation.routes import kotlinx.serialization.Serializable diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/WriteNewNoteRoute.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/WriteNewNoteRoute.kt new file mode 100755 index 00000000..e29a4cc4 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/navigation/routes/WriteNewNoteRoute.kt @@ -0,0 +1,9 @@ +package ac.cord.auxiliary.compose.ui.composable.navigation.routes + +import kotlinx.serialization.Serializable + +@Serializable +data class WriteNewNoteRoute( + val inReplyToEventId: String? = null, +): Route() { +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/LoadingDataIndicator.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/LoadingDataIndicator.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/LoadingDataIndicator.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/LoadingDataIndicator.kt index df717d0b..6addfe46 100755 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/LoadingDataIndicator.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/LoadingDataIndicator.kt @@ -1,6 +1,6 @@ -package ac.aux.compose.ui.composable.widgets +package ac.cord.auxiliary.compose.ui.composable.widgets -import ac.aux.compose.ui.theme.AuxTheme +import ac.cord.auxiliary.compose.ui.theme.AuxTheme import androidx.compose.foundation.layout.* import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.MaterialTheme diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/coil/forwardingPainter.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/coil/forwardingPainter.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/coil/forwardingPainter.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/coil/forwardingPainter.kt index 4616a28e..712fd3d7 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/coil/forwardingPainter.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/coil/forwardingPainter.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.ui.composable.widgets.coil +package ac.cord.auxiliary.compose.ui.composable.widgets.coil import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.DefaultAlpha diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/detail/MetadataEventDetail.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/detail/MetadataEventDetail.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/detail/MetadataEventDetail.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/detail/MetadataEventDetail.kt index fd56f445..f7ea3c55 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/detail/MetadataEventDetail.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/detail/MetadataEventDetail.kt @@ -1,18 +1,17 @@ -package ac.aux.compose.ui.composable.widgets.detail +package ac.cord.auxiliary.compose.ui.composable.widgets.detail -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Profile -import ac.aux.compose.database.model.intermdiate.LocalNostrEvent -import ac.aux.compose.repository.NostrRepository -import ac.aux.compose.ui.composable.navigation.routes.NostrEventDetailRoute -import ac.aux.compose.ui.composable.navigation.routes.Route -import ac.aux.compose.ui.composable.widgets.feed.ListView -import ac.aux.compose.ui.theme.AuxTheme -import ac.aux.compose.ui.view.model.MetadataEventDetailType -import ac.aux.compose.ui.view.model.MetadataEventDetailViewModel -import ac.aux.compose.ui.view.model.SearchResultType -import ac.aux.compose.ui.view.state.FeedListUIState -import ac.aux.compose.ui.view.state.SearchResultListUIState +import ac.cord.auxiliary.compose.database.model.NostrEvent +import ac.cord.auxiliary.compose.database.model.Profile +import ac.cord.auxiliary.compose.database.model.intermdiate.LocalNostrEvent +import ac.cord.auxiliary.compose.repository.NostrRepository +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.NostrEventDetailRoute +import ac.cord.auxiliary.compose.ui.composable.navigation.routes.Route +import ac.cord.auxiliary.compose.ui.composable.widgets.feed.ListView +import ac.cord.auxiliary.compose.ui.theme.AuxTheme +import ac.cord.auxiliary.compose.ui.view.model.MetadataEventDetailType +import ac.cord.auxiliary.compose.ui.view.model.MetadataEventDetailViewModel +import ac.cord.auxiliary.compose.ui.view.model.SearchResultType +import ac.cord.auxiliary.compose.ui.view.state.FeedListUIState import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -47,11 +46,7 @@ import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.rememberTopAppBarState import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.rememberCoroutineScope -import androidx.compose.runtime.saveable.rememberSaveable -import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/detail/TextNoteEventDetail.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/detail/TextNoteEventDetail.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/detail/TextNoteEventDetail.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/detail/TextNoteEventDetail.kt index 784618e9..c9113328 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/detail/TextNoteEventDetail.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/detail/TextNoteEventDetail.kt @@ -1,10 +1,10 @@ -package ac.aux.compose.ui.composable.widgets.detail +package ac.cord.auxiliary.compose.ui.composable.widgets.detail -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Profile -import ac.aux.compose.database.model.intermdiate.LocalNostrEvent -import ac.aux.compose.extensions.toFormattedTimeAndDateString -import ac.aux.compose.ui.theme.AuxTheme +import ac.cord.auxiliary.compose.database.model.NostrEvent +import ac.cord.auxiliary.compose.database.model.Profile +import ac.cord.auxiliary.compose.database.model.intermdiate.LocalNostrEvent +import ac.cord.auxiliary.compose.extensions.toFormattedTimeAndDateString +import ac.cord.auxiliary.compose.ui.theme.AuxTheme import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/feed/Dummy.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/feed/Dummy.kt new file mode 100644 index 00000000..c391a5a2 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/feed/Dummy.kt @@ -0,0 +1,2 @@ +package ac.cord.auxiliary.compose.ui.composable.widgets.feed + diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/feed/EventListView.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/feed/EventListView.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/feed/EventListView.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/feed/EventListView.kt index 4f41760e..69ebd88d 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/feed/EventListView.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/feed/EventListView.kt @@ -1,12 +1,11 @@ -package ac.aux.compose.ui.composable.widgets.feed +package ac.cord.auxiliary.compose.ui.composable.widgets.feed -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Profile -import ac.aux.compose.database.model.Repost -import ac.aux.compose.database.model.intermdiate.LocalNostrEvent -import ac.aux.compose.extensions.toFormattedTimeAndDateString -import ac.aux.compose.ui.composable.widgets.profile.ProfileAvatar -import ac.aux.compose.ui.theme.AuxTheme +import ac.cord.auxiliary.compose.database.model.NostrEvent +import ac.cord.auxiliary.compose.database.model.Profile +import ac.cord.auxiliary.compose.database.model.intermdiate.LocalNostrEvent +import ac.cord.auxiliary.compose.extensions.toFormattedTimeAndDateString +import ac.cord.auxiliary.compose.ui.composable.widgets.profile.ProfileAvatar +import ac.cord.auxiliary.compose.ui.theme.AuxTheme import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -15,26 +14,19 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyRow import androidx.compose.foundation.lazy.items -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Person import androidx.compose.material3.AssistChip import androidx.compose.material3.ElevatedCard import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi -import androidx.compose.material3.Icon -import androidx.compose.material3.MaterialShapes import androidx.compose.material3.MaterialTheme import androidx.compose.material3.SuggestionChip import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment -import androidx.compose.ui.BiasAbsoluteAlignment import androidx.compose.ui.Modifier -import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip18Reposts.RepostEvent import kotlin.time.Instant diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/feed/FeedListItem.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/feed/FeedListItem.kt new file mode 100644 index 00000000..2672cee2 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/feed/FeedListItem.kt @@ -0,0 +1,15 @@ +package ac.cord.auxiliary.compose.ui.composable.widgets.feed + +import ac.cord.auxiliary.compose.database.model.intermdiate.LocalNostrEvent +import androidx.compose.runtime.Composable +import com.vitorpamplona.quartz.nip01Core.core.HexKey + +@Composable +fun FeedListItem( + localNostrEvent: LocalNostrEvent, + onNavigateToEvent: (HexKey) -> Unit +) { + localNostrEvent.ListView( + onNavigateToEvent = onNavigateToEvent + ) +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/profile/ProfileAvatar.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/profile/ProfileAvatar.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/profile/ProfileAvatar.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/profile/ProfileAvatar.kt index 931206fd..a7150a8c 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/widgets/profile/ProfileAvatar.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/profile/ProfileAvatar.kt @@ -1,15 +1,14 @@ -package ac.aux.compose.ui.composable.widgets.profile +package ac.cord.auxiliary.compose.ui.composable.widgets.profile -import ac.aux.compose.database.model.Profile -import ac.aux.compose.ui.composable.widgets.coil.forwardingPainter -import ac.aux.compose.ui.theme.AuxTheme +import ac.cord.auxiliary.compose.database.model.Profile +import ac.cord.auxiliary.compose.ui.composable.widgets.coil.forwardingPainter +import ac.cord.auxiliary.compose.ui.theme.AuxTheme import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.AccountCircle import androidx.compose.material.icons.filled.Face5 -import androidx.compose.material.icons.filled.Face6 import androidx.compose.material.icons.filled.FaceRetouchingOff import androidx.compose.material3.Icon import androidx.compose.material3.Surface @@ -22,7 +21,6 @@ import androidx.compose.ui.graphics.vector.rememberVectorPainter import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import co.touchlab.kermit.Logger import coil3.compose.AsyncImage import kotlin.math.abs diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/theme/Color.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/theme/Color.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/theme/Color.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/theme/Color.kt index 8f01e9d7..4f108dbf 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/theme/Color.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/theme/Color.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.ui.theme +package ac.cord.auxiliary.compose.ui.theme import androidx.compose.ui.graphics.Color diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/theme/Theme.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/theme/Theme.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/theme/Theme.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/theme/Theme.kt index 692860a8..8cdea971 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/theme/Theme.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/theme/Theme.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.ui.theme +package ac.cord.auxiliary.compose.ui.theme import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.ColorScheme diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/theme/Type.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/theme/Type.kt similarity index 100% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/theme/Type.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/theme/Type.kt diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/CreateProfileViewModel.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/CreateProfileViewModel.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/CreateProfileViewModel.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/CreateProfileViewModel.kt index ee2e5234..0bb5f89d 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/CreateProfileViewModel.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/CreateProfileViewModel.kt @@ -1,16 +1,16 @@ -package ac.aux.compose.ui.view.model +package ac.cord.auxiliary.compose.ui.view.model -import ac.aux.compose.managers.SeedManager -import ac.aux.compose.nostr.Relays -import ac.aux.compose.repository.NostrRepository -import ac.aux.compose.ui.view.state.CreateProfileUIState +import ac.cord.auxiliary.compose.managers.SeedManager +import ac.cord.auxiliary.compose.nostr.Relays +import ac.cord.auxiliary.compose.repository.NostrRepository +import ac.cord.auxiliary.compose.ui.view.state.CreateProfileUIState import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import ac.aux.compose.ui.view.state.form.CreateProfileFormState +import ac.cord.auxiliary.compose.ui.view.state.form.CreateProfileFormState import androidx.lifecycle.viewModelScope import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.toHexKey diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/FeedListViewModel.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/FeedListViewModel.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/FeedListViewModel.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/FeedListViewModel.kt index c1ffbaac..38874308 100755 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/FeedListViewModel.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/FeedListViewModel.kt @@ -1,11 +1,11 @@ -package ac.aux.compose.ui.view.model +package ac.cord.auxiliary.compose.ui.view.model -import ac.aux.compose.database.model.SynchronizeNostrEventRequest -import ac.aux.compose.database.model.types.SynchronizationFilter -import ac.aux.compose.managers.SeedManager -import ac.aux.compose.nostr.Relays -import ac.aux.compose.repository.NostrRepository -import ac.aux.compose.ui.view.state.FeedListUIState +import ac.cord.auxiliary.compose.database.model.SynchronizeNostrEventRequest +import ac.cord.auxiliary.compose.database.model.types.SynchronizationFilter +import ac.cord.auxiliary.compose.managers.SeedManager +import ac.cord.auxiliary.compose.nostr.Relays +import ac.cord.auxiliary.compose.repository.NostrRepository +import ac.cord.auxiliary.compose.ui.view.state.FeedListUIState import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/MetadataEventDetailViewModel.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/MetadataEventDetailViewModel.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/MetadataEventDetailViewModel.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/MetadataEventDetailViewModel.kt index 056025f4..d094bedb 100755 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/MetadataEventDetailViewModel.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/MetadataEventDetailViewModel.kt @@ -1,13 +1,11 @@ -package ac.aux.compose.ui.view.model +package ac.cord.auxiliary.compose.ui.view.model -import ac.aux.compose.database.model.SynchronizeNostrEventRequest -import ac.aux.compose.database.model.types.SynchronizationFilter -import ac.aux.compose.nostr.Relays -import ac.aux.compose.repository.NostrRepository -import ac.aux.compose.ui.view.state.FeedListUIState -import ac.aux.compose.ui.view.state.SearchResultListUIState +import ac.cord.auxiliary.compose.database.model.SynchronizeNostrEventRequest +import ac.cord.auxiliary.compose.database.model.types.SynchronizationFilter +import ac.cord.auxiliary.compose.nostr.Relays +import ac.cord.auxiliary.compose.repository.NostrRepository +import ac.cord.auxiliary.compose.ui.view.state.FeedListUIState import androidx.compose.foundation.pager.PagerState -import androidx.compose.foundation.pager.rememberPagerState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/NavigationViewModel.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/NavigationViewModel.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/NavigationViewModel.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/NavigationViewModel.kt index 5e22faf1..7d178397 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/NavigationViewModel.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/NavigationViewModel.kt @@ -1,17 +1,17 @@ -package ac.aux.compose.ui.view.model +package ac.cord.auxiliary.compose.ui.view.model -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.managers.SeedManager -import ac.aux.compose.network.dto.RelayDTO -import ac.aux.compose.network.relays.RelayPool.Companion.PUBLISH_TIMEOUT -import ac.aux.compose.network.relays.RelaysSocketManager -import ac.aux.compose.network.sockets.NostrIncomingMessage -import ac.aux.compose.network.sockets.NostrSocketClientFactory -import ac.aux.compose.nostr.Relays -import ac.aux.compose.repository.CachingImportRepository -import ac.aux.compose.repository.NostrRepository -import ac.aux.compose.repository.RelayRepository -import ac.aux.compose.ui.view.state.NavigationUIState +import ac.cord.auxiliary.compose.database.model.NostrEvent +import ac.cord.auxiliary.compose.managers.SeedManager +import ac.cord.auxiliary.compose.network.dto.RelayDTO +import ac.cord.auxiliary.compose.network.relays.RelayPool.Companion.PUBLISH_TIMEOUT +import ac.cord.auxiliary.compose.network.relays.RelaysSocketManager +import ac.cord.auxiliary.compose.network.sockets.NostrIncomingMessage +import ac.cord.auxiliary.compose.network.sockets.NostrSocketClientFactory +import ac.cord.auxiliary.compose.nostr.Relays +import ac.cord.auxiliary.compose.repository.CachingImportRepository +import ac.cord.auxiliary.compose.repository.NostrRepository +import ac.cord.auxiliary.compose.repository.RelayRepository +import ac.cord.auxiliary.compose.ui.view.state.NavigationUIState import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewmodel.initializer diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/NostrEventDetailViewModel.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/NostrEventDetailViewModel.kt similarity index 89% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/NostrEventDetailViewModel.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/NostrEventDetailViewModel.kt index 3abe1b40..1761dc73 100755 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/NostrEventDetailViewModel.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/NostrEventDetailViewModel.kt @@ -1,11 +1,11 @@ -package ac.aux.compose.ui.view.model +package ac.cord.auxiliary.compose.ui.view.model -import ac.aux.compose.database.model.SynchronizeNostrEventRequest -import ac.aux.compose.database.model.types.SynchronizationFilter -import ac.aux.compose.managers.SeedManager -import ac.aux.compose.nostr.Relays -import ac.aux.compose.repository.NostrRepository -import ac.aux.compose.ui.view.state.NostrEventDetailUIState +import ac.cord.auxiliary.compose.database.model.SynchronizeNostrEventRequest +import ac.cord.auxiliary.compose.database.model.types.SynchronizationFilter +import ac.cord.auxiliary.compose.managers.SeedManager +import ac.cord.auxiliary.compose.nostr.Relays +import ac.cord.auxiliary.compose.repository.NostrRepository +import ac.cord.auxiliary.compose.ui.view.state.NostrEventDetailUIState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/SearchResultViewModel.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/SearchResultViewModel.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/SearchResultViewModel.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/SearchResultViewModel.kt index c1febc43..bfdb00fb 100755 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/SearchResultViewModel.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/SearchResultViewModel.kt @@ -1,11 +1,11 @@ -package ac.aux.compose.ui.view.model +package ac.cord.auxiliary.compose.ui.view.model -import ac.aux.compose.database.model.SynchronizeNostrEventRequest -import ac.aux.compose.database.model.types.SynchronizationFilter -import ac.aux.compose.nostr.Relays -import ac.aux.compose.repository.NostrRepository -import ac.aux.compose.repository.SearchRepository -import ac.aux.compose.ui.view.state.SearchResultListUIState +import ac.cord.auxiliary.compose.database.model.SynchronizeNostrEventRequest +import ac.cord.auxiliary.compose.database.model.types.SynchronizationFilter +import ac.cord.auxiliary.compose.nostr.Relays +import ac.cord.auxiliary.compose.repository.NostrRepository +import ac.cord.auxiliary.compose.repository.SearchRepository +import ac.cord.auxiliary.compose.ui.view.state.SearchResultListUIState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/SearchViewModel.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/SearchViewModel.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/SearchViewModel.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/SearchViewModel.kt index 841905fb..4cf91c9d 100755 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/SearchViewModel.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/SearchViewModel.kt @@ -1,10 +1,10 @@ -package ac.aux.compose.ui.view.model +package ac.cord.auxiliary.compose.ui.view.model -import ac.aux.compose.database.model.Profile -import ac.aux.compose.database.model.RecentSearch -import ac.aux.compose.repository.NostrRepository -import ac.aux.compose.repository.SearchRepository -import ac.aux.compose.ui.view.state.SearchUIState +import ac.cord.auxiliary.compose.database.model.Profile +import ac.cord.auxiliary.compose.database.model.RecentSearch +import ac.cord.auxiliary.compose.repository.NostrRepository +import ac.cord.auxiliary.compose.repository.SearchRepository +import ac.cord.auxiliary.compose.ui.view.state.SearchUIState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateOf diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/SignInToProfileViewModel.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/SignInToProfileViewModel.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/SignInToProfileViewModel.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/SignInToProfileViewModel.kt index 659877d4..3c37586d 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/SignInToProfileViewModel.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/SignInToProfileViewModel.kt @@ -1,9 +1,9 @@ -package ac.aux.compose.ui.view.model +package ac.cord.auxiliary.compose.ui.view.model -import ac.aux.compose.nostr.Relays -import ac.aux.compose.repository.NostrRepository -import ac.aux.compose.ui.view.state.SignInToProfileUIState -import ac.aux.compose.ui.view.state.form.SignInToProfileFormState +import ac.cord.auxiliary.compose.nostr.Relays +import ac.cord.auxiliary.compose.repository.NostrRepository +import ac.cord.auxiliary.compose.ui.view.state.SignInToProfileUIState +import ac.cord.auxiliary.compose.ui.view.state.form.SignInToProfileFormState import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf import androidx.lifecycle.ViewModel diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/UnqueuedProfileSynchronizationViewModel.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/UnqueuedProfileSynchronizationViewModel.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/UnqueuedProfileSynchronizationViewModel.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/UnqueuedProfileSynchronizationViewModel.kt index c77288b4..2d01a8da 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/UnqueuedProfileSynchronizationViewModel.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/UnqueuedProfileSynchronizationViewModel.kt @@ -1,9 +1,9 @@ -package ac.aux.compose.ui.view.model +package ac.cord.auxiliary.compose.ui.view.model -import ac.aux.compose.database.model.SynchronizeNostrEventRequest -import ac.aux.compose.database.model.types.SynchronizationFilter -import ac.aux.compose.nostr.Relays -import ac.aux.compose.repository.NostrRepository +import ac.cord.auxiliary.compose.database.model.SynchronizeNostrEventRequest +import ac.cord.auxiliary.compose.database.model.types.SynchronizationFilter +import ac.cord.auxiliary.compose.nostr.Relays +import ac.cord.auxiliary.compose.repository.NostrRepository import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf import androidx.lifecycle.ViewModel @@ -13,7 +13,6 @@ import androidx.lifecycle.viewmodel.viewModelFactory import androidx.lifecycle.viewModelScope import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent -import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.delay diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/WriteNewNoteViewModel.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/WriteNewNoteViewModel.kt similarity index 88% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/WriteNewNoteViewModel.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/WriteNewNoteViewModel.kt index 06b742b9..d832ad18 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/model/WriteNewNoteViewModel.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/WriteNewNoteViewModel.kt @@ -1,16 +1,15 @@ -package ac.aux.compose.ui.view.model +package ac.cord.auxiliary.compose.ui.view.model -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.managers.SeedManager -import ac.aux.compose.repository.NostrRepository -import ac.aux.compose.ui.view.state.WriteNewNoteUIState +import ac.cord.auxiliary.compose.managers.SeedManager +import ac.cord.auxiliary.compose.repository.NostrRepository +import ac.cord.auxiliary.compose.ui.view.state.WriteNewNoteUIState import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory -import ac.aux.compose.ui.view.state.form.WriteNewNoteFormState +import ac.cord.auxiliary.compose.ui.view.state.form.WriteNewNoteFormState import androidx.lifecycle.viewModelScope import co.touchlab.kermit.Logger import com.vitorpamplona.quartz.nip01Core.core.toHexKey diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/CreateProfileUIState.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/CreateProfileUIState.kt similarity index 67% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/CreateProfileUIState.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/CreateProfileUIState.kt index 17712d33..56cd44b5 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/CreateProfileUIState.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/CreateProfileUIState.kt @@ -1,8 +1,6 @@ -package ac.aux.compose.ui.view.state +package ac.cord.auxiliary.compose.ui.view.state -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Profile -import ac.aux.compose.database.model.UnsignedNostrEvent +import ac.cord.auxiliary.compose.database.model.Profile abstract class CreateProfileUIState { data object Error: CreateProfileUIState() diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/FeedListUIState.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/FeedListUIState.kt similarity index 59% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/FeedListUIState.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/FeedListUIState.kt index d66a9caf..bb918e43 100755 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/FeedListUIState.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/FeedListUIState.kt @@ -1,7 +1,6 @@ -package ac.aux.compose.ui.view.state +package ac.cord.auxiliary.compose.ui.view.state -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.intermdiate.LocalNostrEvent +import ac.cord.auxiliary.compose.database.model.intermdiate.LocalNostrEvent sealed interface FeedListUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/NavigationUIState.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/NavigationUIState.kt similarity index 74% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/NavigationUIState.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/NavigationUIState.kt index 64367260..a11de7fd 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/NavigationUIState.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/NavigationUIState.kt @@ -1,10 +1,9 @@ -package ac.aux.compose.ui.view.state +package ac.cord.auxiliary.compose.ui.view.state -import ac.aux.compose.database.model.BroadcastNostrEventReceipt -import ac.aux.compose.database.model.BroadcastNostrEventRequest -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Profile -import ac.aux.compose.database.model.UnsignedNostrEvent +import ac.cord.auxiliary.compose.database.model.BroadcastNostrEventRequest +import ac.cord.auxiliary.compose.database.model.NostrEvent +import ac.cord.auxiliary.compose.database.model.Profile +import ac.cord.auxiliary.compose.database.model.UnsignedNostrEvent abstract class NavigationUIState { data object Error: NavigationUIState() diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/NostrEventDetailUIState.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/NostrEventDetailUIState.kt similarity index 66% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/NostrEventDetailUIState.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/NostrEventDetailUIState.kt index 41034b4a..d745628a 100755 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/NostrEventDetailUIState.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/NostrEventDetailUIState.kt @@ -1,7 +1,6 @@ -package ac.aux.compose.ui.view.state +package ac.cord.auxiliary.compose.ui.view.state -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.intermdiate.LocalNostrEvent +import ac.cord.auxiliary.compose.database.model.intermdiate.LocalNostrEvent sealed interface NostrEventDetailUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/SearchResultListUIState.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/SearchResultListUIState.kt similarity index 66% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/SearchResultListUIState.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/SearchResultListUIState.kt index a63f655b..7806d34d 100755 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/SearchResultListUIState.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/SearchResultListUIState.kt @@ -1,6 +1,6 @@ -package ac.aux.compose.ui.view.state +package ac.cord.auxiliary.compose.ui.view.state -import ac.aux.compose.database.model.intermdiate.LocalNostrEvent +import ac.cord.auxiliary.compose.database.model.intermdiate.LocalNostrEvent sealed interface SearchResultListUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/SearchUIState.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/SearchUIState.kt similarity index 67% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/SearchUIState.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/SearchUIState.kt index 69d4954d..48e42ed9 100755 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/SearchUIState.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/SearchUIState.kt @@ -1,6 +1,6 @@ -package ac.aux.compose.ui.view.state +package ac.cord.auxiliary.compose.ui.view.state -import ac.aux.compose.database.model.intermdiate.LocalNostrEvent +import ac.cord.auxiliary.compose.database.model.intermdiate.LocalNostrEvent sealed interface SearchUIState { data class Loaded( diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/SignInToProfileUIState.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/SignInToProfileUIState.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/SignInToProfileUIState.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/SignInToProfileUIState.kt index 8282ef0e..c73d1afb 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/SignInToProfileUIState.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/SignInToProfileUIState.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.ui.view.state +package ac.cord.auxiliary.compose.ui.view.state import com.vitorpamplona.quartz.nip01Core.core.HexKey diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/WriteNewNoteUIState.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/WriteNewNoteUIState.kt similarity index 54% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/WriteNewNoteUIState.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/WriteNewNoteUIState.kt index f42cf35a..4d92deee 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/WriteNewNoteUIState.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/WriteNewNoteUIState.kt @@ -1,8 +1,4 @@ -package ac.aux.compose.ui.view.state - -import ac.aux.compose.database.model.NostrEvent -import ac.aux.compose.database.model.Profile -import ac.aux.compose.database.model.UnsignedNostrEvent +package ac.cord.auxiliary.compose.ui.view.state abstract class WriteNewNoteUIState { data object Error: WriteNewNoteUIState() diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/form/CreateProfileFormState.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/form/CreateProfileFormState.kt similarity index 70% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/form/CreateProfileFormState.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/form/CreateProfileFormState.kt index f992aba0..238b24cc 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/form/CreateProfileFormState.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/form/CreateProfileFormState.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.ui.view.state.form +package ac.cord.auxiliary.compose.ui.view.state.form data class CreateProfileFormState( val nameField: TextField = TextField(), diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/form/SignInToProfileFormState.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/form/SignInToProfileFormState.kt similarity index 60% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/form/SignInToProfileFormState.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/form/SignInToProfileFormState.kt index 08a2b3cf..5aa5e7d3 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/form/SignInToProfileFormState.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/form/SignInToProfileFormState.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.ui.view.state.form +package ac.cord.auxiliary.compose.ui.view.state.form data class SignInToProfileFormState( val textField: TextField = TextField(), diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/form/TextField.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/form/TextField.kt similarity index 82% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/form/TextField.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/form/TextField.kt index 3b48af54..86362247 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/form/TextField.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/form/TextField.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.ui.view.state.form +package ac.cord.auxiliary.compose.ui.view.state.form import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/form/WriteNewNoteFormState.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/form/WriteNewNoteFormState.kt similarity index 59% rename from composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/form/WriteNewNoteFormState.kt rename to composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/form/WriteNewNoteFormState.kt index 640b6ba3..717f44b6 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/view/state/form/WriteNewNoteFormState.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/state/form/WriteNewNoteFormState.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.ui.view.state.form +package ac.cord.auxiliary.compose.ui.view.state.form data class WriteNewNoteFormState( val textField: TextField = TextField(), diff --git a/composeApp/src/commonTest/kotlin/ac/aux/compose/ComposeAppCommonTest.kt b/composeApp/src/commonTest/kotlin/ac/auxiliary/compose/ComposeAppCommonTest.kt similarity index 83% rename from composeApp/src/commonTest/kotlin/ac/aux/compose/ComposeAppCommonTest.kt rename to composeApp/src/commonTest/kotlin/ac/auxiliary/compose/ComposeAppCommonTest.kt index 51ac1519..b83025ad 100644 --- a/composeApp/src/commonTest/kotlin/ac/aux/compose/ComposeAppCommonTest.kt +++ b/composeApp/src/commonTest/kotlin/ac/auxiliary/compose/ComposeAppCommonTest.kt @@ -1,4 +1,4 @@ -package ac.aux.compose +package ac.auxiliary.compose import kotlin.test.Test import kotlin.test.assertEquals diff --git a/composeApp/src/iosMain/kotlin/ac/aux/compose/PlatformContext.ios.kt b/composeApp/src/iosMain/kotlin/ac/aux/compose/PlatformContext.ios.kt deleted file mode 100644 index e4be7c73..00000000 --- a/composeApp/src/iosMain/kotlin/ac/aux/compose/PlatformContext.ios.kt +++ /dev/null @@ -1,3 +0,0 @@ -package ac.aux.compose - -actual class PlatformContext \ No newline at end of file diff --git a/composeApp/src/iosMain/kotlin/ac/aux/compose/MainViewController.kt b/composeApp/src/iosMain/kotlin/ac/cord/auxiliary/compose/MainViewController.kt similarity index 91% rename from composeApp/src/iosMain/kotlin/ac/aux/compose/MainViewController.kt rename to composeApp/src/iosMain/kotlin/ac/cord/auxiliary/compose/MainViewController.kt index a18735c6..7b39aaf5 100644 --- a/composeApp/src/iosMain/kotlin/ac/aux/compose/MainViewController.kt +++ b/composeApp/src/iosMain/kotlin/ac/cord/auxiliary/compose/MainViewController.kt @@ -1,4 +1,4 @@ -package ac.aux.compose +package ac.cord.auxiliary.compose import androidx.compose.ui.window.ComposeUIViewController import androidx.navigation.compose.rememberNavController diff --git a/composeApp/src/iosMain/kotlin/ac/aux/compose/Platform.ios.kt b/composeApp/src/iosMain/kotlin/ac/cord/auxiliary/compose/Platform.ios.kt similarity index 68% rename from composeApp/src/iosMain/kotlin/ac/aux/compose/Platform.ios.kt rename to composeApp/src/iosMain/kotlin/ac/cord/auxiliary/compose/Platform.ios.kt index e0e0e1aa..f142eaa6 100644 --- a/composeApp/src/iosMain/kotlin/ac/aux/compose/Platform.ios.kt +++ b/composeApp/src/iosMain/kotlin/ac/cord/auxiliary/compose/Platform.ios.kt @@ -1,4 +1,4 @@ -package ac.aux.compose +package ac.cord.auxiliary.compose import platform.UIKit.UIDevice diff --git a/composeApp/src/iosMain/kotlin/ac/cord/auxiliary/compose/PlatformContext.ios.kt b/composeApp/src/iosMain/kotlin/ac/cord/auxiliary/compose/PlatformContext.ios.kt new file mode 100644 index 00000000..b52de0a8 --- /dev/null +++ b/composeApp/src/iosMain/kotlin/ac/cord/auxiliary/compose/PlatformContext.ios.kt @@ -0,0 +1,3 @@ +package ac.cord.auxiliary.compose + +actual class PlatformContext \ No newline at end of file diff --git a/composeApp/src/iosMain/kotlin/ac/aux/compose/database/builder/PlatformDatabaseBuilder.ios.kt b/composeApp/src/iosMain/kotlin/ac/cord/auxiliary/compose/database/builder/PlatformDatabaseBuilder.ios.kt similarity index 88% rename from composeApp/src/iosMain/kotlin/ac/aux/compose/database/builder/PlatformDatabaseBuilder.ios.kt rename to composeApp/src/iosMain/kotlin/ac/cord/auxiliary/compose/database/builder/PlatformDatabaseBuilder.ios.kt index ad88c156..4e3be082 100644 --- a/composeApp/src/iosMain/kotlin/ac/aux/compose/database/builder/PlatformDatabaseBuilder.ios.kt +++ b/composeApp/src/iosMain/kotlin/ac/cord/auxiliary/compose/database/builder/PlatformDatabaseBuilder.ios.kt @@ -1,7 +1,7 @@ -package ac.aux.compose.database.builder +package ac.cord.auxiliary.compose.database.builder -import ac.aux.compose.PlatformContext -import ac.aux.compose.database.AuxDatabase +import ac.cord.auxiliary.compose.PlatformContext +import ac.auxiliary.compose.database.AuxDatabase import androidx.room.Room import androidx.room.RoomDatabase import kotlinx.cinterop.ExperimentalForeignApi diff --git a/composeApp/src/iosMain/kotlin/ac/aux/compose/ui/theme/Theme.ios.kt b/composeApp/src/iosMain/kotlin/ac/cord/auxiliary/compose/ui/theme/Theme.ios.kt similarity index 88% rename from composeApp/src/iosMain/kotlin/ac/aux/compose/ui/theme/Theme.ios.kt rename to composeApp/src/iosMain/kotlin/ac/cord/auxiliary/compose/ui/theme/Theme.ios.kt index 255b6d60..79e272fe 100644 --- a/composeApp/src/iosMain/kotlin/ac/aux/compose/ui/theme/Theme.ios.kt +++ b/composeApp/src/iosMain/kotlin/ac/cord/auxiliary/compose/ui/theme/Theme.ios.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.ui.theme +package ac.cord.auxiliary.compose.ui.theme import androidx.compose.material3.ColorScheme import androidx.compose.runtime.Composable diff --git a/composeApp/src/jvmMain/kotlin/ac/aux/compose/PlatformContext.jvm.kt b/composeApp/src/jvmMain/kotlin/ac/aux/compose/PlatformContext.jvm.kt deleted file mode 100644 index e4be7c73..00000000 --- a/composeApp/src/jvmMain/kotlin/ac/aux/compose/PlatformContext.jvm.kt +++ /dev/null @@ -1,3 +0,0 @@ -package ac.aux.compose - -actual class PlatformContext \ No newline at end of file diff --git a/composeApp/src/jvmMain/kotlin/ac/aux/compose/Platform.jvm.kt b/composeApp/src/jvmMain/kotlin/ac/cord/auxiliary/compose/Platform.jvm.kt similarity index 56% rename from composeApp/src/jvmMain/kotlin/ac/aux/compose/Platform.jvm.kt rename to composeApp/src/jvmMain/kotlin/ac/cord/auxiliary/compose/Platform.jvm.kt index 2843dd78..cbce9a9b 100644 --- a/composeApp/src/jvmMain/kotlin/ac/aux/compose/Platform.jvm.kt +++ b/composeApp/src/jvmMain/kotlin/ac/cord/auxiliary/compose/Platform.jvm.kt @@ -1,4 +1,4 @@ -package ac.aux.compose +package ac.cord.auxiliary.compose class JVMPlatform: Platform { override val name: String = "Java ${System.getProperty("java.version")}" diff --git a/composeApp/src/jvmMain/kotlin/ac/cord/auxiliary/compose/PlatformContext.jvm.kt b/composeApp/src/jvmMain/kotlin/ac/cord/auxiliary/compose/PlatformContext.jvm.kt new file mode 100644 index 00000000..b52de0a8 --- /dev/null +++ b/composeApp/src/jvmMain/kotlin/ac/cord/auxiliary/compose/PlatformContext.jvm.kt @@ -0,0 +1,3 @@ +package ac.cord.auxiliary.compose + +actual class PlatformContext \ No newline at end of file diff --git a/composeApp/src/jvmMain/kotlin/ac/aux/compose/database/builder/PlatformDatabaseBuilder.jvm.kt b/composeApp/src/jvmMain/kotlin/ac/cord/auxiliary/compose/database/builder/PlatformDatabaseBuilder.jvm.kt similarity index 80% rename from composeApp/src/jvmMain/kotlin/ac/aux/compose/database/builder/PlatformDatabaseBuilder.jvm.kt rename to composeApp/src/jvmMain/kotlin/ac/cord/auxiliary/compose/database/builder/PlatformDatabaseBuilder.jvm.kt index eebd7b28..f78769a7 100644 --- a/composeApp/src/jvmMain/kotlin/ac/aux/compose/database/builder/PlatformDatabaseBuilder.jvm.kt +++ b/composeApp/src/jvmMain/kotlin/ac/cord/auxiliary/compose/database/builder/PlatformDatabaseBuilder.jvm.kt @@ -1,7 +1,7 @@ -package ac.aux.compose.database.builder +package ac.cord.auxiliary.compose.database.builder -import ac.aux.compose.PlatformContext -import ac.aux.compose.database.AuxDatabase +import ac.cord.auxiliary.compose.PlatformContext +import ac.auxiliary.compose.database.AuxDatabase import androidx.room.Room import androidx.room.RoomDatabase import java.io.File diff --git a/composeApp/src/jvmMain/kotlin/ac/aux/compose/main.kt b/composeApp/src/jvmMain/kotlin/ac/cord/auxiliary/compose/main.kt similarity index 93% rename from composeApp/src/jvmMain/kotlin/ac/aux/compose/main.kt rename to composeApp/src/jvmMain/kotlin/ac/cord/auxiliary/compose/main.kt index caef58c7..2833dfbf 100644 --- a/composeApp/src/jvmMain/kotlin/ac/aux/compose/main.kt +++ b/composeApp/src/jvmMain/kotlin/ac/cord/auxiliary/compose/main.kt @@ -1,4 +1,4 @@ -package ac.aux.compose +package ac.cord.auxiliary.compose import androidx.compose.ui.window.Window import androidx.compose.ui.window.application diff --git a/composeApp/src/jvmMain/kotlin/ac/aux/compose/ui/theme/Theme.jvm.kt b/composeApp/src/jvmMain/kotlin/ac/cord/auxiliary/compose/ui/theme/Theme.jvm.kt similarity index 88% rename from composeApp/src/jvmMain/kotlin/ac/aux/compose/ui/theme/Theme.jvm.kt rename to composeApp/src/jvmMain/kotlin/ac/cord/auxiliary/compose/ui/theme/Theme.jvm.kt index 255b6d60..79e272fe 100644 --- a/composeApp/src/jvmMain/kotlin/ac/aux/compose/ui/theme/Theme.jvm.kt +++ b/composeApp/src/jvmMain/kotlin/ac/cord/auxiliary/compose/ui/theme/Theme.jvm.kt @@ -1,4 +1,4 @@ -package ac.aux.compose.ui.theme +package ac.cord.auxiliary.compose.ui.theme import androidx.compose.material3.ColorScheme import androidx.compose.runtime.Composable