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

refactor: replace enum values() with entries property

Browse source 
https://kotlinlang.org/docs/whatsnew19.html#stable-replacement-of-the-enum-class-values-function
This commit is contained in:
andrekir 2023-09-16 08:27:01 -03:00
parent a250555ee5
commit e8b0f1584b
13 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/geeksville/mesh/service/MeshService.kt
View file

@ -1420,7 +1420,7 @@ class MeshService : Service(), Logging {
}
private fun requestAllConfig() {
AdminProtos.AdminMessage.ConfigType.values().filter {
AdminProtos.AdminMessage.ConfigType.entries.filter {
it != AdminProtos.AdminMessage.ConfigType.UNRECOGNIZED
}.forEach(::requestConfig)
}

2
app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
View file

@ -379,7 +379,7 @@ fun ChannelScreen(
item {
DropDownPreference(title = stringResource(id = R.string.channel_options),
enabled = enabled,
items = ChannelOption.values()
items = ChannelOption.entries
.map { it.modemPreset to stringResource(it.configRes) },
selectedItem = channelSet.loraConfig.modemPreset,
onItemSelected = {

2
app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
View file

@ -235,7 +235,7 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
}
/// the sorted list of region names like arrayOf("US", "CN", "EU488")
private val regions = ConfigProtos.Config.LoRaConfig.RegionCode.values().filter {
private val regions = ConfigProtos.Config.LoRaConfig.RegionCode.entries.filter {
it != ConfigProtos.Config.LoRaConfig.RegionCode.UNRECOGNIZED
}.map {
it.name

2
app/src/main/java/com/geeksville/mesh/ui/components/EditListPreference.kt
View file

@ -124,7 +124,7 @@ inline fun <reified T> EditListPreference(
DropDownPreference(
title = "Type",
enabled = enabled,
items = RemoteHardwarePinType.values()
items = RemoteHardwarePinType.entries
.filter { it != RemoteHardwarePinType.UNRECOGNIZED }
.map { it to it.name },
selectedItem = value.type,

2
app/src/main/java/com/geeksville/mesh/ui/components/config/AudioConfigItemList.kt
View file

@ -53,7 +53,7 @@ fun AudioConfigItemList(
item {
DropDownPreference(title = "CODEC2 sample rate",
enabled = enabled,
items = AudioConfig.Audio_Baud.values()
items = AudioConfig.Audio_Baud.entries
.filter { it != AudioConfig.Audio_Baud.UNRECOGNIZED }
.map { it to it.name },
selectedItem = audioInput.bitrate,

2
app/src/main/java/com/geeksville/mesh/ui/components/config/BluetoothConfigItemList.kt
View file

@ -45,7 +45,7 @@ fun BluetoothConfigItemList(
item {
DropDownPreference(title = "Pairing mode",
enabled = enabled,
items = BluetoothConfig.PairingMode.values()
items = BluetoothConfig.PairingMode.entries
.filter { it != BluetoothConfig.PairingMode.UNRECOGNIZED }
.map { it to it.name },
selectedItem = bluetoothInput.mode,

6
app/src/main/java/com/geeksville/mesh/ui/components/config/CannedMessageConfigItemList.kt
View file

@ -92,7 +92,7 @@ fun CannedMessageConfigItemList(
item {
DropDownPreference(title = "Generate input event on Press",
enabled = enabled,
items = CannedMessageConfig.InputEventChar.values()
items = CannedMessageConfig.InputEventChar.entries
.filter { it != CannedMessageConfig.InputEventChar.UNRECOGNIZED }
.map { it to it.name },
selectedItem = cannedMessageInput.inputbrokerEventPress,
@ -105,7 +105,7 @@ fun CannedMessageConfigItemList(
item {
DropDownPreference(title = "Generate input event on CW",
enabled = enabled,
items = CannedMessageConfig.InputEventChar.values()
items = CannedMessageConfig.InputEventChar.entries
.filter { it != CannedMessageConfig.InputEventChar.UNRECOGNIZED }
.map { it to it.name },
selectedItem = cannedMessageInput.inputbrokerEventCw,
@ -118,7 +118,7 @@ fun CannedMessageConfigItemList(
item {
DropDownPreference(title = "Generate input event on CCW",
enabled = enabled,
items = CannedMessageConfig.InputEventChar.values()
items = CannedMessageConfig.InputEventChar.entries
.filter { it != CannedMessageConfig.InputEventChar.UNRECOGNIZED }
.map { it to it.name },
selectedItem = cannedMessageInput.inputbrokerEventCcw,

4
app/src/main/java/com/geeksville/mesh/ui/components/config/DeviceConfigItemList.kt
View file

@ -37,7 +37,7 @@ fun DeviceConfigItemList(
item {
DropDownPreference(title = "Role",
enabled = enabled,
items = DeviceConfig.Role.values()
items = DeviceConfig.Role.entries
.filter { it != DeviceConfig.Role.UNRECOGNIZED }
.map { it to it.name },
selectedItem = deviceInput.role,
@ -84,7 +84,7 @@ fun DeviceConfigItemList(
item {
DropDownPreference(title = "Rebroadcast mode",
enabled = enabled,
items = DeviceConfig.RebroadcastMode.values()
items = DeviceConfig.RebroadcastMode.entries
.filter { it != DeviceConfig.RebroadcastMode.UNRECOGNIZED }
.map { it to it.name },
selectedItem = deviceInput.rebroadcastMode,

8
app/src/main/java/com/geeksville/mesh/ui/components/config/DisplayConfigItemList.kt
View file

@ -45,7 +45,7 @@ fun DisplayConfigItemList(
item {
DropDownPreference(title = "GPS coordinates format",
enabled = enabled,
items = DisplayConfig.GpsCoordinateFormat.values()
items = DisplayConfig.GpsCoordinateFormat.entries
.filter { it != DisplayConfig.GpsCoordinateFormat.UNRECOGNIZED }
.map { it to it.name },
selectedItem = displayInput.gpsFormat,
@ -82,7 +82,7 @@ fun DisplayConfigItemList(
item {
DropDownPreference(title = "Display units",
enabled = enabled,
items = DisplayConfig.DisplayUnits.values()
items = DisplayConfig.DisplayUnits.entries
.filter { it != DisplayConfig.DisplayUnits.UNRECOGNIZED }
.map { it to it.name },
selectedItem = displayInput.units,
@ -93,7 +93,7 @@ fun DisplayConfigItemList(
item {
DropDownPreference(title = "Override OLED auto-detect",
enabled = enabled,
items = DisplayConfig.OledType.values()
items = DisplayConfig.OledType.entries
.filter { it != DisplayConfig.OledType.UNRECOGNIZED }
.map { it to it.name },
selectedItem = displayInput.oled,
@ -104,7 +104,7 @@ fun DisplayConfigItemList(
item {
DropDownPreference(title = "Display mode",
enabled = enabled,
items = DisplayConfig.DisplayMode.values()
items = DisplayConfig.DisplayMode.entries
.filter { it != DisplayConfig.DisplayMode.UNRECOGNIZED }
.map { it to it.name },
selectedItem = displayInput.displaymode,

4
app/src/main/java/com/geeksville/mesh/ui/components/config/LoRaConfigItemList.kt
View file

@ -52,7 +52,7 @@ fun LoRaConfigItemList(
item {
DropDownPreference(title = "Modem preset",
enabled = enabled && loraInput.usePreset,
items = LoRaConfig.ModemPreset.values()
items = LoRaConfig.ModemPreset.entries
.filter { it != LoRaConfig.ModemPreset.UNRECOGNIZED }
.map { it to it.name },
selectedItem = loraInput.modemPreset,
@ -96,7 +96,7 @@ fun LoRaConfigItemList(
item {
DropDownPreference(title = "Region (frequency plan)",
enabled = enabled,
items = LoRaConfig.RegionCode.values()
items = LoRaConfig.RegionCode.entries
.filter { it != LoRaConfig.RegionCode.UNRECOGNIZED }
.map { it to it.name },
selectedItem = loraInput.region,

2
app/src/main/java/com/geeksville/mesh/ui/components/config/NetworkConfigItemList.kt
View file

@ -112,7 +112,7 @@ fun NetworkConfigItemList(
item {
DropDownPreference(title = "IPv4 mode",
enabled = enabled,
items = NetworkConfig.AddressMode.values()
items = NetworkConfig.AddressMode.entries
.filter { it != NetworkConfig.AddressMode.UNRECOGNIZED }
.map { it to it.name },
selectedItem = networkInput.addressMode,

2
app/src/main/java/com/geeksville/mesh/ui/components/config/PositionConfigItemList.kt
View file

@ -149,7 +149,7 @@ fun PositionConfigItemList(
BitwisePreference(title = "Position flags",
value = positionInput.positionFlags,
enabled = enabled,
items = ConfigProtos.Config.PositionConfig.PositionFlags.values()
items = ConfigProtos.Config.PositionConfig.PositionFlags.entries
.filter { it != PositionConfig.PositionFlags.UNSET && it != PositionConfig.PositionFlags.UNRECOGNIZED }
.map { it.number to it.name },
onItemSelected = { positionInput = positionInput.copy { positionFlags = it } }

4
app/src/main/java/com/geeksville/mesh/ui/components/config/SerialConfigItemList.kt
View file

@ -69,7 +69,7 @@ fun SerialConfigItemList(
item {
DropDownPreference(title = "Serial baud rate",
enabled = enabled,
items = SerialConfig.Serial_Baud.values()
items = SerialConfig.Serial_Baud.entries
.filter { it != SerialConfig.Serial_Baud.UNRECOGNIZED }
.map { it to it.name },
selectedItem = serialInput.baud,
@ -88,7 +88,7 @@ fun SerialConfigItemList(
item {
DropDownPreference(title = "Serial mode",
enabled = enabled,
items = SerialConfig.Serial_Mode.values()
items = SerialConfig.Serial_Mode.entries
.filter { it != SerialConfig.Serial_Mode.UNRECOGNIZED }
.map { it to it.name },
selectedItem = serialInput.mode,