ride card and refactoring

Author: 04jono

app/src/main/java/com/cornellappdev/scoop/data/models/Ride.kt

@@ -1,6 +1,9 @@
 package com.cornellappdev.scoop.data.models
 
+import android.os.Build
+import androidx.annotation.RequiresApi
 import com.squareup.moshi.Json
+import java.time.LocalDateTime
 
 // TODO: fix this so that it actually makes sense and correlates with backend haha
 
@@ -19,3 +22,25 @@ data class Ride(
     var creator: User? = null,
     var path: Path? = null
 )
+
+/*
+ * Backward compatibility functions for Dates
+ */
+
+/**
+ * Convert a String to Kotlin LocalDateTime
+ */
+@RequiresApi(Build.VERSION_CODES.O)
+fun stringToDate(dateString : String) : LocalDateTime {
+    var splitString = dateString.split(" ")
+    var dateList = splitString[0].split("/")
+    var timeList = splitString[1].split(":")
+    var pm = splitString[2] == "PM"
+    var hour = if(pm) Integer.parseInt(timeList[0]) + 12 else Integer.parseInt(timeList[0])
+    // Year, Month, Day, Hour, Minute
+    return LocalDateTime.of(Integer.parseInt(dateList[2]), Integer.parseInt(dateList[0]), Integer.parseInt(dateList[1]), hour, Integer.parseInt(timeList[1]))
+}
+
+
+
+

app/src/main/java/com/cornellappdev/scoop/data/repositories/RideRepository.kt

@@ -4,6 +4,7 @@ import com.cornellappdev.scoop.data.NetworkApi
 import com.cornellappdev.scoop.data.models.Ride
 import com.cornellappdev.scoop.data.models.RideRequestBody
 import com.cornellappdev.scoop.data.models.RideType
+import com.cornellappdev.scoop.data.models.User
 import javax.inject.Inject
 import javax.inject.Singleton
 

app/src/main/java/com/cornellappdev/scoop/ui/components/general/RideCard.kt

@@ -17,6 +17,8 @@ import androidx.compose.material.icons.outlined.Place
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.PathEffect
@@ -41,7 +43,8 @@ fun RideCard(
         shape = RoundedCornerShape(10.dp),
         modifier = Modifier
             .fillMaxWidth(),
-        border = BorderStroke(1.dp, color = BorderGray)
+        border = BorderStroke(1.dp, color = BorderGray),
+        elevation = 2.dp
     ) {
         Column(modifier = Modifier.padding(10.dp)) {
             Row(
@@ -60,6 +63,7 @@ fun RideCard(
                 }
 
                 Row(modifier = Modifier.wrapContentSize()) {
+
                     Icon(
                         Icons.Filled.CalendarToday,
                         modifier = Modifier
@@ -68,6 +72,13 @@ fun RideCard(
                             .align(Alignment.CenterVertically),
                         contentDescription = stringResource(R.string.calendar_icon_description)
                     )
+
+                    ride.datetime?.let { time ->
+                        Text(
+                            text = time,
+                            style = TextStyle(color = Color.Black, fontSize = 22.sp)
+                        )
+                    }
                 }
             }
 

app/src/main/java/com/cornellappdev/scoop/ui/components/post/ThirdPage.kt

@@ -13,6 +13,6 @@ import com.cornellappdev.scoop.data.models.RideRequestBody
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
-fun ThirdPage(ride: RideRequestBody) {
+fun ThirdPage(ride: Ride) {
     BottomSheet(ride)
 }

app/src/main/java/com/cornellappdev/scoop/ui/components/post/ThirdPageBottomSheet.kt

@@ -28,7 +28,7 @@ import com.cornellappdev.scoop.data.models.RideRequestBody
 import com.cornellappdev.scoop.data.models.RideType
 
 @Composable
-fun BottomSheet(ride: RideRequestBody) {
+fun BottomSheet(ride: Ride) {
     Column(modifier = Modifier.padding(top = 28.dp, start = 40.dp, end = 40.dp)) {
         Text(
             text = "Trip to ${ride.arrivalLocationName}",

app/src/main/java/com/cornellappdev/scoop/ui/components/search/DisplaySearchesPage.kt

@@ -52,6 +52,8 @@ fun DisplaySearchesPage(
     val filter = rememberSaveable { mutableStateOf<String?>(null) }
     val isEditing = rememberSaveable { mutableStateOf(false) }
 
+    val testData = listOf(Ride(departureLocationName = "Ithaca", arrivalLocationName = "Syracuse", datetime = "Nov 13"), Ride(departureLocationName = "Ithaca", arrivalLocationName = "Syracuse", datetime = "Nov 13"))
+
     Scaffold(topBar = {
         Box(
             modifier = Modifier
@@ -111,7 +113,7 @@ fun DisplaySearchesPage(
                     state = state,
                     verticalArrangement = Arrangement.spacedBy(10.dp)
                 ) {
-                    items(searchResults.value) { item ->
+                    items(testData) { item ->
                         RideCard(item)
                     }
                 }

app/src/main/java/com/cornellappdev/scoop/ui/screens/PostScreen.kt

@@ -50,7 +50,7 @@ PostScreen to network and pass data back and forth.
 )
 @Composable
 fun PostScreen(
-    onPostNewTrip: (RideRequestBody) -> Unit,
+    onPostNewTrip: (Ride) -> Unit,
     postScreenViewModel: PostScreenViewModel = hiltViewModel()
 ) {
     val pagerState = rememberPagerState(0)

app/src/main/java/com/cornellappdev/scoop/ui/viewmodel/PostScreenViewModel.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.cornellappdev.scoop.data.models.RideRequestBody
+import com.cornellappdev.scoop.data.models.Ride
 import com.cornellappdev.scoop.data.models.stringToRideType
 import com.cornellappdev.scoop.data.repositories.RideRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -18,9 +18,10 @@ import javax.inject.Inject
 class PostScreenViewModel @Inject constructor(private val rideRepository: RideRepository) :
     ViewModel() {
 
-    private val _ride: RideRequestBody by mutableStateOf(RideRequestBody())
-    val ride: RideRequestBody = _ride
+    private val _ride: Ride by mutableStateOf(Ride())
+    val ride: Ride = _ride
 
+    /*
     fun createARide() = viewModelScope.launch {
         if (assertReadyToPost()) {
             rideRepository.createRide(
@@ -38,6 +39,8 @@ class PostScreenViewModel @Inject constructor(private val rideRepository: RideRe
         }
     }
 
+     */
+
     private fun assertReadyToPost(): Boolean {
         return ride.type != null
                 && ride.departureLocationName != null