v0.50.3

Fix for case-sensitive hashtag issue.

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 167
-        versionName "0.49.4"
+        versionCode 171
+        versionName "0.50.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -177,6 +177,12 @@ dependencies {
     playImplementation platform('com.google.firebase:firebase-bom:32.0.0')
     playImplementation 'com.google.firebase:firebase-messaging-ktx'
 
+    // Charts
+    implementation "com.patrykandpatrick.vico:core:${vico_version}"
+    implementation "com.patrykandpatrick.vico:compose:${vico_version}"
+    implementation "com.patrykandpatrick.vico:views:${vico_version}"
+    implementation "com.patrykandpatrick.vico:compose-m2:${vico_version}"
+
     // Automatic memory leak detection
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
 

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

@@ -95,7 +95,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
                 BadgeAwardEvent.kind
             ),
             tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
-            limit = 400,
+            limit = 4000,
             since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultNotificationFollowList)?.relayList
         )
     )

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

@@ -43,6 +43,7 @@ class TextNoteEvent(
             }
             findHashtags(msg).forEach {
                 tags.add(listOf("t", it))
+                tags.add(listOf("t", it.lowercase()))
             }
             extraTags?.forEach {
                 tags.add(listOf("t", it))

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

@@ -70,7 +70,7 @@ object Client : RelayPool.Listener {
         if (relay == null) {
             RelayPool.send(signedEvent)
         } else {
-            val useConnectedRelayIfPresent = relays.filter { it.url == relay }
+            val useConnectedRelayIfPresent = RelayPool.getRelays(relay)
 
             if (useConnectedRelayIfPresent.isNotEmpty()) {
                 useConnectedRelayIfPresent.forEach {
@@ -103,7 +103,7 @@ object Client : RelayPool.Listener {
             onConnected(relay)
 
             GlobalScope.launch(Dispatchers.IO) {
-                delay(10000) // waits for a reply
+                delay(60000) // waits for a reply
                 relay.disconnect()
                 RelayPool.removeRelay(relay)
 

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

@@ -30,6 +30,10 @@ object RelayPool : Relay.Listener {
         return relays.firstOrNull() { it.url == url }
     }
 
+    fun getRelays(url: String): List<Relay> {
+        return relays.filter { it.url == url }
+    }
+
     fun loadRelays(relayList: List<Relay>) {
         if (!relayList.isNullOrEmpty()) {
             relayList.forEach { addRelay(it) }

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

@@ -8,6 +8,7 @@ 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.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavHostController
@@ -18,6 +19,7 @@ import com.vitorpamplona.amethyst.ui.dal.HomeConversationsFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.HomeNewThreadFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.NotificationFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.VideoFeedFilter
+import com.vitorpamplona.amethyst.ui.note.UserReactionsViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrGlobalFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrHomeFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrHomeRepliesFeedViewModel
@@ -37,6 +39,8 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.ProfileScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.SearchScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.ThreadScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.VideoScreen
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
@@ -50,7 +54,8 @@ fun AppNavigation(
 
     // Avoids creating ViewModels for performance reasons (up to 1 second delays)
     val accountState by accountViewModel.accountLiveData.observeAsState()
-    val account = accountState?.account ?: return
+    val account = remember(accountState) { accountState?.account } ?: return
+    val accountHex = remember(accountState) { accountState?.account?.userProfile()?.pubkeyHex }
 
     HomeNewThreadFeedFilter.account = account
     HomeConversationsFeedFilter.account = account
@@ -67,6 +72,16 @@ fun AppNavigation(
     NotificationFeedFilter.account = account
     val notifFeedViewModel: NotificationViewModel = viewModel()
 
+    val userReactionsStatsModel: UserReactionsViewModel = viewModel()
+    val scope = rememberCoroutineScope()
+
+    LaunchedEffect(accountHex) {
+        scope.launch(Dispatchers.IO) {
+            userReactionsStatsModel.load(account.userProfile())
+            userReactionsStatsModel.initializeSuspend()
+        }
+    }
+
     NavHost(navController, startDestination = Route.Home.route) {
         Route.Video.let { route ->
             composable(route.route, route.arguments, content = {
@@ -135,6 +150,7 @@ fun AppNavigation(
 
                 NotificationScreen(
                     notifFeedViewModel = notifFeedViewModel,
+                    userReactionsStatsModel = userReactionsStatsModel,
                     accountViewModel = accountViewModel,
                     navController = navController,
                     scrollToTop = scrollToTop

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

@@ -7,6 +7,7 @@ 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
@@ -23,6 +24,7 @@ import androidx.compose.material.Text
 import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.filled.ExpandMore
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
@@ -337,7 +339,16 @@ fun SimpleTextSpinner(
         modifier = modifier,
         contentAlignment = Alignment.Center
     ) {
-        Text(placeholder)
+        Row(verticalAlignment = Alignment.CenterVertically) {
+            Spacer(modifier = Modifier.size(20.dp))
+            Text(placeholder)
+            Icon(
+                imageVector = Icons.Default.ExpandMore,
+                null,
+                modifier = Modifier.size(20.dp),
+                tint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+            )
+        }
         Box(
             modifier = Modifier
                 .matchParentSize()

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

@@ -110,6 +110,8 @@ fun ChatroomMessageCompose(
         note?.let {
             NoteQuickActionMenu(it, popupExpanded, { popupExpanded = false }, accountViewModel)
         }
+    } else if (account.isHidden(noteForReports.author!!)) {
+        // Does nothing
     } else {
         var showHiddenNote by remember { mutableStateOf(false) }
         var isAcceptableAndCanPreview by remember { mutableStateOf(Pair(true, true)) }
@@ -131,16 +133,14 @@ fun ChatroomMessageCompose(
         }
 
         if (!isAcceptableAndCanPreview.first && !showHiddenNote) {
-            if (!account.isHidden(noteForReports.author!!)) {
-                HiddenNote(
-                    account.getRelevantReports(noteForReports),
-                    account.userProfile(),
-                    Modifier,
-                    innerQuote,
-                    navController,
-                    onClick = { showHiddenNote = true }
-                )
-            }
+            HiddenNote(
+                account.getRelevantReports(noteForReports),
+                account.userProfile(),
+                Modifier,
+                innerQuote,
+                navController,
+                onClick = { showHiddenNote = true }
+            )
         } else {
             val backgroundBubbleColor: Color
             val alignment: Arrangement.Horizontal

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

@@ -220,6 +220,8 @@ fun NoteComposeInner(
         note?.let {
             NoteQuickActionMenu(it, popupExpanded, { popupExpanded = false }, accountViewModel)
         }
+    } else if (account.isHidden(noteForReports.author!!)) {
+        // Does nothing
     } else {
         var showHiddenNote by remember { mutableStateOf(false) }
         var isAcceptableAndCanPreview by remember { mutableStateOf(Pair(true, true)) }
@@ -241,16 +243,14 @@ fun NoteComposeInner(
         }
 
         if (!isAcceptableAndCanPreview.first && !showHiddenNote) {
-            if (!account.isHidden(noteForReports.author!!)) {
-                HiddenNote(
-                    account.getRelevantReports(noteForReports),
-                    account.userProfile(),
-                    modifier,
-                    isBoostedNote,
-                    navController,
-                    onClick = { showHiddenNote = true }
-                )
-            }
+            HiddenNote(
+                account.getRelevantReports(noteForReports),
+                account.userProfile(),
+                modifier,
+                isBoostedNote,
+                navController,
+                onClick = { showHiddenNote = true }
+            )
         } else if ((noteEvent is ChannelCreateEvent || noteEvent is ChannelMetadataEvent) && baseChannel != null) {
             ChannelHeader(baseChannel = baseChannel, account = account, navController = navController)
         } else if (noteEvent is BadgeDefinitionEvent) {

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

@@ -0,0 +1,351 @@
+package com.vitorpamplona.amethyst.ui.note
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Bolt
+import androidx.compose.material.icons.filled.ExpandMore
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment.Companion.CenterVertically
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import androidx.navigation.NavController
+import com.patrykandpatrick.vico.core.chart.composed.ComposedChartEntryModel
+import com.patrykandpatrick.vico.core.entry.ChartEntryModel
+import com.patrykandpatrick.vico.core.entry.ChartEntryModelProducer
+import com.patrykandpatrick.vico.core.entry.composed.plus
+import com.patrykandpatrick.vico.core.entry.entryOf
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
+import com.vitorpamplona.amethyst.service.model.ReactionEvent
+import com.vitorpamplona.amethyst.service.model.RepostEvent
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import java.math.BigDecimal
+import java.time.Instant
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+
+@Composable
+fun UserReactionsRow(model: UserReactionsViewModel, accountViewModel: AccountViewModel, navController: NavController, onClick: () -> Unit) {
+    Row(
+        verticalAlignment = CenterVertically,
+        modifier = Modifier
+            .clickable(onClick = onClick)
+            .padding(10.dp)
+    ) {
+        Row(verticalAlignment = CenterVertically, modifier = Modifier.width(68.dp)) {
+            Text(
+                text = stringResource(id = R.string.today),
+                fontWeight = FontWeight.Bold
+            )
+
+            Icon(
+                imageVector = Icons.Default.ExpandMore,
+                null,
+                modifier = Modifier.size(20.dp),
+                tint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+            )
+        }
+
+        Row(verticalAlignment = CenterVertically, modifier = Modifier.weight(1f)) {
+            UserReplyReaction(model.replies[model.today])
+        }
+
+        Row(verticalAlignment = CenterVertically, modifier = Modifier.weight(1f)) {
+            UserBoostReaction(model.boosts[model.today])
+        }
+
+        Row(verticalAlignment = CenterVertically, modifier = Modifier.weight(1f)) {
+            UserLikeReaction(model.reactions[model.today])
+        }
+
+        Row(verticalAlignment = CenterVertically, modifier = Modifier.weight(1f)) {
+            UserZapReaction(model.zaps[model.today])
+        }
+    }
+}
+
+class UserReactionsViewModel : ViewModel() {
+    var user: User? = null
+
+    var reactions by mutableStateOf<Map<String, Int>>(emptyMap())
+    var boosts by mutableStateOf<Map<String, Int>>(emptyMap())
+    var zaps by mutableStateOf<Map<String, BigDecimal>>(emptyMap())
+    var replies by mutableStateOf<Map<String, Int>>(emptyMap())
+
+    var takenIntoAccount = setOf<HexKey>()
+
+    val sdf = DateTimeFormatter.ofPattern("yyyy-MM-dd") // SimpleDateFormat()
+    val today = sdf.format(LocalDateTime.now())
+
+    var chartModel by mutableStateOf<ComposedChartEntryModel<ChartEntryModel>?>(null)
+    var axisLabels by mutableStateOf<List<String>>(emptyList())
+
+    fun load(baseUser: User) {
+        user = baseUser
+        reactions = emptyMap()
+        boosts = emptyMap()
+        zaps = emptyMap()
+        replies = emptyMap()
+        takenIntoAccount = emptySet()
+    }
+
+    fun formatDate(createAt: Long): String {
+        return sdf.format(
+            Instant.ofEpochSecond(createAt)
+                .atZone(ZoneId.systemDefault())
+                .toLocalDateTime()
+        )
+    }
+
+    fun initializeSuspend() {
+        val currentUser = user?.pubkeyHex ?: return
+
+        val reactions = mutableMapOf<String, Int>()
+        val boosts = mutableMapOf<String, Int>()
+        val zaps = mutableMapOf<String, BigDecimal>()
+        val replies = mutableMapOf<String, Int>()
+        val takenIntoAccount = mutableSetOf<HexKey>()
+
+        LocalCache.notes.values.forEach {
+            val noteEvent = it.event
+            if (noteEvent != null && !takenIntoAccount.contains(noteEvent.id())) {
+                if (noteEvent is ReactionEvent) {
+                    if (noteEvent.isTaggedUser(currentUser) && noteEvent.pubKey != currentUser) {
+                        val netDate = formatDate(noteEvent.createdAt)
+                        reactions[netDate] = (reactions[netDate] ?: 0) + 1
+                        takenIntoAccount.add(noteEvent.id())
+                    }
+                } else if (noteEvent is RepostEvent) {
+                    if (noteEvent.isTaggedUser(currentUser) && noteEvent.pubKey != currentUser) {
+                        val netDate = formatDate(noteEvent.createdAt)
+                        boosts[netDate] = (boosts[netDate] ?: 0) + 1
+                        takenIntoAccount.add(noteEvent.id())
+                    }
+                } else if (noteEvent is LnZapEvent) {
+                    if (noteEvent.isTaggedUser(currentUser) && noteEvent.pubKey != currentUser) {
+                        val netDate = formatDate(noteEvent.createdAt)
+                        zaps[netDate] = (zaps[netDate] ?: BigDecimal.ZERO) + (noteEvent.amount ?: BigDecimal.ZERO)
+                        takenIntoAccount.add(noteEvent.id())
+                    }
+                } else if (noteEvent is TextNoteEvent) {
+                    if (noteEvent.isTaggedUser(currentUser) && noteEvent.pubKey != currentUser) {
+                        val netDate = formatDate(noteEvent.createdAt)
+                        replies[netDate] = (replies[netDate] ?: 0) + 1
+                        takenIntoAccount.add(noteEvent.id())
+                    }
+                }
+            }
+        }
+
+        this.takenIntoAccount = takenIntoAccount
+        this.reactions = reactions
+        this.replies = replies
+        this.zaps = zaps
+        this.boosts = boosts
+
+        refreshChartModel()
+    }
+
+    fun addToStatsSuspend(newNotes: Set<Note>) {
+        val currentUser = user?.pubkeyHex ?: return
+
+        val reactions = this.reactions.toMutableMap()
+        val boosts = this.boosts.toMutableMap()
+        val zaps = this.zaps.toMutableMap()
+        val replies = this.replies.toMutableMap()
+        val takenIntoAccount = this.takenIntoAccount.toMutableSet()
+        var hasNewElements = false
+
+        newNotes.forEach {
+            val noteEvent = it.event
+            if (noteEvent != null && !takenIntoAccount.contains(noteEvent.id())) {
+                if (noteEvent is ReactionEvent) {
+                    if (noteEvent.isTaggedUser(currentUser) && noteEvent.pubKey != currentUser) {
+                        val netDate = formatDate(noteEvent.createdAt)
+                        reactions[netDate] = (reactions[netDate] ?: 0) + 1
+                        takenIntoAccount.add(noteEvent.id())
+                        hasNewElements = true
+                    }
+                } else if (noteEvent is RepostEvent) {
+                    if (noteEvent.isTaggedUser(currentUser) && noteEvent.pubKey != currentUser) {
+                        val netDate = formatDate(noteEvent.createdAt)
+                        boosts[netDate] = (boosts[netDate] ?: 0) + 1
+                        takenIntoAccount.add(noteEvent.id())
+                        hasNewElements = true
+                    }
+                } else if (noteEvent is LnZapEvent) {
+                    if (noteEvent.isTaggedUser(currentUser) && noteEvent.pubKey != currentUser) {
+                        val netDate = formatDate(noteEvent.createdAt)
+                        zaps[netDate] = (zaps[netDate] ?: BigDecimal.ZERO) + (noteEvent.amount ?: BigDecimal.ZERO)
+                        takenIntoAccount.add(noteEvent.id())
+                        hasNewElements = true
+                    }
+                } else if (noteEvent is TextNoteEvent) {
+                    if (noteEvent.isTaggedUser(currentUser) && noteEvent.pubKey != currentUser) {
+                        val netDate = formatDate(noteEvent.createdAt)
+                        replies[netDate] = (replies[netDate] ?: 0) + 1
+                        takenIntoAccount.add(noteEvent.id())
+                        hasNewElements = true
+                    }
+                }
+            }
+        }
+
+        if (hasNewElements) {
+            this.takenIntoAccount = takenIntoAccount
+            this.reactions = reactions
+            this.replies = replies
+            this.zaps = zaps
+            this.boosts = boosts
+
+            refreshChartModel()
+        }
+    }
+
+    private fun refreshChartModel() {
+        val day = 24 * 60 * 60L
+        val now = LocalDateTime.now()
+        val displayAxisFormatter = DateTimeFormatter.ofPattern("EEE")
+
+        val dataAxisLabels = listOf(6, 5, 4, 3, 2, 1, 0).map { sdf.format(now.minusSeconds(day * it)) }
+
+        val listOfCountCurves = listOf(
+            dataAxisLabels.mapIndexed { index, dateStr -> entryOf(index, replies[dateStr]?.toFloat() ?: 0f) },
+            dataAxisLabels.mapIndexed { index, dateStr -> entryOf(index, boosts[dateStr]?.toFloat() ?: 0f) },
+            dataAxisLabels.mapIndexed { index, dateStr -> entryOf(index, reactions[dateStr]?.toFloat() ?: 0f) }
+        )
+
+        val listOfValueCurves = listOf(
+            dataAxisLabels.mapIndexed { index, dateStr -> entryOf(index, zaps[dateStr]?.toFloat() ?: 0f) }
+        )
+
+        val chartEntryModelProducer1 = ChartEntryModelProducer(listOfCountCurves).getModel()
+        val chartEntryModelProducer2 = ChartEntryModelProducer(listOfValueCurves).getModel()
+
+        this.axisLabels = listOf(6, 5, 4, 3, 2, 1, 0).map { displayAxisFormatter.format(now.minusSeconds(day * it)) }
+        this.chartModel = chartEntryModelProducer1.plus(chartEntryModelProducer2)
+    }
+
+    var collectorJob: Job? = null
+
+    init {
+        collectorJob = viewModelScope.launch(Dispatchers.IO) {
+            LocalCache.live.newEventBundles.collect { newNotes ->
+                addToStatsSuspend(newNotes)
+            }
+        }
+    }
+
+    override fun onCleared() {
+        collectorJob?.cancel()
+        super.onCleared()
+    }
+}
+
+@Composable
+fun UserReplyReaction(
+    replyCount: Int?
+) {
+    Icon(
+        painter = painterResource(R.drawable.ic_comment),
+        null,
+        modifier = Modifier.size(20.dp),
+        tint = Color.Cyan
+    )
+
+    Spacer(modifier = Modifier.width(10.dp))
+
+    Text(
+        showCount(replyCount),
+        fontWeight = FontWeight.Bold,
+        fontSize = 18.sp
+    )
+}
+
+@Composable
+fun UserBoostReaction(
+    boostCount: Int?
+) {
+    Icon(
+        painter = painterResource(R.drawable.ic_retweeted),
+        null,
+        modifier = Modifier.size(24.dp),
+        tint = Color.Unspecified
+    )
+
+    Spacer(modifier = Modifier.width(10.dp))
+
+    Text(
+        showCount(boostCount),
+        fontWeight = FontWeight.Bold,
+        fontSize = 18.sp
+    )
+}
+
+@Composable
+fun UserLikeReaction(
+    likeCount: Int?
+) {
+    Icon(
+        painter = painterResource(R.drawable.ic_liked),
+        null,
+        modifier = Modifier.size(20.dp),
+        tint = Color.Unspecified
+    )
+
+    Spacer(modifier = Modifier.width(10.dp))
+
+    Text(
+        showCount(likeCount),
+        fontWeight = FontWeight.Bold,
+        fontSize = 18.sp
+    )
+}
+
+@Composable
+fun UserZapReaction(
+    amount: BigDecimal?
+) {
+    Icon(
+        imageVector = Icons.Default.Bolt,
+        contentDescription = stringResource(R.string.zaps),
+        modifier = Modifier.size(24.dp),
+        tint = BitcoinOrange
+    )
+
+    Spacer(modifier = Modifier.width(8.dp))
+
+    Text(
+        showAmount(amount),
+        fontWeight = FontWeight.Bold,
+        fontSize = 18.sp
+    )
+}

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

@@ -1,29 +1,65 @@
 package com.vitorpamplona.amethyst.ui.screen.loggedIn
 
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Divider
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 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.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
+import com.patrykandpatrick.vico.compose.axis.horizontal.bottomAxis
+import com.patrykandpatrick.vico.compose.axis.vertical.endAxis
+import com.patrykandpatrick.vico.compose.axis.vertical.startAxis
+import com.patrykandpatrick.vico.compose.chart.Chart
+import com.patrykandpatrick.vico.compose.chart.line.lineChart
+import com.patrykandpatrick.vico.compose.component.shape.shader.fromBrush
+import com.patrykandpatrick.vico.compose.style.ProvideChartStyle
+import com.patrykandpatrick.vico.core.DefaultAlpha
+import com.patrykandpatrick.vico.core.axis.AxisPosition
+import com.patrykandpatrick.vico.core.axis.formatter.AxisValueFormatter
+import com.patrykandpatrick.vico.core.chart.composed.plus
+import com.patrykandpatrick.vico.core.chart.line.LineChart
+import com.patrykandpatrick.vico.core.chart.values.ChartValues
+import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders
+import com.patrykandpatrick.vico.core.entry.composed.plus
 import com.vitorpamplona.amethyst.service.NostrAccountDataSource
 import com.vitorpamplona.amethyst.ui.dal.NotificationFeedFilter
 import com.vitorpamplona.amethyst.ui.navigation.Route
+import com.vitorpamplona.amethyst.ui.note.OneGiga
+import com.vitorpamplona.amethyst.ui.note.OneKilo
+import com.vitorpamplona.amethyst.ui.note.OneMega
+import com.vitorpamplona.amethyst.ui.note.UserReactionsRow
+import com.vitorpamplona.amethyst.ui.note.UserReactionsViewModel
+import com.vitorpamplona.amethyst.ui.note.showCount
 import com.vitorpamplona.amethyst.ui.screen.CardFeedView
 import com.vitorpamplona.amethyst.ui.screen.NotificationViewModel
 import com.vitorpamplona.amethyst.ui.screen.ScrollStateKeys
+import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
+import java.math.BigDecimal
+import java.math.RoundingMode
+import kotlin.math.roundToInt
 
 @Composable
 fun NotificationScreen(
     notifFeedViewModel: NotificationViewModel,
+    userReactionsStatsModel: UserReactionsViewModel,
     accountViewModel: AccountViewModel,
     navController: NavController,
     scrollToTop: Boolean = false
@@ -61,6 +97,7 @@ fun NotificationScreen(
         Column(
             modifier = Modifier.padding(vertical = 0.dp)
         ) {
+            SummaryBar(userReactionsStatsModel, accountViewModel, navController)
             CardFeedView(
                 viewModel = notifFeedViewModel,
                 accountViewModel = accountViewModel,
@@ -72,3 +109,121 @@ fun NotificationScreen(
         }
     }
 }
+
+@Composable
+fun SummaryBar(model: UserReactionsViewModel, accountViewModel: AccountViewModel, navController: NavController) {
+    var showChart by remember {
+        mutableStateOf(false)
+    }
+
+    UserReactionsRow(model, accountViewModel, navController) {
+        showChart = !showChart
+    }
+
+    val lineChartCount =
+        lineChart(
+            lines = listOf(Color.Cyan, Color.Green, Color.Red).map { lineChartColor ->
+                LineChart.LineSpec(
+                    lineColor = lineChartColor.toArgb(),
+                    lineBackgroundShader = DynamicShaders.fromBrush(
+                        Brush.verticalGradient(
+                            listOf(
+                                lineChartColor.copy(DefaultAlpha.LINE_BACKGROUND_SHADER_START),
+                                lineChartColor.copy(DefaultAlpha.LINE_BACKGROUND_SHADER_END)
+                            )
+                        )
+                    )
+                )
+            },
+            targetVerticalAxisPosition = AxisPosition.Vertical.Start
+        )
+
+    val lineChartZaps =
+        lineChart(
+            lines = listOf(BitcoinOrange).map { lineChartColor ->
+                LineChart.LineSpec(
+                    lineColor = lineChartColor.toArgb(),
+                    lineBackgroundShader = DynamicShaders.fromBrush(
+                        Brush.verticalGradient(
+                            listOf(
+                                lineChartColor.copy(DefaultAlpha.LINE_BACKGROUND_SHADER_START),
+                                lineChartColor.copy(DefaultAlpha.LINE_BACKGROUND_SHADER_END)
+                            )
+                        )
+                    )
+                )
+            },
+            targetVerticalAxisPosition = AxisPosition.Vertical.End
+        )
+
+    model.chartModel?.let {
+        if (showChart) {
+            Row(
+                modifier = Modifier
+                    .padding(vertical = 10.dp, horizontal = 20.dp)
+                    .clickable(onClick = { showChart = !showChart })
+            ) {
+                ProvideChartStyle() {
+                    Chart(
+                        chart = remember(lineChartCount, lineChartZaps) {
+                            lineChartCount.plus(lineChartZaps)
+                        },
+                        model = it,
+                        startAxis = startAxis(
+                            valueFormatter = CountAxisValueFormatter()
+                        ),
+                        endAxis = endAxis(
+                            valueFormatter = AmountAxisValueFormatter()
+                        ),
+                        bottomAxis = bottomAxis(
+                            valueFormatter = LabelValueFormatter(model.axisLabels)
+                        )
+                    )
+                }
+            }
+        }
+    }
+
+    Divider(
+        thickness = 0.25.dp
+    )
+}
+
+class LabelValueFormatter(val axisLabels: List<String>) : AxisValueFormatter<AxisPosition.Horizontal.Bottom> {
+    override fun formatValue(
+        value: Float,
+        chartValues: ChartValues
+    ): String {
+        return axisLabels[value.roundToInt()]
+    }
+}
+
+class CountAxisValueFormatter() : AxisValueFormatter<AxisPosition.Vertical.Start> {
+    override fun formatValue(
+        value: Float,
+        chartValues: ChartValues
+    ): String {
+        return showCount(value.roundToInt())
+    }
+}
+
+class AmountAxisValueFormatter() : AxisValueFormatter<AxisPosition.Vertical.End> {
+    override fun formatValue(
+        value: Float,
+        chartValues: ChartValues
+    ): String {
+        return showAmountAxis(value.toBigDecimal())
+    }
+}
+
+fun showAmountAxis(amount: BigDecimal?): String {
+    if (amount == null) return ""
+    if (amount.abs() < BigDecimal(0.01)) return ""
+
+    return when {
+        amount >= OneGiga -> "%.0fG".format(amount.div(OneGiga).setScale(0, RoundingMode.HALF_UP))
+        amount >= OneMega -> "%.0fM".format(amount.div(OneMega).setScale(0, RoundingMode.HALF_UP))
+        amount >= OneKilo -> "%.0fk".format(amount.div(OneKilo).setScale(0, RoundingMode.HALF_UP))
+        else -> "%.0f".format(amount)
+    }
+}

app/src/main/res/values-hu/strings.xml

@@ -284,6 +284,8 @@
     <string name="looking_for_event">"%1$s esemény keresése"</string>
 
     <string name="custom_zaps_add_a_message">Nyilvános üzenet hozzáadása</string>
+    <string name="custom_zaps_add_a_message_private">Adj hozzá egy privát üzenetet</string>
+    <string name="custom_zaps_add_a_message_nonzap">A számlához adj hozzá egy üzenetet</string>
     <string name="custom_zaps_add_a_message_example">Köszönöm a kemény munkát!</string>
 
     <string name="lightning_create_and_add_invoice">Létrehoz és Hozzáad</string>
@@ -334,6 +336,13 @@
     <string name="upload_server_relays_nip95">Saját csomópontjaid (NIP-95)</string>
     <string name="upload_server_relays_nip95_explainer">A fájlokat a csomópontokra töltik fel és ott tárolják. Rögzített URL-től mentesek (harmadik féltől való függőség). Győződj meg róla, hogy legalább egy NIP-95 csomópont a csomópontlistában szerepel</string>
 
+    <string name="connect_via_tor_short">Tor/Orbot beállítása</string>
+    <string name="connect_via_tor">Csatlakozás a saját Orbot beállításod alapján</string>
+
+    <string name="do_you_really_want_to_disable_tor_title">Lecsatlakozás a saját Orbot/Tor hálózatról?</string>
+    <string name="do_you_really_want_to_disable_tor_text">Az adataid azonnal a hagyományos hálózaton lesz továbbítva</string>
+    <string name="yes">Igen</string>
+    <string name="no">Nem</string>
 
 
     <string name="follow_list_selection">Követek Lista</string>
@@ -374,4 +383,6 @@
     <string name="channel_list_user_or_group_id_demo">npub, nevent vagy hex</string>
     <string name="channel_list_create_channel">Létrehoz</string>
     <string name="channel_list_join_channel">Csatlakozás</string>
+
+    <string name="today">Ma</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -402,4 +402,6 @@
     <string name="channel_list_user_or_group_id_demo">npub, nevent or hex</string>
     <string name="channel_list_create_channel">Create</string>
     <string name="channel_list_join_channel">Join</string>
+
+    <string name="today">Today</string>
 </resources>

build.gradle

@@ -7,6 +7,7 @@ buildscript {
         room_version = "2.4.3"
         accompanist_version = '0.30.0'
         coil_version = '2.3.0'
+        vico_version = '1.6.5'
     }
     dependencies {
         classpath 'com.google.gms:google-services:4.3.15'