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: add MQTT Map Reporting consent (#2006)

Browse source 
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
James Rich 2025-06-03 10:39:58 -05:00 • committed by GitHub
parent e4313e0bd3
commit 3115bbe58d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 360 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/geeksville/mesh/ui/common/components/PositionPrecisionPreference.kt
View file

@ -39,9 +39,9 @@ import kotlin.math.roundToInt
private const val PositionEnabled = 32
private const val PositionDisabled = 0
const val PositionPrecisionMin = 10
const val PositionPrecisionMax = 19
const val PositionPrecisionDefault = 13
const val PositionPrecisionMin = 12
const val PositionPrecisionMax = 15
const val PositionPrecisionDefault = 14
@Suppress("MagicNumber")
fun precisionBitsToMeters(bits: Int): Double = 23905787.925008 * 0.5.pow(bits.toDouble())

87
app/src/main/java/com/geeksville/mesh/ui/common/components/SwitchPreference.kt
View file

@ -17,18 +17,14 @@
package com.geeksville.mesh.ui.common.components
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.selection.toggleable
import androidx.compose.material3.ListItem
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.ListItemDefaults
import androidx.compose.material3.Switch
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.tooling.preview.Preview
@ -36,78 +32,57 @@ import androidx.compose.ui.unit.dp
@Composable
fun SwitchPreference(
modifier: Modifier = Modifier,
title: String,
summary: String,
summary: String = "",
checked: Boolean,
enabled: Boolean,
onCheckedChange: (Boolean) -> Unit,
modifier: Modifier = Modifier,
padding: PaddingValues? = null,
containerColor: Color? = null,
) {
val color = if (enabled) {
Color.Unspecified
} else {
MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f)
}
ListItem(
modifier = modifier,
colors = ListItemDefaults.colors().copy(
headlineColor = if (enabled) {
ListItemDefaults.colors().headlineColor
} else {
ListItemDefaults.colors().headlineColor.copy(alpha = 0.5f)
},
supportingTextColor = if (enabled) {
ListItemDefaults.colors().supportingTextColor
} else {
ListItemDefaults.colors().supportingTextColor.copy(alpha = 0.5f)
},
containerColor = containerColor ?: ListItemDefaults.colors().containerColor,
),
modifier = (padding?.let { Modifier.padding(it) } ?: modifier).toggleable(
value = checked,
enabled = enabled,
onValueChange = onCheckedChange,
),
trailingContent = {
Switch(
enabled = enabled,
checked = checked,
onCheckedChange = onCheckedChange,
onCheckedChange = null,
)
},
supportingContent = {
Text(
text = summary,
modifier = Modifier.padding(bottom = 16.dp),
color = color,
)
if (summary.isNotEmpty()) {
Text(
text = summary,
modifier = Modifier.padding(bottom = 16.dp),
)
}
},
headlineContent = {
Text(
text = title,
color = color,
)
}
)
}
@Composable
fun SwitchPreference(
title: String,
checked: Boolean,
enabled: Boolean,
onCheckedChange: (Boolean) -> Unit,
modifier: Modifier = Modifier,
padding: PaddingValues = PaddingValues(horizontal = 16.dp),
) {
Row(
modifier = modifier
.fillMaxWidth()
.size(48.dp)
.padding(padding),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
Text(
text = title,
style = MaterialTheme.typography.bodyLarge,
color = if (enabled) {
Color.Unspecified
} else {
MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f)
},
)
Switch(
enabled = enabled,
checked = checked,
onCheckedChange = onCheckedChange,
)
}
}
@Preview(showBackground = true)
@Composable
private fun SwitchPreferencePreview() {