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

Added relays count (#3773)

Browse source 
Signed-off-by: Benjamin Faershtein <119711889+RCGV1@users.noreply.github.com>
Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: James Rich <2199651+jamesarich@users.noreply.github.com>
This commit is contained in:
Benjamin Faershtein 2025-11-24 16:30:44 -08:00 • committed by GitHub
parent 0d00c838b0
commit 022652efe5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
feature/messaging/src/main/kotlin/org/meshtastic/feature/messaging/DeliveryInfoDialog.kt
View file

@ -30,18 +30,21 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import org.jetbrains.compose.resources.StringResource
import org.jetbrains.compose.resources.pluralStringResource
import org.jetbrains.compose.resources.stringResource
import org.meshtastic.core.strings.Res
import org.meshtastic.core.strings.close
import org.meshtastic.core.strings.relayed_by
import org.meshtastic.core.strings.relays
import org.meshtastic.core.strings.resend
@Suppress("UnusedParameter")
@Composable
fun DeliveryInfo(
title: StringResource,
resendOption: Boolean,
text: StringResource? = null,
relayNodeName: String? = null,
relays: Int = 0,
onConfirm: (() -> Unit) = {},
onDismiss: () -> Unit = {},
) = AlertDialog(
@ -75,9 +78,9 @@ fun DeliveryInfo(
style = MaterialTheme.typography.bodyMedium,
)
}
relayNodeName?.let {
if (relays != 0) {
Text(
text = stringResource(Res.string.relayed_by, it),
text = pluralStringResource(Res.plurals.relays, relays, relays),
modifier = Modifier.padding(top = 8.dp),
textAlign = TextAlign.Center,
style = MaterialTheme.typography.bodyMedium,

1
feature/messaging/src/main/kotlin/org/meshtastic/feature/messaging/MessageListPaged.kt
View file

@ -397,6 +397,7 @@ internal fun MessageStatusDialog(
resendOption = resendOption,
text = text,
relayNodeName = relayNodeName,
relays = message.relays,
onConfirm = onResend,
onDismiss = onDismiss,
)