meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use Resources for string access (#3620)

Browse source
This commit is contained in:
Phil Oliver 2025-11-05 00:59:45 -05:00 • committed by GitHub
parent 0833a6767e
commit 8b83273a4f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 59 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

16
feature/node/src/main/kotlin/org/meshtastic/feature/node/component/FirmwareReleaseSheetContent.kt
View file

@ -39,6 +39,7 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalResources
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.core.net.toUri
@ -50,6 +51,7 @@ import org.meshtastic.core.strings.R as Res
@Composable
fun FirmwareReleaseSheetContent(firmwareRelease: FirmwareRelease, modifier: Modifier = Modifier) {
val context = LocalContext.current
val resources = LocalResources.current
Column(
modifier = modifier.verticalScroll(rememberScrollState()).padding(16.dp).fillMaxWidth(),
verticalArrangement = Arrangement.spacedBy(8.dp),
@ -64,7 +66,12 @@ fun FirmwareReleaseSheetContent(firmwareRelease: FirmwareRelease, modifier: Modi
val intent = Intent(Intent.ACTION_VIEW, firmwareRelease.pageUrl.toUri())
context.startActivity(intent)
} catch (e: ActivityNotFoundException) {
Toast.makeText(context, Res.string.error_no_app_to_handle_link, Toast.LENGTH_LONG).show()
Toast.makeText(
context,
resources.getString(Res.string.error_no_app_to_handle_link),
Toast.LENGTH_LONG,
)
.show()
Timber.e(e)
}
},
@ -80,7 +87,12 @@ fun FirmwareReleaseSheetContent(firmwareRelease: FirmwareRelease, modifier: Modi
val intent = Intent(Intent.ACTION_VIEW, firmwareRelease.zipUrl.toUri())
context.startActivity(intent)
} catch (e: ActivityNotFoundException) {
Toast.makeText(context, Res.string.error_no_app_to_handle_link, Toast.LENGTH_LONG).show()
Toast.makeText(
context,
resources.getString(Res.string.error_no_app_to_handle_link),
Toast.LENGTH_LONG,
)
.show()
Timber.e(e)
}
},

4
feature/node/src/main/kotlin/org/meshtastic/feature/node/component/NodeMenu.kt
View file

@ -39,7 +39,7 @@ fun NodeActionDialogs(
title = Res.string.favorite,
text =
stringResource(
id = if (node.isFavorite) Res.string.favorite_remove else Res.string.favorite_add,
if (node.isFavorite) Res.string.favorite_remove else Res.string.favorite_add,
node.user.longName,
),
onConfirm = {
@ -54,7 +54,7 @@ fun NodeActionDialogs(
title = Res.string.ignore,
text =
stringResource(
id = if (node.isIgnored) Res.string.ignore_remove else Res.string.ignore_add,
if (node.isIgnored) Res.string.ignore_remove else Res.string.ignore_add,
node.user.longName,
),
onConfirm = {