✨ Display API client for statuses (#326)

* ✨ Update fav icon to heart for Träwelldroid users

* ✨ Display api client for status

Author: jheubuch

app/src/main/kotlin/de/hbch/traewelling/api/models/status/ApiClient.kt

@@ -0,0 +1,6 @@
+package de.hbch.traewelling.api.models.status
+
+data class ApiClient(
+    val id: Int,
+    val name: String
+)

app/src/main/kotlin/de/hbch/traewelling/api/models/status/Status.kt

@@ -18,7 +18,8 @@ data class Status(
     var liked: Boolean?,
     @SerializedName("isLikable") val likeable: Boolean?,
     @SerializedName("train") val journey: Journey,
-    val event: Event?
+    val event: Event?,
+    val client: ApiClient?
 ) {
     fun getStatusBody(): String {
         var statusBody = body ?: ""
@@ -29,6 +30,8 @@ data class Status(
 
         return statusBody
     }
+
+    val isTraewelldroidCheckIn get() = client?.id == 43
 }
 
 enum class StatusVisibility() {

app/src/main/kotlin/de/hbch/traewelling/theme/Colors.kt

@@ -5,4 +5,5 @@ import androidx.compose.ui.graphics.Color
 val Traewelldroid = Color(0xFF3F51B5)
 val TraewelldroidDark = Color(0xFF42A5F5)
 val StarYellow = Color(0xFFFFC107)
+val HeartRed = Color(0xFFFF0000)
 var PolylineColor = Traewelldroid

app/src/main/kotlin/de/hbch/traewelling/ui/include/status/CheckInCard.kt

@@ -50,6 +50,7 @@ import de.hbch.traewelling.api.models.status.StatusBusiness
 import de.hbch.traewelling.api.models.trip.ProductType
 import de.hbch.traewelling.shared.LoggedInUserViewModel
 import de.hbch.traewelling.theme.AppTypography
+import de.hbch.traewelling.theme.HeartRed
 import de.hbch.traewelling.theme.LocalColorScheme
 import de.hbch.traewelling.theme.StarYellow
 import de.hbch.traewelling.ui.composables.LineIcon
@@ -448,11 +449,15 @@ private fun CheckInCardFooter(
                         targetState = likedState,
                         label = "FavoriteAnimation"
                     ) {
-                        val icon = if (it) R.drawable.ic_faved else R.drawable.ic_not_faved
+                        val color = if (status.isTraewelldroidCheckIn) HeartRed else StarYellow
+                        val icon = when (status.isTraewelldroidCheckIn) {
+                            true -> if (it) R.drawable.ic_heart_filled else R.drawable.ic_heart
+                            false -> if (it) R.drawable.ic_faved else R.drawable.ic_not_faved
+                        }
                         Icon(
                             painterResource(id = icon),
                             contentDescription = null,
-                            tint = StarYellow
+                            tint = color
                         )
                     }
                     Text(

app/src/main/kotlin/de/hbch/traewelling/ui/statusDetail/StatusDetail.kt

@@ -192,6 +192,27 @@ fun StatusDetail(
                     textAlign = TextAlign.End,
                     style = AppTypography.labelMedium
                 )
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.End
+                ) {
+                    if (status?.isTraewelldroidCheckIn == true) {
+                        Icon(
+                            painter = painterResource(id = R.drawable.ic_logo),
+                            contentDescription = null,
+                            modifier = Modifier.padding(end = 4.dp)
+                        )
+                    }
+                    Text(
+                        text = stringResource(
+                            id = R.string.checked_in_with,
+                            status?.client?.name ?: "Träwelling"
+                        ),
+                        style = AppTypography.labelMedium,
+                        maxLines = 2
+                    )
+                }
             }
         }
     }

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

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M16.5,3c-1.74,0 -3.41,0.81 -4.5,2.09C10.91,3.81 9.24,3 7.5,3 4.42,3 2,5.42 2,8.5c0,3.78 3.4,6.86 8.55,11.54L12,21.35l1.45,-1.32C18.6,15.36 22,12.28 22,8.5 22,5.42 19.58,3 16.5,3zM12.1,18.55l-0.1,0.1 -0.1,-0.1C7.14,14.24 4,11.39 4,8.5 4,6.5 5.5,5 7.5,5c1.54,0 3.04,0.99 3.57,2.36h1.87C13.46,5.99 14.96,5 16.5,5c2,0 3.5,1.5 3.5,3.5 0,2.89 -3.14,5.74 -7.9,10.05z"/>
+</vector>

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

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z"/>
+</vector>

app/src/main/res/values-de-rDE/strings.xml

@@ -244,4 +244,5 @@
     <string name="travelynx_limited_functionality">Aktuell ist es nur möglich, Check-Ins für travelynx zu erstellen. Wenn du diese bearbeiten möchtest, nutze bitte die Website. Ziehe in Betracht, deine Träwelling-Synchronisation abzuschalten, um Fehler zu vermeiden.</string>
     <string name="travelynx_token">travelynx Travel-Token</string>
     <string name="changes_saved">Änderungen wurden gespeichert</string>
+    <string name="checked_in_with">Eingecheckt mit %1$s</string>
 </resources>

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

@@ -249,4 +249,5 @@
     <string name="travelynx_limited_functionality">At the moment, it is only possible to create check-ins with travelynx. If you want to edit them, please use the website for that. Consider turning off your Träwelling sync to prevent issues.</string>
     <string name="travelynx_token">travelynx travel token</string>
     <string name="changes_saved">Changes have been saved</string>
+    <string name="checked_in_with">Checked in with %1$s</string>
 </resources>