mirror
/
meshtastic-android
kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

oh! LayoutFlexible to manage space inside rows/cols

pull/8/head
geeksville 2020-02-17 13:15:14 -08:00
rodzic ccdca3b146
commit 52deba7d4b
1 zmienionych plików z 6 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
app/src/main/java/com/geeksville/mesh/ui/Messages.kt
Wyświetl plik

@ -9,7 +9,10 @@ import androidx.ui.core.TextField
import androidx.ui.foundation.shape.corner.RoundedCornerShape import androidx.ui.foundation.shape.corner.RoundedCornerShape
import androidx.ui.graphics.Color import androidx.ui.graphics.Color
import androidx.ui.input.ImeAction import androidx.ui.input.ImeAction
import androidx.ui.layout.* import androidx.ui.layout.Column
import androidx.ui.layout.LayoutPadding
import androidx.ui.layout.LayoutSize
import androidx.ui.layout.Row
import androidx.ui.material.Emphasis import androidx.ui.material.Emphasis
import androidx.ui.material.MaterialTheme import androidx.ui.material.MaterialTheme
import androidx.ui.material.ProvideEmphasis import androidx.ui.material.ProvideEmphasis
@ -97,7 +100,7 @@ fun MessagesContent() {
val sidePad = 8.dp val sidePad = 8.dp
val topPad = 4.dp val topPad = 4.dp
Column(modifier = LayoutGravity.Start) { Column(modifier = LayoutFlexible(1.0f)) {
messages.value.forEach { messages.value.forEach {
MessageCard( MessageCard(
it, modifier = LayoutPadding( it, modifier = LayoutPadding(
@ -113,7 +116,7 @@ fun MessagesContent() {
val message = state { "text message" } val message = state { "text message" }
val backgroundColor = palette.secondary.copy(alpha = 0.12f) val backgroundColor = palette.secondary.copy(alpha = 0.12f)
Surface( Surface(
modifier = LayoutPadding(8.dp) + LayoutSize.Min(40.dp, 40.dp) + LayoutGravity.End, modifier = LayoutPadding(8.dp),
color = backgroundColor, color = backgroundColor,
shape = RoundedCornerShape(4.dp) shape = RoundedCornerShape(4.dp)
) { ) {