laantungir/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2026-08-08 23:54:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(git): make the project-home social row interactive

Browse Source 
Replaces the read-only zap/reaction/comment counts with the canonical
ZapReaction / LikeReaction / ReplyReaction actions, so the repository home
now supports one-tap zaps (with the amount dialog), reactions, and replying
to the repo announcement — each with its live counter.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01DpNmN8CvP6HnEsdTGAjVUr
This commit is contained in:
Claude
2026-06-29 15:38:37 +00:00
parent 2ad4af2479
commit d270b6a69f
2 changed files with 14 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepo/GitRepositoryHomeUi.kt
+13 -30
View File
@@ -35,7 +35,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
@@ -50,10 +49,11 @@ import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbol
import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols
import com.vitorpamplona.amethyst.model.AddressableNote
import com.vitorpamplona.amethyst.model.Note
import com.vitorpamplona.amethyst.service.relayClient.reqCommand.event.observeNoteReactionCount
import com.vitorpamplona.amethyst.service.relayClient.reqCommand.event.observeNoteReplyCount
import com.vitorpamplona.amethyst.service.relayClient.reqCommand.event.observeNoteZaps
import com.vitorpamplona.amethyst.ui.navigation.navs.INav
import com.vitorpamplona.amethyst.ui.navigation.routes.routeReplyTo
import com.vitorpamplona.amethyst.ui.note.LikeReaction
import com.vitorpamplona.amethyst.ui.note.ReplyReaction
import com.vitorpamplona.amethyst.ui.note.ZapReaction
import com.vitorpamplona.amethyst.ui.note.elements.TimeAgo
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
import com.vitorpamplona.amethyst.ui.stringRes
@@ -74,40 +74,23 @@ private val CardShape = RoundedCornerShape(15.dp)
fun RepoSocialRow(
note: AddressableNote,
accountViewModel: AccountViewModel,
nav: INav,
) {
val reactionCount by observeNoteReactionCount(note, accountViewModel)
val replyCount by observeNoteReplyCount(note, accountViewModel)
val zapState by observeNoteZaps(note, accountViewModel)
val zapCount = zapState?.note?.zaps?.size ?: note.zaps.size
Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
SocialStat(MaterialSymbols.Bolt, zapCount, MaterialTheme.colorScheme.primary)
SocialStat(MaterialSymbols.Favorite, reactionCount, MaterialTheme.colorScheme.error)
SocialStat(MaterialSymbols.Forum, replyCount, MaterialTheme.colorScheme.onSurfaceVariant)
}
}
@Composable
private fun SocialStat(
symbol: MaterialSymbol,
count: Int,
tint: Color,
) {
val grayTint = MaterialTheme.colorScheme.onSurfaceVariant
Row(
modifier =
Modifier
.clip(CircleShape)
.background(MaterialTheme.colorScheme.surface)
.padding(horizontal = 12.dp, vertical = 6.dp),
.padding(horizontal = 16.dp, vertical = 8.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(6.dp),
horizontalArrangement = Arrangement.spacedBy(22.dp),
) {
Icon(symbol = symbol, contentDescription = null, modifier = Modifier.size(16.dp), tint = tint)
Text(
text = compactCount(count),
style = MaterialTheme.typography.labelLarge,
fontWeight = FontWeight.SemiBold,
)
ZapReaction(baseNote = note, grayTint = grayTint, accountViewModel = accountViewModel, nav = nav)
LikeReaction(baseNote = note, grayTint = grayTint, accountViewModel = accountViewModel, nav = nav)
ReplyReaction(baseNote = note, grayTint = grayTint, accountViewModel = accountViewModel) {
nav.nav { routeReplyTo(note, accountViewModel.account) }
}
}
}
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepo/GitRepositoryScreen.kt
+1 -1
View File
@@ -308,7 +308,7 @@ private fun GitRepositoryHome(
val currentEvent = event
if (currentEvent != null) {
GitRepositoryOverviewSections(currentEvent, accountViewModel, nav)
RepoSocialRow(note, accountViewModel)
RepoSocialRow(note, accountViewModel, nav)
}
if (snapshot != null) {