meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Finished updates to dev05 of Compose

Browse source
This commit is contained in:
Kevin Hester 2020-03-01 16:06:07 -08:00
parent e2ceaf3a2d
commit b7c408d890
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt
View file

@ -1,7 +1,6 @@
package com.geeksville.mesh.ui
import androidx.compose.Composable
import androidx.compose.ambient
import androidx.compose.state
import androidx.ui.animation.Crossfade
import androidx.ui.core.ContextAmbient
@ -37,12 +36,10 @@ fun getInitials(name: String): String {
fun HomeContent() {
Column {
Row {
Container(LayoutSize(40.dp, 40.dp)) {
VectorImage(
id = if (UIState.isConnected.value) R.drawable.cloud_on else R.drawable.cloud_off,
tint = palette.onBackground
)
}
VectorImage(
id = if (UIState.isConnected.value) R.drawable.cloud_on else R.drawable.cloud_off,
tint = palette.onBackground // , modifier = LayoutSize(40.dp, 40.dp)
)
if (UIState.isConnected.value) {
Column {
@ -134,8 +131,10 @@ private fun AppContent(openDrawer: () -> Unit) {
TopAppBar(
title = { Text(text = "Meshtastic") },
navigationIcon = {
VectorImageButton(R.drawable.ic_launcher_new_foreground) {
openDrawer()
Container(LayoutSize(40.dp, 40.dp)) {
VectorImageButton(R.drawable.ic_launcher_new_foreground) {
openDrawer()
}
}
}
)