diff --git a/app/src/main/kotlin/de/hbch/traewelling/api/models/wrapped/YearInReview.kt b/app/src/main/kotlin/de/hbch/traewelling/api/models/wrapped/YearInReview.kt index d37a4bae..f4bdd48a 100644 --- a/app/src/main/kotlin/de/hbch/traewelling/api/models/wrapped/YearInReview.kt +++ b/app/src/main/kotlin/de/hbch/traewelling/api/models/wrapped/YearInReview.kt @@ -28,7 +28,7 @@ data class YearInReviewSumStats( ) data class TopByDistance( - val operator: String, + val operator: String?, val distance: Long, val line: String? ) diff --git a/app/src/main/kotlin/de/hbch/traewelling/ui/wrapped/Wrapped.kt b/app/src/main/kotlin/de/hbch/traewelling/ui/wrapped/Wrapped.kt index 686c70dd..e7452b25 100644 --- a/app/src/main/kotlin/de/hbch/traewelling/ui/wrapped/Wrapped.kt +++ b/app/src/main/kotlin/de/hbch/traewelling/ui/wrapped/Wrapped.kt @@ -209,7 +209,7 @@ fun WrappedOperatorDistance( val annotatedString = buildAnnotatedString { appendLine(stringResource(R.string.wrapped_farest_travels)) appendLine() - val distanceOperator = yearInReviewData.operators.topByDistance.operator + val distanceOperator = yearInReviewData.operators.topByDistance.operator ?: stringResource(R.string.unknown) withStyle(primarySpanStyle.merge(largeSpanStyle).merge(SpanStyle(fontFamily = getBTModern(distanceOperator)))) { withStyle(centerAlignedStyle) { appendLine(distanceOperator) @@ -481,7 +481,7 @@ fun WrappedMostLikedTrip( yearInReviewData: YearInReviewData, modifier: Modifier = Modifier ) { - val status = yearInReviewData.mostLikedStatuses.first().status + val status = yearInReviewData.mostLikedStatuses.firstOrNull()?.status WrappedScaffold( graphicsLayer = graphicsLayer, modifier = modifier, @@ -494,9 +494,13 @@ fun WrappedMostLikedTrip( ) } ) { + val text = if (status == null) + stringResource(id = R.string.wrapped_no_likes) + else + stringResource(id = R.string.wrapped_your_most_liked_trip, status.likes ?: 0, getLocalDateString(status.journey.origin.departurePlanned)) Text( modifier = it, - text = stringResource(id = R.string.wrapped_your_most_liked_trip, status.likes ?: 0, getLocalDateString(status.journey.origin.departurePlanned)), + text = text, style = AppTypography.titleLarge, textAlign = TextAlign.Center ) diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index b65b44fc..0864a74f 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -332,6 +332,7 @@ Deine bei Ankunft unpünktlichste Fahrt war am %1$s Herzensbrecher! 💘 Du hast deine meisten Gefällt-mir-Angaben (%1$d) am %2$s erhalten. + Du hast dieses Jahr keine Gefällt-mir-Angaben erhalten. Gewohnheitstier 🦥 Du hast diese Orte besonders oft besucht… Entdecker! 🧑🏼‍🔬 diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 12da2334..c7c7cdd4 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -265,6 +265,7 @@ og Den linjen du reiste lengst med var Du fikk flest \"Liker det\"-meldinger (%1$d) den %2$s + Du fikk ingen \"Liker det\"-meldinger i året. Vanemenneske 🦥 Disse stedene har du besøkt oftest… Dine favorittlinjer! 🤗 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c0454310..4a62c26b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -359,6 +359,7 @@ Your most unpunctual trip on arrival was at %1$s Heartbreaker! 💘 You received the most likes (%1$d) at %2$s + You received no likes this year. Creature of habit 🦥 You visited those places a lot… Explorer! 🧑🏼‍🔬