Skip to content

Commit

Permalink
Androidx dependency updates late Jan 2024 (#4165)
Browse files Browse the repository at this point in the history
- Update Wear Assist alignment to keep same appearance of an inline chevron to change the assistant
  • Loading branch information
jpelgrom authored Jan 27, 2024
1 parent c6ddca8 commit 97d312b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -76,7 +76,7 @@ fun LoadNfcView(
}
}) {
Icon(
imageVector = Icons.Outlined.ArrowBack,
imageVector = Icons.AutoMirrored.Outlined.ArrowBack,
contentDescription = stringResource(commonR.string.navigate_up)
)
}
Expand All @@ -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)
)
Expand Down
16 changes: 8 additions & 8 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 97d312b

Please sign in to comment.