Prepares for a minified release.

2023-08-01 21:49:30 -04:00
parent 5f85d8a97b
commit 7c1c500990
12 changed files with 69 additions and 52 deletions
@@ -10,7 +10,9 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.ConnectivityType
 import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
 import com.vitorpamplona.amethyst.model.KIND3_FOLLOWS
+import com.vitorpamplona.amethyst.model.Nip47URI
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
+import com.vitorpamplona.amethyst.model.ServersAvailable
 import com.vitorpamplona.amethyst.model.Settings
 import com.vitorpamplona.amethyst.model.hexToByteArray
 import com.vitorpamplona.amethyst.model.parseConnectivityType
@@ -22,8 +24,6 @@ import com.vitorpamplona.amethyst.service.model.Event
 import com.vitorpamplona.amethyst.service.model.Event.Companion.getRefinedEvent
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.toNpub
-import com.vitorpamplona.amethyst.ui.actions.ServersAvailable
-import com.vitorpamplona.amethyst.ui.note.Nip47URI
 import fr.acinq.secp256k1.Hex
 import java.io.File
 import java.util.Locale
@@ -18,9 +18,7 @@ import com.vitorpamplona.amethyst.service.relays.Constants
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.service.relays.RelayPool
-import com.vitorpamplona.amethyst.ui.actions.ServersAvailable
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
-import com.vitorpamplona.amethyst.ui.note.Nip47URI
 import com.vitorpamplona.amethyst.ui.note.combineWith
 import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.collections.immutable.persistentSetOf
@@ -0,0 +1,3 @@
+package com.vitorpamplona.amethyst.model
+
+data class Nip47URI(val pubKeyHex: HexKey, val relayUri: String?, val secret: HexKey?)
@@ -0,0 +1,16 @@
+package com.vitorpamplona.amethyst.model
+
+enum class ServersAvailable {
+    // IMGUR,
+    NOSTR_BUILD,
+    NOSTRIMG,
+    NOSTRFILES_DEV,
+    NOSTRCHECK_ME,
+
+    // IMGUR_NIP_94,
+    NOSTRIMG_NIP_94,
+    NOSTR_BUILD_NIP_94,
+    NOSTRFILES_DEV_NIP_94,
+    NOSTRCHECK_ME_NIP_94,
+    NIP95
+}
@@ -1,12 +1,10 @@
 package com.vitorpamplona.amethyst.ui.note

 import android.net.Uri
-import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.Nip47URI
 import com.vitorpamplona.amethyst.model.decodePublicKey
 import com.vitorpamplona.amethyst.model.toHexKey

-data class Nip47URI(val pubKeyHex: HexKey, val relayUri: String?, val secret: HexKey?)
-
 // Rename to the corect nip number when ready.
 object Nip47 {
    fun parse(uri: String): Nip47URI {
@@ -8,6 +8,7 @@ import androidx.core.net.toFile
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.ServersAvailable
 import com.vitorpamplona.amethyst.service.HttpClient
 import okhttp3.*
 import okhttp3.MediaType.Companion.toMediaType
@@ -45,6 +45,7 @@ import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.ServersAvailable
 import com.vitorpamplona.amethyst.ui.components.VideoView
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.TextSpinner
@@ -1099,21 +1099,6 @@ fun CreateButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier
    }
 }

-enum class ServersAvailable {
-    // IMGUR,
-    NOSTR_BUILD,
-    NOSTRIMG,
-    NOSTRFILES_DEV,
-    NOSTRCHECK_ME,
-
-    // IMGUR_NIP_94,
-    NOSTRIMG_NIP_94,
-    NOSTR_BUILD_NIP_94,
-    NOSTRFILES_DEV_NIP_94,
-    NOSTRCHECK_ME_NIP_94,
-    NIP95
-}
-
@Composable
 fun ImageVideoDescription(
    uri: Uri,
@@ -67,6 +67,7 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.Nip47URI
 import com.vitorpamplona.amethyst.model.decodePublicKey
 import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
@@ -85,6 +85,7 @@ import com.vitorpamplona.amethyst.model.LiveActivitiesChannel
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.PublicChatChannel
+import com.vitorpamplona.amethyst.model.ServersAvailable
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrChannelDataSource
 import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent.Companion.STATUS_LIVE
@@ -94,7 +95,6 @@ import com.vitorpamplona.amethyst.ui.actions.NewChannelView
 import com.vitorpamplona.amethyst.ui.actions.NewMessageTagger
 import com.vitorpamplona.amethyst.ui.actions.NewPostViewModel
 import com.vitorpamplona.amethyst.ui.actions.PostButton
-import com.vitorpamplona.amethyst.ui.actions.ServersAvailable
 import com.vitorpamplona.amethyst.ui.actions.UploadFromGallery
 import com.vitorpamplona.amethyst.ui.actions.toImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.components.LoadNote