- Strings added to resources.

- Fix for saved data on desktop.
- Clicking on a selected word will reset words selection.
- New isQ extension

Author: alejandro-rios

composeApp/src/commonMain/composeResources/values/strings.xml

@@ -12,4 +12,11 @@
     <string name="label_hint">Give me a hint</string>
     <string name="message_hint">Try with: %s</string>
     <string name="total_words">%1$d words</string>
+    <string name="letter_q">Qu</string>
+    <string name="word_counter_3">3</string>
+    <string name="word_counter_4">4</string>
+    <string name="word_counter_5">5</string>
+    <string name="word_counter_6">6</string>
+    <string name="word_counter_7">7</string>
+    <string name="word_counter_more">8+</string>
 </resources>

composeApp/src/commonMain/kotlin/com/alejandrorios/bogglemultiplatform/App.kt

@@ -48,7 +48,7 @@ internal fun App() {
     }
 }
 
-var appStorage: String? = ""
+var appStorage: String = ""
 
 enum class KotlinPlatform {
     ANDROID, IOS ,WASM, JS, DESKTOP;

composeApp/src/commonMain/kotlin/com/alejandrorios/bogglemultiplatform/ui/components/BoggleBoard.kt

@@ -3,7 +3,6 @@ package com.alejandrorios.bogglemultiplatform.ui.components
 import androidx.compose.animation.core.FastOutLinearInEasing
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.tween
-import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
@@ -36,8 +35,8 @@ import androidx.compose.ui.graphics.drawscope.scale
 import androidx.compose.ui.unit.dp
 import com.alejandrorios.bogglemultiplatform.currentPlatform
 import com.alejandrorios.bogglemultiplatform.ui.screen.BoggleUiState
-import com.alejandrorios.bogglemultiplatform.utils.boggleDieModifier
 import com.alejandrorios.bogglemultiplatform.utils.boggleBoardDragHandler
+import com.alejandrorios.bogglemultiplatform.utils.boggleDieModifier
 
 @Composable
 fun BoggleBoard(
@@ -174,7 +173,6 @@ fun BoggleBoard(
         ) {
             items(state.board.size, key = { it }) { index ->
                 val selected = selectedIds.value.contains(index)
-                val interactionSource = remember { MutableInteractionSource() }
 
                 BoggleDie(
                     letter = state.board[index],
@@ -183,14 +181,14 @@ fun BoggleBoard(
                     modifier = Modifier
                         .rotate(dieRotationAngle)
                         .boggleDieModifier(
-                            interactionSource = interactionSource,
                             onClick = {
-                                selectedIds.value = if (selected) {
-                                    selectedIds.value.minus(index)
+                                if (selected) {
+                                    selectedIds.value = emptySet()
+                                    updateKeys(emptyList(), true)
                                 } else {
-                                    selectedIds.value.plus(index)
+                                    selectedIds.value = selectedIds.value.plus(index)
+                                    updateKeys(selectedIds.value.toList(), true)
                                 }
-                                updateKeys(selectedIds.value.toList(), true)
                             },
                             selectedKeys = selectedIds.value.toList(),
                             index = index

composeApp/src/commonMain/kotlin/com/alejandrorios/bogglemultiplatform/ui/components/BoggleDie.kt

@@ -19,6 +19,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.alejandrorios.bogglemultiplatform.utils.isQ
 
 @Composable
 fun BoggleDie(
@@ -65,7 +66,7 @@ fun BoggleDie(
         ) {
             Text(
                 text = letter,
-                fontSize = if (letter == "Qu") 32.sp else 38.sp,
+                fontSize = if (letter.isQ()) 32.sp else 38.sp,
                 color = getLetterColor(selected),
                 fontWeight = FontWeight.Bold,
                 textAlign = TextAlign.Center,

composeApp/src/commonMain/kotlin/com/alejandrorios/bogglemultiplatform/ui/components/WordCounter.kt

@@ -1,5 +1,6 @@
 package com.alejandrorios.bogglemultiplatform.ui.components
 
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -33,7 +34,9 @@ fun WordCounter(
     wordPair: WordPair,
     onWordClick: (String) -> Unit,
 ) {
-    if (wordPair.wordsTotal != 0) {
+    AnimatedVisibility(
+        visible = wordPair.wordsTotal != 0,
+    ) {
         val progress = wordPair.wordsFound.size / wordPair.wordsTotal.toFloat()
         val animatedProgress = animateFloatAsState(
             targetValue = progress,

composeApp/src/commonMain/kotlin/com/alejandrorios/bogglemultiplatform/ui/components/WordCounterRow.kt

@@ -9,7 +9,15 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import boggle_multiplatform.composeapp.generated.resources.Res
+import boggle_multiplatform.composeapp.generated.resources.word_counter_3
+import boggle_multiplatform.composeapp.generated.resources.word_counter_4
+import boggle_multiplatform.composeapp.generated.resources.word_counter_5
+import boggle_multiplatform.composeapp.generated.resources.word_counter_6
+import boggle_multiplatform.composeapp.generated.resources.word_counter_7
+import boggle_multiplatform.composeapp.generated.resources.word_counter_more
 import com.alejandrorios.bogglemultiplatform.data.models.WordsCount
+import org.jetbrains.compose.resources.stringResource
 
 @Composable
 fun WordCounterRow(
@@ -22,32 +30,32 @@ fun WordCounterRow(
         horizontalArrangement = Arrangement.Center
     ) {
         WordCounter(
-            numberOfLetters = "3",
+            numberOfLetters = stringResource(Res.string.word_counter_3),
             wordPair = wordsCount.threeLetters,
             onWordClick = { onWordClick(it) },
         )
         WordCounter(
-            numberOfLetters = "4",
+            numberOfLetters = stringResource(Res.string.word_counter_4),
             wordPair = wordsCount.fourLetters,
             onWordClick = { onWordClick(it) },
         )
         WordCounter(
-            numberOfLetters = "5",
+            numberOfLetters = stringResource(Res.string.word_counter_5),
             wordPair = wordsCount.fiveLetters,
             onWordClick = { onWordClick(it) },
         )
         WordCounter(
-            numberOfLetters = "6",
+            numberOfLetters = stringResource(Res.string.word_counter_6),
             wordPair = wordsCount.sixLetters,
             onWordClick = { onWordClick(it) },
         )
         WordCounter(
-            numberOfLetters = "7",
+            numberOfLetters = stringResource(Res.string.word_counter_7),
             wordPair = wordsCount.sevenLetters,
             onWordClick = { onWordClick(it) },
         )
         WordCounter(
-            numberOfLetters = "8+",
+            numberOfLetters = stringResource(Res.string.word_counter_more),
             wordPair = wordsCount.moreThanSevenLetters,
             onWordClick = { onWordClick(it) },
         )

composeApp/src/commonMain/kotlin/com/alejandrorios/bogglemultiplatform/utils/Extensions.kt

@@ -2,10 +2,14 @@ package com.alejandrorios.bogglemultiplatform.utils
 
 import androidx.compose.foundation.lazy.grid.LazyGridItemInfo
 import androidx.compose.foundation.lazy.grid.LazyGridState
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.unit.round
 import androidx.compose.ui.unit.toIntRect
 import androidx.compose.ui.unit.toOffset
+import boggle_multiplatform.composeapp.generated.resources.Res
+import boggle_multiplatform.composeapp.generated.resources.letter_q
+import org.jetbrains.compose.resources.stringResource
 import kotlin.math.abs
 
 /**
@@ -47,3 +51,6 @@ fun LazyGridState.gridItemKeyAtPosition(hitPoint: Offset): LazyGridItemInfo? =
 
 // Extension function to get the die key
 fun LazyGridItemInfo.dieKey(): Int = this.key as Int
+
+@Composable
+fun String.isQ(): Boolean = this == stringResource(Res.string.letter_q)

composeApp/src/commonMain/kotlin/com/alejandrorios/bogglemultiplatform/utils/Modifiers.kt

@@ -4,7 +4,9 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.gestures.detectDragGestures
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.lazy.grid.LazyGridState
+import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.input.pointer.pointerInput
@@ -99,8 +101,9 @@ fun Modifier.boggleBoardDragHandler(
  * @param index The index of the die.
  * @return The modifier.
  */
+@Composable
 fun Modifier.boggleDieModifier(
-    interactionSource: MutableInteractionSource,
+    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
     onClick: () -> Unit,
     selectedKeys: List<Int>,
     index: Int

composeApp/src/desktopMain/kotlin/main.kt

@@ -5,6 +5,8 @@ import androidx.compose.ui.window.application
 import androidx.compose.ui.window.rememberWindowState
 import com.alejandrorios.bogglemultiplatform.App
 import com.alejandrorios.bogglemultiplatform.appStorage
+import kotlinx.io.files.Path
+import kotlinx.io.files.SystemFileSystem
 import net.harawata.appdirs.AppDirsFactory
 
 fun main() {
@@ -13,6 +15,10 @@ fun main() {
         appStorage = AppDirsFactory.getInstance()
             .getUserDataDir("com.alejandrorios.bogglemultiplatform", "1.0.0", "alejandrorios")
 
+        with(SystemFileSystem) {
+            if (!exists(Path(appStorage))) createDirectories(Path("${appStorage}/saved.json"))
+        }
+
         Window(
             title = "Boggle Multiplatform",
             state = windowState,