feat: Provide Navigation to Input Timezone (#2003)

This commit is contained in:
Robert-0410 2025-06-03 08:31:08 -07:00 committed by GitHub
parent 43b6e54bbb
commit e4313e0bd3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 153 additions and 56 deletions

View file

@ -74,6 +74,8 @@ import com.geeksville.mesh.BuildConfig
import com.geeksville.mesh.R
import com.geeksville.mesh.model.DeviceVersion
import com.geeksville.mesh.model.UIViewModel
import com.geeksville.mesh.navigation.ChannelsRoutes
import com.geeksville.mesh.navigation.ConnectionsRoutes
import com.geeksville.mesh.navigation.NavGraph
import com.geeksville.mesh.navigation.Route
import com.geeksville.mesh.navigation.showLongNameTitle
@ -88,8 +90,8 @@ enum class TopLevelDestination(@StringRes val label: Int, val icon: ImageVector,
Contacts(R.string.contacts, Icons.AutoMirrored.TwoTone.Chat, Route.Contacts),
Nodes(R.string.nodes, Icons.TwoTone.People, Route.Nodes),
Map(R.string.map, Icons.TwoTone.Map, Route.Map),
Channels(R.string.channels, Icons.TwoTone.Contactless, Route.Channels),
Connections(R.string.connections, Icons.TwoTone.CloudOff, Route.Connections),
Channels(R.string.channels, Icons.TwoTone.Contactless, ChannelsRoutes.Channels),
Connections(R.string.connections, Icons.TwoTone.CloudOff, ConnectionsRoutes.Connections),
;
companion object {
@ -323,7 +325,6 @@ private fun MainAppBar(
)
}
@OptIn(ExperimentalMaterial3Api::class)
@Composable
private fun MainMenuActions(
isManaged: Boolean,

View file

@ -42,6 +42,7 @@ import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.Settings
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Button
import androidx.compose.material3.Checkbox
@ -93,10 +94,16 @@ import com.geeksville.mesh.model.BluetoothViewModel
import com.geeksville.mesh.model.NO_DEVICE_SELECTED
import com.geeksville.mesh.model.Node
import com.geeksville.mesh.model.UIViewModel
import com.geeksville.mesh.navigation.ConfigRoute
import com.geeksville.mesh.navigation.Route
import com.geeksville.mesh.navigation.getNavRouteFrom
import com.geeksville.mesh.repository.network.NetworkRepository
import com.geeksville.mesh.service.MeshService
import com.geeksville.mesh.ui.node.NodeActionButton
import com.geeksville.mesh.ui.node.components.NodeChip
import com.geeksville.mesh.ui.node.components.NodeMenuAction
import com.geeksville.mesh.ui.radioconfig.RadioConfigViewModel
import com.geeksville.mesh.ui.radioconfig.components.PacketResponseStateDialog
import com.geeksville.mesh.ui.sharing.SharedContactDialog
import kotlinx.coroutines.delay
@ -115,9 +122,12 @@ fun ConnectionsScreen(
uiViewModel: UIViewModel = hiltViewModel(),
scanModel: BTScanModel = hiltViewModel(),
bluetoothViewModel: BluetoothViewModel = hiltViewModel(),
radioConfigViewModel: RadioConfigViewModel = hiltViewModel(),
onNavigateToRadioConfig: () -> Unit,
onNavigateToNodeDetails: (Int) -> Unit,
onConfigNavigate: (Route) -> Unit
) {
val radioConfigState by radioConfigViewModel.radioConfigState.collectAsStateWithLifecycle()
val config by uiViewModel.localConfig.collectAsState()
val currentRegion = config.lora.region
val scrollState = rememberScrollState()
@ -134,6 +144,25 @@ fun ConnectionsScreen(
val regionUnset = currentRegion == ConfigProtos.Config.LoRaConfig.RegionCode.UNSET &&
connectionState == MeshService.ConnectionState.CONNECTED
/* Animate waiting for the configurations */
var isWaiting by remember { mutableStateOf(false) }
if (isWaiting) {
PacketResponseStateDialog(
state = radioConfigState.responseState,
onDismiss = {
isWaiting = false
radioConfigViewModel.clearPacketResponse()
},
onComplete = {
getNavRouteFrom(radioConfigState.route)?.let { route ->
isWaiting = false
radioConfigViewModel.clearPacketResponse()
onConfigNavigate(route)
}
},
)
}
val isGpsDisabled = context.gpsDisabled()
LaunchedEffect(isGpsDisabled) {
if (isGpsDisabled) {
@ -285,28 +314,27 @@ fun ConnectionsScreen(
)
Spacer(modifier = Modifier.width(8.dp))
Text(
text = "${node.user.longName}",
text = node.user.longName,
style = MaterialTheme.typography.titleLarge
)
}
}
Button(
modifier = Modifier.fillMaxWidth(),
NodeActionButton(
title = stringResource(id = R.string.radio_configuration),
icon = Icons.Default.Settings,
enabled = true,
onClick = onNavigateToRadioConfig
) {
Text(stringResource(R.string.radio_configuration))
}
)
Spacer(modifier = Modifier.height(8.dp))
if (regionUnset && selectedDevice != "m") {
Text(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 8.dp),
text = stringResource(R.string.must_set_region),
color = MaterialTheme.colorScheme.error,
style = MaterialTheme.typography.titleLarge,
textAlign = TextAlign.Center
NodeActionButton(
title = stringResource(id = R.string.set_your_region),
icon = ConfigRoute.LORA.icon,
enabled = true,
onClick = {
isWaiting = true
radioConfigViewModel.setResponseStateLoading(ConfigRoute.LORA)
}
)
Spacer(modifier = Modifier.height(8.dp))
}

View file

@ -138,7 +138,7 @@ fun ChannelScreen(
var showResetDialog by remember { mutableStateOf(false) }
var showScanDialog by remember { mutableStateOf(false) }
/* Animate waiting for the channel configurations */
/* Animate waiting for the configurations */
var isWaiting by remember { mutableStateOf(false) }
if (isWaiting) {
PacketResponseStateDialog(