✨ Add link to Mastodon profile if connected

closes #311
Traewelldroid · Jan 7, 2024 · 8dd877d · 8dd877d
1 parent 25b78d2
commit 8dd877d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/app/src/main/kotlin/de/hbch/traewelling/api/models/user/User.kt b/app/src/main/kotlin/de/hbch/traewelling/api/models/user/User.kt
@@ -12,7 +12,6 @@ data class User(
     @SerializedName("trainDistance") val distance: Int,
     @SerializedName("trainDuration") val duration: Int,
     @SerializedName("points") val points: Int,
-    @SerializedName("twitterUrl") val twitterUrl: String?,
     @SerializedName("mastodonUrl") val mastodonUrl: String?,
     @SerializedName("privateProfile") val privateProfile: Boolean,
     @SerializedName("home") var home: Station?,

diff --git a/app/src/main/kotlin/de/hbch/traewelling/ui/user/User.kt b/app/src/main/kotlin/de/hbch/traewelling/ui/user/User.kt
@@ -1,5 +1,6 @@
 package de.hbch.traewelling.ui.user
 
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -15,6 +16,7 @@ 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.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -26,6 +28,7 @@ import de.hbch.traewelling.theme.AppTypography
 import de.hbch.traewelling.theme.MainTheme
 import de.hbch.traewelling.ui.composables.ButtonWithIconAndText
 import de.hbch.traewelling.ui.composables.ProfilePicture
+import de.hbch.traewelling.util.openLink
 
 @Composable
 fun UserCard(
@@ -57,6 +60,7 @@ private fun UserCardContent(
     followAction: () -> Unit = { },
     muteAction: () -> Unit = { }
 ) {
+    val context = LocalContext.current
     ElevatedCard(
         modifier = modifier.fillMaxWidth()
     ) {
@@ -90,10 +94,19 @@ private fun UserCardContent(
                             modifier = Modifier.padding(start = 8.dp)
                         )
                     }
+                    if (user.mastodonUrl != null) {
+                        Icon(
+                            painter = painterResource(id = R.drawable.ic_mastodon),
+                            contentDescription = null,
+                            modifier = Modifier.padding(start = 8.dp).clickable {
+                                context.openLink(user.mastodonUrl)
+                            }
+                        )
+                    }
                 }
                 Text(
                     style = AppTypography.titleMedium,
-                    text = user.username
+                    text = "@${user.username}"
                 )
             }
             Row(
@@ -268,7 +281,6 @@ private fun UserCardPreview() {
         10241024,
         4711,
         null,
-        null,
         false,
         null,
         null,
@@ -286,7 +298,6 @@ private fun UserCardPreview() {
         4568,
         42,
         null,
-        null,
         true,
         null,
         null,

diff --git a/app/src/main/kotlin/de/hbch/traewelling/util/Extensions.kt b/app/src/main/kotlin/de/hbch/traewelling/util/Extensions.kt
@@ -264,6 +264,13 @@ fun Context.refreshJwt(onTokenReceived: (String) -> Unit = { }) {
     }
 }
 
+fun Context.openLink(url: String) {
+    val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+    try {
+        startActivity(intent)
+    } catch (_: Exception) { }
+}
+
 @Composable
 fun <T> T.useDebounce(
     delayMillis: Long = 300L,