mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-03-24 00:33:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

update to dev07 compose

Browse Source
This commit is contained in:
geeksville
2020-03-29 13:38:50 -07:00
parent 5b60253e00
commit 40853723ab
11 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/geeksville/mesh/ui/AndroidImage.kt
View File

@@ -5,10 +5,9 @@ import androidx.compose.Composable
import androidx.ui.core.DensityAmbient
import androidx.ui.core.DrawModifier
import androidx.ui.core.Modifier
import androidx.ui.core.toModifier
import androidx.ui.core.asModifier
import androidx.ui.foundation.Box
import androidx.ui.graphics.*
import androidx.ui.graphics.colorspace.ColorSpace
import androidx.ui.graphics.colorspace.ColorSpaces
import androidx.ui.graphics.painter.ImagePainter
import androidx.ui.unit.Density
@@ -31,12 +30,12 @@ private object ClipModifier : DrawModifier {
/// Stolen from the Compose SimpleImage, replace with their real Image component someday
@Composable
fun ScaledImage(
image: Image,
image: ImageAsset,
modifier: Modifier = Modifier.None,
tint: Color? = null
) {
with(DensityAmbient.current) {
val imageModifier = ImagePainter(image).toModifier(
val imageModifier = ImagePainter(image).asModifier(
scaleFit = ScaleFit.FillMaxDimension,
colorFilter = tint?.let { ColorFilter(it, BlendMode.srcIn) }
)
@@ -46,7 +45,7 @@ fun ScaledImage(
/// Borrowed from Compose
class AndroidImage(val bitmap: Bitmap) : Image {
class AndroidImage(val bitmap: Bitmap) : ImageAsset {
/**
* @see Image.width
@@ -60,12 +59,12 @@ class AndroidImage(val bitmap: Bitmap) : Image {
override val height: Int
get() = bitmap.height
override val config: ImageConfig get() = ImageConfig.Argb8888
override val config: ImageAssetConfig get() = ImageAssetConfig.Argb8888
/**
* @see Image.colorSpace
*/
override val colorSpace: ColorSpace
override val colorSpace: androidx.ui.graphics.colorspace.ColorSpace
get() = ColorSpaces.Srgb
/**
@@ -77,7 +76,7 @@ class AndroidImage(val bitmap: Bitmap) : Image {
/**
* @see Image.nativeImage
*/
override val nativeImage: NativeImage
override val nativeImage: NativeImageAsset
get() = bitmap
/**

2
app/src/main/java/com/geeksville/mesh/ui/AppDrawer.kt
View File

@@ -9,8 +9,8 @@ import androidx.ui.graphics.Color
import androidx.ui.layout.*
import androidx.ui.material.Divider
import androidx.ui.material.MaterialTheme
import androidx.ui.material.Surface
import androidx.ui.material.TextButton
import androidx.ui.material.surface.Surface
import androidx.ui.tooling.preview.Preview
import androidx.ui.unit.dp
import com.geeksville.mesh.R

4
app/src/main/java/com/geeksville/mesh/ui/BTScanScreen.kt
View File

@@ -14,7 +14,7 @@ import androidx.ui.core.Text
import androidx.ui.layout.Column
import androidx.ui.layout.LayoutGravity
import androidx.ui.material.CircularProgressIndicator
import androidx.ui.material.EmphasisLevels
import androidx.ui.material.MaterialTheme
import androidx.ui.material.ProvideEmphasis
import androidx.ui.material.RadioGroup
import androidx.ui.tooling.preview.Preview
@@ -173,7 +173,7 @@ fun BTScanScreen() {
Column {
ScanUIState.devices.values.forEach {
// disabled pending https://issuetracker.google.com/issues/149528535
ProvideEmphasis(emphasis = if (it.bonded) EmphasisLevels().high else EmphasisLevels().disabled) {
ProvideEmphasis(emphasis = if (it.bonded) MaterialTheme.emphasisLevels().high else MaterialTheme.emphasisLevels().disabled) {
RadioGroupTextItem(
selected = (it.isSelected),
onSelect = {

1
app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt
View File

@@ -9,7 +9,6 @@ import androidx.ui.layout.Container
import androidx.ui.layout.LayoutSize
import androidx.ui.layout.Row
import androidx.ui.material.*
import androidx.ui.material.surface.Surface
import androidx.ui.tooling.preview.Preview
import androidx.ui.unit.dp
import com.geeksville.android.Logging

2
app/src/main/java/com/geeksville/mesh/ui/Messages.kt
View File

@@ -75,7 +75,7 @@ fun MessagesContent() {
val topPad = 4.dp
VerticalScroller(
modifier = LayoutFlexible(1f)
modifier = LayoutWeight(1f)
) {
Column {
messages.forEach { msg ->

3
app/src/main/java/com/geeksville/mesh/ui/NodeInfoCard.kt
View File

@@ -3,7 +3,6 @@ package com.geeksville.mesh.ui
import androidx.compose.Composable
import androidx.ui.core.Text
import androidx.ui.layout.*
import androidx.ui.material.EmphasisLevels
import androidx.ui.material.MaterialTheme
import androidx.ui.material.ProvideEmphasis
import androidx.ui.tooling.preview.Preview
@@ -47,7 +46,7 @@ fun CompassHeading(modifier: Modifier1 = Modifier1.None, node: NodeInfo) {
@Composable
fun NodeHeading(node: NodeInfo) {
ProvideEmphasis(emphasis = EmphasisLevels().high) {
ProvideEmphasis(emphasis = MaterialTheme.emphasisLevels().high) {
Text(
node.user?.longName ?: "unknown",
style = MaterialTheme.typography().subtitle1

8
app/src/main/java/com/geeksville/mesh/ui/StyledTextField.kt
View File

@@ -11,9 +11,9 @@ import androidx.ui.input.KeyboardType
import androidx.ui.input.VisualTransformation
import androidx.ui.layout.LayoutPadding
import androidx.ui.material.Emphasis
import androidx.ui.material.EmphasisLevels
import androidx.ui.material.MaterialTheme
import androidx.ui.material.ProvideEmphasis
import androidx.ui.material.surface.Surface
import androidx.ui.material.Surface
import androidx.ui.text.TextStyle
import androidx.ui.unit.dp
@@ -30,7 +30,7 @@ fun StyledTextField(
value: String,
modifier: Modifier = Modifier.None,
onValueChange: (String) -> Unit = {},
textStyle: TextStyle? = null,
textStyle: TextStyle = TextStyle.Default,
keyboardType: KeyboardType = KeyboardType.Text,
imeAction: ImeAction = ImeAction.Unspecified,
onFocus: () -> Unit = {},
@@ -47,7 +47,7 @@ fun StyledTextField(
shape = RoundedCornerShape(4.dp)
) {
val showingHint = state { value.isEmpty() }
val level = if (showingHint.value) HintEmphasis else EmphasisLevels().medium
val level = if (showingHint.value) HintEmphasis else MaterialTheme.emphasisLevels().medium
ProvideEmphasis(level) {
TextField(

5
app/src/main/java/com/geeksville/mesh/ui/Vectors.kt
View File

@@ -5,7 +5,7 @@ import androidx.compose.Composable
import androidx.ui.core.Modifier
import androidx.ui.foundation.Icon
import androidx.ui.graphics.Color
import androidx.ui.graphics.vector.DrawVector
import androidx.ui.graphics.vector.drawVector
import androidx.ui.layout.Container
import androidx.ui.layout.LayoutSize
import androidx.ui.material.IconButton
@@ -42,9 +42,8 @@ fun VectorImage(
modifier = modifier + LayoutSize(
vector.defaultWidth,
vector.defaultHeight
)
) + drawVector(vector, tint)
) {
DrawVector(vector, tint)
}
// }
}