coastercast/Quiztable
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Store question answers for review

Browse source
This commit is contained in:
Oliver Rümpelein 2021-08-19 12:18:23 +02:00
parent fe7d40c4f0
commit 5a5f0e16a4
5 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/kotlin/GameBoard.kt
View file

@ -17,6 +17,7 @@ fun GameBoard(
reviewModeActive: Boolean,
secondRoundDouble: Boolean,
playerPointMap: Map<Player, Long>,
questionsResolved: Map<QuestionData, QuestionResolution>,
onDisableReviewMode: () -> Unit,
onPointsChange: (Player, Long) -> Unit,
onQuestionDone: (QuestionData, QuestionResolution) -> Unit,
@ -43,6 +44,7 @@ fun GameBoard(
QuestionGrid(
game,
secondRoundDouble,
questionsResolved,
onResolveQuestion = onQuestionDone,
onPointsChange = onPointsChange
)

1
src/main/kotlin/Main.kt
View file

@ -137,6 +137,7 @@ fun main() = application {
reviewModeActive,
secondRoundDouble,
playerPointMap,
questionsResolved,
onDisableReviewMode = { reviewModeActive = false },
onPointsChange = { player, points ->
playerPointMap[player] = playerPointMap[player]?.plus(points) ?: 0

7
src/main/kotlin/components/Question.kt
View file

@ -29,23 +29,23 @@ fun Question(
secondRoundDouble: Boolean,
players: List<Player>,
topic: Topic,
questionResolved: QuestionResolution,
heightFraction: Float,
color: Color,
onPointsChange: (Player, Long) -> Unit,
onResolve: (QuestionData, QuestionResolution) -> Unit
) {
var questionVisible by remember { mutableStateOf(false) }
var questionResolution by remember { mutableStateOf(QuestionResolution(false, null)) }
var pointsButtonActive by remember { mutableStateOf(false) }
if (questionResolution.answered) {
if (questionResolved.answered) {
Surface(
shape = MaterialTheme.shapes.small,
modifier = Modifier
.setButtonSize(heightFraction),
color = Color.LightGray,
) {
val player = questionResolution.player
val player = questionResolved.player
if (player != null) {
Column(
modifier = Modifier.fillMaxSize(),
@ -90,7 +90,6 @@ fun Question(
players = players,
secondRoundDouble = secondRoundDouble,
onResolve = {
questionResolution = it
questionVisible = false
onResolve(questionData, it)
},

2
src/main/kotlin/components/QuestionGrid.kt
View file

@ -11,6 +11,7 @@ import data.QuestionData
fun QuestionGrid(
game: Game,
secondRoundDouble: Boolean,
questionResolved: Map<QuestionData, QuestionResolution>,
onPointsChange: (player: Player, points: Long) -> Unit,
onResolveQuestion: (QuestionData, QuestionResolution) -> Unit
) {
@ -25,6 +26,7 @@ fun QuestionGrid(
secondRoundDouble = secondRoundDouble,
users = users,
columnFraction = maxColumnFraction,
questionsResolved = questionResolved,
onPointsChange = onPointsChange,
onResolveQuestion = onResolveQuestion
)

2
src/main/kotlin/components/TopicRow.kt
View file

@ -21,6 +21,7 @@ fun TopicRow(
secondRoundDouble: Boolean,
users: List<Player>,
columnFraction: Float,
questionsResolved: Map<QuestionData, QuestionResolution>,
onPointsChange: (Player, Long) -> Unit,
onResolveQuestion: (QuestionData, QuestionResolution) -> Unit
) {
@ -52,6 +53,7 @@ fun TopicRow(
topic = topic,
secondRoundDouble = secondRoundDouble,
players = users,
questionResolved = questionsResolved[question] ?: error("No resolution found for question ${question.hint}"),
heightFraction = buttonHeightFraction,
color = topicColor,
onPointsChange = onPointsChange,