Skip to content

Commit 18dc8f2

Browse files
authored
Merge pull request #21387 from wordpress-mobile/dependabot/gradle/androidx.compose-compose-bom-2024.10.01
Bump androidx.compose:compose-bom from 2024.08.00 to 2024.10.01
2 parents 9b2d391 + 9f0ba52 commit 18dc8f2

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

WordPress/src/main/java/org/wordpress/android/ui/barcodescanner/BarcodeScanner.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ import androidx.compose.runtime.Composable
1717
import androidx.compose.runtime.remember
1818
import androidx.compose.ui.Modifier
1919
import androidx.compose.ui.platform.LocalContext
20-
import androidx.compose.ui.platform.LocalLifecycleOwner
2120
import androidx.compose.ui.tooling.preview.Preview
2221
import androidx.compose.ui.viewinterop.AndroidView
2322
import androidx.core.content.ContextCompat
23+
import androidx.lifecycle.compose.LocalLifecycleOwner
2424
import org.wordpress.android.ui.compose.theme.AppThemeM2
2525
import androidx.camera.core.Preview as CameraPreview
2626

WordPress/src/main/java/org/wordpress/android/ui/reader/views/compose/readingpreferences/ReadingPreferencesScreen.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ private fun ReadingPreferencesPreviewFeedback(
292292
}
293293

294294
val buttonLabel = stringResource(R.string.reader_preferences_screen_preview_text_feedback_label)
295+
@Suppress("DEPRECATION")
295296
ClickableText(
296297
text = annotatedString,
297298
style = textStyle,

WordPress/src/main/java/org/wordpress/android/ui/reader/views/compose/tagsfeed/ReaderTagsFeed.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.wordpress.android.ui.reader.views.compose.tagsfeed
22

33
import android.content.res.Configuration
4-
import androidx.compose.foundation.ExperimentalFoundationApi
54
import androidx.compose.foundation.background
65
import androidx.compose.foundation.clickable
76
import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -28,7 +27,7 @@ import androidx.compose.material.ExperimentalMaterialApi
2827
import androidx.compose.material.pullrefresh.PullRefreshIndicator
2928
import androidx.compose.material.pullrefresh.pullRefresh
3029
import androidx.compose.material.pullrefresh.rememberPullRefreshState
31-
import androidx.compose.material.ripple.rememberRipple
30+
import androidx.compose.material.ripple
3231
import androidx.compose.material3.Button
3332
import androidx.compose.material3.ButtonDefaults
3433
import androidx.compose.material3.Icon
@@ -90,7 +89,7 @@ fun ReaderTagsFeed(uiState: UiState) {
9089
}
9190
}
9291

93-
@OptIn(ExperimentalMaterialApi::class, ExperimentalFoundationApi::class)
92+
@OptIn(ExperimentalMaterialApi::class)
9493
@Composable
9594
private fun Loaded(uiState: UiState.Loaded) {
9695
val pullRefreshState = rememberPullRefreshState(
@@ -137,7 +136,7 @@ private fun Loaded(uiState: UiState.Loaded) {
137136

138137
Column(
139138
modifier = Modifier
140-
.animateItemPlacement()
139+
.animateItem(fadeInSpec = null, fadeOutSpec = null)
141140
.fillMaxWidth()
142141
.padding(
143142
top = Margin.Large.value,
@@ -370,7 +369,7 @@ private fun PostListLoaded(
370369
.align(Alignment.Center)
371370
.clickable(
372371
interactionSource = remember { MutableInteractionSource() },
373-
indication = rememberRipple(bounded = false),
372+
indication = ripple(bounded = false),
374373
onClick = {
375374
tagChip.onMoreFromTagClick(tagChip.tag)
376375
}

WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/compose/DomainItem.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import androidx.compose.foundation.layout.size
1313
import androidx.compose.foundation.layout.width
1414
import androidx.compose.material.icons.Icons
1515
import androidx.compose.material.icons.filled.Check
16-
import androidx.compose.material.ripple.rememberRipple
16+
import androidx.compose.material.ripple
1717
import androidx.compose.material3.HorizontalDivider
1818
import androidx.compose.material3.Icon
1919
import androidx.compose.material3.MaterialTheme.colorScheme
@@ -58,7 +58,7 @@ fun DomainItem(uiState: DomainUiState): Unit = with(uiState) {
5858
modifier = Modifier
5959
.clickable(
6060
interactionSource = remember(::MutableInteractionSource),
61-
indication = rememberRipple(color = HighlightBgColor),
61+
indication = ripple(color = HighlightBgColor),
6262
onClick = onClick::invoke,
6363
)
6464
.then(if (cost is Cost.Paid) {

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ androidx-appcompat = '1.7.0'
1111
androidx-arch-core = '2.2.0'
1212
androidx-camera = '1.4.0'
1313
androidx-cardview = '1.0.0'
14-
androidx-compose-bom = '2024.08.00'
14+
androidx-compose-bom = '2024.10.01'
1515
androidx-compose-compiler = '1.5.15'
1616
androidx-compose-material3 = '1.2.1'
1717
androidx-constraintlayout-compose = '1.0.1'

0 commit comments

Comments
 (0)