composeApp/src/androidMain/kotlin/su/reya/coop/AndroidExternalSigner.kt

@@ -6,6 +6,8 @@ import android.content.Intent
 import androidx.core.net.toUri
 import rust.nostr.sdk.PublicKey
 import rust.nostr.sdk.UnsignedEvent
+import su.reya.coop.nostr.ExternalSignerHandler
+import su.reya.coop.nostr.ExternalSignerResult
 
 class AndroidExternalSigner(
     private val context: Context,

composeApp/src/androidMain/kotlin/su/reya/coop/NostrForegroundService.kt

@@ -21,6 +21,7 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import su.reya.coop.nostr.NostrManager
+import su.reya.coop.nostr.roomId
 import java.io.File
 
 private const val GROUP_KEY_MESSAGES = "su.reya.coop.MESSAGES"

composeApp/src/androidMain/kotlin/su/reya/coop/screens/ChatScreen.kt

@@ -68,11 +68,11 @@ import rust.nostr.sdk.UnsignedEvent
 import su.reya.coop.LocalNavigator
 import su.reya.coop.LocalNostrViewModel
 import su.reya.coop.LocalSnackbarHostState
-import su.reya.coop.Room
 import su.reya.coop.Screen
-import su.reya.coop.formatAsGroupHeader
-import su.reya.coop.humanReadable
-import su.reya.coop.roomId
+import su.reya.coop.nostr.Room
+import su.reya.coop.nostr.formatAsGroupHeader
+import su.reya.coop.nostr.humanReadable
+import su.reya.coop.nostr.roomId
 import su.reya.coop.shared.Avatar
 import su.reya.coop.shared.getExpressiveFontFamily
 import su.reya.coop.shared.nameFlow

composeApp/src/androidMain/kotlin/su/reya/coop/screens/HomeScreen.kt

@@ -95,10 +95,10 @@ import su.reya.coop.LocalNavigator
 import su.reya.coop.LocalNostrViewModel
 import su.reya.coop.LocalScanResult
 import su.reya.coop.LocalSnackbarHostState
-import su.reya.coop.Room
-import su.reya.coop.RoomKind
 import su.reya.coop.Screen
-import su.reya.coop.ago
+import su.reya.coop.nostr.Room
+import su.reya.coop.nostr.RoomKind
+import su.reya.coop.nostr.ago
 import su.reya.coop.shared.Avatar
 import su.reya.coop.shared.getExpressiveFontFamily
 import su.reya.coop.shared.nameFlow

composeApp/src/androidMain/kotlin/su/reya/coop/screens/RequestListScreen.kt

@@ -40,8 +40,8 @@ import kotlinx.coroutines.launch
 import su.reya.coop.LocalNavigator
 import su.reya.coop.LocalNostrViewModel
 import su.reya.coop.LocalSnackbarHostState
-import su.reya.coop.RoomKind
 import su.reya.coop.Screen
+import su.reya.coop.nostr.RoomKind
 
 @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class)
 @Composable

composeApp/src/androidMain/kotlin/su/reya/coop/shared/RoomHelper.kt

@@ -5,7 +5,7 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import su.reya.coop.NostrViewModel
-import su.reya.coop.Room
+import su.reya.coop.nostr.Room
 import su.reya.coop.short
 
 fun Room.nameFlow(viewModel: NostrViewModel): Flow<String> {

shared/src/commonMain/kotlin/su/reya/coop/NostrViewModel.kt

@@ -41,7 +41,12 @@ import rust.nostr.sdk.Tag
 import rust.nostr.sdk.Timestamp
 import rust.nostr.sdk.UnsignedEvent
 import su.reya.coop.blossom.BlossomClient
+import su.reya.coop.nostr.ExternalSignerHandler
+import su.reya.coop.nostr.ExternalSignerProxy
 import su.reya.coop.nostr.Nostr
+import su.reya.coop.nostr.Room
+import su.reya.coop.nostr.SignerPermissions
+import su.reya.coop.nostr.roomId
 import su.reya.coop.storage.SecretStorage
 import kotlin.time.Clock
 import kotlin.time.Duration.Companion.milliseconds

shared/src/commonMain/kotlin/su/reya/coop/nostr/ExternalSignerHandler.kt

@@ -1,4 +1,4 @@
-package su.reya.coop
+package su.reya.coop.nostr
 
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json

shared/src/commonMain/kotlin/su/reya/coop/nostr/ExternalSignerProxy.kt

@@ -1,4 +1,4 @@
-package su.reya.coop
+package su.reya.coop.nostr
 
 import rust.nostr.sdk.AsyncNostrSigner
 import rust.nostr.sdk.Event

shared/src/commonMain/kotlin/su/reya/coop/nostr/Messaging.kt

@@ -24,10 +24,6 @@ import rust.nostr.sdk.Tag
 import rust.nostr.sdk.UnsignedEvent
 import rust.nostr.sdk.nip17ExtractRelayList
 import rust.nostr.sdk.nip59MakeGiftWrapAsync
-import su.reya.coop.Room
-import su.reya.coop.RoomKind
-import su.reya.coop.UniversalSigner
-import su.reya.coop.roomId
 import kotlin.time.Duration
 
 data class MessageSyncState(

shared/src/commonMain/kotlin/su/reya/coop/nostr/Nostr.kt

@@ -29,7 +29,6 @@ import rust.nostr.sdk.SleepWhenIdle
 import rust.nostr.sdk.Timestamp
 import rust.nostr.sdk.UnsignedEvent
 import rust.nostr.sdk.initLogger
-import su.reya.coop.UniversalSigner
 import kotlin.time.Duration
 
 object NostrManager {

shared/src/commonMain/kotlin/su/reya/coop/nostr/ProfileManager.kt

@@ -26,7 +26,6 @@ import rust.nostr.sdk.ReqTarget
 import rust.nostr.sdk.SendEventTarget
 import rust.nostr.sdk.SubscribeAutoCloseOptions
 import rust.nostr.sdk.Timestamp
-import su.reya.coop.UniversalSigner
 import kotlin.time.Duration
 
 class ProfileManager(private val nostr: Nostr) {

shared/src/commonMain/kotlin/su/reya/coop/nostr/RelayManager.kt

@@ -17,7 +17,6 @@ import rust.nostr.sdk.SendEventTarget
 import rust.nostr.sdk.SubscribeAutoCloseOptions
 import rust.nostr.sdk.extractRelayList
 import rust.nostr.sdk.nip17ExtractRelayList
-import su.reya.coop.UniversalSigner
 import kotlin.time.Duration
 
 class RelayManager(private val nostr: Nostr) {

shared/src/commonMain/kotlin/su/reya/coop/nostr/Room.kt

@@ -1,4 +1,4 @@
-package su.reya.coop
+package su.reya.coop.nostr
 
 import kotlinx.datetime.DateTimeUnit
 import kotlinx.datetime.TimeZone

shared/src/commonMain/kotlin/su/reya/coop/nostr/Signer.kt

@@ -1,4 +1,4 @@
-package su.reya.coop
+package su.reya.coop.nostr
 
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock