More map modularization (#3319)

app/src/main/java/com/geeksville/mesh/ui/map/MapScreen.kt

@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2025 Meshtastic LLC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.geeksville.mesh.ui.map
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Scaffold
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import org.meshtastic.core.strings.R
-import org.meshtastic.core.ui.component.MainAppBar
-import org.meshtastic.feature.map.MapViewModel
-
-@Composable
-fun MapScreen(
-    onClickNodeChip: (Int) -> Unit,
-    navigateToNodeDetails: (Int) -> Unit,
-    modifier: Modifier = Modifier,
-    mapViewModel: MapViewModel = hiltViewModel(),
-) {
-    val ourNodeInfo by mapViewModel.ourNodeInfo.collectAsStateWithLifecycle()
-    val isConnected by mapViewModel.isConnected.collectAsStateWithLifecycle()
-
-    @Suppress("ViewModelForwarding")
-    Scaffold(
-        modifier = modifier,
-        topBar = {
-            MainAppBar(
-                title = stringResource(R.string.map),
-                ourNode = ourNodeInfo,
-                showNodeChip = ourNodeInfo != null && isConnected,
-                canNavigateUp = false,
-                onNavigateUp = {},
-                actions = {},
-                onClickChip = { onClickNodeChip(it.num) },
-            )
-        },
-    ) { paddingValues ->
-        Box(modifier = Modifier.padding(paddingValues)) {
-            MapView(mapViewModel = mapViewModel, navigateToNodeDetails = navigateToNodeDetails)
-        }
-    }
-}

app/src/main/java/com/geeksville/mesh/ui/map/NodeMapViewModel.kt

@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2025 Meshtastic LLC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.geeksville.mesh.ui.map
-
-import androidx.lifecycle.ViewModel
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.StateFlow
-import org.meshtastic.core.common.BuildConfigProvider
-import org.meshtastic.core.data.repository.NodeRepository
-import org.meshtastic.core.database.model.Node
-import javax.inject.Inject
-
-@HiltViewModel
-class NodeMapViewModel @Inject constructor(nodeRepository: NodeRepository, buildConfigProvider: BuildConfigProvider) :
-    ViewModel() {
-    val ourNodeInfo: StateFlow<Node?> = nodeRepository.ourNodeInfo
-
-    val applicationId = buildConfigProvider.applicationId
-}

app/src/main/java/com/geeksville/mesh/ui/metrics/PositionLog.kt

@@ -67,11 +67,11 @@ 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
+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 java.text.DateFormat
-import kotlin.time.Duration.Companion.days
 
 @Composable
 private fun RowScope.PositionText(text: String, weight: Float) {
@@ -106,7 +106,6 @@ private fun HeaderItem(compactWidth: Boolean) {
 
 const val DEG_D = 1e-7
 const val HEADING_DEG = 1e-5
-private const val SECONDS_TO_MILLIS = 1000L
 
 @Composable
 fun PositionItem(compactWidth: Boolean, position: MeshProtos.Position, dateFormat: DateFormat, system: DisplayUnits) {
@@ -122,24 +121,10 @@ fun PositionItem(compactWidth: Boolean, position: MeshProtos.Position, dateForma
             PositionText("${position.groundSpeed} Km/h", WEIGHT_15)
             PositionText("%.0f°".format(position.groundTrack * HEADING_DEG), WEIGHT_15)
         }
-        PositionText(formatPositionTime(position, dateFormat), WEIGHT_40)
+        PositionText(position.formatPositionTime(dateFormat), WEIGHT_40)
     }
 }
 
-@Composable
-fun formatPositionTime(position: MeshProtos.Position, dateFormat: DateFormat): String {
-    val currentTime = System.currentTimeMillis()
-    val sixMonthsAgo = currentTime - 180.days.inWholeMilliseconds
-    val isOlderThanSixMonths = position.time * SECONDS_TO_MILLIS < sixMonthsAgo
-    val timeText =
-        if (isOlderThanSixMonths) {
-            stringResource(id = R.string.unknown_age)
-        } else {
-            dateFormat.format(position.time * SECONDS_TO_MILLIS)
-        }
-    return timeText
-}
-
 @Composable
 private fun ActionButtons(
     clearButtonEnabled: Boolean,

app/src/main/java/com/geeksville/mesh/ui/settings/SettingsScreen.kt

@@ -60,7 +60,6 @@ import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.geeksville.mesh.BuildConfig
 import com.geeksville.mesh.ClientOnlyProtos.DeviceProfile
-import com.geeksville.mesh.android.gpsDisabled
 import com.geeksville.mesh.navigation.getNavRouteFrom
 import com.geeksville.mesh.ui.settings.radio.RadioConfigItemList
 import com.geeksville.mesh.ui.settings.radio.RadioConfigViewModel
@@ -71,6 +70,7 @@ import com.geeksville.mesh.util.LanguageUtils.getLanguageMap
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.rememberMultiplePermissionsState
 import kotlinx.coroutines.delay
+import org.meshtastic.core.common.gpsDisabled
 import org.meshtastic.core.navigation.Route
 import org.meshtastic.core.strings.R
 import org.meshtastic.core.ui.component.MainAppBar