corrected notification logic

swciitg · Sep 9, 2023 · a928dbf · a928dbf
1 parent 9c8f46f
commit a928dbf
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 13 deletions.
diff --git a/lib/pages/notifications/notification_settings.dart b/lib/pages/notifications/notification_settings.dart
@@ -1,8 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:onestop_dev/globals/database_strings.dart';
+import 'package:onestop_dev/globals/my_colors.dart';
+import 'package:onestop_dev/globals/my_fonts.dart';
+import 'package:onestop_dev/services/api.dart';
+import 'package:onestop_dev/stores/login_store.dart';
 import 'package:onestop_dev/widgets/notifications/notif_toggle.dart';
-import '../../globals/my_colors.dart';
-import '../../globals/my_fonts.dart';
+
 
 class NotificationSettings extends StatefulWidget {
   const NotificationSettings({Key? key}) : super(key: key);
@@ -12,6 +15,8 @@ class NotificationSettings extends StatefulWidget {
 }
 
 class _NotificationSettingsState extends State<NotificationSettings> {
+  bool isLoading = false;
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -21,13 +26,33 @@ class _NotificationSettingsState extends State<NotificationSettings> {
         style: MyFonts.w500,
         ),
       ),
-      body:  ListView(
+      body:  Column(
         children: [
           NotifToggle(text: NotificationCategories.cabSharing),
           NotifToggle(text: NotificationCategories.lost),
           NotifToggle(text: NotificationCategories.found),
           NotifToggle(text: NotificationCategories.buy),
           NotifToggle(text: NotificationCategories.sell),
+          ElevatedButton(onPressed: () async {
+            if(isLoading)
+              {
+                return;
+              }
+            setState(() {
+              isLoading = true;
+            });
+            try{
+            await APIService().updateUserNotifPref(LoginStore.userData['notifPref']);}
+            catch(e)
+            {
+              print(e);
+            }
+            setState(() {
+              isLoading = false;
+            });
+          }, child: isLoading? CircularProgressIndicator(
+            color: Colors.white,
+          ) : Text('Save'))
         ],
       ),
     );

diff --git a/lib/widgets/notifications/notif_toggle.dart b/lib/widgets/notifications/notif_toggle.dart
@@ -1,11 +1,8 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_switch/flutter_switch.dart';
-import 'package:get/get.dart';
 import 'package:onestop_dev/functions/utility/capitalize_string.dart';
-import 'package:onestop_dev/services/api.dart';
 import 'package:onestop_dev/stores/login_store.dart';
-
 import '../../globals/my_colors.dart';
 import '../../globals/my_fonts.dart';
 
@@ -18,7 +15,6 @@ class NotifToggle extends StatefulWidget {
 }
 
 class _NotifToggleState extends State<NotifToggle> {
-  bool isLoading = false;
   @override
   Widget build(BuildContext context) {
     var name = capitalize(widget.text);
@@ -36,13 +32,10 @@ class _NotifToggleState extends State<NotifToggle> {
             height: 32,
             width: 52,
             value: LoginStore.userData['notifPref'][widget.text]!,
-            onToggle: (val) async {
-              if(isLoading) {return;}
-              isLoading = true;
+            onToggle: (val) {
               LoginStore.userData['notifPref'][widget.text] = val;
-              await APIService().updateUserNotifPref(LoginStore.userData['notifPref']);
-              setState((){});
-              isLoading = false;
+              setState(() {
+              });
             },
           ),
         ],