Skip to content

Commit 7069134

Browse files
dependabot[bot]Williamraicooltey
authored
Bump androidx.compose:compose-bom from 2025.11.01 to 2025.12.00 (#6167)
* Bump androidx.compose:compose-bom from 2025.11.01 to 2025.12.00 Bumps androidx.compose:compose-bom from 2025.11.01 to 2025.12.00. --- updated-dependencies: - dependency-name: androidx.compose:compose-bom dependency-version: 2025.12.00 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * - uses stringResource to retrieve instead of context.getString to fix Compose lint errors --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: williamrai <[email protected]> Co-authored-by: Cooltey Feng <[email protected]> Co-authored-by: William Rai <[email protected]>
1 parent 174d512 commit 7069134

File tree

10 files changed

+46
-35
lines changed

10 files changed

+46
-35
lines changed

app/src/main/java/org/wikipedia/activitytab/timeline/TimelineModule.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,10 +219,9 @@ fun TimelineDateSeparator(
219219
date: Date,
220220
modifier: Modifier = Modifier
221221
) {
222-
val context = LocalContext.current
223222
val (dateHeaderText, showSecondaryDate) = when {
224-
date.isToday() -> context.getString(R.string.activity_tab_timeline_today) to true
225-
date.isYesterday() -> context.getString(R.string.activity_tab_timeline_yesterday) to true
223+
date.isToday() -> stringResource(R.string.activity_tab_timeline_today) to true
224+
date.isYesterday() -> stringResource(R.string.activity_tab_timeline_yesterday) to true
226225
else -> DateUtil.getMMMMdYYYY(date, false) to false
227226
}
228227

app/src/main/java/org/wikipedia/donate/donationreminder/DonationReminderScreen.kt

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ import androidx.compose.ui.draw.clip
5858
import androidx.compose.ui.focus.FocusRequester
5959
import androidx.compose.ui.focus.focusRequester
6060
import androidx.compose.ui.layout.onGloballyPositioned
61-
import androidx.compose.ui.platform.LocalContext
6261
import androidx.compose.ui.res.painterResource
6362
import androidx.compose.ui.res.stringResource
6463
import androidx.compose.ui.text.Placeholder
@@ -318,8 +317,11 @@ fun DonationReminderContent(
318317
var showReadFrequencyCustomDialog by remember { mutableStateOf(false) }
319318
var showDonationAmountCustomDialog by remember { mutableStateOf(false) }
320319
var customDialogErrorMessage by remember { mutableStateOf("") }
321-
val context = LocalContext.current
322320

321+
val warningMinAmount = stringResource(R.string.donation_reminders_settings_warning_min_amount)
322+
val warningMaxAmount = stringResource(R.string.donation_reminders_settings_warning_max_amount)
323+
val donateGooglePayMinAmount = stringResource(R.string.donate_gpay_minimum_amount)
324+
val donateGooglePayMaxAmount = stringResource(R.string.donate_gpay_maximum_amount)
323325
Column(
324326
modifier = modifier
325327
) {
@@ -384,14 +386,14 @@ fun DonationReminderContent(
384386
val amount = DonateUtil.getAmountFloat(value)
385387
customDialogErrorMessage = when {
386388
amount <= minimumAmount -> {
387-
context.getString(
388-
R.string.donation_reminders_settings_warning_min_amount,
389+
String.format(
390+
warningMinAmount,
389391
uiState.readFrequency.displayFormatter(minimumAmount + 1)
390392
)
391393
}
392394
amount >= maximumAmount -> {
393-
context.getString(
394-
R.string.donation_reminders_settings_warning_max_amount,
395+
String.format(
396+
warningMaxAmount,
395397
uiState.readFrequency.displayFormatter(maximumAmount - 1)
396398
)
397399
}
@@ -442,14 +444,14 @@ fun DonationReminderContent(
442444
val maximumAmount = uiState.donationAmount.maximumAmount
443445
customDialogErrorMessage = when {
444446
amount < minimumAmount -> {
445-
context.getString(
446-
R.string.donate_gpay_minimum_amount,
447+
String.format(
448+
donateGooglePayMinAmount,
447449
uiState.donationAmount.displayFormatter(minimumAmount)
448450
)
449451
}
450452
maximumAmount > 0 && amount >= maximumAmount -> {
451-
context.getString(
452-
R.string.donate_gpay_maximum_amount,
453+
String.format(
454+
donateGooglePayMaxAmount,
453455
uiState.donationAmount.displayFormatter(maximumAmount)
454456
)
455457
}

app/src/main/java/org/wikipedia/language/LangLinksScreen.kt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import androidx.compose.runtime.remember
2121
import androidx.compose.runtime.setValue
2222
import androidx.compose.ui.Alignment
2323
import androidx.compose.ui.Modifier
24-
import androidx.compose.ui.platform.LocalContext
24+
import androidx.compose.ui.res.stringResource
2525
import androidx.compose.ui.text.TextStyle
2626
import androidx.compose.ui.text.font.FontWeight
2727
import androidx.compose.ui.unit.dp
@@ -43,15 +43,18 @@ fun ComposeLangLinksScreen(
4343
onBackButtonClick: () -> Unit,
4444
onSearchQueryChange: (String) -> Unit,
4545
) {
46-
val context = LocalContext.current
4746
var searchQuery by remember { mutableStateOf("") }
4847

48+
val title = stringResource(R.string.langlinks_activity_title)
49+
val filterHintText = stringResource(R.string.langlinks_filter_hint)
50+
val notMatchText = stringResource(R.string.langlinks_no_match)
51+
4952
Scaffold(
5053
modifier = modifier,
5154
topBar = {
5255
WikiTopAppBarWithSearch(
53-
appBarTitle = context.getString(R.string.langlinks_activity_title),
54-
placeHolderTitle = context.getString(R.string.langlinks_filter_hint),
56+
appBarTitle = title,
57+
placeHolderTitle = filterHintText,
5558
searchQuery = searchQuery,
5659
onSearchQueryChange = {
5760
searchQuery = it
@@ -103,7 +106,7 @@ fun ComposeLangLinksScreen(
103106
SearchEmptyView(
104107
modifier = Modifier
105108
.fillMaxWidth(),
106-
emptyTexTitle = context.getString(R.string.langlinks_no_match)
109+
emptyTexTitle = notMatchText
107110
)
108111
}
109112
return@Scaffold

app/src/main/java/org/wikipedia/readinglist/recommended/RecommendedReadingListSettingsScreen.kt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import androidx.compose.runtime.setValue
3939
import androidx.compose.ui.Alignment
4040
import androidx.compose.ui.Modifier
4141
import androidx.compose.ui.draw.clip
42-
import androidx.compose.ui.platform.LocalContext
4342
import androidx.compose.ui.res.painterResource
4443
import androidx.compose.ui.res.stringResource
4544
import androidx.compose.ui.text.input.KeyboardType
@@ -361,15 +360,17 @@ private fun UpdatesFrequencyView(
361360
onUpdateFrequency: (RecommendedReadingListUpdateFrequency) -> Unit,
362361
modifier: Modifier = Modifier
363362
) {
364-
val context = LocalContext.current
365363
var showDialog by remember { mutableStateOf(false) }
366364
val frequencies = RecommendedReadingListUpdateFrequency.entries.toTypedArray()
367-
val dialogOptions = frequencies.map { context.getString(it.dialogStringRes) }
365+
val dialogOptions = frequencies.map { stringResource(it.dialogStringRes) }
368366
val selectedDialogOption = stringResource(selectedFrequency.dialogStringRes)
369367
val updateFrequencyString = stringResource(
370368
R.string.recommended_reading_list_settings_updates_frequency,
371369
stringResource(selectedFrequency.displayStringRes)
372370
)
371+
val stringToFrequency = remember(dialogOptions, frequencies) {
372+
dialogOptions.zip(frequencies).toMap()
373+
}
373374
ListItem(
374375
modifier = modifier
375376
.clickable(
@@ -405,9 +406,7 @@ private fun UpdatesFrequencyView(
405406
selectedOption = selectedDialogOption,
406407
onDismissRequest = { showDialog = false },
407408
onOptionSelected = { selectedOptionString ->
408-
val newSelectedFrequency = frequencies.find {
409-
context.getString(it.dialogStringRes) == selectedOptionString
410-
} ?: RecommendedReadingListUpdateFrequency.DAILY
409+
val newSelectedFrequency = stringToFrequency[selectedOptionString] ?: RecommendedReadingListUpdateFrequency.DAILY
411410
onUpdateFrequency(newSelectedFrequency)
412411
}
413412
)

app/src/main/java/org/wikipedia/settings/AboutActivity.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import androidx.compose.runtime.setValue
3030
import androidx.compose.ui.Alignment
3131
import androidx.compose.ui.Modifier
3232
import androidx.compose.ui.graphics.ColorFilter
33-
import androidx.compose.ui.platform.LocalContext
3433
import androidx.compose.ui.res.painterResource
3534
import androidx.compose.ui.res.stringResource
3635
import androidx.compose.ui.text.SpanStyle
@@ -199,9 +198,10 @@ fun AboutWikipediaHeader(
199198
versionName: String,
200199
snackbarHostState: SnackbarHostState
201200
) {
202-
val context = LocalContext.current
203201
val scope = rememberCoroutineScope()
204202

203+
val alreadyEnabledMessage = stringResource(R.string.show_developer_settings_already_enabled)
204+
val enabledMessage = stringResource(R.string.show_developer_settings_enabled)
205205
Column(
206206
modifier = modifier,
207207
horizontalAlignment = Alignment.CenterHorizontally
@@ -212,14 +212,14 @@ fun AboutWikipediaHeader(
212212
when (isEnabled) {
213213
true -> {
214214
snackbarHostState.showSnackbar(
215-
message = context.getString(R.string.show_developer_settings_already_enabled),
215+
message = alreadyEnabledMessage,
216216
duration = SnackbarDuration.Short
217217
)
218218
}
219219

220220
false -> {
221221
snackbarHostState.showSnackbar(
222-
message = context.getString(R.string.show_developer_settings_enabled),
222+
message = enabledMessage,
223223
duration = SnackbarDuration.Short
224224
)
225225
}

app/src/main/java/org/wikipedia/yearinreview/YearInReviewGeoSlide.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ fun GeoScreenContent(
8686
val markerPaintSrcIn: Paint = remember { PlacesFragment.getMarkerPaintSrcIn() }
8787
val markerBorderPaint: Paint = remember { PlacesFragment.getMarkerBorderPaint(context) }
8888
val markerBitmapBase: Bitmap = remember { PlacesFragment.getMarkerBitmapBase(context) }
89+
val mediaWikiFaqUrl = stringResource(R.string.year_in_review_media_wiki_faq_url)
8990

9091
DisposableEffect(lifecycleOwner) {
9192
val observer = LifecycleEventObserver { _, event ->
@@ -230,7 +231,7 @@ fun GeoScreenContent(
230231
onClick = {
231232
UriUtil.handleExternalLink(
232233
context = context,
233-
uri = context.getString(R.string.year_in_review_media_wiki_faq_url).toUri()
234+
uri = mediaWikiFaqUrl.toUri()
234235
)
235236
}) {
236237
Icon(

app/src/main/java/org/wikipedia/yearinreview/YearInReviewOnboardingScreen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ fun YearInReviewOnboardingBottomBar(
148148
onGetStartedClick: () -> Unit
149149
) {
150150
val context = LocalContext.current
151+
val mediaWikiUrl = stringResource(R.string.year_in_review_media_wiki_url)
151152
BottomAppBar(
152153
containerColor = WikipediaTheme.colors.paperColor,
153154
content = {
@@ -168,7 +169,7 @@ fun YearInReviewOnboardingBottomBar(
168169
YearInReviewEvent.submit(action = "learn_click", slide = "explore_prompt")
169170
UriUtil.handleExternalLink(
170171
context = context,
171-
uri = context.getString(R.string.year_in_review_media_wiki_url).toUri()
172+
uri = mediaWikiUrl.toUri()
172173
)
173174
}
174175
) {

app/src/main/java/org/wikipedia/yearinreview/YearInReviewScreenCaptureHandler.kt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.graphics.Bitmap
44
import androidx.compose.runtime.Composable
55
import androidx.compose.runtime.rememberCoroutineScope
66
import androidx.compose.ui.platform.LocalContext
7+
import androidx.compose.ui.res.stringResource
78
import org.wikipedia.R
89
import org.wikipedia.util.ShareUtil
910

@@ -14,16 +15,20 @@ fun YearInReviewScreenCaptureHandler(
1415
) {
1516
val coroutineScope = rememberCoroutineScope()
1617
val context = LocalContext.current
18+
val shareUrl = stringResource(R.string.year_in_review_share_url)
19+
val shareBodyFormat = stringResource(R.string.year_in_review_share_body)
20+
val hashtag = stringResource(R.string.year_in_review_hashtag)
21+
val shareSubject = stringResource(R.string.year_in_review_share_subject)
1722

1823
val shareImageCallback: (Bitmap) -> Unit = { bitmap ->
19-
val googlePlayUrl = context.getString(R.string.year_in_review_share_url) + YearInReviewViewModel.YIR_TAG
20-
val bodyText = context.getString(R.string.year_in_review_share_body, googlePlayUrl, context.getString(R.string.year_in_review_hashtag))
24+
val googlePlayUrl = shareUrl + YearInReviewViewModel.YIR_TAG
25+
val bodyText = String.format(shareBodyFormat, googlePlayUrl, hashtag)
2126
ShareUtil.shareImage(
2227
coroutineScope = coroutineScope,
2328
context = context,
2429
bmp = bitmap,
2530
imageFileName = YearInReviewViewModel.YIR_TAG,
26-
subject = context.getString(R.string.year_in_review_share_subject),
31+
subject = shareSubject,
2732
text = bodyText,
2833
onShared = onComplete
2934
)

app/src/main/java/org/wikipedia/yearinreview/YearInReviewScreenDeck.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,7 @@ private fun StandardScreenContent(
451451
) {
452452
val headerAspectRatio = 3f / 2f
453453
val context = LocalContext.current
454+
val mediaWikiFaqUrl = stringResource(R.string.year_in_review_media_wiki_faq_url)
454455
Column(
455456
verticalArrangement = Arrangement.Top,
456457
modifier = modifier
@@ -475,7 +476,7 @@ private fun StandardScreenContent(
475476
onClick = {
476477
UriUtil.handleExternalLink(
477478
context = context,
478-
uri = context.getString(R.string.year_in_review_media_wiki_faq_url).toUri()
479+
uri = mediaWikiFaqUrl.toUri()
479480
)
480481
}) {
481482
Icon(

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ swiperefreshlayout = "1.2.0"
4747
uiautomator = "2.3.0"
4848
viewpager2 = "1.1.0"
4949
workRuntimeKtx = "2.11.0"
50-
composeBom = "2025.11.01"
50+
composeBom = "2025.12.00"
5151
composeActivity = "1.12.1"
5252
composeViewModel = "2.10.0"
5353

0 commit comments

Comments
 (0)