refactor: utilize statics and class functions for LunaModule enum

[skip ci]
JagandeepBrar · Jun 1, 2022 · 9f3c3f7 · 9f3c3f7
1 parent 8fe81d1
commit 9f3c3f7
Show file tree

Hide file tree

Showing 40 changed files with 274 additions and 446 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - cloud_firestore (3.1.16):
+  - cloud_firestore (3.1.17):
     - Firebase/Firestore (= 8.15.0)
     - firebase_core
     - Flutter
@@ -51,18 +51,18 @@ PODS:
   - Firebase/Storage (8.15.0):
     - Firebase/CoreOnly
     - FirebaseStorage (~> 8.15.0)
-  - firebase_auth (3.3.18):
+  - firebase_auth (3.3.19):
     - Firebase/Auth (= 8.15.0)
     - firebase_core
     - Flutter
-  - firebase_core (1.17.0):
+  - firebase_core (1.17.1):
     - Firebase/CoreOnly (= 8.15.0)
     - Flutter
-  - firebase_messaging (11.4.0):
+  - firebase_messaging (11.4.1):
     - Firebase/Messaging (= 8.15.0)
     - firebase_core
     - Flutter
-  - firebase_storage (10.2.16):
+  - firebase_storage (10.2.17):
     - Firebase/Storage (= 8.15.0)
     - firebase_core
     - Flutter
@@ -244,15 +244,15 @@ CHECKOUT OPTIONS:
     :tag: 8.15.0
 
 SPEC CHECKSUMS:
-  cloud_firestore: c85ca781dc18eed0b05c90973b4b030e6802acc4
+  cloud_firestore: 936969669b510f2affd43583582d7b117c5f08d1
   DKImagePickerController: 72fd378f244cef3d27288e0aebf217a4467e4012
   DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
-  file_picker: 3e6c3790de664ccf9b882732d9db5eaf6b8d4eb1
+  file_picker: 817ab1d8cd2da9d2da412a417162deee3500fc95
   Firebase: 5f8193dff4b5b7c5d5ef72ae54bb76c08e2b841d
-  firebase_auth: ace975b530600827bd901a9a18584f7cdaf6d160
-  firebase_core: aa1b92020533f5c23955e388c347c58fd64f8627
-  firebase_messaging: 8957bf304b47daf8bf12d0b111fdecc5b33e77a3
-  firebase_storage: 9708f24db0c21dadf7e5494f27406326c0d4ab53
+  firebase_auth: a6470a6974d42f83117932c913aecb926182f907
+  firebase_core: 318de541b0e61d3f24262982a3f0b54afe72439b
+  firebase_messaging: 943cfe65e0b3f457240489ce67655e40da1d270c
+  firebase_storage: b079dbfa7ef016051b6f95315a7002012fda9984
   FirebaseAuth: 3e73bf8abf4fbb40f8b421f361f4cc48ee57388c
   FirebaseCore: 5743c5785c074a794d35f2fff7ecc254a91e08b1
   FirebaseCoreDiagnostics: 92e07a649aeb66352b319d43bdd2ee3942af84cb

diff --git a/lib/core.dart b/lib/core.dart
@@ -2,7 +2,6 @@ export 'core/cache.dart';
 export 'core/dialogs.dart';
 export 'core/extensions.dart';
 export 'core/models.dart';
-export 'core/modules.dart';
 export 'core/pages.dart';
 export 'core/router.dart';
 export 'core/services.dart';
@@ -14,6 +13,7 @@ export 'database/box.dart';
 export 'database/tables/lunasea.dart';
 export 'system/logger.dart';
 export 'widgets/ui.dart';
+export 'modules.dart';
 export 'vendor.dart'
     hide
         StreamProvider,

diff --git a/lib/core/state/state.dart b/lib/core/state/state.dart
@@ -10,7 +10,7 @@ import 'package:lunasea/modules/overseerr/core/state.dart';
 import 'package:lunasea/modules/sabnzbd/core/state.dart';
 import 'package:lunasea/modules/nzbget/core/state.dart';
 import 'package:lunasea/modules/tautulli/core/state.dart';
-import 'package:lunasea/core/modules.dart';
+import 'package:lunasea/modules.dart';
 
 import 'package:provider/provider.dart';
 

diff --git a/lib/database/tables/lunasea.dart b/lib/database/tables/lunasea.dart
@@ -6,7 +6,7 @@ import 'package:lunasea/core/models/logs/log_type.dart';
 import 'package:lunasea/core/models/types/browser.dart';
 import 'package:lunasea/core/models/types/indexer_icon.dart';
 import 'package:lunasea/core/models/types/list_view_option.dart';
-import 'package:lunasea/core/modules.dart';
+import 'package:lunasea/modules.dart';
 import 'package:lunasea/database/table.dart';
 import 'package:lunasea/vendor.dart';
 import 'package:lunasea/widgets/ui.dart';
@@ -71,14 +71,14 @@ enum LunaSeaDatabase<T> with LunaTableMixin<T> {
   @override
   void import(dynamic value) {
     if (this == LunaSeaDatabase.DEFAULT_LAUNCH_MODULE) {
-      final item = LunaModule.DASHBOARD.fromKey(value.toString());
+      final item = LunaModule.fromKey(value.toString());
       if (item != null) update(item as T);
       return;
     }
     if (this == LunaSeaDatabase.DRAWER_MANUAL_ORDER) {
       List<LunaModule> item = [];
       (value as List).cast<String>().forEach((val) {
-        LunaModule? module = LunaModule.DASHBOARD.fromKey(val);
+        LunaModule? module = LunaModule.fromKey(val);
         if (module != null) item.add(module);
       });
       update(item as T);

diff --git a/lib/firebase/messaging.dart b/lib/firebase/messaging.dart
@@ -80,7 +80,7 @@ class LunaFirebaseMessaging {
     return onMessage.listen((message) {
       if (LunaSeaDatabase.ENABLE_IN_APP_NOTIFICATIONS.read()) return;
 
-      LunaModule? module = LunaModule.DASHBOARD.fromKey(message.data['module']);
+      LunaModule? module = LunaModule.fromKey(message.data['module']);
       showLunaSnackBar(
         title: message.notification?.title ?? 'Unknown Content',
         message: message.notification?.body ?? LunaUI.TEXT_EMDASH,
@@ -112,7 +112,7 @@ class LunaFirebaseMessaging {
   Future<void> _handleWebhook(RemoteMessage? message) async {
     if (message == null || message.data.isEmpty) return;
     // Extract module
-    LunaModule? module = LunaModule.DASHBOARD.fromKey(message.data['module']);
+    LunaModule? module = LunaModule.fromKey(message.data['module']);
     if (module == null) {
       LunaLogger().warning(
         'LunaFirebaseMessaging',