fix: Fix datetime formatting issues

droidconKE · Nov 9, 2023 · f9d9bc7 · f9d9bc7
1 parent 20274f0
commit f9d9bc7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/presentation/src/main/java/com/android254/presentation/sessions/mappers/SessionMapper.kt b/presentation/src/main/java/com/android254/presentation/sessions/mappers/SessionMapper.kt
@@ -27,13 +27,14 @@ import java.util.Locale
 
 fun Session.toPresentationModel(): SessionPresentationModel {
     val startTime = getTimePeriod(this.startDateTime)
+    val endTime = getTimePeriod(this.endDateTime)
     return SessionPresentationModel(
         id = this.id,
         title = this.title,
         description = this.description,
         venue = this.rooms,
         startTime = startTime.time,
-        endTime = this.endTime,
+        endTime = "${endTime.time} ${endTime.period}",
         amOrPm = startTime.period,
         isStarred = this.isBookmarked,
         level = this.sessionLevel,

diff --git a/presentation/src/main/java/com/android254/presentation/sessions/models/SessionsUiState.kt b/presentation/src/main/java/com/android254/presentation/sessions/models/SessionsUiState.kt
@@ -38,5 +38,5 @@ data class SessionsUiState(
     val isError: Boolean = false,
     val errorMessage: String = "",
     val eventDays: List<EventDate> = emptyList(),
-    val selectedEventDay: EventDate = EventDate("1", 1)
+    val selectedEventDay: EventDate = EventDate("-1", 1)
 )
diff --git a/presentation/src/main/java/com/android254/presentation/sessions/view/SessionsViewModel.kt b/presentation/src/main/java/com/android254/presentation/sessions/view/SessionsViewModel.kt
@@ -162,7 +162,7 @@ class SessionsViewModel @Inject constructor(
             _sessionsUiState.update {
                 it.copy(
                     eventDays = sessionDays,
-                    selectedEventDay = sessionDays.first()
+                    selectedEventDay = if (it.selectedEventDay.value == "-1") { sessionDays.first() } else { it.selectedEventDay }
                 )
             }
         }

diff --git a/presentation/src/main/java/com/android254/presentation/utils/DateAndTimeUtils.kt b/presentation/src/main/java/com/android254/presentation/utils/DateAndTimeUtils.kt
@@ -15,6 +15,7 @@
  */
 package com.android254.presentation.utils
 
+import android.text.format.DateUtils
 import timber.log.Timber
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -24,16 +25,10 @@ fun String.getTimeDifference(): String {
     return try {
         val dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.getDefault())
         val timePosted = dateFormat.parse(this)
-        val currentTime = Date()
 
-        val timeDifference = currentTime.time - timePosted.time
+        val currentTime = Date()
 
-        val minutesDifference = timeDifference / (1000 * 60)
-        if (minutesDifference <= 60) {
-            "$minutesDifference mins ago"
-        } else {
-            "${minutesDifference / 60} hours ago"
-        }
+        return DateUtils.getRelativeTimeSpanString(timePosted.time, currentTime.time, DateUtils.DAY_IN_MILLIS).toString()
     } catch (e: Exception) {
         Timber.e(e)
         this