--- a/app/src/main/java/com/geekorum/ttrss/articles_list/ArticleCard.kt Mon Jan 08 16:57:14 2024 -0400
+++ b/app/src/main/java/com/geekorum/ttrss/articles_list/ArticleCard.kt Wed Jan 10 20:16:14 2024 -0400
@@ -73,18 +73,18 @@
onToggleUnreadClick: () -> Unit,
onSwiped: () -> Unit,
modifier: Modifier = Modifier,
- behindCardContent: @Composable (SwipeToDismissValue?) -> Unit = { }
+ behindCardContent: @Composable (SwipeToDismissBoxValue?) -> Unit = { }
) {
- val dismissState = rememberSwipeToDismissState()
+ val dismissState = rememberSwipeToDismissBoxState()
var isInit by remember { mutableStateOf(false) }
LaunchedEffect(Unit) {
// state is restored because it user rememberSaveable
// so reset it if needed
- dismissState.snapTo(SwipeToDismissValue.Settled)
+ dismissState.snapTo(SwipeToDismissBoxValue.Settled)
isInit = true
}
LaunchedEffect(isInit, dismissState.currentValue) {
- if (isInit && dismissState.currentValue != SwipeToDismissValue.Settled) {
+ if (isInit && dismissState.currentValue != SwipeToDismissBoxValue.Settled) {
onSwiped()
}
}
--- a/app/src/main/java/com/geekorum/ttrss/articles_list/ArticleCardsList.kt Mon Jan 08 16:57:14 2024 -0400
+++ b/app/src/main/java/com/geekorum/ttrss/articles_list/ArticleCardsList.kt Wed Jan 10 20:16:14 2024 -0400
@@ -355,9 +355,9 @@
@OptIn(ExperimentalMaterial3Api::class)
@Composable
-private fun ChangeReadBehindItem(dismissDirection: SwipeToDismissValue) {
+private fun ChangeReadBehindItem(dismissDirection: SwipeToDismissBoxValue) {
val horizontalArrangement = when (dismissDirection) {
- SwipeToDismissValue.StartToEnd -> Arrangement.Start
+ SwipeToDismissBoxValue.StartToEnd -> Arrangement.Start
else -> Arrangement.End
}
Row(modifier = Modifier
@@ -367,7 +367,7 @@
verticalAlignment = Alignment.CenterVertically
) {
val text = stringResource(id = R.string.mark_as_read)
- if (dismissDirection == SwipeToDismissValue.StartToEnd) {
+ if (dismissDirection == SwipeToDismissBoxValue.StartToEnd) {
Icon(painter = painterResource(R.drawable.ic_archive), contentDescription = text,
modifier = Modifier.padding(end = 8.dp),
tint = MaterialTheme.colorScheme.secondary
@@ -375,7 +375,7 @@
}
Text(text,
style = MaterialTheme.typography.bodySmall)
- if (dismissDirection == SwipeToDismissValue.EndToStart) {
+ if (dismissDirection == SwipeToDismissBoxValue.EndToStart) {
Icon(painter = painterResource(R.drawable.ic_archive), contentDescription = text,
modifier = Modifier.padding(start = 8.dp),
tint = MaterialTheme.colorScheme.secondary
--- a/gradle/libs.versions.toml Mon Jan 08 16:57:14 2024 -0400
+++ b/gradle/libs.versions.toml Wed Jan 10 20:16:14 2024 -0400
@@ -49,12 +49,12 @@
okio = "3.7.0"
okhttp = "4.10.0"
timber = "5.0.1"
-truth = "1.1.3"
+truth = "1.2.0"
mockk = "1.13.8"
firebase-bom = "32.7.0"
google-play-core = "2.1.0"
google-play-core-review = "2.0.1"
-gms-play-services-base = "18.2.0"
+gms-play-services-base = "18.3.0"
javax-inject = "1"
jsoup = "1.15.3"
retrofit = "2.9.0"
@@ -110,7 +110,7 @@
androidx-compose-material-icons-core = { module = "androidx.compose.material:material-icons-core" }
androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
# beta for bottom app bar with FAB overlaid and bottom app bar scroll behavior
-androidx-compose-material3 = { module = "androidx.compose.material3:material3", version = "1.2.0-beta01" }
+androidx-compose-material3 = { module = "androidx.compose.material3:material3", version = "1.2.0-beta02" }
androidx-compose-material3-window-sizes = { module = "androidx.compose.material3:material3-window-size-class" }
# beta for fix that keeps mutable states working during unit tests
androidx-compose-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata", version = "1.6.0-beta03" }