Show disruptions when present

cristan · Sep 3, 2024 · 900acad · 900acad
1 parent 98e774c
commit 900acad
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/app/src/main/java/nl/ovfietsbeschikbaarheid/mapper/DetailsMapper.kt b/app/src/main/java/nl/ovfietsbeschikbaarheid/mapper/DetailsMapper.kt
@@ -31,6 +31,7 @@ object DetailsMapper {
         val about = payload.infoImages.find { it.title == "Bijzonderheden" }?.body?.replace(newLinesAtEnd, "")
         // Filled in example Leiden Centraal, Centrumzijde
         val openingHoursInfo = payload.infoImages.find { it.title == "Info openingstijden" }?.body
+        val disruptions = payload.infoImages.find { it.title == "Storing" }?.body
 
         val location =
             if (payload.city == "" || payload.city == null || payload.street == null || payload.houseNumber == null || payload.postalCode == null) {
@@ -100,6 +101,7 @@ object DetailsMapper {
             serviceType = serviceType,
             directions = if (directions != "") directions else null,
             about = about,
+            disruptions = "Helaas kunt u hier op dit moment geen OV-fiets huren. Onze excuses voor dit ongemak. Raadpleeg de NS Reisplanner app of website (ns.nl/ov-fiets) voor de dichtstbijzijnde OV-fiets verhuurlocatie.",
             location = location,
             coordinates = LatLng(payload.lat, payload.lng),
             stationName = allStations[payload.stationCode],

diff --git a/app/src/main/java/nl/ovfietsbeschikbaarheid/model/DetailsModel.kt b/app/src/main/java/nl/ovfietsbeschikbaarheid/model/DetailsModel.kt
@@ -13,6 +13,7 @@ data class DetailsModel(
     val capacity: Int,
     val serviceType: ServiceType?,
     val about: String?,
+    val disruptions: String?,
     val directions: String?,
     val location: LocationModel?,
     val coordinates: LatLng,

diff --git a/app/src/main/java/nl/ovfietsbeschikbaarheid/ui/screen/DetailScreen.kt b/app/src/main/java/nl/ovfietsbeschikbaarheid/ui/screen/DetailScreen.kt
@@ -18,6 +18,7 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.HorizontalDivider
@@ -180,6 +181,10 @@ private fun ActualDetails(
         Column(Modifier.padding(start = 20.dp, end = 20.dp, bottom = 20.dp, top = 4.dp)) {
             MainInfo(details)
 
+            details?.disruptions?.let {
+                Disruptions(it)
+            }
+
             Location(details, onLocationClicked)
 
             ExtraInfo(details)
@@ -254,6 +259,23 @@ private fun MainInfo(details: DetailsModel) {
     }
 }
 
+@Composable
+private fun Disruptions(disruptions: String) {
+    Card(
+        modifier = Modifier.padding(top = 16.dp),
+        elevation = CardDefaults.cardElevation(
+            defaultElevation = 2.dp
+        ),
+        colors = CardDefaults.cardColors(
+            containerColor = Red50,
+        ),
+    ) {
+        Column(Modifier.padding(16.dp)) {
+            Text(disruptions, color = Color.White)
+        }
+    }
+}
+
 @Composable
 private fun Location(details: DetailsModel, onNavigateClicked: (String) -> Unit) {
     OvCard(
@@ -451,6 +473,7 @@ fun DetailsPreview() {
         105,
         ServiceType.Sleutelautomaat,
         about,
+        "Helaas kunt u hier op dit moment geen OV-fiets huren. Onze excuses voor dit ongemak. Raadpleeg de NS Reisplanner app of website (ns.nl/ov-fiets) voor de dichtstbijzijnde OV-fiets verhuurlocatie.",
         directions,
         locationModel,
         LatLng(52.15446, 5.37339),