v0.7

README.md

@@ -11,11 +11,16 @@ Amethyst brings the best social network to your Android phone. Just insert your
 - [x] Notifications Feed
 - [x] Global Feed
 - [x] Reactions (like, boost, reply)
-- [x] Image Preview
+- [x] Image Preview (gifs, svgs)
 - [x] Url Preview
 - [x] View Threads
-- [ ] Private Messages
-- [ ] Communities
+- [x] Private Messages (NIP-04)
+- [x] User Profiles (follow/unfollow)
+- [x] Public Chats (NIP-28)
+- [ ] Notification Bubbles
+- [ ] Dropdown to Link Users/Posts when writting
+- [ ] Identity Verification (NIP-05)
+- [ ] Event Delegation (NIP-09)
 - [ ] Profile Edit
 - [ ] Relay Edit
 

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 2
-        versionName "0.2"
+        versionCode 7
+        versionName "0.7"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -56,8 +56,9 @@ dependencies {
 
     // Navigation
     implementation("androidx.navigation:navigation-compose:$nav_version")
-    implementation 'androidx.lifecycle:lifecycle-runtime-compose:2.6.0-alpha03'
-    implementation 'androidx.compose.runtime:runtime-livedata:1.4.0-alpha03'
+    implementation 'androidx.lifecycle:lifecycle-runtime-compose:2.6.0-alpha04'
+    implementation 'androidx.compose.runtime:runtime-livedata:1.4.0-alpha04'
+    implementation "androidx.compose.material:material-icons-extended:1.3.1"
 
     // Input
     implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1'
@@ -90,7 +91,22 @@ dependencies {
 
     // link preview
     implementation 'tw.com.oneup.www:Baha-UrlPreview:1.0.1'
-    implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha03'
+    implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha04'
+
+    // upload pictures:
+    implementation "com.google.accompanist:accompanist-permissions:0.28.0"
+
+    // view videos
+    implementation 'com.google.android.exoplayer:exoplayer:2.18.2'
+
+    // view gifs
+    implementation "io.coil-kt:coil-gif:2.2.2"
+    // view svgs
+    implementation("io.coil-kt:coil-svg:2.2.2")
+
+    // tabs for user profiles
+    implementation "com.google.accompanist:accompanist-pager:$accompanist_version" // Pager
+    implementation "com.google.accompanist:accompanist-pager-indicators:$accompanist_version"
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'

app/src/androidTest/java/com/vitorpamplona/amethyst/ExampleInstrumentedTest.kt

@@ -1,13 +1,11 @@
 package com.vitorpamplona.amethyst
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.*
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *

app/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
 
     <application
         android:allowBackup="true"

app/src/main/java/com/vitorpamplona/amethyst/lnurl/LnInvoiceUtil.kt

@@ -0,0 +1,156 @@
+package com.vitorpamplona.amethyst.lnurl
+
+import java.math.BigDecimal
+import java.util.Locale
+import java.util.regex.Pattern
+
+/** based on litecoinj */
+object LnInvoiceUtil {
+  private val invoicePattern = Pattern.compile("lnbc((?<amount>\\d+)(?<multiplier>[munp])?)?1[^1\\s]+", Pattern.CASE_INSENSITIVE)
+
+  /** The Bech32 character set for encoding.  */
+  private const val CHARSET = "qpzry9x8gf2tvdw0s3jn54khce6mua7l"
+
+  /** The Bech32 character set for decoding.  */
+  private val CHARSET_REV = byteArrayOf(
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    15, -1, 10, 17, 21, 20, 26, 30, 7, 5, -1, -1, -1, -1, -1, -1,
+    -1, 29, -1, 24, 13, 25, 9, 8, 23, -1, 18, 22, 31, 27, 19, -1,
+    1, 0, 3, 16, 11, 28, 12, 14, 6, 4, 2, -1, -1, -1, -1, -1,
+    -1, 29, -1, 24, 13, 25, 9, 8, 23, -1, 18, 22, 31, 27, 19, -1,
+    1, 0, 3, 16, 11, 28, 12, 14, 6, 4, 2, -1, -1, -1, -1, -1
+  )
+
+
+  /** Find the polynomial with value coefficients mod the generator as 30-bit.  */
+  private fun polymod(values: ByteArray): Int {
+    var c = 1
+    for (v_i in values) {
+      val c0 = c ushr 25 and 0xff
+      c = c and 0x1ffffff shl 5 xor (v_i.toInt() and 0xff)
+      if (c0 and 1 != 0) c = c xor 0x3b6a57b2
+      if (c0 and 2 != 0) c = c xor 0x26508e6d
+      if (c0 and 4 != 0) c = c xor 0x1ea119fa
+      if (c0 and 8 != 0) c = c xor 0x3d4233dd
+      if (c0 and 16 != 0) c = c xor 0x2a1462b3
+    }
+    return c
+  }
+
+  /** Expand a HRP for use in checksum computation.  */
+  private fun expandHrp(hrp: String): ByteArray {
+    val hrpLength = hrp.length
+    val ret = ByteArray(hrpLength * 2 + 1)
+    for (i in 0 until hrpLength) {
+      val c = hrp[i].code and 0x7f // Limit to standard 7-bit ASCII
+      ret[i] = (c ushr 5 and 0x07).toByte()
+      ret[i + hrpLength + 1] = (c and 0x1f).toByte()
+    }
+    ret[hrpLength] = 0
+    return ret
+  }
+
+  /** Verify a checksum.  */
+  private fun verifyChecksum(hrp: String, values: ByteArray): Boolean {
+    val hrpExpanded: ByteArray = expandHrp(hrp)
+    val combined = ByteArray(hrpExpanded.size + values.size)
+    System.arraycopy(hrpExpanded, 0, combined, 0, hrpExpanded.size)
+    System.arraycopy(values, 0, combined, hrpExpanded.size, values.size)
+    return polymod(combined) == 1
+  }
+
+  class AddressFormatException(message: String): Exception(message) {
+
+  }
+
+  fun decodeUnlimitedLength(invoice: String): Boolean {
+    var lower = false
+    var upper = false
+    for (i in 0 until invoice.length) {
+      val c = invoice[i]
+      if (c.code < 33 || c.code > 126) throw AddressFormatException("Invalid character: $c, pos: $i")
+      if (c in 'a'..'z') {
+        if (upper) throw AddressFormatException("Invalid character: $c, pos: $i")
+        lower = true
+      }
+      if (c in 'A'..'Z') {
+        if (lower) throw AddressFormatException("Invalid character: $c, pos: $i")
+        upper = true
+      }
+    }
+    val pos = invoice.lastIndexOf('1')
+    if (pos < 1) throw AddressFormatException("Missing human-readable part")
+    val dataPartLength = invoice.length - 1 - pos
+    if (dataPartLength < 6) throw AddressFormatException("Data part too short: $dataPartLength")
+    val values = ByteArray(dataPartLength)
+    for (i in 0 until dataPartLength) {
+      val c = invoice[i + pos + 1]
+      if (CHARSET_REV.get(c.code).toInt() == -1) throw AddressFormatException("Invalid character: " + c + ", pos: " + (i + pos + 1))
+      values[i] = CHARSET_REV.get(c.code)
+    }
+    val hrp = invoice.substring(0, pos).lowercase(Locale.ROOT)
+    if (!verifyChecksum(hrp, values)) throw AddressFormatException("Invalid Checksum")
+    return true
+  }
+
+  /**
+   * Parses invoice amount according to
+   * https://github.com/lightningnetwork/lightning-rfc/blob/master/11-payment-encoding.md#human-readable-part
+   * @return invoice amount in bitcoins, zero if the invoice has no amount
+   * @throws RuntimeException if invoice format is incorrect
+   */
+  fun getAmount(invoice: String): BigDecimal {
+    try {
+      decodeUnlimitedLength(invoice) // checksum must match
+    } catch (e: AddressFormatException) {
+      throw IllegalArgumentException("Cannot decode invoice", e)
+    }
+
+    val matcher = invoicePattern.matcher(invoice)
+    require(matcher.matches()) { "Failed to match HRP pattern" }
+    val amountGroup = matcher.group("amount")
+    val multiplierGroup = matcher.group("multiplier")
+    if (amountGroup == null) {
+      return BigDecimal.ZERO
+    }
+    val amount = BigDecimal(amountGroup)
+    if (multiplierGroup == null) {
+      return amount
+    }
+    require(!(multiplierGroup == "p" && amountGroup[amountGroup.length - 1] != '0')) { "sub-millisatoshi amount" }
+    return amount.multiply(multiplier(multiplierGroup))
+  }
+
+  fun getAmountInSats(invoice: String): BigDecimal {
+    return getAmount(invoice).multiply(BigDecimal(100000000))
+  }
+
+  private fun multiplier(multiplier: String): BigDecimal {
+    return when (multiplier) {
+      "m" -> BigDecimal("0.001")
+      "u" -> BigDecimal("0.000001")
+      "n" -> BigDecimal("0.000000001")
+      "p" -> BigDecimal("0.000000000001")
+      else -> throw IllegalArgumentException("Invalid multiplier: $multiplier")
+    }
+  }
+
+  /**
+   * Finds LN invoice in the provided input string and returns it.
+   * For example for input = "aaa bbb lnbc1xxx ccc" it will return "lnbc1xxx"
+   * It will only return the first invoice found in the input.
+   *
+   * @return the invoice if it was found. null for null input or if no invoice is found
+   */
+  fun findInvoice(input: String?): String? {
+    if (input == null) {
+      return null
+    }
+    val matcher = invoicePattern.matcher(input)
+    return if (matcher.find()) {
+      matcher.group()
+    } else null
+  }
+}

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

@@ -1,20 +1,34 @@
 package com.vitorpamplona.amethyst.model
 
 import androidx.lifecycle.LiveData
+import com.vitorpamplona.amethyst.service.Constants
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.service.relays.Client
+import nostr.postr.Contact
 import nostr.postr.Persona
+import nostr.postr.Utils
+import nostr.postr.events.ContactListEvent
+import nostr.postr.events.PrivateDmEvent
 import nostr.postr.events.TextNoteEvent
 import nostr.postr.toHex
 
-class Account(val loggedIn: Persona) {
+val DefaultChannels = setOf(
+  "25e5c82273a271cb1a840d0060391a0bf4965cafeb029d5ab55350b418953fbb" // -> Anigma's Nostr
+)
+
+class Account(val loggedIn: Persona, val followingChannels: MutableSet<String> = DefaultChannels.toMutableSet()) {
   var seeReplies: Boolean = true
 
   fun userProfile(): User {
     return LocalCache.getOrCreateUser(loggedIn.pubKey)
   }
 
+  fun followingChannels(): List<Channel> {
+    return followingChannels.map { LocalCache.getOrCreateChannel(it) }
+  }
+
   fun isWriteable(): Boolean {
     return loggedIn.privKey != null
   }
@@ -22,8 +36,13 @@ class Account(val loggedIn: Persona) {
   fun reactTo(note: Note) {
     if (!isWriteable()) return
 
+    if (note.reactions.firstOrNull { it.author == userProfile() } != null) {
+      // has already liked this note
+      return
+    }
+
     note.event?.let {
-      val event = ReactionEvent.create(it, loggedIn.privKey!!)
+      val event = ReactionEvent.createLike(it, loggedIn.privKey!!)
       Client.send(event)
       LocalCache.consume(event)
     }
@@ -39,6 +58,38 @@ class Account(val loggedIn: Persona) {
     }
   }
 
+  fun broadcast(note: Note) {
+    note.event?.let {
+      Client.send(it)
+    }
+  }
+
+  fun follow(user: User) {
+    if (!isWriteable()) return
+
+    val lastestContactList = userProfile().lastestContactList
+    val event = if (lastestContactList != null) {
+      ContactListEvent.create(lastestContactList.follows.plus(Contact(user.pubkeyHex, null)), lastestContactList.relayUse, loggedIn.privKey!!)
+    } else {
+      val relays = Constants.defaultRelays.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) }
+      ContactListEvent.create(listOf(Contact(user.pubkeyHex, null)), relays, loggedIn.privKey!!)
+    }
+
+    Client.send(event)
+    LocalCache.consume(event)
+  }
+
+  fun unfollow(user: User) {
+    if (!isWriteable()) return
+
+    val lastestContactList = userProfile().lastestContactList
+    if (lastestContactList != null) {
+      val event = ContactListEvent.create(lastestContactList.follows.filter { it.pubKeyHex != user.pubkeyHex }, lastestContactList.relayUse, loggedIn.privKey!!)
+      Client.send(event)
+      LocalCache.consume(event)
+    }
+  }
+
   fun sendPost(message: String, replyingTo: Note?) {
     if (!isWriteable()) return
 
@@ -67,6 +118,63 @@ class Account(val loggedIn: Persona) {
     }
   }
 
+  fun sendChannelMeesage(message: String, toChannel: String, replyingTo: Note? = null) {
+    if (!isWriteable()) return
+
+    val signedEvent = ChannelMessageEvent.create(
+      message = message,
+      channel = toChannel,
+      privateKey = loggedIn.privKey!!
+    )
+    Client.send(signedEvent)
+    LocalCache.consume(signedEvent)
+  }
+
+  fun sendPrivateMeesage(message: String, toUser: String, replyingTo: Note? = null) {
+    if (!isWriteable()) return
+    val user = LocalCache.users[toUser] ?: return
+
+    val signedEvent = PrivateDmEvent.create(
+      recipientPubKey = user.pubkey,
+      publishedRecipientPubKey = user.pubkey,
+      msg = message,
+      privateKey = loggedIn.privKey!!,
+      advertiseNip18 = false
+    )
+    Client.send(signedEvent)
+    LocalCache.consume(signedEvent)
+  }
+
+  fun decryptContent(note: Note): String? {
+    val event = note.event
+    return if (event is PrivateDmEvent && loggedIn.privKey != null) {
+      var pubkeyToUse = event.pubKey
+
+      val recepientPK = event.recipientPubKey
+
+      if (note.author == userProfile() && recepientPK != null)
+        pubkeyToUse = recepientPK
+
+      return try {
+        val sharedSecret = Utils.getSharedSecret(loggedIn.privKey!!, pubkeyToUse)
+
+        val retVal = Utils.decrypt(event.content, sharedSecret)
+
+        if (retVal.startsWith(PrivateDmEvent.nip18Advertisement)) {
+          retVal.substring(16)
+        } else {
+          retVal
+        }
+
+      } catch (e: Exception) {
+        e.printStackTrace()
+        null
+      }
+    } else {
+      event?.content
+    }
+  }
+
   // Observers line up here.
   val live: AccountLiveData = AccountLiveData(this)
 

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

@@ -0,0 +1,58 @@
+package com.vitorpamplona.amethyst.model
+
+import androidx.lifecycle.LiveData
+import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
+import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.ui.note.toShortenHex
+import java.util.Collections
+import java.util.concurrent.ConcurrentHashMap
+import nostr.postr.events.ContactListEvent
+
+class Channel(val id: ByteArray) {
+    val idHex = id.toHexKey()
+    val idDisplayHex = id.toShortenHex()
+
+    var info = ChannelCreateEvent.ChannelData(null, null, null)
+
+    var updatedMetadataAt: Long = 0;
+
+    val notes = ConcurrentHashMap<HexKey, Note>()
+
+    @Synchronized
+    fun getOrCreateNote(idHex: String): Note {
+        return notes[idHex] ?: run {
+            val answer = Note(idHex)
+            notes.put(idHex, answer)
+            answer
+        }
+    }
+
+    fun updateChannelInfo(channelInfo: ChannelCreateEvent.ChannelData, updatedAt: Long) {
+        info = channelInfo
+        updatedMetadataAt = updatedAt
+
+        live.refresh()
+    }
+
+    fun profilePicture(): String {
+        if (info.picture.isNullOrBlank()) info.picture = null
+        return info.picture ?: "https://robohash.org/${idHex}.png"
+    }
+
+    // Observers line up here.
+    val live: ChannelLiveData = ChannelLiveData(this)
+
+    private fun refreshObservers() {
+        live.refresh()
+    }
+}
+
+
+class ChannelLiveData(val channel: Channel): LiveData<ChannelState>(ChannelState(channel)) {
+    fun refresh() {
+        postValue(ChannelState(channel))
+    }
+}
+
+class ChannelState(val channel: Channel)

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

@@ -1,8 +1,9 @@
 package com.vitorpamplona.amethyst.model
 
-import com.vitorpamplona.amethyst.ui.note.toDisplayHex
+import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
 import java.util.regex.Pattern
+import nostr.postr.Bech32
 import nostr.postr.Persona
 import nostr.postr.bechToBytes
 import nostr.postr.toHex
@@ -10,6 +11,8 @@ import nostr.postr.toHex
 /** Makes the distinction between String and Hex **/
 typealias HexKey = String
 
+fun ByteArray.toNote() = Bech32.encodeBytes(hrp = "note", this, Bech32.Encoding.Bech32)
+
 fun ByteArray.toHexKey(): HexKey {
   return toHex()
 }
@@ -19,7 +22,7 @@ fun HexKey.toByteArray(): ByteArray {
 }
 
 fun HexKey.toDisplayHexKey(): String {
-  return this.toDisplayHex()
+  return this.toShortenHex()
 }
 
 fun decodePublicKey(key: String): ByteArray {

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

@@ -4,6 +4,11 @@ import android.util.Log
 import androidx.lifecycle.LiveData
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+import com.vitorpamplona.amethyst.service.model.ChannelHideMessageEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMuteUserEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import java.io.ByteArrayInputStream
@@ -28,6 +33,7 @@ object LocalCache {
 
   val users = ConcurrentHashMap<HexKey, User>()
   val notes = ConcurrentHashMap<HexKey, Note>()
+  val channels = ConcurrentHashMap<HexKey, Channel>()
 
   @Synchronized
   fun getOrCreateUser(pubkey: ByteArray): User {
@@ -48,6 +54,16 @@ object LocalCache {
     }
   }
 
+  @Synchronized
+  fun getOrCreateChannel(key: String): Channel {
+    return channels[key] ?: run {
+      val answer = Channel(key.toByteArray())
+      channels.put(key, answer)
+      answer
+    }
+  }
+
+
   fun consume(event: MetadataEvent) {
     //Log.d("MT", "New User ${users.size} ${event.contactMetaData.name}")
 
@@ -103,6 +119,8 @@ object LocalCache {
       it.addReply(note)
     }
 
+    UrlCachedPreviewer.preloadPreviewsFor(note)
+
     refreshObservers()
   }
 
@@ -112,9 +130,9 @@ object LocalCache {
 
   fun consume(event: ContactListEvent) {
     val user = getOrCreateUser(event.pubKey)
-    //Log.d("CL", "${user.toBestDisplayName()} ${event.follows}")
 
     if (event.createdAt > user.updatedFollowsAt) {
+      Log.d("CL", "AAA ${user.toBestDisplayName()} ${event.follows.size}")
       user.updateFollows(
         event.follows.map {
           try {
@@ -129,13 +147,35 @@ object LocalCache {
         }.filterNotNull(),
         event.createdAt
       )
+
+      user.lastestContactList = event
     }
 
     refreshObservers()
   }
 
   fun consume(event: PrivateDmEvent) {
-    //Log.d("PM", event.toJson())
+    val note = getOrCreateNote(event.id.toHex())
+
+    // Already processed this event.
+    if (note.event != null) return
+
+    val author = getOrCreateUser(event.pubKey)
+    val recipient = event.recipientPubKey?.let { getOrCreateUser(it) }
+
+    //Log.d("PM", "${author.toBestDisplayName()} to ${recipient?.toBestDisplayName()}")
+
+    val repliesTo = event.tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }.map { getOrCreateNote(it) }.toMutableList()
+    val mentions = event.tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }.map { getOrCreateUser(decodePublicKey(it)) }
+
+    note.loadEvent(event, author, mentions, repliesTo)
+
+    if (recipient != null) {
+      author.addMessage(recipient, note)
+      recipient.addMessage(author, note)
+    }
+
+    refreshObservers()
   }
 
   fun consume(event: DeletionEvent) {
@@ -205,6 +245,73 @@ object LocalCache {
     }
   }
 
+  fun consume(event: ChannelCreateEvent) {
+    // new event
+    val oldChannel = getOrCreateChannel(event.id.toHex())
+    if (event.createdAt > oldChannel.updatedMetadataAt) {
+      oldChannel.updateChannelInfo(event.channelInfo, event.createdAt)
+    } else {
+      // older data, does nothing
+    }
+  }
+  fun consume(event: ChannelMetadataEvent) {
+    //Log.d("MT", "New User ${users.size} ${event.contactMetaData.name}")
+    if (event.channel.isNullOrBlank()) return
+
+    // new event
+    val oldChannel = getOrCreateChannel(event.channel)
+    if (event.createdAt > oldChannel.updatedMetadataAt) {
+      oldChannel.updateChannelInfo(event.channelInfo, event.createdAt)
+    } else {
+      //Log.d("MT","Relay sent a previous Metadata Event ${oldUser.toBestDisplayName()} ${formattedDateTime(event.createdAt)} > ${formattedDateTime(oldUser.updatedAt)}")
+    }
+  }
+
+  fun consume(event: ChannelMessageEvent) {
+    if (event.channel.isNullOrBlank()) return
+
+    val channel = getOrCreateChannel(event.channel)
+
+    val note = channel.getOrCreateNote(event.id.toHex())
+
+    // Already processed this event.
+    if (note.event != null) return
+
+    val author = getOrCreateUser(event.pubKey)
+    val mentions = Collections.synchronizedList(event.mentions.map { getOrCreateUser(decodePublicKey(it)) })
+    val replyTo = Collections.synchronizedList(event.replyTos.map { getOrCreateNote(it) }.toMutableList())
+
+    note.channel = channel
+    note.loadEvent(event, author, mentions, replyTo)
+
+    //Log.d("CM", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content} ${formattedDateTime(event.createdAt)}")
+
+    // Adds notifications to users.
+    mentions.forEach {
+      it.taggedPosts.add(note)
+    }
+    replyTo.forEach {
+      it.author?.taggedPosts?.add(note)
+    }
+
+    // Counts the replies
+    replyTo.forEach {
+      it.addReply(note)
+    }
+
+    UrlCachedPreviewer.preloadPreviewsFor(note)
+
+    refreshObservers()
+  }
+
+  fun consume(event: ChannelHideMessageEvent) {
+
+  }
+
+  fun consume(event: ChannelMuteUserEvent) {
+
+  }
+
   // Observers line up here.
   val live: LocalCacheLiveData = LocalCacheLiveData(this)
 

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

@@ -2,27 +2,38 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
-import com.vitorpamplona.amethyst.ui.note.toDisplayHex
+import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
 import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import java.util.Collections
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
 import nostr.postr.events.Event
 
 class Note(val idHex: String) {
+    // These fields are always available.
+    // They are immutable
     val id = Hex.decode(idHex)
-    val idDisplayHex = id.toDisplayHex()
+    val idDisplayHex = id.toShortenHex()
 
+    // These fields are only available after the Text Note event is received.
+    // They are immutable after that.
     var event: Event? = null
     var author: User? = null
     var mentions: List<User>? = null
     var replyTo: MutableList<Note>? = null
 
+    // These fields are updated every time an event related to this note is received.
     val replies = Collections.synchronizedSet(mutableSetOf<Note>())
     val reactions = Collections.synchronizedSet(mutableSetOf<Note>())
     val boosts = Collections.synchronizedSet(mutableSetOf<Note>())
 
+    var channel: Channel? = null
+
     fun loadEvent(event: Event, author: User, mentions: List<User>, replyTo: MutableList<Note>) {
         this.event = event
         this.author = author
@@ -91,18 +102,24 @@ class Note(val idHex: String) {
 }
 
 class NoteLiveData(val note: Note): LiveData<NoteState>(NoteState(note)) {
+    val scope = CoroutineScope(Job() + Dispatchers.Main)
+
     fun refresh() {
         postValue(NoteState(note))
     }
 
     override fun onActive() {
         super.onActive()
-        NostrSingleEventDataSource.add(note.idHex)
+        scope.launch {
+            NostrSingleEventDataSource.add(note.idHex)
+        }
     }
 
     override fun onInactive() {
         super.onInactive()
-        NostrSingleEventDataSource.remove(note.idHex)
+        scope.launch {
+            NostrSingleEventDataSource.remove(note.idHex)
+        }
     }
 }
 

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

@@ -0,0 +1,55 @@
+package com.vitorpamplona.amethyst.model
+
+import com.baha.url.preview.BahaUrlPreview
+import com.baha.url.preview.IUrlPreviewCallback
+import com.baha.url.preview.UrlInfoItem
+import com.vitorpamplona.amethyst.ui.components.imageExtension
+import com.vitorpamplona.amethyst.ui.components.isValidURL
+import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
+import com.vitorpamplona.amethyst.ui.components.videoExtension
+import java.util.concurrent.ConcurrentHashMap
+
+object UrlCachedPreviewer {
+  val cache = ConcurrentHashMap<String, UrlInfoItem>()
+
+  fun previewInfo(url: String, callback: IUrlPreviewCallback? = null) {
+    cache[url]?.let {
+      callback?.onComplete(it)
+      return
+    }
+
+    BahaUrlPreview(url, object : IUrlPreviewCallback {
+      override fun onComplete(urlInfo: UrlInfoItem) {
+        cache.put(url, urlInfo)
+        callback?.onComplete(urlInfo)
+      }
+
+      override fun onFailed(throwable: Throwable) {
+        callback?.onFailed(throwable)
+      }
+    }).fetchUrlPreview()
+  }
+
+  fun findUrlsInMessage(message: String): List<String> {
+    return message.split('\n').map { paragraph ->
+      paragraph.split(' ').filter { word: String ->
+        isValidURL(word) || noProtocolUrlValidator.matcher(word).matches()
+      }
+    }.flatten()
+  }
+
+  fun preloadPreviewsFor(note: Note) {
+    note.event?.content?.let {
+      findUrlsInMessage(it).forEach {
+        val removedParamsFromUrl = it.split("?")[0].toLowerCase()
+        if (imageExtension.matcher(removedParamsFromUrl).matches()) {
+          // Preload Images? Isn't this too heavy?
+        } else if (videoExtension.matcher(removedParamsFromUrl).matches()) {
+          // Do nothing for now.
+        } else {
+          previewInfo(it)
+        }
+      }
+    }
+  }
+}

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

@@ -2,23 +2,29 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
-import com.vitorpamplona.amethyst.ui.note.toDisplayHex
+import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import java.util.Collections
+import java.util.concurrent.ConcurrentHashMap
+import nostr.postr.events.ContactListEvent
 
 class User(val pubkey: ByteArray) {
     val pubkeyHex = pubkey.toHexKey()
-    val pubkeyDisplayHex = pubkey.toDisplayHex()
+    val pubkeyDisplayHex = pubkey.toShortenHex()
 
     var info = UserMetadata()
 
     var updatedMetadataAt: Long = 0;
     var updatedFollowsAt: Long = 0;
 
+    var lastestContactList: ContactListEvent? = null
+
     val notes = Collections.synchronizedSet(mutableSetOf<Note>())
     val follows = Collections.synchronizedSet(mutableSetOf<User>())
     val taggedPosts = Collections.synchronizedSet(mutableSetOf<Note>())
 
-    var follower: Number? = null
+    val followers = Collections.synchronizedSet(mutableSetOf<User>())
+
+    val messages = ConcurrentHashMap<User, MutableSet<Note>>()
 
     fun toBestDisplayName(): String {
         return bestDisplayName() ?: bestUsername() ?: pubkeyDisplayHex
@@ -37,9 +43,40 @@ class User(val pubkey: ByteArray) {
         return info.picture ?: "https://robohash.org/${pubkeyHex}.png"
     }
 
+    fun follow(user: User) {
+        follows.add(user)
+        user.followers.add(this)
+    }
+    fun unfollow(user: User) {
+        follows.remove(user)
+        user.followers.remove(this)
+    }
+
+    @Synchronized
+    fun getOrCreateChannel(user: User): MutableSet<Note> {
+        return messages[user] ?: run {
+            val channel = mutableSetOf<Note>()
+            messages[user] = channel
+            channel
+        }
+    }
+
+    fun addMessage(user: User, msg: Note) {
+        getOrCreateChannel(user).add(msg)
+        live.refresh()
+    }
+
     fun updateFollows(newFollows: List<User>, updateAt: Long) {
-        follows.clear()
-        follows.addAll(newFollows)
+        val toBeAdded = newFollows - follows
+        val toBeRemoved = follows - newFollows
+
+        toBeAdded.forEach {
+            follow(it)
+        }
+        toBeRemoved.forEach {
+            unfollow(it)
+        }
+
         updatedFollowsAt = updateAt
 
         live.refresh()
@@ -66,6 +103,7 @@ class UserMetadata {
     var display_name: String? = null
     var displayName: String? = null
     var picture: String? = null
+    var banner: String? = null
     var website: String? = null
     var about: String? = null
     var nip05: String? = null

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

@@ -6,7 +6,7 @@ object Constants {
     val defaultRelays = arrayOf(
       Relay("wss://nostr.bitcoiner.social", read = true, write = true),
       Relay("wss://relay.nostr.bg", read = true, write = true),
-      //Relay("wss://brb.io", read = true, write = true),
+      Relay("wss://brb.io", read = true, write = true),
       Relay("wss://nostr.v0l.io", read = true, write = true),
       Relay("wss://nostr.rocks", read = true, write = true),
       Relay("wss://relay.damus.io", read = true, write = true),
@@ -17,8 +17,9 @@ object Constants {
       Relay("wss://nostr-pub.wellorder.net", read = true, write = true),
       Relay("wss://nostr.mom", read = true, write = true),
       Relay("wss://nostr.orangepill.dev", read = true, write = true),
-      //Relay("wss://nostr-pub.semisol.dev", read = true, write = true),
+      Relay("wss://nostr-pub.semisol.dev", read = true, write = true),
       Relay("wss://nostr.onsats.org", read = true, write = true),
-      Relay("wss://nostr.sandwich.farm", read = true, write = true)
+      Relay("wss://nostr.sandwich.farm", read = true, write = true),
+      Relay("wss://relay.nostr.ch", read = true, write = true)
     )
 }

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

@@ -6,10 +6,11 @@ import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.UserState
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import nostr.postr.JsonFilter
+import nostr.postr.events.ContactListEvent
+import nostr.postr.events.MetadataEvent
 import nostr.postr.events.TextNoteEvent
-import nostr.postr.toHex
 
-object NostrAccountDataSource: NostrDataSource("AccountData") {
+object NostrAccountDataSource: NostrDataSource<Note>("AccountData") {
   lateinit var account: Account
 
   private val cacheListener: (UserState) -> Unit = {
@@ -30,8 +31,9 @@ object NostrAccountDataSource: NostrDataSource("AccountData") {
 
   fun createAccountFilter(): JsonFilter {
     return JsonFilter(
+      kinds = listOf(MetadataEvent.kind, ContactListEvent.kind),
       authors = listOf(account.userProfile().pubkeyHex),
-      since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 4), // 4 days
+      since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 7), // 4 days
     )
   }
 

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

@@ -0,0 +1,31 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import nostr.postr.JsonFilter
+
+object NostrChannelDataSource: NostrDataSource<Note>("ChatroomFeed") {
+  var channel: com.vitorpamplona.amethyst.model.Channel? = null
+
+  fun loadMessagesBetween(channelId: String) {
+    channel = LocalCache.channels[channelId]
+  }
+
+  fun createMessagesToChannelFilter() = JsonFilter(
+    kinds = listOf(ChannelMessageEvent.kind),
+    tags = mapOf("e" to listOf(channel?.idHex).filterNotNull()),
+    since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 1), // 24 hours
+  )
+
+  val messagesChannel = requestNewChannel()
+
+  // returns the last Note of each user.
+  override fun feed(): List<Note> {
+    return channel?.notes?.values?.sortedBy { it.event!!.createdAt } ?: emptyList()
+  }
+
+  override fun updateChannelFilters() {
+    messagesChannel.filter = createMessagesToChannelFilter()
+  }
+}

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

@@ -0,0 +1,45 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
+import nostr.postr.JsonFilter
+import nostr.postr.events.PrivateDmEvent
+
+object NostrChatRoomDataSource: NostrDataSource<Note>("ChatroomFeed") {
+  lateinit var account: Account
+  var withUser: User? = null
+
+  fun loadMessagesBetween(accountIn: Account, userId: String) {
+    account = accountIn
+    withUser = LocalCache.users[userId]
+  }
+
+  fun createMessagesToMeFilter() = JsonFilter(
+    kinds = listOf(PrivateDmEvent.kind),
+    authors = withUser?.let { listOf(it.pubkeyHex) },
+    tags = mapOf("p" to listOf(account.userProfile().pubkeyHex))
+  )
+
+  fun createMessagesFromMeFilter() = JsonFilter(
+    kinds = listOf(PrivateDmEvent.kind),
+    authors = listOf(account.userProfile().pubkeyHex),
+    tags = withUser?.let { mapOf("p" to listOf(it.pubkeyHex)) }
+  )
+
+  val incomingChannel = requestNewChannel()
+  val outgoingChannel = requestNewChannel()
+
+  // returns the last Note of each user.
+  override fun feed(): List<Note> {
+    val messages = account.userProfile().messages[withUser]
+
+    return messages?.sortedBy { it.event!!.createdAt } ?: emptyList()
+  }
+
+  override fun updateChannelFilters() {
+    incomingChannel.filter = createMessagesToMeFilter()
+    outgoingChannel.filter = createMessagesFromMeFilter()
+  }
+}

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

@@ -0,0 +1,70 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import nostr.postr.JsonFilter
+import nostr.postr.events.PrivateDmEvent
+
+object NostrChatroomListDataSource: NostrDataSource<Note>("MailBoxFeed") {
+  lateinit var account: Account
+
+  fun createMessagesToMeFilter() = JsonFilter(
+    kinds = listOf(PrivateDmEvent.kind),
+    tags = mapOf("p" to listOf(account.userProfile().pubkeyHex))
+  )
+
+  fun createMessagesFromMeFilter() = JsonFilter(
+    kinds = listOf(PrivateDmEvent.kind),
+    authors = listOf(account.userProfile().pubkeyHex)
+  )
+
+  fun createMyChannelsFilter() = JsonFilter(
+    kinds = listOf(ChannelCreateEvent.kind),
+    ids = account.followingChannels.toList()
+  )
+
+  fun createMyChannelsInfoFilter() = JsonFilter(
+    kinds = listOf(ChannelMetadataEvent.kind),
+    tags = mapOf("e" to account.followingChannels.toList())
+  )
+
+  fun createMessagesToMyChannelsFilter() = JsonFilter(
+    kinds = listOf(ChannelMessageEvent.kind),
+    tags = mapOf("e" to account.followingChannels.toList()),
+    since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 1), // 24 hours
+  )
+
+  val incomingChannel = requestNewChannel()
+  val outgoingChannel = requestNewChannel()
+
+  val myChannelsChannel = requestNewChannel()
+  val myChannelsInfoChannel = requestNewChannel()
+  val myChannelsMessagesChannel = requestNewChannel()
+
+  // returns the last Note of each user.
+  override fun feed(): List<Note> {
+    val messages = account.userProfile().messages
+    val messagingWith = messages.keys().toList()
+
+    val privateMessages = messagingWith.mapNotNull {
+      messages[it]?.sortedBy { it.event?.createdAt }?.last { it.event != null }
+    }
+
+    val publicChannels = account.followingChannels().map {
+      it.notes.values.sortedBy { it.event?.createdAt }.last { it.event != null }
+    }
+
+    return (privateMessages + publicChannels).sortedBy { it.event?.createdAt }.reversed()
+  }
+
+  override fun updateChannelFilters() {
+    incomingChannel.filter = createMessagesToMeFilter()
+    outgoingChannel.filter = createMessagesFromMeFilter()
+    myChannelsChannel.filter = createMyChannelsFilter()
+    myChannelsInfoChannel.filter = createMyChannelsInfoFilter()
+    myChannelsMessagesChannel.filter = createMessagesToMyChannelsFilter()
+  }
+}

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

@@ -1,7 +1,11 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+import com.vitorpamplona.amethyst.service.model.ChannelHideMessageEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMuteUserEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.service.relays.Client
@@ -15,7 +19,7 @@ import nostr.postr.events.PrivateDmEvent
 import nostr.postr.events.RecommendRelayEvent
 import nostr.postr.events.TextNoteEvent
 
-abstract class NostrDataSource(val debugName: String) {
+abstract class NostrDataSource<T>(val debugName: String) {
   private val channels = Collections.synchronizedSet(mutableSetOf<Channel>())
   private val channelIds =  Collections.synchronizedSet(mutableSetOf<String>())
 
@@ -34,6 +38,12 @@ abstract class NostrDataSource(val debugName: String) {
           else -> when (event.kind) {
             RepostEvent.kind -> LocalCache.consume(RepostEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
             ReactionEvent.kind -> LocalCache.consume(ReactionEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
+
+            ChannelCreateEvent.kind -> LocalCache.consume(ChannelCreateEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
+            ChannelMetadataEvent.kind -> LocalCache.consume(ChannelMetadataEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
+            ChannelMessageEvent.kind -> LocalCache.consume(ChannelMessageEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
+            ChannelHideMessageEvent.kind -> LocalCache.consume(ChannelHideMessageEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
+            ChannelMuteUserEvent.kind -> LocalCache.consume(ChannelMuteUserEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
           }
         }
       }
@@ -57,6 +67,10 @@ abstract class NostrDataSource(val debugName: String) {
         resetFilters()
       }*/
     }
+
+    override fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay) {
+
+    }
   }
 
   init {
@@ -74,7 +88,7 @@ abstract class NostrDataSource(val debugName: String) {
     }
   }
 
-  fun loadTop(): List<Note> {
+  fun loadTop(): List<T> {
     return feed().take(100)
   }
 
@@ -131,5 +145,5 @@ abstract class NostrDataSource(val debugName: String) {
   }
 
   abstract fun updateChannelFilters()
-  abstract fun feed(): List<Note>
+  abstract fun feed(): List<T>
 }

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

@@ -1,10 +1,11 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
 import nostr.postr.JsonFilter
 import nostr.postr.events.TextNoteEvent
 
-object NostrGlobalDataSource: NostrDataSource("GlobalFeed") {
+object NostrGlobalDataSource: NostrDataSource<Note>("GlobalFeed") {
   val fifteenMinutes = (60*15) // 15 mins
 
   fun createGlobalFilter() = JsonFilter(

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

@@ -9,7 +9,7 @@ import nostr.postr.JsonFilter
 import nostr.postr.events.TextNoteEvent
 import nostr.postr.toHex
 
-object NostrHomeDataSource: NostrDataSource("HomeFeed") {
+object NostrHomeDataSource: NostrDataSource<Note>("HomeFeed") {
   lateinit var account: Account
 
   private val cacheListener: (UserState) -> Unit = {
@@ -29,11 +29,13 @@ object NostrHomeDataSource: NostrDataSource("HomeFeed") {
   }
 
   fun createFollowAccountsFilter(): JsonFilter? {
-    val follows = account.userProfile().follows?.map {
-      it.pubkey.toHex().substring(0, 6)
-    }
+    val follows = listOf(account.userProfile().pubkeyHex.substring(0, 6)).plus(
+      account.userProfile().follows?.map {
+        it.pubkey.toHex().substring(0, 6)
+      } ?: emptyList()
+    )
 
-    if (follows == null || follows.isEmpty()) return null
+    if (follows.isEmpty()) return null
 
     return JsonFilter(
       kinds = listOf(TextNoteEvent.kind, RepostEvent.kind),

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

@@ -4,11 +4,11 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
 import nostr.postr.JsonFilter
 
-object NostrNotificationDataSource: NostrDataSource("GlobalFeed") {
+object NostrNotificationDataSource: NostrDataSource<Note>("GlobalFeed") {
   lateinit var account: Account
 
   fun createGlobalFilter() = JsonFilter(
-    since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 7), // 2 days
+    since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 7), // 7 days
     tags = mapOf("p" to listOf(account.userProfile().pubkeyHex).filterNotNull())
   )
 

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

@@ -2,10 +2,13 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.ReactionEvent
+import com.vitorpamplona.amethyst.service.model.RepostEvent
 import java.util.Collections
 import nostr.postr.JsonFilter
+import nostr.postr.events.TextNoteEvent
 
-object NostrSingleEventDataSource: NostrDataSource("SingleEventFeed") {
+object NostrSingleEventDataSource: NostrDataSource<Note>("SingleEventFeed") {
   val eventsToWatch = Collections.synchronizedList(mutableListOf<String>())
 
   fun createRepliesAndReactionsFilter(): JsonFilter? {
@@ -15,7 +18,9 @@ object NostrSingleEventDataSource: NostrDataSource("SingleEventFeed") {
       return null
     }
 
+    // downloads all the reactions to a given event.
     return JsonFilter(
+      kinds = listOf(TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind),
       tags = mapOf("e" to reactionsToWatch)
     )
   }
@@ -39,6 +44,7 @@ object NostrSingleEventDataSource: NostrDataSource("SingleEventFeed") {
       return null
     }
 
+    // downloads linked events to this event.
     return JsonFilter(
       ids = interestedEvents
     )

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

@@ -6,7 +6,7 @@ import java.util.Collections
 import nostr.postr.JsonFilter
 import nostr.postr.events.MetadataEvent
 
-object NostrSingleUserDataSource: NostrDataSource("SingleUserFeed") {
+object NostrSingleUserDataSource: NostrDataSource<Note>("SingleUserFeed") {
   val usersToWatch = Collections.synchronizedList(mutableListOf<String>())
 
   fun createUserFilter(): JsonFilter? {

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

@@ -5,7 +5,7 @@ import com.vitorpamplona.amethyst.model.Note
 import java.util.Collections
 import nostr.postr.JsonFilter
 
-object NostrThreadDataSource: NostrDataSource("SingleThreadFeed") {
+object NostrThreadDataSource: NostrDataSource<Note>("SingleThreadFeed") {
   val eventsToWatch = Collections.synchronizedList(mutableListOf<String>())
 
   fun createRepliesAndReactionsFilter(): JsonFilter? {

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

@@ -0,0 +1,45 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
+import nostr.postr.JsonFilter
+import nostr.postr.events.MetadataEvent
+import nostr.postr.events.TextNoteEvent
+
+object NostrUserProfileDataSource: NostrDataSource<Note>("UserProfileFeed") {
+  var user: User? = null
+
+  fun loadUserProfile(userId: String) {
+    user = LocalCache.users[userId]
+    resetFilters()
+  }
+
+  fun createUserInfoFilter(): JsonFilter {
+    return JsonFilter(
+      kinds = listOf(MetadataEvent.kind),
+      authors = listOf(user!!.pubkeyHex),
+      since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 7)
+    )
+  }
+
+  fun createUserPostsFilter(): JsonFilter {
+    return JsonFilter(
+      kinds = listOf(TextNoteEvent.kind),
+      authors = listOf(user!!.pubkeyHex),
+      since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 4)
+    )
+  }
+
+  val userInfoChannel = requestNewChannel()
+  val notesChannel = requestNewChannel()
+
+  override fun feed(): List<Note> {
+    return user?.notes?.sortedBy { it.event?.createdAt }?.reversed() ?: emptyList()
+  }
+
+  override fun updateChannelFilters() {
+    userInfoChannel.filter = createUserInfoFilter()
+    notesChannel.filter = createUserPostsFilter()
+  }
+}

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

@@ -0,0 +1,31 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.User
+import nostr.postr.JsonFilter
+import nostr.postr.events.ContactListEvent
+
+object NostrUserProfileFollowersDataSource: NostrDataSource<User>("UserProfileFollowerFeed") {
+  var user: User? = null
+
+  fun loadUserProfile(userId: String) {
+    user = LocalCache.users[userId]
+    resetFilters()
+  }
+
+  fun createFollowersFilter() = JsonFilter(
+    kinds = listOf(ContactListEvent.kind),
+    since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 7), // 7 days
+    tags = mapOf("p" to listOf(user!!.pubkeyHex).filterNotNull())
+  )
+
+  val followerChannel = requestNewChannel()
+
+  override fun feed(): List<User> {
+    return user?.followers?.toList() ?: emptyList()
+  }
+
+  override fun updateChannelFilters() {
+    followerChannel.filter = createFollowersFilter()
+  }
+}

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

@@ -0,0 +1,33 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.User
+import nostr.postr.JsonFilter
+import nostr.postr.events.ContactListEvent
+
+object NostrUserProfileFollowsDataSource: NostrDataSource<User>("UserProfileFollowsFeed") {
+  var user: User? = null
+
+  fun loadUserProfile(userId: String) {
+    user = LocalCache.users[userId]
+    resetFilters()
+  }
+
+  fun createFollowFilter(): JsonFilter {
+    return JsonFilter(
+      kinds = listOf(ContactListEvent.kind),
+      authors = listOf(user!!.pubkeyHex),
+      since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 7), // 4 days
+    )
+  }
+
+  val followChannel = requestNewChannel()
+
+  override fun feed(): List<User> {
+    return user?.follows?.toList() ?: emptyList()
+  }
+
+  override fun updateChannelFilters() {
+    followChannel.filter = createFollowFilter()
+  }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/ChannelCreateEvent.kt

@@ -0,0 +1,44 @@
+package com.vitorpamplona.amethyst.service.model
+
+import java.util.Date
+import nostr.postr.Utils
+import nostr.postr.events.Event
+import nostr.postr.events.MetadataEvent
+
+class ChannelCreateEvent (
+  id: ByteArray,
+  pubKey: ByteArray,
+  createdAt: Long,
+  tags: List<List<String>>,
+  content: String,
+  sig: ByteArray
+): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+  @Transient val channelInfo: ChannelData
+
+  init {
+    try {
+      channelInfo = MetadataEvent.gson.fromJson(content, ChannelData::class.java)
+    } catch (e: Exception) {
+      throw Error("can't parse $content", e)
+    }
+  }
+
+  companion object {
+    const val kind = 40
+
+    fun create(channelInfo: ChannelData?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelCreateEvent {
+      val content = if (channelInfo != null)
+        gson.toJson(channelInfo)
+      else
+        ""
+
+      val pubKey = Utils.pubkeyCreate(privateKey)
+      val tags = emptyList<List<String>>()
+      val id = generateId(pubKey, createdAt, kind, tags, content)
+      val sig = Utils.sign(id, privateKey)
+      return ChannelCreateEvent(id, pubKey, createdAt, tags, content, sig)
+    }
+  }
+
+  data class ChannelData(var name: String?, var about: String?, var picture: String?)
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/ChannelHideMessageEvent.kt

@@ -0,0 +1,38 @@
+package com.vitorpamplona.amethyst.service.model
+
+import java.util.Date
+import nostr.postr.Utils
+import nostr.postr.events.Event
+import nostr.postr.toHex
+
+class ChannelHideMessageEvent (
+  id: ByteArray,
+  pubKey: ByteArray,
+  createdAt: Long,
+  tags: List<List<String>>,
+  content: String,
+  sig: ByteArray
+): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+  @Transient val eventsToHide: List<String>
+
+  init {
+    eventsToHide = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+  }
+
+  companion object {
+    const val kind = 43
+
+    fun create(reason: String, messagesToHide: List<String>?, mentions: List<String>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelHideMessageEvent {
+      val content = reason
+      val pubKey = Utils.pubkeyCreate(privateKey)
+      val tags =
+        messagesToHide?.map {
+          listOf("e", it)
+        } ?: emptyList()
+
+      val id = generateId(pubKey, createdAt, kind, tags, content)
+      val sig = Utils.sign(id, privateKey)
+      return ChannelHideMessageEvent(id, pubKey, createdAt, tags, content, sig)
+    }
+  }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/ChannelMessageEvent.kt

@@ -0,0 +1,47 @@
+package com.vitorpamplona.amethyst.service.model
+
+import java.util.Date
+import nostr.postr.Utils
+import nostr.postr.events.Event
+import nostr.postr.toHex
+
+class ChannelMessageEvent (
+  id: ByteArray,
+  pubKey: ByteArray,
+  createdAt: Long,
+  tags: List<List<String>>,
+  content: String,
+  sig: ByteArray
+): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+  @Transient val channel: String?
+  @Transient val replyTos: List<String>
+  @Transient val mentions: List<String>
+
+  init {
+    channel = tags.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }?.getOrNull(1) ?: tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
+    replyTos = tags.filter { it.firstOrNull() == "e" && (it.size < 3 || (it.size > 3 && it[3] != "root")) }.mapNotNull { it.getOrNull(1) }
+    mentions = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+  }
+
+  companion object {
+    const val kind = 42
+
+    fun create(message: String, channel: String, replyTos: List<String>? = null, mentions: List<String>? = null, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMessageEvent {
+      val content = message
+      val pubKey = Utils.pubkeyCreate(privateKey)
+      val tags = mutableListOf(
+        listOf("e", channel, "", "root")
+      )
+      replyTos?.forEach {
+        tags.add(listOf("e", it))
+      }
+      mentions?.forEach {
+        tags.add(listOf("p", it))
+      }
+
+      val id = generateId(pubKey, createdAt, kind, tags, content)
+      val sig = Utils.sign(id, privateKey)
+      return ChannelMessageEvent(id, pubKey, createdAt, tags, content, sig)
+    }
+  }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/ChannelMetadataEvent.kt

@@ -0,0 +1,46 @@
+package com.vitorpamplona.amethyst.service.model
+
+import java.util.Date
+import nostr.postr.ContactMetaData
+import nostr.postr.Utils
+import nostr.postr.events.Event
+import nostr.postr.events.MetadataEvent
+import nostr.postr.toHex
+
+class ChannelMetadataEvent (
+  id: ByteArray,
+  pubKey: ByteArray,
+  createdAt: Long,
+  tags: List<List<String>>,
+  content: String,
+  sig: ByteArray
+): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+  @Transient val channel: String?
+  @Transient val channelInfo: ChannelCreateEvent.ChannelData
+
+  init {
+    channel = tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
+    try {
+      channelInfo = MetadataEvent.gson.fromJson(content, ChannelCreateEvent.ChannelData::class.java)
+    } catch (e: Exception) {
+      throw Error("can't parse $content", e)
+    }
+  }
+
+  companion object {
+    const val kind = 41
+
+    fun create(newChannelInfo: ChannelCreateEvent.ChannelData?, originalChannel: ChannelCreateEvent, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMetadataEvent {
+      val content = if (newChannelInfo != null)
+        gson.toJson(newChannelInfo)
+      else
+        ""
+
+      val pubKey = Utils.pubkeyCreate(privateKey)
+      val tags = listOf( listOf("e", originalChannel.id.toHex(), "", "root") )
+      val id = generateId(pubKey, createdAt, kind, tags, content)
+      val sig = Utils.sign(id, privateKey)
+      return ChannelMetadataEvent(id, pubKey, createdAt, tags, content, sig)
+    }
+  }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/ChannelMuteUserEvent.kt

@@ -0,0 +1,39 @@
+package com.vitorpamplona.amethyst.service.model
+
+import java.util.Date
+import nostr.postr.Utils
+import nostr.postr.events.Event
+import nostr.postr.events.MetadataEvent
+import nostr.postr.toHex
+
+class ChannelMuteUserEvent (
+  id: ByteArray,
+  pubKey: ByteArray,
+  createdAt: Long,
+  tags: List<List<String>>,
+  content: String,
+  sig: ByteArray
+): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+  @Transient val usersToMute: List<String>
+
+  init {
+    usersToMute = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+  }
+
+  companion object {
+    const val kind = 43
+
+    fun create(reason: String, usersToMute: List<String>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMuteUserEvent {
+      val content = reason
+      val pubKey = Utils.pubkeyCreate(privateKey)
+      val tags =
+        usersToMute?.map {
+          listOf("p", it)
+        } ?: emptyList()
+
+      val id = generateId(pubKey, createdAt, kind, tags, content)
+      val sig = Utils.sign(id, privateKey)
+      return ChannelMuteUserEvent(id, pubKey, createdAt, tags, content, sig)
+    }
+  }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/ReactionEvent.kt

@@ -25,8 +25,11 @@ class ReactionEvent (
   companion object {
     const val kind = 7
 
-    fun create(originalNote: Event, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
-      val content = "+"
+    fun createLike(originalNote: Event, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
+      return create("+", originalNote, privateKey, createdAt)
+    }
+
+    fun create(content: String, originalNote: Event, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
       val pubKey = Utils.pubkeyCreate(privateKey)
       val tags = listOf( listOf("e", originalNote.id.toHex()), listOf("p", originalNote.pubKey.toHex()))
       val id = generateId(pubKey, createdAt, kind, tags, content)

app/src/main/java/com/vitorpamplona/amethyst/service/relays/Client.kt

@@ -85,6 +85,10 @@ object Client: RelayPool.Listener {
         listeners.forEach { it.onRelayStateChange(type, relay) }
     }
 
+    override fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay) {
+        listeners.forEach { it.onSendResponse(eventId, success, message, relay) }
+    }
+
     fun subscribe(listener: Listener) {
         listeners.add(listener)
     }
@@ -109,5 +113,10 @@ object Client: RelayPool.Listener {
          * Connected to or disconnected from a relay
          */
         open fun onRelayStateChange(type: Relay.Type, relay: Relay) = Unit
+
+        /**
+         * When an relay saves or rejects a new event.
+         */
+        open fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay) = Unit
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt

@@ -59,8 +59,7 @@ class Relay(
                             it.onError(this@Relay, channel, Error("Relay sent notice: $channel"))
                         }
                         "OK" -> listeners.forEach {
-                            // "channel" being the second string in the string array ...
-                            // Event was saved correctly?
+                            it.onSendResponse(this@Relay, msg[1].asString, msg[2].asBoolean, msg[3].asString)
                         }
                         else -> listeners.forEach {
                             it.onError(
@@ -155,6 +154,7 @@ class Relay(
 
         fun onError(relay: Relay, subscriptionId: String, error: Error)
 
+        fun onSendResponse(relay: Relay, eventId: String, success: Boolean, message: String)
         /**
          * Connected to or disconnected from a relay
          *

app/src/main/java/com/vitorpamplona/amethyst/service/relays/RelayPool.kt

@@ -12,9 +12,12 @@ object RelayPool: Relay.Listener {
     private val relays = Collections.synchronizedList(ArrayList<Relay>())
     private val listeners = Collections.synchronizedSet(HashSet<Listener>())
 
-    fun report(): String {
-        val connected = relays.filter { it.isConnected() }
-        return "${connected.size}/${relays.size}"
+    fun availableRelays(): Int {
+        return relays.size
+    }
+
+    fun connectedRelays(): Int {
+        return relays.filter { it.isConnected() }.size
     }
 
     fun loadRelays(relayList: List<Relay>? = null){
@@ -79,6 +82,8 @@ object RelayPool: Relay.Listener {
         fun onError(error: Error, subscriptionId: String, relay: Relay)
 
         fun onRelayStateChange(type: Relay.Type, relay: Relay)
+
+        fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay)
     }
 
     @Synchronized
@@ -96,6 +101,10 @@ object RelayPool: Relay.Listener {
         refreshObservers()
     }
 
+    override fun onSendResponse(relay: Relay, eventId: String, success: Boolean, message: String) {
+        listeners.forEach { it.onSendResponse(eventId, success, message, relay) }
+    }
+
     // Observers line up here.
     val live: RelayPoolLiveData = RelayPoolLiveData(this)
 

app/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui
 
+import android.os.Build.VERSION.SDK_INT
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
@@ -8,14 +9,23 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.viewmodel.compose.viewModel
+import coil.Coil
+import coil.ImageLoader
+import coil.decode.GifDecoder
+import coil.decode.ImageDecoderDecoder
+import coil.decode.SvgDecoder
 import com.vitorpamplona.amethyst.KeyStorage
 import com.vitorpamplona.amethyst.service.NostrAccountDataSource
+import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
 import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
 import com.vitorpamplona.amethyst.service.NostrHomeDataSource
 import com.vitorpamplona.amethyst.service.NostrNotificationDataSource
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
 import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
 import com.vitorpamplona.amethyst.service.NostrThreadDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileFollowersDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileFollowsDataSource
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.ui.screen.AccountScreen
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
@@ -25,6 +35,17 @@ class MainActivity : ComponentActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
 
+    Coil.setImageLoader {
+      ImageLoader.Builder(this).components {
+        if (SDK_INT >= 28) {
+          add(ImageDecoderDecoder.Factory())
+        } else {
+          add(GifDecoder.Factory())
+        }
+        add(SvgDecoder.Factory())
+      }.build()
+    }
+
     setContent {
       AmethystTheme {
         // A surface container using the 'background' color from the theme
@@ -50,6 +71,10 @@ class MainActivity : ComponentActivity() {
   override fun onPause() {
     NostrAccountDataSource.stop()
     NostrHomeDataSource.stop()
+    NostrChatroomListDataSource.stop()
+    NostrUserProfileDataSource.stop()
+    NostrUserProfileFollowersDataSource.stop()
+    NostrUserProfileFollowsDataSource.stop()
 
     NostrGlobalDataSource.stop()
     NostrNotificationDataSource.stop()

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

@@ -0,0 +1,57 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import android.graphics.Bitmap
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import java.io.ByteArrayOutputStream
+import java.io.IOException
+import java.util.UUID
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.MultipartBody
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.Response
+
+object ImageUploader {
+  private fun encodeImage(bitmap: Bitmap): ByteArray {
+    val byteArrayOutPutStream = ByteArrayOutputStream()
+    bitmap.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutPutStream)
+    return byteArrayOutPutStream.toByteArray()
+  }
+
+  fun uploadImage(bitmap: Bitmap, onSuccess: (String) -> Unit) {
+    val client = OkHttpClient.Builder().build()
+
+    val body: RequestBody = MultipartBody.Builder()
+      .setType(MultipartBody.FORM)
+      .addFormDataPart(
+        "image",
+        "${UUID.randomUUID()}.png",
+        encodeImage(bitmap).toRequestBody("image/png".toMediaType())
+      )
+      .build()
+
+    val request: Request = Request.Builder()
+      .url("https://api.imgur.com/3/image")
+      .header("Authorization", "Client-ID e6aea87296f3f96")
+      .post(body)
+      .build()
+
+    client.newCall(request).enqueue(object : Callback {
+      override fun onResponse(call: Call, response: Response) {
+        response.use {
+          val tree = jacksonObjectMapper().readTree(response.body!!.string())
+          val url = tree.get("data").get("link").asText()
+          onSuccess(url)
+        }
+      }
+
+      override fun onFailure(call: Call, e: IOException) {
+        e.printStackTrace()
+      }
+    })
+  }
+}

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

@@ -17,48 +17,64 @@ import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.material.TextFieldDefaults
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.setValue
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
-import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewmodel.compose.viewModel
+import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.ui.components.UrlPreview
+import com.vitorpamplona.amethyst.ui.components.imageExtension
+import com.vitorpamplona.amethyst.ui.navigation.UploadFromGallery
+import kotlinx.coroutines.delay
 import nostr.postr.events.TextNoteEvent
 
-class PostViewModel: ViewModel() {
-    var account: Account? = null
-    var message by mutableStateOf("")
-    var replyingTo: Note? = null
-
-    fun sendPost() {
-        account?.sendPost(message, replyingTo)
-    }
-}
 
+@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun NewPostView(onClose: () -> Unit, replyingTo: Note? = null, account: Account) {
-    val postViewModel: PostViewModel = viewModel<PostViewModel>().apply {
+    val postViewModel: NewPostViewModel = viewModel<NewPostViewModel>().apply {
         this.replyingTo = replyingTo
         this.account = account
     }
 
-    val dialogProperties = DialogProperties()
+    val context = LocalContext.current
+
+    // initialize focus reference to be able to request focus programmatically
+    val focusRequester = FocusRequester()
+    val keyboardController = LocalSoftwareKeyboardController.current
+
+    LaunchedEffect(Unit) {
+        delay(100)
+        focusRequester.requestFocus()
+    }
+
     Dialog(
-        onDismissRequest = { onClose() }, properties = dialogProperties
+        onDismissRequest = { onClose() },
+        properties = DialogProperties(
+            usePlatformDefaultWidth = false,
+            dismissOnClickOutside = false
+        )
     ) {
         Surface(
             modifier = Modifier
                 .fillMaxWidth()
-                .fillMaxHeight(0.5f)
+                .fillMaxHeight()
         ) {
             Column(
                 modifier = Modifier.padding(10.dp)
@@ -69,13 +85,21 @@ fun NewPostView(onClose: () -> Unit, replyingTo: Note? = null, account: Account)
                     horizontalArrangement = Arrangement.SpaceBetween,
                     verticalAlignment = Alignment.CenterVertically
                 ) {
-                    CloseButton(onCancel = onClose)
+                    CloseButton(onCancel = {
+                        postViewModel.cancel()
+                        onClose()
+                    })
+
+                    UploadFromGallery {
+                        postViewModel.upload(it, context)
+                    }
 
                     PostButton(
                         onPost = {
                             postViewModel.sendPost()
                             onClose()
-                        }
+                        },
+                        postViewModel.message.isNotBlank()
                     )
                 }
 
@@ -96,16 +120,26 @@ fun NewPostView(onClose: () -> Unit, replyingTo: Note? = null, account: Account)
 
                 OutlinedTextField(
                     value = postViewModel.message,
-                    onValueChange = { postViewModel.message = it },
+                    onValueChange = {
+                        postViewModel.message = it
+                        postViewModel.urlPreview = postViewModel.findUrlInMessage()
+                    },
                     keyboardOptions = KeyboardOptions.Default.copy(
                         capitalization = KeyboardCapitalization.Sentences
                     ),
-                    modifier = Modifier.fillMaxWidth().fillMaxHeight()
+                    modifier = Modifier
+                        .fillMaxWidth()
                         .border(
                             width = 1.dp,
                             color = MaterialTheme.colors.surface,
                             shape = RoundedCornerShape(8.dp)
-                        ),
+                        )
+                        .focusRequester(focusRequester)
+                        .onFocusChanged {
+                            if (it.isFocused) {
+                                keyboardController?.show()
+                            }
+                        },
                     placeholder = {
                         Text(
                             text = "What's on your mind?",
@@ -117,15 +151,39 @@ fun NewPostView(onClose: () -> Unit, replyingTo: Note? = null, account: Account)
                             unfocusedBorderColor = Color.Transparent,
                             focusedBorderColor = Color.Transparent
                         )
-
                 )
+
+                val myUrlPreview = postViewModel.urlPreview
+                if (myUrlPreview != null) {
+                    Column(modifier = Modifier.padding(top = 5.dp)) {
+                        val removedParamsFromUrl = myUrlPreview.split("?")[0].toLowerCase()
+                        if (imageExtension.matcher(removedParamsFromUrl).matches()) {
+                            AsyncImage(
+                                model = myUrlPreview,
+                                contentDescription = myUrlPreview,
+                                contentScale = ContentScale.FillWidth,
+                                modifier = Modifier
+                                    .padding(top = 4.dp)
+                                    .fillMaxWidth()
+                                    .clip(shape = RoundedCornerShape(15.dp))
+                                    .border(
+                                        1.dp,
+                                        MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
+                                        RoundedCornerShape(15.dp)
+                                    )
+                            )
+                        } else {
+                            UrlPreview("https://$myUrlPreview", myUrlPreview, false)
+                        }
+                    }
+                }
             }
         }
     }
 }
 
 @Composable
-private fun CloseButton(onCancel: () -> Unit) {
+fun CloseButton(onCancel: () -> Unit) {
     Button(
         onClick = {
             onCancel()
@@ -141,15 +199,17 @@ private fun CloseButton(onCancel: () -> Unit) {
 }
 
 @Composable
-private fun PostButton(onPost: () -> Unit = {}) {
+fun PostButton(onPost: () -> Unit = {}, isActive: Boolean) {
     Button(
         onClick = {
-            onPost()
+            if (isActive) {
+                onPost()
+            }
         },
         shape = RoundedCornerShape(20.dp),
         colors = ButtonDefaults
             .buttonColors(
-                backgroundColor = MaterialTheme.colors.primary
+                backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
             )
     ) {
         Text(text = "Post", color = Color.White)

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

@@ -0,0 +1,57 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import android.content.Context
+import android.graphics.ImageDecoder
+import android.net.Uri
+import android.os.Build
+import android.provider.MediaStore
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.lifecycle.ViewModel
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.ui.components.isValidURL
+import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
+
+class NewPostViewModel: ViewModel() {
+    var account: Account? = null
+    var replyingTo: Note? = null
+
+    var message by mutableStateOf("")
+    var urlPreview by mutableStateOf<String?>(null)
+
+    fun sendPost() {
+        account?.sendPost(message, replyingTo)
+        message = ""
+        urlPreview = null
+    }
+
+    fun upload(it: Uri, context: Context) {
+        val img = if (Build.VERSION.SDK_INT < 28) {
+            MediaStore.Images.Media.getBitmap(context.contentResolver, it)
+        } else {
+            ImageDecoder.decodeBitmap(ImageDecoder.createSource(context.contentResolver, it))
+        }
+
+        img?.let {
+            ImageUploader.uploadImage(img) {
+                message = message + "\n\n" + it
+                urlPreview = findUrlInMessage()
+            }
+        }
+    }
+
+    fun cancel() {
+        message = ""
+        urlPreview = null
+    }
+
+    fun findUrlInMessage(): String? {
+        return message.split('\n').firstNotNullOfOrNull { paragraph ->
+            paragraph.split(' ').firstOrNull { word: String ->
+                isValidURL(word) || noProtocolUrlValidator.matcher(word).matches()
+            }
+        }
+    }
+}

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

@@ -0,0 +1,84 @@
+package com.vitorpamplona.amethyst.ui.navigation
+
+import android.net.Uri
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Button
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.google.accompanist.permissions.isGranted
+import com.google.accompanist.permissions.rememberPermissionState
+
+@OptIn(ExperimentalPermissionsApi::class)
+@Composable
+fun UploadFromGallery(onImageChosen: (Uri) -> Unit) {
+    val cameraPermissionState = rememberPermissionState(
+        android.Manifest.permission.READ_MEDIA_IMAGES
+    )
+
+    if (cameraPermissionState.status.isGranted) {
+        var showGallerySelect by remember { mutableStateOf(false) }
+        if (showGallerySelect) {
+            GallerySelect(
+                onImageUri = { uri ->
+                    showGallerySelect = false
+                    if (uri != null)
+                        onImageChosen(uri)
+                }
+            )
+        } else {
+            Box() {
+                Button(
+                    modifier = Modifier
+                        .align(Alignment.TopCenter)
+                        .padding(4.dp),
+                    onClick = {
+                        showGallerySelect = true
+                    }
+                ) {
+                    Text("Add Image from Gallery")
+                }
+            }
+        }
+    } else {
+        Column {
+            Button(onClick = { cameraPermissionState.launchPermissionRequest() }) {
+                Text("Add Image from Gallery")
+            }
+        }
+    }
+}
+
+
+@Composable
+fun GallerySelect(
+    onImageUri: (Uri?) -> Unit = { }
+) {
+    val launcher = rememberLauncherForActivityResult(
+        contract = ActivityResultContracts.GetContent(),
+        onResult = { uri: Uri? ->
+            onImageUri(uri)
+        }
+    )
+
+    @Composable
+    fun LaunchGallery() {
+        SideEffect {
+            launcher.launch("image/*")
+        }
+    }
+
+    LaunchGallery()
+}

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

@@ -0,0 +1,26 @@
+package com.vitorpamplona.amethyst.ui.components
+
+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.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.text.AnnotatedString
+import androidx.navigation.NavController
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.toNote
+import com.vitorpamplona.amethyst.ui.note.toShortenHex
+
+@Composable
+fun ClickableNoteTag(
+  note: Note,
+  navController: NavController
+) {
+  val innerNoteState by note.live.observeAsState()
+  ClickableText(
+    text = AnnotatedString("@${innerNoteState?.note?.id?.toNote()?.toShortenHex()} "),
+    onClick = { navController.navigate("Note/${innerNoteState?.note?.idHex}") },
+    style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
+  )
+}

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

@@ -0,0 +1,19 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import androidx.compose.foundation.text.ClickableText
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.text.AnnotatedString
+
+@Composable
+fun ClickableUrl(urlText: String, url: String) {
+  val uri = LocalUriHandler.current
+
+  ClickableText(
+    text = AnnotatedString("$urlText "),
+    onClick = { runCatching { uri.openUri(url) } },
+    style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary),
+  )
+}

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

@@ -0,0 +1,24 @@
+package com.vitorpamplona.amethyst.ui.components
+
+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.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.text.AnnotatedString
+import androidx.navigation.NavController
+import com.vitorpamplona.amethyst.model.User
+
+@Composable
+fun ClickableUserTag(
+  user: User,
+  navController: NavController
+) {
+  val innerUserState by user.live.observeAsState()
+  ClickableText(
+    text = AnnotatedString("@${innerUserState?.user?.toBestDisplayName()} "),
+    onClick = { navController.navigate("User/${innerUserState?.user?.pubkeyHex}") },
+    style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
+  )
+}

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

@@ -0,0 +1,107 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import android.content.Intent
+import android.net.Uri
+import androidx.compose.foundation.border
+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.shape.RoundedCornerShape
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.Divider
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+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.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.core.content.ContextCompat.startActivity
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
+
+@Composable
+fun InvoicePreview(lnInvoice: String) {
+  val amount = try {
+    LnInvoiceUtil.getAmountInSats(lnInvoice)
+  } catch (e: Exception) {
+    e.printStackTrace()
+    null
+  }
+
+  val context = LocalContext.current
+
+  Column(modifier = Modifier
+    .fillMaxWidth()
+    .padding(start = 30.dp, end = 30.dp)
+    .clip(shape = RoundedCornerShape(10.dp))
+    .border(1.dp, MaterialTheme.colors.onSurface.copy(alpha = 0.12f), RoundedCornerShape(15.dp))
+  ) {
+
+    Column(
+      modifier = Modifier
+        .fillMaxWidth()
+        .padding(30.dp)
+    ) {
+
+      Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier
+          .fillMaxWidth()
+          .padding(bottom = 10.dp)
+      ) {
+        Icon(
+          painter = painterResource(R.drawable.lightning),
+          null,
+          modifier = Modifier.size(20.dp),
+          tint = Color.Unspecified
+        )
+
+        Text(
+          text = "Lightning Invoice",
+          fontSize = 20.sp,
+          fontWeight = FontWeight.W500,
+          modifier = Modifier.padding(start = 10.dp)
+        )
+      }
+
+      Divider()
+
+      amount?.let {
+        Text(
+          text = "${amount.toInt()} sats",
+          fontSize = 25.sp,
+          fontWeight = FontWeight.W500,
+          modifier = Modifier
+            .fillMaxWidth()
+            .padding(vertical = 10.dp),
+        )
+      } 
+
+      Button(
+        modifier = Modifier.fillMaxWidth().padding(vertical = 10.dp),
+        onClick = {
+          runCatching {
+            val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning://$lnInvoice"))
+            startActivity(context, intent, null)
+          }
+        },
+        shape = RoundedCornerShape(15.dp),
+        colors = ButtonDefaults.buttonColors(
+          backgroundColor = MaterialTheme.colors.primary
+        )
+      ) {
+        Text(text = "Pay", color = Color.White, fontSize = 20.sp)
+      }
+    }
+  }
+}

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

@@ -1,30 +1,32 @@
 package com.vitorpamplona.amethyst.ui.components
 
-import androidx.compose.foundation.border
+import android.util.Patterns
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
-import coil.compose.AsyncImage
+import androidx.navigation.NavController
 import com.google.accompanist.flowlayout.FlowRow
+import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.ui.note.toShortenHex
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import java.net.MalformedURLException
 import java.net.URISyntaxException
 import java.net.URL
 import java.util.regex.Pattern
 
-val imageExtension = Pattern.compile("(.*/)*.+\\.(png|jpg|gif|bmp|jpeg|webp)$")
+val imageExtension = Pattern.compile("(.*/)*.+\\.(png|jpg|gif|bmp|jpeg|webp|svg)$")
+val videoExtension = Pattern.compile("(.*/)*.+\\.(mp4|avi|wmv|mpg|amv|webm)$")
 val noProtocolUrlValidator = Pattern.compile("^[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b(?:[-a-zA-Z0-9()@:%_\\+.~#?&//=]*)$")
-val tagIndex = Pattern.compile("\\#\\[([0-9]*)\\]")
+val tagIndex = Pattern.compile(".*\\#\\[([0-9]+)\\].*")
+
+val mentionsPattern: Pattern = Pattern.compile("@([A-Za-z0-9_-]+)")
+val hashTagsPattern: Pattern = Pattern.compile("#([A-Za-z0-9_-]+)")
+val urlPattern: Pattern = Patterns.WEB_URL
 
 fun isValidURL(url: String?): Boolean {
   return try {
@@ -38,7 +40,7 @@ fun isValidURL(url: String?): Boolean {
 }
 
 @Composable
-fun RichTextViewer(content: String, tags: List<List<String>>?) {
+fun RichTextViewer(content: String, tags: List<List<String>>?, note: Note, accountViewModel: AccountViewModel, navController: NavController) {
   Column(modifier = Modifier.padding(top = 5.dp)) {
     // FlowRow doesn't work well with paragraphs. So we need to split them
     content.split('\n').forEach { paragraph ->
@@ -46,26 +48,22 @@ fun RichTextViewer(content: String, tags: List<List<String>>?) {
       FlowRow() {
         paragraph.split(' ').forEach { word: String ->
           // Explicit URL
-          if (isValidURL(word)) {
+          val lnInvoice = LnInvoiceUtil.findInvoice(word)
+          if (lnInvoice != null) {
+            InvoicePreview(lnInvoice)
+          } else if (isValidURL(word)) {
             val removedParamsFromUrl = word.split("?")[0].toLowerCase()
             if (imageExtension.matcher(removedParamsFromUrl).matches()) {
-              AsyncImage(
-                model = word,
-                contentDescription = word,
-                contentScale = ContentScale.FillWidth,
-                modifier = Modifier
-                  .padding(top = 4.dp)
-                  .fillMaxWidth()
-                  .clip(shape = RoundedCornerShape(15.dp))
-                  .border(1.dp, MaterialTheme.colors.onSurface.copy(alpha = 0.12f), RoundedCornerShape(15.dp))
-              )
+              ZoomableImageView(word)
+            } else if (videoExtension.matcher(removedParamsFromUrl).matches()) {
+              VideoView(word)
             } else {
               UrlPreview(word, word)
             }
           } else if (noProtocolUrlValidator.matcher(word).matches()) {
             UrlPreview("https://$word", word)
           } else if (tagIndex.matcher(word).matches() && tags != null) {
-            TagLink(word, tags)
+            TagLink(word, tags, navController)
           } else {
             Text(text = "$word ")
           }
@@ -77,7 +75,7 @@ fun RichTextViewer(content: String, tags: List<List<String>>?) {
 }
 
 @Composable
-fun TagLink(word: String, tags: List<List<String>>) {
+fun TagLink(word: String, tags: List<List<String>>, navController: NavController) {
   val matcher = tagIndex.matcher(word)
 
   val index = try {
@@ -92,24 +90,23 @@ fun TagLink(word: String, tags: List<List<String>>) {
     return Text(text = "$word ")
   }
 
-  if (index > 0 && index < tags.size) {
+  if (index >= 0 && index < tags.size) {
     if (tags[index][0] == "p") {
       val user = LocalCache.users[tags[index][1]]
       if (user != null) {
-        val innerUserState by user.live.observeAsState()
-        Text(
-          "${innerUserState?.user?.toBestDisplayName()}"
-        )
+        ClickableUserTag(user, navController)
+      } else {
+        Text(text = "${tags[index][1].toShortenHex()} ")
       }
     } else if (tags[index][0] == "e") {
       val note = LocalCache.notes[tags[index][1]]
       if (note != null) {
-        val innerNoteState by note.live.observeAsState()
-        Text(
-          "${innerNoteState?.note?.idDisplayHex}"
-        )
+        ClickableNoteTag(note, navController)
+      } else {
+        Text(text = "${tags[index][1].toShortenHex()} ")
       }
     } else
       Text(text = "$word ")
   }
-}
+}
+

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

@@ -1,109 +1,49 @@
 package com.vitorpamplona.amethyst.ui.components
 
 import androidx.compose.animation.Crossfade
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-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.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.ClickableText
-import androidx.compose.material.LocalTextStyle
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-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.LocalUriHandler
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import coil.compose.AsyncImage
-import com.baha.url.preview.BahaUrlPreview
 import com.baha.url.preview.IUrlPreviewCallback
 import com.baha.url.preview.UrlInfoItem
+import com.vitorpamplona.amethyst.model.UrlCachedPreviewer
 
 
 @Composable
-fun UrlPreview(url: String, urlText: String) {
+fun UrlPreview(url: String, urlText: String, showUrlIfError: Boolean = true) {
   var urlPreviewState by remember { mutableStateOf<UrlPreviewState>(UrlPreviewState.Loading) }
 
   // Doesn't use a viewModel because of viewModel reusing issues (too many UrlPreview are created).
-  LaunchedEffect(urlPreviewState) {
-    if (urlPreviewState == UrlPreviewState.Loading) {
-      val urlPreview = BahaUrlPreview(url, object : IUrlPreviewCallback {
-        override fun onComplete(urlInfo: UrlInfoItem) {
-          if (urlInfo.allFetchComplete() && urlInfo.url == url)
-            urlPreviewState = UrlPreviewState.Loaded(urlInfo)
-          else
-            urlPreviewState = UrlPreviewState.Empty
-        }
+  LaunchedEffect(url) {
+    UrlCachedPreviewer.previewInfo(url, object : IUrlPreviewCallback {
+      override fun onComplete(urlInfo: UrlInfoItem) {
+        if (urlInfo.allFetchComplete() && urlInfo.url == url)
+          urlPreviewState = UrlPreviewState.Loaded(urlInfo)
+        else
+          urlPreviewState = UrlPreviewState.Empty
+      }
 
-        override fun onFailed(throwable: Throwable) {
-          urlPreviewState = UrlPreviewState.Error("Error parsing preview for ${url}: ${throwable.message}")
-        }
-      })
-
-      urlPreview.fetchUrlPreview()
-    }
+      override fun onFailed(throwable: Throwable) {
+        urlPreviewState = UrlPreviewState.Error("Error parsing preview for ${url}: ${throwable.message}")
+      }
+    })
   }
 
-  val uri = LocalUriHandler.current
-
   Crossfade(targetState = urlPreviewState) { state ->
     when (state) {
       is UrlPreviewState.Loaded -> {
-        Row(
-          modifier = Modifier.clickable { runCatching { uri.openUri(url) } }
-            .clip(shape = RoundedCornerShape(15.dp))
-            .border(1.dp, MaterialTheme.colors.onSurface.copy(alpha = 0.12f), RoundedCornerShape(15.dp))
-        ) {
-          Column {
-            AsyncImage(
-              model = state.previewInfo.image,
-              contentDescription = "Profile Image",
-              contentScale = ContentScale.FillWidth,
-              modifier = Modifier.fillMaxWidth()
-            )
-
-            Text(
-              text = state.previewInfo.title,
-              style = MaterialTheme.typography.body2,
-              modifier = Modifier.fillMaxWidth().padding(start = 10.dp, end = 10.dp, top= 10.dp),
-              maxLines = 1,
-              overflow = TextOverflow.Ellipsis
-            )
-
-            Text(
-              text = state.previewInfo.description,
-              style = MaterialTheme.typography.caption,
-              modifier = Modifier
-                .fillMaxWidth()
-                .padding(start = 10.dp, end = 10.dp, bottom = 10.dp),
-              color = Color.Gray,
-              maxLines = 3,
-              overflow = TextOverflow.Ellipsis
-            )
-          }
-        }
+        UrlPreviewCard(url, state.previewInfo)
       }
       else -> {
-        ClickableText(
-          text = AnnotatedString("$urlText "),
-          onClick = { runCatching { uri.openUri(url) } },
-          style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary),
-        )
+        if (showUrlIfError) {
+          ClickableUrl(urlText, url)
+        }
       }
     }
   }
 
-}
+}
+

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

@@ -0,0 +1,66 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+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.shape.RoundedCornerShape
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+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.LocalUriHandler
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import coil.compose.AsyncImage
+import com.baha.url.preview.UrlInfoItem
+
+@Composable
+fun UrlPreviewCard(
+  url: String,
+  previewInfo: UrlInfoItem
+) {
+  val uri = LocalUriHandler.current
+
+  Row(
+    modifier = Modifier
+      .clickable { runCatching { uri.openUri(url) } }
+      .clip(shape = RoundedCornerShape(15.dp))
+      .border(1.dp, MaterialTheme.colors.onSurface.copy(alpha = 0.12f), RoundedCornerShape(15.dp))
+  ) {
+    Column {
+      AsyncImage(
+        model = previewInfo.image,
+        contentDescription = "Profile Image",
+        contentScale = ContentScale.FillWidth,
+        modifier = Modifier.fillMaxWidth()
+      )
+
+      Text(
+        text = previewInfo.title,
+        style = MaterialTheme.typography.body2,
+        modifier = Modifier
+          .fillMaxWidth()
+          .padding(start = 10.dp, end = 10.dp, top = 10.dp),
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis
+      )
+
+      Text(
+        text = previewInfo.description,
+        style = MaterialTheme.typography.caption,
+        modifier = Modifier
+          .fillMaxWidth()
+          .padding(start = 10.dp, end = 10.dp, bottom = 10.dp),
+        color = Color.Gray,
+        maxLines = 3,
+        overflow = TextOverflow.Ellipsis
+      )
+    }
+  }
+}

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

@@ -0,0 +1,48 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.viewinterop.AndroidView
+import com.google.android.exoplayer2.C
+import com.google.android.exoplayer2.ExoPlayer
+import com.google.android.exoplayer2.MediaItem
+import com.google.android.exoplayer2.Player
+import com.google.android.exoplayer2.ui.AspectRatioFrameLayout
+import com.google.android.exoplayer2.ui.StyledPlayerView
+
+@Composable
+fun VideoView(videoUri: String) {
+  val context = LocalContext.current
+
+  val exoPlayer = ExoPlayer.Builder(LocalContext.current).build().apply {
+    repeatMode = Player.REPEAT_MODE_ALL
+    videoScalingMode = C.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING
+    setMediaItem(MediaItem.fromUri(videoUri))
+    prepare()
+  }
+
+  DisposableEffect(exoPlayer) {
+    onDispose {
+      exoPlayer.release()
+    }
+  }
+
+  AndroidView(
+    modifier = Modifier
+      .fillMaxWidth(),
+    factory = {
+      StyledPlayerView(context).apply {
+        player = exoPlayer
+        layoutParams = FrameLayout.LayoutParams(
+          ViewGroup.LayoutParams.MATCH_PARENT,
+          ViewGroup.LayoutParams.WRAP_CONTENT
+        )
+        resizeMode = AspectRatioFrameLayout.RESIZE_MODE_FIXED_WIDTH
+      }
+    })
+}

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

@@ -0,0 +1,59 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import androidx.compose.foundation.gestures.awaitFirstDown
+import androidx.compose.foundation.gestures.calculatePan
+import androidx.compose.foundation.gestures.calculateZoom
+import androidx.compose.foundation.gestures.forEachGesture
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.ContentScale
+import coil.compose.AsyncImage
+
+@Composable
+fun ZoomableAsyncImage(imageUrl: String) {
+    var scale by remember { mutableStateOf(1f) }
+    var offsetX by remember { mutableStateOf(0f) }
+    var offsetY by remember { mutableStateOf(0f) }
+
+    Column(
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally,
+        modifier = Modifier
+            .pointerInput(Unit) {
+                forEachGesture {
+                    awaitPointerEventScope {
+                        awaitFirstDown()
+                        do {
+                            val event = awaitPointerEvent()
+                            scale *= event.calculateZoom()
+                            val offset = event.calculatePan()
+                            offsetX += offset.x
+                            offsetY += offset.y
+                        } while (event.changes.any { it.pressed })
+                    }
+                }
+            }
+    ) {
+        AsyncImage(
+            model = imageUrl,
+            contentDescription = "Profile Image",
+            contentScale = ContentScale.FillWidth,
+            modifier = Modifier.fillMaxSize().graphicsLayer(
+                scaleX = scale,
+                scaleY = scale,
+                translationX = offsetX,
+                translationY = offsetY
+            ),
+        )
+    }
+}

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

@@ -0,0 +1,77 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import coil.compose.AsyncImage
+import com.vitorpamplona.amethyst.ui.actions.CloseButton
+
+@Composable
+@OptIn(ExperimentalComposeUiApi::class)
+fun ZoomableImageView(word: String) {
+  // store the dialog open or close state
+  var dialogOpen by remember {
+    mutableStateOf(false)
+  }
+
+  AsyncImage(
+    model = word,
+    contentDescription = word,
+    contentScale = ContentScale.FillWidth,
+    modifier = Modifier
+      .padding(top = 4.dp)
+      .fillMaxWidth()
+      .clip(shape = RoundedCornerShape(15.dp))
+      .border(1.dp, MaterialTheme.colors.onSurface.copy(alpha = 0.12f), RoundedCornerShape(15.dp))
+      .clickable(
+        onClick = { dialogOpen = true }
+      )
+  )
+
+  if (dialogOpen) {
+    Dialog(
+      onDismissRequest = { dialogOpen = false },
+      properties = DialogProperties(usePlatformDefaultWidth = false)
+    ) {
+      Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
+        Column(
+          modifier = Modifier.padding(10.dp)
+        ) {
+          Row(
+            modifier = Modifier
+              .fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically
+          ) {
+            CloseButton(onCancel = {
+              dialogOpen = false
+            })
+          }
+
+          ZoomableAsyncImage(word)
+        }
+      }
+    }
+  }
+}

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

@@ -4,7 +4,6 @@ import androidx.compose.runtime.Composable
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import androidx.navigation.compose.rememberNavController
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable

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

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.ui.navigation
 import android.util.Log
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -37,14 +38,13 @@ import kotlinx.coroutines.launch
 
 @Composable
 fun AppTopBar(navController: NavHostController, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) {
+
+
     when (currentRoute(navController)) {
-        Route.Profile.route,
-        Route.Lists.route,
-        Route.Topics.route,
-        Route.Bookmarks.route,
-        Route.Moments.route -> TopBarWithBackButton(navController)
+        //Route.Profile.route -> TopBarWithBackButton(navController)
         else -> MainTopBar(scaffoldState, accountViewModel)
     }
+
 }
 
 @Composable
@@ -53,7 +53,8 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel)
     val accountUser = accountUserState?.user
 
     val relayViewModel: RelayPoolViewModel = viewModel { RelayPoolViewModel() }
-    val relayPoolLiveData by relayViewModel.relayPoolLiveData.observeAsState()
+    val connectedRelaysLiveData by relayViewModel.connectedRelaysLiveData.observeAsState()
+    val availableRelaysLiveData by relayViewModel.availableRelaysLiveData.observeAsState()
 
     val coroutineScope = rememberCoroutineScope()
 
@@ -98,15 +99,15 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel)
                         model = accountUser?.profilePicture() ?: "https://robohash.org/ohno.png",
                         contentDescription = "Profile Image",
                         modifier = Modifier
-                            .width(34.dp)
+                            .width(34.dp).height(34.dp)
                             .clip(shape = CircleShape),
                     )
                 }
             },
             actions = {
                 Text(
-                    relayPoolLiveData ?: "--/--",
-                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                    "${connectedRelaysLiveData ?: "--"}/${availableRelaysLiveData ?: "--"}",
+                    color = if (connectedRelaysLiveData == 0) Color.Red else MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                 )
 
                 IconButton(

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

@@ -8,15 +8,14 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.Divider
 import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.ScaffoldState
 import androidx.compose.material.Surface
@@ -35,6 +34,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.font.FontWeight.Companion.W500
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.navigation.NavController
 import androidx.navigation.NavHostController
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.R
@@ -43,14 +43,6 @@ import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import kotlinx.coroutines.launch
 
-val bottomNavigations = listOf(
-    Route.Profile,
-    Route.Lists,
-    //Route.Topics,
-    Route.Bookmarks,
-    //Route.Moments
-)
-
 @Composable
 fun DrawerContent(navController: NavHostController,
                   scaffoldState: ScaffoldState,
@@ -66,19 +58,31 @@ fun DrawerContent(navController: NavHostController,
     ) {
         Column() {
             Box {
-                Image(
-                    painter = painterResource(R.drawable.profile_banner),
-                    contentDescription = "Profile Banner",
-                    contentScale = ContentScale.FillWidth,
-                    modifier = Modifier.fillMaxWidth()
-                )
+                val banner = accountUser?.info?.banner
+                if (banner != null && banner.isNotBlank()) {
+                    AsyncImage(
+                        model = banner,
+                        contentDescription = "Profile Image",
+                        contentScale = ContentScale.FillWidth,
+                        modifier = Modifier.fillMaxWidth().height(150.dp)
+                    )
+                } else {
+                    Image(
+                        painter = painterResource(R.drawable.profile_banner),
+                        contentDescription = "Profile Banner",
+                        contentScale = ContentScale.FillWidth,
+                        modifier = Modifier.fillMaxWidth().height(150.dp)
+                    )
+                }
 
                 ProfileContent(
                     accountUser,
                     modifier = Modifier
                         .fillMaxWidth()
                         .padding(horizontal = 25.dp)
-                        .padding(top = 125.dp)
+                        .padding(top = 100.dp),
+                    scaffoldState,
+                    navController
                 )
             }
             Divider(
@@ -86,6 +90,7 @@ fun DrawerContent(navController: NavHostController,
                 modifier = Modifier.padding(top = 20.dp)
             )
             ListContent(
+                accountUser,
                 navController,
                 scaffoldState,
                 modifier = Modifier
@@ -98,16 +103,26 @@ fun DrawerContent(navController: NavHostController,
 }
 
 @Composable
-fun ProfileContent(accountUser: User?, modifier: Modifier = Modifier) {
+fun ProfileContent(accountUser: User?, modifier: Modifier = Modifier, scaffoldState: ScaffoldState, navController: NavController) {
+    val coroutineScope = rememberCoroutineScope()
+
     Column(modifier = modifier) {
         AsyncImage(
             model = accountUser?.profilePicture() ?: "https://robohash.org/ohno.png",
             contentDescription = "Profile Image",
             modifier = Modifier
-                .width(100.dp)
+                .width(100.dp).height(100.dp)
                 .clip(shape = CircleShape)
                 .border(3.dp, MaterialTheme.colors.background, CircleShape)
                 .background(MaterialTheme.colors.background)
+                .clickable(onClick = {
+                    accountUser?.let {
+                        navController.navigate("User/${it.pubkeyHex}")
+                    }
+                    coroutineScope.launch {
+                        scaffoldState.drawerState.close()
+                    }
+                })
         )
         Text(
             accountUser?.bestDisplayName() ?: "",
@@ -118,11 +133,11 @@ fun ProfileContent(accountUser: User?, modifier: Modifier = Modifier) {
         Text(" @${accountUser?.bestUsername()}", color = Color.LightGray)
         Row(modifier = Modifier.padding(top = 15.dp)) {
             Row() {
-                Text("${accountUser?.follows?.size}", fontWeight = FontWeight.Bold)
+                Text("${accountUser?.follows?.size ?: "--"}", fontWeight = FontWeight.Bold)
                 Text(" Following")
             }
             Row(modifier = Modifier.padding(start = 10.dp)) {
-                Text("${accountUser?.follower ?: "--"}", fontWeight = FontWeight.Bold)
+                Text("${accountUser?.followers?.size ?: "--"}", fontWeight = FontWeight.Bold)
                 Text(" Followers")
             }
         }
@@ -131,21 +146,25 @@ fun ProfileContent(accountUser: User?, modifier: Modifier = Modifier) {
 
 @Composable
 fun ListContent(
+    accountUser: User?,
     navController: NavHostController,
     scaffoldState: ScaffoldState,
     modifier: Modifier,
     accountViewModel: AccountStateViewModel
 ) {
-    Column(
-        modifier = modifier
-    ) {
+    Column(modifier = modifier) {
         LazyColumn() {
-            items(items = bottomNavigations) {
-                NavigationRow(navController, scaffoldState, it)
-            }
             item {
+                if (accountUser != null)
+                    NavigationRow(navController,
+                        scaffoldState,
+                        "User/${accountUser.pubkeyHex}",
+                        Route.Profile.icon,
+                        "Profile"
+                    )
+
                 Divider(
-                    modifier = Modifier.padding(vertical = 15.dp),
+                    modifier = Modifier.padding(bottom = 15.dp),
                     thickness = 0.25.dp
                 )
                 Column(modifier = modifier.padding(horizontal = 25.dp)) {
@@ -171,31 +190,36 @@ fun ListContent(
 }
 
 @Composable
-fun NavigationRow(navController: NavHostController, scaffoldState: ScaffoldState, route: Route) {
+fun NavigationRow(navController: NavHostController, scaffoldState: ScaffoldState, route: String, icon: Int, title: String) {
     val coroutineScope = rememberCoroutineScope()
     val currentRoute = currentRoute(navController)
-    Row(
-        modifier = Modifier
-            .padding(vertical = 15.dp, horizontal = 25.dp)
-            .clickable(onClick = {
-                if (currentRoute != route.route) {
-                    navController.navigate(route.route)
-                }
-                coroutineScope.launch {
-                    scaffoldState.drawerState.close()
-                }
-            }),
-        verticalAlignment = Alignment.CenterVertically
+    Row(modifier = Modifier
+        .fillMaxWidth()
+        .clickable(onClick = {
+            if (currentRoute != route) {
+                navController.navigate(route)
+            }
+            coroutineScope.launch {
+                scaffoldState.drawerState.close()
+            }
+        })
     ) {
-        Icon(
-            painter = painterResource(route.icon), null,
-            modifier = Modifier.size(22.dp),
-            tint = MaterialTheme.colors.primary
-        )
-        Text(
-            modifier = Modifier.padding(start = 16.dp),
-            text = route.route,
-            fontSize = 18.sp,
-        )
+        Row(
+            modifier = Modifier.fillMaxWidth()
+                .padding(vertical = 15.dp, horizontal = 25.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Icon(
+                painter = painterResource(icon), null,
+                modifier = Modifier.size(22.dp),
+                tint = MaterialTheme.colors.primary
+            )
+            Text(
+                modifier = Modifier.padding(start = 16.dp),
+                text = title,
+                fontSize = 18.sp,
+            )
+        }
     }
+
 }

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

@@ -10,12 +10,14 @@ import androidx.navigation.NavType
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.navArgument
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.screen.ChannelScreen
+import com.vitorpamplona.amethyst.ui.screen.ChatroomListScreen
+import com.vitorpamplona.amethyst.ui.screen.ChatroomScreen
 import com.vitorpamplona.amethyst.ui.screen.HomeScreen
-import com.vitorpamplona.amethyst.ui.screen.MessageScreen
-import com.vitorpamplona.amethyst.ui.screen.ThreadScreen
 import com.vitorpamplona.amethyst.ui.screen.NotificationScreen
 import com.vitorpamplona.amethyst.ui.screen.ProfileScreen
 import com.vitorpamplona.amethyst.ui.screen.SearchScreen
+import com.vitorpamplona.amethyst.ui.screen.ThreadScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 
@@ -28,17 +30,27 @@ sealed class Route(
     object Home : Route("Home", R.drawable.ic_home, buildScreen = { acc, nav -> { _ -> HomeScreen(acc, nav) } })
     object Search : Route("Search", R.drawable.ic_search, buildScreen = { acc, nav -> { _ -> SearchScreen(acc, nav) }})
     object Notification : Route("Notification", R.drawable.ic_notifications,buildScreen = { acc, nav -> { _ -> NotificationScreen(acc, nav) }})
-    object Message : Route("Message", R.drawable.ic_dm, buildScreen = { acc, nav -> { _ -> MessageScreen(acc) }})
-    object Profile : Route("Profile", R.drawable.ic_profile, buildScreen = { acc, nav -> { _ -> ProfileScreen(acc) }})
-    object Lists : Route("Lists", R.drawable.ic_lists, buildScreen = { acc, nav -> { _ -> ProfileScreen(acc) }})
-    object Topics : Route("Topics", R.drawable.ic_topics, buildScreen = { acc, nav -> { _ -> ProfileScreen(acc) }})
-    object Bookmarks : Route("Bookmarks", R.drawable.ic_bookmarks, buildScreen = { acc, nav -> { _ -> ProfileScreen(acc) }})
-    object Moments : Route("Moments", R.drawable.ic_moments, buildScreen = { acc, nav -> { _ -> ProfileScreen(acc) }})
+    object Message : Route("Message", R.drawable.ic_dm, buildScreen = { acc, nav -> { _ -> ChatroomListScreen(acc, nav) }})
+
+    object Profile : Route("User/{id}", R.drawable.ic_profile,
+        arguments = listOf(navArgument("id") { type = NavType.StringType } ),
+        buildScreen = { acc, nav -> { ProfileScreen(it.arguments?.getString("id"), acc, nav) }}
+    )
 
     object Note : Route("Note/{id}", R.drawable.ic_moments,
         arguments = listOf(navArgument("id") { type = NavType.StringType } ),
         buildScreen = { acc, nav -> { ThreadScreen(it.arguments?.getString("id"), acc, nav) }}
     )
+
+    object Room : Route("Room/{id}", R.drawable.ic_moments,
+        arguments = listOf(navArgument("id") { type = NavType.StringType } ),
+        buildScreen = { acc, nav -> { ChatroomScreen(it.arguments?.getString("id"), acc, nav) }}
+    )
+
+    object Channel : Route("Channel/{id}", R.drawable.ic_moments,
+        arguments = listOf(navArgument("id") { type = NavType.StringType } ),
+        buildScreen = { acc, nav -> { ChannelScreen(it.arguments?.getString("id"), acc, nav) }}
+    )
 }
 
 val Routes = listOf(
@@ -50,13 +62,9 @@ val Routes = listOf(
 
     //drawer
     Route.Profile,
-    Route.Lists,
-    Route.Topics,
-    Route.Bookmarks,
-    Route.Moments,
-
-    //inner
-    Route.Note
+    Route.Note,
+    Route.Room,
+    Route.Channel
 )
 
 @Composable

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

@@ -1,9 +1,6 @@
 package com.vitorpamplona.amethyst.ui.note
 
-import android.text.format.DateUtils
-import android.text.format.DateUtils.getRelativeTimeSpanString
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -12,10 +9,7 @@ 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.material.Divider
 import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
@@ -24,31 +18,29 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import com.google.accompanist.flowlayout.FlowRow
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.service.model.ReactionEvent
-import com.vitorpamplona.amethyst.service.model.RepostEvent
-import com.vitorpamplona.amethyst.ui.components.RichTextViewer
 import com.vitorpamplona.amethyst.ui.screen.BoostSetCard
-import com.vitorpamplona.amethyst.ui.screen.LikeSetCard
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import nostr.postr.events.TextNoteEvent
 
 @Composable
-fun BoostSetCompose(likeSetCard: BoostSetCard, modifier: Modifier = Modifier, isInnerNote: Boolean = false, accountViewModel: AccountViewModel, navController: NavController) {
+fun BoostSetCompose(likeSetCard: BoostSetCard, isInnerNote: Boolean = false, accountViewModel: AccountViewModel, navController: NavController) {
     val noteState by likeSetCard.note.live.observeAsState()
     val note = noteState?.note
 
     if (note?.event == null) {
-        BlankNote(modifier, isInnerNote)
+        BlankNote(Modifier, isInnerNote)
     } else {
-        Column(modifier = modifier) {
-            Row(modifier = Modifier.padding(horizontal = if (!isInnerNote) 12.dp else 0.dp)) {
+        Column() {
+            Row(modifier = Modifier
+                .padding(
+                    start = if (!isInnerNote) 12.dp else 0.dp,
+                    end = if (!isInnerNote) 12.dp else 0.dp,
+                    top = 10.dp)
+            ) {
 
                 // Draws the like picture outside the boosted card.
                 if (!isInnerNote) {
@@ -80,6 +72,11 @@ fun BoostSetCompose(likeSetCard: BoostSetCard, modifier: Modifier = Modifier, is
                                         .width(35.dp)
                                         .height(35.dp)
                                         .clip(shape = CircleShape)
+                                        .clickable(onClick = {
+                                            userState?.let {
+                                                navController.navigate("User/${it.user.pubkeyHex}")
+                                            }
+                                        })
                                 )
                             }
                         }

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

@@ -0,0 +1,157 @@
+package com.vitorpamplona.amethyst.ui.note
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.Divider
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+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.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
+import coil.compose.AsyncImage
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.ui.components.RichTextViewer
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import nostr.postr.events.TextNoteEvent
+
+@Composable
+fun ChatroomCompose(baseNote: Note, accountViewModel: AccountViewModel, navController: NavController) {
+    val noteState by baseNote.live.observeAsState()
+    val note = noteState?.note
+
+    val accountUserState by accountViewModel.userLiveData.observeAsState()
+    val accountUser = accountUserState?.user
+
+    if (note?.event == null) {
+        BlankNote(Modifier)
+    } else if (note.channel != null) {
+        val authorState by note.author!!.live.observeAsState()
+        val author = authorState?.user
+
+        val channelState by note.channel!!.live.observeAsState()
+        val channel = channelState?.channel
+
+        Column(modifier =
+        Modifier.clickable(
+            onClick = { navController.navigate("Channel/${channel?.idHex}") }
+        )
+        ) {
+            Row(
+                modifier = Modifier
+                    .padding(
+                        start = 12.dp,
+                        end = 12.dp,
+                        top = 10.dp)
+            ) {
+
+                AsyncImage(
+                    model = channel?.profilePicture(),
+                    contentDescription = "Public Channel Image",
+                    modifier = Modifier
+                        .width(55.dp).height(55.dp)
+                        .clip(shape = CircleShape)
+                )
+
+                Column(modifier = Modifier.padding(start = 10.dp)) {
+                    Row(verticalAlignment = Alignment.CenterVertically) {
+                        Text(
+                            "${channel?.info?.name}",
+                            fontWeight = FontWeight.Bold,
+                        )
+
+                        Text(
+                            timeAgo(note.event?.createdAt),
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    }
+
+                    val eventContent = accountViewModel.decrypt(note)
+                    if (eventContent != null)
+                        RichTextViewer("${author?.toBestDisplayName()}: " + eventContent.take(100), note.event?.tags, note, accountViewModel, navController)
+                    else
+                        RichTextViewer("Referenced event not found", note.event?.tags, note, accountViewModel, navController)
+                }
+            }
+
+            Divider(
+                modifier = Modifier.padding(top = 10.dp),
+                thickness = 0.25.dp
+            )
+        }
+
+    } else {
+        val authorState by note.author!!.live.observeAsState()
+        val author = authorState?.user
+
+        val replyAuthorBase = note.mentions?.first()
+
+        var userToComposeOn = author
+
+        if ( replyAuthorBase != null ) {
+            val replyAuthorState by replyAuthorBase.live.observeAsState()
+            val replyAuthor = replyAuthorState?.user
+
+            if (author == accountUser) {
+                userToComposeOn = replyAuthor
+            }
+        }
+
+        Column(modifier =
+            Modifier.clickable(
+                    onClick = { navController.navigate("Room/${userToComposeOn?.pubkeyHex}") }
+            )
+        ) {
+            Row(
+                modifier = Modifier
+                    .padding(
+                        start = 12.dp,
+                        end = 12.dp,
+                        top = 10.dp)
+            ) {
+
+                AsyncImage(
+                    model = userToComposeOn?.profilePicture(),
+                    contentDescription = "Profile Image",
+                    modifier = Modifier
+                        .width(55.dp).height(55.dp)
+                        .clip(shape = CircleShape)
+                )
+
+                Column(modifier = Modifier.padding(start = 10.dp)) {
+                    Row(verticalAlignment = Alignment.CenterVertically) {
+                        if (userToComposeOn != null)
+                            UserDisplay(userToComposeOn)
+
+                        Text(
+                            timeAgo(note.event?.createdAt),
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    }
+
+                    val eventContent = accountViewModel.decrypt(note)
+                    if (eventContent != null)
+                        RichTextViewer(eventContent.take(100), note.event?.tags, note, accountViewModel, navController)
+                    else
+                        RichTextViewer("Referenced event not found", note.event?.tags, note, accountViewModel, navController)
+                }
+            }
+
+            Divider(
+                modifier = Modifier.padding(top = 10.dp),
+                thickness = 0.25.dp
+            )
+        }
+    }
+
+}

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

@@ -0,0 +1,172 @@
+package com.vitorpamplona.amethyst.ui.note
+
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.layout.wrapContentWidth
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableStateOf
+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.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
+import coil.compose.AsyncImage
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.ui.components.RichTextViewer
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+val ChatBubbleShapeMe = RoundedCornerShape(20.dp, 20.dp, 3.dp, 20.dp)
+val ChatBubbleShapeThem = RoundedCornerShape(20.dp, 20.dp, 20.dp, 3.dp)
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+fun ChatroomMessageCompose(baseNote: Note, accountViewModel: AccountViewModel, navController: NavController) {
+    val noteState by baseNote.live.observeAsState()
+    val note = noteState?.note
+
+    val accountUserState by accountViewModel.userLiveData.observeAsState()
+    val accountUser = accountUserState?.user
+
+    var popupExpanded by remember { mutableStateOf(false) }
+
+    if (note?.event == null) {
+        BlankNote(Modifier)
+    } else {
+        val authorState by note.author!!.live.observeAsState()
+        val author = authorState?.user
+
+        Column() {
+            var backgroundBubbleColor: Color
+            var alignment: Arrangement.Horizontal
+            var shape: Shape
+
+            if (author == accountUser) {
+                backgroundBubbleColor = MaterialTheme.colors.primary.copy(alpha = 0.32f)
+                alignment = Arrangement.End
+                shape = ChatBubbleShapeMe
+            } else {
+                backgroundBubbleColor = MaterialTheme.colors.onSurface.copy(alpha = 0.12f)
+                alignment = Arrangement.Start
+                shape = ChatBubbleShapeThem
+            }
+
+            Row(
+                horizontalArrangement = alignment,
+                modifier = Modifier.fillMaxWidth()
+                    .padding(
+                        start = 12.dp,
+                        end = 12.dp,
+                        top = 5.dp,
+                        bottom = 5.dp
+                    ).combinedClickable(
+                        onClick = {  },
+                        onLongClick = { popupExpanded = true }
+                    )
+            ) {
+
+                Row(
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Surface(
+                        color = backgroundBubbleColor,
+                        shape = shape
+                    ) {
+                        Column(
+                            modifier = Modifier.padding(10.dp),
+                        ) {
+
+                            if (author != accountUser && note.event is ChannelMessageEvent) {
+                                Row(
+                                    verticalAlignment = Alignment.CenterVertically,
+                                    horizontalArrangement = alignment
+                                ) {
+                                    AsyncImage(
+                                        model = author?.profilePicture(),
+                                        contentDescription = "Profile Image",
+                                        modifier = Modifier
+                                            .width(25.dp).height(25.dp)
+                                            .clip(shape = CircleShape)
+                                            .clickable(onClick = {
+                                                author?.let {
+                                                    navController.navigate("User/${it.pubkeyHex}")
+                                                }
+                                            })
+                                    )
+
+                                    Text(
+                                        "  ${author?.toBestDisplayName()}",
+                                        fontWeight = FontWeight.Bold,
+                                        modifier = Modifier.clickable(onClick = {
+                                                author?.let {
+                                                    navController.navigate("User/${it.pubkeyHex}")
+                                                }
+                                            })
+                                    )
+                                }
+                            }
+
+                            Row(
+                                verticalAlignment = Alignment.CenterVertically
+                            ) {
+                                val eventContent = accountViewModel.decrypt(note)
+
+                                if (eventContent != null)
+                                    RichTextViewer(
+                                        eventContent,
+                                        note.event?.tags,
+                                        note,
+                                        accountViewModel,
+                                        navController
+                                    )
+                                else
+                                    RichTextViewer(
+                                        "Could Not decrypt the message",
+                                        note.event?.tags,
+                                        note,
+                                        accountViewModel,
+                                        navController
+                                    )
+
+                            }
+
+                            Row(
+                                verticalAlignment = Alignment.CenterVertically,
+                                horizontalArrangement = alignment
+                            ) {
+                                Text(
+                                    timeAgoLong(note.event?.createdAt),
+                                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+
+            NoteDropDownMenu(note, popupExpanded, { popupExpanded = false }, accountViewModel)
+        }
+    }
+}
+

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

@@ -1,9 +1,6 @@
 package com.vitorpamplona.amethyst.ui.note
 
-import android.text.format.DateUtils
-import android.text.format.DateUtils.getRelativeTimeSpanString
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -12,10 +9,7 @@ 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.material.Divider
 import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
@@ -24,19 +18,13 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import com.google.accompanist.flowlayout.FlowRow
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.service.model.ReactionEvent
-import com.vitorpamplona.amethyst.service.model.RepostEvent
-import com.vitorpamplona.amethyst.ui.components.RichTextViewer
 import com.vitorpamplona.amethyst.ui.screen.LikeSetCard
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import nostr.postr.events.TextNoteEvent
 
 @Composable
 fun LikeSetCompose(likeSetCard: LikeSetCard, modifier: Modifier = Modifier, isInnerNote: Boolean = false, accountViewModel: AccountViewModel, navController: NavController) {
@@ -44,10 +32,15 @@ fun LikeSetCompose(likeSetCard: LikeSetCard, modifier: Modifier = Modifier, isIn
     val note = noteState?.note
 
     if (note?.event == null) {
-        BlankNote(modifier, isInnerNote)
+        BlankNote(Modifier, isInnerNote)
     } else {
         Column(modifier = modifier) {
-            Row(modifier = Modifier.padding(horizontal = if (!isInnerNote) 12.dp else 0.dp)) {
+            Row(                modifier = Modifier
+                .padding(
+                    start = if (!isInnerNote) 12.dp else 0.dp,
+                    end = if (!isInnerNote) 12.dp else 0.dp,
+                    top = 10.dp)
+            ) {
 
                 // Draws the like picture outside the boosted card.
                 if (!isInnerNote) {
@@ -76,9 +69,14 @@ fun LikeSetCompose(likeSetCard: LikeSetCard, modifier: Modifier = Modifier, isIn
                                     model = userState?.user?.profilePicture(),
                                     contentDescription = "Profile Image",
                                     modifier = Modifier
-                                        .width(35.dp)
+                                        .width(35.dp).height(35.dp)
                                         .height(35.dp)
                                         .clip(shape = CircleShape)
+                                        .clickable(onClick = {
+                                            userState?.let {
+                                                navController.navigate("User/${it.user.pubkeyHex}")
+                                            }
+                                        })
                                 )
                             }
                         }

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

@@ -1,56 +1,72 @@
 package com.vitorpamplona.amethyst.ui.note
 
-import android.text.format.DateUtils
-import android.text.format.DateUtils.getRelativeTimeSpanString
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.Divider
+import androidx.compose.material.DropdownMenu
+import androidx.compose.material.DropdownMenuItem
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableStateOf
+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.clip
+import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
-import androidx.navigation.compose.rememberNavController
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.toNote
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.ui.components.RichTextViewer
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import nostr.postr.events.TextNoteEvent
+import nostr.postr.toNpub
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Boolean = false, accountViewModel: AccountViewModel, navController: NavController) {
     val noteState by baseNote.live.observeAsState()
     val note = noteState?.note
 
+    var popupExpanded by remember { mutableStateOf(false) }
+
     if (note?.event == null) {
         BlankNote(modifier, isInnerNote)
     } else {
         val authorState by note.author!!.live.observeAsState()
         val author = authorState?.user
 
-        Column(modifier = modifier) {
+        Column(modifier =
+            modifier.combinedClickable(
+                onClick = { navController.navigate("Note/${note.idHex}") },
+                onLongClick = { popupExpanded = true },
+            )
+        ) {
             Row(
                 modifier = Modifier
                     .padding(
                         start = if (!isInnerNote) 12.dp else 0.dp,
                         end = if (!isInnerNote) 12.dp else 0.dp,
                         top = 10.dp)
-                    .clickable ( onClick = { navController.navigate("Note/${note.idHex}") } )
             ) {
 
                 // Draws the boosted picture outside the boosted card.
@@ -60,8 +76,13 @@ fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Bool
                             model = author?.profilePicture(),
                             contentDescription = "Profile Image",
                             modifier = Modifier
-                                .width(55.dp)
+                                .width(55.dp).height(55.dp)
                                 .clip(shape = CircleShape)
+                                .clickable(onClick = {
+                                    author?.let {
+                                        navController.navigate("User/${it.pubkeyHex}")
+                                    }
+                                })
                         )
 
                         // boosted picture
@@ -71,24 +92,35 @@ fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Bool
                                 model = boostedPosts[0].author?.profilePicture(),
                                 contentDescription = "Profile Image",
                                 modifier = Modifier
-                                    .width(35.dp)
+                                    .width(35.dp).height(35.dp)
                                     .clip(shape = CircleShape)
                                     .align(Alignment.BottomEnd)
                                     .background(MaterialTheme.colors.background)
                                     .border(2.dp, MaterialTheme.colors.primary, CircleShape)
+                                    .clickable(onClick = {
+                                        boostedPosts[0].author?.let {
+                                            navController.navigate("User/${it.pubkeyHex}")
+                                        }
+                                    })
                             )
                         }
                     }
                 }
 
-                Column(modifier = Modifier.padding(start = if (!isInnerNote) 10.dp else 0.dp)) {
+                Column(modifier = Modifier.padding(start = if (!isInnerNote) 10.dp else 0.dp)
+                    .clickable(onClick = {
+                        note?.let {
+                            navController.navigate("Note/${note.idHex}")
+                        }
+                    })
+                ) {
                     Row(verticalAlignment = Alignment.CenterVertically) {
                         if (author != null)
                             UserDisplay(author)
 
                         if (note.event !is RepostEvent) {
                             Text(
-                                "   " + timeAgo(note.event?.createdAt),
+                                timeAgo(note.event?.createdAt),
                                 color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                             )
                         } else {
@@ -127,7 +159,7 @@ fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Bool
                     } else {
                         val eventContent = note.event?.content
                         if (eventContent != null)
-                            RichTextViewer(eventContent, note.event?.tags)
+                            RichTextViewer(eventContent, note.event?.tags, note, accountViewModel, navController)
 
                         ReactionsRowState(note, accountViewModel)
 
@@ -136,8 +168,34 @@ fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Bool
                             thickness = 0.25.dp
                         )
                     }
+
+                    NoteDropDownMenu(note, popupExpanded, { popupExpanded = false }, accountViewModel)
                 }
             }
         }
     }
+}
+
+@Composable
+fun NoteDropDownMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Unit, accountViewModel: AccountViewModel) {
+    val clipboardManager = LocalClipboardManager.current
+
+    DropdownMenu(
+        expanded = popupExpanded,
+        onDismissRequest = onDismiss
+    ) {
+        DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString(note.event?.content ?: "")); onDismiss() }) {
+            Text("Copy Text")
+        }
+        DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString(note.author?.pubkey?.toNpub() ?: "")); onDismiss() }) {
+            Text("Copy User ID")
+        }
+        DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString(note.id.toNote())); onDismiss() }) {
+            Text("Copy Note ID")
+        }
+        Divider()
+        DropdownMenuItem(onClick = { accountViewModel.broadcast(note); onDismiss() }) {
+            Text("Broadcast")
+        }
+    }
 }

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

@@ -2,11 +2,11 @@ package com.vitorpamplona.amethyst.ui.note
 
 import nostr.postr.toHex
 
-fun ByteArray.toDisplayHex(): String {
-  return toHex().toDisplayHex()
+fun ByteArray.toShortenHex(): String {
+  return toHex().toShortenHex()
 }
 
-fun String.toDisplayHex(): String {
+fun String.toShortenHex(): String {
   return replaceRange(6, length-6, ":")
 }
 

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -35,7 +36,7 @@ fun ReactionsRow(note: Note, account: Account, boost: (Note) -> Unit, reactTo: (
     NewPostView({ wantsToReplyTo = null }, wantsToReplyTo, account)
 
   Row(modifier = Modifier.padding(top = 8.dp)) {
-    Row(verticalAlignment = Alignment.CenterVertically) {
+    Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween) {
       IconButton(
         modifier = Modifier.then(Modifier.size(24.dp)),
         onClick = { if (account.isWriteable()) wantsToReplyTo = note }

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

@@ -14,5 +14,25 @@ fun timeAgo(mills: Long?): String {
   if (humanReadable.startsWith("In") || humanReadable.startsWith("0")) {
     humanReadable = "now";
   }
+
+  return " • " + humanReadable
+    .replace(" hr. ago", "h")
+    .replace(" min. ago", "m")
+    .replace(" days. ago", "d")
+}
+
+fun timeAgoLong(mills: Long?): String {
+  if (mills == null) return " "
+
+  var humanReadable = DateUtils.getRelativeTimeSpanString(
+    mills * 1000,
+    System.currentTimeMillis(),
+    DateUtils.MINUTE_IN_MILLIS,
+    DateUtils.FORMAT_SHOW_TIME
+  ).toString()
+  if (humanReadable.startsWith("In") || humanReadable.startsWith("0")) {
+    humanReadable = "now";
+  }
+
   return humanReadable
 }

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

@@ -0,0 +1,80 @@
+package com.vitorpamplona.amethyst.ui.note
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.Divider
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+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.unit.dp
+import androidx.navigation.NavController
+import coil.compose.AsyncImage
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.ui.screen.FollowButton
+import com.vitorpamplona.amethyst.ui.screen.UnfollowButton
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+@Composable
+fun UserCompose(baseUser: User, accountViewModel: AccountViewModel, navController: NavController) {
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+
+    val userState by baseUser.live.observeAsState()
+    val user = userState?.user ?: return
+
+    Column(modifier =
+        Modifier.clickable(
+            onClick = { navController.navigate("User/${user.pubkeyHex}") }
+        )
+    ) {
+        Row(
+            modifier = Modifier
+                .padding(
+                    start = 12.dp,
+                    end = 12.dp,
+                    top = 10.dp)
+        ) {
+
+            AsyncImage(
+                model = user.profilePicture(),
+                contentDescription = "Profile Image",
+                modifier = Modifier
+                    .width(55.dp).height(55.dp)
+                    .clip(shape = CircleShape)
+            )
+
+            Column(modifier = Modifier.padding(start = 10.dp).weight(1f)) {
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    UserDisplay(user)
+                }
+
+                Text(
+                    user.info.about?.take(100) ?: "",
+                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                )
+            }
+
+            Column(modifier = Modifier.padding(start = 10.dp)) {
+                if (accountState?.account?.userProfile()?.follows?.contains(user) == true) {
+                    UnfollowButton { accountState?.account?.unfollow(user) }
+                } else {
+                    FollowButton { accountState?.account?.follow(user) }
+                }
+            }
+        }
+
+        Divider(
+            modifier = Modifier.padding(top = 10.dp),
+            thickness = 0.25.dp
+        )
+    }
+}

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

@@ -9,14 +9,21 @@ import com.vitorpamplona.amethyst.model.User
 @Composable
 fun UserDisplay(user: User) {
     if (user.bestUsername() != null || user.bestDisplayName() != null) {
-      Text(
-        user.bestDisplayName() ?: "",
-        fontWeight = FontWeight.Bold,
-      )
-      Text(
-        "@${(user.bestUsername() ?: "")}",
-        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
-      )
+      if (user.bestDisplayName().isNullOrBlank()) {
+        Text(
+          "@${(user.bestUsername() ?: "")}",
+          fontWeight = FontWeight.Bold,
+        )
+      } else {
+        Text(
+          user.bestDisplayName() ?: "",
+          fontWeight = FontWeight.Bold,
+        )
+        Text(
+          "@${(user.bestUsername() ?: "")}",
+          color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+        )
+      }
     } else {
       Text(
         user.pubkeyDisplayHex,

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

@@ -4,11 +4,9 @@ import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.layout.Column
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
-@OptIn(ExperimentalLifecycleComposeApi::class)
 @Composable
 fun AccountScreen(accountStateViewModel: AccountStateViewModel) {
   val accountState by accountStateViewModel.accountContent.collectAsStateWithLifecycle()

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

@@ -3,8 +3,10 @@ package com.vitorpamplona.amethyst.ui.screen
 import androidx.lifecycle.ViewModel
 import androidx.security.crypto.EncryptedSharedPreferences
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.DefaultChannels
 import com.vitorpamplona.amethyst.model.toByteArray
 import com.vitorpamplona.amethyst.service.NostrAccountDataSource
+import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
 import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
 import com.vitorpamplona.amethyst.service.NostrHomeDataSource
 import com.vitorpamplona.amethyst.service.NostrNotificationDataSource
@@ -26,39 +28,47 @@ class AccountStateViewModel(private val encryptedPreferences: EncryptedSharedPre
 
   init {
     // pulls account from storage.
-    loadFromEncryptedStorage()?.let { login(it) }
+    loadFromEncryptedStorage()?.let {
+      login(it)
+    }
   }
 
   fun login(key: String) {
     val pattern = Pattern.compile(".+@.+\\.[a-z]+")
 
-    login(
+    val account =
       if (key.startsWith("nsec")) {
-        Persona(privKey = key.bechToBytes())
+        Account(Persona(privKey = key.bechToBytes()))
       } else if (key.startsWith("npub")) {
-        Persona(pubKey = key.bechToBytes())
+        Account(Persona(pubKey = key.bechToBytes()))
       } else if (pattern.matcher(key).matches()) {
         // Evaluate NIP-5
-        Persona()
+        Account(Persona())
       } else {
-        Persona(Hex.decode(key))
+        Account(Persona(Hex.decode(key)))
       }
-    )
+
+    saveToEncryptedStorage(account)
+
+    login(account)
   }
 
-  fun login(person: Persona) {
-    val loggedIn = Account(person)
+  fun newKey() {
+    val account = Account(Persona())
+    saveToEncryptedStorage(account)
+    login(account)
+  }
 
-    if (person.privKey != null)
-      _accountContent.update { AccountState.LoggedIn ( loggedIn ) }
+  fun login(account: Account) {
+    if (account.loggedIn.privKey != null)
+      _accountContent.update { AccountState.LoggedIn ( account ) }
     else
-      _accountContent.update { AccountState.LoggedInViewOnly ( Account(person) ) }
+      _accountContent.update { AccountState.LoggedInViewOnly ( account ) }
 
-    saveToEncryptedStorage(person)
-
-    NostrAccountDataSource.account = loggedIn
-    NostrHomeDataSource.account = loggedIn
-    NostrNotificationDataSource.account = loggedIn
+    NostrAccountDataSource.account = account
+    NostrHomeDataSource.account = account
+    NostrNotificationDataSource.account = account
+    NostrChatroomListDataSource.account = account
 
     NostrAccountDataSource.start()
     NostrGlobalDataSource.start()
@@ -67,10 +77,7 @@ class AccountStateViewModel(private val encryptedPreferences: EncryptedSharedPre
     NostrSingleEventDataSource.start()
     NostrSingleUserDataSource.start()
     NostrThreadDataSource.start()
-  }
-
-  fun newKey() {
-    login(Persona())
+    NostrChatroomListDataSource.start()
   }
 
   fun logOff() {
@@ -86,20 +93,22 @@ class AccountStateViewModel(private val encryptedPreferences: EncryptedSharedPre
     }.apply()
   }
 
-  fun saveToEncryptedStorage(login: Persona) {
+  fun saveToEncryptedStorage(account: Account) {
     encryptedPreferences.edit().apply {
-      login.privKey?.let { putString("nostr_privkey", it.toHex()) }
-      login.pubKey.let { putString("nostr_pubkey", it.toHex()) }
+      account.loggedIn.privKey?.let { putString("nostr_privkey", it.toHex()) }
+      account.loggedIn.pubKey.let { putString("nostr_pubkey", it.toHex()) }
+      account.followingChannels.let { putStringSet("following_channels", account.followingChannels) }
     }.apply()
   }
 
-  fun loadFromEncryptedStorage(): Persona? {
+  fun loadFromEncryptedStorage(): Account? {
     encryptedPreferences.apply {
       val privKey = getString("nostr_privkey", null)
       val pubKey = getString("nostr_pubkey", null)
+      val followingChannels = getStringSet("following_channels", DefaultChannels)?.toMutableSet() ?: DefaultChannels.toMutableSet()
 
       if (pubKey != null) {
-        return Persona(privKey = privKey?.toByteArray(), pubKey = pubKey.toByteArray())
+        return Account(Persona(privKey = privKey?.toByteArray(), pubKey = pubKey.toByteArray()), followingChannels)
       } else {
         return null
       }

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

@@ -1,27 +1,18 @@
 package com.vitorpamplona.amethyst.ui.screen
 
 import androidx.compose.animation.Crossfade
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material.Button
-import androidx.compose.material.OutlinedButton
-import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import com.google.accompanist.swiperefresh.SwipeRefresh
@@ -31,7 +22,6 @@ import com.vitorpamplona.amethyst.ui.note.LikeSetCompose
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
-@OptIn(ExperimentalLifecycleComposeApi::class)
 @Composable
 fun CardFeedView(viewModel: CardFeedViewModel, accountViewModel: AccountViewModel, navController: NavController) {
     val feedState by viewModel.feedContent.collectAsStateWithLifecycle()

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

@@ -14,7 +14,7 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 
-class CardFeedViewModel(val dataSource: NostrDataSource): ViewModel() {
+class CardFeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
     private val _feedContent = MutableStateFlow<CardFeedState>(CardFeedState.Loading)
     val feedContent = _feedContent.asStateFlow()
 

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

@@ -0,0 +1,83 @@
+package com.vitorpamplona.amethyst.ui.screen
+
+import androidx.compose.animation.Crossfade
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation.NavController
+import com.google.accompanist.swiperefresh.SwipeRefresh
+import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
+import com.vitorpamplona.amethyst.ui.note.ChatroomMessageCompose
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+@Composable
+fun ChatroomFeedView(viewModel: FeedViewModel, accountViewModel: AccountViewModel, navController: NavController) {
+    val feedState by viewModel.feedContent.collectAsStateWithLifecycle()
+
+    var isRefreshing by remember { mutableStateOf(false) }
+    val swipeRefreshState = rememberSwipeRefreshState(isRefreshing)
+
+    val listState = rememberLazyListState()
+
+    LaunchedEffect(isRefreshing) {
+        if (isRefreshing) {
+            viewModel.refresh()
+            isRefreshing = false
+        }
+    }
+
+    SwipeRefresh(
+        state = swipeRefreshState,
+        onRefresh = {
+            isRefreshing = true
+        },
+    ) {
+        Column() {
+            Crossfade(targetState = feedState) { state ->
+                when (state) {
+                    is FeedState.Empty -> {
+                        FeedEmpty {
+                            isRefreshing = true
+                        }
+                    }
+                    is FeedState.FeedError -> {
+                        FeedError(state.errorMessage) {
+                            isRefreshing = true
+                        }
+                    }
+                    is FeedState.Loaded -> {
+                        LazyColumn(
+                            contentPadding = PaddingValues(
+                                top = 10.dp,
+                                bottom = 10.dp
+                            ),
+                            state = listState
+                        ) {
+                            var previousDate: String = ""
+                            itemsIndexed(state.feed, key = { _, item -> item.idHex }) { index, item ->
+                                ChatroomMessageCompose(item, accountViewModel = accountViewModel, navController = navController)
+                            }
+                        }
+
+                        LaunchedEffect(Unit) {
+                            listState.animateScrollToItem(state.feed.size-1, 0)
+                        }
+                    }
+                    FeedState.Loading -> {
+                        LoadingFeed()
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,78 @@
+package com.vitorpamplona.amethyst.ui.screen
+
+import androidx.compose.animation.Crossfade
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation.NavController
+import com.google.accompanist.swiperefresh.SwipeRefresh
+import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
+import com.vitorpamplona.amethyst.ui.note.ChatroomCompose
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+@Composable
+fun ChatroomListFeedView(viewModel: FeedViewModel, accountViewModel: AccountViewModel, navController: NavController) {
+    val feedState by viewModel.feedContent.collectAsStateWithLifecycle()
+
+    var isRefreshing by remember { mutableStateOf(false) }
+    val swipeRefreshState = rememberSwipeRefreshState(isRefreshing)
+
+    val listState = rememberLazyListState()
+
+    LaunchedEffect(isRefreshing) {
+        if (isRefreshing) {
+            viewModel.refresh()
+            isRefreshing = false
+        }
+    }
+
+    SwipeRefresh(
+        state = swipeRefreshState,
+        onRefresh = {
+            isRefreshing = true
+        },
+    ) {
+        Column() {
+            Crossfade(targetState = feedState) { state ->
+                when (state) {
+                    is FeedState.Empty -> {
+                        FeedEmpty {
+                            isRefreshing = true
+                        }
+                    }
+                    is FeedState.FeedError -> {
+                        FeedError(state.errorMessage) {
+                            isRefreshing = true
+                        }
+                    }
+                    is FeedState.Loaded -> {
+                        LazyColumn(
+                            contentPadding = PaddingValues(
+                                top = 10.dp,
+                                bottom = 10.dp
+                            ),
+                            state = listState
+                        ) {
+                            itemsIndexed(state.feed, key = { _, item -> item.idHex }) { index, item ->
+                                ChatroomCompose(item, accountViewModel = accountViewModel, navController = navController)
+                            }
+                        }
+                    }
+                    FeedState.Loading -> {
+                        LoadingFeed()
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -21,7 +21,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import com.google.accompanist.swiperefresh.SwipeRefresh
@@ -29,7 +28,6 @@ import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
-@OptIn(ExperimentalLifecycleComposeApi::class)
 @Composable
 fun FeedView(viewModel: FeedViewModel, accountViewModel: AccountViewModel, navController: NavController) {
     val feedState by viewModel.feedContent.collectAsStateWithLifecycle()
@@ -133,57 +131,4 @@ fun FeedEmpty(onRefresh: () -> Unit) {
             Text(text = "Refresh")
         }
     }
-}
-
-
-// Bosted code to be deleted:
-
-/*
-
-                                Boosted By: removed because it was ugly
-
-                                if (item.event is RepostEvent) {
-                                    Row(
-                                        modifier = Modifier.padding(
-                                            start = 12.dp,
-                                            end = 12.dp,
-                                            bottom = 8.dp
-                                        ),
-                                        verticalAlignment = Alignment.CenterVertically
-                                    ) {
-                                        Icon(
-                                            painter = painterResource(R.drawable.ic_retweet),
-                                            null,
-                                            modifier = Modifier.size(20.dp),
-                                            tint = Color.Gray
-                                        )
-                                        Text(
-                                            text = "Boosted by ${item.author.toBestDisplayName()}",
-                                            modifier = Modifier.padding(start = 10.dp),
-                                            fontWeight = FontWeight.Bold,
-                                            color = Color.Gray,
-                                        )
-                                    }
-                                    val refNote = item.replyTo.firstOrNull()
-                                    if (refNote != null) {
-                                        NoteCompose(index, refNote)
-                                    } else {
-                                        Row(
-                                            modifier = Modifier.padding(
-                                                start = 40.dp,
-                                                end = 40.dp,
-                                                bottom = 25.dp,
-                                                top = 15.dp
-                                            ),
-                                            verticalAlignment = Alignment.CenterVertically
-                                        ) {
-                                            Text(
-                                                text = "Could not find referenced event",
-                                                modifier = Modifier.padding(30.dp),
-                                                color = Color.Gray,
-                                            )
-                                        }
-                                    }
-                                } else {
-                                    NoteCompose(index, item)
-                                }*/
+}

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

@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 
 
-class FeedViewModel(val dataSource: NostrDataSource): ViewModel() {
+class FeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
     private val _feedContent = MutableStateFlow<FeedState>(FeedState.Loading)
     val feedContent = _feedContent.asStateFlow()
 

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

@@ -6,7 +6,10 @@ import androidx.lifecycle.ViewModel
 import com.vitorpamplona.amethyst.service.relays.RelayPool
 
 class RelayPoolViewModel: ViewModel() {
-  val relayPoolLiveData: LiveData<String> = Transformations.map(RelayPool.live) {
-    it.relays.report()
+  val connectedRelaysLiveData: LiveData<Int> = Transformations.map(RelayPool.live) {
+    it.relays.connectedRelays()
+  }
+  val availableRelaysLiveData: LiveData<Int> = Transformations.map(RelayPool.live) {
+    it.relays.availableRelays()
   }
 }

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

@@ -1,16 +1,10 @@
 package com.vitorpamplona.amethyst.ui.screen
 
-import android.content.res.Resources.Theme
 import androidx.compose.animation.Crossfade
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@@ -19,20 +13,15 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.GenericShape
-import androidx.compose.material.Button
 import androidx.compose.material.Divider
 import androidx.compose.material.MaterialTheme
-import androidx.compose.material.OutlinedButton
 import androidx.compose.material.Text
-import androidx.compose.material.rememberScaffoldState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -40,28 +29,21 @@ 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.graphics.Shape
-import androidx.compose.ui.graphics.drawscope.DrawScope
-import androidx.compose.ui.platform.debugInspectorInfo
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import com.google.accompanist.swiperefresh.SwipeRefresh
 import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
-import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.ui.components.RichTextViewer
 import com.vitorpamplona.amethyst.ui.note.BlankNote
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.note.ReactionsRowState
 import com.vitorpamplona.amethyst.ui.note.UserDisplay
-import com.vitorpamplona.amethyst.ui.note.timeAgo
+import com.vitorpamplona.amethyst.ui.note.timeAgoLong
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import kotlinx.coroutines.launch
 
-@OptIn(ExperimentalLifecycleComposeApi::class)
 @Composable
 fun ThreadFeedView(noteId: String, viewModel: FeedViewModel, accountViewModel: AccountViewModel, navController: NavController) {
     val feedState by viewModel.feedContent.collectAsStateWithLifecycle()
@@ -183,13 +165,20 @@ fun NoteMaster(baseNote: Note, accountViewModel: AccountViewModel, navController
             Modifier
                 .fillMaxWidth()
                 .padding(top = 10.dp)) {
-            Row(modifier = Modifier.padding(start = 12.dp, end = 12.dp)) {
+            Row(modifier = Modifier
+                .padding(start = 12.dp, end = 12.dp)
+                .clickable(onClick = {
+                    author?.let {
+                        navController.navigate("User/${it.pubkeyHex}")
+                    }
+                })
+            ) {
                 // Draws the boosted picture outside the boosted card.
                 AsyncImage(
                     model = author?.profilePicture(),
                     contentDescription = "Profile Image",
                     modifier = Modifier
-                        .width(55.dp)
+                        .width(55.dp).height(55.dp)
                         .clip(shape = CircleShape)
                 )
 
@@ -201,7 +190,7 @@ fun NoteMaster(baseNote: Note, accountViewModel: AccountViewModel, navController
 
                     Row(verticalAlignment = Alignment.CenterVertically) {
                         Text(
-                            timeAgo(note.event?.createdAt),
+                            timeAgoLong(note.event?.createdAt),
                             color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                         )
                     }
@@ -212,7 +201,7 @@ fun NoteMaster(baseNote: Note, accountViewModel: AccountViewModel, navController
                 Column() {
                     val eventContent = note.event?.content
                     if (eventContent != null)
-                        RichTextViewer(eventContent, note.event?.tags)
+                        RichTextViewer(eventContent, note.event?.tags, note, accountViewModel, navController)
 
                     ReactionsRowState(note, accountViewModel)
 

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

@@ -0,0 +1,10 @@
+package com.vitorpamplona.amethyst.ui.screen
+
+import com.vitorpamplona.amethyst.model.User
+
+sealed class UserFeedState {
+    object Loading : UserFeedState()
+    class Loaded(val feed: List<User>) : UserFeedState()
+    object Empty : UserFeedState()
+    class FeedError(val errorMessage: String) : UserFeedState()
+}

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

@@ -0,0 +1,78 @@
+package com.vitorpamplona.amethyst.ui.screen
+
+import androidx.compose.animation.Crossfade
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation.NavController
+import com.google.accompanist.swiperefresh.SwipeRefresh
+import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
+import com.vitorpamplona.amethyst.ui.note.UserCompose
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+@Composable
+fun UserFeedView(viewModel: UserFeedViewModel, accountViewModel: AccountViewModel, navController: NavController) {
+    val feedState by viewModel.feedContent.collectAsStateWithLifecycle()
+
+    var isRefreshing by remember { mutableStateOf(false) }
+    val swipeRefreshState = rememberSwipeRefreshState(isRefreshing)
+
+    val listState = rememberLazyListState()
+
+    LaunchedEffect(isRefreshing) {
+        if (isRefreshing) {
+            viewModel.refresh()
+            isRefreshing = false
+        }
+    }
+
+    SwipeRefresh(
+        state = swipeRefreshState,
+        onRefresh = {
+            isRefreshing = true
+        },
+    ) {
+        Column() {
+            Crossfade(targetState = feedState) { state ->
+                when (state) {
+                    is UserFeedState.Empty -> {
+                        FeedEmpty {
+                            isRefreshing = true
+                        }
+                    }
+                    is UserFeedState.FeedError -> {
+                        FeedError(state.errorMessage) {
+                            isRefreshing = true
+                        }
+                    }
+                    is UserFeedState.Loaded -> {
+                        LazyColumn(
+                            contentPadding = PaddingValues(
+                                top = 10.dp,
+                                bottom = 10.dp
+                            ),
+                            state = listState
+                        ) {
+                            itemsIndexed(state.feed, key = { _, item -> item.pubkeyHex }) { index, item ->
+                                UserCompose(item, accountViewModel = accountViewModel, navController = navController)
+                            }
+                        }
+                    }
+                    UserFeedState.Loading -> {
+                        LoadingFeed()
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,79 @@
+package com.vitorpamplona.amethyst.ui.screen
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.LocalCacheState
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.NostrDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileFollowersDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileFollowsDataSource
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+
+class NostrUserProfileFollowsUserFeedViewModel(): UserFeedViewModel(
+    NostrUserProfileFollowsDataSource
+)
+
+class NostrUserProfileFollowersUserFeedViewModel(): UserFeedViewModel(
+    NostrUserProfileFollowersDataSource
+)
+
+open class UserFeedViewModel(val dataSource: NostrDataSource<User>): ViewModel() {
+    private val _feedContent = MutableStateFlow<UserFeedState>(UserFeedState.Loading)
+    val feedContent = _feedContent.asStateFlow()
+
+    fun refresh() {
+        // For some reason, view Model Scope doesn't call
+        viewModelScope.launch {
+            refreshSuspend()
+        }
+    }
+
+    fun refreshSuspend() {
+        val notes = dataSource.loadTop()
+
+        val oldNotesState = feedContent.value
+        if (oldNotesState is UserFeedState.Loaded) {
+            if (notes != oldNotesState.feed) {
+                updateFeed(notes)
+            }
+        } else {
+            updateFeed(notes)
+        }
+    }
+
+    fun updateFeed(notes: List<User>) {
+        if (notes.isEmpty()) {
+            _feedContent.update { UserFeedState.Empty }
+        } else {
+            _feedContent.update { UserFeedState.Loaded(notes) }
+        }
+    }
+
+    fun refreshCurrentList() {
+        val state = feedContent.value
+        if (state is UserFeedState.Loaded) {
+            _feedContent.update { UserFeedState.Loaded(state.feed) }
+        }
+    }
+
+    private val cacheListener: (LocalCacheState) -> Unit = {
+        refresh()
+    }
+
+    init {
+        LocalCache.live.observeForever(cacheListener)
+    }
+
+    override fun onCleared() {
+        LocalCache.live.removeObserver(cacheListener)
+
+        dataSource.stop()
+        viewModelScope.cancel()
+        super.onCleared()
+    }
+}

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

@@ -19,4 +19,12 @@ class AccountViewModel(private val account: Account): ViewModel() {
   fun boost(note: Note) {
     account.boost(note)
   }
+
+  fun broadcast(note: Note) {
+    account.broadcast(note)
+  }
+
+  fun decrypt(note: Note): String? {
+    return account.decryptContent(note)
+  }
 }

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

@@ -0,0 +1,145 @@
+package com.vitorpamplona.amethyst.ui.screen
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.Divider
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.NavController
+import coil.compose.AsyncImage
+import com.vitorpamplona.amethyst.model.Channel
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.NostrChannelDataSource
+import com.vitorpamplona.amethyst.service.NostrChatRoomDataSource
+import com.vitorpamplona.amethyst.ui.actions.PostButton
+import com.vitorpamplona.amethyst.ui.note.UserDisplay
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+@Composable
+fun ChannelScreen(channelId: String?, accountViewModel: AccountViewModel, navController: NavController) {
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account
+
+    if (account != null && channelId != null) {
+        val newPost = remember { mutableStateOf(TextFieldValue("")) }
+
+        NostrChannelDataSource.loadMessagesBetween(channelId)
+
+        val channelState by NostrChannelDataSource.channel!!.live.observeAsState()
+        val channel = channelState?.channel ?: return
+
+        val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrChannelDataSource ) }
+
+        Column(Modifier.fillMaxHeight()) {
+            channel?.let {
+                ChannelHeader(
+                    it,
+                    accountViewModel = accountViewModel,
+                    navController = navController
+                )
+            }
+
+            Column(
+                modifier = Modifier.fillMaxHeight().padding(vertical = 0.dp).weight(1f, true)
+            ) {
+                ChatroomFeedView(feedViewModel, accountViewModel, navController)
+            }
+
+            //LAST ROW
+            Row(modifier = Modifier.padding(10.dp).fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceBetween,
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                OutlinedTextField(
+                    value = newPost.value,
+                    onValueChange = { newPost.value = it },
+                    keyboardOptions = KeyboardOptions.Default.copy(
+                        capitalization = KeyboardCapitalization.Sentences
+                    ),
+                    modifier = Modifier.weight(1f, true).padding(end = 10.dp),
+                    placeholder = {
+                        Text(
+                            text = "reply here.. ",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    }
+                )
+
+                PostButton(
+                    onPost = {
+                        account.sendChannelMeesage(newPost.value.text, channel.idHex)
+                        newPost.value = TextFieldValue("")
+                    },
+                    newPost.value.text.isNotBlank()
+                )
+            }
+        }
+    }
+}
+
+
+@Composable
+fun ChannelHeader(baseChannel: Channel, accountViewModel: AccountViewModel, navController: NavController) {
+    val channelState by baseChannel.live.observeAsState()
+    val channel = channelState?.channel
+
+    Column(modifier =
+        Modifier
+            .padding(12.dp)
+    ) {
+        Row(verticalAlignment = Alignment.CenterVertically) {
+
+            AsyncImage(
+                model = channel?.profilePicture(),
+                contentDescription = "Profile Image",
+                modifier = Modifier
+                    .width(35.dp).height(35.dp)
+                    .clip(shape = CircleShape)
+            )
+
+            Column(modifier = Modifier.padding(start = 10.dp)) {
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    Text(
+                        "${channel?.info?.name}",
+                        fontWeight = FontWeight.Bold,
+                    )
+                }
+
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    Text(
+                        "${channel?.info?.about}",
+                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                    )
+                }
+            }
+        }
+
+        Divider(
+            modifier = Modifier.padding(top = 12.dp, start = 12.dp, end = 12.dp),
+            thickness = 0.25.dp
+        )
+    }
+}

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

@@ -0,0 +1,32 @@
+package com.vitorpamplona.amethyst.ui.screen
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.NavController
+import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+@Composable
+fun ChatroomListScreen(accountViewModel: AccountViewModel, navController: NavController) {
+    val account by accountViewModel.accountLiveData.observeAsState()
+
+    if (account != null) {
+        val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrChatroomListDataSource ) }
+
+        Column(Modifier.fillMaxHeight()) {
+            Column(
+                modifier = Modifier.padding(vertical = 0.dp)
+            ) {
+                ChatroomListFeedView(feedViewModel, accountViewModel, navController)
+            }
+        }
+    }
+}
+

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

@@ -0,0 +1,133 @@
+package com.vitorpamplona.amethyst.ui.screen
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.Divider
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.NavController
+import coil.compose.AsyncImage
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.NostrChatRoomDataSource
+import com.vitorpamplona.amethyst.ui.actions.PostButton
+import com.vitorpamplona.amethyst.ui.note.UserDisplay
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+@Composable
+fun ChatroomScreen(userId: String?, accountViewModel: AccountViewModel, navController: NavController) {
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account
+
+    if (account != null && userId != null) {
+        val newPost = remember { mutableStateOf(TextFieldValue("")) }
+
+        NostrChatRoomDataSource.loadMessagesBetween(account, userId)
+
+        val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrChatRoomDataSource ) }
+
+        Column(Modifier.fillMaxHeight()) {
+            NostrChatRoomDataSource.withUser?.let {
+                ChatroomHeader(
+                    it,
+                    accountViewModel = accountViewModel,
+                    navController = navController
+                )
+            }
+
+            Column(
+                modifier = Modifier.fillMaxHeight().padding(vertical = 0.dp).weight(1f, true)
+            ) {
+                ChatroomFeedView(feedViewModel, accountViewModel, navController)
+            }
+
+            //LAST ROW
+            Row(modifier = Modifier.padding(10.dp).fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceBetween,
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                OutlinedTextField(
+                    value = newPost.value,
+                    onValueChange = { newPost.value = it },
+                    keyboardOptions = KeyboardOptions.Default.copy(
+                        capitalization = KeyboardCapitalization.Sentences
+                    ),
+                    modifier = Modifier.weight(1f, true).padding(end = 10.dp),
+                    placeholder = {
+                        Text(
+                            text = "reply here.. ",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    }
+                )
+
+                PostButton(
+                    onPost = {
+                        account.sendPrivateMeesage(newPost.value.text, userId)
+                        newPost.value = TextFieldValue("")
+                    },
+                    newPost.value.text.isNotBlank()
+                )
+            }
+        }
+    }
+}
+
+
+@Composable
+fun ChatroomHeader(baseUser: User, accountViewModel: AccountViewModel, navController: NavController) {
+    val authorState by baseUser.live.observeAsState()
+    val author = authorState?.user
+
+    Column(modifier =
+        Modifier
+            .padding(12.dp)
+            .clickable(
+                onClick = { navController.navigate("User/${author?.pubkeyHex}") }
+            )
+    ) {
+        Row(verticalAlignment = Alignment.CenterVertically) {
+
+            AsyncImage(
+                model = author?.profilePicture(),
+                contentDescription = "Profile Image",
+                modifier = Modifier
+                    .width(35.dp).height(35.dp)
+                    .clip(shape = CircleShape)
+            )
+
+            Column(modifier = Modifier.padding(start = 10.dp)) {
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    if (author != null)
+                        UserDisplay(author)
+                }
+            }
+        }
+
+        Divider(
+            modifier = Modifier.padding(top = 12.dp, start = 12.dp, end = 12.dp),
+            thickness = 0.25.dp
+        )
+    }
+}

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

@@ -8,18 +8,16 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
 import com.vitorpamplona.amethyst.service.NostrHomeDataSource
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
-@OptIn(ExperimentalLifecycleComposeApi::class)
 @Composable
 fun HomeScreen(accountViewModel: AccountViewModel, navController: NavController) {
-    val account by accountViewModel.accountLiveData.observeAsState()
+    val accountState by accountViewModel.accountLiveData.observeAsState()
 
-    if (account != null) {
+    if (accountState != null) {
         val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrHomeDataSource ) }
 
         Column(Modifier.fillMaxHeight()) {

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

@@ -5,11 +5,14 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.statusBarsPadding
-import androidx.compose.material.*
+import androidx.compose.material.DrawerValue
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Scaffold
+import androidx.compose.material.rememberDrawerState
+import androidx.compose.material.rememberScaffoldState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
@@ -51,7 +54,6 @@ fun MainScreen(accountViewModel: AccountViewModel, accountStateViewModel: Accoun
     }
 }
 
-@OptIn(ExperimentalLifecycleComposeApi::class)
 @Composable
 fun FloatingButton(navController: NavHostController, accountViewModel: AccountStateViewModel) {
     val accountState by accountViewModel.accountContent.collectAsStateWithLifecycle()

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

@@ -1,29 +0,0 @@
-package com.vitorpamplona.amethyst.ui.screen
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.material.Text
-import androidx.compose.material.rememberScaffoldState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-
-@Composable
-fun MessageScreen(accountViewModel: AccountViewModel) {
-    val state = rememberScaffoldState()
-    val scope = rememberCoroutineScope()
-
-    Column(
-        Modifier
-            .fillMaxHeight()
-            .fillMaxWidth(),
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Center,
-    ) {
-        Text("Message Screen")
-    }
-}

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

@@ -8,13 +8,11 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
 import com.vitorpamplona.amethyst.service.NostrNotificationDataSource
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
-@OptIn(ExperimentalLifecycleComposeApi::class)
 @Composable
 fun NotificationScreen(accountViewModel: AccountViewModel, navController: NavController) {
     val account by accountViewModel.accountLiveData.observeAsState()

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

@@ -1,29 +1,346 @@
 package com.vitorpamplona.amethyst.ui.screen
 
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+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.material.Button
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.Divider
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Surface
+import androidx.compose.material.Tab
+import androidx.compose.material.TabRow
+import androidx.compose.material.TabRowDefaults
 import androidx.compose.material.Text
-import androidx.compose.material.rememberScaffoldState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.rememberCoroutineScope
 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.ClipboardManager
+import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.NavController
+import coil.compose.AsyncImage
+import com.google.accompanist.pager.ExperimentalPagerApi
+import com.google.accompanist.pager.HorizontalPager
+import com.google.accompanist.pager.pagerTabIndicatorOffset
+import com.google.accompanist.pager.rememberPagerState
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileFollowersDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileFollowsDataSource
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import kotlinx.coroutines.launch
+import nostr.postr.toNpub
+
+data class TabRowItem(
+    val title: String,
+    val screen: @Composable () -> Unit,
+)
+
+@OptIn(ExperimentalPagerApi::class)
+@Composable
+fun ProfileScreen(userId: String?, accountViewModel: AccountViewModel, navController: NavController) {
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account
+
+    val accountUserState by accountViewModel.userLiveData.observeAsState()
+    val accountUser = accountUserState?.user
+
+    val clipboardManager = LocalClipboardManager.current
+
+    if (userId != null && account != null && accountUser != null) {
+        DisposableEffect(account) {
+            NostrUserProfileDataSource.loadUserProfile(userId)
+            NostrUserProfileFollowersDataSource.loadUserProfile(userId)
+            NostrUserProfileFollowsDataSource.loadUserProfile(userId)
+
+            onDispose {
+                NostrUserProfileDataSource.stop()
+                NostrUserProfileFollowsDataSource.stop()
+                NostrUserProfileFollowersDataSource.stop()
+            }
+        }
+
+        val baseUser = NostrUserProfileDataSource.user ?: return
+
+        val userState by baseUser.live.observeAsState()
+        val user = userState?.user ?: return
+
+        Surface(
+            modifier = Modifier.fillMaxWidth(),
+            color = MaterialTheme.colors.background
+        ) {
+            Column() {
+                Box {
+                    val banner = user.info.banner
+                    if (banner != null && banner.isNotBlank()) {
+                        AsyncImage(
+                            model = banner,
+                            contentDescription = "Profile Image",
+                            contentScale = ContentScale.FillWidth,
+                            modifier = Modifier.fillMaxWidth().height(125.dp)
+                        )
+                    } else {
+                        Image(
+                            painter = painterResource(R.drawable.profile_banner),
+                            contentDescription = "Profile Banner",
+                            contentScale = ContentScale.FillWidth,
+                            modifier = Modifier.fillMaxWidth().height(125.dp)
+                        )
+                    }
+
+                    Column(modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 10.dp)
+                        .padding(top = 75.dp)) {
+
+                        Row(horizontalArrangement = Arrangement.SpaceBetween,
+                            verticalAlignment = Alignment.Bottom) {
+                            AsyncImage(
+                                model = user.profilePicture(),
+                                contentDescription = "Profile Image",
+                                modifier = Modifier
+                                    .width(100.dp)
+                                    .height(100.dp)
+                                    .clip(shape = CircleShape)
+                                    .border(3.dp, MaterialTheme.colors.background, CircleShape)
+                                    .background(MaterialTheme.colors.background)
+                            )
+
+                            Spacer(Modifier.weight(1f))
+
+                            MessageButton(user, navController)
+
+                            NPubCopyButton(clipboardManager, user)
+
+                            if (accountUser == user) {
+                                EditButton()
+                            } else {
+                                if (accountUser.follows?.contains(user) == true) {
+                                    UnfollowButton { account.unfollow(user) }
+                                } else {
+                                    FollowButton { account.follow(user) }
+                                }
+                            }
+                        }
+
+                        Text(
+                            user.bestDisplayName() ?: "",
+                            modifier = Modifier.padding(top = 7.dp),
+                            fontWeight = FontWeight.Bold,
+                            fontSize = 25.sp
+                        )
+                        Text(" @${user.bestUsername()}", color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f))
+                        Text(
+                            "${user.info.about}",
+                            color = Color.White,
+                            modifier = Modifier.padding(top = 5.dp, bottom = 5.dp)
+                        )
+
+                        Divider(modifier = Modifier.padding(top = 6.dp))
+                    }
+                }
+
+                val pagerState = rememberPagerState()
+                val coroutineScope = rememberCoroutineScope()
+
+                Column(modifier = Modifier.padding(start = 10.dp, end = 10.dp)) {
+                    TabRow(
+                        selectedTabIndex = pagerState.currentPage,
+                        indicator = { tabPositions ->
+                            TabRowDefaults.Indicator(
+                                Modifier.pagerTabIndicatorOffset(pagerState, tabPositions),
+                                color = MaterialTheme.colors.primary
+                            )
+                        },
+                    ) {
+                        Tab(
+                            selected = pagerState.currentPage == 0,
+                            onClick = { coroutineScope.launch { pagerState.animateScrollToPage(0) } },
+                            text = {
+                                Text(text = "Notes")
+                            }
+                        )
+
+                        Tab(
+                            selected = pagerState.currentPage == 1,
+                            onClick = { coroutineScope.launch { pagerState.animateScrollToPage(1) } },
+                            text = {
+                                Text(text = "${user.follows?.size ?: "--"} Following")
+                            }
+                        )
+
+                        Tab(
+                            selected = pagerState.currentPage == 2,
+                            onClick = { coroutineScope.launch { pagerState.animateScrollToPage(2) } },
+                            text = {
+                                Text(text = "${user.followers?.size ?: "--"} Followers")
+                            }
+                        )
+                    }
+                    HorizontalPager(count = 3, state = pagerState) {
+                        when (pagerState.currentPage) {
+                            0 -> TabNotes(user, accountViewModel, navController)
+                            1 -> TabFollows(user, accountViewModel, navController)
+                            2 -> TabFollowers(user, accountViewModel, navController)
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
 
 @Composable
-fun ProfileScreen(accountViewModel: AccountViewModel) {
-    val state = rememberScaffoldState()
-    val scope = rememberCoroutineScope()
+fun TabNotes(user: User, accountViewModel: AccountViewModel, navController: NavController) {
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    if (accountState != null) {
+        val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrUserProfileDataSource ) }
 
-    Column(
-        Modifier
-            .fillMaxHeight()
-            .fillMaxWidth(),
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Center,
-    ) {
-        Text("Profile Screen")
+        Column(Modifier.fillMaxHeight()) {
+            Column(
+                modifier = Modifier.padding(vertical = 0.dp)
+            ) {
+                FeedView(feedViewModel, accountViewModel, navController)
+            }
+        }
     }
-}
+}
+
+@Composable
+fun TabFollows(user: User, accountViewModel: AccountViewModel, navController: NavController) {
+    val feedViewModel: NostrUserProfileFollowsUserFeedViewModel = viewModel()
+
+    Column(Modifier.fillMaxHeight()) {
+        Column(
+            modifier = Modifier.padding(vertical = 0.dp)
+        ) {
+            UserFeedView(feedViewModel, accountViewModel, navController)
+        }
+    }
+}
+
+@Composable
+fun TabFollowers(user: User, accountViewModel: AccountViewModel, navController: NavController) {
+    val feedViewModel: NostrUserProfileFollowersUserFeedViewModel = viewModel()
+
+    Column(Modifier.fillMaxHeight()) {
+        Column(
+            modifier = Modifier.padding(vertical = 0.dp)
+        ) {
+            UserFeedView(feedViewModel, accountViewModel, navController)
+        }
+    }
+}
+
+@Composable
+private fun NPubCopyButton(
+    clipboardManager: ClipboardManager,
+    user: User
+) {
+    Button(
+        modifier = Modifier.padding(horizontal = 3.dp),
+        onClick = { clipboardManager.setText(AnnotatedString(user.pubkey.toNpub())) },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+            ),
+    ) {
+        Text(text = "npub", color = Color.White)
+    }
+}
+
+@Composable
+private fun MessageButton(user: User, navController: NavController) {
+    Button(
+        modifier = Modifier.padding(horizontal = 3.dp),
+        onClick = { navController.navigate("Room/${user.pubkeyHex}") },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+            ),
+    ) {
+        Icon(
+            painter = painterResource(R.drawable.ic_dm),
+            "Send a Direct Message",
+            modifier = Modifier.size(20.dp),
+            tint = Color.Unspecified
+        )
+    }
+}
+
+@Composable
+private fun EditButton() {
+    Button(
+        modifier = Modifier.padding(horizontal = 3.dp),
+        onClick = {},
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = MaterialTheme.colors.primary
+            )
+    ) {
+        Text(text = "Edit", color = Color.White)
+    }
+}
+
+@Composable
+fun UnfollowButton(onClick: () -> Unit) {
+    Button(
+        modifier = Modifier.padding(horizontal = 3.dp),
+        onClick = onClick,
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = MaterialTheme.colors.primary
+            )
+    ) {
+        Text(text = "Unfollow", color = Color.White)
+    }
+}
+
+@Composable
+fun FollowButton(onClick: () -> Unit) {
+    Button(
+        modifier = Modifier.padding(start = 3.dp),
+        onClick = onClick,
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = MaterialTheme.colors.primary
+            )
+    ) {
+        Text(text = "Follow", color = Color.White)
+    }
+}
+
+

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

@@ -6,13 +6,11 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
 import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
-@OptIn(ExperimentalLifecycleComposeApi::class)
 @Composable
 fun SearchScreen(accountViewModel: AccountViewModel, navController: NavController) {
     val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrGlobalDataSource ) }

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

@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Modifier
@@ -17,6 +18,12 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 fun ThreadScreen(noteId: String?, accountViewModel: AccountViewModel, navController: NavController) {
     val account by accountViewModel.accountLiveData.observeAsState()
 
+    DisposableEffect(account) {
+        onDispose {
+            NostrThreadDataSource.stop()
+        }
+    }
+
     if (account != null && noteId != null) {
         NostrThreadDataSource.loadThread(noteId)
 

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

@@ -12,29 +12,37 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.ClickableText
+import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.Button
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Visibility
+import androidx.compose.material.icons.outlined.VisibilityOff
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.ui.theme.Purple700
 
 @Composable
 fun LoginPage(accountViewModel: AccountStateViewModel) {
@@ -48,7 +56,7 @@ fun LoginPage(accountViewModel: AccountStateViewModel) {
             style = TextStyle(
                 fontSize = 14.sp,
                 textDecoration = TextDecoration.Underline,
-                color = Purple700
+                color = MaterialTheme.colors.primary
             )
         )
     }
@@ -59,6 +67,7 @@ fun LoginPage(accountViewModel: AccountStateViewModel) {
     ) {
 
         val key = remember { mutableStateOf(TextFieldValue("")) }
+        var errorMessage by remember { mutableStateOf("") }
 
         Image(
             painterResource(id = R.drawable.amethyst_logo),
@@ -71,27 +80,62 @@ fun LoginPage(accountViewModel: AccountStateViewModel) {
 
         //Text(text = "Insert your private or public key (view-only)")
 
+        var showPassword by remember {
+            mutableStateOf(false)
+        }
+
         OutlinedTextField(
             value = key.value,
             onValueChange = { key.value = it },
             keyboardOptions = KeyboardOptions(
                 autoCorrect = false,
                 keyboardType = KeyboardType.Ascii,
-                imeAction = ImeAction.Next
+                imeAction = ImeAction.Go
             ),
             placeholder = {
                 Text(
                     text = "nsec / npub / hex private key",
                     color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                 )
-            }
+            },
+            trailingIcon = {
+                IconButton(onClick = { showPassword = !showPassword }) {
+                    Icon(
+                        imageVector = if (showPassword) Icons.Outlined.VisibilityOff else Icons.Outlined.Visibility,
+                        contentDescription = if (showPassword) "Show Password" else "Hide Password"
+                    )
+                }
+            },
+            visualTransformation = if (showPassword) VisualTransformation.None else PasswordVisualTransformation(),
+            keyboardActions = KeyboardActions(
+                onGo = {
+                    try {
+                        accountViewModel.login(key.value.text)
+                    } catch (e: Exception) {
+                        errorMessage = "Invalid key"
+                    }
+                }
+            )
         )
+        if (errorMessage.isNotBlank()) {
+            Text(
+                text = "${errorMessage}",
+                color = MaterialTheme.colors.error,
+                style = MaterialTheme.typography.caption
+            )
+        }
 
         Spacer(modifier = Modifier.height(20.dp))
 
         Box(modifier = Modifier.padding(40.dp, 0.dp, 40.dp, 0.dp)) {
             Button(
-                onClick = { accountViewModel.login(key.value.text) },
+                onClick = {
+                    try {
+                        accountViewModel.login(key.value.text)
+                    } catch (e: Exception) {
+                        errorMessage = "Invalid key"
+                    }
+                },
                 shape = RoundedCornerShape(35.dp),
                 modifier = Modifier
                     .fillMaxWidth()

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

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="280dp"
+    android:height="280dp"
+    android:viewportWidth="280"
+    android:viewportHeight="280">
+  <path
+      android:pathData="M7,140.5C7,66.77 66.77,7 140.5,7C214.23,7 274,66.77 274,140.5C274,214.23 214.23,274 140.5,274C66.77,274 7,214.23 7,140.5Z"
+      android:fillColor="#f7931a"/>
+  <path
+      android:pathData="M161.19,51.5C153.23,72.16 145.28,94.41 135.72,116.66C135.72,116.66 135.72,119.84 138.91,119.84L204.17,119.84C204.17,119.84 204.17,121.43 205.77,123.02L110.25,229.5C108.66,227.91 108.66,226.32 108.66,224.73L142.09,153.21L142.09,146.86L75.23,146.86L75.23,140.5L156.42,51.5L161.19,51.5Z"
+      android:fillColor="#ffffff"/>
+</vector>

app/src/test/java/com/vitorpamplona/amethyst/ExampleUnitTest.kt

@@ -1,9 +1,8 @@
 package com.vitorpamplona.amethyst
 
+import org.junit.Assert.assertEquals
 import org.junit.Test
 
-import org.junit.Assert.*
-
 /**
  * Example local unit test, which will execute on the development machine (host).
  *

build.gradle

@@ -1,8 +1,9 @@
 buildscript {
     ext {
-        compose_ui_version = '1.3.2'
+        compose_ui_version = '1.3.3'
         nav_version = "2.5.3"
         room_version = "2.4.3"
+        accompanist_version = "0.28.0"
     }
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {