Fix conflict

app/src/main/java/com/waseefakhtar/doseapp/data/MedicationDao.kt

@@ -8,7 +8,6 @@ import androidx.room.Query
 import androidx.room.Update
 import com.waseefakhtar.doseapp.data.entity.MedicationEntity
 import kotlinx.coroutines.flow.Flow
-import java.util.Date
 
 @Dao
 interface MedicationDao {
@@ -34,8 +33,9 @@ interface MedicationDao {
         """
             SELECT *
             FROM medicationentity
-            WHERE endDate > :date
+            WHERE strftime('%Y-%m-%d', medicationTime / 1000, 'unixepoch', 'localtime') = :date
+            ORDER BY medicationTime ASC
         """
     )
-    fun getMedicationsForDate(date: Date): Flow<List<MedicationEntity>>
+    fun getMedicationsForDate(date: String): Flow<List<MedicationEntity>>
 }

app/src/main/java/com/waseefakhtar/doseapp/data/repository/MedicationRepositoryImpl.kt

@@ -7,7 +7,6 @@ import com.waseefakhtar.doseapp.domain.model.Medication
 import com.waseefakhtar.doseapp.domain.repository.MedicationRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
-import java.util.Date
 
 class MedicationRepositoryImpl(
     private val dao: MedicationDao
@@ -33,7 +32,7 @@ class MedicationRepositoryImpl(
         }
     }
 
