reya/coop-mobile
1
0
Fork 0
Code Issues Pull Requests Releases 13 Wiki Activity

chore: re-structure project #31

Merged
reya merged 3 commits from restructure into master 2026-06-29 13:42:58 +00:00
Conversation 0 Commits 3 Files Changed 33 +21 -20
15 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9c2dc1e6a5 - Show all commits

2
composeApp/src/androidMain/kotlin/su/reya/coop/AndroidExternalSigner.kt
View File

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

1
composeApp/src/androidMain/kotlin/su/reya/coop/NostrForegroundService.kt
View File

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

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

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

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

@@ -95,10 +95,10 @@ import su.reya.coop.LocalNavigator
import su.reya.coop.LocalNostrViewModel import su.reya.coop.LocalNostrViewModel
import su.reya.coop.LocalScanResult import su.reya.coop.LocalScanResult
import su.reya.coop.LocalSnackbarHostState import su.reya.coop.LocalSnackbarHostState
import su.reya.coop.Room
import su.reya.coop.RoomKind
import su.reya.coop.Screen 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.Avatar
import su.reya.coop.shared.getExpressiveFontFamily import su.reya.coop.shared.getExpressiveFontFamily
import su.reya.coop.shared.nameFlow import su.reya.coop.shared.nameFlow

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

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

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

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

5
shared/src/commonMain/kotlin/su/reya/coop/NostrViewModel.kt
View File

@@ -41,7 +41,12 @@ import rust.nostr.sdk.Tag
import rust.nostr.sdk.Timestamp import rust.nostr.sdk.Timestamp
import rust.nostr.sdk.UnsignedEvent import rust.nostr.sdk.UnsignedEvent
import su.reya.coop.blossom.BlossomClient 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.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 su.reya.coop.storage.SecretStorage
import kotlin.time.Clock import kotlin.time.Clock
import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.milliseconds

2
shared/src/commonMain/kotlin/su/reya/coop/ExternalSignerHandler.kt → shared/src/commonMain/kotlin/su/reya/coop/nostr/ExternalSignerHandler.kt
View File

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

2
shared/src/commonMain/kotlin/su/reya/coop/ExternalSignerProxy.kt → shared/src/commonMain/kotlin/su/reya/coop/nostr/ExternalSignerProxy.kt
View File

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

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

@@ -24,10 +24,6 @@ import rust.nostr.sdk.Tag
import rust.nostr.sdk.UnsignedEvent import rust.nostr.sdk.UnsignedEvent
import rust.nostr.sdk.nip17ExtractRelayList import rust.nostr.sdk.nip17ExtractRelayList
import rust.nostr.sdk.nip59MakeGiftWrapAsync 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 import kotlin.time.Duration
data class MessageSyncState( data class MessageSyncState(

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

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

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

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

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

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

2
shared/src/commonMain/kotlin/su/reya/coop/Room.kt → shared/src/commonMain/kotlin/su/reya/coop/nostr/Room.kt
View File

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

2
shared/src/commonMain/kotlin/su/reya/coop/Signer.kt → shared/src/commonMain/kotlin/su/reya/coop/nostr/Signer.kt
View File

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