fixed notification

mixin27 · Sep 16, 2024 · dadf656 · dadf656
1 parent 497156a
commit dadf656
Show file tree

Hide file tree

Showing 7 changed files with 100 additions and 96 deletions.
diff --git a/lib/app_start_up.dart b/lib/app_start_up.dart
@@ -4,7 +4,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:mmcalendar/firebase_options.dart';
 import 'package:mmcalendar/src/shared/providers/mm_calendar_providers.dart';
 import 'package:mmcalendar/src/utils/shared_prefs/preference_manager.dart';
-// import 'package:mmcalendar/src/utils/onesignal/onesignal.dart';
+import 'package:mmcalendar/src/utils/onesignal/onesignal.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'app_start_up.g.dart';
@@ -25,7 +25,7 @@ FutureOr<void> appStartup(AppStartupRef ref) async {
     Firebase.initializeApp(
       options: DefaultFirebaseOptions.currentPlatform,
     ),
-    // initOnesignal(),
+    initOnesignal(),
 
     // list of providers to be warmed up
     // ref.watch(onboardingRepositoryProvider.future),

diff --git a/lib/main.dart b/lib/main.dart
@@ -8,7 +8,6 @@ import 'package:mmcalendar/src/features/app/app.dart';
 import 'package:mmcalendar/src/l10n/l10n.dart';
 import 'package:mmcalendar/src/shared/errors/async_error_logger.dart';
 import 'package:mmcalendar/src/shared/errors/error_logger.dart';
-// import 'package:mmcalendar/src/utils/onesignal/onesignal.dart';
 
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();

diff --git a/lib/src/features/settings/presentation/app_settings/app_settings_page.dart b/lib/src/features/settings/presentation/app_settings/app_settings_page.dart
@@ -20,7 +20,7 @@ class AppSettingsPage extends StatelessWidget {
       ),
       body: ListView(
         children: [
-          // const NotificationSwitchListTile(),
+          const NotificationSwitchListTile(),
           const ThemeModeSwitchTile(),
           const CalendarLanguageListTile(),
           const AppLanguageListTile(),

diff --git a/lib/src/utils/onesignal/onesignal.dart b/lib/src/utils/onesignal/onesignal.dart
@@ -1,33 +1,33 @@
-// import 'package:mmcalendar/src/utils/native_id.dart';
-// import 'package:onesignal_flutter/onesignal_flutter.dart';
+import 'package:mmcalendar/src/utils/native_id.dart';
+import 'package:onesignal_flutter/onesignal_flutter.dart';
 
-// const String onesignalAppId = String.fromEnvironment('ONESIGNAL_APP_ID');
+const String onesignalAppId = String.fromEnvironment('ONESIGNAL_APP_ID');
 
-// Future<void> initOnesignal() async {
-//   if (onesignalAppId.isEmpty) {
-//     throw AssertionError('ONESIGNAL_APP_ID is not set');
-//   }
+Future<void> initOnesignal() async {
+  if (onesignalAppId.isEmpty) {
+    throw AssertionError('ONESIGNAL_APP_ID is not set');
+  }
 
-//   OneSignal.Debug.setLogLevel(OSLogLevel.verbose);
+  OneSignal.Debug.setLogLevel(OSLogLevel.verbose);
 
-//   OneSignal.initialize(onesignalAppId);
+  OneSignal.initialize(onesignalAppId);
 
-//   OneSignal.Notifications.requestPermission(true);
+  OneSignal.Notifications.requestPermission(true);
 
-//   final deviceId = await getNativeDeviceId();
-//   if (deviceId != null) {
-//     await OneSignal.login(deviceId);
-//   }
-// }
+  final deviceId = await getNativeDeviceId();
+  if (deviceId != null) {
+    await OneSignal.login(deviceId);
+  }
+}
 
-// Future<void> disablePush([bool disable = true]) async {
-//   if (disable) {
-//     OneSignal.User.pushSubscription.optOut();
-//   } else {
-//     OneSignal.User.pushSubscription.optIn();
-//   }
-// }
+Future<void> disablePush([bool disable = true]) async {
+  if (disable) {
+    OneSignal.User.pushSubscription.optOut();
+  } else {
+    OneSignal.User.pushSubscription.optIn();
+  }
+}
 
-// bool? getPushSubsciption() {
-//   return OneSignal.User.pushSubscription.optedIn;
-// }
+bool? getPushSubsciption() {
+  return OneSignal.User.pushSubscription.optedIn;
+}
diff --git a/lib/src/widgets/settings/notification_switch_tile.dart b/lib/src/widgets/settings/notification_switch_tile.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:iconly/iconly.dart';
-// import 'package:mmcalendar/src/utils/onesignal/onesignal.dart';
+import 'package:mmcalendar/src/utils/onesignal/onesignal.dart';
 
 class NotificationSwitchListTile extends StatefulWidget {
   const NotificationSwitchListTile({
@@ -18,10 +18,10 @@ class _NotificationSwitchListTileState
 
   @override
   void initState() {
-    // final flag = getPushSubsciption();
-    // setState(() {
-    //   _enabled = flag ?? false;
-    // });
+    final flag = getPushSubsciption();
+    setState(() {
+      _enabled = flag ?? false;
+    });
     super.initState();
   }
 
@@ -33,7 +33,7 @@ class _NotificationSwitchListTileState
         setState(() {
           _enabled = newValue;
         });
-        // await disablePush(!newValue);
+        await disablePush(!newValue);
       },
       secondary: const Icon(IconlyLight.notification),
       title: const Text('Notification'),