Improvements
try to make it run on Android (still unsuccessful)
This commit is contained in:
@@ -19,6 +19,7 @@ import androidx.compose.material3.CardDefaults
|
||||
import androidx.compose.material3.HorizontalDivider
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.OutlinedCard
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.getValue
|
||||
@@ -29,6 +30,8 @@ import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.alpha
|
||||
import androidx.compose.ui.draw.shadow
|
||||
import androidx.compose.ui.input.pointer.PointerButton.Companion.Secondary
|
||||
import androidx.compose.ui.unit.TextUnit
|
||||
import androidx.compose.ui.unit.TextUnitType
|
||||
import androidx.compose.ui.unit.dp
|
||||
import ch.dissem.yaep.domain.Clue
|
||||
import ch.dissem.yaep.domain.Game
|
||||
@@ -62,6 +65,7 @@ class DisplayClue<C : Clue>(val clue: C) {
|
||||
fun App(modifier: Modifier = Modifier, game: Game = remember { generateGame() }) {
|
||||
val horizontalClues = remember { game.horizontalClues.map { DisplayClue(it) } }
|
||||
val verticalClues = remember { game.verticalClues.map { DisplayClue(it) } }
|
||||
val time = "00:00:00" // TODO
|
||||
Row(modifier = modifier) {
|
||||
PuzzleGrid(
|
||||
modifier = Modifier.aspectRatio(1f).weight(0.6f).fillMaxHeight(),
|
||||
@@ -71,11 +75,17 @@ fun App(modifier: Modifier = Modifier, game: Game = remember { generateGame() })
|
||||
verticalClues.forEach { it.update(game.grid) }
|
||||
}
|
||||
)
|
||||
PuzzleClues(
|
||||
modifier = Modifier.padding(start = 16.dp).weight(0.4f).fillMaxHeight(),
|
||||
horizontalClues,
|
||||
verticalClues
|
||||
)
|
||||
Column(
|
||||
modifier = Modifier.padding(start = 16.dp).weight(0.4f).fillMaxHeight()
|
||||
) {
|
||||
PuzzleClues(
|
||||
modifier = Modifier,
|
||||
horizontalClues,
|
||||
verticalClues
|
||||
)
|
||||
|
||||
Text(time, fontSize = TextUnit(4f, TextUnitType.Em))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user