migration fixes

Tiebe · Jan 30, 2024 · 46c9e4f · 46c9e4f
1 parent dbf08f3
commit 46c9e4f
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 16 deletions.
diff --git a/shared/src/commonMain/kotlin/nl/tiebe/otarium/logic/root/RootComponent.kt b/shared/src/commonMain/kotlin/nl/tiebe/otarium/logic/root/RootComponent.kt
@@ -1,6 +1,7 @@
 package nl.tiebe.otarium.logic.root
 
 import com.arkivanov.decompose.value.Value
+import kotlinx.serialization.Serializable
 import nl.tiebe.otarium.logic.root.home.HomeComponent
 import nl.tiebe.otarium.logic.root.login.LoginComponent
 import nl.tiebe.otarium.logic.root.onboarding.OnboardingComponent

diff --git a/...commonMain/kotlin/nl/tiebe/otarium/logic/root/home/children/averages/AveragesComponent.kt b/...commonMain/kotlin/nl/tiebe/otarium/logic/root/home/children/averages/AveragesComponent.kt
@@ -32,8 +32,10 @@ interface AveragesComponent : HomeComponent.MenuItemComponent, BackHandlerOwner
 
     @Serializable
     sealed class Config {
-        object List : Config()
+        @Serializable
+        data object List : Config()
 
+        @Serializable
         data class Subject(val subjectId: Int) : Config()
     }
 

diff --git a/shared/src/commonMain/kotlin/nl/tiebe/otarium/logic/root/home/children/elo/ELOComponent.kt b/shared/src/commonMain/kotlin/nl/tiebe/otarium/logic/root/home/children/elo/ELOComponent.kt
@@ -8,11 +8,10 @@ import nl.tiebe.otarium.logic.root.home.children.elo.children.learningresources.
 import nl.tiebe.otarium.logic.root.home.children.elo.children.studyguides.StudyGuidesChildComponent
 
 interface ELOComponent : HomeComponent.MenuItemComponent {
-    @Serializable
     sealed class ELOChild(val id: Int) {
-        object StudyGuides : ELOChild(0)
-        object Assignments : ELOChild(1)
-        object LearningResources : ELOChild(2)
+        data object StudyGuides : ELOChild(0)
+        data object Assignments : ELOChild(1)
+        data object LearningResources : ELOChild(2)
 
     }
 

diff --git a/...be/otarium/logic/root/home/children/elo/children/assignments/AssignmentsChildComponent.kt b/...be/otarium/logic/root/home/children/elo/children/assignments/AssignmentsChildComponent.kt
@@ -29,8 +29,9 @@ interface AssignmentsChildComponent : ELOComponent.ELOChildComponent {
 
     @Serializable
     sealed class Config {
-        object AssignmentList : Config()
-
+        @Serializable
+        data object AssignmentList : Config()
+        @Serializable
         data class Assignment(val assignmentLink: String) : Config()
     }
 

diff --git a/...be/otarium/logic/root/home/children/elo/children/studyguides/StudyGuidesChildComponent.kt b/...be/otarium/logic/root/home/children/elo/children/studyguides/StudyGuidesChildComponent.kt
@@ -32,8 +32,10 @@ interface StudyGuidesChildComponent : ELOComponent.ELOChildComponent {
 
     @Serializable
     sealed class Config {
-        object StudyGuideList : Config()
+        @Serializable
+        data object StudyGuideList : Config()
 
+        @Serializable
         data class StudyGuide(val studyGuideLink: String) : Config()
     }
 

diff --git a/...commonMain/kotlin/nl/tiebe/otarium/logic/root/home/children/messages/MessagesComponent.kt b/...commonMain/kotlin/nl/tiebe/otarium/logic/root/home/children/messages/MessagesComponent.kt
@@ -49,12 +49,13 @@ interface MessagesComponent: HomeComponent.MenuItemComponent, BackHandlerOwner {
 
     @Serializable
     sealed class Config {
+        @Serializable
         data class Folder(val folderId: Int) : Config()
-
+        @Serializable
         data class Message(val messageLink: String) : Config()
-
+        @Serializable
         data class ReceiverInfo(val messageLink: String, val receiverType: ReceiverInfoComponent.ReceiverType) : Config()
-
+        @Serializable
         data class Compose(val receivers: List<String>, val subject: String, val body: String) : Config()
     }
 

diff --git a/...commonMain/kotlin/nl/tiebe/otarium/logic/root/home/children/settings/SettingsComponent.kt b/...commonMain/kotlin/nl/tiebe/otarium/logic/root/home/children/settings/SettingsComponent.kt
@@ -38,11 +38,14 @@ interface SettingsComponent: HomeComponent.MenuItemComponent, BackHandlerOwner {
 
     @Serializable
     sealed class Config(val localizedString: String) {
-        object Main : Config(getLocalizedString(MR.strings.settingsItem))
+        @Serializable
+        data object Main : Config(getLocalizedString(MR.strings.settingsItem))
 
-        object UI : Config(getLocalizedString(MR.strings.ui_settings))
+        @Serializable
+        data object UI : Config(getLocalizedString(MR.strings.ui_settings))
 
-        object Colors : Config(getLocalizedString(MR.strings.color_settings))
+        @Serializable
+        data object Colors : Config(getLocalizedString(MR.strings.color_settings))
     }
 
     fun selectAccount(account: MagisterAccount)

diff --git a/...Main/kotlin/nl/tiebe/otarium/logic/root/home/children/timetable/TimetableRootComponent.kt b/...Main/kotlin/nl/tiebe/otarium/logic/root/home/children/timetable/TimetableRootComponent.kt
@@ -30,8 +30,9 @@ interface TimetableRootComponent : HomeComponent.MenuItemComponent, BackHandlerO
 
     @Serializable
     sealed class Config {
-        object Main : Config()
-
+        @Serializable
+        data object Main : Config()
+        @Serializable
         data class TimetablePopup(val item: AgendaItemWithAbsence) : Config()
     }