Organize channel config files (#3526)

2025-12-24 00:07:48 -05:00 · 2025-10-22 16:48:46 -04:00
parent 58fda3d990
commit 6864dd0729
9 changed files with 189 additions and 84 deletions
--- a/app/src/main/java/com/geeksville/mesh/navigation/ChannelsNavigation.kt
+++ b/app/src/main/java/com/geeksville/mesh/navigation/ChannelsNavigation.kt
@@ -28,7 +28,7 @@ import com.geeksville.mesh.ui.sharing.ChannelScreen
 import org.meshtastic.core.navigation.ChannelsRoutes
 import org.meshtastic.core.navigation.DEEP_LINK_BASE_URI
 import org.meshtastic.feature.settings.navigation.ConfigRoute
-import org.meshtastic.feature.settings.radio.component.ChannelConfigScreen
+import org.meshtastic.feature.settings.radio.channel.ChannelConfigScreen
 import org.meshtastic.feature.settings.radio.component.LoRaConfigScreen

 /** Navigation graph for for the top level ChannelScreen - [ChannelsRoutes.Channels]. */
--- a/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/ChannelItem.kt
+++ b/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/ChannelItem.kt
@@ -31,7 +31,9 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.meshtastic.core.ui.theme.AppTheme

@Composable
 fun ChannelItem(
@@ -60,3 +62,9 @@ fun ChannelItem(
        }
    }
 }
+
+@Preview
+@Composable
+private fun ChannelItemPreview() {
+    AppTheme { ChannelItem(index = 0, title = "Medium Fast", enabled = true) {} }
+}
--- a/feature/settings/detekt-baseline.xml
+++ b/feature/settings/detekt-baseline.xml
@@ -2,7 +2,7 @@
 <SmellBaseline>
  <ManuallySuppressedIssues/>
  <CurrentIssues>
-    <ID>ComposableParamOrder:ChannelSettingsItemList.kt$ChannelSettingsItemList</ID>
+    <ID>ComposableParamOrder:ChannelConfigScreen.kt$ChannelConfigScreen</ID>
    <ID>ComposableParamOrder:Debug.kt$DecodedPayloadBlock</ID>
    <ID>ComposableParamOrder:DebugSearch.kt$DebugSearchState</ID>
    <ID>ComposableParamOrder:DebugSearch.kt$DebugSearchStateviewModelDefaults</ID>
@@ -49,7 +49,7 @@
    <ID>MultipleEmitters:CleanNodeDatabaseScreen.kt$NodesDeletionPreview</ID>
    <ID>MultipleEmitters:RadioConfig.kt$RadioConfigItemList</ID>
    <ID>NestedBlockDepth:RadioConfigViewModel.kt$RadioConfigViewModel$private fun processPacketResponse(packet: MeshProtos.MeshPacket)</ID>
-    <ID>ParameterNaming:ChannelSettingsItemList.kt$onPositiveClicked</ID>
+    <ID>ParameterNaming:ChannelConfigScreen.kt$onPositiveClicked</ID>
    <ID>ParameterNaming:CleanNodeDatabaseScreen.kt$onCheckedChanged</ID>
    <ID>ParameterNaming:CleanNodeDatabaseScreen.kt$onDaysChanged</ID>
    <ID>ParameterNaming:MapReportingPreference.kt$onMapReportingEnabledChanged</ID>
@@ -61,8 +61,8 @@
    <ID>TooGenericExceptionCaught:LanguageUtils.kt$LanguageUtils$e: Exception</ID>
    <ID>TooGenericExceptionCaught:RadioConfigViewModel.kt$RadioConfigViewModel$ex: Exception</ID>
    <ID>TooManyFunctions:RadioConfigViewModel.kt$RadioConfigViewModel : ViewModel</ID>
-    <ID>UnusedParameter:ChannelSettingsItemList.kt$onBack: () -&gt; Unit</ID>
-    <ID>UnusedParameter:ChannelSettingsItemList.kt$title: String</ID>
+    <ID>UnusedParameter:ChannelConfigScreen.kt$onBack: () -&gt; Unit</ID>
+    <ID>UnusedParameter:ChannelConfigScreen.kt$title: String</ID>
    <ID>ViewModelInjection:DebugSearch.kt$viewModel</ID>
  </CurrentIssues>
 </SmellBaseline>
--- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/navigation/SettingsNavigation.kt
+++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/navigation/SettingsNavigation.kt
@@ -32,11 +32,11 @@ import org.meshtastic.feature.settings.SettingsScreen
 import org.meshtastic.feature.settings.debugging.DebugScreen
 import org.meshtastic.feature.settings.radio.CleanNodeDatabaseScreen
 import org.meshtastic.feature.settings.radio.RadioConfigViewModel
+import org.meshtastic.feature.settings.radio.channel.ChannelConfigScreen
 import org.meshtastic.feature.settings.radio.component.AmbientLightingConfigScreen
 import org.meshtastic.feature.settings.radio.component.AudioConfigScreen
 import org.meshtastic.feature.settings.radio.component.BluetoothConfigScreen
 import org.meshtastic.feature.settings.radio.component.CannedMessageConfigScreen
-import org.meshtastic.feature.settings.radio.component.ChannelConfigScreen
 import org.meshtastic.feature.settings.radio.component.DetectionSensorConfigScreen
 import org.meshtastic.feature.settings.radio.component.DeviceConfigScreen
 import org.meshtastic.feature.settings.radio.component.DisplayConfigScreen
--- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/ChannelSettingsItemList.kt
+++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/ChannelSettingsItemList.kt
@@ -15,32 +15,25 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package org.meshtastic.feature.settings.radio.component
+package org.meshtastic.feature.settings.radio.channel

 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.FastOutSlowInEasing
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.slideInHorizontally
 import androidx.compose.animation.slideOutHorizontally
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.twotone.Add
-import androidx.compose.material.icons.twotone.Close
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -63,61 +56,22 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import org.meshtastic.core.model.Channel
 import org.meshtastic.core.model.DeviceVersion
 import org.meshtastic.core.strings.R
-import org.meshtastic.core.ui.component.ChannelItem
-import org.meshtastic.core.ui.component.PreferenceCategory
 import org.meshtastic.core.ui.component.PreferenceFooter
-import org.meshtastic.core.ui.component.SecurityIcon
 import org.meshtastic.core.ui.component.dragContainer
 import org.meshtastic.core.ui.component.dragDropItemsIndexed
 import org.meshtastic.core.ui.component.rememberDragDropState
 import org.meshtastic.feature.settings.radio.RadioConfigViewModel
+import org.meshtastic.feature.settings.radio.channel.component.ChannelCard
+import org.meshtastic.feature.settings.radio.channel.component.ChannelConfigHeader
+import org.meshtastic.feature.settings.radio.channel.component.ChannelLegend
+import org.meshtastic.feature.settings.radio.channel.component.ChannelLegendDialog
+import org.meshtastic.feature.settings.radio.channel.component.EditChannelDialog
+import org.meshtastic.feature.settings.radio.channel.component.SECONDARY_CHANNEL_EPOCH
+import org.meshtastic.feature.settings.radio.component.PacketResponseStateDialog
 import org.meshtastic.proto.ChannelProtos.ChannelSettings
 import org.meshtastic.proto.ConfigProtos.Config.LoRaConfig
 import org.meshtastic.proto.channelSettings

