Merge branch 'develop' into l10n_develop

patrickunterwegs · web-flow · commit a2eb8f9ec008 · 2026-01-09T14:18:39.000+01:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -41,8 +41,8 @@ android {
         applicationId = "at.techbee.jtx"
         minSdk = 23
         targetSdk = 36
-        versionCode = 215000004
-        versionName = "2.15.00"      // keep -release as a suffix also for release, build flavor adds the suffix e.g. .gplay (e.g. 1.00.00-rc0.gplay)
+        versionCode = 215010001
+        versionName = "2.15.01"      // keep -release as a suffix also for release, build flavor adds the suffix e.g. .gplay (e.g. 1.00.00-rc0.gplay)
         buildConfigField("String", "versionCodename", "\"Love knows no borders \uD83C\uDF08\"")
         multiDexEnabled = true
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/at/techbee/jtx/ui/about/AboutContributors.kt b/app/src/main/java/at/techbee/jtx/ui/about/AboutContributors.kt
@@ -91,9 +91,11 @@ fun AboutContributors(
         }
 
         item {
+            val ffgUrl = stringResource(R.string.link_ffg)
+
             ElevatedCard(
                 onClick = {
-                    context.startActivity(Intent(Intent.ACTION_VIEW, context.getString(R.string.link_ffg).toUri()))
+                    context.startActivity(Intent(Intent.ACTION_VIEW, ffgUrl.toUri()))
                 },
                 modifier = Modifier.padding(top = 8.dp)
             ) {
@@ -111,7 +113,7 @@ fun AboutContributors(
                     textAlign = TextAlign.Center
                 )
                 Text(
-                    text = stringResource(id = R.string.link_ffg),
+                    text = ffgUrl,
                     style = Typography.titleMedium,
                     modifier = Modifier
                         .fillMaxWidth()
diff --git a/app/src/main/java/at/techbee/jtx/ui/about/AboutJtx.kt b/app/src/main/java/at/techbee/jtx/ui/about/AboutJtx.kt
@@ -106,18 +106,20 @@ fun AboutJtx(modifier: Modifier = Modifier) {
                 modifier = Modifier.padding(top = 12.dp),
                 style = Typography.titleMedium,
             )
+
+            val jtxTermsUrl = stringResource(id = R.string.link_jtx_terms)
             TextButton(
                 content = {
                     Text(
-                        text = stringResource(id = R.string.link_jtx_terms),
+                        text = jtxTermsUrl,
                         style = Typography.bodyLarge,
                     )
                 },
                 onClick = {
                     context.startActivity(
                         Intent(
                             Intent.ACTION_VIEW,
-                            context.getString(R.string.link_jtx_terms).toUri()
+                            jtxTermsUrl.toUri()
                         )
                     )
                 }
diff --git a/app/src/main/java/at/techbee/jtx/ui/collections/CollectionsScreen.kt b/app/src/main/java/at/techbee/jtx/ui/collections/CollectionsScreen.kt
@@ -133,6 +133,7 @@ fun CollectionsScreen(
         )
     }
 
+    val collectionsToastXItemsAdded = stringResource(R.string.collections_toast_x_items_added, resultImportTxtFilepaths.size)
     LaunchedEffect(resultImportTxtFilepaths, importCollection, importModule) {
         // import from file uri
         if(importModule == null) {
@@ -165,7 +166,7 @@ fun CollectionsScreen(
             }
             Toast.makeText(
                 context,
-                context.getString(R.string.collections_toast_x_items_added, resultImportTxtFilepaths.size),
+                collectionsToastXItemsAdded,
                 Toast.LENGTH_LONG
             ).show()
             importCollection = null
@@ -198,11 +199,12 @@ fun CollectionsScreen(
 
     // show result
     val insertResult by collectionsViewModel.resultInsertedFromICS.observeAsState()
+    val snackbarTextXItemsAdded = stringResource(id = R.string.collections_snackbar_x_items_added, insertResult?.first?:0, insertResult?.second?:0)
     LaunchedEffect(insertResult) {
         insertResult?.let {
             Toast.makeText(
                 context,
-                context.getString(R.string.collections_snackbar_x_items_added, it.first, it.second),
+                snackbarTextXItemsAdded,
                 Toast.LENGTH_LONG
             ).show()
             snackbarHostState.currentSnackbarData?.dismiss()
@@ -219,10 +221,13 @@ fun CollectionsScreen(
             onDismiss = { showCollectionsAddDialog = false }
         )
 
+    val biometricPromptTitle = stringResource(id = R.string.collections_biometric_protected_entries_locked_title)
+    val biometricPromptSubtitle = stringResource(id = R.string.collections_biometric_protected_entries_locked_subtitle)
+    val biometricPromptCancel = stringResource(id = R.string.cancel)
     val biometricPromptInfo: BiometricPrompt.PromptInfo = BiometricPrompt.PromptInfo.Builder()
-        .setTitle(context.getString(R.string.collections_biometric_protected_entries_locked_title))
-        .setSubtitle(context.getString(R.string.collections_biometric_protected_entries_locked_subtitle))
-        .setNegativeButtonText(context.getString(R.string.cancel))
+        .setTitle(biometricPromptTitle)
+        .setSubtitle(biometricPromptSubtitle)
+        .setNegativeButtonText(biometricPromptCancel)
         .build()
 
     Scaffold(
diff --git a/app/src/main/java/at/techbee/jtx/ui/detail/DetailBottomAppBar.kt b/app/src/main/java/at/techbee/jtx/ui/detail/DetailBottomAppBar.kt
@@ -365,13 +365,14 @@ fun DetailBottomAppBar(
             }
         },
         floatingActionButton = {
-            // TODO(b/228588827): Replace with Secondary FAB when available.
+            val sanckbarBuyproRemoteEntriesBlockedText = stringResource(id = R.string.buypro_snackbar_remote_entries_blocked)
+
             FloatingActionButton(
                 onClick = {
                     if (!isProActionAvailable)
                         Toast.makeText(
                             context,
-                            context.getText(R.string.buypro_snackbar_remote_entries_blocked),
+                            sanckbarBuyproRemoteEntriesBlockedText,
                             Toast.LENGTH_LONG
                         ).show()
                     else if (!collection.readonly)
diff --git a/app/src/main/java/at/techbee/jtx/ui/detail/DetailsCardDates.kt b/app/src/main/java/at/techbee/jtx/ui/detail/DetailsCardDates.kt
@@ -63,6 +63,8 @@ fun DetailsCardDates(
     var completed by remember { mutableStateOf(icalObject.completed) }
     var completedTimezone by remember { mutableStateOf(icalObject.completedTimezone) }
 
+    val validationErrorToastText = stringResource(id = R.string.edit_validation_errors_dialog_due_date_before_dtstart)
+
     ElevatedCard(modifier = modifier) {
         Column(
             modifier = Modifier.fillMaxWidth().padding(if(isEditMode) 4.dp else 0.dp),
@@ -76,7 +78,7 @@ fun DetailsCardDates(
                     isEditMode = isEditMode,
                     onDateTimeChanged = { datetime, timezone ->
                         if((due ?: Long.MAX_VALUE) <= (datetime ?: Long.MIN_VALUE)) {
-                            Toast.makeText(context, context.getText(R.string.edit_validation_errors_dialog_due_date_before_dtstart), Toast.LENGTH_LONG).show()
+                            Toast.makeText(context, validationErrorToastText, Toast.LENGTH_LONG).show()
                         } else {
                             dtstart = datetime
                             dtstartTimezone = timezone
@@ -120,7 +122,7 @@ fun DetailsCardDates(
                         if((datetime ?: Long.MAX_VALUE) <= (dtstart ?: Long.MIN_VALUE)) {
                             Toast.makeText(
                                 context,
-                                context.getText(R.string.edit_validation_errors_dialog_due_date_before_dtstart),
+                                validationErrorToastText,
                                 Toast.LENGTH_LONG
                             ).show()
                         } else {
diff --git a/app/src/main/java/at/techbee/jtx/ui/detail/DetailsCardRecur.kt b/app/src/main/java/at/techbee/jtx/ui/detail/DetailsCardRecur.kt
@@ -8,6 +8,7 @@
 
 package at.techbee.jtx.ui.detail
 
+import android.annotation.SuppressLint
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -75,6 +76,7 @@ import java.util.Locale
 import kotlin.math.absoluteValue
 
 
+@SuppressLint("LocalContextGetResourceValueCall")
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
 fun DetailsCardRecur(
diff --git a/app/src/main/java/at/techbee/jtx/ui/detail/DetailsScreen.kt b/app/src/main/java/at/techbee/jtx/ui/detail/DetailsScreen.kt
@@ -413,6 +413,8 @@ fun DetailsScreen(
                                     )
                                 }
                             )
+
+                            val copiedToClipboardToastMessage = stringResource(id = R.string.menu_view_copy_to_clipboard_copied)
                             DropdownMenuItem(
                                 text = { Text(text = stringResource(id = R.string.menu_view_copy_to_clipboard)) },
                                 onClick = {
@@ -427,7 +429,7 @@ fun DetailsScreen(
                                                 val clipboardManager = context.getSystemService(CLIPBOARD_SERVICE) as ClipboardManager
                                                 clipboardManager.setPrimaryClip(ClipData.newPlainText("", text))
                                                 if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2)            // Only show a toast for Android 12 and lower.
-                                                    detailViewModel.toastMessage.value = context.getString(R.string.menu_view_copy_to_clipboard_copied)
+                                                    detailViewModel.toastMessage.value = copiedToClipboardToastMessage
                                             }
                                     }
                                     menuExpanded.value = false
diff --git a/app/src/main/java/at/techbee/jtx/ui/donate/DonateScreen.kt b/app/src/main/java/at/techbee/jtx/ui/donate/DonateScreen.kt
@@ -141,17 +141,18 @@ fun DonateScreenContent(modifier: Modifier = Modifier) {
             textAlign = TextAlign.Center
         )
 
+        val paypalUrl = stringResource(id = R.string.link_paypal)
         TextButton(onClick = {
             context.startActivity(
                 Intent(
                     Intent.ACTION_VIEW,
-                    context.getString(R.string.link_paypal).toUri()
+                    paypalUrl.toUri()
                 )
             )
         }) {
             Image(
                 painter = painterResource(id = R.drawable.paypal),
-                contentDescription = null,
+                contentDescription = paypalUrl,
                 modifier = Modifier
                     .size(200.dp, 100.dp)
             )
@@ -165,10 +166,11 @@ fun DonateScreenContent(modifier: Modifier = Modifier) {
             textAlign = TextAlign.Center
         )
 
+        val contributeUrl = stringResource(id = R.string.link_jtx_contribute)
         TextButton(
             content = {
                 Text(
-                    text = stringResource(id = R.string.link_jtx_donate),
+                    text = contributeUrl,
                     style = Typography.titleLarge,
                     fontWeight = FontWeight.Bold,
                     textAlign = TextAlign.Center
@@ -179,7 +181,7 @@ fun DonateScreenContent(modifier: Modifier = Modifier) {
                 context.startActivity(
                     Intent(
                         Intent.ACTION_VIEW,
-                        context.getString(R.string.link_jtx_donate).toUri()
+                        contributeUrl.toUri()
                     )
                 )
             }
diff --git a/app/src/main/java/at/techbee/jtx/ui/list/ListScreenKanban.kt b/app/src/main/java/at/techbee/jtx/ui/list/ListScreenKanban.kt
@@ -8,6 +8,7 @@
 
 package at.techbee.jtx.ui.list
 
+import android.annotation.SuppressLint
 import android.content.Context.VIBRATOR_MANAGER_SERVICE
 import android.content.Context.VIBRATOR_SERVICE
 import android.media.MediaPlayer
@@ -66,6 +67,7 @@ import kotlin.math.abs
 import kotlin.math.roundToInt
 
 
+@SuppressLint("LocalContextGetResourceValueCall")
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun ListScreenKanban(
diff --git a/app/src/main/java/at/techbee/jtx/ui/list/ListScreenTabContainer.kt b/app/src/main/java/at/techbee/jtx/ui/list/ListScreenTabContainer.kt
@@ -203,6 +203,8 @@ fun ListScreenTabContainer(
         }
     }
 
+    val toastMessageListExported = stringResource(R.string.list_toast_export_success)
+    val toastMessageListExportError = stringResource(R.string.list_toast_export_error)
     val launcherExportToCSV = rememberLauncherForActivityResult(CreateDocument("text/csv")) {
         it?.let { uri ->
             //isProcessing.postValue(true)
@@ -217,9 +219,9 @@ fun ListScreenTabContainer(
                         //Log.d("CSV", csvData.joinToString(separator = System.lineSeparator()))
                         outputStream.write(csvData.joinToString(separator = System.lineSeparator()).toByteArray())
                     }
-                    listViewModel.toastMessage.value = context.getString(R.string.list_toast_export_success)
+                    listViewModel.toastMessage.value = toastMessageListExported
                 } catch (_: IOException) {
-                    listViewModel.toastMessage.value = context.getString(R.string.list_toast_export_error)
+                    listViewModel.toastMessage.value = toastMessageListExportError
                 }
             }
         }
@@ -688,6 +690,12 @@ fun ListScreenTabContainer(
                             || (listViewModel.module == Module.NOTE && collection.supportsVJOURNAL)
                             || (listViewModel.module == Module.TODO && collection.supportsVTODO)
                 }) {
+
+                    val biometricPromptTitle = stringResource(R.string.settings_protect_biometric)
+                    val biometricPromptSubtitle = stringResource(R.string.settings_protect_biometric_info_on_unlock)
+                    val biometricPromptCancel = stringResource(R.string.cancel)
+
+
                 ListBottomAppBar(
                     module = listViewModel.module,
                     iCal4ListRel = iCal4ListRel,
@@ -748,9 +756,9 @@ fun ListScreenTabContainer(
                             globalStateHolder.isAuthenticated.value = false
                         } else {
                             val promptInfo: BiometricPrompt.PromptInfo = BiometricPrompt.PromptInfo.Builder()
-                                .setTitle(context.getString(R.string.settings_protect_biometric))
-                                .setSubtitle(context.getString(R.string.settings_protect_biometric_info_on_unlock))
-                                .setNegativeButtonText(context.getString(R.string.cancel))
+                                .setTitle(biometricPromptTitle)
+                                .setSubtitle(biometricPromptSubtitle)
+                                .setNegativeButtonText(biometricPromptCancel)
                                 .build()
                             globalStateHolder.biometricPrompt?.authenticate(promptInfo)
                         }
diff --git a/app/src/main/java/at/techbee/jtx/ui/presets/PresetsScreen.kt b/app/src/main/java/at/techbee/jtx/ui/presets/PresetsScreen.kt
@@ -73,6 +73,11 @@ fun PresetsScreen(
     val extendedStatuses by database.getStoredStatuses().observeAsState(emptyList())
     val storedListSettings by database.getStoredListSettings(modules = listOf(Module.JOURNAL.name, Module.NOTE.name, Module.TODO.name)).observeAsState(emptyList())
 
+    val toastMessagePresetsSaved = stringResource(id = R.string.presets_saved)
+    val toastMessagePresetsExportError = stringResource(id = R.string.presets_export_error)
+    val toastMessagePresetsImported = stringResource(id = R.string.presets_imported)
+    val toastMessagePresetsImportInvalidFile = stringResource(id = R.string.presets_import_invalid_file)
+
     val launcherExportPresets = rememberLauncherForActivityResult(
         ActivityResultContracts.CreateDocument("application/json")
     ) { exportPresetsFilepath ->
@@ -92,10 +97,10 @@ fun PresetsScreen(
                 context.contentResolver?.openOutputStream(exportPresetsFilepath)?.use { outputStream ->
                     outputStream.write(presetDataJson.toByteArray())
                 }
-                context.getString(R.string.presets_saved)
+                toastMessage = toastMessagePresetsSaved
             }
         } catch (_: IOException) {
-            toastMessage= context.getString(R.string.presets_export_error)
+            toastMessage= toastMessagePresetsExportError
         }
     }
 
@@ -108,7 +113,7 @@ fun PresetsScreen(
             val presetData = try {
                 Json.decodeFromString<PresetData>(presetDataJson)
             } catch (_: Exception) {
-                toastMessage = context.getString(R.string.presets_import_invalid_file)
+                toastMessage = toastMessagePresetsImportInvalidFile
                 return@rememberLauncherForActivityResult
             }
             Log.d("presetDataJsonImport", presetDataJson)
@@ -123,7 +128,7 @@ fun PresetsScreen(
                         it.id = 0L
                     database.upsertStoredListSetting(it)
                 }
-                toastMessage = context.getString(R.string.presets_imported)
+                toastMessage = toastMessagePresetsImported
             }
         }
     }
diff --git a/app/src/main/java/at/techbee/jtx/ui/reusable/dialogs/SelectModuleForTxtImportDialog.kt b/app/src/main/java/at/techbee/jtx/ui/reusable/dialogs/SelectModuleForTxtImportDialog.kt
@@ -1,17 +1,31 @@
 package at.techbee.jtx.ui.reusable.dialogs
 
 import android.net.Uri
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.ElevatedFilterChip
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.core.net.toUri
 import at.techbee.jtx.R
 import at.techbee.jtx.database.Module
 
@@ -38,15 +52,19 @@ fun SelectModuleForTxtImportDialog(
                 FlowRow(
                     horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterHorizontally),
                 ) {
-                    Module.values().forEach { module ->
+                    val jounalText = stringResource(R.string.journal)
+                    val noteText = stringResource(R.string.note)
+                    val taskText = stringResource(R.string.task)
+
+                    Module.entries.forEach { module ->
                         ElevatedFilterChip(
                             selected = module == selected,
                             onClick = { selected = module },
                             label = { Text(
                                 when(module) {
-                                    Module.JOURNAL -> context.getString(R.string.journal)
-                                    Module.NOTE -> context.getString(R.string.note)
-                                    Module.TODO -> context.getString(R.string.task)
+                                    Module.JOURNAL -> jounalText
+                                    Module.NOTE -> noteText
+                                    Module.TODO -> taskText
                                 }
                             ) }
                         )
@@ -85,7 +103,7 @@ fun SelectModuleForTxtImportDialog_Preview() {
     MaterialTheme {
 
         SelectModuleForTxtImportDialog(
-            files = listOf(Uri.parse("https://www.techbee.at/datei.txt"), Uri.parse("content://xxx/datei2.md")),
+            files = listOf("https://www.techbee.at/datei.txt".toUri(), "content://xxx/datei2.md".toUri()),
             onModuleSelected = { },
             onDismiss = { }
         )
diff --git a/app/src/main/java/at/techbee/jtx/ui/reusable/elements/AudioPlaybackElement.kt b/app/src/main/java/at/techbee/jtx/ui/reusable/elements/AudioPlaybackElement.kt
diff --git a/app/src/main/java/at/techbee/jtx/ui/reusable/elements/CollectionsSpinner.kt b/app/src/main/java/at/techbee/jtx/ui/reusable/elements/CollectionsSpinner.kt
diff --git a/app/src/main/java/at/techbee/jtx/ui/settings/SettingsScreen.kt b/app/src/main/java/at/techbee/jtx/ui/settings/SettingsScreen.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml

Original file line number	Diff line number	Diff line change
`@@ -106,18 +106,20 @@ fun AboutJtx(modifier: Modifier = Modifier) {`
`106`	`106`	`modifier = Modifier.padding(top = 12.dp),`
`107`	`107`	`style = Typography.titleMedium,`
`108`	`108`	`)`
	`109`	`+`
	`110`	`+ val jtxTermsUrl = stringResource(id = R.string.link_jtx_terms)`
`109`	`111`	`TextButton(`
`110`	`112`	`content = {`
`111`	`113`	`Text(`
`112`		`- text = stringResource(id = R.string.link_jtx_terms),`
	`114`	`+ text = jtxTermsUrl,`
`113`	`115`	`style = Typography.bodyLarge,`
`114`	`116`	`)`
`115`	`117`	`},`
`116`	`118`	`onClick = {`
`117`	`119`	`context.startActivity(`
`118`	`120`	`Intent(`
`119`	`121`	`Intent.ACTION_VIEW,`
`120`		`- context.getString(R.string.link_jtx_terms).toUri()`
	`122`	`+ jtxTermsUrl.toUri()`
`121`	`123`	`)`
`122`	`124`	`)`
`123`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -413,6 +413,8 @@ fun DetailsScreen(`
`413`	`413`	`)`
`414`	`414`	`}`
`415`	`415`	`)`
	`416`	`+`
	`417`	`+ val copiedToClipboardToastMessage = stringResource(id = R.string.menu_view_copy_to_clipboard_copied)`
`416`	`418`	`DropdownMenuItem(`
`417`	`419`	`text = { Text(text = stringResource(id = R.string.menu_view_copy_to_clipboard)) },`
`418`	`420`	`onClick = {`
`@@ -427,7 +429,7 @@ fun DetailsScreen(`
`427`	`429`	`val clipboardManager = context.getSystemService(CLIPBOARD_SERVICE) as ClipboardManager`
`428`	`430`	`clipboardManager.setPrimaryClip(ClipData.newPlainText("", text))`
`429`	`431`	`if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) // Only show a toast for Android 12 and lower.`
`430`		`- detailViewModel.toastMessage.value = context.getString(R.string.menu_view_copy_to_clipboard_copied)`
	`432`	`+ detailViewModel.toastMessage.value = copiedToClipboardToastMessage`
`431`	`433`	`}`
`432`	`434`	`}`
`433`	`435`	`menuExpanded.value = false`
Original file line number	Diff line number	Diff line change
`@@ -141,17 +141,18 @@ fun DonateScreenContent(modifier: Modifier = Modifier) {`
`141`	`141`	`textAlign = TextAlign.Center`
`142`	`142`	`)`
`143`	`143`
	`144`	`+ val paypalUrl = stringResource(id = R.string.link_paypal)`
`144`	`145`	`TextButton(onClick = {`
`145`	`146`	`context.startActivity(`
`146`	`147`	`Intent(`
`147`	`148`	`Intent.ACTION_VIEW,`
`148`		`- context.getString(R.string.link_paypal).toUri()`
	`149`	`+ paypalUrl.toUri()`
`149`	`150`	`)`
`150`	`151`	`)`
`151`	`152`	`}) {`
`152`	`153`	`Image(`
`153`	`154`	`painter = painterResource(id = R.drawable.paypal),`
`154`		`- contentDescription = null,`
	`155`	`+ contentDescription = paypalUrl,`
`155`	`156`	`modifier = Modifier`
`156`	`157`	`.size(200.dp, 100.dp)`
`157`	`158`	`)`
`@@ -165,10 +166,11 @@ fun DonateScreenContent(modifier: Modifier = Modifier) {`
`165`	`166`	`textAlign = TextAlign.Center`
`166`	`167`	`)`
`167`	`168`
	`169`	`+ val contributeUrl = stringResource(id = R.string.link_jtx_contribute)`
`168`	`170`	`TextButton(`
`169`	`171`	`content = {`
`170`	`172`	`Text(`
`171`		`- text = stringResource(id = R.string.link_jtx_donate),`
	`173`	`+ text = contributeUrl,`
`172`	`174`	`style = Typography.titleLarge,`
`173`	`175`	`fontWeight = FontWeight.Bold,`
`174`	`176`	`textAlign = TextAlign.Center`
`@@ -179,7 +181,7 @@ fun DonateScreenContent(modifier: Modifier = Modifier) {`
`179`	`181`	`context.startActivity(`
`180`	`182`	`Intent(`
`181`	`183`	`Intent.ACTION_VIEW,`
`182`		`- context.getString(R.string.link_jtx_donate).toUri()`
	`184`	`+ contributeUrl.toUri()`
`183`	`185`	`)`
`184`	`186`	`)`
`185`	`187`	`}`