fix: removed unnecessary send alert button in settings

vskvj3 · Jun 26, 2023 · a427608 · a427608
1 parent 8a1d1c4
commit a427608
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 12 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,4 +1,6 @@
 //import 'package:AlertMe/pages/Login_RegisterPage.dart';
+import 'dart:ui';
+
 import 'package:alert_me/utils/find_distance.dart';
 import 'package:alert_me/widgets/alert_notification.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
@@ -42,7 +44,6 @@ void main() async {
           'Message also contained a notification: ${message.notification}');
     }
   });
-
   runApp(const MyApp());
 }
 

diff --git a/lib/pages/alert_page.dart b/lib/pages/alert_page.dart
@@ -248,7 +248,7 @@ class _AlertPageState extends State<AlertPage> {
                   color: Colors.white,
                   fontSize: 20,
                   fontWeight: FontWeight.bold),
-            ))
+            )),
       ],
     );
   }

diff --git a/lib/pages/emergency_contacts_page.dart b/lib/pages/emergency_contacts_page.dart
@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'package:alert_me/utils/emergency_notif.dart';
 import 'package:alert_me/utils/validate_data.dart';
 import 'package:alert_me/widgets/text_field.dart';
 import 'package:flutter/material.dart';
@@ -87,7 +88,10 @@ class _EmergencyContactsPageState extends State<EmergencyContactsPage> {
                                 _phoneNumberController.text.isNotEmpty &&
                                 emergencyContactList.length < 5 &&
                                 PhoneValidator.validatePhoneNumber(
-                                    _phoneNumberController.text) && !(PhoneValidator.checkDuplicate(emergencyContactList,_phoneNumberController.text))) {
+                                    _phoneNumberController.text) &&
+                                !(PhoneValidator.checkDuplicate(
+                                    emergencyContactList,
+                                    _phoneNumberController.text))) {
                               final tempList = [
                                 _nameController.text,
                                 _phoneNumberController.text
@@ -108,8 +112,8 @@ class _EmergencyContactsPageState extends State<EmergencyContactsPage> {
                                   }
                                 }
                                 setState(() {
-                                  _phoneNumberController.text ="";
-                                  _nameController.text="";
+                                  _phoneNumberController.text = "";
+                                  _nameController.text = "";
                                   emergencyContactList;
                                 });
                               }
@@ -149,11 +153,11 @@ class _EmergencyContactsPageState extends State<EmergencyContactsPage> {
                         trailing: TextButton(
                             onPressed: () async {
                               setState(() {
-                              emergencyContactList.removeAt(index);
-                            });
-                            await EmergencyDataStorage.storeContacts(
-                              json.encode(emergencyContactList),
-                            );
+                                emergencyContactList.removeAt(index);
+                              });
+                              await EmergencyDataStorage.storeContacts(
+                                json.encode(emergencyContactList),
+                              );
                             },
                             child: const Text("Remove")),
                         contentPadding: const EdgeInsets.only(left: 10),
@@ -170,6 +174,12 @@ class _EmergencyContactsPageState extends State<EmergencyContactsPage> {
                   ),
                 ),
               ],
+              // ElevatedButton(
+              //     onPressed: () {
+              //       AppNotif().showNotification(
+              //           title: "Send Alert", body: "Press to send alert");
+              //     },
+              //     child: Text("test"))
             ],
           ),
         ),

diff --git a/lib/utils/emergency_notif.dart b/lib/utils/emergency_notif.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/material.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 
 class AppNotif {
@@ -10,15 +11,19 @@ class AppNotif {
         InitializationSettings(android: initializationSettingsAndroid);
     await appNotif.initialize(initializationSettings,
         onDidReceiveBackgroundNotificationResponse:
-            (NotificationResponse notificationResponse) async {});
+            (NotificationResponse notificationResponse) async {
+      debugPrint("pressed  background notification");
+    }, onDidReceiveNotificationResponse:
+            (NotificationResponse norificationResponse) async {
+      debugPrint("pressed notification");
+    });
   }
 
   notificationDetails() {
     return const NotificationDetails(
       android: AndroidNotificationDetails('1', 'Notification Button',
           playSound: false,
           enableVibration: false,
-          showWhen: false,
           importance: Importance.max,
           icon: 'mipmap/ic_launcher',
           ongoing: true,
@@ -29,6 +34,7 @@ class AppNotif {
 
   Future showNotification(
       {int id = 111, String? title, String? body, String? payload}) async {
+    debugPrint("indise show notification");
     return appNotif.show(id, title, body, await notificationDetails());
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -248,7 +248,7 @@ class _AlertPageState extends State<AlertPage> { @@
                       color: Colors.white,
                       fontSize: 20,
                       fontWeight: FontWeight.bold),
-                ))
+                )),
           ],
         );
       }
@@ Expand Down @@