Skip to content

Commit

Permalink
[Mosaic] Add alphabet in Mosaic version (fixes #16)
Browse files Browse the repository at this point in the history
  • Loading branch information
opatry committed Jan 3, 2024
1 parent 4bb9df4 commit efed056
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/*
* 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.component

import androidx.compose.runtime.Composable
import com.jakewharton.mosaic.ui.Column
import com.jakewharton.mosaic.ui.Row
import net.opatry.game.wordle.AnswerFlag

@Composable
fun Alphabet(alphabet: Map<Char, AnswerFlag>) {
Column {
alphabet.keys.chunked(9).forEach { row ->
Row {
row.forEach { letter ->
WordleCharCell(letter, alphabet[letter]!!)
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@ import androidx.compose.runtime.Composable
import com.jakewharton.mosaic.ui.Column
import com.jakewharton.mosaic.ui.Text
import com.jakewharton.mosaic.runMosaic
import com.jakewharton.mosaic.ui.Row
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import net.opatry.game.wordle.State
import net.opatry.game.wordle.WordleRules
import net.opatry.game.wordle.mosaic.component.WordleGrid
import net.opatry.game.wordle.mosaic.component.Alphabet
import net.opatry.game.wordle.ui.WordleViewModel
import org.jline.terminal.TerminalBuilder

Expand Down Expand Up @@ -80,7 +82,12 @@ fun GameScreen(viewModel: WordleViewModel) {
Column {
Text("")

WordleGrid(viewModel.grid)
Row {
Text(" ")
WordleGrid(viewModel.grid)
Text(" ")
Alphabet(viewModel.alphabet)
}

when (val state = viewModel.state) {
is State.Won -> {
Expand Down

0 comments on commit efed056

Please sign in to comment.