Skip to content

Commit

Permalink
fix: alarm time not set when changing sound, vibrate or snooze at sam…
Browse files Browse the repository at this point in the history
…e time (closes #337)
  • Loading branch information
Bnyro committed Feb 7, 2025
1 parent f4c6949 commit ab772f7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableIntStateOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
Expand Down Expand Up @@ -74,13 +75,13 @@ fun AlarmPicker(currentAlarm: Alarm, onSave: (Alarm) -> Unit, onCancel: () -> Un
var soundName by remember { mutableStateOf(currentAlarm.soundName) }
var soundUri by remember { mutableStateOf(currentAlarm.soundUri) }
var repeat by remember { mutableStateOf(currentAlarm.repeat) }
var snoozeMinutes by remember { mutableStateOf(currentAlarm.snoozeMinutes) }
var snoozeMinutes by remember { mutableIntStateOf(currentAlarm.snoozeMinutes) }
var snoozeEnabled by remember { mutableStateOf(currentAlarm.snoozeEnabled) }
var soundEnabled by remember { mutableStateOf(currentAlarm.soundEnabled) }

val initialTime = remember { TimeHelper.millisToTime(currentAlarm.time) }
var hours = remember { initialTime.hours }
var minutes = remember { initialTime.minutes }
var hours by remember { mutableIntStateOf(initialTime.hours) }
var minutes by remember { mutableIntStateOf(initialTime.minutes) }

val scrollState = rememberScrollState()
Surface {
Expand All @@ -95,9 +96,7 @@ fun AlarmPicker(currentAlarm: Alarm, onSave: (Alarm) -> Unit, onCancel: () -> Un
AlarmTimePicker(
hours,
minutes,
onHoursChanged = {
hours = it
},
onHoursChanged = { hours = it },
onMinutesChanged = { minutes = it }
)
Column {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ class AlarmPickerModel(application: Application, savedStateHandle: SavedStateHan

init {
val alarmId = id?.toLong() ?: 0L

alarm = if (alarmId == 0L) {
Alarm(time = TimeHelper.currentDayMillis)
} else {
runBlocking(Dispatchers.IO) {
alarmRepository.getAlarmById(alarmId)
}
}

}

fun createAlarm(alarm: Alarm) {
Expand Down

0 comments on commit ab772f7

Please sign in to comment.