From 0fd3c4ca0540fec938155868a58bbc7281b17b23 Mon Sep 17 00:00:00 2001 From: Phil Oliver <3497406+poliver@users.noreply.github.com> Date: Wed, 8 Oct 2025 14:20:09 -0400 Subject: [PATCH] Protobuf package change (#3291) --- .../mesh/compose/ScannedQrCodeDialogTest.kt | 10 ++-- .../mesh/model/EnvironmentMetricsState.kt | 2 +- .../geeksville/mesh/model/MetricsViewModel.kt | 8 +-- .../java/com/geeksville/mesh/model/UIState.kt | 18 +++---- .../mesh/repository/network/MQTTRepository.kt | 4 +- .../mesh/repository/radio/MockInterface.kt | 24 ++++----- .../repository/radio/RadioInterfaceService.kt | 2 +- .../geeksville/mesh/service/MeshService.kt | 44 ++++++++-------- .../mesh/service/MeshServiceNotifications.kt | 6 +-- .../geeksville/mesh/service/PacketHandler.kt | 8 +-- .../main/java/com/geeksville/mesh/ui/Main.kt | 2 +- .../common/components/ScannedQrCodeDialog.kt | 8 +-- .../components/ScannedQrCodeViewModel.kt | 12 ++--- .../mesh/ui/connections/ConnectionsScreen.kt | 2 +- .../ui/connections/ConnectionsViewModel.kt | 2 +- .../components/CurrentlyConnectedInfo.kt | 6 +-- .../geeksville/mesh/ui/contact/ContactItem.kt | 2 +- .../geeksville/mesh/ui/contact/Contacts.kt | 2 +- .../mesh/ui/contact/ContactsViewModel.kt | 2 +- .../com/geeksville/mesh/ui/message/Message.kt | 2 +- .../mesh/ui/message/MessageViewModel.kt | 4 +- .../mesh/ui/message/components/Reaction.kt | 2 +- .../mesh/ui/metrics/DeviceMetrics.kt | 4 +- .../mesh/ui/metrics/EnvironmentCharts.kt | 2 +- .../mesh/ui/metrics/EnvironmentMetrics.kt | 6 +-- .../mesh/ui/metrics/HostMetricsLog.kt | 2 +- .../geeksville/mesh/ui/metrics/PaxMetrics.kt | 4 +- .../geeksville/mesh/ui/metrics/PositionLog.kt | 4 +- .../mesh/ui/metrics/PowerMetrics.kt | 2 +- .../mesh/ui/metrics/SignalMetrics.kt | 2 +- .../mesh/ui/metrics/TracerouteLog.kt | 2 +- .../geeksville/mesh/ui/node/NodeListScreen.kt | 2 +- .../com/geeksville/mesh/ui/sharing/Channel.kt | 10 ++-- .../mesh/ui/sharing/ChannelViewModel.kt | 14 +++--- .../mesh/ui/sharing/ContactSharing.kt | 4 +- .../mesh/ui/sharing/SharedContactDialog.kt | 2 +- .../mesh/ui/sharing/SharedContactViewModel.kt | 2 +- .../com/geeksville/mesh/util/GraphUtil.kt | 50 +++++-------------- .../mesh/util/HardwareModelExtensions.kt | 2 +- .../mesh/ui/metrics/EnvironmentMetricsTest.kt | 4 +- .../core/data/repository/MeshLogRepository.kt | 8 +-- .../core/data/repository/NodeRepository.kt | 2 +- .../core/data/repository/PacketRepository.kt | 2 +- .../data/repository/RadioConfigRepository.kt | 18 +++---- .../core/database/dao/NodeInfoDaoTest.kt | 6 +-- .../core/database/dao/PacketDaoTest.kt | 2 +- .../meshtastic/core/database/Converters.kt | 6 +-- .../core/database/entity/MeshLog.kt | 6 +-- .../core/database/entity/NodeEntity.kt | 8 +-- .../meshtastic/core/database/entity/Packet.kt | 2 +- .../meshtastic/core/database/model/Message.kt | 2 +- .../meshtastic/core/database/model/Node.kt | 14 +++--- .../core/datastore/ChannelSetDataSource.kt | 8 +-- .../core/datastore/LocalConfigDataSource.kt | 4 +- .../core/datastore/ModuleConfigDataSource.kt | 4 +- .../core/datastore/di/DataStoreModule.kt | 6 +-- .../serializer/ChannelSetSerializer.kt | 2 +- .../serializer/LocalConfigSerializer.kt | 2 +- .../serializer/ModuleConfigSerializer.kt | 2 +- .../org/meshtastic/core/model/ChannelTest.kt | 2 +- .../org/meshtastic/core/model/Channel.kt | 10 ++-- .../meshtastic/core/model/ChannelOption.kt | 6 +-- .../org/meshtastic/core/model/DataPacket.kt | 4 +- .../org/meshtastic/core/model/NodeInfo.kt | 6 +-- .../meshtastic/core/model/RouteDiscovery.kt | 6 +-- .../meshtastic/core/model/util/ChannelSet.kt | 2 +- .../core/model/util/DistanceExtensions.kt | 2 +- .../meshtastic/core/model/util/Extensions.kt | 4 +- .../org/meshtastic/core/model/NodeInfoTest.kt | 4 +- .../meshtastic/core/proto/ProtoExtensions.kt | 14 +++--- core/proto/src/main/proto | 2 +- .../meshtastic/core/service/ServiceAction.kt | 2 +- .../core/service/ServiceRepository.kt | 4 +- .../core/ui/component/EditListPreference.kt | 8 +-- .../meshtastic/core/ui/component/NodeChip.kt | 6 +-- .../core/ui/component/SecurityIcon.kt | 6 +-- .../preview/NodePreviewParameterProvider.kt | 14 +++--- .../core/ui/component/preview/PreviewUtils.kt | 6 +-- .../org/meshtastic/feature/map/MapView.kt | 6 +-- .../feature/map/MapViewExtensions.kt | 2 +- .../meshtastic/feature/map/MapViewModel.kt | 2 +- .../map/component/EditWaypointDialog.kt | 6 +-- .../org/meshtastic/feature/map/MapView.kt | 10 ++-- .../meshtastic/feature/map/MapViewModel.kt | 2 +- .../map/component/EditWaypointDialog.kt | 4 +- .../feature/map/component/WaypointMarkers.kt | 2 +- .../feature/map/BaseMapViewModel.kt | 2 +- .../feature/map/node/NodeMapViewModel.kt | 4 +- .../node/component/AdministrationSection.kt | 2 +- .../feature/node/component/ElevationInfo.kt | 2 +- .../node/component/EnvironmentMetrics.kt | 2 +- .../feature/node/component/NodeItem.kt | 2 +- .../feature/node/list/NodeListViewModel.kt | 2 +- .../feature/node/model/MetricsState.kt | 6 +-- .../component/EditDeviceProfileDialogTest.kt | 6 +-- .../feature/settings/SettingsScreen.kt | 2 +- .../feature/settings/SettingsViewModel.kt | 6 +-- .../settings/debugging/DebugViewModel.kt | 12 ++--- .../settings/navigation/SettingsNavigation.kt | 4 +- .../settings/radio/RadioConfigViewModel.kt | 22 ++++---- .../AmbientLightingConfigItemList.kt | 4 +- .../radio/component/AudioConfigItemList.kt | 6 +-- .../component/BluetoothConfigItemList.kt | 6 +-- .../component/CannedMessageConfigItemList.kt | 6 +-- .../component/ChannelSettingsItemList.kt | 6 +-- .../DetectionSensorConfigItemList.kt | 6 +-- .../radio/component/DeviceConfigItemList.kt | 6 +-- .../radio/component/DisplayConfigItemList.kt | 6 +-- .../radio/component/EditChannelDialog.kt | 6 +-- .../component/EditDeviceProfileDialog.kt | 2 +- .../ExternalNotificationConfigItemList.kt | 4 +- .../radio/component/LoRaConfigItemList.kt | 4 +- .../radio/component/MQTTConfigItemList.kt | 4 +- .../component/NeighborInfoConfigItemList.kt | 4 +- .../radio/component/NetworkConfigItemList.kt | 6 +-- .../component/PaxcounterConfigItemList.kt | 4 +- .../radio/component/PositionConfigItemList.kt | 8 +-- .../radio/component/PowerConfigItemList.kt | 4 +- .../component/RangeTestConfigItemList.kt | 4 +- .../component/RemoteHardwareConfigItemList.kt | 4 +- .../radio/component/SecurityConfigItemList.kt | 6 +-- .../radio/component/SerialConfigItemList.kt | 6 +-- .../component/StoreForwardConfigItemList.kt | 4 +- .../component/TelemetryConfigItemList.kt | 4 +- .../radio/component/UserConfigItemList.kt | 2 +- .../meshserviceexample/MainActivity.kt | 2 +- 126 files changed, 354 insertions(+), 380 deletions(-) diff --git a/app/src/androidTest/java/com/geeksville/mesh/compose/ScannedQrCodeDialogTest.kt b/app/src/androidTest/java/com/geeksville/mesh/compose/ScannedQrCodeDialogTest.kt index f1c80882d..3d06e5cce 100644 --- a/app/src/androidTest/java/com/geeksville/mesh/compose/ScannedQrCodeDialogTest.kt +++ b/app/src/androidTest/java/com/geeksville/mesh/compose/ScannedQrCodeDialogTest.kt @@ -23,11 +23,6 @@ import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry -import com.geeksville.mesh.AppOnlyProtos.ChannelSet -import com.geeksville.mesh.ConfigProtos -import com.geeksville.mesh.channelSet -import com.geeksville.mesh.channelSettings -import com.geeksville.mesh.copy import com.geeksville.mesh.ui.common.components.ScannedQrCodeDialog import org.junit.Assert import org.junit.Rule @@ -35,6 +30,11 @@ import org.junit.Test import org.junit.runner.RunWith import org.meshtastic.core.model.Channel import org.meshtastic.core.strings.R +import org.meshtastic.proto.AppOnlyProtos.ChannelSet +import org.meshtastic.proto.ConfigProtos +import org.meshtastic.proto.channelSet +import org.meshtastic.proto.channelSettings +import org.meshtastic.proto.copy @RunWith(AndroidJUnit4::class) class ScannedQrCodeDialogTest { diff --git a/app/src/main/java/com/geeksville/mesh/model/EnvironmentMetricsState.kt b/app/src/main/java/com/geeksville/mesh/model/EnvironmentMetricsState.kt index f1478e944..3de99782c 100644 --- a/app/src/main/java/com/geeksville/mesh/model/EnvironmentMetricsState.kt +++ b/app/src/main/java/com/geeksville/mesh/model/EnvironmentMetricsState.kt @@ -18,7 +18,6 @@ package com.geeksville.mesh.model import androidx.compose.ui.graphics.Color -import com.geeksville.mesh.TelemetryProtos import org.meshtastic.core.model.util.UnitConversions import org.meshtastic.core.ui.theme.GraphColors.Green import org.meshtastic.core.ui.theme.GraphColors.InfantryBlue @@ -30,6 +29,7 @@ import org.meshtastic.core.ui.theme.GraphColors.Purple import org.meshtastic.core.ui.theme.GraphColors.Red import org.meshtastic.core.ui.theme.GraphColors.Yellow import org.meshtastic.feature.node.model.TimeFrame +import org.meshtastic.proto.TelemetryProtos @Suppress("MagicNumber") enum class Environment(val color: Color) { diff --git a/app/src/main/java/com/geeksville/mesh/model/MetricsViewModel.kt b/app/src/main/java/com/geeksville/mesh/model/MetricsViewModel.kt index ae910b689..19cdfc68e 100644 --- a/app/src/main/java/com/geeksville/mesh/model/MetricsViewModel.kt +++ b/app/src/main/java/com/geeksville/mesh/model/MetricsViewModel.kt @@ -24,10 +24,6 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.navigation.toRoute import com.geeksville.mesh.CoroutineDispatchers -import com.geeksville.mesh.MeshProtos -import com.geeksville.mesh.MeshProtos.MeshPacket -import com.geeksville.mesh.Portnums -import com.geeksville.mesh.Portnums.PortNum import com.geeksville.mesh.util.safeNumber import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow @@ -61,6 +57,10 @@ import org.meshtastic.core.strings.R import org.meshtastic.feature.map.model.CustomTileSource import org.meshtastic.feature.node.model.MetricsState import org.meshtastic.feature.node.model.TimeFrame +import org.meshtastic.proto.MeshProtos +import org.meshtastic.proto.MeshProtos.MeshPacket +import org.meshtastic.proto.Portnums +import org.meshtastic.proto.Portnums.PortNum import timber.log.Timber import java.io.BufferedWriter import java.io.FileNotFoundException diff --git a/app/src/main/java/com/geeksville/mesh/model/UIState.kt b/app/src/main/java/com/geeksville/mesh/model/UIState.kt index 37f437f81..b4d8f8adf 100644 --- a/app/src/main/java/com/geeksville/mesh/model/UIState.kt +++ b/app/src/main/java/com/geeksville/mesh/model/UIState.kt @@ -29,15 +29,6 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.asLiveData import androidx.lifecycle.viewModelScope import androidx.navigation.NavHostController -import com.geeksville.mesh.AdminProtos -import com.geeksville.mesh.AppOnlyProtos -import com.geeksville.mesh.ConfigProtos.Config -import com.geeksville.mesh.LocalOnlyProtos.LocalConfig -import com.geeksville.mesh.LocalOnlyProtos.LocalModuleConfig -import com.geeksville.mesh.MeshProtos -import com.geeksville.mesh.channelSet -import com.geeksville.mesh.config -import com.geeksville.mesh.copy import com.geeksville.mesh.repository.radio.MeshActivity import com.geeksville.mesh.repository.radio.RadioInterfaceService import com.geeksville.mesh.service.MeshServiceNotifications @@ -72,6 +63,15 @@ import org.meshtastic.core.model.util.toChannelSet import org.meshtastic.core.service.IMeshService import org.meshtastic.core.service.ServiceRepository import org.meshtastic.core.strings.R +import org.meshtastic.proto.AdminProtos +import org.meshtastic.proto.AppOnlyProtos +import org.meshtastic.proto.ConfigProtos.Config +import org.meshtastic.proto.LocalOnlyProtos.LocalConfig +import org.meshtastic.proto.LocalOnlyProtos.LocalModuleConfig +import org.meshtastic.proto.MeshProtos +import org.meshtastic.proto.channelSet +import org.meshtastic.proto.config +import org.meshtastic.proto.copy import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/com/geeksville/mesh/repository/network/MQTTRepository.kt b/app/src/main/java/com/geeksville/mesh/repository/network/MQTTRepository.kt index 2e0425550..074d1851f 100644 --- a/app/src/main/java/com/geeksville/mesh/repository/network/MQTTRepository.kt +++ b/app/src/main/java/com/geeksville/mesh/repository/network/MQTTRepository.kt @@ -17,8 +17,6 @@ package com.geeksville.mesh.repository.network -import com.geeksville.mesh.MeshProtos.MqttClientProxyMessage -import com.geeksville.mesh.mqttClientProxyMessage import com.geeksville.mesh.util.ignoreException import com.google.protobuf.ByteString import kotlinx.coroutines.channels.awaitClose @@ -36,6 +34,8 @@ import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence import org.meshtastic.core.data.repository.NodeRepository import org.meshtastic.core.data.repository.RadioConfigRepository import org.meshtastic.core.model.util.subscribeList +import org.meshtastic.proto.MeshProtos.MqttClientProxyMessage +import org.meshtastic.proto.mqttClientProxyMessage import timber.log.Timber import java.net.URI import java.security.SecureRandom diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/MockInterface.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/MockInterface.kt index 28bb560bb..a2f80bae1 100644 --- a/app/src/main/java/com/geeksville/mesh/repository/radio/MockInterface.kt +++ b/app/src/main/java/com/geeksville/mesh/repository/radio/MockInterface.kt @@ -17,20 +17,8 @@ package com.geeksville.mesh.repository.radio -import com.geeksville.mesh.AdminProtos -import com.geeksville.mesh.ChannelProtos -import com.geeksville.mesh.ConfigKt -import com.geeksville.mesh.ConfigProtos -import com.geeksville.mesh.MeshProtos -import com.geeksville.mesh.Portnums -import com.geeksville.mesh.TelemetryProtos -import com.geeksville.mesh.channel import com.geeksville.mesh.concurrent.handledLaunch -import com.geeksville.mesh.config -import com.geeksville.mesh.deviceMetadata -import com.geeksville.mesh.fromRadio import com.geeksville.mesh.model.getInitials -import com.geeksville.mesh.queueStatus import com.google.protobuf.ByteString import dagger.assisted.Assisted import dagger.assisted.AssistedInject @@ -38,6 +26,18 @@ import kotlinx.coroutines.delay import org.meshtastic.core.model.Channel import org.meshtastic.core.model.DataPacket import org.meshtastic.core.model.Position +import org.meshtastic.proto.AdminProtos +import org.meshtastic.proto.ChannelProtos +import org.meshtastic.proto.ConfigKt +import org.meshtastic.proto.ConfigProtos +import org.meshtastic.proto.MeshProtos +import org.meshtastic.proto.Portnums +import org.meshtastic.proto.TelemetryProtos +import org.meshtastic.proto.channel +import org.meshtastic.proto.config +import org.meshtastic.proto.deviceMetadata +import org.meshtastic.proto.fromRadio +import org.meshtastic.proto.queueStatus import timber.log.Timber import kotlin.random.Random diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/RadioInterfaceService.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/RadioInterfaceService.kt index 46a5697b9..803faadb2 100644 --- a/app/src/main/java/com/geeksville/mesh/repository/radio/RadioInterfaceService.kt +++ b/app/src/main/java/com/geeksville/mesh/repository/radio/RadioInterfaceService.kt @@ -23,7 +23,6 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.coroutineScope import com.geeksville.mesh.BuildConfig import com.geeksville.mesh.CoroutineDispatchers -import com.geeksville.mesh.MeshProtos import com.geeksville.mesh.android.BinaryLogFile import com.geeksville.mesh.android.BuildUtils import com.geeksville.mesh.concurrent.handledLaunch @@ -49,6 +48,7 @@ import org.meshtastic.core.analytics.platform.PlatformAnalytics import org.meshtastic.core.model.util.anonymize import org.meshtastic.core.prefs.radio.RadioPrefs import org.meshtastic.core.service.ConnectionState +import org.meshtastic.proto.MeshProtos import timber.log.Timber import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt index 38224c036..40027ce33 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt @@ -28,34 +28,12 @@ import android.os.IBinder import android.os.RemoteException import androidx.core.app.ServiceCompat import androidx.core.location.LocationCompat -import com.geeksville.mesh.AdminProtos -import com.geeksville.mesh.AppOnlyProtos import com.geeksville.mesh.BuildConfig -import com.geeksville.mesh.ChannelProtos -import com.geeksville.mesh.ConfigProtos import com.geeksville.mesh.CoroutineDispatchers -import com.geeksville.mesh.DeviceUIProtos -import com.geeksville.mesh.LocalOnlyProtos.LocalConfig -import com.geeksville.mesh.LocalOnlyProtos.LocalModuleConfig -import com.geeksville.mesh.MeshProtos -import com.geeksville.mesh.MeshProtos.FromRadio.PayloadVariantCase -import com.geeksville.mesh.MeshProtos.MeshPacket -import com.geeksville.mesh.MeshProtos.ToRadio -import com.geeksville.mesh.ModuleConfigProtos -import com.geeksville.mesh.PaxcountProtos -import com.geeksville.mesh.Portnums -import com.geeksville.mesh.StoreAndForwardProtos -import com.geeksville.mesh.TelemetryProtos -import com.geeksville.mesh.XmodemProtos import com.geeksville.mesh.concurrent.handledLaunch -import com.geeksville.mesh.copy -import com.geeksville.mesh.fromRadio import com.geeksville.mesh.model.NO_DEVICE_SELECTED -import com.geeksville.mesh.position import com.geeksville.mesh.repository.network.MQTTRepository import com.geeksville.mesh.repository.radio.RadioInterfaceService -import com.geeksville.mesh.telemetry -import com.geeksville.mesh.user import com.geeksville.mesh.util.ignoreException import com.geeksville.mesh.util.toRemoteExceptions import com.google.protobuf.ByteString @@ -106,6 +84,28 @@ import org.meshtastic.core.service.IMeshService import org.meshtastic.core.service.ServiceAction import org.meshtastic.core.service.ServiceRepository import org.meshtastic.core.strings.R +import org.meshtastic.proto.AdminProtos +import org.meshtastic.proto.AppOnlyProtos +import org.meshtastic.proto.ChannelProtos +import org.meshtastic.proto.ConfigProtos +import org.meshtastic.proto.DeviceUIProtos +import org.meshtastic.proto.LocalOnlyProtos.LocalConfig +import org.meshtastic.proto.LocalOnlyProtos.LocalModuleConfig +import org.meshtastic.proto.MeshProtos +import org.meshtastic.proto.MeshProtos.FromRadio.PayloadVariantCase +import org.meshtastic.proto.MeshProtos.MeshPacket +import org.meshtastic.proto.MeshProtos.ToRadio +import org.meshtastic.proto.ModuleConfigProtos +import org.meshtastic.proto.PaxcountProtos +import org.meshtastic.proto.Portnums +import org.meshtastic.proto.StoreAndForwardProtos +import org.meshtastic.proto.TelemetryProtos +import org.meshtastic.proto.XmodemProtos +import org.meshtastic.proto.copy +import org.meshtastic.proto.fromRadio +import org.meshtastic.proto.position +import org.meshtastic.proto.telemetry +import org.meshtastic.proto.user import timber.log.Timber import java.util.Random import java.util.UUID diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshServiceNotifications.kt b/app/src/main/java/com/geeksville/mesh/service/MeshServiceNotifications.kt index 8eee47248..d1acdfc90 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshServiceNotifications.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MeshServiceNotifications.kt @@ -35,15 +35,15 @@ import androidx.core.app.RemoteInput import androidx.core.content.getSystemService import androidx.core.net.toUri import com.geeksville.mesh.MainActivity -import com.geeksville.mesh.MeshProtos import com.geeksville.mesh.R.raw -import com.geeksville.mesh.TelemetryProtos -import com.geeksville.mesh.TelemetryProtos.LocalStats import com.geeksville.mesh.service.ReplyReceiver.Companion.KEY_TEXT_REPLY import org.meshtastic.core.database.entity.NodeEntity import org.meshtastic.core.model.util.formatUptime import org.meshtastic.core.navigation.DEEP_LINK_BASE_URI import org.meshtastic.core.strings.R +import org.meshtastic.proto.MeshProtos +import org.meshtastic.proto.TelemetryProtos +import org.meshtastic.proto.TelemetryProtos.LocalStats /** * Manages the creation and display of all app notifications. diff --git a/app/src/main/java/com/geeksville/mesh/service/PacketHandler.kt b/app/src/main/java/com/geeksville/mesh/service/PacketHandler.kt index 4518a22d3..a5fd4e116 100644 --- a/app/src/main/java/com/geeksville/mesh/service/PacketHandler.kt +++ b/app/src/main/java/com/geeksville/mesh/service/PacketHandler.kt @@ -17,11 +17,7 @@ package com.geeksville.mesh.service -import com.geeksville.mesh.MeshProtos -import com.geeksville.mesh.MeshProtos.MeshPacket -import com.geeksville.mesh.MeshProtos.ToRadio import com.geeksville.mesh.concurrent.handledLaunch -import com.geeksville.mesh.fromRadio import com.geeksville.mesh.repository.radio.RadioInterfaceService import dagger.Lazy import java8.util.concurrent.CompletableFuture @@ -38,6 +34,10 @@ import org.meshtastic.core.model.MessageStatus import org.meshtastic.core.model.util.toOneLineString import org.meshtastic.core.model.util.toPIIString import org.meshtastic.core.service.ConnectionState +import org.meshtastic.proto.MeshProtos +import org.meshtastic.proto.MeshProtos.MeshPacket +import org.meshtastic.proto.MeshProtos.ToRadio +import org.meshtastic.proto.fromRadio import timber.log.Timber import java.util.UUID import java.util.concurrent.ConcurrentLinkedQueue diff --git a/app/src/main/java/com/geeksville/mesh/ui/Main.kt b/app/src/main/java/com/geeksville/mesh/ui/Main.kt index 829ace03c..3167b4370 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/Main.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/Main.kt @@ -74,7 +74,6 @@ import androidx.navigation.compose.NavHost import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.compose.rememberNavController import com.geeksville.mesh.BuildConfig -import com.geeksville.mesh.MeshProtos import com.geeksville.mesh.model.BTScanModel import com.geeksville.mesh.model.UIViewModel import com.geeksville.mesh.navigation.channelsGraph @@ -113,6 +112,7 @@ import org.meshtastic.core.ui.icon.Settings import org.meshtastic.core.ui.theme.StatusColors.StatusBlue import org.meshtastic.core.ui.theme.StatusColors.StatusGreen import org.meshtastic.feature.settings.navigation.settingsGraph +import org.meshtastic.proto.MeshProtos import timber.log.Timber enum class TopLevelDestination(@StringRes val label: Int, val icon: ImageVector, val route: Route) { diff --git a/app/src/main/java/com/geeksville/mesh/ui/common/components/ScannedQrCodeDialog.kt b/app/src/main/java/com/geeksville/mesh/ui/common/components/ScannedQrCodeDialog.kt index 89059ae01..7260e6297 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/common/components/ScannedQrCodeDialog.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/common/components/ScannedQrCodeDialog.kt @@ -51,13 +51,13 @@ import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.DialogProperties import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.geeksville.mesh.AppOnlyProtos.ChannelSet -import com.geeksville.mesh.ConfigProtos.Config.LoRaConfig.ModemPreset -import com.geeksville.mesh.channelSet -import com.geeksville.mesh.copy import org.meshtastic.core.model.Channel import org.meshtastic.core.strings.R import org.meshtastic.feature.settings.radio.component.ChannelSelection +import org.meshtastic.proto.AppOnlyProtos.ChannelSet +import org.meshtastic.proto.ConfigProtos.Config.LoRaConfig.ModemPreset +import org.meshtastic.proto.channelSet +import org.meshtastic.proto.copy @Composable fun ScannedQrCodeDialog( diff --git a/app/src/main/java/com/geeksville/mesh/ui/common/components/ScannedQrCodeViewModel.kt b/app/src/main/java/com/geeksville/mesh/ui/common/components/ScannedQrCodeViewModel.kt index 34d6f16df..99a8d0efa 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/common/components/ScannedQrCodeViewModel.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/common/components/ScannedQrCodeViewModel.kt @@ -20,12 +20,6 @@ package com.geeksville.mesh.ui.common.components import android.os.RemoteException import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.geeksville.mesh.AppOnlyProtos -import com.geeksville.mesh.ChannelProtos -import com.geeksville.mesh.ConfigProtos.Config -import com.geeksville.mesh.LocalOnlyProtos.LocalConfig -import com.geeksville.mesh.channelSet -import com.geeksville.mesh.config import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.stateIn @@ -33,6 +27,12 @@ import kotlinx.coroutines.launch import org.meshtastic.core.data.repository.RadioConfigRepository import org.meshtastic.core.proto.getChannelList import org.meshtastic.core.service.ServiceRepository +import org.meshtastic.proto.AppOnlyProtos +import org.meshtastic.proto.ChannelProtos +import org.meshtastic.proto.ConfigProtos.Config +import org.meshtastic.proto.LocalOnlyProtos.LocalConfig +import org.meshtastic.proto.channelSet +import org.meshtastic.proto.config import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/com/geeksville/mesh/ui/connections/ConnectionsScreen.kt b/app/src/main/java/com/geeksville/mesh/ui/connections/ConnectionsScreen.kt index 3206b3325..899a0a4f7 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/connections/ConnectionsScreen.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/connections/ConnectionsScreen.kt @@ -52,7 +52,6 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.geeksville.mesh.ConfigProtos import com.geeksville.mesh.model.BTScanModel import com.geeksville.mesh.model.DeviceListEntry import com.geeksville.mesh.ui.connections.components.BLEDevices @@ -73,6 +72,7 @@ import org.meshtastic.feature.settings.navigation.ConfigRoute import org.meshtastic.feature.settings.navigation.getNavRouteFrom import org.meshtastic.feature.settings.radio.RadioConfigViewModel import org.meshtastic.feature.settings.radio.component.PacketResponseStateDialog +import org.meshtastic.proto.ConfigProtos fun String?.isIPAddress(): Boolean = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { @Suppress("DEPRECATION") diff --git a/app/src/main/java/com/geeksville/mesh/ui/connections/ConnectionsViewModel.kt b/app/src/main/java/com/geeksville/mesh/ui/connections/ConnectionsViewModel.kt index c748a68ed..afc4a98a2 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/connections/ConnectionsViewModel.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/connections/ConnectionsViewModel.kt @@ -19,7 +19,6 @@ package com.geeksville.mesh.ui.connections import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.geeksville.mesh.LocalOnlyProtos.LocalConfig import com.geeksville.mesh.repository.bluetooth.BluetoothRepository import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow @@ -33,6 +32,7 @@ import org.meshtastic.core.database.entity.MyNodeEntity import org.meshtastic.core.database.model.Node import org.meshtastic.core.prefs.ui.UiPrefs import org.meshtastic.core.service.ServiceRepository +import org.meshtastic.proto.LocalOnlyProtos.LocalConfig import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/com/geeksville/mesh/ui/connections/components/CurrentlyConnectedInfo.kt b/app/src/main/java/com/geeksville/mesh/ui/connections/components/CurrentlyConnectedInfo.kt index fc5c36d5e..9ba83a894 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/connections/components/CurrentlyConnectedInfo.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/connections/components/CurrentlyConnectedInfo.kt @@ -36,9 +36,6 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.dp -import com.geeksville.mesh.MeshProtos -import com.geeksville.mesh.PaxcountProtos -import com.geeksville.mesh.TelemetryProtos import org.meshtastic.core.database.model.Node import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.MaterialBatteryInfo @@ -46,6 +43,9 @@ import org.meshtastic.core.ui.component.MaterialBluetoothSignalInfo import org.meshtastic.core.ui.component.NodeChip import org.meshtastic.core.ui.theme.AppTheme import org.meshtastic.core.ui.theme.StatusColors.StatusRed +import org.meshtastic.proto.MeshProtos +import org.meshtastic.proto.PaxcountProtos +import org.meshtastic.proto.TelemetryProtos /** Converts Bluetooth RSSI to a 0-4 bar signal strength level. */ @Composable diff --git a/app/src/main/java/com/geeksville/mesh/ui/contact/ContactItem.kt b/app/src/main/java/com/geeksville/mesh/ui/contact/ContactItem.kt index 346387315..ffe36cd67 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/contact/ContactItem.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/contact/ContactItem.kt @@ -49,11 +49,11 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.dp -import com.geeksville.mesh.AppOnlyProtos import com.geeksville.mesh.model.Contact import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.SecurityIcon import org.meshtastic.core.ui.theme.AppTheme +import org.meshtastic.proto.AppOnlyProtos @Suppress("LongMethod") @Composable diff --git a/app/src/main/java/com/geeksville/mesh/ui/contact/Contacts.kt b/app/src/main/java/com/geeksville/mesh/ui/contact/Contacts.kt index 945a0b50d..7a81b5975 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/contact/Contacts.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/contact/Contacts.kt @@ -61,10 +61,10 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.window.DialogProperties import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.geeksville.mesh.AppOnlyProtos import com.geeksville.mesh.model.Contact import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.MainAppBar +import org.meshtastic.proto.AppOnlyProtos import java.util.concurrent.TimeUnit @OptIn(ExperimentalMaterial3ExpressiveApi::class) diff --git a/app/src/main/java/com/geeksville/mesh/ui/contact/ContactsViewModel.kt b/app/src/main/java/com/geeksville/mesh/ui/contact/ContactsViewModel.kt index 04f0aa330..a46d5fd57 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/contact/ContactsViewModel.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/contact/ContactsViewModel.kt @@ -20,7 +20,6 @@ package com.geeksville.mesh.ui.contact import android.content.Context import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.geeksville.mesh.channelSet import com.geeksville.mesh.model.Contact import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext @@ -38,6 +37,7 @@ import org.meshtastic.core.model.util.getChannel import org.meshtastic.core.model.util.getShortDate import org.meshtastic.core.service.ServiceRepository import org.meshtastic.core.strings.R +import org.meshtastic.proto.channelSet import javax.inject.Inject import kotlin.collections.map diff --git a/app/src/main/java/com/geeksville/mesh/ui/message/Message.kt b/app/src/main/java/com/geeksville/mesh/ui/message/Message.kt index 12f3d111b..f95d45d78 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/message/Message.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/message/Message.kt @@ -91,7 +91,6 @@ import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.dp import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.geeksville.mesh.AppOnlyProtos import com.geeksville.mesh.ui.sharing.SharedContactDialog import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch @@ -104,6 +103,7 @@ import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.SecurityIcon import org.meshtastic.core.ui.theme.AppTheme import org.meshtastic.feature.node.component.NodeKeyStatusIcon +import org.meshtastic.proto.AppOnlyProtos import java.nio.charset.StandardCharsets private const val MESSAGE_CHARACTER_LIMIT_BYTES = 200 diff --git a/app/src/main/java/com/geeksville/mesh/ui/message/MessageViewModel.kt b/app/src/main/java/com/geeksville/mesh/ui/message/MessageViewModel.kt index de0f6ebfc..0f7419196 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/message/MessageViewModel.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/message/MessageViewModel.kt @@ -20,9 +20,7 @@ package com.geeksville.mesh.ui.message import android.os.RemoteException import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.geeksville.mesh.channelSet import com.geeksville.mesh.service.MeshServiceNotifications -import com.geeksville.mesh.sharedContact import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow @@ -45,6 +43,8 @@ import org.meshtastic.core.model.DeviceVersion import org.meshtastic.core.prefs.ui.UiPrefs import org.meshtastic.core.service.ServiceAction import org.meshtastic.core.service.ServiceRepository +import org.meshtastic.proto.channelSet +import org.meshtastic.proto.sharedContact import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/com/geeksville/mesh/ui/message/components/Reaction.kt b/app/src/main/java/com/geeksville/mesh/ui/message/components/Reaction.kt index 952fc2149..0baf6676c 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/message/components/Reaction.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/message/components/Reaction.kt @@ -51,10 +51,10 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.dp -import com.geeksville.mesh.MeshProtos import org.meshtastic.core.database.entity.Reaction import org.meshtastic.core.ui.component.BottomSheetDialog import org.meshtastic.core.ui.theme.AppTheme +import org.meshtastic.proto.MeshProtos @Composable private fun ReactionItem(emoji: String, emojiCount: Int = 1, onClick: () -> Unit = {}, onLongClick: () -> Unit = {}) { diff --git a/app/src/main/java/com/geeksville/mesh/ui/metrics/DeviceMetrics.kt b/app/src/main/java/com/geeksville/mesh/ui/metrics/DeviceMetrics.kt index 75e97dee1..ecd4bf65d 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/metrics/DeviceMetrics.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/metrics/DeviceMetrics.kt @@ -60,8 +60,6 @@ import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.dp import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.geeksville.mesh.TelemetryProtos -import com.geeksville.mesh.TelemetryProtos.Telemetry import com.geeksville.mesh.model.MetricsViewModel import com.geeksville.mesh.ui.metrics.CommonCharts.DATE_TIME_FORMAT import com.geeksville.mesh.ui.metrics.CommonCharts.MAX_PERCENT_VALUE @@ -79,6 +77,8 @@ import org.meshtastic.core.ui.theme.GraphColors.Cyan import org.meshtastic.core.ui.theme.GraphColors.Green import org.meshtastic.core.ui.theme.GraphColors.Magenta import org.meshtastic.feature.node.model.TimeFrame +import org.meshtastic.proto.TelemetryProtos +import org.meshtastic.proto.TelemetryProtos.Telemetry private const val CHART_WEIGHT = 1f private const val Y_AXIS_WEIGHT = 0.1f diff --git a/app/src/main/java/com/geeksville/mesh/ui/metrics/EnvironmentCharts.kt b/app/src/main/java/com/geeksville/mesh/ui/metrics/EnvironmentCharts.kt index 6d619c0fa..cc29a935a 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/metrics/EnvironmentCharts.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/metrics/EnvironmentCharts.kt @@ -40,13 +40,13 @@ import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.LocalWindowInfo import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import com.geeksville.mesh.TelemetryProtos.Telemetry import com.geeksville.mesh.model.Environment import com.geeksville.mesh.model.EnvironmentGraphingData import com.geeksville.mesh.util.GraphUtil.createPath import com.geeksville.mesh.util.GraphUtil.drawPathWithGradient import org.meshtastic.core.strings.R import org.meshtastic.feature.node.model.TimeFrame +import org.meshtastic.proto.TelemetryProtos.Telemetry private const val CHART_WEIGHT = 1f private const val Y_AXIS_WEIGHT = 0.1f diff --git a/app/src/main/java/com/geeksville/mesh/ui/metrics/EnvironmentMetrics.kt b/app/src/main/java/com/geeksville/mesh/ui/metrics/EnvironmentMetrics.kt index cfe599695..183241ca0 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/metrics/EnvironmentMetrics.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/metrics/EnvironmentMetrics.kt @@ -49,9 +49,6 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.geeksville.mesh.TelemetryProtos -import com.geeksville.mesh.TelemetryProtos.Telemetry -import com.geeksville.mesh.copy import com.geeksville.mesh.model.MetricsViewModel import com.geeksville.mesh.ui.metrics.CommonCharts.DATE_TIME_FORMAT import com.geeksville.mesh.ui.metrics.CommonCharts.MS_PER_SEC @@ -63,6 +60,9 @@ import org.meshtastic.core.ui.component.MainAppBar import org.meshtastic.core.ui.component.OptionLabel import org.meshtastic.core.ui.component.SlidingSelector import org.meshtastic.feature.node.model.TimeFrame +import org.meshtastic.proto.TelemetryProtos +import org.meshtastic.proto.TelemetryProtos.Telemetry +import org.meshtastic.proto.copy @Composable fun EnvironmentMetricsScreen(viewModel: MetricsViewModel = hiltViewModel(), onNavigateUp: () -> Unit) { diff --git a/app/src/main/java/com/geeksville/mesh/ui/metrics/HostMetricsLog.kt b/app/src/main/java/com/geeksville/mesh/ui/metrics/HostMetricsLog.kt index 01ae70323..23bd577d3 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/metrics/HostMetricsLog.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/metrics/HostMetricsLog.kt @@ -54,13 +54,13 @@ import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.dp import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.geeksville.mesh.TelemetryProtos import com.geeksville.mesh.model.MetricsViewModel import com.geeksville.mesh.ui.metrics.CommonCharts.DATE_TIME_FORMAT import org.meshtastic.core.model.util.formatUptime import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.MainAppBar import org.meshtastic.core.ui.theme.AppTheme +import org.meshtastic.proto.TelemetryProtos import java.text.DecimalFormat @OptIn(ExperimentalFoundationApi::class) diff --git a/app/src/main/java/com/geeksville/mesh/ui/metrics/PaxMetrics.kt b/app/src/main/java/com/geeksville/mesh/ui/metrics/PaxMetrics.kt index c8a65de5a..5b5ab8fce 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/metrics/PaxMetrics.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/metrics/PaxMetrics.kt @@ -54,8 +54,6 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.geeksville.mesh.PaxcountProtos -import com.geeksville.mesh.Portnums.PortNum import com.geeksville.mesh.model.MetricsViewModel import org.meshtastic.core.database.entity.MeshLog import org.meshtastic.core.model.util.formatUptime @@ -64,6 +62,8 @@ import org.meshtastic.core.ui.component.MainAppBar import org.meshtastic.core.ui.component.OptionLabel import org.meshtastic.core.ui.component.SlidingSelector import org.meshtastic.feature.node.model.TimeFrame +import org.meshtastic.proto.PaxcountProtos +import org.meshtastic.proto.Portnums.PortNum import java.text.DateFormat import java.util.Date diff --git a/app/src/main/java/com/geeksville/mesh/ui/metrics/PositionLog.kt b/app/src/main/java/com/geeksville/mesh/ui/metrics/PositionLog.kt index 10a4bf3d2..3ea113823 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/metrics/PositionLog.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/metrics/PositionLog.kt @@ -62,8 +62,6 @@ import androidx.compose.ui.tooling.preview.PreviewScreenSizes import androidx.compose.ui.unit.dp import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.geeksville.mesh.ConfigProtos.Config.DisplayConfig.DisplayUnits -import com.geeksville.mesh.MeshProtos import com.geeksville.mesh.model.MetricsViewModel import org.meshtastic.core.model.util.metersIn import org.meshtastic.core.model.util.toString @@ -71,6 +69,8 @@ import org.meshtastic.core.proto.formatPositionTime import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.MainAppBar import org.meshtastic.core.ui.theme.AppTheme +import org.meshtastic.proto.ConfigProtos.Config.DisplayConfig.DisplayUnits +import org.meshtastic.proto.MeshProtos import java.text.DateFormat @Composable diff --git a/app/src/main/java/com/geeksville/mesh/ui/metrics/PowerMetrics.kt b/app/src/main/java/com/geeksville/mesh/ui/metrics/PowerMetrics.kt index 4757ce8ca..646f6e17f 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/metrics/PowerMetrics.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/metrics/PowerMetrics.kt @@ -60,7 +60,6 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.geeksville.mesh.TelemetryProtos.Telemetry import com.geeksville.mesh.model.MetricsViewModel import com.geeksville.mesh.ui.metrics.CommonCharts.DATE_TIME_FORMAT import com.geeksville.mesh.ui.metrics.CommonCharts.MS_PER_SEC @@ -73,6 +72,7 @@ import org.meshtastic.core.ui.component.SlidingSelector import org.meshtastic.core.ui.theme.GraphColors.InfantryBlue import org.meshtastic.core.ui.theme.GraphColors.Red import org.meshtastic.feature.node.model.TimeFrame +import org.meshtastic.proto.TelemetryProtos.Telemetry import kotlin.math.ceil import kotlin.math.floor diff --git a/app/src/main/java/com/geeksville/mesh/ui/metrics/SignalMetrics.kt b/app/src/main/java/com/geeksville/mesh/ui/metrics/SignalMetrics.kt index 57320df6e..bbb04c957 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/metrics/SignalMetrics.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/metrics/SignalMetrics.kt @@ -57,7 +57,6 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.geeksville.mesh.MeshProtos.MeshPacket import com.geeksville.mesh.model.MetricsViewModel import com.geeksville.mesh.ui.metrics.CommonCharts.DATE_TIME_FORMAT import com.geeksville.mesh.ui.metrics.CommonCharts.MS_PER_SEC @@ -69,6 +68,7 @@ import org.meshtastic.core.ui.component.OptionLabel import org.meshtastic.core.ui.component.SlidingSelector import org.meshtastic.core.ui.component.SnrAndRssi import org.meshtastic.feature.node.model.TimeFrame +import org.meshtastic.proto.MeshProtos.MeshPacket @Suppress("MagicNumber") private enum class Metric(val color: Color, val min: Float, val max: Float) { diff --git a/app/src/main/java/com/geeksville/mesh/ui/metrics/TracerouteLog.kt b/app/src/main/java/com/geeksville/mesh/ui/metrics/TracerouteLog.kt index 49ca62a17..a7d6bfdef 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/metrics/TracerouteLog.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/metrics/TracerouteLog.kt @@ -62,7 +62,6 @@ import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.dp import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.geeksville.mesh.MeshProtos import com.geeksville.mesh.model.MetricsViewModel import com.geeksville.mesh.ui.metrics.CommonCharts.MS_PER_SEC import org.meshtastic.core.model.fullRouteDiscovery @@ -76,6 +75,7 @@ import org.meshtastic.core.ui.theme.AppTheme import org.meshtastic.core.ui.theme.StatusColors.StatusGreen import org.meshtastic.core.ui.theme.StatusColors.StatusOrange import org.meshtastic.core.ui.theme.StatusColors.StatusYellow +import org.meshtastic.proto.MeshProtos import java.text.DateFormat @OptIn(ExperimentalFoundationApi::class) diff --git a/app/src/main/java/com/geeksville/mesh/ui/node/NodeListScreen.kt b/app/src/main/java/com/geeksville/mesh/ui/node/NodeListScreen.kt index ace46d5dd..4248ca6dd 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/node/NodeListScreen.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/node/NodeListScreen.kt @@ -57,7 +57,6 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.geeksville.mesh.AdminProtos import com.geeksville.mesh.ui.sharing.AddContactFAB import com.geeksville.mesh.ui.sharing.supportsQrCodeSharing import org.meshtastic.core.database.model.Node @@ -71,6 +70,7 @@ import org.meshtastic.feature.node.component.NodeActionDialogs import org.meshtastic.feature.node.component.NodeFilterTextField import org.meshtastic.feature.node.component.NodeItem import org.meshtastic.feature.node.list.NodeListViewModel +import org.meshtastic.proto.AdminProtos @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Suppress("LongMethod", "CyclomaticComplexMethod") diff --git a/app/src/main/java/com/geeksville/mesh/ui/sharing/Channel.kt b/app/src/main/java/com/geeksville/mesh/ui/sharing/Channel.kt index f039a037e..2acf3e70b 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/sharing/Channel.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/sharing/Channel.kt @@ -89,11 +89,6 @@ import androidx.compose.ui.unit.sp import androidx.core.net.toUri import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.geeksville.mesh.AppOnlyProtos.ChannelSet -import com.geeksville.mesh.ChannelProtos -import com.geeksville.mesh.ConfigProtos -import com.geeksville.mesh.channelSet -import com.geeksville.mesh.copy import com.geeksville.mesh.ui.common.components.ScannedQrCodeDialog import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.isGranted @@ -116,6 +111,11 @@ import org.meshtastic.feature.settings.navigation.getNavRouteFrom import org.meshtastic.feature.settings.radio.RadioConfigViewModel import org.meshtastic.feature.settings.radio.component.ChannelSelection import org.meshtastic.feature.settings.radio.component.PacketResponseStateDialog +import org.meshtastic.proto.AppOnlyProtos.ChannelSet +import org.meshtastic.proto.ChannelProtos +import org.meshtastic.proto.ConfigProtos +import org.meshtastic.proto.channelSet +import org.meshtastic.proto.copy import timber.log.Timber /** diff --git a/app/src/main/java/com/geeksville/mesh/ui/sharing/ChannelViewModel.kt b/app/src/main/java/com/geeksville/mesh/ui/sharing/ChannelViewModel.kt index e7caee9c3..ac99e2512 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/sharing/ChannelViewModel.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/sharing/ChannelViewModel.kt @@ -21,13 +21,6 @@ import android.net.Uri import android.os.RemoteException import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.geeksville.mesh.AppOnlyProtos -import com.geeksville.mesh.ChannelProtos -import com.geeksville.mesh.ConfigProtos.Config -import com.geeksville.mesh.LocalOnlyProtos.LocalConfig -import com.geeksville.mesh.channelSet -import com.geeksville.mesh.config -import com.geeksville.mesh.copy import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted @@ -40,6 +33,13 @@ import org.meshtastic.core.data.repository.RadioConfigRepository import org.meshtastic.core.model.util.toChannelSet import org.meshtastic.core.proto.getChannelList import org.meshtastic.core.service.ServiceRepository +import org.meshtastic.proto.AppOnlyProtos +import org.meshtastic.proto.ChannelProtos +import org.meshtastic.proto.ConfigProtos.Config +import org.meshtastic.proto.LocalOnlyProtos.LocalConfig +import org.meshtastic.proto.channelSet +import org.meshtastic.proto.config +import org.meshtastic.proto.copy import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/com/geeksville/mesh/ui/sharing/ContactSharing.kt b/app/src/main/java/com/geeksville/mesh/ui/sharing/ContactSharing.kt index 5a1550d3d..81b89898c 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/sharing/ContactSharing.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/sharing/ContactSharing.kt @@ -44,8 +44,6 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.core.net.toUri -import com.geeksville.mesh.AdminProtos -import com.geeksville.mesh.MeshProtos import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.isGranted import com.google.accompanist.permissions.rememberPermissionState @@ -62,6 +60,8 @@ import org.meshtastic.core.model.DeviceVersion import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.CopyIconButton import org.meshtastic.core.ui.component.SimpleAlertDialog +import org.meshtastic.proto.AdminProtos +import org.meshtastic.proto.MeshProtos import timber.log.Timber import java.net.MalformedURLException diff --git a/app/src/main/java/com/geeksville/mesh/ui/sharing/SharedContactDialog.kt b/app/src/main/java/com/geeksville/mesh/ui/sharing/SharedContactDialog.kt index 8eabdd3ae..8174ddaf2 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/sharing/SharedContactDialog.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/sharing/SharedContactDialog.kt @@ -26,9 +26,9 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.res.stringResource import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.geeksville.mesh.AdminProtos import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.SimpleAlertDialog +import org.meshtastic.proto.AdminProtos /** A dialog for importing a shared contact that was scanned from a QR code. */ @Composable diff --git a/app/src/main/java/com/geeksville/mesh/ui/sharing/SharedContactViewModel.kt b/app/src/main/java/com/geeksville/mesh/ui/sharing/SharedContactViewModel.kt index 3d0c17c75..c007c12ee 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/sharing/SharedContactViewModel.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/sharing/SharedContactViewModel.kt @@ -19,7 +19,6 @@ package com.geeksville.mesh.ui.sharing import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.geeksville.mesh.AdminProtos import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow @@ -29,6 +28,7 @@ import org.meshtastic.core.data.repository.NodeRepository import org.meshtastic.core.database.model.Node import org.meshtastic.core.service.ServiceAction import org.meshtastic.core.service.ServiceRepository +import org.meshtastic.proto.AdminProtos import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/com/geeksville/mesh/util/GraphUtil.kt b/app/src/main/java/com/geeksville/mesh/util/GraphUtil.kt index cad72d1ef..dd3dcad6b 100644 --- a/app/src/main/java/com/geeksville/mesh/util/GraphUtil.kt +++ b/app/src/main/java/com/geeksville/mesh/util/GraphUtil.kt @@ -18,10 +18,10 @@ package com.geeksville.mesh.util import android.content.res.Resources -import androidx.compose.ui.graphics.Path import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Path import androidx.compose.ui.graphics.StrokeCap import androidx.compose.ui.graphics.asAndroidPath import androidx.compose.ui.graphics.asComposePath @@ -29,7 +29,7 @@ import androidx.compose.ui.graphics.drawscope.DrawContext import androidx.compose.ui.graphics.drawscope.DrawScope import androidx.compose.ui.graphics.drawscope.Stroke import androidx.compose.ui.unit.dp -import com.geeksville.mesh.TelemetryProtos.Telemetry +import org.meshtastic.proto.TelemetryProtos.Telemetry object GraphUtil { @@ -39,26 +39,20 @@ object GraphUtil { * @param value Must be zero-scaled before passing. * @param divisor The range for the data set. */ - fun plotPoint( - drawContext: DrawContext, - color: Color, - x: Float, - value: Float, - divisor: Float, - ) { + fun plotPoint(drawContext: DrawContext, color: Color, x: Float, value: Float, divisor: Float) { val height = drawContext.size.height val ratio = value / divisor val y = height - (ratio * height) drawContext.canvas.drawCircle( center = Offset(x, y), radius = RADIUS, - paint = androidx.compose.ui.graphics.Paint().apply { this.color = color } + paint = androidx.compose.ui.graphics.Paint().apply { this.color = color }, ) } /** - * Creates a [Path] that could be used to draw a line from the `index` to the end of `telemetries` - * or the last point before a time separation between [Telemetry]s. + * Creates a [Path] that could be used to draw a line from the `index` to the end of `telemetries` or the last point + * before a time separation between [Telemetry]s. * * @param telemetries data used to create the [Path] * @param index current place in the [List] @@ -77,7 +71,7 @@ object GraphUtil { timeRange: Int, width: Float, timeThreshold: Long, - calculateY: (Int) -> Float + calculateY: (Int) -> Float, ): Int { var i = index var isNewLine = true @@ -112,37 +106,17 @@ object GraphUtil { return i } - fun DrawScope.drawPathWithGradient( - path: Path, - color: Color, - height: Float, - x1: Float, - x2: Float - ) { - drawPath( - path = path, - color = color, - style = Stroke( - width = 2.dp.toPx(), - cap = StrokeCap.Round - ) - ) - val fillPath = android.graphics.Path(path.asAndroidPath()) - .asComposePath() - .apply { + fun DrawScope.drawPathWithGradient(path: Path, color: Color, height: Float, x1: Float, x2: Float) { + drawPath(path = path, color = color, style = Stroke(width = 2.dp.toPx(), cap = StrokeCap.Round)) + val fillPath = + android.graphics.Path(path.asAndroidPath()).asComposePath().apply { lineTo(x1, height) lineTo(x2, height) close() } drawPath( path = fillPath, - brush = Brush.verticalGradient( - colors = listOf( - color.copy(alpha = 0.5f), - Color.Transparent - ), - endY = height - ), + brush = Brush.verticalGradient(colors = listOf(color.copy(alpha = 0.5f), Color.Transparent), endY = height), ) } } diff --git a/app/src/main/java/com/geeksville/mesh/util/HardwareModelExtensions.kt b/app/src/main/java/com/geeksville/mesh/util/HardwareModelExtensions.kt index f93be1581..905d76c2e 100644 --- a/app/src/main/java/com/geeksville/mesh/util/HardwareModelExtensions.kt +++ b/app/src/main/java/com/geeksville/mesh/util/HardwareModelExtensions.kt @@ -17,7 +17,7 @@ package com.geeksville.mesh.util -import com.geeksville.mesh.MeshProtos +import org.meshtastic.proto.MeshProtos import timber.log.Timber /** diff --git a/app/src/test/java/com/geeksville/mesh/ui/metrics/EnvironmentMetricsTest.kt b/app/src/test/java/com/geeksville/mesh/ui/metrics/EnvironmentMetricsTest.kt index 2fc378d47..c934972a2 100644 --- a/app/src/test/java/com/geeksville/mesh/ui/metrics/EnvironmentMetricsTest.kt +++ b/app/src/test/java/com/geeksville/mesh/ui/metrics/EnvironmentMetricsTest.kt @@ -17,11 +17,11 @@ package com.geeksville.mesh.ui.metrics -import com.geeksville.mesh.TelemetryProtos -import com.geeksville.mesh.copy import org.junit.Assert.assertEquals import org.junit.Test import org.meshtastic.core.model.util.UnitConversions.celsiusToFahrenheit +import org.meshtastic.proto.TelemetryProtos +import org.meshtastic.proto.copy class EnvironmentMetricsTest { diff --git a/core/data/src/main/kotlin/org/meshtastic/core/data/repository/MeshLogRepository.kt b/core/data/src/main/kotlin/org/meshtastic/core/data/repository/MeshLogRepository.kt index 2047f12af..0ca56aa97 100644 --- a/core/data/src/main/kotlin/org/meshtastic/core/data/repository/MeshLogRepository.kt +++ b/core/data/src/main/kotlin/org/meshtastic/core/data/repository/MeshLogRepository.kt @@ -17,10 +17,6 @@ package org.meshtastic.core.data.repository -import com.geeksville.mesh.MeshProtos -import com.geeksville.mesh.MeshProtos.MeshPacket -import com.geeksville.mesh.Portnums -import com.geeksville.mesh.TelemetryProtos.Telemetry import dagger.Lazy import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.Flow @@ -32,6 +28,10 @@ import kotlinx.coroutines.withContext import org.meshtastic.core.database.dao.MeshLogDao import org.meshtastic.core.database.entity.MeshLog import org.meshtastic.core.di.annotation.IoDispatcher +import org.meshtastic.proto.MeshProtos +import org.meshtastic.proto.MeshProtos.MeshPacket +import org.meshtastic.proto.Portnums +import org.meshtastic.proto.TelemetryProtos.Telemetry import javax.inject.Inject @Suppress("TooManyFunctions") diff --git a/core/data/src/main/kotlin/org/meshtastic/core/data/repository/NodeRepository.kt b/core/data/src/main/kotlin/org/meshtastic/core/data/repository/NodeRepository.kt index bb03ce42d..5d3fcd056 100644 --- a/core/data/src/main/kotlin/org/meshtastic/core/data/repository/NodeRepository.kt +++ b/core/data/src/main/kotlin/org/meshtastic/core/data/repository/NodeRepository.kt @@ -19,7 +19,6 @@ package org.meshtastic.core.data.repository import androidx.lifecycle.Lifecycle import androidx.lifecycle.coroutineScope -import com.geeksville.mesh.MeshProtos import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow @@ -41,6 +40,7 @@ import org.meshtastic.core.database.model.NodeSortOption import org.meshtastic.core.di.annotation.IoDispatcher import org.meshtastic.core.model.DataPacket import org.meshtastic.core.model.util.onlineTimeThreshold +import org.meshtastic.proto.MeshProtos import javax.inject.Inject import javax.inject.Singleton import kotlin.collections.map diff --git a/core/data/src/main/kotlin/org/meshtastic/core/data/repository/PacketRepository.kt b/core/data/src/main/kotlin/org/meshtastic/core/data/repository/PacketRepository.kt index 730f0515c..999f3d9c4 100644 --- a/core/data/src/main/kotlin/org/meshtastic/core/data/repository/PacketRepository.kt +++ b/core/data/src/main/kotlin/org/meshtastic/core/data/repository/PacketRepository.kt @@ -17,7 +17,6 @@ package org.meshtastic.core.data.repository -import com.geeksville.mesh.Portnums.PortNum import dagger.Lazy import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow @@ -30,6 +29,7 @@ import org.meshtastic.core.database.entity.ReactionEntity import org.meshtastic.core.database.model.Node import org.meshtastic.core.model.DataPacket import org.meshtastic.core.model.MessageStatus +import org.meshtastic.proto.Portnums.PortNum import javax.inject.Inject class PacketRepository @Inject constructor(private val packetDaoLazy: Lazy) { diff --git a/core/data/src/main/kotlin/org/meshtastic/core/data/repository/RadioConfigRepository.kt b/core/data/src/main/kotlin/org/meshtastic/core/data/repository/RadioConfigRepository.kt index 2300aa053..328b34697 100644 --- a/core/data/src/main/kotlin/org/meshtastic/core/data/repository/RadioConfigRepository.kt +++ b/core/data/src/main/kotlin/org/meshtastic/core/data/repository/RadioConfigRepository.kt @@ -17,21 +17,21 @@ package org.meshtastic.core.data.repository -import com.geeksville.mesh.AppOnlyProtos.ChannelSet -import com.geeksville.mesh.ChannelProtos.Channel -import com.geeksville.mesh.ChannelProtos.ChannelSettings -import com.geeksville.mesh.ClientOnlyProtos.DeviceProfile -import com.geeksville.mesh.ConfigProtos.Config -import com.geeksville.mesh.LocalOnlyProtos.LocalConfig -import com.geeksville.mesh.LocalOnlyProtos.LocalModuleConfig -import com.geeksville.mesh.ModuleConfigProtos.ModuleConfig -import com.geeksville.mesh.deviceProfile import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine import org.meshtastic.core.datastore.ChannelSetDataSource import org.meshtastic.core.datastore.LocalConfigDataSource import org.meshtastic.core.datastore.ModuleConfigDataSource import org.meshtastic.core.model.util.getChannelUrl +import org.meshtastic.proto.AppOnlyProtos.ChannelSet +import org.meshtastic.proto.ChannelProtos.Channel +import org.meshtastic.proto.ChannelProtos.ChannelSettings +import org.meshtastic.proto.ClientOnlyProtos.DeviceProfile +import org.meshtastic.proto.ConfigProtos.Config +import org.meshtastic.proto.LocalOnlyProtos.LocalConfig +import org.meshtastic.proto.LocalOnlyProtos.LocalModuleConfig +import org.meshtastic.proto.ModuleConfigProtos.ModuleConfig +import org.meshtastic.proto.deviceProfile import javax.inject.Inject /** diff --git a/core/database/src/androidTest/kotlin/org/meshtastic/core/database/dao/NodeInfoDaoTest.kt b/core/database/src/androidTest/kotlin/org/meshtastic/core/database/dao/NodeInfoDaoTest.kt index 94640dde5..e31bd015e 100644 --- a/core/database/src/androidTest/kotlin/org/meshtastic/core/database/dao/NodeInfoDaoTest.kt +++ b/core/database/src/androidTest/kotlin/org/meshtastic/core/database/dao/NodeInfoDaoTest.kt @@ -20,9 +20,6 @@ package org.meshtastic.core.database.dao import androidx.room.Room import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry -import com.geeksville.mesh.MeshProtos -import com.geeksville.mesh.copy -import com.geeksville.mesh.user import com.google.protobuf.ByteString import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.map @@ -40,6 +37,9 @@ import org.meshtastic.core.database.entity.NodeEntity import org.meshtastic.core.database.model.Node import org.meshtastic.core.database.model.NodeSortOption import org.meshtastic.core.model.util.onlineTimeThreshold +import org.meshtastic.proto.MeshProtos +import org.meshtastic.proto.copy +import org.meshtastic.proto.user @RunWith(AndroidJUnit4::class) class NodeInfoDaoTest { diff --git a/core/database/src/androidTest/kotlin/org/meshtastic/core/database/dao/PacketDaoTest.kt b/core/database/src/androidTest/kotlin/org/meshtastic/core/database/dao/PacketDaoTest.kt index 83ac79e9c..b8d791072 100644 --- a/core/database/src/androidTest/kotlin/org/meshtastic/core/database/dao/PacketDaoTest.kt +++ b/core/database/src/androidTest/kotlin/org/meshtastic/core/database/dao/PacketDaoTest.kt @@ -20,7 +20,6 @@ package org.meshtastic.core.database.dao import androidx.room.Room import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry -import com.geeksville.mesh.Portnums import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking import org.junit.After @@ -33,6 +32,7 @@ import org.meshtastic.core.database.MeshtasticDatabase import org.meshtastic.core.database.entity.MyNodeEntity import org.meshtastic.core.database.entity.Packet import org.meshtastic.core.model.DataPacket +import org.meshtastic.proto.Portnums @RunWith(AndroidJUnit4::class) class PacketDaoTest { diff --git a/core/database/src/main/kotlin/org/meshtastic/core/database/Converters.kt b/core/database/src/main/kotlin/org/meshtastic/core/database/Converters.kt index c75b869a0..4237db7d4 100644 --- a/core/database/src/main/kotlin/org/meshtastic/core/database/Converters.kt +++ b/core/database/src/main/kotlin/org/meshtastic/core/database/Converters.kt @@ -18,13 +18,13 @@ package org.meshtastic.core.database import androidx.room.TypeConverter -import com.geeksville.mesh.MeshProtos -import com.geeksville.mesh.PaxcountProtos -import com.geeksville.mesh.TelemetryProtos import com.google.protobuf.ByteString import com.google.protobuf.InvalidProtocolBufferException import kotlinx.serialization.json.Json import org.meshtastic.core.model.DataPacket +import org.meshtastic.proto.MeshProtos +import org.meshtastic.proto.PaxcountProtos +import org.meshtastic.proto.TelemetryProtos import timber.log.Timber @Suppress("TooManyFunctions") diff --git a/core/database/src/main/kotlin/org/meshtastic/core/database/entity/MeshLog.kt b/core/database/src/main/kotlin/org/meshtastic/core/database/entity/MeshLog.kt index 5c3bfe7be..02b9fb657 100644 --- a/core/database/src/main/kotlin/org/meshtastic/core/database/entity/MeshLog.kt +++ b/core/database/src/main/kotlin/org/meshtastic/core/database/entity/MeshLog.kt @@ -21,10 +21,10 @@ import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.Index import androidx.room.PrimaryKey -import com.geeksville.mesh.MeshProtos -import com.geeksville.mesh.MeshProtos.FromRadio -import com.geeksville.mesh.Portnums import com.google.protobuf.TextFormat +import org.meshtastic.proto.MeshProtos +import org.meshtastic.proto.MeshProtos.FromRadio +import org.meshtastic.proto.Portnums import java.io.IOException @Suppress("EmptyCatchBlock", "SwallowedException", "ConstructorParameterNaming") diff --git a/core/database/src/main/kotlin/org/meshtastic/core/database/entity/NodeEntity.kt b/core/database/src/main/kotlin/org/meshtastic/core/database/entity/NodeEntity.kt index 0de2180ad..9c7e76fdd 100644 --- a/core/database/src/main/kotlin/org/meshtastic/core/database/entity/NodeEntity.kt +++ b/core/database/src/main/kotlin/org/meshtastic/core/database/entity/NodeEntity.kt @@ -23,10 +23,6 @@ import androidx.room.Entity import androidx.room.Index import androidx.room.PrimaryKey import androidx.room.Relation -import com.geeksville.mesh.MeshProtos -import com.geeksville.mesh.PaxcountProtos -import com.geeksville.mesh.TelemetryProtos -import com.geeksville.mesh.copy import com.google.protobuf.ByteString import com.google.protobuf.kotlin.isNotEmpty import org.meshtastic.core.database.model.Node @@ -36,6 +32,10 @@ import org.meshtastic.core.model.MeshUser import org.meshtastic.core.model.NodeInfo import org.meshtastic.core.model.Position import org.meshtastic.core.model.util.onlineTimeThreshold +import org.meshtastic.proto.MeshProtos +import org.meshtastic.proto.PaxcountProtos +import org.meshtastic.proto.TelemetryProtos +import org.meshtastic.proto.copy data class NodeWithRelations( @Embedded val node: NodeEntity, diff --git a/core/database/src/main/kotlin/org/meshtastic/core/database/entity/Packet.kt b/core/database/src/main/kotlin/org/meshtastic/core/database/entity/Packet.kt index 7b970627d..a744c7a23 100644 --- a/core/database/src/main/kotlin/org/meshtastic/core/database/entity/Packet.kt +++ b/core/database/src/main/kotlin/org/meshtastic/core/database/entity/Packet.kt @@ -23,11 +23,11 @@ import androidx.room.Entity import androidx.room.Index import androidx.room.PrimaryKey import androidx.room.Relation -import com.geeksville.mesh.MeshProtos.User import org.meshtastic.core.database.model.Message import org.meshtastic.core.database.model.Node import org.meshtastic.core.model.DataPacket import org.meshtastic.core.model.util.getShortDateTime +import org.meshtastic.proto.MeshProtos.User data class PacketEntity( @Embedded val packet: Packet, diff --git a/core/database/src/main/kotlin/org/meshtastic/core/database/model/Message.kt b/core/database/src/main/kotlin/org/meshtastic/core/database/model/Message.kt index 08a0eb191..50a38a4b5 100644 --- a/core/database/src/main/kotlin/org/meshtastic/core/database/model/Message.kt +++ b/core/database/src/main/kotlin/org/meshtastic/core/database/model/Message.kt @@ -18,10 +18,10 @@ package org.meshtastic.core.database.model import androidx.annotation.StringRes -import com.geeksville.mesh.MeshProtos.Routing import org.meshtastic.core.database.entity.Reaction import org.meshtastic.core.model.MessageStatus import org.meshtastic.core.strings.R +import org.meshtastic.proto.MeshProtos.Routing @Suppress("CyclomaticComplexMethod") @StringRes diff --git a/core/database/src/main/kotlin/org/meshtastic/core/database/model/Node.kt b/core/database/src/main/kotlin/org/meshtastic/core/database/model/Node.kt index 9e05b782a..76914750f 100644 --- a/core/database/src/main/kotlin/org/meshtastic/core/database/model/Node.kt +++ b/core/database/src/main/kotlin/org/meshtastic/core/database/model/Node.kt @@ -18,13 +18,6 @@ package org.meshtastic.core.database.model import android.graphics.Color -import com.geeksville.mesh.ConfigProtos -import com.geeksville.mesh.ConfigProtos.Config.DisplayConfig -import com.geeksville.mesh.MeshProtos -import com.geeksville.mesh.PaxcountProtos -import com.geeksville.mesh.TelemetryProtos.DeviceMetrics -import com.geeksville.mesh.TelemetryProtos.EnvironmentMetrics -import com.geeksville.mesh.TelemetryProtos.PowerMetrics import com.google.protobuf.ByteString import com.google.protobuf.kotlin.isNotEmpty import org.meshtastic.core.database.entity.NodeEntity @@ -32,6 +25,13 @@ import org.meshtastic.core.model.util.GPSFormat import org.meshtastic.core.model.util.UnitConversions.celsiusToFahrenheit import org.meshtastic.core.model.util.latLongToMeter import org.meshtastic.core.model.util.toDistanceString +import org.meshtastic.proto.ConfigProtos +import org.meshtastic.proto.ConfigProtos.Config.DisplayConfig +import org.meshtastic.proto.MeshProtos +import org.meshtastic.proto.PaxcountProtos +import org.meshtastic.proto.TelemetryProtos.DeviceMetrics +import org.meshtastic.proto.TelemetryProtos.EnvironmentMetrics +import org.meshtastic.proto.TelemetryProtos.PowerMetrics @Suppress("MagicNumber") data class Node( diff --git a/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/ChannelSetDataSource.kt b/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/ChannelSetDataSource.kt index 7fdfc274d..5d726936e 100644 --- a/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/ChannelSetDataSource.kt +++ b/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/ChannelSetDataSource.kt @@ -18,12 +18,12 @@ package org.meshtastic.core.datastore import androidx.datastore.core.DataStore -import com.geeksville.mesh.AppOnlyProtos.ChannelSet -import com.geeksville.mesh.ChannelProtos.Channel -import com.geeksville.mesh.ChannelProtos.ChannelSettings -import com.geeksville.mesh.ConfigProtos import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.catch +import org.meshtastic.proto.AppOnlyProtos.ChannelSet +import org.meshtastic.proto.ChannelProtos.Channel +import org.meshtastic.proto.ChannelProtos.ChannelSettings +import org.meshtastic.proto.ConfigProtos import timber.log.Timber import java.io.IOException import javax.inject.Inject diff --git a/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/LocalConfigDataSource.kt b/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/LocalConfigDataSource.kt index 77f96605e..95795f46f 100644 --- a/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/LocalConfigDataSource.kt +++ b/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/LocalConfigDataSource.kt @@ -18,10 +18,10 @@ package org.meshtastic.core.datastore import androidx.datastore.core.DataStore -import com.geeksville.mesh.ConfigProtos.Config -import com.geeksville.mesh.LocalOnlyProtos.LocalConfig import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.catch +import org.meshtastic.proto.ConfigProtos.Config +import org.meshtastic.proto.LocalOnlyProtos.LocalConfig import timber.log.Timber import java.io.IOException import javax.inject.Inject diff --git a/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/ModuleConfigDataSource.kt b/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/ModuleConfigDataSource.kt index be8900fd0..54dcf03e4 100644 --- a/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/ModuleConfigDataSource.kt +++ b/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/ModuleConfigDataSource.kt @@ -18,10 +18,10 @@ package org.meshtastic.core.datastore import androidx.datastore.core.DataStore -import com.geeksville.mesh.LocalOnlyProtos.LocalModuleConfig -import com.geeksville.mesh.ModuleConfigProtos.ModuleConfig import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.catch +import org.meshtastic.proto.LocalOnlyProtos.LocalModuleConfig +import org.meshtastic.proto.ModuleConfigProtos.ModuleConfig import timber.log.Timber import java.io.IOException import javax.inject.Inject diff --git a/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/di/DataStoreModule.kt b/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/di/DataStoreModule.kt index 29a019b02..051954933 100644 --- a/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/di/DataStoreModule.kt +++ b/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/di/DataStoreModule.kt @@ -27,9 +27,6 @@ import androidx.datastore.preferences.core.PreferenceDataStoreFactory import androidx.datastore.preferences.core.Preferences import androidx.datastore.preferences.core.emptyPreferences import androidx.datastore.preferences.preferencesDataStoreFile -import com.geeksville.mesh.AppOnlyProtos.ChannelSet -import com.geeksville.mesh.LocalOnlyProtos.LocalConfig -import com.geeksville.mesh.LocalOnlyProtos.LocalModuleConfig import dagger.Module import dagger.Provides import dagger.hilt.InstallIn @@ -48,6 +45,9 @@ import org.meshtastic.core.datastore.KEY_THEME import org.meshtastic.core.datastore.serializer.ChannelSetSerializer import org.meshtastic.core.datastore.serializer.LocalConfigSerializer import org.meshtastic.core.datastore.serializer.ModuleConfigSerializer +import org.meshtastic.proto.AppOnlyProtos.ChannelSet +import org.meshtastic.proto.LocalOnlyProtos.LocalConfig +import org.meshtastic.proto.LocalOnlyProtos.LocalModuleConfig import javax.inject.Singleton private const val USER_PREFERENCES_NAME = "user_preferences" diff --git a/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/serializer/ChannelSetSerializer.kt b/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/serializer/ChannelSetSerializer.kt index 1a1d33605..9bf5f98b5 100644 --- a/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/serializer/ChannelSetSerializer.kt +++ b/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/serializer/ChannelSetSerializer.kt @@ -19,8 +19,8 @@ package org.meshtastic.core.datastore.serializer import androidx.datastore.core.CorruptionException import androidx.datastore.core.Serializer -import com.geeksville.mesh.AppOnlyProtos.ChannelSet import com.google.protobuf.InvalidProtocolBufferException +import org.meshtastic.proto.AppOnlyProtos.ChannelSet import java.io.InputStream import java.io.OutputStream diff --git a/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/serializer/LocalConfigSerializer.kt b/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/serializer/LocalConfigSerializer.kt index 3abea260f..b6b314096 100644 --- a/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/serializer/LocalConfigSerializer.kt +++ b/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/serializer/LocalConfigSerializer.kt @@ -19,8 +19,8 @@ package org.meshtastic.core.datastore.serializer import androidx.datastore.core.CorruptionException import androidx.datastore.core.Serializer -import com.geeksville.mesh.LocalOnlyProtos.LocalConfig import com.google.protobuf.InvalidProtocolBufferException +import org.meshtastic.proto.LocalOnlyProtos.LocalConfig import java.io.InputStream import java.io.OutputStream diff --git a/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/serializer/ModuleConfigSerializer.kt b/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/serializer/ModuleConfigSerializer.kt index b774534f4..ec950cde4 100644 --- a/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/serializer/ModuleConfigSerializer.kt +++ b/core/datastore/src/main/kotlin/org/meshtastic/core/datastore/serializer/ModuleConfigSerializer.kt @@ -19,8 +19,8 @@ package org.meshtastic.core.datastore.serializer import androidx.datastore.core.CorruptionException import androidx.datastore.core.Serializer -import com.geeksville.mesh.LocalOnlyProtos.LocalModuleConfig import com.google.protobuf.InvalidProtocolBufferException +import org.meshtastic.proto.LocalOnlyProtos.LocalModuleConfig import java.io.InputStream import java.io.OutputStream diff --git a/core/model/src/androidTest/kotlin/org/meshtastic/core/model/ChannelTest.kt b/core/model/src/androidTest/kotlin/org/meshtastic/core/model/ChannelTest.kt index 0e86c8576..9dabe2991 100644 --- a/core/model/src/androidTest/kotlin/org/meshtastic/core/model/ChannelTest.kt +++ b/core/model/src/androidTest/kotlin/org/meshtastic/core/model/ChannelTest.kt @@ -18,13 +18,13 @@ package org.meshtastic.core.model import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.geeksville.mesh.channelSet import org.junit.Assert import org.junit.Test import org.junit.runner.RunWith import org.meshtastic.core.model.util.URL_PREFIX import org.meshtastic.core.model.util.getChannelUrl import org.meshtastic.core.model.util.toChannelSet +import org.meshtastic.proto.channelSet @RunWith(AndroidJUnit4::class) class ChannelTest { diff --git a/core/model/src/main/kotlin/org/meshtastic/core/model/Channel.kt b/core/model/src/main/kotlin/org/meshtastic/core/model/Channel.kt index 31c976173..5f8ea392b 100644 --- a/core/model/src/main/kotlin/org/meshtastic/core/model/Channel.kt +++ b/core/model/src/main/kotlin/org/meshtastic/core/model/Channel.kt @@ -17,12 +17,12 @@ package org.meshtastic.core.model -import com.geeksville.mesh.ChannelProtos -import com.geeksville.mesh.ConfigKt.loRaConfig -import com.geeksville.mesh.ConfigProtos -import com.geeksville.mesh.ConfigProtos.Config.LoRaConfig.ModemPreset -import com.geeksville.mesh.channelSettings import com.google.protobuf.ByteString +import org.meshtastic.proto.ChannelProtos +import org.meshtastic.proto.ConfigKt.loRaConfig +import org.meshtastic.proto.ConfigProtos +import org.meshtastic.proto.ConfigProtos.Config.LoRaConfig.ModemPreset +import org.meshtastic.proto.channelSettings import java.security.SecureRandom /** Utility function to make it easy to declare byte arrays - FIXME move someplace better */ diff --git a/core/model/src/main/kotlin/org/meshtastic/core/model/ChannelOption.kt b/core/model/src/main/kotlin/org/meshtastic/core/model/ChannelOption.kt index 01afb4684..6fac6d705 100644 --- a/core/model/src/main/kotlin/org/meshtastic/core/model/ChannelOption.kt +++ b/core/model/src/main/kotlin/org/meshtastic/core/model/ChannelOption.kt @@ -18,10 +18,10 @@ package org.meshtastic.core.model import androidx.annotation.StringRes -import com.geeksville.mesh.ConfigProtos.Config.LoRaConfig -import com.geeksville.mesh.ConfigProtos.Config.LoRaConfig.ModemPreset -import com.geeksville.mesh.ConfigProtos.Config.LoRaConfig.RegionCode import org.meshtastic.core.strings.R +import org.meshtastic.proto.ConfigProtos.Config.LoRaConfig +import org.meshtastic.proto.ConfigProtos.Config.LoRaConfig.ModemPreset +import org.meshtastic.proto.ConfigProtos.Config.LoRaConfig.RegionCode import kotlin.math.floor /** hash a string into an integer using the djb2 algorithm by Dan Bernstein http://www.cse.yorku.ca/~oz/hash.html */ diff --git a/core/model/src/main/kotlin/org/meshtastic/core/model/DataPacket.kt b/core/model/src/main/kotlin/org/meshtastic/core/model/DataPacket.kt index aafc8329a..7a9907df1 100644 --- a/core/model/src/main/kotlin/org/meshtastic/core/model/DataPacket.kt +++ b/core/model/src/main/kotlin/org/meshtastic/core/model/DataPacket.kt @@ -19,10 +19,10 @@ package org.meshtastic.core.model import android.os.Parcel import android.os.Parcelable -import com.geeksville.mesh.MeshProtos -import com.geeksville.mesh.Portnums import kotlinx.parcelize.Parcelize import kotlinx.serialization.Serializable +import org.meshtastic.proto.MeshProtos +import org.meshtastic.proto.Portnums /** Generic [Parcel.readParcelable] Android 13 compatibility extension. */ private inline fun Parcel.readParcelableCompat(loader: ClassLoader?): T? = diff --git a/core/model/src/main/kotlin/org/meshtastic/core/model/NodeInfo.kt b/core/model/src/main/kotlin/org/meshtastic/core/model/NodeInfo.kt index e86a5fa2b..418cc07b5 100644 --- a/core/model/src/main/kotlin/org/meshtastic/core/model/NodeInfo.kt +++ b/core/model/src/main/kotlin/org/meshtastic/core/model/NodeInfo.kt @@ -19,14 +19,14 @@ package org.meshtastic.core.model import android.graphics.Color import android.os.Parcelable -import com.geeksville.mesh.ConfigProtos -import com.geeksville.mesh.MeshProtos -import com.geeksville.mesh.TelemetryProtos import kotlinx.parcelize.Parcelize import org.meshtastic.core.model.util.anonymize import org.meshtastic.core.model.util.bearing import org.meshtastic.core.model.util.latLongToMeter import org.meshtastic.core.model.util.onlineTimeThreshold +import org.meshtastic.proto.ConfigProtos +import org.meshtastic.proto.MeshProtos +import org.meshtastic.proto.TelemetryProtos // // model objects that directly map to the corresponding protobufs diff --git a/core/model/src/main/kotlin/org/meshtastic/core/model/RouteDiscovery.kt b/core/model/src/main/kotlin/org/meshtastic/core/model/RouteDiscovery.kt index 7a56fecbd..309db0618 100644 --- a/core/model/src/main/kotlin/org/meshtastic/core/model/RouteDiscovery.kt +++ b/core/model/src/main/kotlin/org/meshtastic/core/model/RouteDiscovery.kt @@ -17,9 +17,9 @@ package org.meshtastic.core.model -import com.geeksville.mesh.MeshProtos -import com.geeksville.mesh.MeshProtos.RouteDiscovery -import com.geeksville.mesh.Portnums +import org.meshtastic.proto.MeshProtos +import org.meshtastic.proto.MeshProtos.RouteDiscovery +import org.meshtastic.proto.Portnums val MeshProtos.MeshPacket.fullRouteDiscovery: RouteDiscovery? get() = diff --git a/core/model/src/main/kotlin/org/meshtastic/core/model/util/ChannelSet.kt b/core/model/src/main/kotlin/org/meshtastic/core/model/util/ChannelSet.kt index efcc308e1..757fefc3e 100644 --- a/core/model/src/main/kotlin/org/meshtastic/core/model/util/ChannelSet.kt +++ b/core/model/src/main/kotlin/org/meshtastic/core/model/util/ChannelSet.kt @@ -20,11 +20,11 @@ package org.meshtastic.core.model.util import android.graphics.Bitmap import android.net.Uri import android.util.Base64 -import com.geeksville.mesh.AppOnlyProtos.ChannelSet import com.google.zxing.BarcodeFormat import com.google.zxing.MultiFormatWriter import com.journeyapps.barcodescanner.BarcodeEncoder import org.meshtastic.core.model.Channel +import org.meshtastic.proto.AppOnlyProtos.ChannelSet import timber.log.Timber import java.net.MalformedURLException import kotlin.jvm.Throws diff --git a/core/model/src/main/kotlin/org/meshtastic/core/model/util/DistanceExtensions.kt b/core/model/src/main/kotlin/org/meshtastic/core/model/util/DistanceExtensions.kt index 0d268e0ab..35fec459f 100644 --- a/core/model/src/main/kotlin/org/meshtastic/core/model/util/DistanceExtensions.kt +++ b/core/model/src/main/kotlin/org/meshtastic/core/model/util/DistanceExtensions.kt @@ -21,7 +21,7 @@ package org.meshtastic.core.model.util import android.icu.util.LocaleData import android.icu.util.ULocale -import com.geeksville.mesh.ConfigProtos.Config.DisplayConfig.DisplayUnits +import org.meshtastic.proto.ConfigProtos.Config.DisplayConfig.DisplayUnits import java.util.Locale enum class DistanceUnit(val symbol: String, val multiplier: Float, val system: Int) { diff --git a/core/model/src/main/kotlin/org/meshtastic/core/model/util/Extensions.kt b/core/model/src/main/kotlin/org/meshtastic/core/model/util/Extensions.kt index 9bb047b13..f72273522 100644 --- a/core/model/src/main/kotlin/org/meshtastic/core/model/util/Extensions.kt +++ b/core/model/src/main/kotlin/org/meshtastic/core/model/util/Extensions.kt @@ -18,9 +18,9 @@ package org.meshtastic.core.model.util import android.widget.EditText -import com.geeksville.mesh.ConfigProtos -import com.geeksville.mesh.MeshProtos import org.meshtastic.core.model.BuildConfig +import org.meshtastic.proto.ConfigProtos +import org.meshtastic.proto.MeshProtos /** * When printing strings to logs sometimes we want to print useful debugging information about users or positions. But diff --git a/core/model/src/test/kotlin/org/meshtastic/core/model/NodeInfoTest.kt b/core/model/src/test/kotlin/org/meshtastic/core/model/NodeInfoTest.kt index 593d66e65..52c497f31 100644 --- a/core/model/src/test/kotlin/org/meshtastic/core/model/NodeInfoTest.kt +++ b/core/model/src/test/kotlin/org/meshtastic/core/model/NodeInfoTest.kt @@ -18,12 +18,12 @@ package org.meshtastic.core.model import androidx.core.os.LocaleListCompat -import com.geeksville.mesh.ConfigProtos.Config.DisplayConfig.DisplayUnits -import com.geeksville.mesh.MeshProtos import org.junit.After import org.junit.Assert import org.junit.Before import org.junit.Test +import org.meshtastic.proto.ConfigProtos.Config.DisplayConfig.DisplayUnits +import org.meshtastic.proto.MeshProtos import java.util.Locale class NodeInfoTest { diff --git a/core/proto/src/main/kotlin/org/meshtastic/core/proto/ProtoExtensions.kt b/core/proto/src/main/kotlin/org/meshtastic/core/proto/ProtoExtensions.kt index 037187240..9d38df209 100644 --- a/core/proto/src/main/kotlin/org/meshtastic/core/proto/ProtoExtensions.kt +++ b/core/proto/src/main/kotlin/org/meshtastic/core/proto/ProtoExtensions.kt @@ -19,13 +19,13 @@ package org.meshtastic.core.proto import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource -import com.geeksville.mesh.ChannelProtos -import com.geeksville.mesh.ChannelProtos.ChannelSettings -import com.geeksville.mesh.MeshProtos -import com.geeksville.mesh.MeshProtos.MeshPacket -import com.geeksville.mesh.MeshProtos.Position -import com.geeksville.mesh.channel -import com.geeksville.mesh.channelSettings +import org.meshtastic.proto.ChannelProtos +import org.meshtastic.proto.ChannelProtos.ChannelSettings +import org.meshtastic.proto.MeshProtos +import org.meshtastic.proto.MeshProtos.MeshPacket +import org.meshtastic.proto.MeshProtos.Position +import org.meshtastic.proto.channel +import org.meshtastic.proto.channelSettings import java.text.DateFormat import kotlin.time.Duration.Companion.days diff --git a/core/proto/src/main/proto b/core/proto/src/main/proto index a1b8c3d17..fecb76941 160000 --- a/core/proto/src/main/proto +++ b/core/proto/src/main/proto @@ -1 +1 @@ -Subproject commit a1b8c3d171445b2eebfd4b5bd1e4876f3bbed605 +Subproject commit fecb769415cf30764905f72ed042f27c6123ff17 diff --git a/core/service/src/main/kotlin/org/meshtastic/core/service/ServiceAction.kt b/core/service/src/main/kotlin/org/meshtastic/core/service/ServiceAction.kt index e2e8bb6bf..c9779f36d 100644 --- a/core/service/src/main/kotlin/org/meshtastic/core/service/ServiceAction.kt +++ b/core/service/src/main/kotlin/org/meshtastic/core/service/ServiceAction.kt @@ -17,8 +17,8 @@ package org.meshtastic.core.service -import com.geeksville.mesh.AdminProtos import org.meshtastic.core.database.model.Node +import org.meshtastic.proto.AdminProtos sealed class ServiceAction { data class GetDeviceMetadata(val destNum: Int) : ServiceAction() diff --git a/core/service/src/main/kotlin/org/meshtastic/core/service/ServiceRepository.kt b/core/service/src/main/kotlin/org/meshtastic/core/service/ServiceRepository.kt index 6c4ce6c36..1adad9bf9 100644 --- a/core/service/src/main/kotlin/org/meshtastic/core/service/ServiceRepository.kt +++ b/core/service/src/main/kotlin/org/meshtastic/core/service/ServiceRepository.kt @@ -17,14 +17,14 @@ package org.meshtastic.core.service -import com.geeksville.mesh.MeshProtos -import com.geeksville.mesh.MeshProtos.MeshPacket import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.receiveAsFlow +import org.meshtastic.proto.MeshProtos +import org.meshtastic.proto.MeshProtos.MeshPacket import timber.log.Timber import javax.inject.Inject import javax.inject.Singleton diff --git a/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/EditListPreference.kt b/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/EditListPreference.kt index 3f9d44a1a..af7393b0c 100644 --- a/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/EditListPreference.kt +++ b/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/EditListPreference.kt @@ -40,12 +40,12 @@ import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.geeksville.mesh.ModuleConfigProtos.RemoteHardwarePin -import com.geeksville.mesh.ModuleConfigProtos.RemoteHardwarePinType -import com.geeksville.mesh.copy -import com.geeksville.mesh.remoteHardwarePin import com.google.protobuf.ByteString import org.meshtastic.core.strings.R +import org.meshtastic.proto.ModuleConfigProtos.RemoteHardwarePin +import org.meshtastic.proto.ModuleConfigProtos.RemoteHardwarePinType +import org.meshtastic.proto.copy +import org.meshtastic.proto.remoteHardwarePin @Suppress("LongMethod") @Composable diff --git a/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/NodeChip.kt b/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/NodeChip.kt index 0b530c6e4..62074b48d 100644 --- a/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/NodeChip.kt +++ b/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/NodeChip.kt @@ -37,10 +37,10 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.geeksville.mesh.MeshProtos -import com.geeksville.mesh.PaxcountProtos -import com.geeksville.mesh.TelemetryProtos import org.meshtastic.core.database.model.Node +import org.meshtastic.proto.MeshProtos +import org.meshtastic.proto.PaxcountProtos +import org.meshtastic.proto.TelemetryProtos @Composable fun NodeChip(modifier: Modifier = Modifier, node: Node, onClick: ((Node) -> Unit)? = null) { diff --git a/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/SecurityIcon.kt b/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/SecurityIcon.kt index fc8ffdaa2..bdbc8bdce 100644 --- a/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/SecurityIcon.kt +++ b/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/SecurityIcon.kt @@ -60,15 +60,15 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.geeksville.mesh.AppOnlyProtos -import com.geeksville.mesh.ChannelProtos.ChannelSettings -import com.geeksville.mesh.ConfigProtos.Config.LoRaConfig import org.meshtastic.core.model.Channel import org.meshtastic.core.model.util.getChannel import org.meshtastic.core.strings.R import org.meshtastic.core.ui.theme.StatusColors.StatusGreen import org.meshtastic.core.ui.theme.StatusColors.StatusRed import org.meshtastic.core.ui.theme.StatusColors.StatusYellow +import org.meshtastic.proto.AppOnlyProtos +import org.meshtastic.proto.ChannelProtos.ChannelSettings +import org.meshtastic.proto.ConfigProtos.Config.LoRaConfig private const val PRECISE_POSITION_BITS = 32 diff --git a/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/preview/NodePreviewParameterProvider.kt b/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/preview/NodePreviewParameterProvider.kt index e8d8a8064..0879f92b4 100644 --- a/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/preview/NodePreviewParameterProvider.kt +++ b/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/preview/NodePreviewParameterProvider.kt @@ -18,16 +18,16 @@ package org.meshtastic.core.ui.component.preview import androidx.compose.ui.tooling.preview.PreviewParameterProvider -import com.geeksville.mesh.ConfigProtos -import com.geeksville.mesh.MeshProtos -import com.geeksville.mesh.deviceMetrics -import com.geeksville.mesh.environmentMetrics -import com.geeksville.mesh.paxcount -import com.geeksville.mesh.position -import com.geeksville.mesh.user import com.google.protobuf.ByteString import org.meshtastic.core.database.model.Node import org.meshtastic.core.model.DeviceMetrics.Companion.currentTime +import org.meshtastic.proto.ConfigProtos +import org.meshtastic.proto.MeshProtos +import org.meshtastic.proto.deviceMetrics +import org.meshtastic.proto.environmentMetrics +import org.meshtastic.proto.paxcount +import org.meshtastic.proto.position +import org.meshtastic.proto.user import kotlin.random.Random class NodePreviewParameterProvider : PreviewParameterProvider { diff --git a/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/preview/PreviewUtils.kt b/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/preview/PreviewUtils.kt index 280f95549..a3e297ce4 100644 --- a/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/preview/PreviewUtils.kt +++ b/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/preview/PreviewUtils.kt @@ -20,10 +20,10 @@ package org.meshtastic.core.ui.component.preview import androidx.compose.ui.tooling.preview.PreviewParameterProvider -import com.geeksville.mesh.MeshProtos -import com.geeksville.mesh.PaxcountProtos -import com.geeksville.mesh.TelemetryProtos import org.meshtastic.core.database.model.Node +import org.meshtastic.proto.MeshProtos +import org.meshtastic.proto.PaxcountProtos +import org.meshtastic.proto.TelemetryProtos /** Simple [PreviewParameterProvider] that provides true and false values. */ class BooleanProvider : PreviewParameterProvider { diff --git a/feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/MapView.kt b/feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/MapView.kt index 2b3874feb..9d795bc83 100644 --- a/feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/MapView.kt +++ b/feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/MapView.kt @@ -62,9 +62,6 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.viewinterop.AndroidView import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.geeksville.mesh.MeshProtos.Waypoint -import com.geeksville.mesh.copy -import com.geeksville.mesh.waypoint import com.google.accompanist.permissions.ExperimentalPermissionsApi // Added for Accompanist import com.google.accompanist.permissions.rememberMultiplePermissionsState // Added for Accompanist import com.google.android.material.dialog.MaterialAlertDialogBuilder @@ -82,6 +79,9 @@ import org.meshtastic.feature.map.component.EditWaypointDialog import org.meshtastic.feature.map.component.MapButton import org.meshtastic.feature.map.model.CustomTileSource import org.meshtastic.feature.map.model.MarkerWithLabel +import org.meshtastic.proto.MeshProtos.Waypoint +import org.meshtastic.proto.copy +import org.meshtastic.proto.waypoint import org.osmdroid.bonuspack.utils.BonusPackHelper.getBitmapFromVectorDrawable import org.osmdroid.config.Configuration import org.osmdroid.events.MapEventsReceiver diff --git a/feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/MapViewExtensions.kt b/feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/MapViewExtensions.kt index 465d63cca..0c78bc7f0 100644 --- a/feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/MapViewExtensions.kt +++ b/feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/MapViewExtensions.kt @@ -25,8 +25,8 @@ import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.core.content.ContextCompat -import com.geeksville.mesh.MeshProtos import org.meshtastic.core.ui.R +import org.meshtastic.proto.MeshProtos import org.osmdroid.util.GeoPoint import org.osmdroid.views.MapView import org.osmdroid.views.overlay.CopyrightOverlay diff --git a/feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/MapViewModel.kt b/feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/MapViewModel.kt index aed2e5ebe..79efb3e2f 100644 --- a/feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/MapViewModel.kt +++ b/feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/MapViewModel.kt @@ -18,7 +18,6 @@ package org.meshtastic.feature.map import androidx.lifecycle.viewModelScope -import com.geeksville.mesh.LocalOnlyProtos.LocalConfig import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.stateIn @@ -29,6 +28,7 @@ import org.meshtastic.core.data.repository.RadioConfigRepository import org.meshtastic.core.model.DataPacket import org.meshtastic.core.prefs.map.MapPrefs import org.meshtastic.core.service.ServiceRepository +import org.meshtastic.proto.LocalOnlyProtos.LocalConfig import javax.inject.Inject @HiltViewModel diff --git a/feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/component/EditWaypointDialog.kt b/feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/component/EditWaypointDialog.kt index 7ce69740b..01a2b8d58 100644 --- a/feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/component/EditWaypointDialog.kt +++ b/feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/component/EditWaypointDialog.kt @@ -64,13 +64,13 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.geeksville.mesh.MeshProtos.Waypoint -import com.geeksville.mesh.copy -import com.geeksville.mesh.waypoint import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.EditTextPreference import org.meshtastic.core.ui.emoji.EmojiPickerDialog import org.meshtastic.core.ui.theme.AppTheme +import org.meshtastic.proto.MeshProtos.Waypoint +import org.meshtastic.proto.copy +import org.meshtastic.proto.waypoint import java.text.SimpleDateFormat import java.util.Calendar import java.util.Locale diff --git a/feature/map/src/google/kotlin/org/meshtastic/feature/map/MapView.kt b/feature/map/src/google/kotlin/org/meshtastic/feature/map/MapView.kt index 246360fe8..7c028d258 100644 --- a/feature/map/src/google/kotlin/org/meshtastic/feature/map/MapView.kt +++ b/feature/map/src/google/kotlin/org/meshtastic/feature/map/MapView.kt @@ -63,11 +63,6 @@ import androidx.compose.ui.unit.dp import androidx.core.graphics.createBitmap import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.geeksville.mesh.ConfigProtos.Config.DisplayConfig.DisplayUnits -import com.geeksville.mesh.MeshProtos.Position -import com.geeksville.mesh.MeshProtos.Waypoint -import com.geeksville.mesh.copy -import com.geeksville.mesh.waypoint import com.google.android.gms.location.LocationCallback import com.google.android.gms.location.LocationRequest import com.google.android.gms.location.LocationResult @@ -113,6 +108,11 @@ import org.meshtastic.feature.map.component.MapControlsOverlay import org.meshtastic.feature.map.component.NodeClusterMarkers import org.meshtastic.feature.map.component.WaypointMarkers import org.meshtastic.feature.map.model.NodeClusterItem +import org.meshtastic.proto.ConfigProtos.Config.DisplayConfig.DisplayUnits +import org.meshtastic.proto.MeshProtos.Position +import org.meshtastic.proto.MeshProtos.Waypoint +import org.meshtastic.proto.copy +import org.meshtastic.proto.waypoint import timber.log.Timber import java.text.DateFormat diff --git a/feature/map/src/google/kotlin/org/meshtastic/feature/map/MapViewModel.kt b/feature/map/src/google/kotlin/org/meshtastic/feature/map/MapViewModel.kt index 287d9b835..91a11aa3e 100644 --- a/feature/map/src/google/kotlin/org/meshtastic/feature/map/MapViewModel.kt +++ b/feature/map/src/google/kotlin/org/meshtastic/feature/map/MapViewModel.kt @@ -21,7 +21,6 @@ import android.app.Application import android.net.Uri import androidx.core.net.toFile import androidx.lifecycle.viewModelScope -import com.geeksville.mesh.ConfigProtos import com.google.android.gms.maps.GoogleMap import com.google.android.gms.maps.model.TileProvider import com.google.android.gms.maps.model.UrlTileProvider @@ -54,6 +53,7 @@ import org.meshtastic.core.datastore.UiPreferencesDataSource import org.meshtastic.core.prefs.map.GoogleMapsPrefs import org.meshtastic.core.prefs.map.MapPrefs import org.meshtastic.core.service.ServiceRepository +import org.meshtastic.proto.ConfigProtos import timber.log.Timber import java.io.File import java.io.FileOutputStream diff --git a/feature/map/src/google/kotlin/org/meshtastic/feature/map/component/EditWaypointDialog.kt b/feature/map/src/google/kotlin/org/meshtastic/feature/map/component/EditWaypointDialog.kt index 74aa4612f..7c2d3ee3e 100644 --- a/feature/map/src/google/kotlin/org/meshtastic/feature/map/component/EditWaypointDialog.kt +++ b/feature/map/src/google/kotlin/org/meshtastic/feature/map/component/EditWaypointDialog.kt @@ -62,10 +62,10 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.geeksville.mesh.MeshProtos.Waypoint -import com.geeksville.mesh.copy import org.meshtastic.core.strings.R import org.meshtastic.core.ui.emoji.EmojiPickerDialog +import org.meshtastic.proto.MeshProtos.Waypoint +import org.meshtastic.proto.copy import java.text.SimpleDateFormat import java.util.Calendar import java.util.Locale diff --git a/feature/map/src/google/kotlin/org/meshtastic/feature/map/component/WaypointMarkers.kt b/feature/map/src/google/kotlin/org/meshtastic/feature/map/component/WaypointMarkers.kt index 669efa9ac..cdb376f29 100644 --- a/feature/map/src/google/kotlin/org/meshtastic/feature/map/component/WaypointMarkers.kt +++ b/feature/map/src/google/kotlin/org/meshtastic/feature/map/component/WaypointMarkers.kt @@ -20,13 +20,13 @@ package org.meshtastic.feature.map.component import android.widget.Toast import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext -import com.geeksville.mesh.MeshProtos import com.google.android.gms.maps.model.BitmapDescriptor import com.google.android.gms.maps.model.LatLng import com.google.maps.android.compose.Marker import com.google.maps.android.compose.rememberUpdatedMarkerState import org.meshtastic.core.strings.R import org.meshtastic.feature.map.BaseMapViewModel +import org.meshtastic.proto.MeshProtos private const val DEG_D = 1e-7 diff --git a/feature/map/src/main/kotlin/org/meshtastic/feature/map/BaseMapViewModel.kt b/feature/map/src/main/kotlin/org/meshtastic/feature/map/BaseMapViewModel.kt index d1844ad78..c4662dccf 100644 --- a/feature/map/src/main/kotlin/org/meshtastic/feature/map/BaseMapViewModel.kt +++ b/feature/map/src/main/kotlin/org/meshtastic/feature/map/BaseMapViewModel.kt @@ -21,7 +21,6 @@ import android.os.RemoteException import androidx.annotation.StringRes import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.geeksville.mesh.MeshProtos import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted @@ -39,6 +38,7 @@ import org.meshtastic.core.model.DataPacket import org.meshtastic.core.prefs.map.MapPrefs import org.meshtastic.core.service.ServiceRepository import org.meshtastic.core.strings.R +import org.meshtastic.proto.MeshProtos import timber.log.Timber import java.util.concurrent.TimeUnit diff --git a/feature/map/src/main/kotlin/org/meshtastic/feature/map/node/NodeMapViewModel.kt b/feature/map/src/main/kotlin/org/meshtastic/feature/map/node/NodeMapViewModel.kt index f9f25c56a..8965cc94e 100644 --- a/feature/map/src/main/kotlin/org/meshtastic/feature/map/node/NodeMapViewModel.kt +++ b/feature/map/src/main/kotlin/org/meshtastic/feature/map/node/NodeMapViewModel.kt @@ -21,8 +21,6 @@ import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.navigation.toRoute -import com.geeksville.mesh.MeshProtos.Position -import com.geeksville.mesh.Portnums.PortNum import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow @@ -39,6 +37,8 @@ import org.meshtastic.core.navigation.NodesRoutes import org.meshtastic.core.prefs.map.MapPrefs import org.meshtastic.core.proto.toPosition import org.meshtastic.feature.map.model.CustomTileSource +import org.meshtastic.proto.MeshProtos.Position +import org.meshtastic.proto.Portnums.PortNum import javax.inject.Inject @HiltViewModel diff --git a/feature/node/src/main/kotlin/org/meshtastic/feature/node/component/AdministrationSection.kt b/feature/node/src/main/kotlin/org/meshtastic/feature/node/component/AdministrationSection.kt index e9449beaf..19f58552a 100644 --- a/feature/node/src/main/kotlin/org/meshtastic/feature/node/component/AdministrationSection.kt +++ b/feature/node/src/main/kotlin/org/meshtastic/feature/node/component/AdministrationSection.kt @@ -28,7 +28,6 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource -import com.geeksville.mesh.MeshProtos import org.meshtastic.core.database.entity.FirmwareRelease import org.meshtastic.core.database.entity.asDeviceVersion import org.meshtastic.core.database.model.Node @@ -45,6 +44,7 @@ import org.meshtastic.core.ui.theme.StatusColors.StatusRed import org.meshtastic.core.ui.theme.StatusColors.StatusYellow import org.meshtastic.feature.node.model.MetricsState import org.meshtastic.feature.node.model.NodeDetailAction +import org.meshtastic.proto.MeshProtos @Suppress("LongMethod") @Composable diff --git a/feature/node/src/main/kotlin/org/meshtastic/feature/node/component/ElevationInfo.kt b/feature/node/src/main/kotlin/org/meshtastic/feature/node/component/ElevationInfo.kt index e79d57865..68a944fee 100644 --- a/feature/node/src/main/kotlin/org/meshtastic/feature/node/component/ElevationInfo.kt +++ b/feature/node/src/main/kotlin/org/meshtastic/feature/node/component/ElevationInfo.kt @@ -23,12 +23,12 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview -import com.geeksville.mesh.ConfigProtos.Config.DisplayConfig.DisplayUnits import org.meshtastic.core.model.util.metersIn import org.meshtastic.core.model.util.toString import org.meshtastic.core.strings.R import org.meshtastic.core.ui.icon.Elevation import org.meshtastic.core.ui.icon.MeshtasticIcons +import org.meshtastic.proto.ConfigProtos.Config.DisplayConfig.DisplayUnits @Composable fun ElevationInfo( diff --git a/feature/node/src/main/kotlin/org/meshtastic/feature/node/component/EnvironmentMetrics.kt b/feature/node/src/main/kotlin/org/meshtastic/feature/node/component/EnvironmentMetrics.kt index a384f331d..bdb541afb 100644 --- a/feature/node/src/main/kotlin/org/meshtastic/feature/node/component/EnvironmentMetrics.kt +++ b/feature/node/src/main/kotlin/org/meshtastic/feature/node/component/EnvironmentMetrics.kt @@ -36,7 +36,6 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import com.geeksville.mesh.ConfigProtos import org.meshtastic.core.database.model.Node import org.meshtastic.core.model.util.UnitConversions import org.meshtastic.core.model.util.UnitConversions.toTempString @@ -45,6 +44,7 @@ import org.meshtastic.core.model.util.toSpeedString import org.meshtastic.core.strings.R import org.meshtastic.feature.node.model.DrawableMetricInfo import org.meshtastic.feature.node.model.VectorMetricInfo +import org.meshtastic.proto.ConfigProtos @Suppress("CyclomaticComplexMethod", "LongMethod") @Composable diff --git a/feature/node/src/main/kotlin/org/meshtastic/feature/node/component/NodeItem.kt b/feature/node/src/main/kotlin/org/meshtastic/feature/node/component/NodeItem.kt index 664e1c461..3116d3410 100644 --- a/feature/node/src/main/kotlin/org/meshtastic/feature/node/component/NodeItem.kt +++ b/feature/node/src/main/kotlin/org/meshtastic/feature/node/component/NodeItem.kt @@ -46,7 +46,6 @@ import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp -import com.geeksville.mesh.ConfigProtos.Config.DisplayConfig import org.meshtastic.core.database.model.Node import org.meshtastic.core.database.model.isUnmessageableRole import org.meshtastic.core.model.util.toDistanceString @@ -56,6 +55,7 @@ import org.meshtastic.core.ui.component.NodeChip import org.meshtastic.core.ui.component.SignalInfo import org.meshtastic.core.ui.component.preview.NodePreviewParameterProvider import org.meshtastic.core.ui.theme.AppTheme +import org.meshtastic.proto.ConfigProtos.Config.DisplayConfig @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Suppress("LongMethod", "CyclomaticComplexMethod") diff --git a/feature/node/src/main/kotlin/org/meshtastic/feature/node/list/NodeListViewModel.kt b/feature/node/src/main/kotlin/org/meshtastic/feature/node/list/NodeListViewModel.kt index e7cc0657b..9ebc13190 100644 --- a/feature/node/src/main/kotlin/org/meshtastic/feature/node/list/NodeListViewModel.kt +++ b/feature/node/src/main/kotlin/org/meshtastic/feature/node/list/NodeListViewModel.kt @@ -20,7 +20,6 @@ package org.meshtastic.feature.node.list import android.os.RemoteException import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.geeksville.mesh.AdminProtos import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow @@ -40,6 +39,7 @@ import org.meshtastic.core.database.model.NodeSortOption import org.meshtastic.core.datastore.UiPreferencesDataSource import org.meshtastic.core.service.ServiceAction import org.meshtastic.core.service.ServiceRepository +import org.meshtastic.proto.AdminProtos import timber.log.Timber import javax.inject.Inject diff --git a/feature/node/src/main/kotlin/org/meshtastic/feature/node/model/MetricsState.kt b/feature/node/src/main/kotlin/org/meshtastic/feature/node/model/MetricsState.kt index 7b0251976..83fb8d60a 100644 --- a/feature/node/src/main/kotlin/org/meshtastic/feature/node/model/MetricsState.kt +++ b/feature/node/src/main/kotlin/org/meshtastic/feature/node/model/MetricsState.kt @@ -20,14 +20,14 @@ package org.meshtastic.feature.node.model import androidx.annotation.StringRes import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import com.geeksville.mesh.ConfigProtos -import com.geeksville.mesh.MeshProtos -import com.geeksville.mesh.TelemetryProtos import org.meshtastic.core.database.entity.FirmwareRelease import org.meshtastic.core.database.entity.MeshLog import org.meshtastic.core.database.model.Node import org.meshtastic.core.model.DeviceHardware import org.meshtastic.core.strings.R +import org.meshtastic.proto.ConfigProtos +import org.meshtastic.proto.MeshProtos +import org.meshtastic.proto.TelemetryProtos import java.util.concurrent.TimeUnit data class MetricsState( diff --git a/feature/settings/src/androidTest/kotlin/org/meshtastic/feature/settings/radio/component/EditDeviceProfileDialogTest.kt b/feature/settings/src/androidTest/kotlin/org/meshtastic/feature/settings/radio/component/EditDeviceProfileDialogTest.kt index 1f1495083..d38a77cf3 100644 --- a/feature/settings/src/androidTest/kotlin/org/meshtastic/feature/settings/radio/component/EditDeviceProfileDialogTest.kt +++ b/feature/settings/src/androidTest/kotlin/org/meshtastic/feature/settings/radio/component/EditDeviceProfileDialogTest.kt @@ -23,14 +23,14 @@ import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry -import com.geeksville.mesh.ClientOnlyProtos.DeviceProfile -import com.geeksville.mesh.deviceProfile -import com.geeksville.mesh.position import org.junit.Assert import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.meshtastic.core.strings.R +import org.meshtastic.proto.ClientOnlyProtos.DeviceProfile +import org.meshtastic.proto.deviceProfile +import org.meshtastic.proto.position @RunWith(AndroidJUnit4::class) class EditDeviceProfileDialogTest { diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/SettingsScreen.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/SettingsScreen.kt index 003713670..e6eac39c7 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/SettingsScreen.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/SettingsScreen.kt @@ -57,7 +57,6 @@ import androidx.compose.ui.unit.dp import androidx.core.net.toUri import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.geeksville.mesh.ClientOnlyProtos.DeviceProfile import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.rememberMultiplePermissionsState import kotlinx.coroutines.delay @@ -78,6 +77,7 @@ import org.meshtastic.feature.settings.radio.component.EditDeviceProfileDialog import org.meshtastic.feature.settings.radio.component.PacketResponseStateDialog import org.meshtastic.feature.settings.util.LanguageUtils import org.meshtastic.feature.settings.util.LanguageUtils.getLanguageMap +import org.meshtastic.proto.ClientOnlyProtos.DeviceProfile import java.text.SimpleDateFormat import java.util.Date import java.util.Locale diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/SettingsViewModel.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/SettingsViewModel.kt index e09bb1de8..75e0f9b3b 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/SettingsViewModel.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/SettingsViewModel.kt @@ -21,9 +21,6 @@ import android.app.Application import android.net.Uri import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.geeksville.mesh.LocalOnlyProtos.LocalConfig -import com.geeksville.mesh.MeshProtos -import com.geeksville.mesh.Portnums import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow @@ -50,6 +47,9 @@ import org.meshtastic.core.model.util.positionToMeter import org.meshtastic.core.prefs.ui.UiPrefs import org.meshtastic.core.service.IMeshService import org.meshtastic.core.service.ServiceRepository +import org.meshtastic.proto.LocalOnlyProtos.LocalConfig +import org.meshtastic.proto.MeshProtos +import org.meshtastic.proto.Portnums import timber.log.Timber import java.io.BufferedWriter import java.io.FileNotFoundException diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/debugging/DebugViewModel.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/debugging/DebugViewModel.kt index f3e582348..20ccb5ddd 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/debugging/DebugViewModel.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/debugging/DebugViewModel.kt @@ -20,12 +20,6 @@ package org.meshtastic.feature.settings.debugging import androidx.compose.runtime.Immutable import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.geeksville.mesh.AdminProtos -import com.geeksville.mesh.MeshProtos -import com.geeksville.mesh.PaxcountProtos -import com.geeksville.mesh.Portnums.PortNum -import com.geeksville.mesh.StoreAndForwardProtos -import com.geeksville.mesh.TelemetryProtos import com.google.protobuf.InvalidProtocolBufferException import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.collections.immutable.ImmutableList @@ -43,6 +37,12 @@ import kotlinx.coroutines.launch import org.meshtastic.core.data.repository.MeshLogRepository import org.meshtastic.core.data.repository.NodeRepository import org.meshtastic.core.database.entity.MeshLog +import org.meshtastic.proto.AdminProtos +import org.meshtastic.proto.MeshProtos +import org.meshtastic.proto.PaxcountProtos +import org.meshtastic.proto.Portnums.PortNum +import org.meshtastic.proto.StoreAndForwardProtos +import org.meshtastic.proto.TelemetryProtos import timber.log.Timber import java.text.DateFormat import java.util.Date diff --git 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 index a5233615c..743c25afe 100644 --- 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 @@ -55,8 +55,6 @@ import androidx.navigation.NavHostController import androidx.navigation.compose.composable import androidx.navigation.navDeepLink import androidx.navigation.navigation -import com.geeksville.mesh.AdminProtos -import com.geeksville.mesh.MeshProtos.DeviceMetadata import org.meshtastic.core.navigation.DEEP_LINK_BASE_URI import org.meshtastic.core.navigation.NodesRoutes import org.meshtastic.core.navigation.Route @@ -89,6 +87,8 @@ import org.meshtastic.feature.settings.radio.component.SerialConfigScreen import org.meshtastic.feature.settings.radio.component.StoreForwardConfigScreen import org.meshtastic.feature.settings.radio.component.TelemetryConfigScreen import org.meshtastic.feature.settings.radio.component.UserConfigScreen +import org.meshtastic.proto.AdminProtos +import org.meshtastic.proto.MeshProtos.DeviceMetadata fun getNavRouteFrom(routeName: String): Route? = ConfigRoute.entries.find { it.name == routeName }?.route ?: ModuleRoute.entries.find { it.name == routeName }?.route diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/RadioConfigViewModel.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/RadioConfigViewModel.kt index e2e3cd694..946e7cddf 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/RadioConfigViewModel.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/RadioConfigViewModel.kt @@ -32,17 +32,6 @@ import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.navigation.toRoute -import com.geeksville.mesh.AdminProtos -import com.geeksville.mesh.ChannelProtos -import com.geeksville.mesh.ClientOnlyProtos.DeviceProfile -import com.geeksville.mesh.ConfigProtos -import com.geeksville.mesh.ConfigProtos.Config.SecurityConfig -import com.geeksville.mesh.MeshProtos -import com.geeksville.mesh.ModuleConfigProtos -import com.geeksville.mesh.Portnums -import com.geeksville.mesh.config -import com.geeksville.mesh.deviceProfile -import com.geeksville.mesh.moduleConfig import com.google.protobuf.MessageLite import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers @@ -77,6 +66,17 @@ import org.meshtastic.core.strings.R import org.meshtastic.feature.settings.navigation.ConfigRoute import org.meshtastic.feature.settings.navigation.ModuleRoute import org.meshtastic.feature.settings.util.UiText +import org.meshtastic.proto.AdminProtos +import org.meshtastic.proto.ChannelProtos +import org.meshtastic.proto.ClientOnlyProtos.DeviceProfile +import org.meshtastic.proto.ConfigProtos +import org.meshtastic.proto.ConfigProtos.Config.SecurityConfig +import org.meshtastic.proto.MeshProtos +import org.meshtastic.proto.ModuleConfigProtos +import org.meshtastic.proto.Portnums +import org.meshtastic.proto.config +import org.meshtastic.proto.deviceProfile +import org.meshtastic.proto.moduleConfig import timber.log.Timber import java.io.FileOutputStream import javax.inject.Inject diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/AmbientLightingConfigItemList.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/AmbientLightingConfigItemList.kt index 34beef468..ed412c233 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/AmbientLightingConfigItemList.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/AmbientLightingConfigItemList.kt @@ -26,13 +26,13 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController -import com.geeksville.mesh.copy -import com.geeksville.mesh.moduleConfig import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.EditTextPreference import org.meshtastic.core.ui.component.PreferenceCategory import org.meshtastic.core.ui.component.SwitchPreference import org.meshtastic.feature.settings.radio.RadioConfigViewModel +import org.meshtastic.proto.copy +import org.meshtastic.proto.moduleConfig @Composable fun AmbientLightingConfigScreen(navController: NavController, viewModel: RadioConfigViewModel = hiltViewModel()) { diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/AudioConfigItemList.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/AudioConfigItemList.kt index 8f5c0e4fc..aa0e13398 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/AudioConfigItemList.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/AudioConfigItemList.kt @@ -26,15 +26,15 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController -import com.geeksville.mesh.ModuleConfigProtos.ModuleConfig.AudioConfig -import com.geeksville.mesh.copy -import com.geeksville.mesh.moduleConfig import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.DropDownPreference import org.meshtastic.core.ui.component.EditTextPreference import org.meshtastic.core.ui.component.PreferenceCategory import org.meshtastic.core.ui.component.SwitchPreference import org.meshtastic.feature.settings.radio.RadioConfigViewModel +import org.meshtastic.proto.ModuleConfigProtos.ModuleConfig.AudioConfig +import org.meshtastic.proto.copy +import org.meshtastic.proto.moduleConfig @Composable fun AudioConfigScreen(navController: NavController, viewModel: RadioConfigViewModel = hiltViewModel()) { diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/BluetoothConfigItemList.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/BluetoothConfigItemList.kt index 2631b445b..90ae67878 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/BluetoothConfigItemList.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/BluetoothConfigItemList.kt @@ -26,15 +26,15 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController -import com.geeksville.mesh.ConfigProtos.Config.BluetoothConfig -import com.geeksville.mesh.config -import com.geeksville.mesh.copy import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.DropDownPreference import org.meshtastic.core.ui.component.EditTextPreference import org.meshtastic.core.ui.component.PreferenceCategory import org.meshtastic.core.ui.component.SwitchPreference import org.meshtastic.feature.settings.radio.RadioConfigViewModel +import org.meshtastic.proto.ConfigProtos.Config.BluetoothConfig +import org.meshtastic.proto.config +import org.meshtastic.proto.copy @Composable fun BluetoothConfigScreen(navController: NavController, viewModel: RadioConfigViewModel = hiltViewModel()) { diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/CannedMessageConfigItemList.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/CannedMessageConfigItemList.kt index bea528626..45712c48c 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/CannedMessageConfigItemList.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/CannedMessageConfigItemList.kt @@ -32,15 +32,15 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController -import com.geeksville.mesh.ModuleConfigProtos.ModuleConfig.CannedMessageConfig -import com.geeksville.mesh.copy -import com.geeksville.mesh.moduleConfig import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.DropDownPreference import org.meshtastic.core.ui.component.EditTextPreference import org.meshtastic.core.ui.component.PreferenceCategory import org.meshtastic.core.ui.component.SwitchPreference import org.meshtastic.feature.settings.radio.RadioConfigViewModel +import org.meshtastic.proto.ModuleConfigProtos.ModuleConfig.CannedMessageConfig +import org.meshtastic.proto.copy +import org.meshtastic.proto.moduleConfig @Composable fun CannedMessageConfigScreen(navController: NavController, viewModel: RadioConfigViewModel = hiltViewModel()) { diff --git 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 index 6ce52e1dc..17b089b26 100644 --- 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 @@ -69,9 +69,6 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController -import com.geeksville.mesh.ChannelProtos.ChannelSettings -import com.geeksville.mesh.ConfigProtos.Config.LoRaConfig -import com.geeksville.mesh.channelSettings import org.meshtastic.core.model.Channel import org.meshtastic.core.model.DeviceVersion import org.meshtastic.core.strings.R @@ -82,6 +79,9 @@ 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.proto.ChannelProtos.ChannelSettings +import org.meshtastic.proto.ConfigProtos.Config.LoRaConfig +import org.meshtastic.proto.channelSettings @Composable private fun ChannelItem( diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/DetectionSensorConfigItemList.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/DetectionSensorConfigItemList.kt index a7a208d18..17c67aa5c 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/DetectionSensorConfigItemList.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/DetectionSensorConfigItemList.kt @@ -29,15 +29,15 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController -import com.geeksville.mesh.ModuleConfigProtos.ModuleConfig -import com.geeksville.mesh.copy -import com.geeksville.mesh.moduleConfig import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.DropDownPreference import org.meshtastic.core.ui.component.EditTextPreference import org.meshtastic.core.ui.component.PreferenceCategory import org.meshtastic.core.ui.component.SwitchPreference import org.meshtastic.feature.settings.radio.RadioConfigViewModel +import org.meshtastic.proto.ModuleConfigProtos.ModuleConfig +import org.meshtastic.proto.copy +import org.meshtastic.proto.moduleConfig @Composable fun DetectionSensorConfigScreen(navController: NavController, viewModel: RadioConfigViewModel = hiltViewModel()) { diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/DeviceConfigItemList.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/DeviceConfigItemList.kt index 3563fea39..ac21aefcd 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/DeviceConfigItemList.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/DeviceConfigItemList.kt @@ -47,15 +47,15 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController -import com.geeksville.mesh.ConfigProtos.Config.DeviceConfig -import com.geeksville.mesh.config -import com.geeksville.mesh.copy import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.DropDownPreference import org.meshtastic.core.ui.component.EditTextPreference import org.meshtastic.core.ui.component.PreferenceCategory import org.meshtastic.core.ui.component.SwitchPreference import org.meshtastic.feature.settings.radio.RadioConfigViewModel +import org.meshtastic.proto.ConfigProtos.Config.DeviceConfig +import org.meshtastic.proto.config +import org.meshtastic.proto.copy private val DeviceConfig.Role.description: Int get() = diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/DisplayConfigItemList.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/DisplayConfigItemList.kt index a6bdddbc6..9023d3a76 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/DisplayConfigItemList.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/DisplayConfigItemList.kt @@ -26,15 +26,15 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController -import com.geeksville.mesh.ConfigProtos.Config.DisplayConfig -import com.geeksville.mesh.config -import com.geeksville.mesh.copy import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.DropDownPreference import org.meshtastic.core.ui.component.EditTextPreference import org.meshtastic.core.ui.component.PreferenceCategory import org.meshtastic.core.ui.component.SwitchPreference import org.meshtastic.feature.settings.radio.RadioConfigViewModel +import org.meshtastic.proto.ConfigProtos.Config.DisplayConfig +import org.meshtastic.proto.config +import org.meshtastic.proto.copy @Composable fun DisplayConfigScreen(navController: NavController, viewModel: RadioConfigViewModel = hiltViewModel()) { diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/EditChannelDialog.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/EditChannelDialog.kt index abd6f413a..6ea4d8ffb 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/EditChannelDialog.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/EditChannelDialog.kt @@ -42,15 +42,15 @@ import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.geeksville.mesh.ChannelProtos -import com.geeksville.mesh.channelSettings -import com.geeksville.mesh.copy import org.meshtastic.core.model.Channel import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.EditBase64Preference import org.meshtastic.core.ui.component.EditTextPreference import org.meshtastic.core.ui.component.PositionPrecisionPreference import org.meshtastic.core.ui.component.SwitchPreference +import org.meshtastic.proto.ChannelProtos +import org.meshtastic.proto.channelSettings +import org.meshtastic.proto.copy @Suppress("LongMethod") @Composable diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/EditDeviceProfileDialog.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/EditDeviceProfileDialog.kt index 7278ef9d4..cfcc15cc9 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/EditDeviceProfileDialog.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/EditDeviceProfileDialog.kt @@ -40,10 +40,10 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.geeksville.mesh.ClientOnlyProtos.DeviceProfile import com.google.protobuf.Descriptors import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.SwitchPreference +import org.meshtastic.proto.ClientOnlyProtos.DeviceProfile private const val SUPPORTED_FIELDS = 7 diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/ExternalNotificationConfigItemList.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/ExternalNotificationConfigItemList.kt index 3f93d259c..a5be1f9fa 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/ExternalNotificationConfigItemList.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/ExternalNotificationConfigItemList.kt @@ -32,14 +32,14 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController -import com.geeksville.mesh.copy -import com.geeksville.mesh.moduleConfig import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.EditTextPreference import org.meshtastic.core.ui.component.PreferenceCategory import org.meshtastic.core.ui.component.SwitchPreference import org.meshtastic.core.ui.component.TextDividerPreference import org.meshtastic.feature.settings.radio.RadioConfigViewModel +import org.meshtastic.proto.copy +import org.meshtastic.proto.moduleConfig @Composable fun ExternalNotificationConfigScreen(navController: NavController, viewModel: RadioConfigViewModel = hiltViewModel()) { diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/LoRaConfigItemList.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/LoRaConfigItemList.kt index fd1a80e60..c96d59e64 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/LoRaConfigItemList.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/LoRaConfigItemList.kt @@ -32,8 +32,6 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController -import com.geeksville.mesh.config -import com.geeksville.mesh.copy import org.meshtastic.core.model.Channel import org.meshtastic.core.model.ChannelOption import org.meshtastic.core.model.RegionInfo @@ -46,6 +44,8 @@ import org.meshtastic.core.ui.component.SignedIntegerEditTextPreference import org.meshtastic.core.ui.component.SwitchPreference import org.meshtastic.core.ui.component.TitledCard import org.meshtastic.feature.settings.radio.RadioConfigViewModel +import org.meshtastic.proto.config +import org.meshtastic.proto.copy @Composable fun LoRaConfigScreen(navController: NavController, viewModel: RadioConfigViewModel) { diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/MQTTConfigItemList.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/MQTTConfigItemList.kt index 7539822be..fa72159f3 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/MQTTConfigItemList.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/MQTTConfigItemList.kt @@ -31,14 +31,14 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController -import com.geeksville.mesh.copy -import com.geeksville.mesh.moduleConfig import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.EditPasswordPreference import org.meshtastic.core.ui.component.EditTextPreference import org.meshtastic.core.ui.component.PreferenceCategory import org.meshtastic.core.ui.component.SwitchPreference import org.meshtastic.feature.settings.radio.RadioConfigViewModel +import org.meshtastic.proto.copy +import org.meshtastic.proto.moduleConfig @Composable fun MQTTConfigScreen(navController: NavController, viewModel: RadioConfigViewModel = hiltViewModel()) { diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/NeighborInfoConfigItemList.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/NeighborInfoConfigItemList.kt index fc4da425b..a5a8722ef 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/NeighborInfoConfigItemList.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/NeighborInfoConfigItemList.kt @@ -26,13 +26,13 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController -import com.geeksville.mesh.copy -import com.geeksville.mesh.moduleConfig import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.EditTextPreference import org.meshtastic.core.ui.component.PreferenceCategory import org.meshtastic.core.ui.component.SwitchPreference import org.meshtastic.feature.settings.radio.RadioConfigViewModel +import org.meshtastic.proto.copy +import org.meshtastic.proto.moduleConfig @Composable fun NeighborInfoConfigScreen(navController: NavController, viewModel: RadioConfigViewModel = hiltViewModel()) { diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/NetworkConfigItemList.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/NetworkConfigItemList.kt index e90b8ed49..32eb46a35 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/NetworkConfigItemList.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/NetworkConfigItemList.kt @@ -40,9 +40,6 @@ import androidx.compose.ui.unit.dp import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController -import com.geeksville.mesh.ConfigProtos.Config.NetworkConfig -import com.geeksville.mesh.config -import com.geeksville.mesh.copy import com.journeyapps.barcodescanner.ScanContract import com.journeyapps.barcodescanner.ScanOptions import org.meshtastic.core.strings.R @@ -54,6 +51,9 @@ import org.meshtastic.core.ui.component.PreferenceCategory import org.meshtastic.core.ui.component.SimpleAlertDialog import org.meshtastic.core.ui.component.SwitchPreference import org.meshtastic.feature.settings.radio.RadioConfigViewModel +import org.meshtastic.proto.ConfigProtos.Config.NetworkConfig +import org.meshtastic.proto.config +import org.meshtastic.proto.copy @Composable private fun ScanErrorDialog(onDismiss: () -> Unit = {}) = diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/PaxcounterConfigItemList.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/PaxcounterConfigItemList.kt index dbce6cc57..9b04cc5b8 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/PaxcounterConfigItemList.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/PaxcounterConfigItemList.kt @@ -26,14 +26,14 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController -import com.geeksville.mesh.copy -import com.geeksville.mesh.moduleConfig import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.EditTextPreference import org.meshtastic.core.ui.component.PreferenceCategory import org.meshtastic.core.ui.component.SignedIntegerEditTextPreference import org.meshtastic.core.ui.component.SwitchPreference import org.meshtastic.feature.settings.radio.RadioConfigViewModel +import org.meshtastic.proto.copy +import org.meshtastic.proto.moduleConfig @Composable fun PaxcounterConfigScreen(navController: NavController, viewModel: RadioConfigViewModel = hiltViewModel()) { diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/PositionConfigItemList.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/PositionConfigItemList.kt index c4d963f2f..8b70d3f51 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/PositionConfigItemList.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/PositionConfigItemList.kt @@ -39,10 +39,6 @@ import androidx.core.location.LocationCompat import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController -import com.geeksville.mesh.ConfigProtos -import com.geeksville.mesh.ConfigProtos.Config.PositionConfig -import com.geeksville.mesh.config -import com.geeksville.mesh.copy import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.rememberPermissionState import kotlinx.coroutines.launch @@ -54,6 +50,10 @@ import org.meshtastic.core.ui.component.EditTextPreference import org.meshtastic.core.ui.component.PreferenceCategory import org.meshtastic.core.ui.component.SwitchPreference import org.meshtastic.feature.settings.radio.RadioConfigViewModel +import org.meshtastic.proto.ConfigProtos +import org.meshtastic.proto.ConfigProtos.Config.PositionConfig +import org.meshtastic.proto.config +import org.meshtastic.proto.copy @OptIn(ExperimentalPermissionsApi::class) @Composable diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/PowerConfigItemList.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/PowerConfigItemList.kt index 2d2bb3ec2..af0c71428 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/PowerConfigItemList.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/PowerConfigItemList.kt @@ -26,13 +26,13 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController -import com.geeksville.mesh.config -import com.geeksville.mesh.copy import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.EditTextPreference import org.meshtastic.core.ui.component.PreferenceCategory import org.meshtastic.core.ui.component.SwitchPreference import org.meshtastic.feature.settings.radio.RadioConfigViewModel +import org.meshtastic.proto.config +import org.meshtastic.proto.copy @Composable fun PowerConfigScreen(navController: NavController, viewModel: RadioConfigViewModel = hiltViewModel()) { diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/RangeTestConfigItemList.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/RangeTestConfigItemList.kt index abda41b83..305341667 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/RangeTestConfigItemList.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/RangeTestConfigItemList.kt @@ -26,13 +26,13 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController -import com.geeksville.mesh.copy -import com.geeksville.mesh.moduleConfig import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.EditTextPreference import org.meshtastic.core.ui.component.PreferenceCategory import org.meshtastic.core.ui.component.SwitchPreference import org.meshtastic.feature.settings.radio.RadioConfigViewModel +import org.meshtastic.proto.copy +import org.meshtastic.proto.moduleConfig @Composable fun RangeTestConfigScreen(navController: NavController, viewModel: RadioConfigViewModel = hiltViewModel()) { diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/RemoteHardwareConfigItemList.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/RemoteHardwareConfigItemList.kt index 8d72dc097..95b410c7d 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/RemoteHardwareConfigItemList.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/RemoteHardwareConfigItemList.kt @@ -26,13 +26,13 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController -import com.geeksville.mesh.copy -import com.geeksville.mesh.moduleConfig import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.EditListPreference import org.meshtastic.core.ui.component.PreferenceCategory import org.meshtastic.core.ui.component.SwitchPreference import org.meshtastic.feature.settings.radio.RadioConfigViewModel +import org.meshtastic.proto.copy +import org.meshtastic.proto.moduleConfig @Composable fun RemoteHardwareConfigScreen(navController: NavController, viewModel: RadioConfigViewModel = hiltViewModel()) { diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/SecurityConfigItemList.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/SecurityConfigItemList.kt index b4757f863..00fb43249 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/SecurityConfigItemList.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/SecurityConfigItemList.kt @@ -43,9 +43,6 @@ import androidx.compose.ui.unit.dp import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController -import com.geeksville.mesh.ConfigProtos.Config.SecurityConfig -import com.geeksville.mesh.config -import com.geeksville.mesh.copy import com.google.protobuf.ByteString import org.meshtastic.core.model.util.encodeToString import org.meshtastic.core.model.util.toByteString @@ -56,6 +53,9 @@ import org.meshtastic.core.ui.component.EditListPreference import org.meshtastic.core.ui.component.PreferenceCategory import org.meshtastic.core.ui.component.SwitchPreference import org.meshtastic.feature.settings.radio.RadioConfigViewModel +import org.meshtastic.proto.ConfigProtos.Config.SecurityConfig +import org.meshtastic.proto.config +import org.meshtastic.proto.copy import java.security.SecureRandom @OptIn(ExperimentalMaterial3ExpressiveApi::class) diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/SerialConfigItemList.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/SerialConfigItemList.kt index b56c7e737..c4d3ad589 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/SerialConfigItemList.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/SerialConfigItemList.kt @@ -26,15 +26,15 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController -import com.geeksville.mesh.ModuleConfigProtos.ModuleConfig.SerialConfig -import com.geeksville.mesh.copy -import com.geeksville.mesh.moduleConfig import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.DropDownPreference import org.meshtastic.core.ui.component.EditTextPreference import org.meshtastic.core.ui.component.PreferenceCategory import org.meshtastic.core.ui.component.SwitchPreference import org.meshtastic.feature.settings.radio.RadioConfigViewModel +import org.meshtastic.proto.ModuleConfigProtos.ModuleConfig.SerialConfig +import org.meshtastic.proto.copy +import org.meshtastic.proto.moduleConfig @Composable fun SerialConfigScreen(navController: NavController, viewModel: RadioConfigViewModel = hiltViewModel()) { diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/StoreForwardConfigItemList.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/StoreForwardConfigItemList.kt index ef1b187d5..bb0c4011d 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/StoreForwardConfigItemList.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/StoreForwardConfigItemList.kt @@ -26,13 +26,13 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController -import com.geeksville.mesh.copy -import com.geeksville.mesh.moduleConfig import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.EditTextPreference import org.meshtastic.core.ui.component.PreferenceCategory import org.meshtastic.core.ui.component.SwitchPreference import org.meshtastic.feature.settings.radio.RadioConfigViewModel +import org.meshtastic.proto.copy +import org.meshtastic.proto.moduleConfig @Composable fun StoreForwardConfigScreen(navController: NavController, viewModel: RadioConfigViewModel = hiltViewModel()) { diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/TelemetryConfigItemList.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/TelemetryConfigItemList.kt index 54a760b26..76a056a8c 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/TelemetryConfigItemList.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/TelemetryConfigItemList.kt @@ -26,13 +26,13 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController -import com.geeksville.mesh.copy -import com.geeksville.mesh.moduleConfig import org.meshtastic.core.strings.R import org.meshtastic.core.ui.component.EditTextPreference import org.meshtastic.core.ui.component.PreferenceCategory import org.meshtastic.core.ui.component.SwitchPreference import org.meshtastic.feature.settings.radio.RadioConfigViewModel +import org.meshtastic.proto.copy +import org.meshtastic.proto.moduleConfig @Composable fun TelemetryConfigScreen(navController: NavController, viewModel: RadioConfigViewModel = hiltViewModel()) { diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/UserConfigItemList.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/UserConfigItemList.kt index 96da4ddb5..895dd964b 100644 --- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/UserConfigItemList.kt +++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/UserConfigItemList.kt @@ -29,7 +29,6 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavController -import com.geeksville.mesh.copy import org.meshtastic.core.database.model.isUnmessageableRole import org.meshtastic.core.model.DeviceVersion import org.meshtastic.core.strings.R @@ -38,6 +37,7 @@ import org.meshtastic.core.ui.component.PreferenceCategory import org.meshtastic.core.ui.component.RegularPreference import org.meshtastic.core.ui.component.SwitchPreference import org.meshtastic.feature.settings.radio.RadioConfigViewModel +import org.meshtastic.proto.copy @Composable fun UserConfigScreen(navController: NavController, viewModel: RadioConfigViewModel = hiltViewModel()) { diff --git a/mesh_service_example/src/main/kotlin/com/meshtastic/android/meshserviceexample/MainActivity.kt b/mesh_service_example/src/main/kotlin/com/meshtastic/android/meshserviceexample/MainActivity.kt index 8ef54274f..7dd6ca103 100644 --- a/mesh_service_example/src/main/kotlin/com/meshtastic/android/meshserviceexample/MainActivity.kt +++ b/mesh_service_example/src/main/kotlin/com/meshtastic/android/meshserviceexample/MainActivity.kt @@ -36,11 +36,11 @@ import androidx.annotation.RequiresApi import androidx.appcompat.app.AppCompatActivity import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat -import com.geeksville.mesh.Portnums import org.meshtastic.core.model.DataPacket import org.meshtastic.core.model.MessageStatus import org.meshtastic.core.model.NodeInfo import org.meshtastic.core.service.IMeshService +import org.meshtastic.proto.Portnums private const val TAG: String = "MeshServiceExample"