chris/YAEP
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Improvements

Browse Source 
try to make it run on Android (finally!)
This commit is contained in:
Christian Basler
2024-08-25 21:55:05 +02:00
parent 8399f98d75
commit e5a0a0adb0
8 changed files with 74 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
commonUI/src/androidMain/kotlin/ch/dissem/yaep/ui/common/pointer utils.android.kt Normal file
View File

@@ -0,0 +1,17 @@
package ch.dissem.yaep.ui.common
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.combinedClickable
import androidx.compose.ui.Modifier
@OptIn(ExperimentalFoundationApi::class)
actual fun Modifier.onPointerAction(
primary: () -> Unit,
secondary: () -> Unit
): Modifier {
return this
.combinedClickable(
onClick = primary,
onLongClick = secondary
)
}

10
commonUI/src/commonMain/kotlin/ch/dissem/yaep/ui/common/App.kt
View File

@@ -1,10 +1,7 @@
package ch.dissem.yaep.ui.common
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.Image
import androidx.compose.foundation.PointerMatcher
import androidx.compose.foundation.PointerMatcher.Companion.mouse
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.aspectRatio
@@ -14,7 +11,6 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.lazy.grid.GridCells
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
import androidx.compose.foundation.onClick
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.MaterialTheme
@@ -29,7 +25,6 @@ import androidx.compose.runtime.setValue
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
@@ -186,11 +181,10 @@ fun PuzzleClues(
}
}
@OptIn(ExperimentalFoundationApi::class)
private fun Modifier.forClue(clue: DisplayClue<out Clue>) = this
private fun Modifier.forClue(clue: DisplayClue<out Clue>): Modifier = this
.alpha(if (clue.isActive) 1f else 0.2f)
.padding(8.dp)
.onClick(matcher = PointerMatcher.Primary + mouse(Secondary)) { clue.isActive = !clue.isActive }
.onEitherPointerAction { clue.isActive = !clue.isActive }
@Composable
fun HorizontalClue(modifier: Modifier = Modifier, clue: HorizontalClue, isClueViolated: Boolean) {

8
commonUI/src/commonMain/kotlin/ch/dissem/yaep/ui/common/pointer utils.kt Normal file
View File

@@ -0,0 +1,8 @@
package ch.dissem.yaep.ui.common
import androidx.compose.ui.Modifier
expect fun Modifier.onPointerAction(primary: () -> Unit = {}, secondary: () -> Unit = {}): Modifier
fun Modifier.onEitherPointerAction(action: () -> Unit): Modifier =
onPointerAction(primary = action, secondary = action)

15
commonUI/src/commonMain/kotlin/ch/dissem/yaep/ui/common/selector.kt
View File

@@ -1,6 +1,7 @@
package ch.dissem.yaep.ui.common
import androidx.compose.foundation.*
import androidx.compose.foundation.Canvas
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxSize
@@ -14,7 +15,6 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.input.pointer.PointerButton
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.drawText
import androidx.compose.ui.text.rememberTextMeasurer
@@ -23,7 +23,6 @@ import ch.dissem.yaep.domain.ItemClass
import ch.dissem.yaep.ui.common.theme.emojiFontFamily
import kotlin.math.min
@OptIn(ExperimentalFoundationApi::class)
@Composable
fun <C : ItemClass<C>> Selector(
modifier: Modifier = Modifier,
@@ -48,13 +47,9 @@ fun <C : ItemClass<C>> Selector(
item = option.item,
modifier = Modifier
.alpha(if (option.enabled) 1f else 0.1f)
.combinedClickable(
onClick = { onSelectItem(option.item) },
onLongClick = { option.enabled = false }
)
.onClick(
matcher = PointerMatcher.mouse(PointerButton.Secondary),
onClick = {
.onPointerAction(
primary = { onSelectItem(option.item) },
secondary = {
if (option.enabled) {
option.enabled = false
onOptionRemoved(option.item)

15
commonUI/src/jvmMain/kotlin/ch/dissem/yaep/ui/common/pointer utils.jvm.kt Normal file
View File

@@ -0,0 +1,15 @@
package ch.dissem.yaep.ui.common
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.PointerMatcher
import androidx.compose.foundation.PointerMatcher.Companion.mouse
import androidx.compose.foundation.onClick
import androidx.compose.ui.Modifier
import androidx.compose.ui.input.pointer.PointerButton.Companion.Secondary
@OptIn(ExperimentalFoundationApi::class)
actual fun Modifier.onPointerAction(primary: () -> Unit, secondary: () -> Unit): Modifier {
return this
.onClick(matcher = PointerMatcher.Primary, onClick = primary)
.onClick(matcher = mouse(Secondary), onClick = secondary)
}