Skip to content

Commit

Permalink
Bump the all group with 5 updates (#311)
Browse files Browse the repository at this point in the history
  • Loading branch information
dependabot[bot] authored Feb 7, 2024
1 parent 2bc28ea commit 7f61b67
Show file tree
Hide file tree
Showing 9 changed files with 50 additions and 38 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Release Notes

## Unreleased

* Bump Compose BOM to 2024.02.00

## 10.0.4

* Bump CameraX to 1.3.0
Expand Down
14 changes: 7 additions & 7 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[versions]
accompanist-permissions = "0.32.0"
accompanist-permissions = "0.34.0"
android-gradle-plugin = "8.2.2"
androidx-activity = "1.8.2"
# TODO: Check if https://android-review.googlesource.com/c/platform/frameworks/support/+/2576871 has
# been merged and if so, swap the buttons in ImageCaptureConfirmationDialog
androidx-compose-bom = "2023.10.01"
androidx-compose-compiler = "1.5.8"
androidx-compose-bom = "2024.02.00"
androidx-compose-compiler = "1.5.9"
androidx-core = "1.12.0"
androidx-core-splashscreen = "1.0.1"
androidx-fragment = "1.6.2"
androidx-lifecycle = "2.7.0"
androidx-navigation = "2.7.6"
androidx-navigation = "2.7.7"
androidx-test-core = "1.5.0"
androidx-test-espresso = "3.5.1"
androidx-test-fragment = "1.6.2"
Expand All @@ -32,15 +32,15 @@ maven-publish = "0.27.0"
mlkit-code-scanner = "16.1.0"
mlkit-obj-detection = "17.0.0"
mockk = "1.13.9"
moshi = "1.15.0"
moshi = "1.15.1"
moshix = "0.25.1"
moshi-lazy-adapters = "2.2"
okhttp = "4.12.0"
play-services-mlkit-face-detection = "17.1.0"
retrofit = "2.9.0"
sentry = "7.2.0"
sentry = "7.3.0"
timber = "5.0.1"
truth = "1.3.0"
truth = "1.4.0"
uiautomator = "2.3.0-beta01"

[plugins]
Expand Down
2 changes: 0 additions & 2 deletions lib/src/main/java/com/smileidentity/compose/SmileIDExt.kt
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ fun SmileID.DocumentVerification(
MaterialTheme(colorScheme = colorScheme, typography = typography) {
OrchestratedDocumentVerificationScreen(
modifier = modifier,
captureBothSides = captureBothSides,
userId = userId,
jobId = jobId,
showAttribution = showAttribution,
Expand Down Expand Up @@ -282,7 +281,6 @@ fun SmileID.EnhancedDocumentVerificationScreen(
MaterialTheme(colorScheme = colorScheme, typography = typography) {
OrchestratedDocumentVerificationScreen(
modifier = modifier,
captureBothSides = captureBothSides,
userId = userId,
jobId = jobId,
showAttribution = showAttribution,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.Divider
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
Expand Down Expand Up @@ -58,7 +58,7 @@ fun BottomPinnedColumn(
scrollableContent()
}
if (showDivider) {
Divider(thickness = Dp.Hairline)
HorizontalDivider(thickness = Dp.Hairline)
}
Column(
horizontalAlignment = horizontalAlignment,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import com.smileidentity.viewmodel.document.OrchestratedDocumentViewModel
internal fun <T : Parcelable> OrchestratedDocumentVerificationScreen(
viewModel: OrchestratedDocumentViewModel<T>,
modifier: Modifier = Modifier,
captureBothSides: Boolean = true,
idAspectRatio: Float? = null,
userId: String = rememberSaveable { randomUserId() },
jobId: String = rememberSaveable { randomJobId() },
Expand Down
9 changes: 5 additions & 4 deletions sample/src/main/java/com/smileidentity/sample/Screen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@ package com.smileidentity.sample

import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
import androidx.compose.material.icons.Icons.AutoMirrored
import androidx.compose.material.icons.Icons.Filled
import androidx.compose.material.icons.Icons.Outlined
import androidx.compose.material.icons.automirrored.filled.List
import androidx.compose.material.icons.automirrored.outlined.List
import androidx.compose.material.icons.filled.Home
import androidx.compose.material.icons.filled.Info
import androidx.compose.material.icons.filled.List
import androidx.compose.material.icons.filled.Settings
import androidx.compose.material.icons.outlined.Home
import androidx.compose.material.icons.outlined.Info
import androidx.compose.material.icons.outlined.List
import androidx.compose.material.icons.outlined.Settings
import androidx.compose.ui.graphics.vector.ImageVector

Expand Down Expand Up @@ -76,8 +77,8 @@ enum class BottomNavigationScreen(
Jobs(
"jobs",
R.string.jobs,
Filled.List,
Outlined.List,
AutoMirrored.Filled.List,
AutoMirrored.Outlined.List,
),
Resources(
"resources",
Expand Down
32 changes: 20 additions & 12 deletions sample/src/main/java/com/smileidentity/sample/compose/MainScreen.kt
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package com.smileidentity.sample.compose

import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.Icons.AutoMirrored
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Delete
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Badge
Expand All @@ -22,13 +23,15 @@ import androidx.compose.material3.NavigationBar
import androidx.compose.material3.NavigationBarItem
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.PlainTooltipBox
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Snackbar
import androidx.compose.material3.SnackbarHost
import androidx.compose.material3.SnackbarHostState
import androidx.compose.material3.Text
import androidx.compose.material3.TooltipBox
import androidx.compose.material3.TooltipDefaults.rememberPlainTooltipPositionProvider
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.rememberTooltipState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.derivedStateOf
Expand Down Expand Up @@ -75,7 +78,6 @@ import kotlinx.collections.immutable.toImmutableList
import kotlinx.coroutines.launch
import java.net.URL

@OptIn(ExperimentalLayoutApi::class)
@Composable
fun MainScreen(
modifier: Modifier = Modifier,
Expand Down Expand Up @@ -362,7 +364,7 @@ private fun TopBar(
if (showUpButton) {
IconButton(onClick = onNavigateUp) {
Icon(
imageVector = Icons.Filled.ArrowBack,
imageVector = AutoMirrored.Filled.ArrowBack,
contentDescription = stringResource(R.string.back),
)
}
Expand All @@ -378,15 +380,22 @@ private fun TopBar(
),
)
if (isJobsScreenSelected) {
PlainTooltipBox(
TooltipBox(
positionProvider = rememberPlainTooltipPositionProvider(),
tooltip = {
Text(stringResource(R.string.jobs_clear_jobs_icon_tooltip))
Text(
stringResource(R.string.jobs_clear_jobs_icon_tooltip),
modifier = Modifier
.background(
MaterialTheme.colorScheme.tertiaryContainer,
MaterialTheme.shapes.small,
)
.padding(8.dp),
)
},
state = rememberTooltipState(),
) {
IconButton(
onClick = viewModel::clearJobs,
modifier = Modifier.tooltipAnchor(),
) {
IconButton(onClick = viewModel::clearJobs) {
Icon(
imageVector = Icons.Default.Delete,
contentDescription = null,
Expand All @@ -399,7 +408,6 @@ private fun TopBar(
)
}

@OptIn(ExperimentalMaterial3Api::class)
@Composable
private fun BottomBar(
bottomNavItems: ImmutableList<BottomNavigationScreen>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowForward
import androidx.compose.material.icons.Icons.AutoMirrored
import androidx.compose.material.icons.automirrored.filled.ArrowForward
import androidx.compose.material.icons.filled.Email
import androidx.compose.material.icons.filled.Info
import androidx.compose.material.icons.filled.Star
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Button
import androidx.compose.material3.Divider
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.ListItem
import androidx.compose.material3.MaterialTheme
Expand Down Expand Up @@ -73,19 +74,19 @@ fun ResourcesScreen(
ListItem(
headlineContent = { Text(it.first) },
supportingContent = { Text(it.second) },
trailingContent = { Icon(Icons.Filled.ArrowForward, null) },
trailingContent = { Icon(AutoMirrored.Filled.ArrowForward, null) },
modifier = Modifier.clickable(onClick = it.third),
)
Divider()
HorizontalDivider()
}
abouts.forEach {
ListItem(
headlineContent = { Text(stringResource(it.first)) },
leadingContent = { Icon(it.second, null) },
trailingContent = { Icon(Icons.Filled.ArrowForward, null) },
trailingContent = { Icon(AutoMirrored.Filled.ArrowForward, null) },
modifier = Modifier.clickable(onClick = it.third),
)
Divider()
HorizontalDivider()
}
}
if (shouldShowWhoWeAreDialog) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.text.selection.SelectionContainer
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowForward
import androidx.compose.material.icons.Icons.AutoMirrored
import androidx.compose.material.icons.automirrored.filled.ArrowForward
import androidx.compose.material.icons.filled.Settings
import androidx.compose.material3.Divider
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.ListItem
import androidx.compose.material3.MaterialTheme
Expand Down Expand Up @@ -68,10 +69,10 @@ fun SettingsScreen(
ListItem(
headlineContent = { Text(stringResource(it.first)) },
leadingContent = { Icon(it.second, null) },
trailingContent = { Icon(Icons.Filled.ArrowForward, null) },
trailingContent = { Icon(AutoMirrored.Filled.ArrowForward, null) },
modifier = Modifier.clickable(onClick = it.third),
)
Divider()
HorizontalDivider()
}
},
pinnedContent = {
Expand Down

0 comments on commit 7f61b67

Please sign in to comment.