From b7c408d890210ab73b200a5998d318e54aa3dcce Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Sun, 1 Mar 2020 16:06:07 -0800
Subject: [PATCH] Finished updates to dev05 of Compose

---
 .../main/java/com/geeksville/mesh/ui/MeshApp.kt | 17 ++++++++---------
 .../main/java/com/geeksville/mesh/ui/Vectors.kt |  8 ++++----
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt b/app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt
index edf3a99e..1d033f00 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt
@@ -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()
+                            }
                         }
                     }
                 )
diff --git a/app/src/main/java/com/geeksville/mesh/ui/Vectors.kt b/app/src/main/java/com/geeksville/mesh/ui/Vectors.kt
index adf9cdee..0ad6c10c 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/Vectors.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/Vectors.kt
@@ -2,8 +2,8 @@ package com.geeksville.mesh.ui
 
 import androidx.annotation.DrawableRes
 import androidx.compose.Composable
+import androidx.ui.core.DensityAmbient
 import androidx.ui.core.Modifier
-import androidx.ui.core.WithDensity
 import androidx.ui.foundation.Clickable
 import androidx.ui.graphics.Color
 import androidx.ui.graphics.vector.DrawVector
@@ -18,7 +18,7 @@ import androidx.ui.unit.dp
 fun VectorImageButton(@DrawableRes id: Int, onClick: () -> Unit) {
     Ripple(bounded = false) {
         Clickable(onClick = onClick) {
-            VectorImage(id = id, modifier = LayoutSize(40.dp, 40.dp))
+            VectorImage(id = id /* , modifier = LayoutSize(40.dp, 40.dp) */)
         }
     }
 }
@@ -39,7 +39,7 @@ fun VectorImage(
     tint: Color = Color.Transparent
 ) {
     val vector = vectorResource(id)
-    WithDensity {
+    // WithDensity {
         Container(
             modifier = modifier + LayoutSize(
                 vector.defaultWidth,
@@ -48,5 +48,5 @@ fun VectorImage(
         ) {
             DrawVector(vector, tint)
         }
-    }
+    // }
 }