Skip to content

Commit 5b1adac

Browse files
Fix deprecation issues from newer foundation library
1 parent c754ee3 commit 5b1adac

File tree

3 files changed

+12
-18
lines changed

3 files changed

+12
-18
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.AppTheme
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: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import androidx.compose.foundation.layout.padding
1515
import androidx.compose.foundation.layout.width
1616
import androidx.compose.foundation.layout.wrapContentHeight
1717
import androidx.compose.foundation.rememberScrollState
18-
import androidx.compose.foundation.text.ClickableText
1918
import androidx.compose.foundation.verticalScroll
2019
import androidx.compose.material.MaterialTheme
2120
import androidx.compose.material.Text
@@ -37,6 +36,7 @@ import androidx.compose.ui.platform.rememberNestedScrollInteropConnection
3736
import androidx.compose.ui.res.stringResource
3837
import androidx.compose.ui.semantics.onClick
3938
import androidx.compose.ui.semantics.semantics
39+
import androidx.compose.ui.text.LinkAnnotation
4040
import androidx.compose.ui.text.SpanStyle
4141
import androidx.compose.ui.text.TextStyle
4242
import androidx.compose.ui.text.buildAnnotatedString
@@ -283,27 +283,22 @@ private fun ReadingPreferencesPreviewFeedback(
283283
end = endIndex,
284284
)
285285

286-
addStringAnnotation(
287-
tag = "url",
288-
annotation = "feedback",
286+
addLink(
287+
clickable = LinkAnnotation.Clickable(
288+
tag = "url",
289+
linkInteractionListener = {
290+
onSendFeedbackClick()
291+
}
292+
),
289293
start = startIndex,
290294
end = endIndex,
291295
)
292296
}
293297

294298
val buttonLabel = stringResource(R.string.reader_preferences_screen_preview_text_feedback_label)
295-
ClickableText(
299+
Text(
296300
text = annotatedString,
297301
style = textStyle,
298-
onClick = { offset ->
299-
annotatedString.getStringAnnotations(tag = "url", start = offset, end = offset)
300-
.firstOrNull()
301-
?.let { annotation ->
302-
if (annotation.item == "feedback") {
303-
onSendFeedbackClick()
304-
}
305-
}
306-
},
307302
modifier = Modifier.semantics {
308303
onClick(
309304
label = buttonLabel,

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

Lines changed: 2 additions & 3 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
@@ -91,7 +90,7 @@ fun ReaderTagsFeed(uiState: UiState) {
9190
}
9291
}
9392

94-
@OptIn(ExperimentalMaterialApi::class, ExperimentalFoundationApi::class)
93+
@OptIn(ExperimentalMaterialApi::class)
9594
@Composable
9695
private fun Loaded(uiState: UiState.Loaded) {
9796
val pullRefreshState = rememberPullRefreshState(
@@ -138,7 +137,7 @@ private fun Loaded(uiState: UiState.Loaded) {
138137

139138
Column(
140139
modifier = Modifier
141-
.animateItemPlacement()
140+
.animateItem()
142141
.fillMaxWidth()
143142
.padding(
144143
top = Margin.Large.value,

0 commit comments

Comments
 (0)