minor changes.

canopas · Jan 9, 2025 · bcdc613 · bcdc613
1 parent 9d3e327
commit bcdc613
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 82 deletions.
diff --git a/app/src/main/java/com/canopas/yourspace/ui/flow/journey/timeline/JourneyTimelineScreen.kt b/app/src/main/java/com/canopas/yourspace/ui/flow/journey/timeline/JourneyTimelineScreen.kt
@@ -1,5 +1,6 @@
 package com.canopas.yourspace.ui.flow.journey.timeline
 
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -135,6 +136,17 @@ private fun TimelineContent(modifier: Modifier) {
                 color = AppTheme.colorScheme.textPrimary,
                 modifier = Modifier.weight(1f)
             )
+
+            if (!state.isToday) {
+                Text(
+                    stringResource(R.string.today),
+                    style = AppTheme.appTypography.header4,
+                    color = AppTheme.colorScheme.primary,
+                    modifier = Modifier.clickable {
+                        viewModel.resetToToday()
+                    }
+                )
+            }
         }
         key(state.selectedTimeTo) {
             HorizontalDatePicker(

diff --git a/app/src/main/java/com/canopas/yourspace/ui/flow/journey/timeline/JourneyTimelineViewModel.kt b/app/src/main/java/com/canopas/yourspace/ui/flow/journey/timeline/JourneyTimelineViewModel.kt
@@ -223,8 +223,6 @@ class JourneyTimelineViewModel @Inject constructor(
         val today = Calendar.getInstance()
         today.set(Calendar.HOUR_OF_DAY, 0)
         today.set(Calendar.MINUTE, 0)
-        today.set(Calendar.SECOND, 0)
-        today.set(Calendar.MILLISECOND, 0)
 
         return today.timeInMillis == calendar.timeInMillis
     }
@@ -265,6 +263,16 @@ class JourneyTimelineViewModel @Inject constructor(
         loadLocations()
     }
 
+    fun resetToToday() {
+        _state.value = _state.value.copy(
+            selectedTimeFrom = getTodayStartTimestamp(),
+            selectedTimeTo = getTodayEndTimestamp(),
+            groupedLocation = emptyMap(),
+            isToday = true
+        )
+        loadLocations()
+    }
+
     fun dismissDatePicker() {
         _state.value = _state.value.copy(showDatePicker = false)
     }

diff --git a/...c/main/java/com/canopas/yourspace/ui/flow/journey/timeline/component/CalendarViewModel.kt b/...c/main/java/com/canopas/yourspace/ui/flow/journey/timeline/component/CalendarViewModel.kt
@@ -15,7 +15,7 @@ import javax.inject.Inject
 class CalendarViewModel @Inject constructor() : ViewModel() {
     private val _state = MutableStateFlow(
         CalendarViewState(
-            selectedDate = LocalDate.now().withDayOfMonth(1),
+            selectedDate = LocalDate.now().atStartOfDay().toLocalDate(),
             weekStartDate = LocalDate.now().with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY))
         )
     )
@@ -35,7 +35,7 @@ class CalendarViewModel @Inject constructor() : ViewModel() {
 
     private fun setContainsToday() {
         val today = LocalDate.now()
-        val endOfWeek = state.value.weekStartDate.plusDays(6)
+        val endOfWeek = state.value.weekStartDate
         val containsToday = today.isAfter(state.value.weekStartDate) && today.isBefore(endOfWeek)
         _state.update { it.copy(containsToday = containsToday) }
     }

diff --git a/.../main/java/com/canopas/yourspace/ui/flow/journey/timeline/component/CalenderDataSource.kt b/.../main/java/com/canopas/yourspace/ui/flow/journey/timeline/component/CalenderDataSource.kt