Fixed Dates and Times in TripScreen, TripCard && Preference screen

cristiangranero90 · cristiangranero90 · Jul 4, 2023 · Jul 4, 2023 · Nov 23, 2023 · Nov 23, 2023
commit 3b72a72667698e7a4ffa9d205d228be2277de8d0
diff --git a/app/src/main/java/com/juntas/juntas_app/journey_create_first/domain/JourneyCreateScreen.kt b/app/src/main/java/com/juntas/juntas_app/journey_create_first/domain/JourneyCreateScreen.kt
@@ -8,6 8,8 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import com.juntas.juntas_app.shared_components.BottomBar
 import com.juntas.juntas_app.shared_components.TopBar
 
 @Composable
 fun JourneyCreate(
@@ -37,5 39,19 @@ fun JourneyCreate(
 @Composable
 @Preview
 fun JourneyCreatePreview(){
- JourneyCreate( {},{} )
  JourneyCreate( topBar = {
  TopBar(
  onProfileClicked = { /*TODO*/ },
  onNotificationsClicked = { /*TODO*/ },
  imageUrl = ""
  )
  },
  bottomBar = {
  BottomBar(
  currentDestination = null,
  onHomeClicked = { /*TODO*/ },
  onPassengerClicked = { /*TODO*/ },
  onDriverClicked = { /*TODO*/ })
  }
  )
 }
diff --git a/app/src/main/java/com/juntas/juntas_app/preference_screen/presentation/PreferenceScreen.kt b/app/src/main/java/com/juntas/juntas_app/preference_screen/presentation/PreferenceScreen.kt
@@ -14,7 14,7 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Checkbox
@@ -73,7 73,7 @@ fun PreferenceScreen(
  ) {
  IconButton(onClick = { onBackClicked() }) {
  Icon(
- imageVector = Icons.Default.ArrowBack ,
  imageVector = Icons.AutoMirrored.Filled.ArrowBack,
  contentDescription = "Go back",
  tint = MaterialTheme.colorScheme.secondary
  )

diff --git a/app/src/main/java/com/juntas/juntas_app/trip_item_screen/presentation/TripItemScreen.kt b/app/src/main/java/com/juntas/juntas_app/trip_item_screen/presentation/TripItemScreen.kt
@@ -33,18 33,19 @@ import coil.compose.AsyncImage
 import com.juntas.juntas_app.R
 import com.juntas.juntas_app.trip_item_screen.components.TripItem
 import java.time.Instant
-import java.time.LocalDateTime
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 
 @Composable
 fun TripItemScreen(
  profileImage: String,
- date: Long,
  dateLong: Long,
  userNameLast: String,
  onBackPressed: () -> Unit,
  modifier: Modifier = Modifier ,
 ) {
  var stars = 3
  val date = Instant.ofEpochMilli(dateLong).atZone(ZoneId.of("UTC")).toLocalDate()
 
  Scaffold(
  modifier = modifier.fillMaxSize(),
@@ -151,11 152,7 @@ fun TripItemScreen(
  horizontalArrangement = Arrangement.Start
  ) {
  Text(
- text = LocalDateTime
- .ofInstant(
- Instant.ofEpochSecond(date),
- ZoneId.systemDefault()
- ).toString(), //TODO: Add dates from origin
  text = date.format(DateTimeFormatter.ofPattern("DD-MM-yyyy")).toString(), //TODO: Add dates from origin
  style = MaterialTheme.typography.titleSmall,
  color = MaterialTheme.colorScheme.secondary
  )

diff --git a/app/src/main/java/com/juntas/juntas_app/trip_screen/presentation/components/TripCard.kt b/app/src/main/java/com/juntas/juntas_app/trip_screen/presentation/components/TripCard.kt
@@ -1,7 1,5 @@
 package com.juntas.juntas_app.trip_screen.presentation.components
 
-import android.os.Build
-import androidx.annotation.RequiresApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -24,7 22,6 @@ import androidx.compose.material.icons.outlined.Schedule
 import androidx.compose.material.icons.outlined.StarBorder
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -44,8 41,9 @@ import coil.compose.AsyncImage
 import com.juntas.juntas_app.R
 import java.time.LocalDate
 import java.time.LocalTime
 import java.time.format.DateTimeFormatter
 
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun TripCard(
  onCardClick: () -> Unit ,
@@ -229,7 227,7 @@ fun TripCard(
  tint = MaterialTheme.colorScheme.tertiary,
  )
  Spacer(modifier = Modifier.width(10.dp))
- Text(text = time.toString(), style = MaterialTheme.typography.bodySmall)
  Text(text = time.format(DateTimeFormatter.ofPattern("HH-MM")).toString(), style = MaterialTheme.typography.bodySmall)
  }
  //Passengers
  Spacer(modifier = Modifier.height(10.dp))
@@ -285,7 283,7 @@ fun TripCard(
  }
 }
 
-@RequiresApi(Build.VERSION_CODES.O)
 
 @Composable
 @Preview(showBackground = true)
 fun TripCardPreview() {