-@Composable
-private fun ChannelCard(
-    index: Int,
-    title: String,
-    enabled: Boolean,
-    channelSettings: ChannelSettings,
-    loraConfig: LoRaConfig,
-    onEditClick: () -> Unit,
-    onDeleteClick: () -> Unit,
-    sharesLocation: Boolean,
-) = ChannelItem(index = index, title = title, enabled = enabled, onClick = onEditClick) {
-    if (sharesLocation) {
-        Icon(
-            imageVector = ChannelIcons.LOCATION.icon,
-            contentDescription = stringResource(ChannelIcons.LOCATION.descriptionResId),
-            modifier = Modifier.wrapContentSize().padding(horizontal = 5.dp),
-        )
-    }
-    if (channelSettings.uplinkEnabled) {
-        Icon(
-            imageVector = ChannelIcons.UPLINK.icon,
-            contentDescription = stringResource(ChannelIcons.UPLINK.descriptionResId),
-            modifier = Modifier.wrapContentSize().padding(horizontal = 5.dp),
-        )
-    }
-    if (channelSettings.downlinkEnabled) {
-        Icon(
-            imageVector = ChannelIcons.DOWNLINK.icon,
-            contentDescription = stringResource(ChannelIcons.DOWNLINK.descriptionResId),
-            modifier = Modifier.wrapContentSize().padding(horizontal = 5.dp),
-        )
-    }
-    SecurityIcon(channelSettings, loraConfig)
-    Spacer(modifier = Modifier.width(10.dp))
-    IconButton(onClick = { onDeleteClick() }) {
-        Icon(
-            imageVector = Icons.TwoTone.Close,
-            contentDescription = stringResource(R.string.delete),
-            modifier = Modifier.wrapContentSize(),
-        )
-    }
-}
-
@Composable
 fun ChannelConfigScreen(viewModel: RadioConfigViewModel, onBack: () -> Unit) {
    val state by viewModel.radioConfigState.collectAsStateWithLifecycle()
@@ -126,7 +80,7 @@ fun ChannelConfigScreen(viewModel: RadioConfigViewModel, onBack: () -> Unit) {
        PacketResponseStateDialog(state = state.responseState, onDismiss = viewModel::clearPacketResponse)
    }

-    ChannelSettingsItemList(
+    ChannelConfigScreen(
        title = stringResource(id = R.string.channels),
        onBack = onBack,
        settingsList = state.channelList,
@@ -140,7 +94,7 @@ fun ChannelConfigScreen(viewModel: RadioConfigViewModel, onBack: () -> Unit) {

@Suppress("LongMethod", "CyclomaticComplexMethod")
@Composable
-private fun ChannelSettingsItemList(
+private fun ChannelConfigScreen(
    title: String,
    onBack: () -> Unit,
    settingsList: List<ChannelSettings>,
@@ -217,7 +171,7 @@ private fun ChannelSettingsItemList(
    ) { innerPadding ->
        Box(modifier = Modifier.fillMaxSize().padding(innerPadding)) {
            Column {
-                ChannelsConfigHeader(
+                ChannelConfigHeader(
                    frequency =
                    if (loraConfig.overrideFrequency != 0f) {
                        loraConfig.overrideFrequency
@@ -267,13 +221,13 @@ private fun ChannelSettingsItemList(
                    item {
                        PreferenceFooter(
                            enabled = enabled && isEditing,
-                            negativeText = R.string.cancel,
+                            negativeText = stringResource(R.string.cancel),
                            onNegativeClicked = {
                                focusManager.clearFocus()
                                settingsListInput.clear()
                                settingsListInput.addAll(settingsList)
                            },
-                            positiveText = R.string.send,
+                            positiveText = stringResource(R.string.send),
                            onPositiveClicked = {
                                focusManager.clearFocus()
                                onPositiveClicked(settingsListInput)
@@ -301,21 +255,6 @@ private fun ChannelSettingsItemList(
    }
 }

-@Composable
-private fun ChannelsConfigHeader(frequency: Float, slot: Int) {
-    Row(
-        modifier = Modifier.fillMaxWidth(),
-        horizontalArrangement = Arrangement.SpaceBetween,
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        PreferenceCategory(text = stringResource(R.string.channels))
-        Column {
-            Text(text = "${stringResource(R.string.freq)}: ${frequency}MHz", fontSize = 11.sp)
-            Text(text = "${stringResource(R.string.slot)}: $slot", fontSize = 11.sp)
-        }
-    }
-}
-
 /**
 * Determines what [Channel] if any is enabled to conduct automatic location sharing.
 *
@@ -345,8 +284,8 @@ private fun determineLocationSharingChannel(firmwareVersion: DeviceVersion, sett

@Preview(showBackground = true)
@Composable
-private fun ChannelSettingsPreview() {
-    ChannelSettingsItemList(
+private fun ChannelConfigScreenPreview() {
+    ChannelConfigScreen(
        title = "Channels",
        onBack = {},
        settingsList =
--- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/channel/component/ChannelCard.kt
+++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/channel/component/ChannelCard.kt
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2025 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.meshtastic.feature.settings.radio.channel.component
+
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.twotone.Close
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.meshtastic.core.strings.R
+import org.meshtastic.core.ui.component.ChannelItem
+import org.meshtastic.core.ui.component.SecurityIcon
+import org.meshtastic.core.ui.theme.AppTheme
+import org.meshtastic.proto.ChannelProtos.ChannelSettings
+import org.meshtastic.proto.ConfigKt.loRaConfig
+import org.meshtastic.proto.ConfigProtos.Config.LoRaConfig
+import org.meshtastic.proto.channelSettings
+
+@Composable
+internal fun ChannelCard(
+    index: Int,
+    title: String,
+    enabled: Boolean,
+    channelSettings: ChannelSettings,
+    loraConfig: LoRaConfig,
+    onEditClick: () -> Unit,
+    onDeleteClick: () -> Unit,
+    sharesLocation: Boolean,
+) = ChannelItem(index = index, title = title, enabled = enabled, onClick = onEditClick) {
+    if (sharesLocation) {
+        Icon(
+            imageVector = ChannelIcons.LOCATION.icon,
+            contentDescription = stringResource(ChannelIcons.LOCATION.descriptionResId),
+            modifier = Modifier.wrapContentSize().padding(horizontal = 5.dp),
+        )
+    }
+    if (channelSettings.uplinkEnabled) {
+        Icon(
+            imageVector = ChannelIcons.UPLINK.icon,
+            contentDescription = stringResource(ChannelIcons.UPLINK.descriptionResId),
+            modifier = Modifier.wrapContentSize().padding(horizontal = 5.dp),
+        )
+    }
+    if (channelSettings.downlinkEnabled) {
+        Icon(
+            imageVector = ChannelIcons.DOWNLINK.icon,
+            contentDescription = stringResource(ChannelIcons.DOWNLINK.descriptionResId),
+            modifier = Modifier.wrapContentSize().padding(horizontal = 5.dp),
+        )
+    }
+    SecurityIcon(channelSettings, loraConfig)
+    Spacer(modifier = Modifier.width(10.dp))
+    IconButton(onClick = { onDeleteClick() }) {
+        Icon(
+            imageVector = Icons.TwoTone.Close,
+            contentDescription = stringResource(R.string.delete),
+            modifier = Modifier.wrapContentSize(),
+        )
+    }
+}
+
+@Preview
+@Composable
+private fun ChannelCardPreview() {
+    AppTheme {
+        ChannelCard(
+            index = 0,
+            title = "Medium Fast",
+            enabled = true,
+            channelSettings =
+            channelSettings {
+                uplinkEnabled = true
+                downlinkEnabled = true
+            },
+            loraConfig = loRaConfig {},
+            onEditClick = {},
+            onDeleteClick = {},
+            sharesLocation = true,
+        )
+    }
+}
--- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/channel/component/ChannelConfigHeader.kt
+++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/channel/component/ChannelConfigHeader.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2025 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.meshtastic.feature.settings.radio.channel.component
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.sp
+import org.meshtastic.core.strings.R
+import org.meshtastic.core.ui.component.PreferenceCategory
+import org.meshtastic.core.ui.theme.AppTheme
+
+@Composable
+internal fun ChannelConfigHeader(frequency: Float, slot: Int) {
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        PreferenceCategory(text = stringResource(R.string.channels))
+        Column {
+            Text(text = "${stringResource(R.string.freq)}: ${frequency}MHz", fontSize = 11.sp)
+            Text(text = "${stringResource(R.string.slot)}: $slot", fontSize = 11.sp)
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun ChannelConfigHeaderPreview() {
+    AppTheme { ChannelConfigHeader(frequency = 913.125f, slot = 45) }
+}
--- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/channel/component/ChannelLegend.kt
+++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/channel/component/ChannelLegend.kt
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package org.meshtastic.feature.settings.radio.component
+package org.meshtastic.feature.settings.radio.channel.component

 import androidx.annotation.StringRes
 import androidx.compose.foundation.clickable
--- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/channel/component/EditChannelDialog.kt
+++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/channel/component/EditChannelDialog.kt
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package org.meshtastic.feature.settings.radio.component
+package org.meshtastic.feature.settings.radio.channel.component

 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column