Skip to content

Commit

Permalink
Merge pull request #53 from waseefakhtar/feature/group-by-headers
Browse files Browse the repository at this point in the history 
Group HomeScreen medications by Today, This Week, and Next Week
  • Loading branch information
@waseefakhtar
waseefakhtar authored Aug 23, 2023
2 parents a3b657f + a5277c2 commit cc7553b
Showing 1 changed file with 78 additions and 15 deletions.
93 changes: 78 additions & 15 deletions app/src/main/java/com/waseefakhtar/doseapp/feature/home/HomeScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Button
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults.cardColors
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
Expand All @@ -32,6 +31,7 @@ import com.waseefakhtar.doseapp.domain.model.Medication
import com.waseefakhtar.doseapp.feature.home.viewmodel.HomeState
import com.waseefakhtar.doseapp.feature.home.viewmodel.HomeViewModel
import com.waseefakhtar.doseapp.util.getTimeRemaining
import java.util.Calendar

@Composable
fun HomeRoute(
Expand All @@ -48,7 +48,6 @@ fun HomeScreen(state: HomeState, viewModel: HomeViewModel) {
verticalArrangement = Arrangement.spacedBy(8.dp)
) {
Greeting()
DailyOverview(state)
DailyMedications(state, viewModel)
}
}
Expand All @@ -71,9 +70,8 @@ fun Greeting() {
}
}

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun DailyOverview(state: HomeState) {
fun DailyOverview(medicationsToday: List<Medication>) {

Card(
modifier = Modifier
Expand Down Expand Up @@ -101,7 +99,7 @@ fun DailyOverview(state: HomeState) {
)

Text(
text = "${state.medications.filter { it.medicationTaken }.size} of ${state.medications.size} completed",
text = "${medicationsToday.filter { it.medicationTaken }.size} of ${medicationsToday.size} completed",
style = MaterialTheme.typography.titleSmall,
)
}
Expand All @@ -121,28 +119,93 @@ fun DailyOverview(state: HomeState) {
@Composable
fun DailyMedications(state: HomeState, viewModel: HomeViewModel) {

Text(
modifier = Modifier
.padding(4.dp, 12.dp, 8.dp, 0.dp)
.fillMaxWidth(),
text = "Today".uppercase(),
textAlign = TextAlign.Center,
style = MaterialTheme.typography.titleMedium,
)
val medicationList = state.medications.sortedBy { it.date }
val combinedList: List<MedicationListItem> = mutableListOf<MedicationListItem>().apply {
val calendar = Calendar.getInstance()
val medicationsToday = medicationList.filter {
val medicationDate = it.date
calendar.time = medicationDate
val medicationDay = calendar.get(Calendar.DAY_OF_YEAR)

val todayCalendar = Calendar.getInstance()
val todayDay = todayCalendar.get(Calendar.DAY_OF_YEAR)

medicationDay == todayDay
}

add(MedicationListItem.DailyOverviewItem(medicationsToday))

if (medicationsToday.isNotEmpty()) {
add(MedicationListItem.HeaderItem("Today"))
addAll(medicationsToday.map { MedicationListItem.MedicationItem(it) })
}

// Find medications for this week and add "This Week" header
val startOfWeekThisWeek = Calendar.getInstance()
startOfWeekThisWeek.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY)
val endOfWeekThisWeek = startOfWeekThisWeek.clone() as Calendar
endOfWeekThisWeek.add(Calendar.DAY_OF_WEEK, 6)
val medicationsThisWeek = medicationList.filter {
val medicationDate = it.date // Change this to the appropriate attribute
medicationDate in startOfWeekThisWeek.time..endOfWeekThisWeek.time && !medicationsToday.contains(it)
}
if (medicationsThisWeek.isNotEmpty()) {
add(MedicationListItem.HeaderItem("This Week"))
addAll(medicationsThisWeek.map { MedicationListItem.MedicationItem(it) })
}

// Find medications for next week and add "Next Week" header
val startOfWeekNextWeek = Calendar.getInstance()
startOfWeekNextWeek.time = endOfWeekThisWeek.time // Use the end of current week as start of next week
startOfWeekNextWeek.add(Calendar.DAY_OF_MONTH, 1)
val endOfWeekNextWeek = startOfWeekNextWeek.clone() as Calendar
endOfWeekNextWeek.add(Calendar.DAY_OF_MONTH, 6)
val medicationsNextWeek = medicationList.filter {
val medicationDate = it.date // Change this to the appropriate attribute
medicationDate in startOfWeekNextWeek.time..endOfWeekNextWeek.time
}
if (medicationsNextWeek.isNotEmpty()) {
add(MedicationListItem.HeaderItem("Next Week"))
addAll(medicationsNextWeek.map { MedicationListItem.MedicationItem(it) })
}
}

LazyColumn(
modifier = Modifier,
contentPadding = PaddingValues(vertical = 8.dp)
) {
items(
items = state.medications.sortedBy { it.medicationTaken },
items = combinedList,
itemContent = {
MedicationCard(medication = it, viewModel)
when (it) {
is MedicationListItem.DailyOverviewItem -> {
DailyOverview(it.medicationsToday)
}
is MedicationListItem.HeaderItem -> {
Text(
modifier = Modifier
.padding(4.dp, 12.dp, 8.dp, 0.dp)
.fillMaxWidth(),
text = it.headerText.uppercase(),
textAlign = TextAlign.Center,
style = MaterialTheme.typography.titleMedium,
)
}
is MedicationListItem.MedicationItem -> {
MedicationCard(medication = it.medication, viewModel)
}
}
}
)
}
}

sealed class MedicationListItem {
data class DailyOverviewItem(val medicationsToday: List<Medication>) : MedicationListItem()
data class MedicationItem(val medication: Medication) : MedicationListItem()
data class HeaderItem(val headerText: String) : MedicationListItem()
}

@Composable
fun MedicationCard(medication: Medication, viewModel: HomeViewModel) {

Expand Down

0 comments on commit cc7553b

Please sign in to comment.