Improve package structure, refactor Manage Symptoms Screen

app/src/main/java/com/mensinator/app/App.kt

@@ -1,8 +1,10 @@
 package com.mensinator.app
 
 import android.app.Application
+import com.mensinator.app.business.*
 import com.mensinator.app.settings.SettingsViewModel
 import com.mensinator.app.statistics.StatisticsViewModel
+import com.mensinator.app.symptoms.ManageSymptomsViewModel
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 import org.koin.core.context.startKoin
@@ -22,6 +24,7 @@ class App : Application() {
         singleOf(::ExportImport) { bind<IExportImport>() }
         singleOf(::NotificationScheduler) { bind<INotificationScheduler>() }
 
+        viewModel { ManageSymptomsViewModel(get()) }
         viewModel { SettingsViewModel(get(), get(), get()) }
         viewModel { StatisticsViewModel(get(), get(), get(), get(), get()) }
     }

app/src/main/java/com/mensinator/app/MainActivity.kt

@@ -8,7 +8,7 @@ import android.view.WindowManager
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
-import com.mensinator.app.navigation.MensinatorApp
+import com.mensinator.app.ui.navigation.MensinatorApp
 import com.mensinator.app.ui.theme.MensinatorTheme
 
 class MainActivity : AppCompatActivity() {

app/src/main/java/com/mensinator/app/CalculationsHelper.kt → app/src/main/java/com/mensinator/app/business/CalculationsHelper.kt

@@ -1,4 +1,4 @@
-package com.mensinator.app
+package com.mensinator.app.business
 
 import android.util.Log
 import com.mensinator.app.extensions.roundToTwoDecimalPoints

app/src/main/java/com/mensinator/app/DatabaseUtils.kt → app/src/main/java/com/mensinator/app/business/DatabaseUtils.kt

@@ -1,4 +1,4 @@
-package com.mensinator.app
+package com.mensinator.app.business
 
 import android.database.sqlite.SQLiteDatabase
 

app/src/main/java/com/mensinator/app/ExportImport.kt → app/src/main/java/com/mensinator/app/business/ExportImport.kt

@@ -1,4 +1,4 @@
-package com.mensinator.app
+package com.mensinator.app.business
 
 import android.content.ContentValues
 import android.content.Context

app/src/main/java/com/mensinator/app/ICalculationsHelper.kt → app/src/main/java/com/mensinator/app/business/ICalculationsHelper.kt

@@ -1,4 +1,4 @@
-package com.mensinator.app
+package com.mensinator.app.business
 
 import java.time.LocalDate
 

app/src/main/java/com/mensinator/app/IExportImport.kt → app/src/main/java/com/mensinator/app/business/IExportImport.kt

@@ -1,4 +1,4 @@
-package com.mensinator.app
+package com.mensinator.app.business
 
 interface IExportImport {
     fun getDocumentsExportFilePath(): String

app/src/main/java/com/mensinator/app/INotificationScheduler.kt → app/src/main/java/com/mensinator/app/business/INotificationScheduler.kt

@@ -1,4 +1,4 @@
-package com.mensinator.app
+package com.mensinator.app.business
 
 import java.time.LocalDate
 

app/src/main/java/com/mensinator/app/IOvulationPrediction.kt → app/src/main/java/com/mensinator/app/business/IOvulationPrediction.kt

@@ -1,4 +1,4 @@
-package com.mensinator.app
+package com.mensinator.app.business
 
 import java.time.LocalDate
 

app/src/main/java/com/mensinator/app/IPeriodDatabaseHelper.kt → app/src/main/java/com/mensinator/app/business/IPeriodDatabaseHelper.kt

@@ -1,7 +1,9 @@
-package com.mensinator.app
+package com.mensinator.app.business
 
 import android.database.sqlite.SQLiteDatabase
 import androidx.annotation.WorkerThread
+import com.mensinator.app.data.Symptom
+import com.mensinator.app.data.Setting
 import java.time.LocalDate
 
 interface IPeriodDatabaseHelper {
@@ -39,7 +41,7 @@ interface IPeriodDatabaseHelper {
     fun updateSymptomDate(dates: List<LocalDate>, symptomId: List<Int>)
 
     // This function is used to get symptoms for a given date
-    fun getSymptomsFromDate(date: LocalDate): List<Int>
+    fun getActiveSymptomIdsForDate(date: LocalDate): List<Int>
 
     fun getSymptomColorForDate(date: LocalDate): List<String>
 

app/src/main/java/com/mensinator/app/IPeriodPrediction.kt → app/src/main/java/com/mensinator/app/business/IPeriodPrediction.kt

@@ -1,4 +1,4 @@
-package com.mensinator.app
+package com.mensinator.app.business
 
 import java.time.LocalDate
 

app/src/main/java/com/mensinator/app/NotificationScheduler.kt → app/src/main/java/com/mensinator/app/business/NotificationScheduler.kt

@@ -1,4 +1,4 @@
-package com.mensinator.app
+package com.mensinator.app.business
 
 
 import android.app.AlarmManager
@@ -7,6 +7,7 @@ import android.content.Context
 import android.content.Intent
 import android.util.Log
 import androidx.core.app.NotificationManagerCompat
+import com.mensinator.app.NotificationReceiver
 import java.time.LocalDate
 import java.time.ZoneId
 

app/src/main/java/com/mensinator/app/OvulationPrediction.kt → app/src/main/java/com/mensinator/app/business/OvulationPrediction.kt

@@ -1,4 +1,4 @@
-package com.mensinator.app
+package com.mensinator.app.business
 
 import android.util.Log
 import java.time.LocalDate