Fix: Updated weather_tile and location_activity_tile (#700)

* fix for 'Weather Condition'

* fix for 'Location Based'

---------

Co-authored-by: Kush Choudhary <kushchoudhary@Kushs-MacBook-Pro.local>

Author: kushchoudhary98

lib/app/modules/addOrUpdateAlarm/controllers/add_or_update_alarm_controller.dart

@@ -329,7 +329,7 @@ class AddOrUpdateAlarmController extends GetxController {
   }
 
   Future<void> getLocation() async {
-    if (await _checkAndRequestPermission()) {
+    if (await checkAndRequestPermission()) {
       const timeLimit = Duration(seconds: 10);
       await FlLocation.getLocation(
         timeLimit: timeLimit,
@@ -342,7 +342,7 @@ class AddOrUpdateAlarmController extends GetxController {
     }
   }
 
-  Future<bool> _checkAndRequestPermission({bool? background}) async {
+  Future<bool> checkAndRequestPermission({bool? background}) async {
     if (!await FlLocation.isLocationServicesEnabled) {
       // Location services are disabled.
       return false;

lib/app/modules/addOrUpdateAlarm/views/location_activity_tile.dart

@@ -98,10 +98,6 @@ class LocationTile extends StatelessWidget {
             if (value == 0) {
               controller.isLocationEnabled.value = false;
             } else if (value == 1) {
-              if (controller.isLocationEnabled.value == false) {
-                await controller.getLocation();
-              }
-
               Get.defaultDialog(
                 backgroundColor: themeController.secondaryBackgroundColor.value,
                 title: 'Set location to automatically cancel alarm!',
@@ -152,6 +148,11 @@ class LocationTile extends StatelessWidget {
                   ],
                 ),
               );
+
+              if (controller.isLocationEnabled.value == false) {
+                await controller.getLocation();
+                controller.mapController.move(controller.selectedPoint.value, 15);
+              }
             }
           });
         },

lib/app/modules/addOrUpdateAlarm/views/weather_tile.dart

@@ -26,7 +26,7 @@ class WeatherTile extends StatelessWidget {
         child:  ListTile(
                 onTap: () async {
                   Utils.hapticFeedback();
-                  await controller.getLocation();
+                  await controller.checkAndRequestPermission();
                   Get.defaultDialog(
                     titlePadding: const EdgeInsets.symmetric(vertical: 20),
                     backgroundColor: themeController.secondaryBackgroundColor.value,

macos/Runner.xcodeproj/project.pbxproj

@@ -182,7 +182,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					33CC10EC2044A3C60003C045 = {

macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"