Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: One-time alarms remain enabled after ringing #782

Merged
merged 2 commits into from
Mar 24, 2025
Merged

Fix: One-time alarms remain enabled after ringing #782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5dc7e2a
changes1
mahendra-918 Mar 24, 2025
e04087b
changes2
mahendra-918 Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions lib/app/modules/alarmRing/controllers/alarm_ring_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,18 @@ class AlarmControlController extends GetxController {
stream: AudioStream.alarm,
);


if (currentlyRingingAlarm.value.days.every((element) => element == false)) {
currentlyRingingAlarm.value.isEnabled = false;
if (currentlyRingingAlarm.value.isSharedAlarmEnabled == false) {
await IsarDb.updateAlarm(currentlyRingingAlarm.value);
} else {
await FirestoreDb.updateAlarm(
currentlyRingingAlarm.value.ownerId,
currentlyRingingAlarm.value,
);
}
}

_subscription.cancel();
_currentTimeTimer?.cancel();
Expand Down
16 changes: 15 additions & 1 deletion lib/app/modules/alarmRing/views/alarm_ring_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import 'package:get/get.dart';
import 'package:ultimate_alarm_clock/app/modules/settings/controllers/theme_controller.dart';
import 'package:ultimate_alarm_clock/app/utils/constants.dart';
import 'package:ultimate_alarm_clock/app/utils/utils.dart';
import 'package:ultimate_alarm_clock/app/data/providers/isar_provider.dart';
import 'package:ultimate_alarm_clock/app/data/providers/firestore_provider.dart';

import '../controllers/alarm_ring_controller.dart';

Expand Down Expand Up @@ -185,12 +187,24 @@ class AlarmControlView extends GetView<AlarmControlController> {
kprimaryColor,
),
),
onPressed: () {
onPressed: () async {
Utils.hapticFeedback();
if (controller
.currentlyRingingAlarm.value.isGuardian) {
controller.guardianTimer.cancel();
}

if (controller.currentlyRingingAlarm.value.days.every((element) => element == false)) {
controller.currentlyRingingAlarm.value.isEnabled = false;
if (controller.currentlyRingingAlarm.value.isSharedAlarmEnabled == false) {
await IsarDb.updateAlarm(controller.currentlyRingingAlarm.value);
} else {
await FirestoreDb.updateAlarm(
controller.currentlyRingingAlarm.value.ownerId,
controller.currentlyRingingAlarm.value,
);
}
}
if (Utils.isChallengeEnabled(
controller.currentlyRingingAlarm.value,
)) {
Expand Down
19 changes: 0 additions & 19 deletions lib/app/modules/splashScreen/controllers/splash_screen_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,25 +124,6 @@ class SplashScreenController extends GetxController {
.every((element) => element == false)) {
currentlyRingingAlarm.value.isEnabled = false;

if (currentlyRingingAlarm.value.isSharedAlarmEnabled == false) {
IsarDb.updateAlarm(currentlyRingingAlarm.value);
} else {
FirestoreDb.updateAlarm(
currentlyRingingAlarm.value.ownerId,
currentlyRingingAlarm.value,
);
}
} else if (currentlyRingingAlarm.value.isOneTime == true) {
// If the alarm has to repeat on one day, but ring just once,
// we will keep seting its days to false until it will never ring
int currentDay = DateTime.now().weekday - 1;
currentlyRingingAlarm.value.days[currentDay] = false;

if (currentlyRingingAlarm.value.days
.every((element) => element == false)) {
currentlyRingingAlarm.value.isEnabled = false;
}

if (currentlyRingingAlarm.value.isSharedAlarmEnabled == false) {
IsarDb.updateAlarm(currentlyRingingAlarm.value);
} else {
Expand Down