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

feat(wifi): introduce BLE-based WiFi provisioning for nymea-compatible devices (#4968)
Some checks are pending
Dependency Submission / dependency-submission (push) Waiting to run
Main CI (Verify & Build) / validate-and-build (push) Waiting to run
Main Push Changelog / Generate main push changelog (push) Waiting to run

Browse source
This commit is contained in:
James Rich 2026-04-02 12:31:17 -05:00 • committed by GitHub
parent 1fee6c4431
commit 7e041c00e1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
38 changed files with 3326 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

6
feature/messaging/src/commonMain/kotlin/org/meshtastic/feature/messaging/ui/contact/Contacts.kt
View file

@ -62,6 +62,7 @@ import kotlinx.coroutines.launch
import org.jetbrains.compose.resources.pluralStringResource
import org.jetbrains.compose.resources.stringResource
import org.meshtastic.core.common.util.MeshtasticUri
import org.meshtastic.core.common.util.NumberFormatter
import org.meshtastic.core.common.util.nowMillis
import org.meshtastic.core.model.Contact
import org.meshtastic.core.model.ContactSettings
@ -368,10 +369,11 @@ private fun MuteNotificationsDialog(
val remaining = settings.muteUntil - now
if (remaining > 0) {
val (days, hours) = formatMuteRemainingTime(remaining)
val hoursFormatted = NumberFormatter.format(hours, 1)
if (days >= 1) {
stringResource(Res.string.mute_status_muted_for_days, days, hours)
stringResource(Res.string.mute_status_muted_for_days, days, hoursFormatted)
} else {
stringResource(Res.string.mute_status_muted_for_hours, hours)
stringResource(Res.string.mute_status_muted_for_hours, hoursFormatted)
}
} else {
stringResource(Res.string.mute_status_unmuted)