From 9e2110bac3757003626b472bd0cb82d4612bdd5c Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Sat, 29 Feb 2020 14:34:20 -0800
Subject: [PATCH] WIP update to Jetpack compose dev05

---
 app/build.gradle                                     | 2 +-
 app/src/main/java/com/geeksville/mesh/ui/Channel.kt  | 2 +-
 app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt  | 8 +++++---
 app/src/main/java/com/geeksville/mesh/ui/Settings.kt | 4 +---
 build.gradle                                         | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e4948b42a..1c2c4a1c5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -45,7 +45,7 @@ android {
 
     composeOptions {
         kotlinCompilerVersion "1.3.61-dev-withExperimentalGoogleExtensions-20200129"
-        kotlinCompilerExtensionVersion "0.1.0-dev04"
+        kotlinCompilerExtensionVersion "0.1.0-dev05"
     }
 }
 
diff --git a/app/src/main/java/com/geeksville/mesh/ui/Channel.kt b/app/src/main/java/com/geeksville/mesh/ui/Channel.kt
index 9b95f762f..eb53bbad8 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/Channel.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/Channel.kt
@@ -25,7 +25,7 @@ object ChannelLog : Logging
 @Composable
 fun ChannelContent(channel: Channel = Channel("Default", 7)) {
     val typography = MaterialTheme.typography()
-    val context = ambient(ContextAmbient)
+    val context = ContextAmbient.current
 
     Column(modifier = LayoutSize.Fill + LayoutPadding(16.dp)) {
         Text(
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 0a1516d89..edf3a99e6 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt
@@ -50,16 +50,18 @@ fun HomeContent() {
 
                     if (false) { // hide the firmware update button for now, it is kinda ugly and users don't need it yet
                         /// Create a software update button
-                        val context = ambient(ContextAmbient)
+                        val context = ContextAmbient.current
                         RadioInterfaceService.getBondedDeviceAddress(context)?.let { macAddress ->
-                            Button(text = "Update firmware",
+                            Button(
                                 onClick = {
                                     SoftwareUpdateService.enqueueWork(
                                         context,
                                         SoftwareUpdateService.startUpdateIntent(macAddress)
                                     )
                                 }
-                            )
+                            ) {
+                                Text(text = "Update firmware")
+                            }
                         }
                     }
                 }
diff --git a/app/src/main/java/com/geeksville/mesh/ui/Settings.kt b/app/src/main/java/com/geeksville/mesh/ui/Settings.kt
index 7d5baa3b0..2e065951e 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/Settings.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/Settings.kt
@@ -23,7 +23,7 @@ object SettingsLog : Logging
 fun SettingsContent() {
     //val typography = MaterialTheme.typography()
 
-    val context = ambient(ContextAmbient)
+    val context = ContextAmbient.current
     Column(modifier = LayoutSize.Fill + LayoutPadding(16.dp)) {
 
         Row {
@@ -50,8 +50,6 @@ fun SettingsContent() {
 
         BTScanScreen()
 
-        val context = ambient(ContextAmbient)
-
         val bonded = RadioInterfaceService.getBondedDeviceAddress(context) != null
         if (!bonded) {
 
diff --git a/build.gradle b/build.gradle
index 54afb3caf..13557f96d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@
 
 buildscript {
     ext.kotlin_version = '1.3.61'
-    ext.compose_version = '0.1.0-dev04'
+    ext.compose_version = '0.1.0-dev05'
     repositories {
         google()
         jcenter()