1.0.1 #3

Merged
me merged 22 commits from dev into main 2026-09-29 17:54:06 -07:00
Showing only changes of commit 183634dee5 - Show all commits
+25 -9
View File
@@ -327,17 +327,25 @@ class _HomeScreenState extends State<HomeScreen> {
if (value) { if (value) {
await _scheduleAlarm(); await _scheduleAlarm();
} else { } else {
_alarmTimer?.cancel(); _stopAlarm();
if (!Platform.isLinux) { }
// Notification Method }
if (ANDROID_USE_NOTIF) await _notifications.cancel(id: _alarmId);
Future<void> _stopAlarm() async {
if (Platform.isLinux) {
_alarmTimer?.cancel();
} else if (Platform.isAndroid) {
// Notification Method
if (ANDROID_USE_NOTIF) {
await _notifications.cancel(id: _alarmId);
}
// Alarm Method // Alarm Method
if (ANDROID_USE_ALARM) await Alarm.stop(_alarmId); if (ANDROID_USE_ALARM) {
await Alarm.stop(_alarmId);
}
} }
_showSnack('Alarm Cancelled'); _showSnack('Alarm Cancelled');
} }
}
void _showSnack(String msg) { void _showSnack(String msg) {
ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(msg))); ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(msg)));
@@ -462,6 +470,9 @@ class _HomeScreenState extends State<HomeScreen> {
), ),
), ),
onChanged: (v) { onChanged: (v) {
if (v == "") {
_stopAlarm();
}
final val = _validateTime(v); final val = _validateTime(v);
if (val == null) { if (val == null) {
_savePrefs(); _savePrefs();
@@ -538,10 +549,15 @@ class _HomeScreenState extends State<HomeScreen> {
subtitle: Text( subtitle: Text(
_alarmEnabled _alarmEnabled
? '${_minutesBefore} Minute${_plural} Before @ $_alarmDisplayTime' ? '${_minutesBefore} Minute${_plural} Before @ $_alarmDisplayTime'
: '', : (_sunsetController.text == ""
? "Time Missing"
: ""),
), ),
value: _alarmEnabled, value:
onChanged: _toggleAlarm, _sunsetController.text != "" ? _alarmEnabled : false,
// If _isDataLoaded is false, onChanged is null, disabling the switch
onChanged:
_sunsetController.text != "" ? _toggleAlarm : null,
), ),
), ),
], ],