fix: Handle gameScore as nullable

Gimbergsson · Jan 16, 2025 · b266c29 · b266c29
1 parent 02baea1
commit b266c29
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/androidos/src/main/java/se/dennisgimbergsson/tennisscoreboard/services/ScoreboardWorker.kt b/androidos/src/main/java/se/dennisgimbergsson/tennisscoreboard/services/ScoreboardWorker.kt
@@ -12,6 +12,7 @@ import com.google.android.gms.wearable.DataMapItem
 import com.google.android.gms.wearable.Wearable
 import com.google.gson.GsonBuilder
 import se.dennisgimbergsson.shared.data.models.Scoreboard
+import se.dennisgimbergsson.shared.enums.GameScores
 import se.dennisgimbergsson.shared.extensions.logAndroidMessage
 import se.dennisgimbergsson.shared.utils.Constants
 
@@ -43,10 +44,15 @@ class ScoreboardWorker(
             if (event.type == TYPE_CHANGED) {
                 event.dataItem.also { item ->
                     if (item.uri.path?.compareTo(Constants.Paths.SCOREBOARD_UPDATE) == 0) {
-                        val scoreboard = getScoreboardUpdate(DataMapItem.fromDataItem(item).dataMap)
+                        val scoreboard =
+                            getScoreboardUpdate(DataMapItem.fromDataItem(item).dataMap)
+                        val homeGameScore =
+                            scoreboard.homeScore.gameScore?.score ?: GameScores.ZERO.score
+                        val awayGameScore =
+                            scoreboard.awayScore.gameScore?.score ?: GameScores.ZERO.score
                         Toast.makeText(
                             applicationContext,
-                            "Score: ${scoreboard.homeScore.gameScore.score} - ${scoreboard.awayScore.gameScore.score}",
+                            "Score: $homeGameScore - $awayGameScore",
                             Toast.LENGTH_SHORT
                         ).show()
                         logAndroidMessage("Score: ${scoreboard.homeScore} - ${scoreboard.awayScore}")

diff --git a/shared/src/main/java/se/dennisgimbergsson/shared/data/models/Score.kt b/shared/src/main/java/se/dennisgimbergsson/shared/data/models/Score.kt
@@ -4,7 +4,7 @@ import se.dennisgimbergsson.shared.enums.GameScores
 import se.dennisgimbergsson.shared.enums.GameScores.ZERO
 
 data class Score(
-    var gameScore: GameScores = ZERO,
+    var gameScore: GameScores? = ZERO,
     var wonGames: Int = 0,
     var wonSets: Int = 0
 ) {

diff --git a/wearos/src/main/java/se/dennisgimbergsson/tennisscoreboard/ui/screens/MainViewModel.kt b/wearos/src/main/java/se/dennisgimbergsson/tennisscoreboard/ui/screens/MainViewModel.kt
@@ -112,6 +112,7 @@ class MainViewModel @Inject constructor(
                                 currentAwayGameScore = ZERO
                                 ZERO
                             }
+                            else -> ZERO
                         }
                     }
 
@@ -141,6 +142,7 @@ class MainViewModel @Inject constructor(
                                 currentAwayGameScore = ZERO
                                 ZERO
                             }
+                            else -> ZERO
                         }
                     }
                 }
@@ -178,6 +180,7 @@ class MainViewModel @Inject constructor(
                                 homeGameScore = ZERO
                                 ZERO
                             }
+                            else -> ZERO
                         }
                     }
 
@@ -269,6 +272,7 @@ class MainViewModel @Inject constructor(
                     THIRTY -> FIFTEEN
                     FORTY -> THIRTY
                     ADVANTAGE -> FORTY
+                    else -> ZERO
                 }
             }
 
@@ -285,6 +289,7 @@ class MainViewModel @Inject constructor(
                     THIRTY -> FIFTEEN
                     FORTY -> THIRTY
                     ADVANTAGE -> FORTY
+                    else -> ZERO
                 }
             }
         }

diff --git a/wearos/src/main/java/se/dennisgimbergsson/tennisscoreboard/ui/views/ScoreboardView.kt b/wearos/src/main/java/se/dennisgimbergsson/tennisscoreboard/ui/views/ScoreboardView.kt
@@ -28,6 +28,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.core.graphics.drawable.toBitmap
 import androidx.wear.input.WearableButtons
+import se.dennisgimbergsson.shared.enums.GameScores
 import se.dennisgimbergsson.shared.utils.WearPreview
 import se.dennisgimbergsson.tennisscoreboard.R
 import se.dennisgimbergsson.tennisscoreboard.ui.screens.MainViewState
@@ -102,7 +103,7 @@ fun ScoreboardView(
             Text(
                 modifier = Modifier
                     .padding(end = 8.dp),
-                text = stringResource(id = state.scoreboard.homeScore.gameScore.stringResource),
+                text = stringResource(id = state.scoreboard.homeScore.gameScore?.stringResource ?: GameScores.ZERO.stringResource),
                 color = Color.White,
                 textAlign = TextAlign.End,
                 fontSize = 32.sp,
@@ -190,7 +191,7 @@ fun ScoreboardView(
             Text(
                 modifier = Modifier
                     .padding(start = 8.dp),
-                text = stringResource(id = state.scoreboard.awayScore.gameScore.stringResource),
+                text = stringResource(id = state.scoreboard.awayScore.gameScore?.stringResource ?: GameScores.ZERO.stringResource),
                 color = Color.White,
                 textAlign = TextAlign.Start,
                 fontSize = 32.sp,