feat: Clickable home feed avatars

MateriiApps · Jan 3, 2025 · 76e0761 · 76e0761
1 parent 6ba1253
commit 76e0761
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 1 deletion.
diff --git a/ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screen/home/component/CreatedRepoItem.kt b/ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screen/home/component/CreatedRepoItem.kt
@@ -11,9 +11,13 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.unit.dp
+import cafe.adriel.voyager.navigator.LocalNavigator
+import cafe.adriel.voyager.navigator.currentOrThrow
 import com.materiiapps.gloom.Res
 import com.materiiapps.gloom.gql.fragment.CreatedRepoItemFragment
+import com.materiiapps.gloom.ui.screen.profile.ProfileScreen
 import com.materiiapps.gloom.ui.util.annotatingStringResource
+import com.materiiapps.gloom.ui.util.navigate
 import dev.icerock.moko.resources.compose.stringResource
 
 @Composable
@@ -23,6 +27,7 @@ fun CreatedRepoItem(
     onStarPressed: (String) -> Unit = {},
     onUnstarPressed: (String) -> Unit = {},
 ) {
+    val navigator = LocalNavigator.currentOrThrow
     val actor = item.actor.actorFragment
     val repo = item.repository.feedRepository
 
@@ -37,6 +42,7 @@ fun CreatedRepoItem(
             iconDescription = stringResource(Res.strings.noun_users_avatar, actor.login),
             badgeIcon = Icons.Filled.Book,
             badgeIconDescription = stringResource(Res.strings.noun_repo),
+            onIconClick = { navigator.navigate(ProfileScreen(actor.login)) },
             text = annotatingStringResource(res = Res.strings.created_repo, actor.login) {
                 when (it) {
                     "name" -> SpanStyle(color = MaterialTheme.colorScheme.onSurface)

diff --git a/ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screen/home/component/FeedActor.kt b/ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screen/home/component/FeedActor.kt
@@ -2,6 +2,7 @@ package com.materiiapps.gloom.ui.screen.home.component
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -19,6 +20,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.unit.dp
 import com.materiiapps.gloom.ui.component.BadgedItem
+import com.materiiapps.gloom.ui.util.thenIf
 import com.seiko.imageloader.rememberImagePainter
 
 @Composable
@@ -28,7 +30,8 @@ fun FeedActor(
     badgeIconDescription: String? = null,
     iconVector: ImageVector? = null,
     iconDescription: String? = null,
-    text: AnnotatedString
+    text: AnnotatedString,
+    onIconClick: (() -> Unit)? = null
 ) {
     Row(
         horizontalArrangement = Arrangement.spacedBy(10.dp),
@@ -50,6 +53,7 @@ fun FeedActor(
                     painter = rememberImagePainter(iconUrl),
                     contentDescription = iconDescription,
                     modifier = Modifier
+                        .thenIf(onIconClick != null) { clickable(onClick = onIconClick!!) }
                         .size(33.dp)
                         .clip(CircleShape)
                 )
@@ -60,6 +64,7 @@ fun FeedActor(
                     contentDescription = iconDescription,
                     tint = MaterialTheme.colorScheme.onPrimary,
                     modifier = Modifier
+                        .thenIf(onIconClick != null) { clickable(onClick = onIconClick!!) }
                         .clip(CircleShape)
                         .background(MaterialTheme.colorScheme.primary)
                         .size(33.dp)

diff --git a/ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screen/home/component/FollowedUserItem.kt b/ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screen/home/component/FollowedUserItem.kt
@@ -11,9 +11,13 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.unit.dp
+import cafe.adriel.voyager.navigator.LocalNavigator
+import cafe.adriel.voyager.navigator.currentOrThrow
 import com.materiiapps.gloom.Res
 import com.materiiapps.gloom.gql.fragment.FollowedUserFeedItemFragment
+import com.materiiapps.gloom.ui.screen.profile.ProfileScreen
 import com.materiiapps.gloom.ui.util.annotatingStringResource
+import com.materiiapps.gloom.ui.util.navigate
 import dev.icerock.moko.resources.compose.stringResource
 
 @Composable
@@ -23,6 +27,7 @@ fun FollowedUserItem(
     onFollowPressed: (String) -> Unit = {},
     onUnfollowPressed: (String) -> Unit = {},
 ) {
+    val navigator = LocalNavigator.currentOrThrow
     val actor = item.follower
     val user = item.followee
     val userLogin = user.feedUser?.login ?: user.feedOrg?.login
@@ -47,6 +52,7 @@ fun FollowedUserItem(
             iconDescription = stringResource(Res.strings.noun_users_avatar, actor.login),
             badgeIcon = Icons.Filled.PersonAddAlt1,
             badgeIconDescription = stringResource(Res.strings.cd_followed),
+            onIconClick = { navigator.navigate(ProfileScreen(actor.login)) },
             text = actorText
         )
 

diff --git a/ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screen/home/component/ForkedRepoItem.kt b/ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screen/home/component/ForkedRepoItem.kt
@@ -10,11 +10,15 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.unit.dp
+import cafe.adriel.voyager.navigator.LocalNavigator
+import cafe.adriel.voyager.navigator.currentOrThrow
 import com.materiiapps.gloom.Res
 import com.materiiapps.gloom.gql.fragment.ForkedRepositoryFeedItemFragment
 import com.materiiapps.gloom.ui.icon.Custom
 import com.materiiapps.gloom.ui.icon.custom.Fork
+import com.materiiapps.gloom.ui.screen.profile.ProfileScreen
 import com.materiiapps.gloom.ui.util.annotatingStringResource
+import com.materiiapps.gloom.ui.util.navigate
 import dev.icerock.moko.resources.compose.stringResource
 
 @Composable
@@ -24,6 +28,7 @@ fun ForkedRepoItem(
     onStarPressed: (String) -> Unit = {},
     onUnstarPressed: (String) -> Unit = {},
 ) {
+    val navigator = LocalNavigator.currentOrThrow
     val actor = item.actor.actorFragment
     val repo = item.repository.feedRepository
 
@@ -38,6 +43,7 @@ fun ForkedRepoItem(
             iconDescription = stringResource(Res.strings.noun_users_avatar, actor.login),
             badgeIcon = Icons.Custom.Fork,
             badgeIconDescription = stringResource(Res.strings.cd_forked_repo),
+            onIconClick = { navigator.navigate(ProfileScreen(actor.login)) },
             text = annotatingStringResource(res = Res.strings.forked_repo, actor.login) {
                 when (it) {
                     "name" -> SpanStyle(color = MaterialTheme.colorScheme.onSurface)

diff --git a/...commonMain/kotlin/com/materiiapps/gloom/ui/screen/home/component/MergedPullRequestItem.kt b/...commonMain/kotlin/com/materiiapps/gloom/ui/screen/home/component/MergedPullRequestItem.kt
@@ -32,6 +32,7 @@ import com.materiiapps.gloom.ui.component.Label
 import com.materiiapps.gloom.ui.component.ThinDivider
 import com.materiiapps.gloom.ui.icon.Custom
 import com.materiiapps.gloom.ui.icon.custom.MergedPullRequest
+import com.materiiapps.gloom.ui.screen.profile.ProfileScreen
 import com.materiiapps.gloom.ui.screen.repo.RepoScreen
 import com.materiiapps.gloom.ui.theme.gloomColorScheme
 import com.materiiapps.gloom.ui.util.annotatingStringResource
@@ -46,6 +47,7 @@ fun MergedPullRequestItem(
     item: MergedPullRequestFeedItemFragment,
     onReactionClick: (ReactionContent, Boolean) -> Unit
 ) {
+    val navigator = LocalNavigator.currentOrThrow
     val actor = item.actor.actorFragment
     val pullRequest = item.pullRequest
     val baseRepo = pullRequest.baseRepository
@@ -61,6 +63,7 @@ fun MergedPullRequestItem(
             iconDescription = stringResource(Res.strings.noun_users_avatar, actor.login),
             badgeIcon = Icons.Custom.MergedPullRequest,
             badgeIconDescription = stringResource(Res.strings.cd_forked_repo),
+            onIconClick = { navigator.navigate(ProfileScreen(actor.login)) },
             text = annotatingStringResource(res = Res.strings.contributed_repo, actor.login, "${baseRepo?.owner?.login}/${baseRepo?.name}") {
                 when (it) {
                     "repo",

diff --git a/ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screen/home/component/NewReleaseItem.kt b/ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screen/home/component/NewReleaseItem.kt
@@ -54,6 +54,7 @@ import com.materiiapps.gloom.ui.component.Avatar
 import com.materiiapps.gloom.ui.component.ThinDivider
 import com.materiiapps.gloom.ui.icon.Custom
 import com.materiiapps.gloom.ui.icon.custom.Commit
+import com.materiiapps.gloom.ui.screen.profile.ProfileScreen
 import com.materiiapps.gloom.ui.screen.release.ReleaseScreen
 import com.materiiapps.gloom.ui.screen.repo.RepoScreen
 import com.materiiapps.gloom.ui.theme.DarkGreen
@@ -70,6 +71,7 @@ fun NewReleaseItem(
     starData: Pair<Boolean, Int>? = null,
     onVisitPressed: (String) -> Unit = {},
 ) {
+    val navigator = LocalNavigator.currentOrThrow
     val actor = item.actor.actorFragment
     val release = item.release
 
@@ -84,6 +86,7 @@ fun NewReleaseItem(
             iconDescription = stringResource(Res.strings.noun_users_avatar, actor.login),
             badgeIcon = Icons.Filled.LocalOffer,
             badgeIconDescription = stringResource(Res.strings.noun_release),
+            onIconClick = { navigator.navigate(ProfileScreen(actor.login)) },
             text = annotatingStringResource(res = Res.strings.published_release, actor.login) {
                 when (it) {
                     "name" -> SpanStyle(color = MaterialTheme.colorScheme.onSurface)

diff --git a/ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screen/home/component/StarredRepoItem.kt b/ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screen/home/component/StarredRepoItem.kt
@@ -11,9 +11,13 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.unit.dp
+import cafe.adriel.voyager.navigator.LocalNavigator
+import cafe.adriel.voyager.navigator.currentOrThrow
 import com.materiiapps.gloom.Res
 import com.materiiapps.gloom.gql.fragment.StarredFeedItemFragment
+import com.materiiapps.gloom.ui.screen.profile.ProfileScreen
 import com.materiiapps.gloom.ui.util.annotatingStringResource
+import com.materiiapps.gloom.ui.util.navigate
 import dev.icerock.moko.resources.compose.stringResource
 
 @Composable
@@ -23,6 +27,7 @@ fun StarredRepoItem(
     onStarPressed: (String) -> Unit = {},
     onUnstarPressed: (String) -> Unit = {},
 ) {
+    val navigator = LocalNavigator.currentOrThrow
     val actor = item.actor.actorFragment
     val repo = item.repository.feedRepository
 
@@ -37,6 +42,7 @@ fun StarredRepoItem(
             iconDescription = stringResource(Res.strings.noun_users_avatar, actor.login),
             badgeIcon = Icons.Filled.Star,
             badgeIconDescription = stringResource(Res.strings.title_starred),
+            onIconClick = { navigator.navigate(ProfileScreen(actor.login)) },
             text = annotatingStringResource(res = Res.strings.starred_repo, actor.login) {
                 when (it) {
                     "name" -> SpanStyle(color = MaterialTheme.colorScheme.onSurface)