kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
make buttons look like buttons
rodzic
59d28b75c1
commit
26055038f7
|
@ -2,17 +2,22 @@ package com.geeksville.mesh.ui
|
||||||
|
|
||||||
import androidx.compose.Composable
|
import androidx.compose.Composable
|
||||||
import androidx.ui.core.Text
|
import androidx.ui.core.Text
|
||||||
|
import androidx.ui.foundation.Clickable
|
||||||
import androidx.ui.foundation.DrawImage
|
import androidx.ui.foundation.DrawImage
|
||||||
import androidx.ui.layout.*
|
import androidx.ui.layout.*
|
||||||
import androidx.ui.material.MaterialTheme
|
import androidx.ui.material.MaterialTheme
|
||||||
|
import androidx.ui.material.ripple.Ripple
|
||||||
import androidx.ui.res.imageResource
|
import androidx.ui.res.imageResource
|
||||||
import androidx.ui.tooling.preview.Preview
|
import androidx.ui.tooling.preview.Preview
|
||||||
import androidx.ui.unit.dp
|
import androidx.ui.unit.dp
|
||||||
|
import com.geeksville.android.Logging
|
||||||
import com.geeksville.mesh.R
|
import com.geeksville.mesh.R
|
||||||
|
|
||||||
/// The Compose IDE preview doesn't like the protobufs
|
/// The Compose IDE preview doesn't like the protobufs
|
||||||
data class Channel(val name: String, val num: Int)
|
data class Channel(val name: String, val num: Int)
|
||||||
|
|
||||||
|
object ChannelLog : Logging
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun ChannelContent(channel: Channel = Channel("Default", 7)) {
|
fun ChannelContent(channel: Channel = Channel("Default", 7)) {
|
||||||
val typography = MaterialTheme.typography()
|
val typography = MaterialTheme.typography()
|
||||||
|
@ -30,12 +35,18 @@ fun ChannelContent(channel: Channel = Channel("Default", 7)) {
|
||||||
DrawImage(image = image)
|
DrawImage(image = image)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Ripple(bounded = false) {
|
||||||
|
Clickable(onClick = {
|
||||||
|
TODO()
|
||||||
|
}) {
|
||||||
VectorImage(
|
VectorImage(
|
||||||
id = R.drawable.ic_twotone_share_24,
|
id = R.drawable.ic_twotone_share_24,
|
||||||
modifier = LayoutGravity.Center + LayoutPadding(left = 8.dp),
|
modifier = LayoutGravity.Center + LayoutPadding(left = 8.dp),
|
||||||
tint = palette.onBackground
|
tint = palette.onBackground
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Text(
|
Text(
|
||||||
text = "Number: ${channel.num}",
|
text = "Number: ${channel.num}",
|
||||||
|
|
Ładowanie…
Reference in New Issue