-    override fun getMedicationsForDate(date: Date): Flow<List<Medication>> {
+    override fun getMedicationsForDate(date: String): Flow<List<Medication>> {
         return dao.getMedicationsForDate(
             date = date
         ).map { entities ->

app/src/main/java/com/waseefakhtar/doseapp/domain/repository/MedicationRepository.kt

@@ -2,7 +2,6 @@ package com.waseefakhtar.doseapp.domain.repository
 
 import com.waseefakhtar.doseapp.domain.model.Medication
 import kotlinx.coroutines.flow.Flow
-import java.util.Date
 
 interface MedicationRepository {
 
@@ -14,5 +13,5 @@ interface MedicationRepository {
 
     fun getAllMedications(): Flow<List<Medication>>
 
-    fun getMedicationsForDate(date: Date): Flow<List<Medication>>
+    fun getMedicationsForDate(date: String): Flow<List<Medication>>
 }

app/src/main/java/com/waseefakhtar/doseapp/extension/DateExtension.kt

@@ -15,6 +15,21 @@ fun Date.toFormattedMonthDateString(): String {
     return sdf.format(this)
 }
 
+fun Date.toFormattedYearMonthDateString(): String {
+    val sdf = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
+    return sdf.format(this)
+}
+
+fun String.toDate(): Date? {
+    return try {
+        val sdf = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
+        sdf.parse(this)
+    } catch (e: Exception) {
+        e.printStackTrace()
+        null
+    }
+}
+
 fun Date.toFormattedDateShortString(): String {
     val sdf = SimpleDateFormat("dd", Locale.getDefault())
     return sdf.format(this)

app/src/main/java/com/waseefakhtar/doseapp/feature/home/HomeScreen.kt

@@ -89,8 +89,9 @@ fun HomeRoute(
         navController = navController,
         state = state,
         navigateToMedicationDetail = navigateToMedicationDetail,
+        onDateSelected = viewModel::selectDate,
+        onSelectedDate = { viewModel.updateSelectedDate(it) },
         logEvent = viewModel::logEvent,
-        onSelectedDate = {viewModel.updateSelectedDate(it)}
     )
 }
 
@@ -100,8 +101,9 @@ fun HomeScreen(
     navController: NavController,
     state: HomeState,
     navigateToMedicationDetail: (Medication) -> Unit,
-    logEvent: (String) -> Unit,
+    onDateSelected: (CalendarModel.DateModel) -> Unit,
     onSelectedDate: (Date) -> Unit,
+    logEvent: (String) -> Unit
 ) {
     Column(
         modifier = modifier,
@@ -111,10 +113,11 @@ fun HomeScreen(
             navController = navController,
             state = state,
             navigateToMedicationDetail = navigateToMedicationDetail,
-            onSelectedDate = onSelectedDate ,
+            onSelectedDate = onSelectedDate,
+            onDateSelected = onDateSelected,
             logEvent = {
                 logEvent.invoke(it)
-            }
+            },
         )
     }
 }
@@ -198,7 +201,6 @@ fun DailyOverviewCard(
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun EmptyCard(
     navController: NavController,
@@ -263,11 +265,12 @@ fun DailyMedications(
     state: HomeState,
     navigateToMedicationDetail: (Medication) -> Unit,
     onSelectedDate: (Date) -> Unit,
+    onDateSelected: (CalendarModel.DateModel) -> Unit,
     logEvent: (String) -> Unit
 ) {
 
-
     DatesHeader(
+        lastSelectedDate = state.lastSelectedDate,
         logEvent = {
             logEvent.invoke(it)
         },
@@ -305,11 +308,16 @@ fun DailyMedications(
 
 @Composable
 fun DatesHeader(
-    logEvent: (String) -> Unit,
-    onDateSelected: (CalendarModel.DateModel) -> Unit // Callback to pass the selected date
+    lastSelectedDate: String,
+    onDateSelected: (CalendarModel.DateModel) -> Unit, // Callback to pass the selected date){}
+    logEvent: (String) -> Unit
 ) {
     val dataSource = CalendarDataSource()
-    var calendarModel by remember { mutableStateOf(dataSource.getData(lastSelectedDate = dataSource.today)) }
+    var calendarModel by remember {
+        mutableStateOf(
+            dataSource.getData(lastSelectedDate = dataSource.getLastSelectedDate(lastSelectedDate))
+        )
+    }
     Column(
         modifier = Modifier
             .fillMaxWidth()

app/src/main/java/com/waseefakhtar/doseapp/feature/home/data/CalendarDataSource.kt

@@ -1,5 +1,6 @@
 package com.waseefakhtar.doseapp.feature.home.data
 
+import com.waseefakhtar.doseapp.extension.toDate
 import com.waseefakhtar.doseapp.extension.toFormattedDateString
 import com.waseefakhtar.doseapp.feature.home.model.CalendarModel
 import java.util.Calendar
@@ -12,6 +13,9 @@ class CalendarDataSource {
             return Date()
         }
 
+    fun getLastSelectedDate(dateString: String): Date {
+        return dateString.toDate() ?: today
+    }
     fun getData(startDate: Date = today, lastSelectedDate: Date): CalendarModel {
         val calendar = Calendar.getInstance()
         calendar.time = startDate
@@ -45,7 +49,10 @@ class CalendarDataSource {
         return CalendarModel(
             selectedDate = toItemModel(lastSelectedDate, true),
             visibleDates = dateList.map {
-                toItemModel(it, it == lastSelectedDate)
+                toItemModel(
+                    date = it,
+                    isSelectedDate = it.toFormattedDateString() == lastSelectedDate.toFormattedDateString()
+                )
             }
         )
     }

app/src/main/java/com/waseefakhtar/doseapp/feature/home/usecase/GetMedicationsUseCase.kt

@@ -9,7 +9,9 @@ class GetMedicationsUseCase @Inject constructor(
     private val repository: MedicationRepository
 ) {
 
-     fun getMedications(): Flow<List<Medication>> {
-        return repository.getAllMedications()
+    fun getMedications(date: String? = null): Flow<List<Medication>> {
+        return if (date != null) {
+            repository.getMedicationsForDate(date)
+        } else repository.getAllMedications()
     }
 }

app/src/main/java/com/waseefakhtar/doseapp/feature/home/viewmodel/HomeState.kt

@@ -5,5 +5,6 @@ import com.waseefakhtar.doseapp.domain.model.Medication
 data class HomeState(
     val greeting: String = "",
     val userName: String = "",
+    val lastSelectedDate: String = "",
     val medications: List<Medication> = emptyList()
 )

app/src/main/java/com/waseefakhtar/doseapp/feature/home/viewmodel/HomeViewModel.kt

@@ -3,17 +3,22 @@ package com.waseefakhtar.doseapp.feature.home.viewmodel
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
+import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.waseefakhtar.doseapp.analytics.AnalyticsHelper
 import com.waseefakhtar.doseapp.domain.model.Medication
 import com.waseefakhtar.doseapp.extension.toFormattedDateString
+import com.waseefakhtar.doseapp.extension.toFormattedYearMonthDateString
+import com.waseefakhtar.doseapp.feature.home.model.CalendarModel
 import com.waseefakhtar.doseapp.feature.home.usecase.GetMedicationsUseCase
 import com.waseefakhtar.doseapp.feature.home.usecase.UpdateMedicationUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.stateIn
@@ -25,35 +30,39 @@ import javax.inject.Inject
 class HomeViewModel @Inject constructor(
     private val getMedicationsUseCase: GetMedicationsUseCase,
     private val updateMedicationUseCase: UpdateMedicationUseCase,
+    private val savedStateHandle: SavedStateHandle,
     private val analyticsHelper: AnalyticsHelper
+
 ) : ViewModel() {
 
     var state by mutableStateOf(HomeState())
         private set
-
+    private var dateFilter = savedStateHandle.getStateFlow(
+        DATE_FILTER_KEY,
+        Date().toFormattedYearMonthDateString()
+    ).onEach {
+        state = state.copy(
+            lastSelectedDate = it
+        )
+    }
 
     private val _selectedDate = MutableStateFlow(Date())
     private val _medications = getMedicationsUseCase.getMedications()
 
-
-
-    val homeUiState  = combine(_selectedDate,_medications)  { selectedDate , medications ->
+    val homeUiState = combine(_selectedDate, _medications) { selectedDate, medications ->
         val filteredMedications = medications.filter {
             it.medicationTime.toFormattedDateString() == selectedDate.toFormattedDateString()
         }.sortedBy { it.medicationTime }
 
         HomeState(
             medications = filteredMedications
         )
-
     }.stateIn(
         viewModelScope,
         SharingStarted.WhileSubscribed(5000),
         HomeState()
     )
 
-
-
     fun updateSelectedDate(date: Date) {
         _selectedDate.value = date
     }
@@ -72,16 +81,23 @@ class HomeViewModel @Inject constructor(
         // TODO: Get greeting by checking system time
     }
 
+    @OptIn(ExperimentalCoroutinesApi::class)
     fun loadMedications() {
         viewModelScope.launch {
-            getMedicationsUseCase.getMedications().onEach { medicationList ->
-                state = state.copy(
-                    medications = medicationList
-                )
+            dateFilter.flatMapLatest { selectedDate ->
+                getMedicationsUseCase.getMedications(selectedDate).onEach { medicationList ->
+                    state = state.copy(
+                        medications = medicationList
+                    )
+                }
             }.launchIn(viewModelScope)
         }
     }
 
+    fun selectDate(selectedDate: CalendarModel.DateModel) {
+        savedStateHandle[DATE_FILTER_KEY] = selectedDate.date.toFormattedYearMonthDateString()
+    }
+
     fun takeMedication(medication: Medication) {
         viewModelScope.launch {
             updateMedicationUseCase.updateMedication(medication)
@@ -95,4 +111,7 @@ class HomeViewModel @Inject constructor(
     fun logEvent(eventName: String) {
         analyticsHelper.logEvent(eventName = eventName)
     }
+    companion object {
+        const val DATE_FILTER_KEY = "medication_date_filter"
+    }
 }