Skip to content

Commit 05945a9

Browse files
committed
refactor(discovery): improve KMP compatibility and clean up icon imports
- Replace platform-specific `String.format` with Kotlin standard library `padStart` in `DwellProgressIndicator` to support common code. - Simplify fully qualified icon references in `DiscoveryGoogleMap` by adding explicit imports.
1 parent 0335907 commit 05945a9

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

app/src/google/kotlin/org/meshtastic/app/map/discovery/DiscoveryGoogleMap.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ import com.google.maps.android.compose.rememberCameraPositionState
3838
import com.google.maps.android.compose.rememberUpdatedMarkerState
3939
import org.meshtastic.core.ui.util.DiscoveryMapNode
4040
import org.meshtastic.core.ui.util.DiscoveryNeighborType
41+
import org.meshtastic.core.ui.icon.MeshtasticIcons
42+
import org.meshtastic.core.ui.icon.Person
43+
import org.meshtastic.core.ui.icon.Temperature
4144

4245
private const val DEFAULT_ZOOM = 12f
4346
private const val BOUNDS_PADDING_PX = 100
@@ -115,9 +118,9 @@ fun DiscoveryGoogleMap(
115118
}
116119
val nodeIcon =
117120
if (node.isSensorNode) {
118-
org.meshtastic.core.ui.icon.MeshtasticIcons.Temperature
121+
MeshtasticIcons.Temperature
119122
} else {
120-
org.meshtastic.core.ui.icon.MeshtasticIcons.Person
123+
MeshtasticIcons.Person
121124
}
122125
MarkerComposable(
123126
state = rememberUpdatedMarkerState(position = nodeLatLng),

feature/discovery/src/commonMain/kotlin/org/meshtastic/feature/discovery/ui/component/DwellProgressIndicator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ fun DwellProgressIndicator(
4747
}
4848
val minutes = remainingSeconds / SECONDS_PER_MINUTE
4949
val seconds = remainingSeconds % SECONDS_PER_MINUTE
50-
val timeText = "%02d:%02d".format(minutes, seconds)
50+
val timeText = "${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}"
5151

5252
Column(verticalArrangement = Arrangement.spacedBy(CONTENT_PADDING), modifier = modifier.fillMaxWidth()) {
5353
Text(text = "Dwelling on $presetName", style = MaterialTheme.typography.titleSmall)

0 commit comments

Comments
 (0)