Revert "Possible iOS fix?"

This reverts commit 3c0686f.
Wavesonics · Aug 31, 2023 · 1ab6a99 · 1ab6a99
1 parent 3c0686f
commit 1ab6a99
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 19 deletions.
diff --git a/...rkrockstudios/apps/hammer/common/components/projectselection/projectslist/ProjectsList.kt b/...rkrockstudios/apps/hammer/common/components/projectselection/projectslist/ProjectsList.kt
@@ -3,15 +3,12 @@ package com.darkrockstudios.apps.hammer.common.components.projectselection.proje
 import com.arkivanov.decompose.value.Value
 import com.arkivanov.essenty.parcelable.Parcelable
 import com.arkivanov.essenty.parcelable.Parcelize
-import com.arkivanov.essenty.parcelable.TypeParceler
 import com.darkrockstudios.apps.hammer.common.components.projecteditor.metadata.ProjectMetadata
 import com.darkrockstudios.apps.hammer.common.components.projectselection.ProjectData
 import com.darkrockstudios.apps.hammer.common.data.ProjectDef
 import com.darkrockstudios.apps.hammer.common.data.projectsync.SyncLogMessage
 import com.darkrockstudios.apps.hammer.common.dependencyinjection.HammerComponent
 import com.darkrockstudios.apps.hammer.common.fileio.HPath
-import com.darkrockstudios.apps.hammer.common.parcelize.StringResourceParceler
-import dev.icerock.moko.resources.StringResource
 
 interface ProjectsList : HammerComponent {
 	val state: Value<State>
@@ -30,15 +27,14 @@ interface ProjectsList : HammerComponent {
 	fun onProjectNameUpdate(newProjectName: String)
 
 	@Parcelize
-	@TypeParceler<StringResource, StringResourceParceler>()
 	data class State(
 		val projects: List<ProjectData> = mutableListOf(),
 		val projectsPath: HPath,
 		val isServerSynced: Boolean = false,
 		val syncState: SyncState = SyncState(),
 		val showCreateDialog: Boolean = false,
 		val createDialogProjectName: String = "",
-		val toast: StringResource? = null
+		val toast: String? = null
 	) : Parcelable
 
 	@Parcelize

diff --git a/...dios/apps/hammer/common/components/projectselection/projectslist/ProjectsListComponent.kt b/...dios/apps/hammer/common/components/projectselection/projectslist/ProjectsListComponent.kt
@@ -58,7 +58,7 @@ class ProjectsListComponent(
 
 	private fun showToast(message: StringResource) {
 		_state.getAndUpdate {
-			it.copy(toast = message)
+			it.copy(toast = strRes.get(message))
 		}
 	}
 
@@ -183,7 +183,7 @@ class ProjectsListComponent(
 			(result.exceptionOrNull() as? ProjectCreationFailedException)?.errorMessage?.let { message ->
 				_state.getAndUpdate {
 					it.copy(
-						toast = message
+						toast = strRes.get(message)
 					)
 				}
 			}

diff --git a/common/src/iosMain/kotlin/com/darkrockstudios/apps/hammer/common/parcelize/parcelize.kt b/common/src/iosMain/kotlin/com/darkrockstudios/apps/hammer/common/parcelize/parcelize.kt
@@ -3,18 +3,7 @@ package com.darkrockstudios.apps.hammer.common.parcelize
 import com.arkivanov.essenty.parcelable.Parceler
 import dev.icerock.moko.resources.StringResource
 import kotlinx.datetime.Instant
-import platform.Foundation.NSCoder
 
 internal actual object InstantParceler : Parceler<Instant>
 
-internal actual object StringResourceParceler : Parceler<StringResource> {
-	override fun create(coder: NSCoder): StringResource {
-		val id = coder.decodeStringForKey(key = "stringResource")
-		return StringResource(resourceId = id)
-	}
-
-
-	override fun StringResource.write(coder: NSCoder) {
-		coder.encodeString(value = resourceId, forKey = "stringResource")
-	}
-}
+internal actual object StringResourceParceler : Parceler<StringResource>