Merge pull request #9 from zsoltk/parcelable-puzzle-piece

Make PuzzlePiece Parcelable
bumble-tech · Sep 27, 2023 · 98a39ff · 98a39ff
2 parents bc96b14 + c0ad2d0
commit 98a39ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/shared/src/commonMain/kotlin/com/bumble/puzzyx/model/PuzzlePiece.kt b/shared/src/commonMain/kotlin/com/bumble/puzzyx/model/PuzzlePiece.kt
@@ -1,7 +1,11 @@
 package com.bumble.puzzyx.model
 
+import com.bumble.appyx.utils.multiplatform.Parcelable
+import com.bumble.appyx.utils.multiplatform.Parcelize
+
+@Parcelize
 data class PuzzlePiece(
     val i: Int,
     val j: Int,
-    val entry: Entry
-)
+    val entryId: Int
+) : Parcelable
diff --git a/shared/src/commonMain/kotlin/com/bumble/puzzyx/node/puzzle1/Puzzle1Node.kt b/shared/src/commonMain/kotlin/com/bumble/puzzyx/node/puzzle1/Puzzle1Node.kt
@@ -67,7 +67,7 @@ class Puzzle1Node(
                 PuzzlePiece(
                     i = shuffledIdx % columns,
                     j = shuffledIdx / columns,
-                    entry = puzzle1Entries[sequentialIdx]
+                    entryId = sequentialIdx
                 )
             },
         savedStateMap = buildContext.savedStateMap,
@@ -105,7 +105,7 @@ class Puzzle1Node(
                                 .fillMaxSize()
                                 .background(color),
                             // TODO decide on the fate of this
-                            puzzlePiece.entry as? Entry.Text ?: Entry.Text(Puzzle.PUZZLE1, "n/a")
+                            entry = puzzle1Entries[puzzlePiece.entryId] as? Entry.Text ?: Entry.Text(Puzzle.PUZZLE1, "n/a")
                         )
                     }
                 )