From 8626a347fb7f08b299878c41a50eb1f8bda3ac8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joris=20Pelgr=C3=B6m?= <joris.pelgrom@gmail.com>
Date: Sat, 27 Jan 2024 18:38:28 +0100
Subject: [PATCH] Androidx dependency updates late Jan 2024

 - Update Wear Assist alignment to keep same appearance of an inline chevron to change the assistant
---
 .../android/nfc/views/NfcNavigationView.kt       |  8 ++++----
 gradle/libs.versions.toml                        | 16 ++++++++--------
 .../conversation/views/ConversationView.kt       |  3 ++-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/io/homeassistant/companion/android/nfc/views/NfcNavigationView.kt b/app/src/main/java/io/homeassistant/companion/android/nfc/views/NfcNavigationView.kt
index f8bc179b8ff..9d41ab06adc 100644
--- a/app/src/main/java/io/homeassistant/companion/android/nfc/views/NfcNavigationView.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/nfc/views/NfcNavigationView.kt
@@ -9,8 +9,8 @@ import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
 import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.ArrowBack
-import androidx.compose.material.icons.outlined.HelpOutline
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.HelpOutline
 import androidx.compose.material.rememberScaffoldState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -76,7 +76,7 @@ fun LoadNfcView(
                         }
                     }) {
                         Icon(
-                            imageVector = Icons.Outlined.ArrowBack,
+                            imageVector = Icons.AutoMirrored.Outlined.ArrowBack,
                             contentDescription = stringResource(commonR.string.navigate_up)
                         )
                     }
@@ -87,7 +87,7 @@ fun LoadNfcView(
                         context.startActivity(intent)
                     }) {
                         Icon(
-                            imageVector = Icons.Outlined.HelpOutline,
+                            imageVector = Icons.AutoMirrored.Outlined.HelpOutline,
                             contentDescription = stringResource(commonR.string.get_help),
                             tint = colorResource(commonR.color.colorOnBackground)
                         )
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a085f49b3ad..f9a9447f579 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ accompanist = "0.32.0"
 activity-compose = "1.8.2"
 androidBeaconLibrary = "2.20"
 androidJunit5 = "1.9.3.0"
-androidPlugin = "8.2.1"
+androidPlugin = "8.2.2"
 androidSdk-compile = "34"
 androidSdk-min = "21"
 androidSdk-target = "33"
@@ -16,15 +16,15 @@ blurView = "version-1.6.6"
 car-versions = "1.4.0-rc02"
 changeLog = "3.4"
 community-material-typeface = "7.0.96.0-kotlin"
-compose-bom = "2023.10.01"
+compose-bom = "2024.01.00"
 compose-compiler = "1.5.8"
 constraintlayout = "2.1.4"
 converterJackson = "2.9.0"
 coreKtx = "1.12.0"
 core-splashscreen = "1.1.0-alpha02"
-cronet-embedded = "113.5672.61"
+cronet-embedded = "119.6045.31"
 emojiJava = "5.1.1"
-firebase-bom = "32.7.0"
+firebase-bom = "32.7.1"
 firebaseAppdistributionGradle = "4.0.1"
 fragment-ktx = "1.6.2"
 googleServices = "4.4.0"
@@ -40,7 +40,7 @@ ksp = "1.9.22-1.0.17"
 ktlint = "11.6.1"
 lifecycle = "2.7.0"
 material = "1.11.0"
-media3 = "1.2.0"
+media3 = "1.2.1"
 navigation-compose = "2.7.6"
 okhttp = "4.12.0"
 paging = "3.2.1"
@@ -56,16 +56,16 @@ retrofit = "2.9.0"
 room = "2.6.1"
 sentry-android = "7.2.0"
 tools-desugar-jdk-libs = "2.0.4"
-watchfaceComplicationsDataSourceKtx = "1.2.0"
+watchfaceComplicationsDataSourceKtx = "1.2.1"
 wear = "1.3.0"
-wear-compose-foundation = "1.2.1"
+wear-compose-foundation = "1.3.0"
 wear-compose-material = "1.0.0-alpha15"
 wear-protolayout = "1.0.0"
 wear-tiles = "1.2.0"
 wear-tooling = "1.0.0"
 wearPhoneInteractions = "1.0.1"
 wearInput = "1.2.0-alpha02"
-webkit = "1.9.0"
+webkit = "1.10.0"
 wear-remote-interactions = "1.0.0"
 workRuntimeKtx = "2.9.0"
 horologist = "0.5.19"
diff --git a/wear/src/main/java/io/homeassistant/companion/android/conversation/views/ConversationView.kt b/wear/src/main/java/io/homeassistant/companion/android/conversation/views/ConversationView.kt
index 456d3cc3336..82123693199 100755
--- a/wear/src/main/java/io/homeassistant/companion/android/conversation/views/ConversationView.kt
+++ b/wear/src/main/java/io/homeassistant/companion/android/conversation/views/ConversationView.kt
@@ -144,7 +144,8 @@ fun ConversationResultView(
                             onClick = { onChangePipeline() },
                             onClickLabel = stringResource(R.string.assist_change_pipeline)
                         )
-                        .padding(bottom = 4.dp)
+                        .padding(bottom = 4.dp),
+                    verticalAlignment = Alignment.CenterVertically
                 ) {
                     Text(
                         text = currentPipeline.name,