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

remove verticalscroller - it doesn't work with flexiblelayouts

pull/8/head
geeksville 2020-02-17 14:43:47 -08:00
rodzic 969f6992bf
commit 3b89abe1ef
2 zmienionych plików z 16 dodań i 18 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

18
app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt
Wyświetl plik

@ -6,7 +6,6 @@ import androidx.ui.animation.Crossfade
import androidx.ui.core.Clip
import androidx.ui.core.Text
import androidx.ui.core.TextField
import androidx.ui.foundation.VerticalScroller
import androidx.ui.foundation.shape.corner.RoundedCornerShape
import androidx.ui.graphics.Color
import androidx.ui.input.ImeAction
@ -153,15 +152,16 @@ private fun AppContent(openDrawer: () -> Unit) {
}
)
VerticalScroller(modifier = LayoutFlexible(1f)) {
when (screen) {
Screen.messages -> MessagesContent()
Screen.settings -> BTScanScreen()
Screen.users -> HomeContent()
Screen.channel -> HomeContent()
else -> TODO()
}
// VerticalScroller breaks flexible layouts - because verticalscrollers have 'infinite' height
// VerticalScroller(modifier = LayoutFlexible(1f)) {
when (screen) {
Screen.messages -> MessagesContent()
Screen.settings -> BTScanScreen()
Screen.users -> HomeContent()
Screen.channel -> HomeContent()
else -> TODO()
}
//}
}
}
}

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

@ -8,10 +8,7 @@ import androidx.ui.core.TextField
import androidx.ui.foundation.shape.corner.RoundedCornerShape
import androidx.ui.graphics.Color
import androidx.ui.input.ImeAction
import androidx.ui.layout.Column
import androidx.ui.layout.LayoutPadding
import androidx.ui.layout.LayoutSize
import androidx.ui.layout.Row
import androidx.ui.layout.*
import androidx.ui.material.Emphasis
import androidx.ui.material.MaterialTheme
import androidx.ui.material.ProvideEmphasis
@ -38,8 +35,6 @@ val TimestampEmphasis = object : Emphasis {
*/
@Composable
fun MessageCard(msg: TextMessage, modifier: Modifier = Modifier.None) {
Row(modifier = modifier) {
UserIcon(null)
@ -75,10 +70,11 @@ fun MessagesContent() {
val sidePad = 8.dp
val topPad = 4.dp
Column(modifier = LayoutFlexible(1.0f)) {
messages.value.forEach {
// modifier = LayoutFlexible(1.0f)
Column {
messages.value.forEach { msg ->
MessageCard(
it, modifier = LayoutPadding(
msg, modifier = LayoutPadding(
left = sidePad,
right = sidePad,
top = topPad,
@ -88,6 +84,8 @@ fun MessagesContent() {
}
}
Spacer(LayoutFlexible(1f))
val message = state { "text message" }
val backgroundColor = palette.secondary.copy(alpha = 0.12f)
Surface(