kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
remove verticalscroller - it doesn't work with flexiblelayouts
rodzic
969f6992bf
commit
3b89abe1ef
|
@ -6,7 +6,6 @@ import androidx.ui.animation.Crossfade
|
||||||
import androidx.ui.core.Clip
|
import androidx.ui.core.Clip
|
||||||
import androidx.ui.core.Text
|
import androidx.ui.core.Text
|
||||||
import androidx.ui.core.TextField
|
import androidx.ui.core.TextField
|
||||||
import androidx.ui.foundation.VerticalScroller
|
|
||||||
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
|
||||||
|
@ -153,15 +152,16 @@ private fun AppContent(openDrawer: () -> Unit) {
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
VerticalScroller(modifier = LayoutFlexible(1f)) {
|
// VerticalScroller breaks flexible layouts - because verticalscrollers have 'infinite' height
|
||||||
when (screen) {
|
// VerticalScroller(modifier = LayoutFlexible(1f)) {
|
||||||
Screen.messages -> MessagesContent()
|
when (screen) {
|
||||||
Screen.settings -> BTScanScreen()
|
Screen.messages -> MessagesContent()
|
||||||
Screen.users -> HomeContent()
|
Screen.settings -> BTScanScreen()
|
||||||
Screen.channel -> HomeContent()
|
Screen.users -> HomeContent()
|
||||||
else -> TODO()
|
Screen.channel -> HomeContent()
|
||||||
}
|
else -> TODO()
|
||||||
}
|
}
|
||||||
|
//}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,10 +8,7 @@ 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.Column
|
import androidx.ui.layout.*
|
||||||
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
|
||||||
|
@ -38,8 +35,6 @@ val TimestampEmphasis = object : Emphasis {
|
||||||
*/
|
*/
|
||||||
@Composable
|
@Composable
|
||||||
fun MessageCard(msg: TextMessage, modifier: Modifier = Modifier.None) {
|
fun MessageCard(msg: TextMessage, modifier: Modifier = Modifier.None) {
|
||||||
|
|
||||||
|
|
||||||
Row(modifier = modifier) {
|
Row(modifier = modifier) {
|
||||||
UserIcon(null)
|
UserIcon(null)
|
||||||
|
|
||||||
|
@ -75,10 +70,11 @@ fun MessagesContent() {
|
||||||
val sidePad = 8.dp
|
val sidePad = 8.dp
|
||||||
val topPad = 4.dp
|
val topPad = 4.dp
|
||||||
|
|
||||||
Column(modifier = LayoutFlexible(1.0f)) {
|
// modifier = LayoutFlexible(1.0f)
|
||||||
messages.value.forEach {
|
Column {
|
||||||
|
messages.value.forEach { msg ->
|
||||||
MessageCard(
|
MessageCard(
|
||||||
it, modifier = LayoutPadding(
|
msg, modifier = LayoutPadding(
|
||||||
left = sidePad,
|
left = sidePad,
|
||||||
right = sidePad,
|
right = sidePad,
|
||||||
top = topPad,
|
top = topPad,
|
||||||
|
@ -88,6 +84,8 @@ fun MessagesContent() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Spacer(LayoutFlexible(1f))
|
||||||
|
|
||||||
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(
|
||||||
|
|
Ładowanie…
Reference in New Issue