From d014b084565fdeeb17811d2e88887ca0ac334dd3 Mon Sep 17 00:00:00 2001
From: Olivier Patry <olivier.patry@gmail.com>
Date: Mon, 10 Jan 2022 11:42:38 +0100
Subject: [PATCH] [Mosaic] Extract Mosaic GameScreen composable in its own file

---
 .../opatry/game/wordle/mosaic/gameScreen.kt   | 72 +++++++++++++++++++
 .../game/wordle/mosaic/wordleComposeMosaic.kt | 39 ----------
 2 files changed, 72 insertions(+), 39 deletions(-)
 create mode 100644 wordle-compose-mosaic/src/main/java/net/opatry/game/wordle/mosaic/gameScreen.kt

diff --git a/wordle-compose-mosaic/src/main/java/net/opatry/game/wordle/mosaic/gameScreen.kt b/wordle-compose-mosaic/src/main/java/net/opatry/game/wordle/mosaic/gameScreen.kt
new file mode 100644
index 0000000..9ff226f
--- /dev/null
+++ b/wordle-compose-mosaic/src/main/java/net/opatry/game/wordle/mosaic/gameScreen.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2022 Olivier Patry
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package net.opatry.game.wordle.mosaic
+
+import androidx.compose.runtime.Composable
+import com.jakewharton.mosaic.Column
+import com.jakewharton.mosaic.Row
+import com.jakewharton.mosaic.Text
+import net.opatry.game.wordle.State
+import net.opatry.game.wordle.mosaic.component.Alphabet
+import net.opatry.game.wordle.mosaic.component.WordleGrid
+import net.opatry.game.wordle.ui.WordleViewModel
+
+
+@Composable
+fun GameScreen(viewModel: WordleViewModel) {
+    Column {
+        Text("")
+
+        Row {
+            Text("    ")
+            WordleGrid(viewModel.grid)
+            Text("            ")
+            Alphabet(viewModel.alphabet)
+        }
+
+        when (val state = viewModel.state) {
+            is State.Won -> {
+                Text("Wordle ${state.wordleId} ${state.answers.size}/${state.maxTries}")
+                Text(viewModel.answer)
+            }
+            is State.Lost -> {
+                Text("Wordle ${state.wordleId} X/${state.maxTries}")
+                Text(viewModel.answer)
+            }
+            is State.Playing -> {
+                Text(" ➡️ Enter a 5 letter english word")
+                Text("") // TODO display error here if any or define a placeholder on top of grid
+            }
+        }
+
+//        viewModel.state.toClipboard()
+//        println("Results copied to clipboard!")
+
+        // there must be stable number of lines for nice UI state
+        if (viewModel.state !is State.Playing) {
+            Text(" 🔄 Play again? (y/N)? ${viewModel.userInput}")
+        } else {
+            Text("")
+        }
+    }
+}
diff --git a/wordle-compose-mosaic/src/main/java/net/opatry/game/wordle/mosaic/wordleComposeMosaic.kt b/wordle-compose-mosaic/src/main/java/net/opatry/game/wordle/mosaic/wordleComposeMosaic.kt
index 6f4e398..191980f 100644
--- a/wordle-compose-mosaic/src/main/java/net/opatry/game/wordle/mosaic/wordleComposeMosaic.kt
+++ b/wordle-compose-mosaic/src/main/java/net/opatry/game/wordle/mosaic/wordleComposeMosaic.kt
@@ -104,42 +104,3 @@ fun main() = runMosaic {
         }
     }
 }
-
-@Composable
-fun GameScreen(viewModel: WordleViewModel) {
-    Column {
-        Text("")
-
-        Row {
-            Text("            ")
-            WordleGrid(viewModel.grid)
-            Text("            ")
-            Alphabet(viewModel.alphabet)
-        }
-
-        when (val state = viewModel.state) {
-            is State.Won -> {
-                Text("Wordle ${state.wordleId} ${state.answers.size}/${state.maxTries}")
-                Text(viewModel.answer)
-            }
-            is State.Lost -> {
-                Text("Wordle ${state.wordleId} X/${state.maxTries}")
-                Text(viewModel.answer)
-            }
-            is State.Playing -> {
-                Text(" ➡️ Enter a 5 letter english word")
-                Text("") // TODO display error here if any or define a placeholder on top of grid
-            }
-        }
-
-//        viewModel.state.toClipboard()
-//        println("Results copied to clipboard!")
-
-        // there must be stable number of lines for nice UI state
-        if (viewModel.state !is State.Playing) {
-            Text(" 🔄 Play again? (y/N)? ${viewModel.userInput}")
-        } else {
-            Text("")
-        }
-    }
-}