Fix merge issues

Author: HaggitheSecond

.idea/inspectionProfiles/Project_Default.xml

@@ -1,7 +1,6 @@
 import 'dart:convert';
 
 import 'package:menstrudel/models/flows/flow_enum.dart';
-import 'package:menstrudel/models/period_logs/symptom_enum.dart';
 import 'package:sqflite/sqflite.dart';
 import 'package:intl/intl.dart';
 import 'package:flutter/material.dart';
@@ -329,11 +328,8 @@ class Manager {
   /// Validates a list of raw symptoms against the Symptom enum,
   /// filters out invalid entries, and then JSON encodes the resulting list of valid symptoms for database storage.
   String _encodeAndValidateSymptoms(List<dynamic> rawSymptoms) {
-    final validSymptoms = Symptom.values.map((e) => e.name).toSet();
-
     final List<String> filteredSymptoms = rawSymptoms
         .whereType<String>()
-        .where((symptom) => validSymptoms.contains(symptom))
         .toList();
 
     return jsonEncode(filteredSymptoms);

app/lib/database/repositories/periods_repository.dart

@@ -6,18 +6,6 @@ import 'package:menstrudel/models/themes/app_theme_mode_enum.dart';
 enum PeriodHistoryView { list, journal }
 
 class SettingsService {
-  static const String _notificationsEnabledKey = 'notifications_enabled';
-  static const String _notificationDaysKey = 'notification_days';
-  static const _notificationTimeKey = 'notification_time';
-  static const String _periodOverdueNotificationsEnabledKey = 'period_overdue_notifications_enabled';
-  static const String _periodOverdueNotificationDaysKey = 'period_overdue_notification_days';
-  static const _periodOverdueNotificationTimeKey = 'period_overdue_notification_time';
-  static const _biometricEnabledKey = 'biometric_enabled';
-  static const _historyViewKey = 'history_view';
-  static const _dynamicColorKey = 'dynamic_color';
-  static const _themeColorKey = 'theme_color';
-  static const _themeModeKey = 'theme_mode';
-  static const _persistentReminderKey = "always_show_reminder_button";
 
   Future<void> deleteAllSettings() async {
     final SharedPreferences prefs = await SharedPreferences.getInstance();
@@ -135,7 +123,7 @@ class SettingsService {
 
   Future<PeriodHistoryView> getHistoryView() async {
     final prefs = await SharedPreferences.getInstance();
-    final viewName = prefs.getString(_historyViewKey);
+    final viewName = prefs.getString(historyViewKey);
     return PeriodHistoryView.values.firstWhere(
       (e) => e.name == viewName,
       orElse: () => PeriodHistoryView.journal,
@@ -174,7 +162,7 @@ class SettingsService {
 
   Future<Set<String>> getDefaultSymptoms() async {
     final prefs = await SharedPreferences.getInstance();
-    final storedDefaultSymptoms = prefs.getStringList(_defaultSymptomsKey);
+    final storedDefaultSymptoms = prefs.getStringList(defaultSymptomsKey);
 
     if (storedDefaultSymptoms == null || storedDefaultSymptoms.isEmpty) {
       return {"Headache", "Fatigue", "Cramps", "Nausea", "Mood Swings", "Bloating", "Acne", "Back pain"};
@@ -185,7 +173,7 @@ class SettingsService {
 
   Future<void> setDefaultSymptoms(Set<String> symptoms) async {
     final prefs = await SharedPreferences.getInstance();
-    prefs.setStringList(_defaultSymptomsKey, symptoms.toList());
+    prefs.setStringList(defaultSymptomsKey, symptoms.toList());
   }
 
   Future<void> addDefaultSymptom(String symptom) async {

app/lib/services/settings_service.dart

@@ -37,6 +37,7 @@ const String dynamicColorKey = 'dynamic_color';
 const String themeColorKey = 'theme_color';
 const String themeModeKey = 'theme_mode';
 const String persistentReminderKey = "always_show_reminder_button";
+const String defaultSymptomsKey = "default_symptoms";
 
 // Notifications
 const String tamponReminderDateTimeKey = 'tampon_reminder_date_time';