v0.64.2

fix relay tab not working in profile page

README.md

@@ -4,6 +4,11 @@
 
 Amethyst brings the best social network to your Android phone. Just insert your Nostr private key and start posting. 
 
+[<img src="./docs/design/obtainium.png"
+alt="Get it on Obtaininum"
+height="80">](https://github.com/ImranR98/Obtainium)
+[<img src="https://github.com/machiav3lli/oandbackupx/raw/034b226cea5c1b30eb4f6a6f313e4dadcbb0ece4/badge_github.png" alt="Get it on GitHub"
+height="80">](https://github.com/vitorpamplona/amethyst/releases)
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
      alt="Get it on F-Droid"
      height="80">](https://f-droid.org/packages/com.vitorpamplona.amethyst/)
@@ -11,8 +16,6 @@ Amethyst brings the best social network to your Android phone. Just insert your
      alt="Get it on Google Play"
      height="80">](https://play.google.com/store/apps/details?id=com.vitorpamplona.amethyst)
 
-Or get the latest APK from the [Releases Section](https://github.com/vitorpamplona/amethyst/releases/latest).
-
 # Current Features
 
 - [x] Event Builders / WebSocket Subscriptions (NIP-01)
@@ -191,6 +194,12 @@ Information that you share is publicly visible to anyone reading from relays tha
 ## Information Permanence ##
 Information shared on nostr should be assumed permanent for privacy purposes. There is no way to guarantee deleting or editing any content once posted. 
 
+# Screenshots
+
+| Home Feed                                 | Messages                                     | Live Streams                                    | Notifications                                          |
+|-------------------------------------------|----------------------------------------------|-------------------------------------------------|--------------------------------------------------------|
+| ![Home Feed](./docs/screenshots/home.png) | ![Messages](./docs/screenshots/messages.png) | ![Live Streams](./docs/screenshots/replies.png) | ![Notifications](./docs/screenshots/notifications.png) |
+
 # Contributing
 
 [Issues](https://github.com/vitorpamplona/amethyst/issues) and [pull requests](https://github.com/vitorpamplona/amethyst/pulls) are very welcome.

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 228
-        versionName "0.62.7"
+        versionCode 233
+        versionName "0.64.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -181,7 +181,7 @@ dependencies {
     playImplementation 'com.google.mlkit:translate:17.0.1'
 
     // PushNotifications
-    playImplementation platform('com.google.firebase:firebase-bom:32.1.0')
+    playImplementation platform('com.google.firebase:firebase-bom:32.1.1')
     playImplementation 'com.google.firebase:firebase-messaging-ktx'
 
     // Charts

app/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt

@@ -14,7 +14,6 @@ import com.vitorpamplona.amethyst.service.HttpClient
 import com.vitorpamplona.amethyst.service.NostrAccountDataSource
 import com.vitorpamplona.amethyst.service.NostrChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
-import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
 import com.vitorpamplona.amethyst.service.NostrHomeDataSource
 import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
@@ -89,7 +88,6 @@ object ServiceManager {
         NostrChannelDataSource.stop()
         NostrChatroomListDataSource.stop()
 
-        NostrGlobalDataSource.stop()
         NostrSingleChannelDataSource.stop()
         NostrSingleEventDataSource.stop()
         NostrSingleUserDataSource.stop()

app/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.kt

@@ -1,10 +1,11 @@
 package com.vitorpamplona.amethyst.model
 import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Immutable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
-fun checkForHashtagWithIcon(tag: String): HashtagIcon? {
+fun checkForHashtagWithIcon(tag: String, primary: Color): HashtagIcon? {
     return when (tag.lowercase()) {
         "bitcoin", "btc", "timechain" -> HashtagIcon(R.drawable.ht_btc, "Bitcoin", Color.Unspecified, Modifier.padding(2.dp, 2.dp, 0.dp, 0.dp))
         "nostr", "nostrich", "nostriches" -> HashtagIcon(R.drawable.ht_nostr, "Nostr", Color.Unspecified, Modifier.padding(1.dp, 2.dp, 0.dp, 0.dp))
@@ -17,10 +18,13 @@ fun checkForHashtagWithIcon(tag: String): HashtagIcon? {
         "skullofsatoshi" -> HashtagIcon(R.drawable.skull, "SkullofSatoshi", Color.Unspecified, Modifier.padding(2.dp, 1.dp, 0.dp, 0.dp))
         "grownostr", "gardening", "garden" -> HashtagIcon(R.drawable.grownostr, "GrowNostr", Color.Unspecified, Modifier.padding(0.dp, 1.dp, 0.dp, 1.dp))
         "footstr" -> HashtagIcon(R.drawable.footstr, "Footstr", Color.Unspecified, Modifier.padding(1.dp, 1.dp, 0.dp, 0.dp))
+        "tunestr", "music", "nowplaying" -> HashtagIcon(R.drawable.tunestr, "Tunestr", primary, Modifier.padding(1.dp, 1.dp, 0.dp, 0.dp))
         "weed", "weedstr", "420", "cannabis", "marijuana" -> HashtagIcon(R.drawable.weed, "Weed", Color.Unspecified, Modifier.padding(0.dp, 0.dp, 0.dp, 0.dp))
         else -> null
     }
 }
+
+@Immutable
 class HashtagIcon(
     val icon: Int,
     val description: String,

app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt

@@ -51,7 +51,8 @@ object LocalCache {
     }
 
     fun getUserIfExists(key: String): User? {
-        return users[key]
+        if (key.isEmpty()) return null
+        return users.get(key)
     }
 
     fun getNoteIfExists(key: String): Note? {
@@ -108,6 +109,7 @@ object LocalCache {
     }
 
     private fun isValidHexNpub(key: String): Boolean {
+        if (key.isBlank()) return false
         if (key.contains(":")) return false
 
         return HexValidator.isHex(key)
@@ -230,7 +232,7 @@ object LocalCache {
 
         note.loadEvent(event, author, replyTo)
 
-        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content()?.take(100)} ${formattedDateTime(event.createdAt)}")
+        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content()?.split("\n")?.take(100)} ${formattedDateTime(event.createdAt)}")
 
         // Prepares user's profile view.
         author.addNote(note)
@@ -302,7 +304,7 @@ object LocalCache {
 
         note.loadEvent(event, author, replyTo)
 
-        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content()?.take(100)} ${formattedDateTime(event.createdAt)}")
+        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content()?.split("\n")?.take(100)} ${formattedDateTime(event.createdAt)}")
 
         // Prepares user's profile view.
         author.addNote(note)

app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt

@@ -77,11 +77,20 @@ open class Note(val idHex: String) {
     open fun idDisplayNote() = idNote().toShortenHex()
 
     fun channelHex(): HexKey? {
-        return (event as? ChannelMessageEvent)?.channel()
-            ?: (event as? ChannelMetadataEvent)?.channel()
-            ?: (event as? ChannelCreateEvent)?.id
-            ?: (event as? LiveActivitiesChatMessageEvent)?.activity()?.toTag()
-            ?: (event as? LiveActivitiesEvent)?.address()?.toTag()
+        return if (event is ChannelMessageEvent ||
+            event is ChannelMetadataEvent ||
+            event is ChannelCreateEvent ||
+            event is LiveActivitiesChatMessageEvent ||
+            event is LiveActivitiesEvent
+        ) {
+            (event as? ChannelMessageEvent)?.channel()
+                ?: (event as? ChannelMetadataEvent)?.channel()
+                ?: (event as? ChannelCreateEvent)?.id
+                ?: (event as? LiveActivitiesChatMessageEvent)?.activity()?.toTag()
+                ?: (event as? LiveActivitiesEvent)?.address()?.toTag()
+        } else {
+            null
+        }
     }
 
     open fun address(): ATag? = null
@@ -493,7 +502,7 @@ class NoteLiveSet(u: Note) {
 
 class NoteLiveData(val note: Note) : LiveData<NoteState>(NoteState(note)) {
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.IO)
+    private val bundler = BundledUpdate(500, Dispatchers.IO)
 
     fun invalidateData() {
         bundler.invalidate() {

app/src/main/java/com/vitorpamplona/amethyst/model/User.kt

@@ -459,7 +459,7 @@ class UserMetadata {
 
 class UserLiveData(val user: User) : LiveData<UserState>(UserState(user)) {
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.IO)
+    private val bundler = BundledUpdate(500, Dispatchers.IO)
 
     fun invalidateData() {
         bundler.invalidate() {

app/src/main/java/com/vitorpamplona/amethyst/service/BlurHashDecoder.kt

@@ -49,6 +49,8 @@ object BlurHashDecoder {
      *                 By default it is true.
      */
     fun decode(blurHash: String?, width: Int, height: Int, punch: Float = 1f, useCache: Boolean = true): Bitmap? {
+        checkNotInMainThread()
+
         if (blurHash == null || blurHash.length < 6) {
             return null
         }

app/src/main/java/com/vitorpamplona/amethyst/service/CachedRichTextParser.kt

@@ -0,0 +1,274 @@
+package com.vitorpamplona.amethyst.service
+
+import android.util.Log
+import android.util.LruCache
+import android.util.Patterns
+import androidx.compose.runtime.Immutable
+import com.linkedin.urls.detection.UrlDetector
+import com.linkedin.urls.detection.UrlDetectorOptions
+import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
+import com.vitorpamplona.amethyst.ui.components.ZoomableUrlContent
+import com.vitorpamplona.amethyst.ui.components.ZoomableUrlImage
+import com.vitorpamplona.amethyst.ui.components.ZoomableUrlVideo
+import com.vitorpamplona.amethyst.ui.components.hashTagsPattern
+import com.vitorpamplona.amethyst.ui.components.imageExtensions
+import com.vitorpamplona.amethyst.ui.components.startsWithNIP19Scheme
+import com.vitorpamplona.amethyst.ui.components.tagIndex
+import com.vitorpamplona.amethyst.ui.components.videoExtensions
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.ImmutableMap
+import kotlinx.collections.immutable.ImmutableSet
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.collections.immutable.toImmutableMap
+import kotlinx.collections.immutable.toImmutableSet
+import java.util.regex.Pattern
+
+@Immutable
+data class RichTextViewerState(
+    val urlSet: ImmutableSet<String>,
+    val imagesForPager: ImmutableMap<String, ZoomableUrlContent>,
+    val imageList: ImmutableList<ZoomableUrlContent>,
+    val customEmoji: ImmutableMap<String, String>,
+    val paragraphs: ImmutableList<ImmutableList<Segment>>
+)
+
+object CachedRichTextParser {
+    val richTextCache = LruCache<String, RichTextViewerState>(200)
+
+    fun parseText(content: String, tags: ImmutableListOfLists<String>): RichTextViewerState {
+        return if (richTextCache[content] != null) {
+            richTextCache[content]
+        } else {
+            val newUrls = RichTextParser().parseText(content, tags)
+            richTextCache.put(content, newUrls)
+            newUrls
+        }
+    }
+}
+
+val longDatePattern: Pattern = Pattern.compile("^\\d{4}-\\d{2}-\\d{2}$")
+val shortDatePattern: Pattern = Pattern.compile("^\\d{2}-\\d{2}-\\d{2}$")
+val numberPattern: Pattern = Pattern.compile("^(-?[\\d.]+)([a-zA-Z%]*)$")
+
+// Group 1 = url, group 4 additional chars
+val noProtocolUrlValidator = Pattern.compile("(([\\w\\d-]+\\.)*[a-zA-Z][\\w-]+[\\.\\:]\\w+([\\/\\?\\=\\&\\#\\.]?[\\w-]+)*\\/?)(.*)")
+
+class RichTextParser() {
+    fun parseText(
+        content: String,
+        tags: ImmutableListOfLists<String>
+    ): RichTextViewerState {
+        val urls = UrlDetector(content, UrlDetectorOptions.Default).detect()
+
+        val urlSet = urls.mapNotNullTo(LinkedHashSet(urls.size)) {
+            // removes e-mails
+            if (Patterns.EMAIL_ADDRESS.matcher(it.originalUrl).matches()) {
+                null
+            } else if (isNumber(it.originalUrl)) {
+                null
+            } else {
+                it.originalUrl
+            }
+        }
+
+        val imagesForPager = urlSet.mapNotNull { fullUrl ->
+            val removedParamsFromUrl = fullUrl.split("?")[0].lowercase()
+            if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) {
+                ZoomableUrlImage(fullUrl)
+            } else if (videoExtensions.any { removedParamsFromUrl.endsWith(it) }) {
+                ZoomableUrlVideo(fullUrl)
+            } else {
+                null
+            }
+        }.associateBy { it.url }
+        val imageList = imagesForPager.values.toList()
+
+        val emojiMap =
+            tags.lists.filter { it.size > 2 && it[0] == "emoji" }.associate { ":${it[1]}:" to it[2] }
+
+        val segments = findTextSegments(content, imagesForPager.keys, urlSet, emojiMap, tags)
+
+        return RichTextViewerState(
+            urlSet.toImmutableSet(),
+            imagesForPager.toImmutableMap(),
+            imageList.toImmutableList(),
+            emojiMap.toImmutableMap(),
+            segments
+        )
+    }
+
+    private fun findTextSegments(content: String, images: Set<String>, urls: Set<String>, emojis: Map<String, String>, tags: ImmutableListOfLists<String>): ImmutableList<ImmutableList<Segment>> {
+        var paragraphSegments = persistentListOf<ImmutableList<Segment>>()
+
+        content.split('\n').forEach { paragraph ->
+            var segments = persistentListOf<Segment>()
+            var isDirty = false
+
+            val wordList = paragraph.split(' ')
+            wordList.forEach { word ->
+                val wordSegment = wordIdentifier(word, images, urls, emojis, tags)
+                if (wordSegment !is RegularTextSegment) {
+                    isDirty = true
+                }
+                segments = segments.add(wordSegment)
+            }
+
+            val newSegments = if (isDirty) {
+                if (isArabic(paragraph)) {
+                    segments.asReversed().toImmutableList()
+                } else {
+                    segments
+                }
+            } else {
+                persistentListOf<Segment>(RegularTextSegment(paragraph))
+            }
+
+            paragraphSegments = paragraphSegments.add(newSegments)
+        }
+
+        return paragraphSegments
+    }
+
+    fun isNumber(word: String): Boolean {
+        return numberPattern.matcher(word).matches()
+    }
+
+    fun isDate(word: String): Boolean {
+        return shortDatePattern.matcher(word).matches() || longDatePattern.matcher(word).matches()
+    }
+
+    private fun isArabic(text: String): Boolean {
+        return text.any { it in '\u0600'..'\u06FF' || it in '\u0750'..'\u077F' }
+    }
+
+    private fun wordIdentifier(word: String, images: Set<String>, urls: Set<String>, emojis: Map<String, String>, tags: ImmutableListOfLists<String>): Segment {
+        val emailMatcher = Patterns.EMAIL_ADDRESS.matcher(word)
+        val phoneMatcher = Patterns.PHONE.matcher(word)
+        val schemelessMatcher = noProtocolUrlValidator.matcher(word)
+
+        return if (word.isEmpty()) {
+            RegularTextSegment(word)
+        } else if (images.contains(word)) {
+            ImageSegment(word)
+        } else if (urls.contains(word)) {
+            LinkSegment(word)
+        } else if (emojis.any { word.contains(it.key) }) {
+            EmojiSegment(word)
+        } else if (word.startsWith("lnbc", true)) {
+            InvoiceSegment(word)
+        } else if (word.startsWith("lnurl", true)) {
+            WithdrawSegment(word)
+        } else if (word.startsWith("cashuA", true)) {
+            CashuSegment(word)
+        } else if (emailMatcher.matches()) {
+            EmailSegment(word)
+        } else if (word.length in 7..14 && !isDate(word) && phoneMatcher.matches()) {
+            PhoneSegment(word)
+        } else if (startsWithNIP19Scheme(word)) {
+            BechSegment(word)
+        } else if (word.startsWith("#")) {
+            parseHash(word, tags)
+        } else if (schemelessMatcher.find()) {
+            val url = schemelessMatcher.group(1) // url
+            val additionalChars = schemelessMatcher.group(4) // additional chars
+            if (url != null) {
+                SchemelessUrlSegment(word, url, additionalChars)
+            } else {
+                RegularTextSegment(word)
+            }
+        } else {
+            RegularTextSegment(word)
+        }
+    }
+
+    private fun parseHash(word: String, tags: ImmutableListOfLists<String>): Segment {
+        // First #[n]
+
+        val matcher = tagIndex.matcher(word)
+        try {
+            if (matcher.find()) {
+                val index = matcher.group(1)?.toInt()
+                val suffix = matcher.group(2)
+
+                if (index != null && index >= 0 && index < tags.lists.size) {
+                    val tag = tags.lists[index]
+
+                    if (tag.size > 1) {
+                        if (tag[0] == "p") {
+                            return HashIndexUserSegment(word, tag[1], suffix)
+                        } else if (tag[0] == "e" || tag[0] == "a") {
+                            return HashIndexEventSegment(word, tag[1], suffix)
+                        }
+                    }
+                }
+            }
+        } catch (e: Exception) {
+            Log.w("Tag Parser", "Couldn't link tag $word", e)
+        }
+
+        // Second #Amethyst
+        val hashtagMatcher = hashTagsPattern.matcher(word)
+
+        try {
+            if (hashtagMatcher.find()) {
+                val hashtag = hashtagMatcher.group(1)
+                if (hashtag != null) {
+                    return HashTagSegment(word, hashtag, hashtagMatcher.group(2))
+                }
+            }
+        } catch (e: Exception) {
+            Log.e("Hashtag Parser", "Couldn't link hashtag $word", e)
+        }
+
+        return RegularTextSegment(word)
+    }
+}
+
+@Immutable
+open class Segment(val segmentText: String)
+
+@Immutable
+class ImageSegment(segment: String) : Segment(segment)
+
+@Immutable
+class LinkSegment(segment: String) : Segment(segment)
+
+@Immutable
+class EmojiSegment(segment: String) : Segment(segment)
+
+@Immutable
+class InvoiceSegment(segment: String) : Segment(segment)
+
+@Immutable
+class WithdrawSegment(segment: String) : Segment(segment)
+
+@Immutable
+class CashuSegment(segment: String) : Segment(segment)
+
+@Immutable
+class EmailSegment(segment: String) : Segment(segment)
+
+@Immutable
+class PhoneSegment(segment: String) : Segment(segment)
+
+@Immutable
+class BechSegment(segment: String) : Segment(segment)
+
+@Immutable
+open class HashIndexSegment(segment: String, val hex: String, val extras: String?) : Segment(segment)
+
+@Immutable
+class HashIndexUserSegment(segment: String, hex: String, extras: String?) : HashIndexSegment(segment, hex, extras)
+
+@Immutable
+class HashIndexEventSegment(segment: String, hex: String, extras: String?) : HashIndexSegment(segment, hex, extras)
+
+@Immutable
+class HashTagSegment(segment: String, val hashtag: String, val extras: String?) : Segment(segment)
+
+@Immutable
+class SchemelessUrlSegment(segment: String, val url: String, val extras: String?) : Segment(segment)
+
+@Immutable
+class RegularTextSegment(segment: String) : Segment(segment)

app/src/main/java/com/vitorpamplona/amethyst/service/CashuProcessor.kt

@@ -14,6 +14,7 @@ import java.util.Base64
 
 @Immutable
 data class CashuToken(
+    val token: String,
     val mint: String,
     val totalAmount: Long,
     val fees: Int,
@@ -23,6 +24,8 @@ data class CashuToken(
 
 class CashuProcessor {
     fun parse(cashuToken: String): GenericLoadable<CashuToken> {
+        checkNotInMainThread()
+
         try {
             val base64token = cashuToken.replace("cashuA", "")
             val cashu = JsonParser.parseString(String(Base64.getDecoder().decode(base64token)))
@@ -37,13 +40,15 @@ class CashuProcessor {
             val fees = Math.max(((totalAmount * 0.02).toInt()), 2)
             val redeemInvoiceAmount = totalAmount - fees
 
-            return GenericLoadable.Loaded(CashuToken(mint, totalAmount, fees, redeemInvoiceAmount, proofs))
+            return GenericLoadable.Loaded(CashuToken(cashuToken, mint, totalAmount, fees, redeemInvoiceAmount, proofs))
         } catch (e: Exception) {
             return GenericLoadable.Error<CashuToken>("Could not parse this cashu token")
         }
     }
 
     fun melt(token: CashuToken, lud16: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        checkNotInMainThread()
+
         runCatching {
             LightningAddressResolver().lnAddressInvoice(
                 lnaddress = lud16,
@@ -84,7 +89,7 @@ class CashuProcessor {
             if (successful) {
                 onSuccess("Redeemed ${token.totalAmount} Sats" + " (Fees: ${token.fees} Sats)")
             } else {
-                onError(tree?.get("detail")?.asText()?.split('.')?.getOrNull(0) ?: "Error")
+                onError(tree?.get("detail")?.asText()?.split('.')?.getOrNull(0) ?: "Cashu: Tokens already spent.")
             }
         } catch (e: Exception) {
             onError("Token melt failure: " + e.message)

app/src/main/java/com/vitorpamplona/amethyst/service/Nip05Verifier.kt

@@ -19,6 +19,9 @@ class Nip05Verifier() {
         if (parts.size == 2) {
             return "https://${parts[1]}/.well-known/nostr.json?name=${parts[0]}"
         }
+        if (parts.size == 1) {
+            return "https://${parts[0]}/.well-known/nostr.json?name=_"
+        }
 
         return null
     }
@@ -31,7 +34,7 @@ class Nip05Verifier() {
     }
 
     private suspend fun fetchNip05JsonSuspend(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
-        // checkNotInMainThread()
+        checkNotInMainThread()
 
         val url = assembleUrl(nip05)
 
@@ -49,6 +52,8 @@ class Nip05Verifier() {
 
                 HttpClient.getHttpClient().newCall(request).enqueue(object : Callback {
                     override fun onResponse(call: Call, response: Response) {
+                        checkNotInMainThread()
+
                         response.use {
                             if (it.isSuccessful) {
                                 onSuccess(it.body.string())
@@ -71,13 +76,15 @@ class Nip05Verifier() {
 
     fun verifyNip05(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
         // check fails on tests
-        // checkNotInMainThread()
+        checkNotInMainThread()
 
         val mapper = jacksonObjectMapper()
 
         fetchNip05Json(
             nip05,
             onSuccess = {
+                checkNotInMainThread()
+
                 // NIP05 usernames are case insensitive, but JSON properties are not
                 // converts the json to lowercase and then tries to access the username via a
                 // lowercase version of the username.
@@ -88,7 +95,12 @@ class Nip05Verifier() {
                     null
                 }
 
-                val user = nip05.split("@")[0].lowercase()
+                val parts = nip05.split("@")
+                val user = if (parts.size == 2) {
+                    parts[0].lowercase()
+                } else {
+                    "_"
+                }
 
                 val hexKey = nip05url?.get("names")?.get(user)?.asText()
 

app/src/main/java/com/vitorpamplona/amethyst/service/NostrGlobalDataSource.kt

@@ -1,28 +0,0 @@
-package com.vitorpamplona.amethyst.service
-
-import com.vitorpamplona.amethyst.service.model.AudioTrackEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
-import com.vitorpamplona.amethyst.service.model.HighlightEvent
-import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
-import com.vitorpamplona.amethyst.service.model.PinListEvent
-import com.vitorpamplona.amethyst.service.model.PollNoteEvent
-import com.vitorpamplona.amethyst.service.model.TextNoteEvent
-import com.vitorpamplona.amethyst.service.relays.FeedType
-import com.vitorpamplona.amethyst.service.relays.JsonFilter
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
-
-object NostrGlobalDataSource : NostrDataSource("GlobalFeed") {
-    fun createGlobalFilter() = TypedFilter(
-        types = setOf(FeedType.GLOBAL),
-        filter = JsonFilter(
-            kinds = listOf(TextNoteEvent.kind, PollNoteEvent.kind, ChannelMessageEvent.kind, AudioTrackEvent.kind, PinListEvent.kind, LongTextNoteEvent.kind, HighlightEvent.kind),
-            limit = 200
-        )
-    )
-
-    val globalFeedChannel = requestNewChannel()
-
-    override fun updateChannelFilters() {
-        globalFeedChannel.typedFilters = listOf(createGlobalFilter()).ifEmpty { null }
-    }
-}

app/src/main/java/com/vitorpamplona/amethyst/service/NostrHomeDataSource.kt

@@ -51,13 +51,13 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
     }
 
     fun createFollowAccountsFilter(): TypedFilter {
-        val follows = account.selectedUsersFollowList(account.defaultHomeFollowList) ?: emptySet()
+        val follows = account.selectedUsersFollowList(account.defaultHomeFollowList)
 
-        val followKeys = follows.map {
+        val followKeys = follows?.map {
             it.substring(0, 6)
         }
 
-        val followSet = followKeys.plus(account.userProfile().pubkeyHex.substring(0, 6))
+        val followSet = followKeys?.plus(account.userProfile().pubkeyHex.substring(0, 6))
 
         return TypedFilter(
             types = setOf(FeedType.FOLLOWS),

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt

@@ -67,6 +67,7 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
+import com.vitorpamplona.amethyst.service.noProtocolUrlValidator
 import com.vitorpamplona.amethyst.ui.components.*
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.TextSpinner

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt

@@ -20,9 +20,9 @@ import com.vitorpamplona.amethyst.service.model.AddressableEvent
 import com.vitorpamplona.amethyst.service.model.BaseTextNoteEvent
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import com.vitorpamplona.amethyst.service.noProtocolUrlValidator
 import com.vitorpamplona.amethyst.ui.components.MediaCompressor
 import com.vitorpamplona.amethyst.ui.components.isValidURL
-import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/RelayInformationDialog.kt

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.ui.actions
 import android.content.Context
 import android.util.Log
 import android.widget.Toast
+import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -29,6 +30,7 @@ import androidx.compose.ui.window.DialogProperties
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.RelayInformation
 import com.vitorpamplona.amethyst.service.HttpClient
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.ui.components.ClickableEmail
 import com.vitorpamplona.amethyst.ui.components.ClickableUrl
 import com.vitorpamplona.amethyst.ui.note.LoadUser
@@ -246,7 +248,11 @@ private fun DisplayOwnerInformation(
     nav: (String) -> Unit
 ) {
     LoadUser(baseUserHex = userHex) {
-        UserCompose(baseUser = it, accountViewModel = accountViewModel, showDiviser = false, nav = nav)
+        Crossfade(it) {
+            if (it != null) {
+                UserCompose(baseUser = it, accountViewModel = accountViewModel, showDiviser = false, nav = nav)
+            }
+        }
     }
 }
 
@@ -286,31 +292,44 @@ fun loadRelayInfo(
     scope: CoroutineScope,
     onInfo: (RelayInformation) -> Unit
 ) {
-    val url = if (dirtyUrl.contains("://")) {
-        dirtyUrl
-            .replace("wss://", "https://")
-            .replace("ws://", "http://")
-    } else {
-        "https://$dirtyUrl"
-    }
+    try {
+        val url = if (dirtyUrl.contains("://")) {
+            dirtyUrl
+                .replace("wss://", "https://")
+                .replace("ws://", "http://")
+        } else {
+            "https://$dirtyUrl"
+        }
 
-    val request: Request = Request
-        .Builder()
-        .header("Accept", "application/nostr+json")
-        .url(url)
-        .build()
+        val request: Request = Request
+            .Builder()
+            .header("Accept", "application/nostr+json")
+            .url(url)
+            .build()
 
-    HttpClient.getHttpClient()
-        .newCall(request)
-        .enqueue(
-            object : Callback {
-                override fun onResponse(call: Call, response: Response) {
-                    response.use {
-                        val body = it.body.string()
-                        try {
-                            if (it.isSuccessful) {
-                                onInfo(RelayInformation.fromJson(body))
-                            } else {
+        HttpClient.getHttpClient()
+            .newCall(request)
+            .enqueue(
+                object : Callback {
+                    override fun onResponse(call: Call, response: Response) {
+                        checkNotInMainThread()
+                        response.use {
+                            val body = it.body.string()
+                            try {
+                                if (it.isSuccessful) {
+                                    onInfo(RelayInformation.fromJson(body))
+                                } else {
+                                    scope.launch {
+                                        Toast
+                                            .makeText(
+                                                context,
+                                                context.getString(R.string.an_error_ocurred_trying_to_get_relay_information, dirtyUrl),
+                                                Toast.LENGTH_SHORT
+                                            ).show()
+                                    }
+                                }
+                            } catch (e: Exception) {
+                                Log.e("RelayInfoFail", "Resulting Message from Relay $dirtyUrl in not parseable: $body", e)
                                 scope.launch {
                                     Toast
                                         .makeText(
@@ -320,31 +339,31 @@ fun loadRelayInfo(
                                         ).show()
                                 }
                             }
-                        } catch (e: Exception) {
-                            Log.e("RelayInfoFail", "Resulting Message from Relay in not parseable: $body", e)
-                            scope.launch {
-                                Toast
-                                    .makeText(
-                                        context,
-                                        context.getString(R.string.an_error_ocurred_trying_to_get_relay_information, dirtyUrl),
-                                        Toast.LENGTH_SHORT
-                                    ).show()
-                            }
+                        }
+                    }
+
+                    override fun onFailure(call: Call, e: IOException) {
+                        Log.e("RelayInfoFail", "Resulting Message from Relay in not parseable $dirtyUrl", e)
+                        scope.launch {
+                            Toast
+                                .makeText(
+                                    context,
+                                    context.getString(R.string.an_error_ocurred_trying_to_get_relay_information, dirtyUrl),
+                                    Toast.LENGTH_SHORT
+                                ).show()
                         }
                     }
                 }
-
-                override fun onFailure(call: Call, e: IOException) {
-                    Log.e("RelayInfoFail", "Resulting Message from Relay in not parseable", e)
-                    scope.launch {
-                        Toast
-                            .makeText(
-                                context,
-                                context.getString(R.string.an_error_ocurred_trying_to_get_relay_information, dirtyUrl),
-                                Toast.LENGTH_SHORT
-                            ).show()
-                    }
-                }
-            }
-        )
+            )
+    } catch (e: Exception) {
+        Log.e("RelayInfoFail", "Invalid URL $dirtyUrl", e)
+        scope.launch {
+            Toast
+                .makeText(
+                    context,
+                    context.getString(R.string.an_error_ocurred_trying_to_get_relay_information, dirtyUrl),
+                    Toast.LENGTH_SHORT
+                ).show()
+        }
+    }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/components/CashuRedeem.kt

@@ -16,9 +16,11 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextDirection
 import androidx.compose.ui.unit.dp
@@ -67,6 +69,7 @@ fun CashuPreview(token: CashuToken, accountViewModel: AccountViewModel) {
     val useWebService = false
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
+    val clipboardManager = LocalClipboardManager.current
 
     Column(
         modifier = Modifier
@@ -114,45 +117,80 @@ fun CashuPreview(token: CashuToken, accountViewModel: AccountViewModel) {
                 )
             }
 
-            Button(
+            Row(
+
                 modifier = Modifier
                     .fillMaxWidth()
-                    .padding(vertical = 10.dp),
-                onClick = {
-                    // Just in case we want to use a webservice instead of directly contacting the mint
-                    if (useWebService) {
-                        val url = "https://redeem.cashu.me?token=$token&lightning=$lud16&autopay=true"
-                        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
-                        startActivity(context, intent, null)
-                    } else {
+                    .padding(bottom = 10.dp)
+            ) {
+                Button(
+
+                    modifier = Modifier
+                        .padding(vertical = 10.dp).padding(horizontal = 2.dp),
+                    onClick = {
                         if (lud16 != null) {
-                            CashuProcessor().melt(
-                                token,
-                                lud16,
-                                onSuccess = {
-                                    scope.launch {
-                                        Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
+                            scope.launch(Dispatchers.IO) {
+                                CashuProcessor().melt(
+                                    token,
+                                    lud16,
+                                    onSuccess = {
+                                        scope.launch {
+                                            Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
+                                        }
+                                    },
+                                    onError = {
+                                        scope.launch {
+                                            Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
+                                        }
                                     }
-                                },
-                                onError = {
-                                    scope.launch {
-                                        Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
-                                    }
-                                }
-                            )
+                                )
+                            }
                         } else {
                             scope.launch {
-                                Toast.makeText(context, "No Lightning Address set", Toast.LENGTH_SHORT).show()
+                                Toast.makeText(
+                                    context,
+                                    "No Lightning Address set",
+                                    Toast.LENGTH_SHORT
+                                ).show()
                             }
                         }
-                    }
-                },
-                shape = QuoteBorder,
-                colors = ButtonDefaults.buttonColors(
-                    backgroundColor = MaterialTheme.colors.primary
-                )
-            ) {
-                Text(stringResource(R.string.cashu_redeem), color = Color.White, fontSize = 20.sp)
+                    },
+                    shape = QuoteBorder,
+                    colors = ButtonDefaults.buttonColors(
+                        backgroundColor = MaterialTheme.colors.primary
+                    )
+                ) {
+                    Text(
+                        stringResource(R.string.cashu_redeem),
+                        color = Color.White,
+                        fontSize = 18.sp
+                    )
+                }
+                Button(
+                    modifier = Modifier
+                        .padding(vertical = 10.dp).padding(horizontal = 1.dp),
+                    onClick = {
+                        if (useWebService) {
+                            // In case we want to use the cashu.me webservice
+                            val url = "https://redeem.cashu.me?token=$token&lightning=$lud16&autopay=false"
+                            val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+                            startActivity(context, intent, null)
+                        } else {
+                            // Copying the token to clipboard for now
+                            var orignaltoken = token.token
+                            clipboardManager.setText(AnnotatedString("$orignaltoken"))
+                            scope.launch {
+                                Toast.makeText(context, "Copied token to clipboard", Toast.LENGTH_SHORT).show()
+                            }
+                        }
+                    },
+                    shape = QuoteBorder,
+                    colors = ButtonDefaults.buttonColors(
+                        backgroundColor = MaterialTheme.colors.primary
+                    )
+                ) {
+                    Text("⎘", color = Color.White, fontSize = 18.sp)
+                }
             }
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableEmail.kt

@@ -7,6 +7,7 @@ import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.AnnotatedString
 
@@ -15,7 +16,7 @@ fun ClickableEmail(email: String) {
     val context = LocalContext.current
 
     ClickableText(
-        text = AnnotatedString("$email "),
+        text = remember { AnnotatedString(email) },
         onClick = { runCatching { context.sendMail(email) } },
         style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
     )

app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickablePhone.kt

@@ -7,6 +7,7 @@ import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.AnnotatedString
 
@@ -15,7 +16,7 @@ fun ClickablePhone(phone: String) {
     val context = LocalContext.current
 
     ClickableText(
-        text = AnnotatedString("$phone "),
+        text = remember { AnnotatedString(phone) },
         onClick = { runCatching { context.dial(phone) } },
         style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
     )

app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt

@@ -50,6 +50,7 @@ import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.actions.toImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.note.LoadChannel
+import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.ImmutableMap
 import kotlinx.collections.immutable.persistentListOf
@@ -78,7 +79,7 @@ fun ClickableRoute(
         else -> {
             Text(
                 remember {
-                    "@${nip19.hex}${nip19.additionalChars} "
+                    "@${nip19.hex}${nip19.additionalChars}"
                 }
             )
         }
@@ -111,7 +112,16 @@ private fun DisplayEvent(
     nav: (String) -> Unit
 ) {
     LoadNote(nip19.hex) {
-        DisplayNoteLink(it, nip19, nav)
+        if (it != null) {
+            DisplayNoteLink(it, nip19, nav)
+        } else {
+            CreateClickableText(
+                clickablePart = remember(nip19) { "@${nip19.hex.toShortenHex()}" },
+                suffix = nip19.additionalChars,
+                route = remember(nip19) { "Event/${nip19.hex}" },
+                nav = nav
+            )
+        }
     }
 }
 
@@ -121,7 +131,16 @@ private fun DisplayNote(
     nav: (String) -> Unit
 ) {
     LoadNote(nip19.hex) {
-        DisplayNoteLink(it, nip19, nav)
+        if (it != null) {
+            DisplayNoteLink(it, nip19, nav)
+        } else {
+            CreateClickableText(
+                clickablePart = remember(nip19) { "@${nip19.hex.toShortenHex()}" },
+                suffix = nip19.additionalChars,
+                route = remember(nip19) { "Event/${nip19.hex}" },
+                nav = nav
+            )
+        }
     }
 }
 
@@ -137,7 +156,7 @@ private fun DisplayNoteLink(
 
     val channelHex = remember(noteState) { note.channelHex() }
     val noteIdDisplayNote = remember(noteState) { "@${note.idDisplayNote()}" }
-    val addedCharts = remember { "${nip19.additionalChars} " }
+    val addedCharts = remember { "${nip19.additionalChars}" }
 
     if (note.event is ChannelCreateEvent || nip19.kind == ChannelCreateEvent.kind) {
         CreateClickableText(
@@ -199,7 +218,7 @@ private fun DisplayAddress(
 
         val route = remember(noteState) { "Note/${nip19.hex}" }
         val displayName = remember(noteState) { "@${noteState?.note?.idDisplayNote()}" }
-        val addedCharts = remember { "${nip19.additionalChars} " }
+        val addedCharts = remember { "${nip19.additionalChars}" }
 
         CreateClickableText(
             clickablePart = displayName,
@@ -212,7 +231,7 @@ private fun DisplayAddress(
     if (noteBase == null) {
         Text(
             remember {
-                "@${nip19.hex}${nip19.additionalChars} "
+                "@${nip19.hex}${nip19.additionalChars}"
             }
         )
     }
@@ -240,7 +259,7 @@ private fun DisplayUser(
     if (userBase == null) {
         Text(
             remember {
-                "@${nip19.hex}${nip19.additionalChars} "
+                "@${nip19.hex}${nip19.additionalChars}"
             }
         )
     }
@@ -268,7 +287,7 @@ private fun RenderUserAsClickableText(
     }
 
     val addedCharts = remember(nip19) {
-        "${nip19.additionalChars} "
+        "${nip19.additionalChars}"
     }
 
     userDisplayName?.let {
@@ -286,7 +305,7 @@ private fun RenderUserAsClickableText(
 @Composable
 fun CreateClickableText(
     clickablePart: String,
-    suffix: String,
+    suffix: String?,
     maxLines: Int = Int.MAX_VALUE,
     overrideColor: Color? = null,
     fontWeight: FontWeight = FontWeight.Normal,
@@ -310,8 +329,10 @@ fun CreateClickableText(
             withStyle(clickablePartStyle) {
                 append(clickablePart)
             }
-            withStyle(nonClickablePartStyle) {
-                append(suffix)
+            if (!suffix.isNullOrBlank()) {
+                withStyle(nonClickablePartStyle) {
+                    append(suffix)
+                }
             }
         }
     }
@@ -488,7 +509,7 @@ data class DoubleEmojiList(
 @Composable
 fun CreateClickableTextWithEmoji(
     clickablePart: String,
-    suffix: String,
+    suffix: String?,
     maxLines: Int = Int.MAX_VALUE,
     overrideColor: Color? = null,
     fontWeight: FontWeight = FontWeight.Normal,
@@ -507,7 +528,7 @@ fun CreateClickableTextWithEmoji(
 
             if (emojis.isNotEmpty()) {
                 val newEmojiList1 = assembleAnnotatedList(clickablePart, emojis)
-                val newEmojiList2 = assembleAnnotatedList(suffix, emojis)
+                val newEmojiList2 = suffix?.let { assembleAnnotatedList(it, emojis) } ?: emptyList<Renderable>()
 
                 if (newEmojiList1.isNotEmpty() || newEmojiList2.isNotEmpty()) {
                     emojiLists = DoubleEmojiList(newEmojiList1.toImmutableList(), newEmojiList2.toImmutableList())

app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableWithdrawal.kt

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.ui.components
 
 import android.content.Intent
 import android.net.Uri
+import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
@@ -25,13 +26,16 @@ fun MayBeWithdrawal(lnurlWord: String) {
         }
     }
 
-    lnWithdrawal?.let {
-        ClickableWithdrawal(withdrawalString = it)
+    Crossfade(targetState = lnWithdrawal) {
+        if (it != null) {
+            ClickableWithdrawal(withdrawalString = it)
+        } else {
+            Text(
+                text = lnurlWord,
+                style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+            )
+        }
     }
-        ?: Text(
-            text = "$lnurlWord ",
-            style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
-        )
 }
 
 @Composable

app/src/main/java/com/vitorpamplona/amethyst/ui/components/ExpandableRichTextViewer.kt

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.components
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
@@ -19,13 +20,12 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawBehind
-import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
+import com.vitorpamplona.amethyst.ui.note.getGradient
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import com.vitorpamplona.amethyst.ui.theme.secondaryButtonBackground
@@ -80,16 +80,7 @@ fun ExpandableRichTextViewer(
                 modifier = Modifier
                     .align(Alignment.BottomCenter)
                     .fillMaxWidth()
-                    .drawBehind {
-                        drawRect(
-                            Brush.verticalGradient(
-                                colors = listOf(
-                                    backgroundColor.value.copy(alpha = 0f),
-                                    backgroundColor.value
-                                )
-                            )
-                        )
-                    }
+                    .background(getGradient(backgroundColor))
             ) {
                 ShowMoreButton() {
                     showFullText = !showFullText

app/src/main/java/com/vitorpamplona/amethyst/ui/components/InvoicePreview.kt

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.ui.components
 
 import android.content.Intent
 import android.net.Uri
+import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -27,7 +28,7 @@ import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
 import com.vitorpamplona.amethyst.ui.theme.subtleBorder
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.launch
 import java.text.NumberFormat
 
 @Composable
@@ -35,7 +36,7 @@ fun MayBeInvoicePreview(lnbcWord: String) {
     var lnInvoice by remember { mutableStateOf<Pair<String, String?>?>(null) }
 
     LaunchedEffect(key1 = lnbcWord) {
-        withContext(Dispatchers.IO) {
+        launch(Dispatchers.IO) {
             val myInvoice = LnInvoiceUtil.findInvoice(lnbcWord)
             if (myInvoice != null) {
                 val myInvoiceAmount = try {
@@ -50,13 +51,16 @@ fun MayBeInvoicePreview(lnbcWord: String) {
         }
     }
 
-    lnInvoice?.let {
-        InvoicePreview(it.first, it.second)
+    Crossfade(targetState = lnInvoice) {
+        if (it != null) {
+            InvoicePreview(it.first, it.second)
+        } else {
+            Text(
+                text = lnbcWord,
+                style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+            )
+        }
     }
-        ?: Text(
-            text = "$lnbcWord ",
-            style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
-        )
 }
 
 @Composable

app/src/main/java/com/vitorpamplona/amethyst/ui/components/MediaCompressor.kt

@@ -10,6 +10,7 @@ import com.abedelazizshe.lightcompressorlibrary.VideoCompressor
 import com.abedelazizshe.lightcompressorlibrary.VideoQuality
 import com.abedelazizshe.lightcompressorlibrary.config.AppSpecificStorageConfiguration
 import com.abedelazizshe.lightcompressorlibrary.config.Configuration
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import id.zelory.compressor.Compressor
 import id.zelory.compressor.constraint.default
 import java.io.File
@@ -24,6 +25,8 @@ class MediaCompressor {
         onReady: (Uri, String?, Long?) -> Unit,
         onError: (String) -> Unit
     ) {
+        checkNotInMainThread()
+
         if (contentType?.startsWith("video", true) == true) {
             VideoCompressor.start(
                 context = applicationContext, // => This is required

app/src/main/java/com/vitorpamplona/amethyst/ui/components/UrlPreview.kt

@@ -25,7 +25,9 @@ fun UrlPreview(url: String, urlText: String) {
         LaunchedEffect(url) {
             launch(Dispatchers.IO) {
                 UrlCachedPreviewer.previewInfo(url) {
-                    urlPreviewState = it
+                    launch(Dispatchers.Main) {
+                        urlPreviewState = it
+                    }
                 }
             }
         }

app/src/main/java/com/vitorpamplona/amethyst/ui/components/VideoView.kt

@@ -62,6 +62,8 @@ import com.vitorpamplona.amethyst.VideoCache
 import com.vitorpamplona.amethyst.service.HttpClient
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlin.time.ExperimentalTime
+import kotlin.time.measureTimedValue
 
 public var DefaultMutedSetting = mutableStateOf(true)
 
@@ -97,12 +99,26 @@ fun LoadThumbAndThenVideoView(videoUri: String, description: String? = null, thu
     }
 }
 
+@OptIn(ExperimentalTime::class)
 @Composable
 fun VideoView(
     videoUri: String,
     description: String? = null,
     thumb: VideoThumb? = null,
     onDialog: ((Boolean) -> Unit)? = null
+) {
+    val (value, elapsed) = measureTimedValue {
+        VideoView1(videoUri, description, thumb, onDialog)
+    }
+    Log.d("Rendering Metrics", "VideoView $elapsed $videoUri")
+}
+
+@Composable
+fun VideoView1(
+    videoUri: String,
+    description: String? = null,
+    thumb: VideoThumb? = null,
+    onDialog: ((Boolean) -> Unit)? = null
 ) {
     var exoPlayerData by remember { mutableStateOf<VideoPlayer?>(null) }
     val defaultToStart by remember { mutableStateOf(DefaultMutedSetting.value) }
@@ -127,6 +143,7 @@ fun VideoView(
     }
 }
 
+@OptIn(ExperimentalTime::class)
 @Composable
 fun VideoView(
     videoUri: String,
@@ -135,6 +152,21 @@ fun VideoView(
     defaultToStart: Boolean = false,
     thumb: VideoThumb? = null,
     onDialog: ((Boolean) -> Unit)? = null
+) {
+    val (value, elapsed) = measureTimedValue {
+        VideoView1(videoUri, description, exoPlayerData, defaultToStart, thumb, onDialog)
+    }
+    Log.d("Rendering Metrics", "VideoView $elapsed $videoUri")
+}
+
+@Composable
+fun VideoView1(
+    videoUri: String,
+    description: String? = null,
+    exoPlayerData: VideoPlayer,
+    defaultToStart: Boolean = false,
+    thumb: VideoThumb? = null,
+    onDialog: ((Boolean) -> Unit)? = null
 ) {
     val lifecycleOwner = rememberUpdatedState(LocalLifecycleOwner.current)
 

app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZapRaiserRequest.kt

@@ -4,7 +4,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.Divider
 import androidx.compose.material.Icon
@@ -25,6 +24,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.actions.NewPostViewModel
+import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 
 @Composable
@@ -33,12 +33,10 @@ fun ZapRaiserRequest(
     newPostViewModel: NewPostViewModel
 ) {
     Column(
-        modifier = Modifier
-            .fillMaxWidth()
+        modifier = Modifier.fillMaxWidth()
     ) {
         Column(
-            modifier = Modifier
-                .fillMaxWidth()
+            modifier = Modifier.fillMaxWidth()
         ) {
             Row(
                 verticalAlignment = Alignment.CenterVertically,
@@ -49,7 +47,7 @@ fun ZapRaiserRequest(
                 Icon(
                     painter = painterResource(R.drawable.lightning),
                     null,
-                    modifier = Modifier.size(20.dp),
+                    modifier = Size20Modifier,
                     tint = Color.Unspecified
                 )
 

app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt

@@ -14,7 +14,6 @@ import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -22,11 +21,10 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.pager.PagerState
-import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.foundation.text.InlineTextContent
 import androidx.compose.foundation.text.appendInlineContent
 import androidx.compose.material.Icon
@@ -41,6 +39,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -48,7 +47,6 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalClipboardManager
@@ -62,12 +60,12 @@ import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.isFinite
-import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.core.net.toUri
 import coil.annotation.ExperimentalCoilApi
 import coil.compose.AsyncImage
+import coil.compose.AsyncImagePainter
 import coil.imageLoader
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.toHexKey
@@ -76,6 +74,7 @@ import com.vitorpamplona.amethyst.ui.actions.CloseButton
 import com.vitorpamplona.amethyst.ui.actions.LoadingAnimation
 import com.vitorpamplona.amethyst.ui.actions.SaveToGallery
 import com.vitorpamplona.amethyst.ui.note.BlankNote
+import com.vitorpamplona.amethyst.ui.theme.Font17SP
 import com.vitorpamplona.amethyst.ui.theme.hashVerified
 import com.vitorpamplona.amethyst.ui.theme.imageModifier
 import kotlinx.collections.immutable.ImmutableList
@@ -210,90 +209,57 @@ fun ZoomableContentView(content: ZoomableContent, images: ImmutableList<Zoomable
     }
 }
 
-@OptIn(ExperimentalLayoutApi::class)
 @Composable
 private fun LocalImageView(
     content: ZoomableLocalImage,
     mainImageModifier: Modifier
 ) {
-    BoxWithConstraints(contentAlignment = Alignment.Center) {
-        // store the dialog open or close state
-        var imageLoadingState by remember {
-            mutableStateOf<Boolean?>(null)
-        }
+    if (content.localFile != null && content.localFile.exists()) {
+        BoxWithConstraints(contentAlignment = Alignment.Center) {
+            val myModifier = remember {
+                mainImageModifier
+                    .widthIn(max = maxWidth)
+                    .heightIn(max = maxHeight)
+                    .run {
+                        aspectRatio(content.dim)?.let { ratio ->
+                            this.aspectRatio(ratio, false)
+                        } ?: this
+                    }
+            }
 
-        val myModifier = remember {
-            mainImageModifier
-                .widthIn(max = maxWidth)
-                .heightIn(max = maxHeight)
-                .run {
-                    aspectRatio(content.dim)?.let { ratio ->
-                        this.aspectRatio(ratio, false)
-                    } ?: this
-                }
-        }
+            val contentScale = remember {
+                if (maxHeight.isFinite) ContentScale.Fit else ContentScale.FillWidth
+            }
 
-        val contentScale = remember {
-            if (maxHeight.isFinite) ContentScale.Fit else ContentScale.FillWidth
-        }
+            val verifierModifier = Modifier.align(Alignment.TopEnd)
+
+            val painterState = remember {
+                mutableStateOf<AsyncImagePainter.State?>(null)
+            }
 
-        if (content.localFile != null && content.localFile.exists()) {
             AsyncImage(
                 model = content.localFile,
                 contentDescription = content.description,
                 contentScale = contentScale,
                 modifier = myModifier,
-                onError = {
-                    if (imageLoadingState != false) {
-                        imageLoadingState = false
-                    }
-                },
-                onSuccess = {
-                    if (imageLoadingState != true) {
-                        imageLoadingState = true
-                    }
+                onState = {
+                    painterState.value = it
                 }
             )
-        }
 
-        if (imageLoadingState == true) {
-            if (content.isVerified != null) {
-                HashVerificationSymbol(content.isVerified, Modifier.align(Alignment.TopEnd))
-            }
-        } else if (imageLoadingState == false || content.localFile == null || !content.localFile.exists()) {
-            BlankNote()
-        } else {
-            if (content.blurhash != null) {
-                DisplayBlurHash(content.blurhash, content.description, contentScale, myModifier)
-            } else {
-                FlowRow() {
-                    DisplayUrlWithLoadingSymbol(content)
-                }
-            }
+            AddedImageFeatures(painterState, content, contentScale, myModifier, verifierModifier)
         }
+    } else {
+        BlankNote()
     }
 }
 
-@OptIn(ExperimentalLayoutApi::class)
 @Composable
 private fun UrlImageView(
     content: ZoomableUrlImage,
     mainImageModifier: Modifier
 ) {
-    val scope = rememberCoroutineScope()
-
     BoxWithConstraints(contentAlignment = Alignment.Center) {
-        val context = LocalContext.current
-
-        // store the dialog open or close state
-        var imageLoadingStatus by remember {
-            mutableStateOf<Boolean?>(null)
-        }
-
-        var verifiedHash by remember {
-            mutableStateOf<Boolean?>(null)
-        }
-
         val myModifier = remember {
             mainImageModifier
                 .widthIn(max = maxWidth)
@@ -309,35 +275,37 @@ private fun UrlImageView(
             if (maxHeight.isFinite) ContentScale.Fit else ContentScale.FillWidth
         }
 
+        val verifierModifier = Modifier.align(Alignment.TopEnd)
+
+        val painterState = remember {
+            mutableStateOf<AsyncImagePainter.State?>(null)
+        }
+
         AsyncImage(
             model = content.url,
             contentDescription = content.description,
             contentScale = contentScale,
             modifier = myModifier,
-            onError = {
-                if (imageLoadingStatus != false) {
-                    imageLoadingStatus = false
-                }
-            },
-            onSuccess = {
-                if (verifiedHash == null) {
-                    scope.launch(Dispatchers.IO) {
-                        verifiedHash = verifyHash(content, context)
-                    }
-                }
-                if (imageLoadingStatus != true) {
-                    imageLoadingStatus = true
-                }
+            onState = {
+                painterState.value = it
             }
         )
 
-        if (imageLoadingStatus == true) {
-            verifiedHash?.let {
-                HashVerificationSymbol(it, Modifier.align(Alignment.TopEnd))
-            }
-        } else if (imageLoadingStatus == false) {
-            ClickableUrl(urlText = "${content.url} ", url = content.url)
-        } else {
+        AddedImageFeatures(painterState, content, contentScale, myModifier, verifierModifier)
+    }
+}
+
+@Composable
+@OptIn(ExperimentalLayoutApi::class)
+private fun AddedImageFeatures(
+    painter: MutableState<AsyncImagePainter.State?>,
+    content: ZoomableLocalImage,
+    contentScale: ContentScale,
+    myModifier: Modifier,
+    verifiedModifier: Modifier
+) {
+    when (painter.value) {
+        null, is AsyncImagePainter.State.Loading -> {
             if (content.blurhash != null) {
                 DisplayBlurHash(content.blurhash, content.description, contentScale, myModifier)
             } else {
@@ -346,6 +314,70 @@ private fun UrlImageView(
                 }
             }
         }
+
+        is AsyncImagePainter.State.Error -> {
+            BlankNote()
+        }
+
+        is AsyncImagePainter.State.Success -> {
+            if (content.isVerified != null) {
+                HashVerificationSymbol(content.isVerified, verifiedModifier)
+            }
+        }
+
+        else -> {
+        }
+    }
+}
+
+@Composable
+@OptIn(ExperimentalLayoutApi::class)
+private fun AddedImageFeatures(
+    painter: MutableState<AsyncImagePainter.State?>,
+    content: ZoomableUrlImage,
+    contentScale: ContentScale,
+    myModifier: Modifier,
+    verifiedModifier: Modifier
+) {
+    var verifiedHash by remember {
+        mutableStateOf<Boolean?>(null)
+    }
+
+    when (painter.value) {
+        null, is AsyncImagePainter.State.Loading -> {
+            if (content.blurhash != null) {
+                DisplayBlurHash(content.blurhash, content.description, contentScale, myModifier)
+            } else {
+                FlowRow() {
+                    DisplayUrlWithLoadingSymbol(content)
+                }
+            }
+        }
+
+        is AsyncImagePainter.State.Error -> {
+            ClickableUrl(urlText = "${content.url} ", url = content.url)
+        }
+
+        is AsyncImagePainter.State.Success -> {
+            if (content.hash != null) {
+                val context = LocalContext.current
+                LaunchedEffect(key1 = content.url) {
+                    launch(Dispatchers.IO) {
+                        val newVerifiedHash = verifyHash(content, context)
+                        if (newVerifiedHash != verifiedHash) {
+                            verifiedHash = newVerifiedHash
+                        }
+                    }
+                }
+            }
+
+            verifiedHash?.let {
+                HashVerificationSymbol(it, verifiedModifier)
+            }
+        }
+
+        else -> {
+        }
     }
 }
 
@@ -381,7 +413,7 @@ private fun DisplayUrlWithLoadingSymbol(content: ZoomableContent) {
 @Composable
 private fun DisplayUrlWithLoadingSymbolWait(content: ZoomableContent) {
     if (content is ZoomableUrlContent) {
-        ClickableUrl(urlText = "${content.url} ", url = content.url)
+        ClickableUrl(urlText = remember { "${content.url} " }, url = content.url)
     } else {
         Text("Loading content... ")
     }
@@ -400,8 +432,8 @@ private fun DisplayUrlWithLoadingSymbolWait(content: ZoomableContent) {
             myId,
             InlineTextContent(
                 Placeholder(
-                    width = 17.sp,
-                    height = 17.sp,
+                    width = Font17SP,
+                    height = Font17SP,
                     placeholderVerticalAlign = PlaceholderVerticalAlign.Center
                 )
             ) {
@@ -470,7 +502,7 @@ fun ZoomableImageDialog(imageUrl: ZoomableContent, allImages: ImmutableList<Zoom
     ) {
         Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
             Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.TopCenter) {
-                val pagerState: PagerState = remember { PagerState() }
+                val pagerState: PagerState = rememberPagerState()
 
                 LaunchedEffect(key1 = pagerState, key2 = imageUrl) {
                     val page = allImages.indexOf(imageUrl)
@@ -565,15 +597,7 @@ private fun HashVerificationSymbol(verifiedHash: Boolean, modifier: Modifier) {
             .height(40.dp)
             .padding(10.dp)
     ) {
-        Box(
-            Modifier
-                .clip(CircleShape)
-                .fillMaxSize(0.6f)
-                .align(Alignment.Center)
-                .background(MaterialTheme.colors.background)
-        )
-
-        if (verifiedHash == true) {
+        if (verifiedHash) {
             IconButton(
                 onClick = {
                     scope.launch {
@@ -592,7 +616,7 @@ private fun HashVerificationSymbol(verifiedHash: Boolean, modifier: Modifier) {
                     modifier = Modifier.size(30.dp)
                 )
             }
-        } else if (verifiedHash == false) {
+        } else {
             IconButton(
                 onClick = {
                     scope.launch {

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/GlobalFeedFilter.kt

@@ -1,53 +0,0 @@
-package com.vitorpamplona.amethyst.ui.dal
-
-import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.service.model.*
-
-class GlobalFeedFilter(val account: Account) : AdditiveFeedFilter<Note>() {
-
-    override fun feedKey(): String {
-        return account.userProfile().pubkeyHex
-    }
-
-    override fun feed(): List<Note> {
-        val notes = innerApplyFilter(LocalCache.notes.values)
-        val longFormNotes = innerApplyFilter(LocalCache.addressables.values)
-
-        return sort(notes + longFormNotes)
-    }
-
-    override fun applyFilter(collection: Set<Note>): Set<Note> {
-        return innerApplyFilter(collection)
-    }
-
-    private fun innerApplyFilter(collection: Collection<Note>): Set<Note> {
-        val followChannels = account.followingChannels
-        val followUsers = account.followingKeySet()
-        val now = System.currentTimeMillis() / 1000
-
-        return collection
-            .asSequence()
-            .filter {
-                (it.event is BaseTextNoteEvent || it.event is AudioTrackEvent) && it.replyTo.isNullOrEmpty()
-            }
-            .filter {
-                val channel = it.channelHex()
-                // does not show events already in the public chat list
-                (channel == null || channel !in followChannels) &&
-                    // does not show people the user already follows
-                    (it.author?.pubkeyHex !in followUsers)
-            }
-            .filter { account.isAcceptable(it) }
-            .filter {
-                // Do not show notes with the creation time exceeding the current time, as they will always stay at the top of the global feed, which is cheating.
-                it.createdAt()!! <= now
-            }
-            .toSet()
-    }
-
-    override fun sort(collection: Set<Note>): List<Note> {
-        return collection.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
-    }
-}

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.ui.dal
 
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
@@ -23,6 +24,8 @@ class HomeConversationsFeedFilter(val account: Account) : AdditiveFeedFilter<Not
     }
 
     private fun innerApplyFilter(collection: Collection<Note>): Set<Note> {
+        val isGlobal = account.defaultHomeFollowList == GLOBAL_FOLLOWS
+
         val followingKeySet = account.selectedUsersFollowList(account.defaultHomeFollowList) ?: emptySet()
         val followingTagSet = account.selectedTagsFollowList(account.defaultHomeFollowList) ?: emptySet()
 
@@ -32,7 +35,7 @@ class HomeConversationsFeedFilter(val account: Account) : AdditiveFeedFilter<Not
             .asSequence()
             .filter {
                 (it.event is TextNoteEvent || it.event is PollNoteEvent || it.event is ChannelMessageEvent || it.event is LiveActivitiesChatMessageEvent) &&
-                    (it.author?.pubkeyHex in followingKeySet || (it.event?.isTaggedHashes(followingTagSet) ?: false)) &&
+                    (isGlobal || it.author?.pubkeyHex in followingKeySet || it.event?.isTaggedHashes(followingTagSet) ?: false) &&
                     // && account.isAcceptable(it)  // This filter follows only. No need to check if acceptable
                     it.author?.let { !account.isHidden(it) } ?: true &&
                     ((it.event?.createdAt() ?: 0) < now) &&

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeLiveActivitiesFeedFilter.kt

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.ui.dal
 
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.OnlineChecker
@@ -29,6 +30,8 @@ class HomeLiveActivitiesFeedFilter(val account: Account) : AdditiveFeedFilter<No
     private fun innerApplyFilter(collection: Collection<Note>): Set<Note> {
         checkNotInMainThread()
 
+        val isGlobal = account.defaultHomeFollowList == GLOBAL_FOLLOWS
+
         val followingKeySet = account.selectedUsersFollowList(account.defaultHomeFollowList) ?: emptySet()
         val followingTagSet = account.selectedTagsFollowList(account.defaultHomeFollowList) ?: emptySet()
 
@@ -39,7 +42,7 @@ class HomeLiveActivitiesFeedFilter(val account: Account) : AdditiveFeedFilter<No
             .filter { it ->
                 val noteEvent = it.event
                 (noteEvent is LiveActivitiesEvent && noteEvent.createdAt > twoHrs && noteEvent.status() == "live" && OnlineChecker.isOnline(noteEvent.streaming())) &&
-                    (it.author?.pubkeyHex in followingKeySet || (noteEvent.isTaggedHashes(followingTagSet))) &&
+                    (isGlobal || it.author?.pubkeyHex in followingKeySet || noteEvent.isTaggedHashes(followingTagSet)) &&
                     // && account.isAcceptable(it)  // This filter follows only. No need to check if acceptable
                     it.author?.let { !account.isHidden(it.pubkeyHex) } ?: true
             }

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.ui.dal
 
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.AudioTrackEvent
@@ -29,6 +30,8 @@ class HomeNewThreadFeedFilter(val account: Account) : AdditiveFeedFilter<Note>()
     }
 
     private fun innerApplyFilter(collection: Collection<Note>): Set<Note> {
+        val isGlobal = account.defaultHomeFollowList == GLOBAL_FOLLOWS
+
         val followingKeySet = account.selectedUsersFollowList(account.defaultHomeFollowList) ?: emptySet()
         val followingTagSet = account.selectedTagsFollowList(account.defaultHomeFollowList) ?: emptySet()
 
@@ -40,7 +43,7 @@ class HomeNewThreadFeedFilter(val account: Account) : AdditiveFeedFilter<Note>()
             .filter { it ->
                 val noteEvent = it.event
                 (noteEvent is TextNoteEvent || noteEvent is RepostEvent || noteEvent is GenericRepostEvent || noteEvent is LongTextNoteEvent || noteEvent is PollNoteEvent || noteEvent is HighlightEvent || noteEvent is AudioTrackEvent) &&
-                    (it.author?.pubkeyHex in followingKeySet || (noteEvent.isTaggedHashes(followingTagSet))) &&
+                    (isGlobal || it.author?.pubkeyHex in followingKeySet || noteEvent.isTaggedHashes(followingTagSet)) &&
                     // && account.isAcceptable(it)  // This filter follows only. No need to check if acceptable
                     it.author?.let { !account.isHidden(it.pubkeyHex) } ?: true &&
                     ((it.event?.createdAt() ?: 0) < oneMinuteInTheFuture) &&

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppBottomBar.kt

@@ -48,7 +48,6 @@ val bottomNavigationItems = listOf(
     Route.Home,
     Route.Message,
     Route.Video,
-    Route.Search,
     Route.Notification
 )
 

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt

@@ -12,7 +12,6 @@ import androidx.navigation.compose.composable
 import com.vitorpamplona.amethyst.ui.note.UserReactionsViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrChatroomListKnownFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrChatroomListNewFeedViewModel
-import com.vitorpamplona.amethyst.ui.screen.NostrGlobalFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrHomeFeedLiveActivitiesViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrHomeFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrHomeRepliesFeedViewModel
@@ -42,7 +41,6 @@ fun AppNavigation(
     liveActivitiesViewModel: NostrHomeFeedLiveActivitiesViewModel,
     knownFeedViewModel: NostrChatroomListKnownFeedViewModel,
     newFeedViewModel: NostrChatroomListNewFeedViewModel,
-    searchFeedViewModel: NostrGlobalFeedViewModel,
     videoFeedViewModel: NostrVideoFeedViewModel,
     notifFeedViewModel: NotificationViewModel,
     userReactionsStatsModel: UserReactionsViewModel,
@@ -111,7 +109,6 @@ fun AppNavigation(
         Route.Search.let { route ->
             composable(route.route, route.arguments, content = {
                 SearchScreen(
-                    searchFeedViewModel = searchFeedViewModel,
                     accountViewModel = accountViewModel,
                     nav = nav
                 )

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt

@@ -48,7 +48,6 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.map
 import androidx.lifecycle.viewModelScope
-import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavHostController
 import coil.Coil
@@ -61,7 +60,6 @@ import com.vitorpamplona.amethyst.service.NostrAccountDataSource
 import com.vitorpamplona.amethyst.service.NostrChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrChatroomDataSource
 import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
-import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
 import com.vitorpamplona.amethyst.service.NostrHashtagDataSource
 import com.vitorpamplona.amethyst.service.NostrHomeDataSource
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
@@ -74,9 +72,7 @@ import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.PeopleListEvent
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.RelayPool
-import com.vitorpamplona.amethyst.ui.actions.NewRelayListView
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImageProxy
-import com.vitorpamplona.amethyst.ui.screen.RelayPoolViewModel
 import com.vitorpamplona.amethyst.ui.screen.equalImmutableLists
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.SpinnerSelectionDialog
@@ -158,7 +154,7 @@ fun HomeTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, a
         FollowList(
             followLists,
             list,
-            false
+            true
         ) { listName ->
             accountViewModel.account.changeDefaultHomeFollowList(listName)
         }
@@ -194,14 +190,6 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel,
 fun GenericTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel, nav: (String) -> Unit, content: @Composable (AccountViewModel) -> Unit) {
     val coroutineScope = rememberCoroutineScope()
 
-    var wantsToEditRelays by remember {
-        mutableStateOf(false)
-    }
-
-    if (wantsToEditRelays) {
-        NewRelayListView({ wantsToEditRelays = false }, accountViewModel, nav = nav)
-    }
-
     Column(modifier = Modifier.height(50.dp)) {
         TopAppBar(
             elevation = 0.dp,
@@ -222,10 +210,6 @@ fun GenericTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewMod
                         ) {
                             content(accountViewModel)
                         }
-
-                        RelayStatus(
-                            { wantsToEditRelays = true }
-                        )
                     }
                 }
             },
@@ -237,7 +221,9 @@ fun GenericTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewMod
                 }
             },
             actions = {
-                RelayIcon { wantsToEditRelays = true }
+                SearchIcon() {
+                    nav(Route.Search.route)
+                }
             }
         )
         Divider(thickness = 0.25.dp)
@@ -245,80 +231,14 @@ fun GenericTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewMod
 }
 
 @Composable
-private fun RelayStatus(
-    onClick: () -> Unit
-) {
-    val relayViewModel: RelayPoolViewModel = viewModel { RelayPoolViewModel() }
-    Column(
-        modifier = Modifier
-            .fillMaxWidth()
-            .fillMaxHeight(),
-        horizontalAlignment = Alignment.End
-    ) {
-        Row(
-            modifier = Modifier.fillMaxHeight(),
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-            RelayStatus(relayViewModel, onClick)
-        }
-    }
-}
-
-@Composable
-private fun RelayStatus(
-    relayViewModel: RelayPoolViewModel,
-    onClick: () -> Unit
-) {
-    val connectedRelaysLiveData = relayViewModel.connectedRelaysLiveData.observeAsState()
-    val availableRelaysLiveData = relayViewModel.availableRelaysLiveData.observeAsState()
-
-    val connectedRelaysText by remember(connectedRelaysLiveData, availableRelaysLiveData) {
-        derivedStateOf {
-            "${connectedRelaysLiveData.value ?: "--"}/${availableRelaysLiveData.value ?: "--"}"
-        }
-    }
-
-    val isConnected by remember(connectedRelaysLiveData) {
-        derivedStateOf {
-            (connectedRelaysLiveData.value ?: 0) > 0
-        }
-    }
-
-    RenderRelayStatus(connectedRelaysText, isConnected, onClick)
-}
-
-@Composable
-private fun RenderRelayStatus(
-    connectedRelaysText: String,
-    isConnected: Boolean,
-    onClick: () -> Unit
-) {
-    Text(
-        text = connectedRelaysText,
-        color = if (isConnected) {
-            MaterialTheme.colors.onSurface.copy(
-                alpha = 0.32f
-            )
-        } else {
-            Color.Red
-        },
-        style = MaterialTheme.typography.subtitle1,
-        modifier = Modifier.clickable(
-            onClick = onClick
-        )
-    )
-}
-
-@Composable
-private fun RelayIcon(onClick: () -> Unit) {
+private fun SearchIcon(onClick: () -> Unit) {
     IconButton(
-        onClick = onClick,
-        modifier = Modifier
+        onClick = onClick
     ) {
         Icon(
-            painter = painterResource(R.drawable.relays),
-            null,
-            modifier = Modifier.size(24.dp),
+            painter = painterResource(R.drawable.ic_search),
+            contentDescription = null,
+            modifier = Modifier.size(22.dp),
             tint = Color.Unspecified
         )
     }
@@ -534,7 +454,6 @@ fun AmethystIcon() {
             NostrChannelDataSource.printCounter()
             NostrChatroomDataSource.printCounter()
             NostrChatroomListDataSource.printCounter()
-            NostrGlobalDataSource.printCounter()
             NostrHashtagDataSource.printCounter()
             NostrHomeDataSource.printCounter()
             NostrSearchEventOrUserDataSource.printCounter()

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt

@@ -34,6 +34,7 @@ import androidx.compose.material.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
@@ -52,6 +53,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.lifecycle.viewmodel.compose.viewModel
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.LocalPreferences
@@ -60,13 +62,17 @@ import com.vitorpamplona.amethyst.ServiceManager
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.HttpClient
+import com.vitorpamplona.amethyst.ui.actions.NewRelayListView
 import com.vitorpamplona.amethyst.ui.actions.toImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.components.CreateTextWithEmoji
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImageProxy
+import com.vitorpamplona.amethyst.ui.screen.RelayPoolViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountBackupDialog
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.ConnectOrbotDialog
 import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
+import com.vitorpamplona.amethyst.ui.theme.Size16dp
+import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
@@ -301,6 +307,12 @@ fun ListContent(
     var conectOrbotDialogOpen by remember { mutableStateOf(false) }
     var proxyPort = remember { mutableStateOf(account.proxyPort.toString()) }
 
+    val relayViewModel: RelayPoolViewModel = viewModel { RelayPoolViewModel() }
+
+    var wantsToEditRelays by remember {
+        mutableStateOf(false)
+    }
+
     Column(
         modifier = modifier
             .fillMaxHeight()
@@ -324,6 +336,16 @@ fun ListContent(
             route = Route.Bookmarks.route
         )
 
+        IconRowRelays(
+            relayViewModel = relayViewModel,
+            onClick = {
+                coroutineScope.launch {
+                    scaffoldState.drawerState.close()
+                }
+                wantsToEditRelays = true
+            }
+        )
+
         NavigationRow(
             title = stringResource(R.string.security_filters),
             icon = Route.BlockedUsers.icon,
@@ -431,6 +453,10 @@ fun ListContent(
             }
         )
     }
+
+    if (wantsToEditRelays) {
+        NewRelayListView({ wantsToEditRelays = false }, accountViewModel, nav = nav)
+    }
 }
 
 private fun enableTor(
@@ -446,6 +472,44 @@ private fun enableTor(
     ServiceManager.start(context)
 }
 
+@Composable
+private fun RelayStatus(
+    relayViewModel: RelayPoolViewModel
+) {
+    val connectedRelaysLiveData = relayViewModel.connectedRelaysLiveData.observeAsState()
+    val availableRelaysLiveData = relayViewModel.availableRelaysLiveData.observeAsState()
+
+    val connectedRelaysText by remember(connectedRelaysLiveData, availableRelaysLiveData) {
+        derivedStateOf {
+            "${connectedRelaysLiveData.value ?: "--"}/${availableRelaysLiveData.value ?: "--"}"
+        }
+    }
+
+    val isConnected by remember(connectedRelaysLiveData) {
+        derivedStateOf {
+            (connectedRelaysLiveData.value ?: 0) > 0
+        }
+    }
+
+    RenderRelayStatus(connectedRelaysText, isConnected)
+}
+
+@Composable
+private fun RenderRelayStatus(
+    connectedRelaysText: String,
+    isConnected: Boolean
+) {
+    Text(
+        text = connectedRelaysText,
+        color = if (isConnected) {
+            MaterialTheme.colors.placeholderText
+        } else {
+            Color.Red
+        },
+        style = MaterialTheme.typography.subtitle1
+    )
+}
+
 @Composable
 fun NavigationRow(
     title: String,
@@ -496,6 +560,39 @@ fun IconRow(title: String, icon: Int, tint: Color, onClick: () -> Unit, onLongCl
     }
 }
 
+@Composable
+fun IconRowRelays(relayViewModel: RelayPoolViewModel, onClick: () -> Unit) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable { onClick() }
+    ) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(vertical = 15.dp, horizontal = 25.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Icon(
+                painter = painterResource(R.drawable.relays),
+                null,
+                modifier = Modifier.size(22.dp),
+                tint = MaterialTheme.colors.onSurface
+            )
+
+            Text(
+                modifier = Modifier.padding(start = 16.dp),
+                text = stringResource(id = R.string.relays),
+                fontSize = 18.sp
+            )
+
+            Spacer(modifier = Modifier.width(Size16dp))
+
+            RelayStatus(relayViewModel = relayViewModel)
+        }
+    }
+}
+
 @Composable
 fun BottomContent(user: User, scaffoldState: ScaffoldState, nav: (String) -> Unit) {
     val coroutineScope = rememberCoroutineScope()

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/Routes.kt

@@ -42,9 +42,14 @@ sealed class Route(
         hasNewItems = { accountViewModel, newNotes -> HomeLatestItem.hasNewItems(accountViewModel, newNotes) }
     )
 
+    object Global : Route(
+        route = "Global",
+        icon = R.drawable.ic_globe
+    )
+
     object Search : Route(
         route = "Search",
-        icon = R.drawable.ic_globe
+        icon = R.drawable.ic_search
     )
 
     object Video : Route(

app/src/main/java/com/vitorpamplona/amethyst/ui/note/BadgeCompose.kt

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.ui.note
 
 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -26,7 +27,6 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.platform.LocalContext
@@ -79,9 +79,7 @@ fun BadgeCompose(likeSetCard: BadgeCard, isInnerNote: Boolean = false, routeForL
 
         Column(
             modifier = Modifier
-                .drawBehind {
-                    drawRect(backgroundColor.value)
-                }
+                .background(backgroundColor.value)
                 .combinedClickable(
                     onClick = {
                         scope.launch {

app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomCompose.kt

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -53,9 +54,14 @@ import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImageProxy
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.ChatHeadlineBorders
+import com.vitorpamplona.amethyst.ui.theme.DividerThickness
 import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
+import com.vitorpamplona.amethyst.ui.theme.Height4dpModifier
 import com.vitorpamplona.amethyst.ui.theme.Size55Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size55dp
+import com.vitorpamplona.amethyst.ui.theme.Size75dp
+import com.vitorpamplona.amethyst.ui.theme.StdTopPadding
 import com.vitorpamplona.amethyst.ui.theme.grayText
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import kotlinx.coroutines.Dispatchers
@@ -110,8 +116,16 @@ private fun ChatroomDirectMessage(
     }
 
     userRoomHex?.let {
-        LoadUser(it) { user ->
-            UserRoomCompose(baseNote, user, accountViewModel, nav)
+        LoadUser(it) { baseUser ->
+            Crossfade(baseUser) { user ->
+                if (user != null) {
+                    UserRoomCompose(baseNote, user, accountViewModel, nav)
+                } else {
+                    Box(Modifier.height(Size75dp).fillMaxWidth()) {
+                        // Makes sure just a max amount of objects are loaded.
+                    }
+                }
+            }
         }
     }
 }
@@ -246,6 +260,7 @@ private fun UserRoomCompose(
             accountViewModel.decrypt(note)
         }
     }
+
     WatchNotificationChanges(note, route, accountViewModel) { newHasNewMessages ->
         if (hasNewMessages.value != newHasNewMessages) {
             hasNewMessages.value = newHasNewMessages
@@ -288,7 +303,7 @@ private fun WatchNotificationChanges(
 }
 
 @Composable
-fun LoadUser(baseUserHex: String, content: @Composable (User) -> Unit) {
+fun LoadUser(baseUserHex: String, content: @Composable (User?) -> Unit) {
     var user by remember(baseUserHex) {
         mutableStateOf<User?>(LocalCache.getUserIfExists(baseUserHex))
     }
@@ -301,9 +316,7 @@ fun LoadUser(baseUserHex: String, content: @Composable (User) -> Unit) {
         }
     }
 
-    user?.let {
-        content(it)
-    }
+    content(user)
 }
 
 @Composable
@@ -348,9 +361,7 @@ fun ChannelName(
     onClick: () -> Unit
 ) {
     Column(modifier = remember { Modifier.clickable(onClick = onClick) }) {
-        Row(
-            modifier = remember { Modifier.padding(start = 12.dp, end = 12.dp, top = 10.dp) }
-        ) {
+        Row(modifier = ChatHeadlineBorders) {
             Column(Size55Modifier) {
                 channelPicture()
             }
@@ -362,11 +373,13 @@ fun ChannelName(
                 verticalArrangement = Arrangement.SpaceAround
             ) {
                 Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                    modifier = remember { Modifier.padding(bottom = 4.dp) }
+                    verticalAlignment = Alignment.CenterVertically
                 ) {
                     FirstRow(channelTitle, channelLastTime, remember { Modifier.weight(1f) })
                 }
+
+                Spacer(modifier = Height4dpModifier)
+
                 Row(
                     modifier = Modifier.fillMaxWidth(),
                     verticalAlignment = Alignment.CenterVertically
@@ -377,8 +390,8 @@ fun ChannelName(
         }
 
         Divider(
-            modifier = remember { Modifier.padding(top = 10.dp) },
-            thickness = 0.25.dp
+            modifier = StdTopPadding,
+            thickness = DividerThickness
         )
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.ui.note
 
 import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -40,7 +41,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.graphics.compositeOver
@@ -923,7 +923,7 @@ private fun RenderRelayIcon(iconUrl: String) {
         Modifier
             .size(Size13dp)
             .clip(shape = CircleShape)
-            .drawBehind { drawRect(backgroundColor) }
+            .background(backgroundColor)
     }
 
     RobohashFallbackAsyncImage(

app/src/main/java/com/vitorpamplona/amethyst/ui/note/MessageSetCompose.kt

@@ -22,7 +22,6 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.res.painterResource
@@ -70,11 +69,7 @@ fun MessageSetCompose(messageSetCard: MessageSetCard, routeForLastRead: String,
 
     val columnModifier = remember(backgroundColor.value) {
         Modifier
-            .drawBehind {
-                drawRect(
-                    backgroundColor.value
-                )
-            }
+            .background(backgroundColor.value)
             .padding(
                 start = 12.dp,
                 end = 12.dp,

app/src/main/java/com/vitorpamplona/amethyst/ui/note/MultiSetCompose.kt

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import android.util.Log
 import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
@@ -11,7 +12,6 @@ import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
 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
 import androidx.compose.foundation.layout.size
@@ -36,38 +36,51 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.compositeOver
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.lifecycle.distinctUntilChanged
+import androidx.lifecycle.map
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.model.UserMetadata
 import com.vitorpamplona.amethyst.service.firstFullChar
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
 import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
+import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImageProxy
 import com.vitorpamplona.amethyst.ui.components.TranslatableRichTextViewer
 import com.vitorpamplona.amethyst.ui.screen.CombinedZap
 import com.vitorpamplona.amethyst.ui.screen.MultiSetCard
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.showAmountAxis
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
+import com.vitorpamplona.amethyst.ui.theme.NotificationIconModifier
+import com.vitorpamplona.amethyst.ui.theme.NotificationIconModifierSmaller
+import com.vitorpamplona.amethyst.ui.theme.Size10dp
+import com.vitorpamplona.amethyst.ui.theme.Size18dp
+import com.vitorpamplona.amethyst.ui.theme.Size25dp
+import com.vitorpamplona.amethyst.ui.theme.Size35Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size35dp
+import com.vitorpamplona.amethyst.ui.theme.StdStartPadding
+import com.vitorpamplona.amethyst.ui.theme.WidthAuthorPictureModifier
 import com.vitorpamplona.amethyst.ui.theme.WidthAuthorPictureModifierWithPadding
 import com.vitorpamplona.amethyst.ui.theme.newItemBackgroundColor
 import com.vitorpamplona.amethyst.ui.theme.overPictureBackground
+import com.vitorpamplona.amethyst.ui.theme.profile35dpModifier
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlin.time.ExperimentalTime
+import kotlin.time.measureTimedValue
 
-@OptIn(ExperimentalFoundationApi::class)
+@OptIn(ExperimentalFoundationApi::class, ExperimentalTime::class)
 @Composable
 fun MultiSetCompose(multiSetCard: MultiSetCard, routeForLastRead: String, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
     val baseNote = remember { multiSetCard.note }
@@ -101,9 +114,7 @@ fun MultiSetCompose(multiSetCard: MultiSetCard, routeForLastRead: String, accoun
 
     val columnModifier = remember(backgroundColor.value) {
         Modifier
-            .drawBehind {
-                drawRect(backgroundColor.value)
-            }
+            .background(backgroundColor.value)
             .padding(
                 start = 12.dp,
                 end = 12.dp,
@@ -121,32 +132,39 @@ fun MultiSetCompose(multiSetCard: MultiSetCard, routeForLastRead: String, accoun
     }
 
     Column(modifier = columnModifier) {
-        Galeries(multiSetCard, backgroundColor, nav, accountViewModel)
+        val (value, elapsed) = measureTimedValue {
+            Galeries(multiSetCard, backgroundColor, accountViewModel, nav)
+        }
+        Log.d("Rendering Metrics", "All Galeries: ${baseNote.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed - ")
 
         Row(remember { Modifier.fillMaxWidth() }) {
             Spacer(modifier = WidthAuthorPictureModifierWithPadding)
 
-            NoteCompose(
-                baseNote = baseNote,
-                routeForLastRead = null,
-                modifier = remember { Modifier.padding(top = 5.dp) },
-                isBoostedNote = true,
-                parentBackgroundColor = backgroundColor,
-                accountViewModel = accountViewModel,
-                nav = nav
-            )
+            val (value, elapsed) = measureTimedValue {
+                NoteCompose(
+                    baseNote = baseNote,
+                    routeForLastRead = null,
+                    modifier = remember { Modifier.padding(top = 5.dp) },
+                    isBoostedNote = true,
+                    parentBackgroundColor = backgroundColor,
+                    accountViewModel = accountViewModel,
+                    nav = nav
+                )
+            }
+            Log.d("Rendering Metrics", "Complete: ${baseNote.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed")
 
             NoteDropDownMenu(baseNote, popupExpanded, { popupExpanded = false }, accountViewModel)
         }
     }
 }
 
+@OptIn(ExperimentalTime::class)
 @Composable
 private fun Galeries(
     multiSetCard: MultiSetCard,
     backgroundColor: MutableState<Color>,
-    nav: (String) -> Unit,
-    accountViewModel: AccountViewModel
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
 ) {
     val zapEvents by remember { derivedStateOf { multiSetCard.zapEvents } }
     val boostEvents by remember { derivedStateOf { multiSetCard.boostEvents } }
@@ -157,17 +175,26 @@ private fun Galeries(
     val hasLikeEvents by remember { derivedStateOf { multiSetCard.likeEvents.isNotEmpty() } }
 
     if (hasZapEvents) {
-        RenderZapGallery(zapEvents, backgroundColor, nav, accountViewModel)
+        val (value, elapsed) = measureTimedValue {
+            RenderZapGallery(zapEvents, backgroundColor, nav, accountViewModel)
+        }
+        Log.d("Rendering Metrics", "Galeries Zaps:   ${multiSetCard.note.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed")
     }
 
     if (hasBoostEvents) {
-        RenderBoostGallery(boostEvents, backgroundColor, nav, accountViewModel)
+        val (value, elapsed) = measureTimedValue {
+            RenderBoostGallery(boostEvents, nav, accountViewModel)
+        }
+        Log.d("Rendering Metrics", "Galeries Repost: ${multiSetCard.note.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed")
     }
 
     if (hasLikeEvents) {
-        likeEvents.forEach {
-            RenderLikeGallery(it.key, it.value, backgroundColor, nav, accountViewModel)
+        val (value, elapsed) = measureTimedValue {
+            likeEvents.forEach {
+                RenderLikeGallery(it.key, it.value, nav, accountViewModel)
+            }
         }
+        Log.d("Rendering Metrics", "Galeries Like:   ${multiSetCard.note.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed")
     }
 }
 
@@ -175,39 +202,23 @@ private fun Galeries(
 fun RenderLikeGallery(
     reactionType: String,
     likeEvents: ImmutableList<Note>,
-    backgroundColor: MutableState<Color>,
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
 ) {
-    val isNotEmpty = remember(likeEvents) {
-        likeEvents.isNotEmpty()
-    }
-
-    val shortReaction by remember {
-        derivedStateOf {
-            reactionType.firstFullChar()
-        }
-    }
-
-    if (isNotEmpty) {
-        Row(remember { Modifier.fillMaxWidth() }) {
+    if (likeEvents.isNotEmpty()) {
+        Row(Modifier.fillMaxWidth()) {
             Box(
-                modifier = remember {
-                    Modifier
-                        .width(55.dp)
-                        .padding(end = 5.dp)
-                }
+                modifier = NotificationIconModifier
             ) {
                 val modifier = remember {
-                    Modifier
-                        .align(Alignment.TopEnd)
+                    Modifier.align(Alignment.TopEnd)
                 }
 
-                when (shortReaction) {
+                when (val shortReaction = reactionType.firstFullChar()) {
                     "+" -> Icon(
                         painter = painterResource(R.drawable.ic_liked),
                         null,
-                        modifier = remember { modifier.size(18.dp) },
+                        modifier = modifier.size(Size18dp),
                         tint = Color.Unspecified
                     )
                     "-" -> Text(text = "\uD83D\uDC4E", modifier = modifier)
@@ -215,7 +226,7 @@ fun RenderLikeGallery(
                 }
             }
 
-            AuthorGallery(likeEvents, backgroundColor, nav, accountViewModel)
+            AuthorGallery(likeEvents, nav, accountViewModel)
         }
     }
 }
@@ -237,21 +248,17 @@ fun RenderZapGallery(
 @Composable
 private fun ZapIcon() {
     Box(
-        modifier = remember {
-            Modifier
-                .width(55.dp)
-                .padding(0.dp)
-        }
+        modifier = WidthAuthorPictureModifier
     ) {
         Icon(
             imageVector = Icons.Default.Bolt,
             contentDescription = "Zaps",
             tint = BitcoinOrange,
-            modifier = remember {
-                Modifier
-                    .size(25.dp)
-                    .align(Alignment.TopEnd)
-            }
+            modifier =
+            Modifier
+                .size(Size25dp)
+                .align(Alignment.TopEnd)
+
         )
     }
 }
@@ -259,21 +266,14 @@ private fun ZapIcon() {
 @Composable
 fun RenderBoostGallery(
     boostEvents: ImmutableList<Note>,
-    backgroundColor: MutableState<Color>,
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
 ) {
     Row(
-        modifier = remember {
-            Modifier.fillMaxWidth()
-        }
+        modifier = Modifier.fillMaxWidth()
     ) {
         Box(
-            modifier = remember {
-                Modifier
-                    .width(55.dp)
-                    .padding(end = 4.dp)
-            }
+            modifier = NotificationIconModifierSmaller
         ) {
             Icon(
                 painter = painterResource(R.drawable.ic_retweeted),
@@ -287,7 +287,7 @@ fun RenderBoostGallery(
             )
         }
 
-        AuthorGallery(boostEvents, backgroundColor, nav, accountViewModel)
+        AuthorGallery(boostEvents, nav, accountViewModel)
     }
 }
 
@@ -299,15 +299,27 @@ fun AuthorGalleryZaps(
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
 ) {
-    Column(modifier = remember { Modifier.padding(start = 10.dp) }) {
+    Column(modifier = StdStartPadding) {
         FlowRow() {
             authorNotes.forEach {
-                AuthorPictureAndComment(it.request, it.response, backgroundColor, nav, accountViewModel)
+                ParseAuthorCommentAndAmount(it, backgroundColor, nav, accountViewModel)
             }
         }
     }
 }
 
+@Composable
+private fun ParseAuthorCommentAndAmount(
+    zap: CombinedZap,
+    backgroundColor: MutableState<Color>,
+    nav: (String) -> Unit,
+    accountViewModel: AccountViewModel
+) {
+    ParseAuthorCommentAndAmount(zap.request, zap.response, accountViewModel) { state ->
+        RenderState(state, backgroundColor, accountViewModel, nav)
+    }
+}
+
 @Immutable
 data class ZapAmountCommentNotification(
     val user: User?,
@@ -316,12 +328,11 @@ data class ZapAmountCommentNotification(
 )
 
 @Composable
-private fun AuthorPictureAndComment(
+private fun ParseAuthorCommentAndAmount(
     zapRequest: Note,
     zapEvent: Note?,
-    backgroundColor: MutableState<Color>,
-    nav: (String) -> Unit,
-    accountViewModel: AccountViewModel
+    accountViewModel: AccountViewModel,
+    onReady: @Composable (MutableState<ZapAmountCommentNotification>) -> Unit
 ) {
     val content = remember {
         mutableStateOf(
@@ -334,7 +345,7 @@ private fun AuthorPictureAndComment(
     }
 
     LaunchedEffect(key1 = zapRequest.idHex, key2 = zapEvent?.idHex) {
-        launch(Dispatchers.Default) {
+        launch(Dispatchers.IO) {
             (zapRequest.event as? LnZapRequestEvent)?.let {
                 val decryptedContent = accountViewModel.decryptZap(zapRequest)
                 val amount = (zapEvent?.event as? LnZapEvent)?.amount
@@ -353,111 +364,116 @@ private fun AuthorPictureAndComment(
         }
     }
 
-    Crossfade(targetState = content) {
-        Row(
-            modifier = Modifier.clickable {
-                nav("User/${it.value.user?.pubkeyHex}")
-            },
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-            AuthorPictureAndComment(
-                authorComment = it,
-                backgroundColor = backgroundColor,
-                nav = nav,
-                accountViewModel = accountViewModel
-            )
-        }
+    onReady(content)
+}
+
+@Composable
+private fun RenderState(
+    content: MutableState<ZapAmountCommentNotification>,
+    backgroundColor: MutableState<Color>,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    Row(
+        modifier = Modifier.clickable {
+            content.value.user?.let {
+                nav(routeFor(it))
+            }
+        },
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        DisplayAuthorCommentAndAmount(
+            authorComment = content,
+            backgroundColor = backgroundColor,
+            nav = nav,
+            accountViewModel = accountViewModel
+        )
     }
 }
 
 val amountBoxModifier = Modifier
-    .fillMaxSize()
+    .size(Size35dp)
     .clip(shape = CircleShape)
 
 val textBoxModifier = Modifier
     .padding(start = 5.dp)
     .fillMaxWidth()
 
-val simpleModifier = Modifier
-
-val sizedModifier = Modifier.size(Size35dp)
-
 val bottomPadding1dp = Modifier.padding(bottom = 1.dp)
 
 val commentTextSize = 12.sp
 
 @Composable
-private fun AuthorPictureAndComment(
+private fun DisplayAuthorCommentAndAmount(
     authorComment: MutableState<ZapAmountCommentNotification>,
     backgroundColor: MutableState<Color>,
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
 ) {
-    Box(modifier = sizedModifier, contentAlignment = Alignment.BottomCenter) {
-        DisplayPicture(authorComment, accountViewModel)
-        DisplayAmount(authorComment)
+    Box(modifier = Size35Modifier, contentAlignment = Alignment.BottomCenter) {
+        CrossfadeToDisplayPicture(authorComment, accountViewModel)
+        CrossfadeToDisplayAmount(authorComment)
     }
 
-    DisplayComment(authorComment, backgroundColor, nav, accountViewModel)
+    CrossfadeToDisplayComment(authorComment, backgroundColor, nav, accountViewModel)
 }
 
 @Composable
-fun DisplayPicture(authorComment: MutableState<ZapAmountCommentNotification>, accountViewModel: AccountViewModel) {
-    authorComment.value.user?.let {
-        FastNoteAuthorPicture(
-            author = it,
-            size = Size35dp,
-            accountViewModel = accountViewModel,
-            pictureModifier = simpleModifier
-        )
+fun CrossfadeToDisplayPicture(authorComment: MutableState<ZapAmountCommentNotification>, accountViewModel: AccountViewModel) {
+    Crossfade(authorComment.value) {
+        WatchUserMetadataAndFollowsAndRenderUserProfilePictureOrDefaultAuthor(it.user, accountViewModel)
     }
 }
 
 @Composable
-fun DisplayAmount(authorComment: MutableState<ZapAmountCommentNotification>) {
-    authorComment.value.amount?.let {
-        Box(
-            modifier = amountBoxModifier,
-            contentAlignment = Alignment.BottomCenter
-        ) {
-            val backgroundColor = MaterialTheme.colors.overPictureBackground
+fun CrossfadeToDisplayAmount(authorComment: MutableState<ZapAmountCommentNotification>) {
+    Crossfade(authorComment.value, modifier = amountBoxModifier) {
+        it.amount?.let {
             Box(
-                modifier = remember {
-                    Modifier
-                        .fillMaxWidth()
-                        .drawBehind { drawRect(backgroundColor) }
-                },
+                modifier = amountBoxModifier,
                 contentAlignment = Alignment.BottomCenter
             ) {
-                Text(
-                    text = it,
-                    fontWeight = FontWeight.Bold,
-                    color = MaterialTheme.colors.secondaryVariant,
-                    fontSize = commentTextSize,
-                    modifier = bottomPadding1dp
-                )
+                val backgroundColor = MaterialTheme.colors.overPictureBackground
+                Box(
+                    modifier = remember {
+                        Modifier
+                            .width(Size35dp)
+                            .background(backgroundColor)
+                    },
+                    contentAlignment = Alignment.BottomCenter
+                ) {
+                    Text(
+                        text = it,
+                        fontWeight = FontWeight.Bold,
+                        color = MaterialTheme.colors.secondaryVariant,
+                        fontSize = commentTextSize,
+                        modifier = bottomPadding1dp
+                    )
+                }
             }
         }
     }
 }
 
 @Composable
-fun DisplayComment(
+fun CrossfadeToDisplayComment(
     authorComment: MutableState<ZapAmountCommentNotification>,
     backgroundColor: MutableState<Color>,
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
 ) {
-    authorComment.value.comment?.let {
-        TranslatableRichTextViewer(
-            content = it,
-            canPreview = true,
-            tags = remember { ImmutableListOfLists() },
-            modifier = textBoxModifier,
-            backgroundColor = backgroundColor,
-            accountViewModel = accountViewModel,
-            nav = nav
-        )
+    Crossfade(authorComment.value) {
+        it.comment?.let {
+            TranslatableRichTextViewer(
+                content = it,
+                canPreview = true,
+                tags = remember { ImmutableListOfLists() },
+                modifier = textBoxModifier,
+                backgroundColor = backgroundColor,
+                accountViewModel = accountViewModel,
+                nav = nav
+            )
+        }
     }
 }
 
@@ -465,14 +481,13 @@ fun DisplayComment(
 @Composable
 fun AuthorGallery(
     authorNotes: ImmutableList<Note>,
-    backgroundColor: MutableState<Color>,
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
 ) {
-    Column(modifier = remember { Modifier.padding(start = 10.dp) }) {
+    Column(modifier = StdStartPadding) {
         FlowRow() {
             authorNotes.forEach { note ->
-                BoxedAuthor(note, backgroundColor, nav, accountViewModel)
+                BoxedAuthor(note, nav, accountViewModel)
             }
         }
     }
@@ -481,102 +496,78 @@ fun AuthorGallery(
 @Composable
 private fun BoxedAuthor(
     note: Note,
-    backgroundColor: MutableState<Color>,
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
 ) {
-    Box(sizedModifier) {
-        NotePictureAndComment(note, backgroundColor, nav, accountViewModel)
+    Box(modifier = Size35Modifier.clickable(onClick = { nav(authorRouteFor(note)) })) {
+        WatchNoteAuthor(note) { targetAuthor ->
+            Crossfade(targetState = targetAuthor, modifier = Size35Modifier) { author ->
+                WatchUserMetadataAndFollowsAndRenderUserProfilePictureOrDefaultAuthor(author, accountViewModel)
+            }
+        }
     }
 }
 
 @Composable
-private fun NotePictureAndComment(
-    baseNote: Note,
-    backgroundColor: MutableState<Color>,
-    nav: (String) -> Unit,
+fun WatchUserMetadataAndFollowsAndRenderUserProfilePictureOrDefaultAuthor(
+    author: User?,
     accountViewModel: AccountViewModel
 ) {
-    val author = remember(baseNote) {
-        mutableStateOf(
-            ZapAmountCommentNotification(
-                user = baseNote.author,
-                comment = null,
-                amount = null
+    if (author != null) {
+        WatchUserMetadataAndFollowsAndRenderUserProfilePicture(author, accountViewModel)
+    } else {
+        DisplayBlankAuthor(Size35dp)
+    }
+}
+
+@Composable
+fun WatchUserMetadataAndFollowsAndRenderUserProfilePicture(
+    author: User,
+    accountViewModel: AccountViewModel
+) {
+    WatchUserMetadata(author) { baseUserPicture ->
+        Crossfade(targetState = baseUserPicture) { userPicture ->
+            RobohashAsyncImageProxy(
+                robot = author.pubkeyHex,
+                model = userPicture,
+                contentDescription = stringResource(id = R.string.profile_image),
+                modifier = MaterialTheme.colors.profile35dpModifier,
+                contentScale = ContentScale.Crop
             )
-        )
-    }
-
-    val modifier = remember(baseNote) {
-        Modifier.clickable {
-            nav("User/${baseNote.author?.pubkeyHex}")
         }
     }
 
-    Row(
-        modifier = modifier,
-        verticalAlignment = Alignment.CenterVertically
-    ) {
-        AuthorPictureAndComment(authorComment = author, backgroundColor, nav, accountViewModel)
-    }
-}
-
-@Composable
-fun FastNoteAuthorPicture(
-    author: User,
-    size: Dp,
-    pictureModifier: Modifier = Modifier,
-    accountViewModel: AccountViewModel
-) {
-    val myBoxModifier = remember {
-        Modifier.size(size)
-    }
-
-    Box(myBoxModifier, contentAlignment = Alignment.TopEnd) {
-        WatchMetadataAndRenderPictureWithFollwingMark(author, size, pictureModifier, accountViewModel)
-    }
-}
-
-@Composable
-private fun WatchMetadataAndRenderPictureWithFollwingMark(
-    author: User,
-    size: Dp,
-    pictureModifier: Modifier,
-    accountViewModel: AccountViewModel
-) {
-    var profilePicture by remember {
-        mutableStateOf(author.info?.picture)
-    }
-
-    val authorPubKey = remember {
-        author.pubkeyHex
-    }
-
-    WatchUserMetadata(author) {
-        if (it.picture != profilePicture) {
-            profilePicture = it.picture
-        }
-    }
-
-    PictureAndFollowingMark(
-        userHex = authorPubKey,
-        userPicture = profilePicture,
-        size = size,
-        modifier = pictureModifier,
-        accountViewModel = accountViewModel
-    )
-}
-
-@Composable
-fun WatchUserMetadata(userBase: User, onMetadataChanges: (UserMetadata) -> Unit) {
-    val userState by userBase.live().metadata.observeAsState()
-    LaunchedEffect(key1 = userState) {
-        launch(Dispatchers.Default) {
-            userState?.user?.info?.let {
-                launch(Dispatchers.Main) {
-                    onMetadataChanges(it)
+    WatchFollows(author.pubkeyHex, accountViewModel) { isFollowing ->
+        Crossfade(targetState = isFollowing) {
+            if (it) {
+                Box(modifier = Size35Modifier, contentAlignment = Alignment.TopEnd) {
+                    FollowingIcon(Size10dp)
                 }
             }
         }
     }
 }
+
+@Composable
+private fun WatchNoteAuthor(
+    baseNote: Note,
+    onContent: @Composable (User?) -> Unit
+) {
+    val author by baseNote.live().metadata.map {
+        it.note.author
+    }.observeAsState(baseNote.author)
+
+    onContent(author)
+}
+
+@Composable
+private fun WatchUserMetadata(
+    author: User,
+    onNewMetadata: @Composable (String?) -> Unit
+) {
+    val userProfile by author.live().metadata.map {
+        it.user.profilePicture()
+    }.distinctUntilChanged().observeAsState(author.profilePicture())
+
+    onNewMetadata(userProfile)
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/note/NIP05VerificationDisplay.kt

@@ -113,14 +113,11 @@ fun ObserveDisplayNip05Status(baseNote: Note, columnModifier: Modifier = Modifie
 fun ObserveDisplayNip05Status(baseUser: User, columnModifier: Modifier = Modifier) {
     val nip05 by baseUser.live().metadata.map {
         it.user.nip05()
-    }.observeAsState()
+    }.observeAsState(baseUser.nip05())
 
     Crossfade(targetState = nip05, modifier = columnModifier) {
         if (it != null) {
-            val isValid = it.split("@").size == 2
-            if (isValid) {
-                DisplayNIP05Line(it, baseUser, columnModifier)
-            }
+            DisplayNIP05Line(it, baseUser, columnModifier)
         }
     }
 }
@@ -144,7 +141,12 @@ private fun DisplayNIP05(
 ) {
     val uri = LocalUriHandler.current
     val (user, domain) = remember(nip05) {
-        nip05.split("@")
+        val parts = nip05.split("@")
+        if (parts.size == 1) {
+            listOf("_", parts[0])
+        } else {
+            listOf(parts[0], parts[1])
+        }
     }
 
     if (user != "_") {
@@ -204,7 +206,7 @@ fun DisplayNip05ProfileStatus(user: User) {
     val uri = LocalUriHandler.current
 
     user.nip05()?.let { nip05 ->
-        if (nip05.split("@").size == 2) {
+        if (nip05.split("@").size <= 2) {
             val nip05Verified by nip05VerificationAsAState(user.info!!, user.pubkeyHex)
             Row(verticalAlignment = Alignment.CenterVertically) {
                 if (nip05Verified == null) {
@@ -232,9 +234,18 @@ fun DisplayNip05ProfileStatus(user: User) {
 
                 var domainPadStart = 5.dp
 
-                if (nip05.split("@")[0] != "_") {
+                val (user, domain) = remember(nip05) {
+                    val parts = nip05.split("@")
+                    if (parts.size == 1) {
+                        listOf("_", parts[0])
+                    } else {
+                        listOf(parts[0], parts[1])
+                    }
+                }
+
+                if (user != "_") {
                     Text(
-                        text = AnnotatedString(nip05.split("@")[0] + "@"),
+                        text = remember { AnnotatedString(user + "@") },
                         modifier = Modifier.padding(top = 1.dp, bottom = 1.dp, start = 5.dp),
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis
@@ -243,7 +254,7 @@ fun DisplayNip05ProfileStatus(user: User) {
                 }
 
                 ClickableText(
-                    text = AnnotatedString(nip05.split("@")[1]),
+                    text = AnnotatedString(domain),
                     onClick = { nip05.let { runCatching { uri.openUri("https://${it.split("@")[1]}") } } },
                     style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary),
                     modifier = Modifier.padding(top = 1.dp, bottom = 1.dp, start = domainPadStart),

app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt

@@ -61,7 +61,6 @@ import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Alignment.Companion.TopEnd
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.compositeOver
@@ -551,7 +550,7 @@ private fun ClickableNote(
 ) {
     val scope = rememberCoroutineScope()
 
-    val updatedModifier = remember(backgroundColor) {
+    val updatedModifier = remember(backgroundColor.value) {
         modifier
             .combinedClickable(
                 onClick = {
@@ -563,9 +562,7 @@ private fun ClickableNote(
                 },
                 onLongClick = showPopup
             )
-            .drawBehind {
-                drawRect(backgroundColor.value)
-            }
+            .background(backgroundColor.value)
     }
 
     Column(modifier = updatedModifier) {
@@ -605,7 +602,7 @@ fun InnerNoteWithReactions(
                 val (value, elapsed) = measureTimedValue {
                     AuthorAndRelayInformation(baseNote, accountViewModel, nav)
                 }
-                println("AAA Rendering Auth $elapsed - ${baseNote.event?.content()?.take(10)}")
+                Log.d("Rendering Metrics", "Author:   ${baseNote.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed")
             }
             Spacer(modifier = DoubleHorzSpacer)
         }
@@ -625,7 +622,7 @@ fun InnerNoteWithReactions(
                     nav = nav
                 )
             }
-            println("AAA Rendering Body $elapsed - ${baseNote.event?.content()?.take(10)}")
+            Log.d("Rendering Metrics", "TextBody: ${baseNote.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed")
         }
     }
 
@@ -646,7 +643,7 @@ fun InnerNoteWithReactions(
                     nav = nav
                 )
             }
-            println("AAA Rendering Reac $elapsed - ${baseNote.event?.content()?.take(10)}")
+            Log.d("Rendering Metrics", "Reaction: ${baseNote.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed")
         }
     }
 
@@ -830,6 +827,14 @@ fun routeFor(note: Note, loggedIn: User): String? {
     return null
 }
 
+fun routeFor(user: User): String {
+    return "User/${user.pubkeyHex}"
+}
+
+fun authorRouteFor(note: Note): String {
+    return "User/${note.author?.pubkeyHex}"
+}
+
 @Composable
 fun RenderTextEvent(
     note: Note,
@@ -1285,16 +1290,7 @@ fun DisplayRelaySet(
                 modifier = Modifier
                     .align(Alignment.BottomCenter)
                     .fillMaxWidth()
-                    .drawBehind {
-                        drawRect(
-                            Brush.verticalGradient(
-                                colors = listOf(
-                                    backgroundColor.value.copy(alpha = 0f),
-                                    backgroundColor.value
-                                )
-                            )
-                        )
-                    }
+                    .background(getGradient(backgroundColor))
             ) {
                 ShowMoreButton {
                     expanded = !expanded
@@ -1401,16 +1397,7 @@ fun DisplayPeopleList(
                 modifier = Modifier
                     .align(Alignment.BottomCenter)
                     .fillMaxWidth()
-                    .drawBehind {
-                        drawRect(
-                            Brush.verticalGradient(
-                                colors = listOf(
-                                    backgroundColor.value.copy(alpha = 0f),
-                                    backgroundColor.value
-                                )
-                            )
-                        )
-                    }
+                    .background(getGradient(backgroundColor))
             ) {
                 ShowMoreButton {
                     expanded = !expanded
@@ -1610,16 +1597,7 @@ fun PinListHeader(
                 modifier = Modifier
                     .align(Alignment.BottomCenter)
                     .fillMaxWidth()
-                    .drawBehind {
-                        drawRect(
-                            Brush.verticalGradient(
-                                colors = listOf(
-                                    backgroundColor.value.copy(alpha = 0f),
-                                    backgroundColor.value
-                                )
-                            )
-                        )
-                    }
+                    .background(getGradient(backgroundColor))
             ) {
                 ShowMoreButton {
                     expanded = !expanded
@@ -1629,6 +1607,15 @@ fun PinListHeader(
     }
 }
 
+fun getGradient(backgroundColor: MutableState<Color>): Brush {
+    return Brush.verticalGradient(
+        colors = listOf(
+            backgroundColor.value.copy(alpha = 0f),
+            backgroundColor.value
+        )
+    )
+}
+
 @Composable
 private fun RenderAudioTrack(
     note: Note,
@@ -2009,7 +1996,7 @@ private fun ChannelNotePicture(baseChannel: Channel) {
             .width(30.dp)
             .height(30.dp)
             .clip(shape = CircleShape)
-            .drawBehind { drawRect(backgroundColor) }
+            .background(backgroundColor)
             .border(
                 2.dp,
                 backgroundColor,
@@ -2081,9 +2068,7 @@ fun DisplayHighlight(
         nav
     )
 
-    authorHex?.let {
-        DisplayQuoteAuthor(authorHex, url, nav)
-    }
+    DisplayQuoteAuthor(authorHex ?: "", url, nav)
 }
 
 @Composable
@@ -2105,7 +2090,7 @@ private fun DisplayQuoteAuthor(
         }
     }
 
-    Row() {
+    Row {
         userBase?.let { userBase ->
             LoadAndDisplayUser(userBase, nav)
         }
@@ -3036,14 +3021,14 @@ fun NoteAuthorPicture(
 }
 
 @Composable
-private fun DisplayBlankAuthor(size: Dp, modifier: Modifier) {
+fun DisplayBlankAuthor(size: Dp, modifier: Modifier = Modifier) {
     val backgroundColor = MaterialTheme.colors.background
 
     val nullModifier = remember {
         modifier
             .size(size)
             .clip(shape = CircleShape)
-            .drawBehind { drawRect(backgroundColor) }
+            .background(backgroundColor)
     }
 
     RobohashAsyncImage(
@@ -3161,16 +3146,14 @@ fun BaseUserPicture(
         Modifier.size(size)
     }
 
-    Crossfade(targetState = userProfile) {
-        Box(myBoxModifier, contentAlignment = TopEnd) {
-            PictureAndFollowingMark(
-                userHex = userPubkey,
-                userPicture = it,
-                size = size,
-                modifier = modifier,
-                accountViewModel = accountViewModel
-            )
-        }
+    Box(myBoxModifier, contentAlignment = TopEnd) {
+        PictureAndFollowingMark(
+            userHex = userPubkey,
+            userPicture = userProfile,
+            size = size,
+            modifier = modifier,
+            accountViewModel = accountViewModel
+        )
     }
 }
 
@@ -3187,7 +3170,7 @@ fun PictureAndFollowingMark(
         modifier
             .size(size)
             .clip(shape = CircleShape)
-            .drawBehind { drawRect(backgroundColor) }
+            .background(backgroundColor)
     }
 
     RobohashAsyncImageProxy(
@@ -3207,53 +3190,41 @@ fun PictureAndFollowingMark(
 }
 
 @Composable
-private fun ObserveAndDisplayFollowingMark(userHex: String, iconSize: Dp, accountViewModel: AccountViewModel) {
-    val showFollowingMark by accountViewModel.userFollows.map {
-        it.user.isFollowingCached(userHex) || (userHex == accountViewModel.account.userProfile().pubkeyHex)
-    }.distinctUntilChanged().observeAsState(
-        accountViewModel.account.userProfile().isFollowingCached(userHex) || (userHex == accountViewModel.account.userProfile().pubkeyHex)
-    )
-
-    Crossfade(targetState = showFollowingMark) {
-        if (it) {
-            Box(contentAlignment = TopEnd) {
-                FollowingIcon(iconSize)
+fun ObserveAndDisplayFollowingMark(userHex: String, iconSize: Dp, accountViewModel: AccountViewModel) {
+    WatchFollows(userHex, accountViewModel) {
+        Crossfade(targetState = it) {
+            if (it) {
+                Box(contentAlignment = TopEnd) {
+                    FollowingIcon(iconSize)
+                }
             }
         }
     }
 }
 
 @Composable
-private fun FollowingIcon(iconSize: Dp) {
-    val myIconBoxModifier = remember {
+fun WatchFollows(userHex: String, accountViewModel: AccountViewModel, onFollowChanges: @Composable (Boolean) -> Unit) {
+    val showFollowingMark by accountViewModel.userFollows.map {
+        it.user.isFollowingCached(userHex) || (userHex == accountViewModel.account.userProfile().pubkeyHex)
+    }.distinctUntilChanged().observeAsState(
+        accountViewModel.account.userProfile().isFollowingCached(userHex) || (userHex == accountViewModel.account.userProfile().pubkeyHex)
+    )
+
+    onFollowChanges(showFollowingMark)
+}
+
+@Composable
+fun FollowingIcon(iconSize: Dp) {
+    val modifier = remember {
         Modifier.size(iconSize)
     }
 
-    Box(myIconBoxModifier, contentAlignment = Alignment.Center) {
-        val backgroundColor = MaterialTheme.colors.background
-
-        val myIconBackgroundModifier = remember {
-            Modifier
-                .clip(CircleShape)
-                .size(iconSize.times(0.6f))
-                .drawBehind { drawRect(backgroundColor) }
-        }
-
-        Box(
-            myIconBackgroundModifier
-        )
-
-        val myIconModifier = remember {
-            Modifier.size(iconSize)
-        }
-
-        Icon(
-            painter = painterResource(R.drawable.ic_verified),
-            stringResource(id = R.string.following),
-            modifier = myIconModifier,
-            tint = Following
-        )
-    }
+    Icon(
+        painter = painterResource(R.drawable.ic_verified),
+        stringResource(id = R.string.following),
+        modifier = modifier,
+        tint = Following
+    )
 }
 
 @Immutable

app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt

@@ -1,11 +1,17 @@
 package com.vitorpamplona.amethyst.ui.note
 
 import android.content.Context
+import android.util.Log
 import android.widget.Toast
 import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedContentScope
+import androidx.compose.animation.ContentTransform
 import androidx.compose.animation.Crossfade
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
 import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
 import androidx.compose.animation.with
@@ -112,6 +118,8 @@ import kotlinx.coroutines.launch
 import java.math.BigDecimal
 import java.math.RoundingMode
 import kotlin.math.roundToInt
+import kotlin.time.ExperimentalTime
+import kotlin.time.measureTimedValue
 
 @Composable
 fun ReactionsRow(
@@ -137,6 +145,7 @@ fun ReactionsRow(
     Spacer(modifier = HalfDoubleVertSpacer)
 }
 
+@OptIn(ExperimentalTime::class)
 @Composable
 private fun InnerReactionRow(
     baseNote: Note,
@@ -163,49 +172,69 @@ private fun InnerReactionRow(
             verticalArrangement = Arrangement.Center,
             modifier = remember { Modifier.weight(1f) }
         ) {
-            Row(verticalAlignment = CenterVertically) {
-                ReplyReactionWithDialog(baseNote, MaterialTheme.colors.placeholderText, accountViewModel, nav)
+            val (value, elapsed) = measureTimedValue {
+                Row(verticalAlignment = CenterVertically) {
+                    ReplyReactionWithDialog(baseNote, MaterialTheme.colors.placeholderText, accountViewModel, nav)
+                }
             }
+            Log.d("Rendering Metrics", "Reaction Reply: ${baseNote.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed")
         }
 
         Column(
             verticalArrangement = Arrangement.Center,
             modifier = remember { Modifier.weight(1f) }
         ) {
-            Row(verticalAlignment = CenterVertically) {
-                BoostWithDialog(baseNote, MaterialTheme.colors.placeholderText, accountViewModel, nav)
+            val (value, elapsed) = measureTimedValue {
+                Row(verticalAlignment = CenterVertically) {
+                    BoostWithDialog(
+                        baseNote,
+                        MaterialTheme.colors.placeholderText,
+                        accountViewModel,
+                        nav
+                    )
+                }
             }
+            Log.d("Rendering Metrics", "Reaction Boost: ${baseNote.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed")
         }
 
         Column(
             verticalArrangement = Arrangement.Center,
             modifier = remember { Modifier.weight(1f) }
         ) {
-            Row(verticalAlignment = CenterVertically) {
-                LikeReaction(baseNote, MaterialTheme.colors.placeholderText, accountViewModel)
+            val (value, elapsed) = measureTimedValue {
+                Row(verticalAlignment = CenterVertically) {
+                    LikeReaction(baseNote, MaterialTheme.colors.placeholderText, accountViewModel)
+                }
             }
+            Log.d("Rendering Metrics", "Reaction Likes: ${baseNote.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed")
         }
 
         Column(
             verticalArrangement = Arrangement.Center,
             modifier = remember { Modifier.weight(1f) }
         ) {
-            Row(verticalAlignment = CenterVertically) {
-                ZapReaction(baseNote, MaterialTheme.colors.placeholderText, accountViewModel)
+            val (value, elapsed) = measureTimedValue {
+                Row(verticalAlignment = CenterVertically) {
+                    ZapReaction(baseNote, MaterialTheme.colors.placeholderText, accountViewModel)
+                }
             }
+            Log.d("Rendering Metrics", "Reaction Zaps:  ${baseNote.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed")
         }
 
         Column(
             verticalArrangement = Arrangement.Center,
             modifier = remember { Modifier.weight(1f) }
         ) {
-            Row(verticalAlignment = CenterVertically) {
-                ViewCountReaction(
-                    note = baseNote,
-                    grayTint = MaterialTheme.colors.placeholderText,
-                    viewCountColorFilter = MaterialTheme.colors.placeholderTextColorFilter
-                )
+            val (value, elapsed) = measureTimedValue {
+                Row(verticalAlignment = CenterVertically) {
+                    ViewCountReaction(
+                        note = baseNote,
+                        grayTint = MaterialTheme.colors.placeholderText,
+                        viewCountColorFilter = MaterialTheme.colors.placeholderTextColorFilter
+                    )
+                }
             }
+            Log.d("Rendering Metrics", "Reaction Views: ${baseNote.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed")
         }
     }
 }
@@ -419,7 +448,6 @@ private fun ReactionDetailGallery(
                 if (hasBoostEvents) {
                     RenderBoostGallery(
                         boostEvents,
-                        backgroundColor,
                         nav,
                         accountViewModel
                     )
@@ -431,7 +459,6 @@ private fun ReactionDetailGallery(
                         RenderLikeGallery(
                             it.key,
                             reactions,
-                            backgroundColor,
                             nav,
                             accountViewModel
                         )
@@ -494,16 +521,10 @@ fun ReplyReaction(
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
 
-    val iconButtonModifier = remember {
-        Modifier.size(iconSize)
-    }
-
-    val iconModifier = remember {
-        Modifier.size(iconSize)
-    }
-
     IconButton(
-        modifier = iconButtonModifier,
+        modifier = remember {
+            Modifier.size(iconSize)
+        },
         onClick = {
             if (accountViewModel.isWriteable()) {
                 onPress()
@@ -520,8 +541,8 @@ fun ReplyReaction(
     ) {
         Icon(
             painter = painterResource(R.drawable.ic_comment),
-            null,
-            modifier = iconModifier,
+            contentDescription = null,
+            modifier = remember { Modifier.size(iconSize) },
             tint = grayTint
         )
     }
@@ -540,23 +561,29 @@ fun ReplyCounter(baseNote: Note, textColor: Color) {
     SlidingAnimation(repliesState, textColor)
 }
 
-@Composable
 @OptIn(ExperimentalAnimationApi::class)
+@Composable
 private fun SlidingAnimation(baseCount: Int, textColor: Color) {
     AnimatedContent<Int>(
         targetState = baseCount,
-        transitionSpec = {
-            if (targetState > initialState) {
-                slideInVertically { -it } with slideOutVertically { it }
-            } else {
-                slideInVertically { it } with slideOutVertically { -it }
-            }
-        }
+        transitionSpec = AnimatedContentScope<Int>::transitionSpec
     ) { count ->
         TextCount(count, textColor)
     }
 }
 
+@OptIn(ExperimentalAnimationApi::class)
+private fun <S> AnimatedContentScope<S>.transitionSpec(): ContentTransform {
+    return slideAnimation
+}
+
+@ExperimentalAnimationApi
+val slideAnimation: ContentTransform = slideInVertically(animationSpec = tween(durationMillis = 100)) { height -> height } + fadeIn(
+    animationSpec = tween(durationMillis = 100)
+) with slideOutVertically(animationSpec = tween(durationMillis = 100)) { height -> -height } + fadeOut(
+    animationSpec = tween(durationMillis = 100)
+)
+
 @Composable
 private fun TextCount(count: Int, textColor: Color) {
     Text(
@@ -571,15 +598,9 @@ private fun TextCount(count: Int, textColor: Color) {
 @Composable
 @OptIn(ExperimentalAnimationApi::class)
 private fun SlidingAnimation(amount: String, textColor: Color) {
-    AnimatedContent<String>(
+    AnimatedContent(
         targetState = amount,
-        transitionSpec = {
-            if (targetState > initialState) {
-                slideInVertically { -it } with slideOutVertically { it }
-            } else {
-                slideInVertically { it } with slideOutVertically { -it }
-            }
-        }
+        transitionSpec = AnimatedContentScope<String>::transitionSpec
     ) { count ->
         Text(
             text = count,

app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserReactionsRow.kt

@@ -5,7 +5,6 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
@@ -50,6 +49,9 @@ import com.vitorpamplona.amethyst.ui.components.BundledInsert
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.showAmountAxis
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
 import com.vitorpamplona.amethyst.ui.theme.RoyalBlue
+import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
+import com.vitorpamplona.amethyst.ui.theme.Size24Modifier
+import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -82,7 +84,7 @@ fun UserReactionsRow(
             Icon(
                 imageVector = Icons.Default.ExpandMore,
                 null,
-                modifier = Modifier.size(20.dp),
+                modifier = Size20Modifier,
                 tint = MaterialTheme.colors.placeholderText
             )
         }
@@ -163,6 +165,8 @@ class UserReactionsViewModel(val account: Account) : ViewModel() {
     fun today() = sdf.format(LocalDateTime.now())
 
     private suspend fun initializeSuspend() {
+        checkNotInMainThread()
+
         val currentUser = user.pubkeyHex
 
         val reactions = mutableMapOf<String, Int>()
@@ -212,6 +216,8 @@ class UserReactionsViewModel(val account: Account) : ViewModel() {
     }
 
     suspend fun addToStatsSuspend(newNotes: Set<Note>) {
+        checkNotInMainThread()
+
         val currentUser = user.pubkeyHex
 
         val reactions = this._reactions.value.toMutableMap()
@@ -268,6 +274,8 @@ class UserReactionsViewModel(val account: Account) : ViewModel() {
     }
 
     private suspend fun refreshChartModel() {
+        checkNotInMainThread()
+
         val day = 24 * 60 * 60L
         val now = LocalDateTime.now()
         val displayAxisFormatter = DateTimeFormatter.ofPattern("EEE")
@@ -337,11 +345,11 @@ fun UserReplyReaction(
     Icon(
         painter = painterResource(R.drawable.ic_comment),
         null,
-        modifier = Modifier.size(20.dp),
+        modifier = Size20Modifier,
         tint = RoyalBlue
     )
 
-    Spacer(modifier = Modifier.width(10.dp))
+    Spacer(modifier = StdHorzSpacer)
 
     Text(
         showCounts,
@@ -359,11 +367,11 @@ fun UserBoostReaction(
     Icon(
         painter = painterResource(R.drawable.ic_retweeted),
         null,
-        modifier = Modifier.size(24.dp),
+        modifier = Size24Modifier,
         tint = Color.Unspecified
     )
 
-    Spacer(modifier = Modifier.width(10.dp))
+    Spacer(modifier = StdHorzSpacer)
 
     Text(
         showCounts,
@@ -381,14 +389,14 @@ fun UserLikeReaction(
     Icon(
         painter = painterResource(R.drawable.ic_liked),
         null,
-        modifier = Modifier.size(20.dp),
+        modifier = Size20Modifier,
         tint = Color.Unspecified
     )
 
-    Spacer(modifier = Modifier.width(10.dp))
+    Spacer(modifier = StdHorzSpacer)
 
     Text(
-        showCounts,
+        text = showCounts,
         fontWeight = FontWeight.Bold,
         fontSize = 18.sp
     )
@@ -401,7 +409,7 @@ fun UserZapReaction(
     Icon(
         imageVector = Icons.Default.Bolt,
         contentDescription = stringResource(R.string.zaps),
-        modifier = Modifier.size(24.dp),
+        modifier = Size24Modifier,
         tint = BitcoinOrange
     )
 

app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapNoteCompose.kt

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import android.widget.Toast
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -19,10 +20,12 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
@@ -194,6 +197,7 @@ fun ShowFollowingOrUnfollowingButton(
     accountViewModel: AccountViewModel
 ) {
     val scope = rememberCoroutineScope()
+    val context = LocalContext.current
 
     var isFollowing by remember { mutableStateOf(false) }
     val accountFollowsState by accountViewModel.account.userProfile().live().follows.observeAsState()
@@ -210,9 +214,41 @@ fun ShowFollowingOrUnfollowingButton(
     }
 
     if (isFollowing) {
-        UnfollowButton { scope.launch(Dispatchers.IO) { accountViewModel.unfollow(baseAuthor) } }
+        UnfollowButton {
+            if (!accountViewModel.isWriteable()) {
+                scope.launch {
+                    Toast
+                        .makeText(
+                            context,
+                            context.getString(R.string.login_with_a_private_key_to_be_able_to_unfollow),
+                            Toast.LENGTH_SHORT
+                        )
+                        .show()
+                }
+            } else {
+                scope.launch(Dispatchers.IO) {
+                    accountViewModel.unfollow(baseAuthor)
+                }
+            }
+        }
     } else {
-        FollowButton({ scope.launch(Dispatchers.IO) { accountViewModel.follow(baseAuthor) } })
+        FollowButton {
+            if (!accountViewModel.isWriteable()) {
+                scope.launch {
+                    Toast
+                        .makeText(
+                            context,
+                            context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
+                            Toast.LENGTH_SHORT
+                        )
+                        .show()
+                }
+            } else {
+                scope.launch(Dispatchers.IO) {
+                    accountViewModel.follow(baseAuthor)
+                }
+            }
+        }
     }
 }
 

app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapUserSetCompose.kt

@@ -21,7 +21,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.res.stringResource
@@ -60,9 +59,7 @@ fun ZapUserSetCompose(zapSetCard: ZapUserSetCard, isInnerNote: Boolean = false,
 
     Column(
         modifier = Modifier
-            .drawBehind {
-                drawRect(backgroundColor.value)
-            }
+            .background(backgroundColor.value)
             .clickable {
                 nav("User/${zapSetCard.user.pubkeyHex}")
             }

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt

@@ -184,7 +184,7 @@ open class CardFeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel() {
                 .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
                 .reversed()
 
-            singleList.chunked(50).map { chunk ->
+            singleList.chunked(30).map { chunk ->
                 MultiSetCard(
                     baseNote,
                     boostsInCard.filter { it in chunk }.toImmutableList(),

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomListFeedView.kt

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.screen
 
+import android.util.Log
 import androidx.compose.animation.Crossfade
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.layout.PaddingValues
@@ -18,6 +19,8 @@ import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.ui.note.ChatroomCompose
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import kotlin.time.ExperimentalTime
+import kotlin.time.measureTimedValue
 
 @Composable
 fun ChatroomListFeedView(
@@ -68,6 +71,7 @@ private fun CrossFadeState(
     }
 }
 
+@OptIn(ExperimentalTime::class)
 @Composable
 private fun FeedLoaded(
     state: FeedState.Loaded,
@@ -108,11 +112,14 @@ private fun FeedLoaded(
             key = { index, item -> if (index == 0) index else item.idHex }
         ) { _, item ->
             Row(Modifier.fillMaxWidth()) {
-                ChatroomCompose(
-                    item,
-                    accountViewModel = accountViewModel,
-                    nav = nav
-                )
+                val (value, elapsed) = measureTimedValue {
+                    ChatroomCompose(
+                        item,
+                        accountViewModel = accountViewModel,
+                        nav = nav
+                    )
+                }
+                Log.d("Rendering Metrics", "Chat Header Complete: ${item.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed")
             }
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedView.kt

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.screen
 
+import android.util.Log
 import androidx.compose.animation.Crossfade
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.ExperimentalFoundationApi
@@ -215,7 +216,7 @@ private fun FeedLoaded(
                 }
             }
 
-            println("AAA Rendering $elapsed - ${item.event?.content()?.take(10)}")
+            Log.d("Rendering Metrics", "Complete: ${item.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed")
         }
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt

@@ -22,7 +22,6 @@ import com.vitorpamplona.amethyst.ui.dal.ChatroomFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.ChatroomListKnownFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.ChatroomListNewFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.FeedFilter
-import com.vitorpamplona.amethyst.ui.dal.GlobalFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.HashtagFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.HomeConversationsFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.HomeLiveActivitiesFeedFilter
@@ -59,13 +58,6 @@ class NostrChatroomFeedViewModel(val user: User, val account: Account) : FeedVie
     }
 }
 
-class NostrGlobalFeedViewModel(val account: Account) : FeedViewModel(GlobalFeedFilter(account)) {
-    class Factory(val account: Account) : ViewModelProvider.Factory {
-        override fun <NostrGlobalFeedViewModel : ViewModel> create(modelClass: Class<NostrGlobalFeedViewModel>): NostrGlobalFeedViewModel {
-            return NostrGlobalFeedViewModel(account) as NostrGlobalFeedViewModel
-        }
-    }
-}
 class NostrVideoFeedViewModel(val account: Account) : FeedViewModel(VideoFeedFilter(account)) {
     class Factory(val account: Account) : ViewModelProvider.Factory {
         override fun <NostrVideoFeedViewModel : ViewModel> create(modelClass: Class<NostrVideoFeedViewModel>): NostrVideoFeedViewModel {
@@ -201,8 +193,8 @@ abstract class FeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel(), I
     fun refreshSuspended() {
         checkNotInMainThread()
 
-        val notes = localFilter.loadTop().toImmutableList()
         lastFeedKey = localFilter.feedKey()
+        val notes = localFilter.loadTop().toImmutableList()
 
         val oldNotesState = _feedContent.value
         if (oldNotesState is FeedState.Loaded) {
@@ -231,16 +223,14 @@ abstract class FeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel(), I
 
     fun refreshFromOldState(newItems: Set<Note>) {
         val oldNotesState = _feedContent.value
-        if (localFilter is AdditiveFeedFilter) {
+        if (localFilter is AdditiveFeedFilter && lastFeedKey != localFilter.feedKey()) {
             if (oldNotesState is FeedState.Loaded) {
                 val newList = localFilter.updateListWith(oldNotesState.feed.value, newItems.toSet()).toImmutableList()
-                lastFeedKey = localFilter.feedKey()
                 if (!equalImmutableLists(newList, oldNotesState.feed.value)) {
                     updateFeed(newList)
                 }
             } else if (oldNotesState is FeedState.Empty) {
                 val newList = localFilter.updateListWith(emptyList(), newItems.toSet()).toImmutableList()
-                lastFeedKey = localFilter.feedKey()
                 if (newList.isNotEmpty()) {
                     updateFeed(newList)
                 }

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt

@@ -18,6 +18,7 @@ import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
@@ -53,11 +54,11 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.graphics.takeOrElse
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
@@ -88,6 +89,7 @@ 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.components.RobohashAsyncImageProxy
 import com.vitorpamplona.amethyst.ui.components.ZoomableContentView
 import com.vitorpamplona.amethyst.ui.components.ZoomableUrlVideo
 import com.vitorpamplona.amethyst.ui.navigation.Route
@@ -585,30 +587,30 @@ fun ChannelHeader(
 
         Column(modifier = modifier) {
             Row(verticalAlignment = Alignment.CenterVertically) {
-                channel.creator?.let {
-                    UserPicture(
-                        user = it,
-                        size = Size35dp,
-                        accountViewModel = accountViewModel,
-                        nav = nav
-                    )
+                if (channel is LiveActivitiesChannel) {
+                    channel.creator?.let {
+                        UserPicture(
+                            user = it,
+                            size = Size35dp,
+                            accountViewModel = accountViewModel,
+                            nav = nav
+                        )
+                    }
+                } else {
+                    channel.profilePicture()?.let {
+                        RobohashAsyncImageProxy(
+                            robot = channel.idHex,
+                            model = it,
+                            contentDescription = stringResource(R.string.profile_image),
+                            contentScale = ContentScale.Crop,
+                            modifier = Modifier.padding(start = 10.dp)
+                                .width(Size35dp)
+                                .height(Size35dp)
+                                .clip(shape = CircleShape)
+                        )
+                    }
                 }
 
-                /*
-                channel.profilePicture()?.let {
-                    RobohashAsyncImageProxy(
-                        robot = channel.idHex,
-                        model = it,
-                        contentDescription = stringResource(R.string.profile_image),
-                        contentScale = ContentScale.Crop,
-                        modifier = Modifier.padding(start = 10.dp)
-                            .width(Size35dp)
-                            .height(Size35dp)
-                            .clip(shape = CircleShape)
-                    )
-                }
-                 */
-
                 Column(
                     modifier = Modifier
                         .padding(start = 10.dp)
@@ -633,7 +635,7 @@ fun ChannelHeader(
                             Text(
                                 text = summary,
                                 color = MaterialTheme.colors.placeholderText,
-                                maxLines = 2,
+                                maxLines = 1,
                                 overflow = TextOverflow.Ellipsis,
                                 fontSize = 12.sp
                             )
@@ -734,7 +736,7 @@ fun LiveFlag() {
         modifier = remember {
             Modifier
                 .clip(SmallBorder)
-                .drawBehind { drawRect(Color.Red) }
+                .background(Color.Red)
                 .padding(horizontal = 5.dp)
         }
     )
@@ -749,7 +751,7 @@ fun EndedFlag() {
         modifier = remember {
             Modifier
                 .clip(SmallBorder)
-                .drawBehind { drawRect(Color.Black) }
+                .background(Color.Black)
                 .padding(horizontal = 5.dp)
         }
     )
@@ -764,7 +766,7 @@ fun OfflineFlag() {
         modifier = remember {
             Modifier
                 .clip(SmallBorder)
-                .drawBehind { drawRect(Color.Black) }
+                .background(Color.Black)
                 .padding(horizontal = 5.dp)
         }
     )
@@ -779,7 +781,7 @@ fun ScheduledFlag() {
         modifier = remember {
             Modifier
                 .clip(SmallBorder)
-                .drawBehind { drawRect(Color.Black) }
+                .background(Color.Black)
                 .padding(horizontal = 5.dp)
         }
     )

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ConnectOrbotDialog.kt

@@ -34,8 +34,8 @@ import com.halilibo.richtext.markdown.Markdown
 import com.halilibo.richtext.ui.material.MaterialRichText
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.actions.CloseButton
-import com.vitorpamplona.amethyst.ui.components.richTextDefaults
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
+import com.vitorpamplona.amethyst.ui.theme.RichTextDefaults
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import kotlinx.coroutines.launch
 
@@ -86,8 +86,8 @@ fun ConnectOrbotDialog(onClose: () -> Unit, onPost: () -> Unit, portNumber: Muta
                 Column(
                     modifier = Modifier.padding(30.dp)
                 ) {
-                    val myMarkDownStyle = richTextDefaults.copy(
-                        stringStyle = richTextDefaults.stringStyle?.copy(
+                    val myMarkDownStyle = RichTextDefaults.copy(
+                        stringStyle = RichTextDefaults.stringStyle?.copy(
                             linkStyle = SpanStyle(
                                 textDecoration = TextDecoration.Underline,
                                 color = MaterialTheme.colors.primary

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HashtagScreen.kt

@@ -1,5 +1,7 @@
 package com.vitorpamplona.amethyst.ui.screen.loggedIn
 
+import android.widget.Toast
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -18,12 +20,14 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.viewmodel.compose.viewModel
+import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.service.NostrHashtagDataSource
 import com.vitorpamplona.amethyst.ui.dal.HashtagFeedFilter
 import com.vitorpamplona.amethyst.ui.screen.NostrHashtagFeedViewModel
@@ -85,8 +89,10 @@ fun HashtagScreen(tag: String?, accountViewModel: AccountViewModel, nav: (String
 }
 
 @Composable
-fun HashtagHeader(tag: String, account: AccountViewModel) {
-    Column() {
+fun HashtagHeader(tag: String, account: AccountViewModel, onClick: () -> Unit = { }) {
+    Column(
+        Modifier.clickable { onClick() }
+    ) {
         Column(modifier = Modifier.padding(12.dp)) {
             Row(verticalAlignment = Alignment.CenterVertically) {
                 Column(
@@ -123,7 +129,8 @@ private fun HashtagActionOptions(
     tag: String,
     accountViewModel: AccountViewModel
 ) {
-    val coroutineScope = rememberCoroutineScope()
+    val scope = rememberCoroutineScope()
+    val context = LocalContext.current
 
     val userState by accountViewModel.userProfile().live().follows.observeAsState()
     val isFollowingTag by remember(userState) {
@@ -133,8 +140,40 @@ private fun HashtagActionOptions(
     }
 
     if (isFollowingTag) {
-        UnfollowButton { coroutineScope.launch(Dispatchers.IO) { accountViewModel.account.unfollow(tag) } }
+        UnfollowButton {
+            if (!accountViewModel.isWriteable()) {
+                scope.launch {
+                    Toast
+                        .makeText(
+                            context,
+                            context.getString(R.string.login_with_a_private_key_to_be_able_to_unfollow),
+                            Toast.LENGTH_SHORT
+                        )
+                        .show()
+                }
+            } else {
+                scope.launch(Dispatchers.IO) {
+                    accountViewModel.account.unfollow(tag)
+                }
+            }
+        }
     } else {
-        FollowButton({ coroutineScope.launch(Dispatchers.IO) { accountViewModel.account.follow(tag) } })
+        FollowButton {
+            if (!accountViewModel.isWriteable()) {
+                scope.launch {
+                    Toast
+                        .makeText(
+                            context,
+                            context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
+                            Toast.LENGTH_SHORT
+                        )
+                        .show()
+                }
+            } else {
+                scope.launch(Dispatchers.IO) {
+                    accountViewModel.account.follow(tag)
+                }
+            }
+        }
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/MainScreen.kt

@@ -38,13 +38,11 @@ import com.vitorpamplona.amethyst.ui.navigation.AppNavigation
 import com.vitorpamplona.amethyst.ui.navigation.AppTopBar
 import com.vitorpamplona.amethyst.ui.navigation.DrawerContent
 import com.vitorpamplona.amethyst.ui.navigation.Route
-import com.vitorpamplona.amethyst.ui.navigation.currentRoute
 import com.vitorpamplona.amethyst.ui.note.UserReactionsViewModel
 import com.vitorpamplona.amethyst.ui.screen.AccountState
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrChatroomListKnownFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrChatroomListNewFeedViewModel
-import com.vitorpamplona.amethyst.ui.screen.NostrGlobalFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrHomeFeedLiveActivitiesViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrHomeFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrHomeRepliesFeedViewModel
@@ -95,11 +93,6 @@ fun MainScreen(accountViewModel: AccountViewModel, accountStateViewModel: Accoun
         factory = NostrHomeFeedLiveActivitiesViewModel.Factory(accountViewModel.account)
     )
 
-    val searchFeedViewModel: NostrGlobalFeedViewModel = viewModel(
-        key = accountViewModel.userProfile().pubkeyHex + "NostrGlobalFeedViewModel",
-        factory = NostrGlobalFeedViewModel.Factory(accountViewModel.account)
-    )
-
     val videoFeedViewModel: NostrVideoFeedViewModel = viewModel(
         key = accountViewModel.userProfile().pubkeyHex + "NostrVideoFeedViewModel",
         factory = NostrVideoFeedViewModel.Factory(accountViewModel.account)
@@ -140,9 +133,6 @@ fun MainScreen(accountViewModel: AccountViewModel, accountStateViewModel: Accoun
                         homeFeedViewModel.sendToTop()
                         repliesFeedViewModel.sendToTop()
                     }
-                    Route.Search.base -> {
-                        searchFeedViewModel.sendToTop()
-                    }
                     Route.Video.base -> {
                         videoFeedViewModel.sendToTop()
                     }
@@ -193,7 +183,6 @@ fun MainScreen(accountViewModel: AccountViewModel, accountStateViewModel: Accoun
                     liveActivitiesViewModel,
                     knownFeedViewModel,
                     newFeedViewModel,
-                    searchFeedViewModel,
                     videoFeedViewModel,
                     notifFeedViewModel,
                     userReactionsStatsModel,

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt

@@ -25,7 +25,6 @@ import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
@@ -384,7 +383,7 @@ private fun RenderScreen(
             CreateAndRenderTabs(baseUser, pagerState)
         }
         HorizontalPager(
-            pageCount = 8,
+            pageCount = 9,
             state = pagerState,
             modifier = pagerModifier
         ) { page ->
@@ -426,8 +425,9 @@ private fun CreateAndRenderPages(
         3 -> TabFollowers(baseUser, followersFeedViewModel, accountViewModel, nav)
         4 -> TabReceivedZaps(baseUser, zapFeedViewModel, accountViewModel, nav)
         5 -> TabBookmarks(bookmarksFeedViewModel, accountViewModel, nav)
-        6 -> TabReports(baseUser, reportsFeedViewModel, accountViewModel, nav)
-        7 -> TabRelays(baseUser, accountViewModel, nav)
+        6 -> TabFollowedTags(baseUser, accountViewModel, nav)
+        7 -> TabReports(baseUser, reportsFeedViewModel, accountViewModel, nav)
+        8 -> TabRelays(baseUser, accountViewModel, nav)
     }
 }
 
@@ -446,6 +446,7 @@ private fun CreateAndRenderTabs(
         { FollowersTabHeader(baseUser) },
         { ZapTabHeader(baseUser) },
         { BookmarkTabHeader(baseUser) },
+        { FollowedTagsTabHeader(baseUser) },
         { ReportsTabHeader(baseUser) },
         { RelaysTabHeader(baseUser) }
     )
@@ -490,6 +491,25 @@ private fun ReportsTabHeader(baseUser: User) {
     Text(text = "$userReports ${stringResource(R.string.reports)}")
 }
 
+@Composable
+private fun FollowedTagsTabHeader(baseUser: User) {
+    var usertags by remember { mutableStateOf(0) }
+
+    LaunchedEffect(key1 = baseUser) {
+        launch(Dispatchers.IO) {
+            val contactList = baseUser?.latestContactList
+
+            val newTags = (contactList?.verifiedFollowTagSet?.count() ?: 0)
+
+            if (newTags != usertags) {
+                usertags = newTags
+            }
+        }
+    }
+
+    Text(text = "$usertags ${stringResource(R.string.followed_tags)}")
+}
+
 @Composable
 private fun BookmarkTabHeader(baseUser: User) {
     val userState by baseUser.live().bookmarks.observeAsState()
@@ -678,6 +698,7 @@ private fun ProfileActions(
     accountViewModel: AccountViewModel
 ) {
     val scope = rememberCoroutineScope()
+    val context = LocalContext.current
 
     val accountLocalUserState by accountViewModel.accountLiveData.observeAsState()
     val account = remember(accountLocalUserState) { accountLocalUserState?.account } ?: return
@@ -714,18 +735,60 @@ private fun ProfileActions(
             account.showUser(baseUser.pubkeyHex)
         }
     } else if (isLoggedInFollowingUser) {
-        UnfollowButton { scope.launch(Dispatchers.IO) { account.unfollow(baseUser) } }
+        UnfollowButton {
+            if (!accountViewModel.isWriteable()) {
+                scope.launch {
+                    Toast
+                        .makeText(
+                            context,
+                            context.getString(R.string.login_with_a_private_key_to_be_able_to_unfollow),
+                            Toast.LENGTH_SHORT
+                        )
+                        .show()
+                }
+            } else {
+                scope.launch(Dispatchers.IO) {
+                    account.unfollow(baseUser)
+                }
+            }
+        }
     } else {
         if (isUserFollowingLoggedIn) {
-            FollowButton(
-                { scope.launch(Dispatchers.IO) { account.follow(baseUser) } },
-                R.string.follow_back
-            )
+            FollowButton(R.string.follow_back) {
+                if (!accountViewModel.isWriteable()) {
+                    scope.launch {
+                        Toast
+                            .makeText(
+                                context,
+                                context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
+                                Toast.LENGTH_SHORT
+                            )
+                            .show()
+                    }
+                } else {
+                    scope.launch(Dispatchers.IO) {
+                        account.follow(baseUser)
+                    }
+                }
+            }
         } else {
-            FollowButton(
-                { scope.launch(Dispatchers.IO) { account.follow(baseUser) } },
-                R.string.follow
-            )
+            FollowButton(R.string.follow) {
+                if (!accountViewModel.isWriteable()) {
+                    scope.launch {
+                        Toast
+                            .makeText(
+                                context,
+                                context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
+                                Toast.LENGTH_SHORT
+                            )
+                            .show()
+                    }
+                } else {
+                    scope.launch(Dispatchers.IO) {
+                        account.follow(baseUser)
+                    }
+                }
+            }
         }
     }
 }
@@ -1168,7 +1231,7 @@ private fun WatchAndRenderBadgeImage(
                 pictureModifier
                     .width(size)
                     .height(size)
-                    .drawBehind { drawRect(bgColor) }
+                    .background(bgColor)
             }
         )
     } else {
@@ -1181,7 +1244,7 @@ private fun WatchAndRenderBadgeImage(
                     .width(size)
                     .height(size)
                     .clip(shape = CircleShape)
-                    .drawBehind { drawRect(bgColor) }
+                    .background(bgColor)
                     .run {
                         if (onClick != null) {
                             this.clickable(onClick = { onClick(eventId) })
@@ -1277,6 +1340,27 @@ fun TabNotesConversations(feedViewModel: NostrUserProfileConversationsFeedViewMo
     }
 }
 
+@Composable
+fun TabFollowedTags(baseUser: User, account: AccountViewModel, nav: (String) -> Unit) {
+    Column(Modifier.fillMaxHeight()) {
+        Column(
+            modifier = Modifier.padding(vertical = 0.dp)
+        ) {
+            baseUser.latestContactList?.let {
+                it.unverifiedFollowTagSet().forEach { hashtag ->
+                    HashtagHeader(
+                        tag = hashtag,
+                        account = account,
+                        onClick = {
+                            nav("Hashtag/$hashtag")
+                        }
+                    )
+                }
+            }
+        }
+    }
+}
+
 @Composable
 fun TabBookmarks(feedViewModel: NostrUserProfileBookmarksFeedViewModel, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
     LaunchedEffect(Unit) {
@@ -1498,7 +1582,7 @@ fun UnfollowButton(onClick: () -> Unit) {
 }
 
 @Composable
-fun FollowButton(onClick: () -> Unit, text: Int = R.string.follow) {
+fun FollowButton(text: Int = R.string.follow, onClick: () -> Unit) {
     Button(
         modifier = Modifier.padding(start = 3.dp),
         onClick = onClick,

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SearchScreen.kt

@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -56,7 +57,6 @@ import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
@@ -66,9 +66,6 @@ import com.vitorpamplona.amethyst.ui.note.ClickableUserPicture
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.note.UserCompose
 import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
-import com.vitorpamplona.amethyst.ui.screen.NostrGlobalFeedViewModel
-import com.vitorpamplona.amethyst.ui.screen.RefresheableFeedView
-import com.vitorpamplona.amethyst.ui.screen.ScrollStateKeys
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.FlowPreview
@@ -86,7 +83,6 @@ import kotlinx.coroutines.channels.Channel as CoroutineChannel
 
 @Composable
 fun SearchScreen(
-    searchFeedViewModel: NostrGlobalFeedViewModel,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
@@ -97,33 +93,29 @@ fun SearchScreen(
         )
     )
 
-    SearchScreen(searchFeedViewModel, searchBarViewModel, accountViewModel, nav)
+    SearchScreen(searchBarViewModel, accountViewModel, nav)
 }
 
 @Composable
 fun SearchScreen(
-    searchFeedViewModel: NostrGlobalFeedViewModel,
     searchBarViewModel: SearchBarViewModel,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
     val lifeCycleOwner = LocalLifecycleOwner.current
 
-    WatchAccountForSearchScreen(searchFeedViewModel, accountViewModel)
+    WatchAccountForSearchScreen(accountViewModel)
 
     DisposableEffect(accountViewModel) {
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_RESUME) {
-                println("Global Start")
-                NostrGlobalDataSource.start()
+                println("Search Start")
                 NostrSearchEventOrUserDataSource.start()
-                searchFeedViewModel.invalidateData()
             }
             if (event == Lifecycle.Event.ON_PAUSE) {
-                println("Global Stop")
+                println("Search Stop")
                 NostrSearchEventOrUserDataSource.clear()
                 NostrSearchEventOrUserDataSource.stop()
-                NostrGlobalDataSource.stop()
             }
         }
 
@@ -133,29 +125,19 @@ fun SearchScreen(
         }
     }
 
-    Column(Modifier.fillMaxHeight()) {
-        Column(
-            modifier = Modifier.padding(vertical = 0.dp)
-        ) {
-            SearchBar(searchBarViewModel, accountViewModel, nav)
-            RefresheableFeedView(
-                searchFeedViewModel,
-                null,
-                scrollStateKey = ScrollStateKeys.GLOBAL_SCREEN,
-                accountViewModel = accountViewModel,
-                nav = nav
-            )
-        }
+    val listState = rememberLazyListState()
+
+    Column(Modifier.fillMaxSize()) {
+        SearchBar(searchBarViewModel, listState)
+        DisplaySearchResults(searchBarViewModel, listState, nav, accountViewModel)
     }
 }
 
 @Composable
-fun WatchAccountForSearchScreen(searchFeedViewModel: NostrGlobalFeedViewModel, accountViewModel: AccountViewModel) {
+fun WatchAccountForSearchScreen(accountViewModel: AccountViewModel) {
     LaunchedEffect(accountViewModel) {
         launch(Dispatchers.IO) {
-            NostrGlobalDataSource.resetFilters()
             NostrSearchEventOrUserDataSource.start()
-            searchFeedViewModel.invalidateData(true)
         }
     }
 }
@@ -228,11 +210,9 @@ class SearchBarViewModel(val account: Account) : ViewModel() {
 @Composable
 private fun SearchBar(
     searchBarViewModel: SearchBarViewModel,
-    accountViewModel: AccountViewModel,
-    nav: (String) -> Unit
+    listState: LazyListState
 ) {
     val scope = rememberCoroutineScope()
-    val listState = rememberLazyListState()
 
     // Create a channel for processing search queries.
     val searchTextChanges = remember {
@@ -283,8 +263,6 @@ private fun SearchBar(
             searchTextChanges.trySend(it)
         }
     }
-
-    DisplaySearchResults(listState, searchBarViewModel, nav, accountViewModel)
 }
 
 @Composable
@@ -352,8 +330,8 @@ private fun SearchTextField(
 
 @Composable
 private fun DisplaySearchResults(
-    listState: LazyListState,
     searchBarViewModel: SearchBarViewModel,
+    listState: LazyListState,
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
 ) {

app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt

@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Shapes
@@ -20,6 +21,8 @@ val Shapes = Shapes(
     large = RoundedCornerShape(0.dp)
 )
 
+val RippleRadius45dp = 45.dp // Ripple should be +10.dp over the component size
+
 val SmallBorder = RoundedCornerShape(7.dp)
 val QuoteBorder = RoundedCornerShape(15.dp)
 val ButtonBorder = RoundedCornerShape(20.dp)
@@ -40,6 +43,7 @@ val DoubleVertSpacer = Modifier.height(10.dp)
 val HalfDoubleVertSpacer = Modifier.height(7.dp)
 
 val Size0dp = 0.dp
+val Size10dp = 10.dp
 val Size13dp = 13.dp
 val Size15dp = 15.dp
 val Size16dp = 16.dp
@@ -56,15 +60,20 @@ val Size75dp = 75.dp
 
 val HalfStartPadding = Modifier.padding(start = 5.dp)
 val StdStartPadding = Modifier.padding(start = 10.dp)
+val StdTopPadding = Modifier.padding(top = 10.dp)
 
 val HalfPadding = Modifier.padding(5.dp)
 val StdPadding = Modifier.padding(10.dp)
 
+val Size6Modifier = Modifier.size(6.dp)
+val Size10Modifier = Modifier.size(10.dp)
 val Size15Modifier = Modifier.size(15.dp)
+val Size18Modifier = Modifier.size(18.dp)
 val Size20Modifier = Modifier.size(20.dp)
 val Size22Modifier = Modifier.size(22.dp)
 val Size24Modifier = Modifier.size(24.dp)
 val Size30Modifier = Modifier.size(30.dp)
+val Size35Modifier = Modifier.size(35.dp)
 val Size55Modifier = Modifier.size(55.dp)
 
 val TinyBorders = Modifier.padding(2.dp)
@@ -93,3 +102,9 @@ val ShowMoreRelaysButtonBoxModifer = Modifier.fillMaxWidth().height(25.dp)
 val ChatBubbleMaxSizeModifier = Modifier.fillMaxWidth(0.85f)
 
 val ModifierWidth3dp = Modifier.width(3.dp)
+
+val NotificationIconModifier = Modifier.width(55.dp).padding(end = 5.dp)
+val NotificationIconModifierSmaller = Modifier.width(55.dp).padding(end = 4.dp)
+
+val ZapPictureCommentModifier = Modifier.height(35.dp).widthIn(min = 35.dp)
+val ChatHeadlineBorders = Modifier.padding(start = 12.dp, end = 12.dp, top = 10.dp)

app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Theme.kt

@@ -1,10 +1,12 @@
 package com.vitorpamplona.amethyst.ui.theme
 
 import android.app.Activity
+import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.Colors
 import androidx.compose.material.MaterialTheme
@@ -14,7 +16,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.compositeOver
@@ -25,9 +26,7 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.unit.dp
 import com.halilibo.richtext.ui.RichTextStyle
-import com.vitorpamplona.amethyst.ui.components.DefaultHeadingStyle
-import com.vitorpamplona.amethyst.ui.components.DefaultParagraphSpacing
-import com.vitorpamplona.amethyst.ui.components.richTextDefaults
+import com.halilibo.richtext.ui.resolveDefaults
 
 private val DarkColorPalette = darkColors(
     primary = Purple200,
@@ -121,6 +120,14 @@ val LightImageModifier = Modifier
         QuoteBorder
     )
 
+val DarkProfile35dpModifier = Modifier
+    .size(Size35dp)
+    .clip(shape = CircleShape)
+
+val LightProfile35dpModifier = Modifier
+    .fillMaxWidth()
+    .clip(shape = CircleShape)
+
 val DarkReplyBorderModifier = Modifier
     .padding(top = 5.dp)
     .fillMaxWidth()
@@ -132,6 +139,26 @@ val DarkReplyBorderModifier = Modifier
     )
 
 val LightReplyBorderModifier = Modifier
+    .padding(top = 2.dp, bottom = 0.dp, start = 0.dp, end = 0.dp)
+    .fillMaxWidth()
+    .clip(shape = QuoteBorder)
+    .border(
+        1.dp,
+        LightSubtleBorder,
+        QuoteBorder
+    )
+
+val DarkInnerPostBorderModifier = Modifier
+    .padding(top = 2.dp, bottom = 0.dp, start = 0.dp, end = 0.dp)
+    .fillMaxWidth()
+    .clip(shape = QuoteBorder)
+    .border(
+        1.dp,
+        DarkSubtleBorder,
+        QuoteBorder
+    )
+
+val LightInnerPostBorderModifier = Modifier
     .padding(top = 5.dp)
     .fillMaxWidth()
     .clip(shape = QuoteBorder)
@@ -141,10 +168,12 @@ val LightReplyBorderModifier = Modifier
         QuoteBorder
     )
 
-val MarkDownStyleOnDark = richTextDefaults.copy(
+val RichTextDefaults = RichTextStyle().resolveDefaults()
+
+val MarkDownStyleOnDark = RichTextDefaults.copy(
     paragraphSpacing = DefaultParagraphSpacing,
     headingStyle = DefaultHeadingStyle,
-    codeBlockStyle = richTextDefaults.codeBlockStyle?.copy(
+    codeBlockStyle = RichTextDefaults.codeBlockStyle?.copy(
         textStyle = TextStyle(
             fontFamily = FontFamily.Monospace,
             fontSize = Font14SP
@@ -158,11 +187,9 @@ val MarkDownStyleOnDark = richTextDefaults.copy(
                 DarkSubtleBorder,
                 QuoteBorder
             )
-            .drawBehind {
-                drawRect(DarkColorPalette.onSurface.copy(alpha = 0.05f))
-            }
+            .background(DarkColorPalette.onSurface.copy(alpha = 0.05f))
     ),
-    stringStyle = richTextDefaults.stringStyle?.copy(
+    stringStyle = RichTextDefaults.stringStyle?.copy(
         linkStyle = SpanStyle(
             color = DarkColorPalette.primary
         ),
@@ -174,10 +201,10 @@ val MarkDownStyleOnDark = richTextDefaults.copy(
     )
 )
 
-val MarkDownStyleOnLight = richTextDefaults.copy(
+val MarkDownStyleOnLight = RichTextDefaults.copy(
     paragraphSpacing = DefaultParagraphSpacing,
     headingStyle = DefaultHeadingStyle,
-    codeBlockStyle = richTextDefaults.codeBlockStyle?.copy(
+    codeBlockStyle = RichTextDefaults.codeBlockStyle?.copy(
         textStyle = TextStyle(
             fontFamily = FontFamily.Monospace,
             fontSize = Font14SP
@@ -191,11 +218,9 @@ val MarkDownStyleOnLight = richTextDefaults.copy(
                 LightSubtleBorder,
                 QuoteBorder
             )
-            .drawBehind {
-                drawRect(LightColorPalette.onSurface.copy(alpha = 0.05f))
-            }
+            .background(DarkColorPalette.onSurface.copy(alpha = 0.05f))
     ),
-    stringStyle = richTextDefaults.stringStyle?.copy(
+    stringStyle = RichTextDefaults.stringStyle?.copy(
         linkStyle = SpanStyle(
             color = LightColorPalette.primary
         ),
@@ -263,9 +288,15 @@ val Colors.repostProfileBorder: Modifier
 val Colors.imageModifier: Modifier
     get() = if (isLight) LightImageModifier else DarkImageModifier
 
+val Colors.profile35dpModifier: Modifier
+    get() = if (isLight) LightProfile35dpModifier else DarkProfile35dpModifier
+
 val Colors.replyModifier: Modifier
     get() = if (isLight) LightReplyBorderModifier else DarkReplyBorderModifier
 
+val Colors.innerPostModifier: Modifier
+    get() = if (isLight) LightInnerPostBorderModifier else DarkInnerPostBorderModifier
+
 @Composable
 fun AmethystTheme(darkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit) {
     val colors = if (darkTheme) {

app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Type.kt

@@ -4,8 +4,10 @@ import androidx.compose.material.Typography
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.em
 import androidx.compose.ui.unit.sp
+import com.halilibo.richtext.ui.HeadingStyle
 
 // Set of Material typography styles to start with
 val Typography = Typography(
@@ -29,5 +31,37 @@ val Typography = Typography(
 )
 
 val Font14SP = 14.sp
+val Font17SP = 17.sp
 
 val MarkdownTextStyle = TextStyle(lineHeight = 1.30.em)
+
+val DefaultParagraphSpacing: TextUnit = 12.sp
+
+internal val DefaultHeadingStyle: HeadingStyle = { level, textStyle ->
+    when (level) {
+        0 -> textStyle.copy(
+            fontSize = 30.sp,
+            fontWeight = FontWeight.Light
+        )
+        1 -> textStyle.copy(
+            fontSize = 26.sp,
+            fontWeight = FontWeight.Light
+        )
+        2 -> textStyle.copy(
+            fontSize = 22.sp,
+            fontWeight = FontWeight.Light
+        )
+        3 -> textStyle.copy(
+            fontSize = 20.sp,
+            fontWeight = FontWeight.Bold
+        )
+        4 -> textStyle.copy(
+            fontSize = 18.sp,
+            fontWeight = FontWeight.Bold
+        )
+        5 -> textStyle.copy(
+            fontWeight = FontWeight.Bold
+        )
+        else -> textStyle
+    }
+}

app/src/main/res/drawable/amethyst.xml

@@ -1,30 +1,37 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="192.62dp"
-    android:height="288.93dp"
-    android:viewportWidth="192.62"
-    android:viewportHeight="288.93">
-  <group>
-    <clip-path
-        android:pathData="m111.18,103.42c-4.68,-0 -8.47,-3.8 -8.47,-8.48 0,-4.68 3.79,-8.48 8.47,-8.48 4.68,-0 8.48,3.8 8.48,8.48 0,4.68 -3.79,8.48 -8.48,8.48zM96.31,-0 L0,91.3L0,197.63l19.9,18.86c0.63,-43.4 14.08,-106.43 37.41,-146.62 0,-0 6.05,5.23 16.74,5.93 11.02,0.73 36.71,-4.37 48.32,0.36 10.87,4.43 11.66,17.34 10.79,27.84 -1.66,20.02 8.14,25.99 25.54,34.66 8.67,4.32 10.67,9.28 7.87,14.44 -3.09,5.68 -17.49,3.05 -33.55,1.1 -17.16,-2.08 -26.79,9.45 -43.37,8.39 -23.4,30.62 -0.84,73.09 -16.14,104.73l22.81,21.62 96.31,-91.31l0,-106.32z"/>
-    <path
-        android:pathData="m111.18,103.42c-4.68,-0 -8.47,-3.8 -8.47,-8.48 0,-4.68 3.79,-8.48 8.47,-8.48 4.68,-0 8.48,3.8 8.48,8.48 0,4.68 -3.79,8.48 -8.48,8.48zM96.31,-0 L0,91.3L0,197.63l19.9,18.86c0.63,-43.4 14.08,-106.43 37.41,-146.62 0,-0 6.05,5.23 16.74,5.93 11.02,0.73 36.71,-4.37 48.32,0.36 10.87,4.43 11.66,17.34 10.79,27.84 -1.66,20.02 8.14,25.99 25.54,34.66 8.67,4.32 10.67,9.28 7.87,14.44 -3.09,5.68 -17.49,3.05 -33.55,1.1 -17.16,-2.08 -26.79,9.45 -43.37,8.39 -23.4,30.62 -0.84,73.09 -16.14,104.73L96.31,288.93 192.62,197.63L192.62,91.3L96.31,-0"
-        android:strokeWidth="0.04"
-        android:strokeColor="#00000000"
-        android:fillType="nonZero">
-      <aapt:attr name="android:fillColor">
-        <gradient 
-            android:startX="33.75"
-            android:startY="252.82"
-            android:endX="158.87"
-            android:endY="36.12"
-            android:tileMode="clamp"
-            android:type="linear">
-          <item android:offset="0" android:color="#FF550066"/>
-          <item android:offset="0" android:color="#FF550066"/>
-          <item android:offset="1" android:color="#FFA75CCC"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-  </group>
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <path
+      android:pathData="M242.66,157.32a15.48,15.75 90,1 0,31.5 0a15.48,15.75 90,1 0,-31.5 0z"
+      android:strokeWidth="2.74">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="42.27"
+          android:startY="20.13"
+          android:endX="55.73"
+          android:endY="20.13"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF652D80"/>
+        <item android:offset="1" android:color="#FF2598CF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M489.48,391.59C488.93,389.92 360.91,85.09 325.7,0.54c-42.87,0 -133.4,0 -197.26,0 -18.74,46.35 -67.12,164.49 -105.93,259.66 21.27,50.74 40.37,96.32 55.1,131.48l80.32,0a5.49,5.49 0,0 0,5.13 -6.45c-0.69,-16.22 -44.84,-75.17 -31.67,-138.94 3.51,-13.72 6.2,-27.66 10.04,-41.33a482.36,482.36 135,0 1,36.88 -95.5c2.44,-4.64 3.57,-6.72 9.19,-3.21 11.99,7.46 25.38,7.03 38.72,6.06 11.5,-2.5 17.1,-8.01 38.17,-2.41 4.17,0 8.23,0 12.49,0.38 10.13,0.8 19.62,3.21 25.71,12.38 6.64,10.02 7.71,21.35 6.64,32.93 -1.62,17.32 -0.47,33.45 14.19,45.66a157.85,157.85 0,0 0,16.47 10.98c7.27,4.67 16.05,6.7 22.28,13.17 3.68,3.81 5.85,7.88 4.25,13.31 -1.59,5.43 -5.85,7.99 -11.44,8.59 -14.16,1.54 -27.99,-1.34 -41.9,-3.02 -1.81,-0.22 -3.59,-0.36 -5.49,-0.47a31.48,31.48 0,0 1,-10.46 0.36l-3.27,0a73.27,73.27 0,0 0,-16.19 3.87c-13.12,4.78 -25.06,10.04 -40.53,9.77a11.86,11.86 0,0 0,-5.63 2.44c-12.13,10.78 -19.43,24.4 -13.36,44.29 16.63,46.46 59.3,158.54 77.64,206.92 -0.52,-32.77 -0.66,-91.44 -0.77,-119.92 73.22,0.11 185.48,0.05 194.43,0.05z"
+      android:strokeWidth="2.74">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="22.6"
+          android:startY="255.92"
+          android:endX="489.54"
+          android:endY="255.92"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF652D80"/>
+        <item android:offset="1" android:color="#FF2598CF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
 </vector>

app/src/main/res/drawable/amethyst_monochrome.xml

@@ -1,7 +1,15 @@
-<vector android:height="108dp" android:viewportHeight="216"
-    android:viewportWidth="216" android:width="108dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000"
-        android:pathData="M90.2,73.6l-17.2,16.6 0,19.7 0,19.7 3,2.9c1.6,1.6 3.3,2.6 3.6,2.2 0.4,-0.4 1,-4.2 1.5,-8.4 0.9,-9.6 4.5,-25.4 6.9,-30.8 0.5,-1.1 1.9,-4.4 3.1,-7.3 1.9,-4.6 2.4,-5.2 4.3,-4.5 1.1,0.5 5.5,0.7 9.6,0.5 10.8,-0.3 13.7,0.3 15.5,3.8 0.8,1.6 1.5,5 1.5,7.5 0,6.1 1,7.7 7,11.4 8,4.9 5.6,8.7 -4.4,6.8 -3.9,-0.7 -6.2,-0.5 -9.6,0.6 -2.5,0.9 -5.8,1.8 -7.3,2.2 -4.4,0.9 -5.7,5.3 -5.7,19.8 0,6.8 -0.5,13.9 -1.1,15.7 -1.1,3 -1,3.4 2.9,7.3l4.1,4.1 5.8,-5.4c3.2,-3 11.3,-10.7 18.1,-17.2l12.2,-11.9 0,-18.9 0,-19 -13.2,-12.8c-14.2,-13.7 -22.3,-21.2 -22.9,-21.2 -0.2,-0 -8.2,7.5 -17.7,16.6z" android:strokeColor="#00000000"/>
-    <path android:fillColor="#000000"
-        android:pathData="M111,91.5c0,3.1 2.6,4.3 4.6,2.3 2,-2 0.7,-4.8 -2.2,-4.8 -1.9,-0 -2.4,0.5 -2.4,2.5z" android:strokeColor="#00000000"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <path
+      android:fillColor="#000000"
+      android:pathData="M249.48,212.29a7.57,7.7 90,1 0,15.41 0a7.57,7.7 90,1 0,-15.41 0z"
+      android:strokeWidth="1.34">
+  </path>
+  <path android:fillColor="#000000"
+      android:pathData="M370.18,326.86C369.91,326.04 307.3,176.97 290.09,135.63c-20.96,0 -65.23,0 -96.46,0 -9.17,22.67 -32.82,80.44 -51.8,126.98 10.4,24.81 19.74,47.1 26.95,64.29l39.28,0a2.68,2.68 135,0 0,2.51 -3.15c-0.34,-7.93 -21.93,-36.76 -15.49,-67.94 1.72,-6.71 3.03,-13.53 4.91,-20.21a235.88,235.88 135,0 1,18.04 -46.7c1.19,-2.27 1.74,-3.29 4.5,-1.57 5.86,3.65 12.41,3.44 18.94,2.97 5.62,-1.22 8.36,-3.92 18.67,-1.18 2.04,0 4.03,0 6.11,0.19 4.95,0.39 9.6,1.57 12.57,6.05 3.25,4.9 3.77,10.44 3.25,16.1 -0.79,8.47 -0.23,16.36 6.94,22.33a77.19,77.19 0,0 0,8.05 5.37c3.56,2.28 7.85,3.27 10.9,6.44 1.8,1.87 2.86,3.85 2.08,6.51 -0.78,2.66 -2.86,3.91 -5.6,4.2 -6.92,0.75 -13.69,-0.66 -20.49,-1.48 -0.89,-0.11 -1.76,-0.17 -2.68,-0.23a15.39,15.39 0,0 1,-5.11 0.17l-1.6,0a35.83,35.83 0,0 0,-7.92 1.89c-6.41,2.34 -12.25,4.91 -19.82,4.78a5.8,5.8 0,0 0,-2.75 1.19c-5.93,5.27 -9.5,11.93 -6.54,21.66 8.13,22.72 29,77.53 37.96,101.18 -0.25,-16.02 -0.32,-44.71 -0.38,-58.64 35.8,0.05 90.7,0.03 95.08,0.03z"
+      android:strokeWidth="1.34">
+  </path>
 </vector>

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -1,35 +1,37 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="192.62"
-    android:viewportHeight="288.93">
-  <group android:scaleX="0.33333334"
-      android:scaleY="0.5"
-      android:translateX="64.206665"
-      android:translateY="72.2325">
-    <group>
-      <clip-path
-          android:pathData="m111.18,103.42c-4.68,-0 -8.47,-3.8 -8.47,-8.48 0,-4.68 3.79,-8.48 8.47,-8.48 4.68,-0 8.48,3.8 8.48,8.48 0,4.68 -3.79,8.48 -8.48,8.48zM96.31,-0 L0,91.3L0,197.63l19.9,18.86c0.63,-43.4 14.08,-106.43 37.41,-146.62 0,-0 6.05,5.23 16.74,5.93 11.02,0.73 36.71,-4.37 48.32,0.36 10.87,4.43 11.66,17.34 10.79,27.84 -1.66,20.02 8.14,25.99 25.54,34.66 8.67,4.32 10.67,9.28 7.87,14.44 -3.09,5.68 -17.49,3.05 -33.55,1.1 -17.16,-2.08 -26.79,9.45 -43.37,8.39 -23.4,30.62 -0.84,73.09 -16.14,104.73l22.81,21.62 96.31,-91.31l0,-106.32z"/>
-      <path
-          android:pathData="m111.18,103.42c-4.68,-0 -8.47,-3.8 -8.47,-8.48 0,-4.68 3.79,-8.48 8.47,-8.48 4.68,-0 8.48,3.8 8.48,8.48 0,4.68 -3.79,8.48 -8.48,8.48zM96.31,-0 L0,91.3L0,197.63l19.9,18.86c0.63,-43.4 14.08,-106.43 37.41,-146.62 0,-0 6.05,5.23 16.74,5.93 11.02,0.73 36.71,-4.37 48.32,0.36 10.87,4.43 11.66,17.34 10.79,27.84 -1.66,20.02 8.14,25.99 25.54,34.66 8.67,4.32 10.67,9.28 7.87,14.44 -3.09,5.68 -17.49,3.05 -33.55,1.1 -17.16,-2.08 -26.79,9.45 -43.37,8.39 -23.4,30.62 -0.84,73.09 -16.14,104.73L96.31,288.93 192.62,197.63L192.62,91.3L96.31,-0"
-          android:strokeWidth="0.04"
-          android:strokeColor="#00000000"
-          android:fillType="nonZero">
-        <aapt:attr name="android:fillColor">
-          <gradient 
-              android:startX="33.75"
-              android:startY="252.82"
-              android:endX="158.87"
-              android:endY="36.12"
-              android:tileMode="clamp"
-              android:type="linear">
-            <item android:offset="0" android:color="#FF550066"/>
-            <item android:offset="0" android:color="#FF550066"/>
-            <item android:offset="1" android:color="#FFA75CCC"/>
-          </gradient>
-        </aapt:attr>
-      </path>
-    </group>
-    </group>
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <path
+      android:pathData="M249.48,212.29a7.57,7.7 90,1 0,15.41 0a7.57,7.7 90,1 0,-15.41 0z"
+      android:strokeWidth="1.34">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="151.49"
+          android:startY="145.21"
+          android:endX="158.07"
+          android:endY="145.21"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF652D80"/>
+        <item android:offset="1" android:color="#FF2598CF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M370.18,326.86C369.91,326.04 307.3,176.97 290.09,135.63c-20.96,0 -65.23,0 -96.46,0 -9.17,22.67 -32.82,80.44 -51.8,126.98 10.4,24.81 19.74,47.1 26.95,64.29l39.28,0a2.68,2.68 135,0 0,2.51 -3.15c-0.34,-7.93 -21.93,-36.76 -15.49,-67.94 1.72,-6.71 3.03,-13.53 4.91,-20.21a235.88,235.88 135,0 1,18.04 -46.7c1.19,-2.27 1.74,-3.29 4.5,-1.57 5.86,3.65 12.41,3.44 18.94,2.97 5.62,-1.22 8.36,-3.92 18.67,-1.18 2.04,0 4.03,0 6.11,0.19 4.95,0.39 9.6,1.57 12.57,6.05 3.25,4.9 3.77,10.44 3.25,16.1 -0.79,8.47 -0.23,16.36 6.94,22.33a77.19,77.19 0,0 0,8.05 5.37c3.56,2.28 7.85,3.27 10.9,6.44 1.8,1.87 2.86,3.85 2.08,6.51 -0.78,2.66 -2.86,3.91 -5.6,4.2 -6.92,0.75 -13.69,-0.66 -20.49,-1.48 -0.89,-0.11 -1.76,-0.17 -2.68,-0.23a15.39,15.39 0,0 1,-5.11 0.17l-1.6,0a35.83,35.83 0,0 0,-7.92 1.89c-6.41,2.34 -12.25,4.91 -19.82,4.78a5.8,5.8 0,0 0,-2.75 1.19c-5.93,5.27 -9.5,11.93 -6.54,21.66 8.13,22.72 29,77.53 37.96,101.18 -0.25,-16.02 -0.32,-44.71 -0.38,-58.64 35.8,0.05 90.7,0.03 95.08,0.03z"
+      android:strokeWidth="1.34">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="141.87"
+          android:startY="260.51"
+          android:endX="370.2"
+          android:endY="260.51"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF652D80"/>
+        <item android:offset="1" android:color="#FF2598CF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
 </vector>

app/src/main/res/drawable/tunestr.xml

@@ -0,0 +1,31 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="600dp"
+    android:height="600dp"
+    android:viewportWidth="600"
+    android:viewportHeight="600">
+  <path
+      android:pathData="m171.93,82.63 l405.17,-82.63 0,112.99 -405.17,82.63z"
+      android:fillColor="#712F8F"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M171.93,82.54l65.23,0l0,422.37l-65.23,0z"
+      android:fillColor="#712F8F"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="m235.04,488.2c11.66,43.5 -25.91,91.36 -83.91,106.9 -58,15.54 -114.46,-7.12 -126.12,-50.62 -11.66,-43.5 25.91,-91.36 83.91,-106.9 58,-15.54 114.46,7.12 126.12,50.62z"
+      android:fillColor="#712F8F"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M511.87,13.54l65.23,0l0,422.37l-65.23,0z"
+      android:fillColor="#712F8F"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="m574.98,419.21c11.66,43.5 -25.91,91.36 -83.91,106.9 -58,15.54 -114.46,-7.12 -126.12,-50.62 -11.66,-43.5 25.91,-91.36 83.91,-106.9 58,-15.54 114.46,7.12 126.12,50.62z"
+      android:fillColor="#712F8F"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"/>
+</vector>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
     <monochrome android:drawable="@drawable/amethyst_monochrome"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>