fix: ui tweaks

app/src/main/java/com/geeksville/mesh/ui/Main.kt

@@ -31,6 +31,8 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.recalculateWindowInsets
+import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
@@ -445,7 +447,7 @@ fun MainScreen(uIViewModel: UIViewModel = hiltViewModel(), scanModel: ScannerVie
         NavHost(
             navController = navController,
             startDestination = NodesRoutes.NodesGraph,
-            modifier = Modifier.fillMaxSize(),
+            modifier = Modifier.fillMaxSize().recalculateWindowInsets().safeDrawingPadding(),
         ) {
             contactsGraph(navController, uIViewModel.scrollToTopEventFlow)
             nodesGraph(navController, uIViewModel.scrollToTopEventFlow)

core/resources/src/androidMain/kotlin/org/meshtastic/core/resources/ContextExt.kt

@@ -25,7 +25,13 @@ fun getString(stringResource: StringResource): String = runBlocking { composeGet
 
 /** Retrieves a formatted string from the [StringResource] in a blocking manner. */
 fun getString(stringResource: StringResource, vararg formatArgs: Any): String = runBlocking {
-    composeGetString(stringResource, *formatArgs)
+    val pattern = composeGetString(stringResource)
+    if (formatArgs.isNotEmpty()) {
+        @Suppress("SpreadOperator")
+        pattern.format(*formatArgs)
+    } else {
+        pattern
+    }
 }
 
 /** Retrieves a string from the [StringResource] in a suspending manner. */
@@ -44,6 +50,11 @@ suspend fun getStringSuspend(stringResource: StringResource, vararg formatArgs:
             }
             .toTypedArray()
 
-    @Suppress("SpreadOperator")
-    return composeGetString(stringResource, *resolvedArgs)
+    val pattern = composeGetString(stringResource)
+    return if (resolvedArgs.isNotEmpty()) {
+        @Suppress("SpreadOperator")
+        pattern.format(*resolvedArgs)
+    } else {
+        pattern
+    }
 }

feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/MapView.kt

@@ -231,6 +231,7 @@ private fun cacheManagerCallback(onTaskComplete: () -> Unit, onTaskFailed: (Int)
 @Suppress("CyclomaticComplexMethod", "LongParameterList", "LongMethod")
 @Composable
 fun MapView(
+    modifier: Modifier = Modifier,
     mapViewModel: MapViewModel = hiltViewModel(),
     navigateToNodeDetails: (Int) -> Unit,
     focusedNodeNum: Int? = null,
@@ -735,6 +736,7 @@ fun MapView(
     }
 
     Scaffold(
+        modifier = modifier,
         floatingActionButton = {
             DownloadButton(showDownloadButton && downloadRegionBoundingBox == null) { showCacheManagerDialog = true }
         },