From ada2f14a7844fa319fd681e1334da9d6e59b48ea Mon Sep 17 00:00:00 2001 From: andrekir Date: Mon, 12 Feb 2024 17:56:00 -0300 Subject: [PATCH] refactor: update `PositionConfigItemList` --- .../config/PositionConfigItemList.kt | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/PositionConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/PositionConfigItemList.kt index 3d385d88..5a6c0056 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/config/PositionConfigItemList.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/PositionConfigItemList.kt @@ -17,6 +17,7 @@ import com.geeksville.mesh.ConfigProtos.Config.PositionConfig import com.geeksville.mesh.Position import com.geeksville.mesh.copy import com.geeksville.mesh.ui.components.BitwisePreference +import com.geeksville.mesh.ui.components.DropDownPreference import com.geeksville.mesh.ui.components.EditTextPreference import com.geeksville.mesh.ui.components.PreferenceCategory import com.geeksville.mesh.ui.components.PreferenceFooter @@ -122,10 +123,13 @@ fun PositionConfigItemList( } item { - SwitchPreference(title = "GPS enabled", - checked = positionInput.gpsEnabled, + DropDownPreference(title = "GPS mode", enabled = enabled, - onCheckedChange = { positionInput = positionInput.copy { gpsEnabled = it } }) + items = ConfigProtos.Config.PositionConfig.GpsMode.entries + .filter { it != ConfigProtos.Config.PositionConfig.GpsMode.UNRECOGNIZED } + .map { it to it.name }, + selectedItem = positionInput.gpsMode, + onItemSelected = { positionInput = positionInput.copy { gpsMode = it } }) } item { Divider() } @@ -137,14 +141,6 @@ fun PositionConfigItemList( onValueChanged = { positionInput = positionInput.copy { gpsUpdateInterval = it } }) } - item { - EditTextPreference(title = "Fix attempt duration (seconds)", - value = positionInput.gpsAttemptTime, - enabled = enabled, - keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }), - onValueChanged = { positionInput = positionInput.copy { gpsAttemptTime = it } }) - } - item { BitwisePreference(title = "Position flags", value = positionInput.positionFlags,