Modularize database classes (#3192)

2026-04-20 22:23:37 +00:00 · 2025-09-24 16:23:05 -04:00 · 2025-09-24 16:23:05 -04:00 · 613714cdb4
commit 613714cdb4
parent 989a6bc820
94 changed files with 384 additions and 431 deletions
--- a/app/src/main/java/com/geeksville/mesh/ui/Main.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/Main.kt
@ -80,7 +80,6 @@ import com.geeksville.mesh.android.AddNavigationTracking
 import com.geeksville.mesh.android.BuildUtils.debug
 import com.geeksville.mesh.android.setAttributes
 import com.geeksville.mesh.model.BTScanModel
-import com.geeksville.mesh.model.Node
 import com.geeksville.mesh.model.UIViewModel
 import com.geeksville.mesh.navigation.channelsGraph
 import com.geeksville.mesh.navigation.connectionsGraph
@ -111,6 +110,7 @@ import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
+import org.meshtastic.core.database.model.Node
 import org.meshtastic.core.model.DeviceVersion
 import org.meshtastic.core.navigation.ConnectionsRoutes
 import org.meshtastic.core.navigation.ContactsRoutes
--- a/app/src/main/java/com/geeksville/mesh/ui/common/components/MainAppBar.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/common/components/MainAppBar.kt
@ -46,7 +46,6 @@ import androidx.navigation.NavDestination
 import androidx.navigation.NavDestination.Companion.hasRoute
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.currentBackStackEntryAsState
-import com.geeksville.mesh.model.Node
 import com.geeksville.mesh.model.UIViewModel
 import com.geeksville.mesh.navigation.isConfigRoute
 import com.geeksville.mesh.navigation.isNodeDetailRoute
@ -55,6 +54,7 @@ import com.geeksville.mesh.ui.common.theme.AppTheme
 import com.geeksville.mesh.ui.debug.DebugMenuActions
 import com.geeksville.mesh.ui.node.components.NodeChip
 import com.geeksville.mesh.ui.node.components.NodeMenuAction
+import org.meshtastic.core.database.model.Node
 import org.meshtastic.core.navigation.ContactsRoutes
 import org.meshtastic.core.navigation.NodesRoutes
 import org.meshtastic.core.navigation.SettingsRoutes
--- a/app/src/main/java/com/geeksville/mesh/ui/common/components/PositionPrecisionPreference.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/common/components/PositionPrecisionPreference.kt
@ -31,8 +31,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.geeksville.mesh.util.DistanceUnit
-import com.geeksville.mesh.util.toDistanceString
+import org.meshtastic.core.model.util.DistanceUnit
+import org.meshtastic.core.model.util.toDistanceString
 import org.meshtastic.core.strings.R
 import kotlin.math.pow
 import kotlin.math.roundToInt
--- a/app/src/main/java/com/geeksville/mesh/ui/common/components/PreviewUtils.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/common/components/PreviewUtils.kt
@ -23,7 +23,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import com.geeksville.mesh.MeshProtos
 import com.geeksville.mesh.PaxcountProtos
 import com.geeksville.mesh.TelemetryProtos
-import com.geeksville.mesh.model.Node
+import org.meshtastic.core.database.model.Node

 /** Simple [PreviewParameterProvider] that provides true and false values. */
 class BooleanProvider : PreviewParameterProvider<Boolean> {
--- a/app/src/main/java/com/geeksville/mesh/ui/common/components/SignalInfo.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/common/components/SignalInfo.kt
@ -26,9 +26,9 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.tooling.preview.PreviewParameter
-import com.geeksville.mesh.model.Node
 import com.geeksville.mesh.ui.common.preview.NodePreviewParameterProvider
 import com.geeksville.mesh.ui.common.theme.AppTheme
+import org.meshtastic.core.database.model.Node
 import org.meshtastic.core.strings.R

 const val MAX_VALID_SNR = 100F
--- a/app/src/main/java/com/geeksville/mesh/ui/common/preview/NodePreviewParameterProvider.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/common/preview/NodePreviewParameterProvider.kt
@ -22,11 +22,11 @@ import com.geeksville.mesh.ConfigProtos
 import com.geeksville.mesh.MeshProtos
 import com.geeksville.mesh.deviceMetrics
 import com.geeksville.mesh.environmentMetrics
-import com.geeksville.mesh.model.Node
 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 kotlin.random.Random

--- a/app/src/main/java/com/geeksville/mesh/ui/connections/ConnectionsScreen.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/connections/ConnectionsScreen.kt
@ -62,7 +62,6 @@ 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.model.Node
 import com.geeksville.mesh.navigation.ConfigRoute
 import com.geeksville.mesh.navigation.getNavRouteFrom
 import com.geeksville.mesh.service.ConnectionState
@ -80,6 +79,7 @@ import com.geeksville.mesh.ui.settings.radio.components.PacketResponseStateDialo
 import com.geeksville.mesh.ui.sharing.SharedContactDialog
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import kotlinx.coroutines.delay
+import org.meshtastic.core.database.model.Node
 import org.meshtastic.core.navigation.Route
 import org.meshtastic.core.navigation.SettingsRoutes
 import org.meshtastic.core.strings.R
--- a/app/src/main/java/com/geeksville/mesh/ui/connections/ConnectionsViewModel.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/connections/ConnectionsViewModel.kt
@ -21,8 +21,6 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.geeksville.mesh.LocalOnlyProtos.LocalConfig
 import com.geeksville.mesh.database.NodeRepository
-import com.geeksville.mesh.database.entity.MyNodeEntity
-import com.geeksville.mesh.model.Node
 import com.geeksville.mesh.repository.bluetooth.BluetoothRepository
 import com.geeksville.mesh.repository.datastore.RadioConfigRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
@ -31,6 +29,8 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.stateIn
+import org.meshtastic.core.database.entity.MyNodeEntity
+import org.meshtastic.core.database.model.Node
 import org.meshtastic.core.prefs.ui.UiPrefs
 import javax.inject.Inject

--- 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
@ -43,12 +43,12 @@ import androidx.compose.ui.unit.dp
 import com.geeksville.mesh.MeshProtos
 import com.geeksville.mesh.PaxcountProtos
 import com.geeksville.mesh.TelemetryProtos
-import com.geeksville.mesh.model.Node
 import com.geeksville.mesh.ui.common.components.MaterialBatteryInfo
 import com.geeksville.mesh.ui.common.theme.AppTheme
 import com.geeksville.mesh.ui.common.theme.StatusColors.StatusRed
 import com.geeksville.mesh.ui.node.components.NodeChip
 import com.geeksville.mesh.ui.node.components.NodeMenuAction
+import org.meshtastic.core.database.model.Node
 import org.meshtastic.core.strings.R

@Composable
--- a/app/src/main/java/com/geeksville/mesh/ui/map/BaseMapViewModel.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/map/BaseMapViewModel.kt
@ -21,8 +21,6 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.geeksville.mesh.database.NodeRepository
 import com.geeksville.mesh.database.PacketRepository
-import com.geeksville.mesh.database.entity.Packet
-import com.geeksville.mesh.model.Node
 import com.geeksville.mesh.repository.datastore.RadioConfigRepository
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
@ -31,6 +29,8 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.stateIn
+import org.meshtastic.core.database.entity.Packet
+import org.meshtastic.core.database.model.Node
 import org.meshtastic.core.prefs.map.MapPrefs

@Suppress("TooManyFunctions")
--- a/app/src/main/java/com/geeksville/mesh/ui/message/Message.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/message/Message.kt
@ -95,9 +95,6 @@ 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.database.entity.QuickChatAction
-import com.geeksville.mesh.model.Message
-import com.geeksville.mesh.model.Node
 import com.geeksville.mesh.model.UIViewModel
 import com.geeksville.mesh.model.getChannel
 import com.geeksville.mesh.ui.common.components.SecurityIcon
@ -107,6 +104,9 @@ import com.geeksville.mesh.ui.node.components.NodeMenuAction
 import com.geeksville.mesh.ui.sharing.SharedContactDialog
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import org.meshtastic.core.database.entity.QuickChatAction
+import org.meshtastic.core.database.model.Message
+import org.meshtastic.core.database.model.Node
 import org.meshtastic.core.model.DataPacket
 import org.meshtastic.core.strings.R
 import java.nio.charset.StandardCharsets
--- a/app/src/main/java/com/geeksville/mesh/ui/message/MessageList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/message/MessageList.kt
@ -47,8 +47,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.geeksville.mesh.database.entity.Reaction
-import com.geeksville.mesh.model.Message
 import com.geeksville.mesh.model.UIViewModel
 import com.geeksville.mesh.ui.message.components.MessageItem
 import com.geeksville.mesh.ui.message.components.ReactionDialog
@ -57,6 +55,8 @@ import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.launch
+import org.meshtastic.core.database.entity.Reaction
+import org.meshtastic.core.database.model.Message
 import org.meshtastic.core.model.MessageStatus
 import org.meshtastic.core.strings.R

--- a/app/src/main/java/com/geeksville/mesh/ui/message/QuickChat.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/message/QuickChat.kt
@ -70,12 +70,12 @@ 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.database.entity.QuickChatAction
 import com.geeksville.mesh.model.UIViewModel
 import com.geeksville.mesh.ui.common.components.dragContainer
 import com.geeksville.mesh.ui.common.components.dragDropItemsIndexed
 import com.geeksville.mesh.ui.common.components.rememberDragDropState
 import com.geeksville.mesh.ui.common.theme.AppTheme
+import org.meshtastic.core.database.entity.QuickChatAction
 import org.meshtastic.core.strings.R

@Composable
--- a/app/src/main/java/com/geeksville/mesh/ui/message/components/MessageItem.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/message/components/MessageItem.kt
@ -49,9 +49,6 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.unit.dp
-import com.geeksville.mesh.database.entity.Reaction
-import com.geeksville.mesh.model.Message
-import com.geeksville.mesh.model.Node
 import com.geeksville.mesh.ui.common.components.MDText
 import com.geeksville.mesh.ui.common.components.Rssi
 import com.geeksville.mesh.ui.common.components.Snr
@ -60,6 +57,9 @@ import com.geeksville.mesh.ui.common.theme.AppTheme
 import com.geeksville.mesh.ui.common.theme.MessageItemColors
 import com.geeksville.mesh.ui.node.components.NodeChip
 import com.geeksville.mesh.ui.node.components.NodeMenuAction
+import org.meshtastic.core.database.entity.Reaction
+import org.meshtastic.core.database.model.Message
+import org.meshtastic.core.database.model.Node
 import org.meshtastic.core.model.MessageStatus
 import org.meshtastic.core.strings.R

--- 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
@ -52,44 +52,25 @@ 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 com.geeksville.mesh.database.entity.Reaction
 import com.geeksville.mesh.ui.common.components.BottomSheetDialog
 import com.geeksville.mesh.ui.common.theme.AppTheme
+import org.meshtastic.core.database.entity.Reaction

@Composable
-private fun ReactionItem(
-    emoji: String,
-    emojiCount: Int = 1,
-    onClick: () -> Unit = {},
-    onLongClick: () -> Unit = {},
-) {
+private fun ReactionItem(emoji: String, emojiCount: Int = 1, onClick: () -> Unit = {}, onLongClick: () -> Unit = {}) {
    BadgedBox(
        badge = {
            if (emojiCount > 1) {
-                Badge {
-                    Text(
-                        fontWeight = FontWeight.Bold,
-                        text = emojiCount.toString()
-                    )
-                }
+                Badge { Text(fontWeight = FontWeight.Bold, text = emojiCount.toString()) }
            }
-        }
+        },
    ) {
        Surface(
-            modifier = Modifier
-                .combinedClickable(
-                    onClick = onClick,
-                    onLongClick = onLongClick
-                ),
+            modifier = Modifier.combinedClickable(onClick = onClick, onLongClick = onLongClick),
            color = MaterialTheme.colorScheme.primaryContainer,
            shape = CircleShape,
        ) {
-            Text(
-                text = emoji,
-                modifier = Modifier
-                    .padding(4.dp)
-                    .clip(CircleShape),
-            )
+            Text(text = emoji, modifier = Modifier.padding(4.dp).clip(CircleShape))
        }
    }
 }
@ -102,10 +83,7 @@ fun ReactionRow(
    onSendReaction: (String) -> Unit = {},
    onShowReactions: () -> Unit = {},
 ) {
-    val emojiList =
-        reduceEmojis(
-            reactions.reversed().map { it.emoji }
-        ).entries
+    val emojiList = reduceEmojis(reactions.reversed().map { it.emoji }).entries

    AnimatedVisibility(emojiList.isNotEmpty()) {
        LazyRow(
@ -113,16 +91,12 @@ fun ReactionRow(
            horizontalArrangement = Arrangement.Start,
            verticalAlignment = Alignment.CenterVertically,
        ) {
-            items(
-                emojiList.size
-            ) { index ->
+            items(emojiList.size) { index ->
                val entry = emojiList.elementAt(index)
                ReactionItem(
                    emoji = entry.key,
                    emojiCount = entry.value,
-                    onClick = {
-                        onSendReaction(entry.key)
-                    },
+                    onClick = { onSendReaction(entry.key) },
                    onLongClick = onShowReactions,
                )
            }
@ -133,68 +107,47 @@ fun ReactionRow(
 fun reduceEmojis(emojis: List<String>): Map<String, Int> = emojis.groupingBy { it }.eachCount()

@Composable
-fun ReactionDialog(
-    reactions: List<Reaction>,
-    onDismiss: () -> Unit = {}
-) = BottomSheetDialog(
-    onDismiss = onDismiss,
-    modifier = Modifier.fillMaxHeight(fraction = .3f),
-) {
-    val groupedEmojis = reactions.groupBy { it.emoji }
-    var selectedEmoji by remember { mutableStateOf<String?>(null) }
-    val filteredReactions = selectedEmoji?.let { groupedEmojis[it] ?: emptyList() } ?: reactions
+fun ReactionDialog(reactions: List<Reaction>, onDismiss: () -> Unit = {}) =
+    BottomSheetDialog(onDismiss = onDismiss, modifier = Modifier.fillMaxHeight(fraction = .3f)) {
+        val groupedEmojis = reactions.groupBy { it.emoji }
+        var selectedEmoji by remember { mutableStateOf<String?>(null) }
+        val filteredReactions = selectedEmoji?.let { groupedEmojis[it] ?: emptyList() } ?: reactions

-    LazyRow(
-        horizontalArrangement = Arrangement.spacedBy(8.dp),
-        modifier = Modifier.fillMaxWidth()
-    ) {
-        items(groupedEmojis.entries.toList()) { (emoji, reactions) ->
-            Text(
-                text = "$emoji${reactions.size}",
-                modifier = Modifier
-                    .clip(CircleShape)
-                    .background(if (selectedEmoji == emoji) Color.Gray else Color.Transparent)
-                    .padding(8.dp)
-                    .clickable {
-                        selectedEmoji = if (selectedEmoji == emoji) null else emoji
-                    },
-                style = MaterialTheme.typography.bodyMedium
-            )
-        }
-    }
-
-    HorizontalDivider(Modifier.padding(vertical = 8.dp))
-
-    LazyColumn(
-        modifier = Modifier.fillMaxWidth(),
-        verticalArrangement = Arrangement.spacedBy(12.dp)
-    ) {
-        items(filteredReactions) { reaction ->
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
+        LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth()) {
+            items(groupedEmojis.entries.toList()) { (emoji, reactions) ->
                Text(
-                    text = reaction.user.longName,
-                    style = MaterialTheme.typography.titleMedium
-                )
-                Text(
-                    text = reaction.emoji,
-                    style = MaterialTheme.typography.titleLarge
+                    text = "$emoji${reactions.size}",
+                    modifier =
+                    Modifier.clip(CircleShape)
+                        .background(if (selectedEmoji == emoji) Color.Gray else Color.Transparent)
+                        .padding(8.dp)
+                        .clickable { selectedEmoji = if (selectedEmoji == emoji) null else emoji },
+                    style = MaterialTheme.typography.bodyMedium,
                )
            }
        }
+
+        HorizontalDivider(Modifier.padding(vertical = 8.dp))
+
+        LazyColumn(modifier = Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(12.dp)) {
+            items(filteredReactions) { reaction ->
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    Text(text = reaction.user.longName, style = MaterialTheme.typography.titleMedium)
+                    Text(text = reaction.emoji, style = MaterialTheme.typography.titleLarge)
+                }
+            }
+        }
    }
-}

@PreviewLightDark
@Composable
 fun ReactionItemPreview() {
    AppTheme {
-        Column(
-            modifier = Modifier.background(MaterialTheme.colorScheme.background)
-        ) {
+        Column(modifier = Modifier.background(MaterialTheme.colorScheme.background)) {
            ReactionItem(emoji = "\uD83D\uDE42")
            ReactionItem(emoji = "\uD83D\uDE42", emojiCount = 2)
            ReactionButton()
@ -207,20 +160,21 @@ fun ReactionItemPreview() {
 fun ReactionRowPreview() {
    AppTheme {
        ReactionRow(
-            reactions = listOf(
+            reactions =
+            listOf(
                Reaction(
                    replyId = 1,
                    user = MeshProtos.User.getDefaultInstance(),
                    emoji = "\uD83D\uDE42",
-                    timestamp = 1L
+                    timestamp = 1L,
                ),
                Reaction(
                    replyId = 1,
                    user = MeshProtos.User.getDefaultInstance(),
                    emoji = "\uD83D\uDE42",
-                    timestamp = 1L
+                    timestamp = 1L,
                ),
-            )
+            ),
        )
    }
 }
--- a/app/src/main/java/com/geeksville/mesh/ui/metrics/PaxMetrics.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/metrics/PaxMetrics.kt
@ -55,11 +55,11 @@ 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.database.entity.MeshLog
 import com.geeksville.mesh.model.MetricsViewModel
 import com.geeksville.mesh.model.TimeFrame
 import com.geeksville.mesh.ui.common.components.OptionLabel
 import com.geeksville.mesh.ui.common.components.SlidingSelector
+import org.meshtastic.core.database.entity.MeshLog
 import org.meshtastic.core.model.util.formatUptime
 import org.meshtastic.core.strings.R
 import java.text.DateFormat
--- a/app/src/main/java/com/geeksville/mesh/ui/metrics/PositionLog.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/metrics/PositionLog.kt
@ -65,8 +65,8 @@ import com.geeksville.mesh.ConfigProtos.Config.DisplayConfig.DisplayUnits
 import com.geeksville.mesh.MeshProtos
 import com.geeksville.mesh.model.MetricsViewModel
 import com.geeksville.mesh.ui.common.theme.AppTheme
-import com.geeksville.mesh.util.metersIn
-import com.geeksville.mesh.util.toString
+import org.meshtastic.core.model.util.metersIn
+import org.meshtastic.core.model.util.toString
 import org.meshtastic.core.strings.R
 import java.text.DateFormat
 import kotlin.time.Duration.Companion.days
--- a/app/src/main/java/com/geeksville/mesh/ui/node/NodeDetail.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/node/NodeDetail.kt
@ -123,13 +123,9 @@ import coil3.compose.AsyncImage
 import coil3.request.ImageRequest
 import com.geeksville.mesh.ConfigProtos
 import com.geeksville.mesh.MeshProtos
-import com.geeksville.mesh.database.entity.FirmwareRelease
-import com.geeksville.mesh.database.entity.asDeviceVersion
 import com.geeksville.mesh.model.MetricsState
 import com.geeksville.mesh.model.MetricsViewModel
-import com.geeksville.mesh.model.Node
 import com.geeksville.mesh.model.UIViewModel
-import com.geeksville.mesh.model.isUnmessageableRole
 import com.geeksville.mesh.service.ServiceAction
 import com.geeksville.mesh.ui.common.components.MainAppBar
 import com.geeksville.mesh.ui.common.components.TitledCard
@ -147,10 +143,11 @@ import com.geeksville.mesh.ui.settings.components.SettingsItemDetail
 import com.geeksville.mesh.ui.settings.components.SettingsItemSwitch
 import com.geeksville.mesh.ui.sharing.SharedContactDialog
 import com.geeksville.mesh.util.thenIf
-import com.geeksville.mesh.util.toDistanceString
-import com.geeksville.mesh.util.toSmallDistanceString
-import com.geeksville.mesh.util.toSpeedString
 import com.mikepenz.markdown.m3.Markdown
+import org.meshtastic.core.database.entity.FirmwareRelease
+import org.meshtastic.core.database.entity.asDeviceVersion
+import org.meshtastic.core.database.model.Node
+import org.meshtastic.core.database.model.isUnmessageableRole
 import org.meshtastic.core.model.DataPacket
 import org.meshtastic.core.model.DeviceHardware
 import org.meshtastic.core.model.DeviceVersion
@ -158,6 +155,9 @@ import org.meshtastic.core.model.util.UnitConversions
 import org.meshtastic.core.model.util.UnitConversions.toTempString
 import org.meshtastic.core.model.util.formatAgo
 import org.meshtastic.core.model.util.formatUptime
+import org.meshtastic.core.model.util.toDistanceString
+import org.meshtastic.core.model.util.toSmallDistanceString
+import org.meshtastic.core.model.util.toSpeedString
 import org.meshtastic.core.navigation.NodeDetailRoutes
 import org.meshtastic.core.navigation.Route
 import org.meshtastic.core.navigation.SettingsRoutes
--- a/app/src/main/java/com/geeksville/mesh/ui/node/NodeScreen.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/node/NodeScreen.kt
@ -46,7 +46,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.model.Node
 import com.geeksville.mesh.model.UIViewModel
 import com.geeksville.mesh.service.ConnectionState
 import com.geeksville.mesh.ui.common.components.MainAppBar
@ -57,6 +56,7 @@ import com.geeksville.mesh.ui.node.components.NodeMenuAction
 import com.geeksville.mesh.ui.sharing.AddContactFAB
 import com.geeksville.mesh.ui.sharing.SharedContactDialog
 import com.geeksville.mesh.ui.sharing.supportsQrCodeSharing
+import org.meshtastic.core.database.model.Node
 import org.meshtastic.core.model.DataPacket
 import org.meshtastic.core.model.DeviceVersion
 import org.meshtastic.core.strings.R
--- a/app/src/main/java/com/geeksville/mesh/ui/node/components/ElevationInfo.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/node/components/ElevationInfo.kt
@ -25,40 +25,21 @@ import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
 import com.geeksville.mesh.ConfigProtos.Config.DisplayConfig.DisplayUnits
-import com.geeksville.mesh.util.metersIn
-import com.geeksville.mesh.util.toString
+import org.meshtastic.core.model.util.metersIn
+import org.meshtastic.core.model.util.toString

@Composable
-fun ElevationInfo(
-    modifier: Modifier = Modifier,
-    altitude: Int,
-    system: DisplayUnits,
-    suffix: String
-) {
+fun ElevationInfo(modifier: Modifier = Modifier, altitude: Int, system: DisplayUnits, suffix: String) {
    val annotatedString = buildAnnotatedString {
        append(altitude.metersIn(system).toString(system))
-        MaterialTheme.typography.labelSmall.toSpanStyle().let { style ->
-            withStyle(style) {
-                append(" $suffix")
-            }
-        }
+        MaterialTheme.typography.labelSmall.toSpanStyle().let { style -> withStyle(style) { append(" $suffix") } }
    }

-    Text(
-        modifier = modifier,
-        fontSize = MaterialTheme.typography.labelLarge.fontSize,
-        text = annotatedString,
-    )
+    Text(modifier = modifier, fontSize = MaterialTheme.typography.labelLarge.fontSize, text = annotatedString)
 }

@Composable
@Preview
 fun ElevationInfoPreview() {
-    MaterialTheme {
-        ElevationInfo(
-            altitude = 100,
-            system = DisplayUnits.METRIC,
-            suffix = "ASL"
-        )
-    }
+    MaterialTheme { ElevationInfo(altitude = 100, system = DisplayUnits.METRIC, suffix = "ASL") }
 }
--- a/app/src/main/java/com/geeksville/mesh/ui/node/components/NodeChip.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/node/components/NodeChip.kt
@ -44,7 +44,7 @@ import androidx.compose.ui.unit.dp
 import com.geeksville.mesh.MeshProtos
 import com.geeksville.mesh.PaxcountProtos
 import com.geeksville.mesh.TelemetryProtos
-import com.geeksville.mesh.model.Node
+import org.meshtastic.core.database.model.Node

@Composable
 fun NodeChip(
--- a/app/src/main/java/com/geeksville/mesh/ui/node/components/NodeFilterTextField.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/node/components/NodeFilterTextField.kt
@ -56,9 +56,9 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.unit.dp
-import com.geeksville.mesh.model.NodeSortOption
 import com.geeksville.mesh.ui.common.preview.LargeFontPreview
 import com.geeksville.mesh.ui.common.theme.AppTheme
+import org.meshtastic.core.database.model.NodeSortOption
 import org.meshtastic.core.strings.R

@Suppress("LongParameterList")
--- a/app/src/main/java/com/geeksville/mesh/ui/node/components/NodeItem.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/node/components/NodeItem.kt
@ -51,13 +51,13 @@ import androidx.compose.ui.unit.dp
 import com.geeksville.mesh.ConfigProtos.Config.DeviceConfig
 import com.geeksville.mesh.ConfigProtos.Config.DisplayConfig
 import com.geeksville.mesh.MeshProtos
-import com.geeksville.mesh.model.Node
-import com.geeksville.mesh.model.isUnmessageableRole
 import com.geeksville.mesh.ui.common.components.BatteryInfo
 import com.geeksville.mesh.ui.common.components.SignalInfo
 import com.geeksville.mesh.ui.common.preview.NodePreviewParameterProvider
 import com.geeksville.mesh.ui.common.theme.AppTheme
-import com.geeksville.mesh.util.toDistanceString
+import org.meshtastic.core.database.model.Node
+import org.meshtastic.core.database.model.isUnmessageableRole
+import org.meshtastic.core.model.util.toDistanceString
 import org.meshtastic.core.strings.R

@Suppress("LongMethod", "CyclomaticComplexMethod")
--- a/app/src/main/java/com/geeksville/mesh/ui/node/components/NodeMenu.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/node/components/NodeMenu.kt
@ -38,9 +38,9 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.geeksville.mesh.model.Node
-import com.geeksville.mesh.model.isUnmessageableRole
 import com.geeksville.mesh.ui.common.components.SimpleAlertDialog
+import org.meshtastic.core.database.model.Node
+import org.meshtastic.core.database.model.isUnmessageableRole
 import org.meshtastic.core.strings.R

@Suppress("LongMethod")
--- a/app/src/main/java/com/geeksville/mesh/ui/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/settings/SettingsViewModel.kt
@ -28,8 +28,6 @@ import com.geeksville.mesh.Portnums
 import com.geeksville.mesh.android.Logging
 import com.geeksville.mesh.database.MeshLogRepository
 import com.geeksville.mesh.database.NodeRepository
-import com.geeksville.mesh.database.entity.MyNodeEntity
-import com.geeksville.mesh.model.Node
 import com.geeksville.mesh.repository.datastore.RadioConfigRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
@ -45,6 +43,8 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.meshtastic.core.database.entity.MyNodeEntity
+import org.meshtastic.core.database.model.Node
 import org.meshtastic.core.datastore.UiPreferencesDataSource
 import org.meshtastic.core.model.Position
 import org.meshtastic.core.model.util.positionToMeter
--- a/app/src/main/java/com/geeksville/mesh/ui/settings/radio/CleanNodeDatabaseScreen.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/settings/radio/CleanNodeDatabaseScreen.kt
@ -46,8 +46,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
-import com.geeksville.mesh.database.entity.NodeEntity
 import com.geeksville.mesh.ui.node.components.NodeChip
+import org.meshtastic.core.database.entity.NodeEntity
 import org.meshtastic.core.strings.R

 /**
--- a/app/src/main/java/com/geeksville/mesh/ui/settings/radio/CleanNodeDatabaseViewModel.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/settings/radio/CleanNodeDatabaseViewModel.kt
@ -20,12 +20,12 @@ package com.geeksville.mesh.ui.settings.radio
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.geeksville.mesh.database.NodeRepository
-import com.geeksville.mesh.database.entity.NodeEntity
 import com.geeksville.mesh.repository.datastore.RadioConfigRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
+import org.meshtastic.core.database.entity.NodeEntity
 import javax.inject.Inject
 import kotlin.time.Duration.Companion.days
 import kotlin.time.Duration.Companion.milliseconds
--- a/app/src/main/java/com/geeksville/mesh/ui/settings/radio/RadioConfigViewModel.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/settings/radio/RadioConfigViewModel.kt
@ -45,11 +45,8 @@ import com.geeksville.mesh.android.GeeksvilleApplication
 import com.geeksville.mesh.android.Logging
 import com.geeksville.mesh.android.isAnalyticsAvailable
 import com.geeksville.mesh.config
-import com.geeksville.mesh.database.entity.MyNodeEntity
 import com.geeksville.mesh.deviceProfile
-import com.geeksville.mesh.model.Node
 import com.geeksville.mesh.model.getChannelList
-import com.geeksville.mesh.model.getStringResFrom
 import com.geeksville.mesh.model.toChannelSet
 import com.geeksville.mesh.moduleConfig
 import com.geeksville.mesh.navigation.ConfigRoute
@ -73,6 +70,9 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.json.JSONObject
+import org.meshtastic.core.database.entity.MyNodeEntity
+import org.meshtastic.core.database.model.Node
+import org.meshtastic.core.database.model.getStringResFrom
 import org.meshtastic.core.model.Position
 import org.meshtastic.core.navigation.SettingsRoutes
 import org.meshtastic.core.prefs.analytics.AnalyticsPrefs
--- a/app/src/main/java/com/geeksville/mesh/ui/settings/radio/components/MapReportingPreference.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/settings/radio/components/MapReportingPreference.kt
@ -43,8 +43,8 @@ import androidx.compose.ui.unit.dp
 import com.geeksville.mesh.ui.common.components.EditTextPreference
 import com.geeksville.mesh.ui.common.components.SwitchPreference
 import com.geeksville.mesh.ui.common.components.precisionBitsToMeters
-import com.geeksville.mesh.util.DistanceUnit
-import com.geeksville.mesh.util.toDistanceString
+import org.meshtastic.core.model.util.DistanceUnit
+import org.meshtastic.core.model.util.toDistanceString
 import org.meshtastic.core.strings.R
 import kotlin.math.roundToInt

--- a/app/src/main/java/com/geeksville/mesh/ui/settings/radio/components/UserConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/settings/radio/components/UserConfigItemList.kt
@ -30,12 +30,12 @@ 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.model.isUnmessageableRole
 import com.geeksville.mesh.ui.common.components.EditTextPreference
 import com.geeksville.mesh.ui.common.components.PreferenceCategory
 import com.geeksville.mesh.ui.common.components.RegularPreference
 import com.geeksville.mesh.ui.common.components.SwitchPreference
 import com.geeksville.mesh.ui.settings.radio.RadioConfigViewModel
+import org.meshtastic.core.database.model.isUnmessageableRole
 import org.meshtastic.core.model.DeviceVersion
 import org.meshtastic.core.strings.R

--- a/app/src/main/java/com/geeksville/mesh/ui/sharing/ContactSharing.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/sharing/ContactSharing.kt
@ -54,7 +54,6 @@ import com.geeksville.mesh.AdminProtos
 import com.geeksville.mesh.MeshProtos
 import com.geeksville.mesh.android.BuildUtils.debug
 import com.geeksville.mesh.android.BuildUtils.errormsg
-import com.geeksville.mesh.model.Node
 import com.geeksville.mesh.model.UIViewModel
 import com.geeksville.mesh.ui.common.components.CopyIconButton
 import com.geeksville.mesh.ui.common.components.SimpleAlertDialog
@ -69,6 +68,7 @@ import com.google.zxing.WriterException
 import com.journeyapps.barcodescanner.BarcodeEncoder
 import com.journeyapps.barcodescanner.ScanContract
 import com.journeyapps.barcodescanner.ScanOptions
+import org.meshtastic.core.database.model.Node
 import org.meshtastic.core.model.DeviceVersion
 import org.meshtastic.core.strings.R
 import timber.log.Timber