Skip to content

Commit 89d78dc

Browse files
worked on display reminder on notification screen
1 parent 215fe6b commit 89d78dc

1 file changed

Lines changed: 12 additions & 5 deletions

File tree

feature/settings/src/main/java/com/brandyodhiambo/settings/presentation/NotificationScreen.kt

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,16 @@ import androidx.compose.material3.Text
4747
import androidx.compose.material3.TopAppBar
4848
import androidx.compose.material3.TopAppBarDefaults
4949
import androidx.compose.runtime.Composable
50+
import androidx.compose.runtime.livedata.observeAsState
5051
import androidx.compose.ui.Alignment
5152
import androidx.compose.ui.Modifier
5253
import androidx.compose.ui.unit.dp
54+
import androidx.hilt.navigation.compose.hiltViewModel
5355
import com.brandyodhiambo.common.domain.model.ReminderMode
5456
import com.brandyodhiambo.common.util.toInitials
57+
import com.brandyodhiambo.designsystem.components.Loader
5558
import com.brandyodhiambo.designsystem.components.NotificationSwitcher
59+
import com.brandyodhiambo.settings.R
5660
import com.ramcosta.composedestinations.annotation.Destination
5761

5862
interface NotificationNavigator {
@@ -66,9 +70,10 @@ interface NotificationNavigator {
6670
@Destination
6771
@Composable
6872
fun NotificationScreen(
69-
navigator: NotificationNavigator
73+
navigator: NotificationNavigator,
74+
settingsViewModel: SettingsViewModel = hiltViewModel()
7075
) {
71-
val reminder = listOf(
76+
/*val reminder = listOf(
7277
ReminderMode(
7378
"Monday",
7479
listOf("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"),
@@ -80,8 +85,9 @@ fun NotificationScreen(
8085
isOn = true
8186
),
8287
83-
)
88+
)*/
8489

90+
val reminder = settingsViewModel.reminderModeFromDb.observeAsState().value
8591
Scaffold(
8692
containerColor = MaterialTheme.colorScheme.primary,
8793
topBar = {
@@ -120,9 +126,9 @@ fun NotificationScreen(
120126
item {
121127
AddReminder(navigator = navigator)
122128
}
123-
if (reminder.isEmpty()) {
129+
if (reminder == null) {
124130
item {
125-
// Loader(compositions = R.raw.clock)
131+
Loader(compositions = com.brandyodhiambo.home.R.raw.drink)
126132
}
127133
} else {
128134
items(reminder) { reminder ->
@@ -221,6 +227,7 @@ fun ReminderCardTime(reminder: ReminderMode) {
221227
padding = 5.dp,
222228
onToggle = {
223229
reminder.isOn.not()
230+
// update the reminder on database
224231
}
225232
)
226233
}

0 commit comments

Comments
 (0)