Add exit option to system tray and add optional param to setSentry

dhzdhd · Dec 15, 2024 · 54b848c · 54b848c
1 parent 8223563
commit 54b848c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -79,13 +79,12 @@ void main() async {
       MenuItemLabel(
         label: 'Show app',
         onClicked: (menuItem) => appWindow.show(),
-      )
+      ),
+      MenuItemLabel(label: 'Exit', onClicked: (menuItem) => appWindow.close())
     ]);
 
     await systemTray.setContextMenu(menu);
-
     systemTray.registerSystemTrayEventHandler((eventName) {
-      debugPrint('eventName: $eventName');
       if (eventName == kSystemTrayEventClick) {
         Platform.isWindows ? appWindow.show() : systemTray.popUpContextMenu();
       } else if (eventName == kSystemTrayEventRightClick) {
@@ -107,6 +106,7 @@ void main() async {
   await Hive.openBox('vault');
 
   final settings = Settings.init();
+
   if (settings.isSentryEnabled) {
     await SentryFlutter.init(
       (options) {

diff --git a/lib/src/settings/controllers/settings_controller.dart b/lib/src/settings/controllers/settings_controller.dart
@@ -33,8 +33,7 @@ class Settings extends _$Settings {
   }
 
   static SettingsModel init() {
-    const defaultValue =
-        SettingsModel(isSentryEnabled: false, themeMode: ThemeMode.system);
+    final defaultValue = SettingsModel.defaultValue();
 
     try {
       final Map<String, dynamic> raw = jsonDecode(
@@ -54,7 +53,7 @@ class Settings extends _$Settings {
     }
   }
 
-  void setSentry(Option<bool> choice) {
+  void setSentry({Option<bool> choice = const None()}) {
     state = state.copyWith(
       isSentryEnabled: choice.match(
         () => !state.isSentryEnabled,
@@ -65,7 +64,9 @@ class Settings extends _$Settings {
   }
 
   void updateThemeMode(ThemeMode? newThemeMode) async {
-    if (newThemeMode == state.themeMode || newThemeMode == null) return;
+    if (newThemeMode == state.themeMode || newThemeMode == null) {
+      return;
+    }
 
     state = state.copyWith(themeMode: newThemeMode);
     Hive.box('vault').put('settings', jsonEncode(state.toJson()));

diff --git a/lib/src/settings/models/settings_model.dart b/lib/src/settings/models/settings_model.dart
@@ -15,4 +15,7 @@ class SettingsModel with _$SettingsModel {
 
   factory SettingsModel.fromJson(Map<String, Object?> json) =>
       _$SettingsModelFromJson(json);
+
+  factory SettingsModel.defaultValue() =>
+      const SettingsModel(isSentryEnabled: false, themeMode: ThemeMode.system);
 }
diff --git a/lib/src/settings/views/settings_view.dart b/lib/src/settings/views/settings_view.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:fpdart/fpdart.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:syncvault/helpers.dart';
 import 'package:syncvault/src/accounts/controllers/folder_controller.dart';
@@ -78,7 +77,7 @@ class SettingsView extends ConsumerWidget {
                         Switch(
                           value: settings.isSentryEnabled,
                           onChanged: (val) {
-                            settingsNotifier.setSentry(none());
+                            settingsNotifier.setSentry();
                           },
                         )
                       ],