fix: Alarm doesn't ring when Show Motivational Quote is turned on. (#804)

* fixed: problem with showMotivationalQuote

* removed unnecessary variable

---------

Co-authored-by: Kush Choudhary <[email protected]>

Author: kushchoudhary98

lib/app/modules/alarmRing/controllers/alarm_ring_controller.dart

@@ -9,14 +9,17 @@ import 'package:flutter_volume_controller/flutter_volume_controller.dart';
 
 import 'package:get/get.dart';
 import 'package:ultimate_alarm_clock/app/data/models/alarm_model.dart';
+import 'package:ultimate_alarm_clock/app/data/models/quote_model.dart';
 
 import 'package:ultimate_alarm_clock/app/data/models/user_model.dart';
 
 import 'package:ultimate_alarm_clock/app/data/providers/firestore_provider.dart';
 import 'package:ultimate_alarm_clock/app/data/providers/isar_provider.dart';
 import 'package:ultimate_alarm_clock/app/data/providers/secure_storage_provider.dart';
 import 'package:ultimate_alarm_clock/app/modules/settings/controllers/settings_controller.dart';
+import 'package:ultimate_alarm_clock/app/modules/settings/controllers/theme_controller.dart';
 import 'package:ultimate_alarm_clock/app/utils/audio_utils.dart';
+import 'package:ultimate_alarm_clock/app/utils/constants.dart';
 
 import 'package:ultimate_alarm_clock/app/utils/utils.dart';
 import 'package:vibration/vibration.dart';
@@ -36,6 +39,7 @@ class AlarmControlController extends GetxController {
   RxBool showButton = false.obs;
   StreamSubscription? _sensorSubscription;
   HomeController homeController = Get.find<HomeController>();
+  ThemeController themeController = Get.find<ThemeController>();
   SettingsController settingsController = Get.find<SettingsController>();
   RxBool get is24HourFormat => settingsController.is24HrsEnabled;
   Rx<AlarmModel> currentlyRingingAlarm = Utils.alarmModelInit.obs;
@@ -50,9 +54,6 @@ class AlarmControlController extends GetxController {
   RxInt guardianCoundown = 120.obs;
   RxBool isPreviewMode = false.obs;
 
-
-
-
   getNextAlarm() async {
     UserModel? _userModel = await SecureStorageProvider().retrieveUserModel();
     AlarmModel _alarmRecord = homeController.genFakeAlarmModel();
@@ -169,6 +170,68 @@ class AlarmControlController extends GetxController {
     });
   }
 
+  void showQuotePopup(Quote quote) {
+    Get.defaultDialog(
+      title: 'Motivational Quote',
+      titlePadding: const EdgeInsets.only(
+        top: 20,
+        bottom: 10,
+      ),
+      backgroundColor: themeController.secondaryBackgroundColor.value,
+      titleStyle: TextStyle(
+        color: themeController.primaryTextColor.value,
+      ),
+      contentPadding: const EdgeInsets.all(20),
+      content: Column(
+        children: [
+          Obx(
+            () => Text(
+              quote.getQuote(),
+              style: TextStyle(
+                color: themeController.primaryTextColor.value,
+              ),
+            ),
+          ),
+          const SizedBox(
+            height: 15,
+          ),
+          Align(
+            alignment: Alignment.centerRight,
+            child: Obx(
+              () => Text(
+                quote.getAuthor(),
+                style: TextStyle(
+                  color: themeController.primaryTextColor.value,
+                  fontWeight: FontWeight.w600,
+                  fontStyle: FontStyle.italic,
+                ),
+              ),
+            ),
+          ),
+          const SizedBox(
+            height: 30,
+          ),
+          TextButton(
+            style: ButtonStyle(
+              backgroundColor: MaterialStateProperty.all(
+                kprimaryColor,
+              ),
+            ),
+            onPressed: () {
+              Get.back();
+            },
+            child: Text(
+              'Dismiss',
+              style: TextStyle(
+                color: themeController.secondaryTextColor.value,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
   @override
   void onInit() async {
     super.onInit();
@@ -200,8 +263,6 @@ class AlarmControlController extends GetxController {
       });
     }
 
-
-
     showButton.value = true;
     initialVolume = await FlutterVolumeController.getVolume(
       stream: AudioStream.alarm,
@@ -269,6 +330,12 @@ class AlarmControlController extends GetxController {
 
     AudioUtils.playAlarm(alarmRecord: currentlyRingingAlarm.value);
 
+
+    if(currentlyRingingAlarm.value.showMotivationalQuote) {
+      Quote quote = Utils.getRandomQuote();
+      showQuotePopup(quote);
+    }
+
     // Setting snooze duration
     minutes.value = currentlyRingingAlarm.value.snoozeDuration;
 

lib/app/modules/alarmRing/views/alarm_ring_view.dart

@@ -134,9 +134,7 @@ class AlarmControlView extends GetView<AlarmControlController> {
                         visible: !controller.isSnoozing.value,
                         child: Obx(
                           () => Padding(
-                            padding: Get.arguments != null
-                                ? const EdgeInsets.symmetric(vertical: 90.0)
-                                : EdgeInsets.zero,
+                            padding: const EdgeInsets.symmetric(vertical: 90.0),
                             child: SizedBox(
                               height: height * 0.07,
                               width: width * 0.5,

lib/app/modules/home/controllers/home_controller.dart

@@ -274,14 +274,6 @@ class HomeController extends GetxController {
       scalingFactor.value = (minFactor + (maxFactor - minFactor) * newFactor);
     });
 
-    if (Get.arguments != null) {
-      bool showMotivationalQuote = Get.arguments.showMotivationalQuote;
-
-      if (showMotivationalQuote) {
-        Quote quote = Utils.getRandomQuote();
-        showQuotePopup(quote);
-      }
-    }
   }
 
   refreshUpcomingAlarms() async {
@@ -594,68 +586,6 @@ class HomeController extends GetxController {
     }
   }
 
-  void showQuotePopup(Quote quote) {
-    Get.defaultDialog(
-      title: 'Motivational Quote',
-      titlePadding: const EdgeInsets.only(
-        top: 20,
-        bottom: 10,
-      ),
-      backgroundColor: themeController.secondaryBackgroundColor.value,
-      titleStyle: TextStyle(
-        color: themeController.primaryTextColor.value,
-      ),
-      contentPadding: const EdgeInsets.all(20),
-      content: Column(
-        children: [
-          Obx(
-            () => Text(
-              quote.getQuote(),
-              style: TextStyle(
-                color: themeController.primaryTextColor.value,
-              ),
-            ),
-          ),
-          const SizedBox(
-            height: 15,
-          ),
-          Align(
-            alignment: Alignment.centerRight,
-            child: Obx(
-              () => Text(
-                quote.getAuthor(),
-                style: TextStyle(
-                  color: themeController.primaryTextColor.value,
-                  fontWeight: FontWeight.w600,
-                  fontStyle: FontStyle.italic,
-                ),
-              ),
-            ),
-          ),
-          const SizedBox(
-            height: 30,
-          ),
-          TextButton(
-            style: ButtonStyle(
-              backgroundColor: MaterialStateProperty.all(
-                kprimaryColor,
-              ),
-            ),
-            onPressed: () {
-              Get.back();
-            },
-            child: Text(
-              'Dismiss',
-              style: TextStyle(
-                color: themeController.secondaryTextColor.value,
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
   Future<void> swipeToDeleteAlarm(UserModel? user, AlarmModel alarm) async {
     AlarmModel? alarmToDelete;