expo-dev-launcher 6.0.6 → 6.0.7

package/CHANGELOG.md

@@ -10,6 +10,10 @@
 
 ### 💡 Others
 
+## 6.0.7 — 2025-08-28
+
+_This version does not introduce any user-facing changes._
+
 ## 6.0.6 — 2025-08-27
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -20,13 +20,13 @@ expoModule {
 }
 
 group = "host.exp.exponent"
-version = "6.0.6"
+version = "6.0.7"
 
 android {
   namespace "expo.modules.devlauncher"
   defaultConfig {
     versionCode 9
-    versionName "6.0.6"
+    versionName "6.0.7"
   }
 
   buildTypes {

package/android/src/debug/java/expo/modules/devlauncher/compose/BindingView.kt

@@ -3,17 +3,15 @@ package expo.modules.devlauncher.compose
 import android.content.Context
 import android.widget.LinearLayout
 import androidx.compose.ui.platform.ComposeView
-import expo.modules.devmenu.compose.theme.AppTheme
+import expo.modules.devmenu.compose.newtheme.AppTheme
 
 class BindingView(context: Context) : LinearLayout(context) {
   init {
     addView(
       ComposeView(context).apply {
         setContent {
-          expo.modules.devmenu.compose.newtheme.AppTheme {
-            AppTheme {
-              DevLauncherBottomTabsNavigator()
-            }
+          AppTheme {
+            DevLauncherBottomTabsNavigator()
           }
         }
       }

package/android/src/debug/java/expo/modules/devlauncher/compose/primitives/Accordion.kt

@@ -28,7 +28,6 @@ import expo.modules.devmenu.compose.newtheme.NewAppTheme
 import expo.modules.devmenu.compose.primitives.NewText
 import expo.modules.devmenu.compose.primitives.RoundedSurface
 import expo.modules.devmenu.compose.primitives.Spacer
-import expo.modules.devmenu.compose.primitives.Text
 
 @Composable
 fun Accordion(
@@ -95,6 +94,6 @@ fun Accordion(
 @Preview(showBackground = true, heightDp = 200, widthDp = 300)
 fun AccordionVariantPreview() {
   Accordion(text = "Enter URL manually") {
-    Text("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed ac nisl interdum, mattis purus a, consequat ipsum. Aliquam sem mauris, egestas a elit a, lacinia efficitur nisi. Maecenas scelerisque erat nisi, ac interdum mauris volutpat vel. Proin sed lectus at purus interdum porta. Ut mollis feugiat dignissim.")
+    NewText("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed ac nisl interdum, mattis purus a, consequat ipsum. Aliquam sem mauris, egestas a elit a, lacinia efficitur nisi. Maecenas scelerisque erat nisi, ac interdum mauris volutpat vel. Proin sed lectus at purus interdum porta. Ut mollis feugiat dignissim.")
   }
 }

package/android/src/debug/java/expo/modules/devlauncher/compose/primitives/CircularProgressBar.kt

@@ -17,8 +17,10 @@ import androidx.compose.ui.graphics.drawscope.withTransform
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import expo.modules.devmenu.compose.theme.Pallet
-import expo.modules.devmenu.compose.theme.Theme
+import expo.modules.devmenu.compose.newtheme.NewAppTheme
+import io.github.lukmccall.colors.blue
+import io.github.lukmccall.colors.gray
+
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
@@ -29,17 +31,8 @@ fun CircularProgressBar(
   strokeWidth: Dp = size / 8,
   duration: Duration = 1.seconds
 ) {
-  val backgroundColor = if (Theme.isDarkTheme) {
-    Pallet.Dark.Gray.gray300
-  } else {
-    Pallet.Light.Gray.gray300
-  }
-
-  val progressColor = if (Theme.isDarkTheme) {
-    Pallet.Dark.Blue.blue500
-  } else {
-    Pallet.Light.Blue.blue500
-  }
+  val backgroundColor = NewAppTheme.pallet.gray.`3`
+  val progressColor = NewAppTheme.pallet.blue.`5`
 
   val transition = rememberInfiniteTransition(label = "infiniteSpinningTransition")
 

package/android/src/debug/java/expo/modules/devlauncher/compose/routes/DevelopmentServers.kt

@@ -28,7 +28,9 @@ fun DevelopmentServersRoute(
           fontWeight = FontWeight.SemiBold,
           textAlign = TextAlign.Center
         ),
-        modifier = Modifier.padding(vertical = NewAppTheme.spacing.`4`).fillMaxWidth()
+        modifier = Modifier
+          .padding(vertical = NewAppTheme.spacing.`4`)
+          .fillMaxWidth()
       )
 
       Spacer(NewAppTheme.spacing.`3`)

package/android/src/debug/java/expo/modules/devlauncher/compose/screens/BranchScreen.kt

@@ -41,7 +41,6 @@ import expo.modules.devmenu.compose.primitives.Divider
 import expo.modules.devmenu.compose.primitives.NewText
 import expo.modules.devmenu.compose.primitives.RoundedSurface
 import expo.modules.devmenu.compose.primitives.Spacer
-import expo.modules.devmenu.compose.theme.Theme
 
 @Composable
 fun BranchScreen(
@@ -200,7 +199,7 @@ fun BranchScreen(
                 verticalAlignment = Alignment.CenterVertically
               ) {
                 CircularProgressBar(
-                  size = Theme.sizing.icon.large
+                  size = 44.dp
                 )
               }
             }

package/android/src/debug/java/expo/modules/devlauncher/compose/screens/BranchesScreen.kt

@@ -44,7 +44,6 @@ import expo.modules.devmenu.compose.newtheme.NewAppTheme
 import expo.modules.devmenu.compose.primitives.NewText
 import expo.modules.devmenu.compose.primitives.RoundedSurface
 import expo.modules.devmenu.compose.primitives.Spacer
-import expo.modules.devmenu.compose.theme.Theme
 import kotlin.time.ExperimentalTime
 
 @Composable
@@ -287,7 +286,7 @@ fun BranchesScreen(
               verticalAlignment = Alignment.CenterVertically
             ) {
               CircularProgressBar(
-                size = Theme.sizing.icon.large
+                size = 44.dp
               )
             }
           }

package/android/src/debug/java/expo/modules/devlauncher/compose/screens/ErrorScreen.kt

@@ -8,13 +8,13 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import expo.modules.devlauncher.compose.models.ErrorAction
 import expo.modules.devlauncher.compose.ui.ActionButton
-import expo.modules.devmenu.compose.primitives.Heading
+import expo.modules.devmenu.compose.newtheme.NewAppTheme
+import expo.modules.devmenu.compose.primitives.NewText
 import expo.modules.devmenu.compose.primitives.Spacer
-import expo.modules.devmenu.compose.primitives.Text
-import expo.modules.devmenu.compose.theme.Theme
 
 @Composable
 fun ErrorScreen(
@@ -23,18 +23,23 @@ fun ErrorScreen(
 ) {
   Column(
     modifier = Modifier
-      .background(Theme.colors.background.secondary)
+      .background(NewAppTheme.colors.background.subtle)
       .fillMaxSize()
       .statusBarsPadding()
   ) {
-    Column(modifier = Modifier.padding(horizontal = Theme.spacing.small)) {
-      Spacer(Theme.spacing.medium)
-      Heading("There was a problem loading the project.")
+    Column(modifier = Modifier.padding(horizontal = NewAppTheme.spacing.`2`)) {
+      Spacer(NewAppTheme.spacing.`3`)
+      NewText(
+        "There was a problem loading the project.",
+        style = NewAppTheme.font.lg.merge(
+          fontWeight = FontWeight.SemiBold
+        )
+      )
 
-      Spacer(Theme.spacing.medium)
-      Text("This development build encountered the following error.")
+      Spacer(NewAppTheme.spacing.`3`)
+      NewText("This development build encountered the following error.")
 
-      Spacer(Theme.spacing.medium)
+      Spacer(NewAppTheme.spacing.`3`)
     }
 
     StackTrace(
@@ -45,23 +50,27 @@ fun ErrorScreen(
 
     Column(
       modifier = Modifier
-        .background(Theme.colors.background.default)
-        .padding(Theme.spacing.medium)
+        .background(NewAppTheme.colors.background.default)
+        .padding(NewAppTheme.spacing.`3`)
         .navigationBarsPadding()
     ) {
       ActionButton(
         "Reload",
-        style = Theme.colors.button.tertiary,
+        foreground = NewAppTheme.colors.buttons.tertiary.foreground,
+        background = NewAppTheme.colors.buttons.tertiary.background,
+        modifier = Modifier.padding(vertical = NewAppTheme.spacing.`2`),
         onClick = {
           onAction(ErrorAction.Reload)
         }
       )
 
-      Spacer(Theme.spacing.small)
+      Spacer(NewAppTheme.spacing.`2`)
 
       ActionButton(
         "Go To Home",
-        style = Theme.colors.button.secondary,
+        foreground = NewAppTheme.colors.buttons.secondary.foreground,
+        background = NewAppTheme.colors.buttons.secondary.background,
+        modifier = Modifier.padding(vertical = NewAppTheme.spacing.`2`),
         onClick = {
           onAction(ErrorAction.GoToHome)
         }

package/android/src/debug/java/expo/modules/devlauncher/compose/screens/HomeScreen.kt

@@ -1,6 +1,5 @@
 package expo.modules.devlauncher.compose.screens
 
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -11,7 +10,6 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import com.composables.core.rememberDialogState
 import com.composeunstyled.Button
@@ -28,8 +26,8 @@ import expo.modules.devlauncher.launcher.DevLauncherAppEntry
 import expo.modules.devlauncher.launcher.errors.DevLauncherErrorInstance
 import expo.modules.devlauncher.services.PackagerInfo
 import expo.modules.devmenu.compose.newtheme.NewAppTheme
-import expo.modules.devmenu.compose.primitives.NewText
 import expo.modules.devmenu.compose.primitives.Spacer
+import expo.modules.devmenu.compose.ui.Section
 import expo.modules.devmenu.compose.ui.Warning
 import kotlin.time.ExperimentalTime
 
@@ -107,30 +105,9 @@ fun HomeScreen(
         horizontalArrangement = Arrangement.SpaceBetween,
         modifier = Modifier.fillMaxWidth()
       ) {
-        NewText(
-          "DEVELOPMENT SERVERS",
-          style = NewAppTheme.font.sm.merge(
-            fontWeight = FontWeight.Medium,
-            fontFamily = NewAppTheme.font.mono
-          ),
-          color = NewAppTheme.colors.text.quaternary
-        )
+        Section.Header("DEVELOPMENT SERVERS")
 
-        NewText(
-          "INFO",
-          style = NewAppTheme.font.sm.merge(
-            fontWeight = FontWeight.Medium,
-            fontFamily = NewAppTheme.font.mono
-          ),
-          color = NewAppTheme.colors.text.link,
-          modifier = Modifier.clickable(
-            interactionSource = null,
-            indication = null,
-            onClick = {
-              onDevServersClick()
-            }
-          )
-        )
+        Section.Button("INFO", onDevServersClick)
       }
 
       Spacer(NewAppTheme.spacing.`3`)
@@ -170,30 +147,9 @@ fun HomeScreen(
           horizontalArrangement = Arrangement.SpaceBetween,
           modifier = Modifier.fillMaxWidth()
         ) {
-          NewText(
-            "RECENTLY OPENED",
-            style = NewAppTheme.font.sm.merge(
-              fontWeight = FontWeight.Medium,
-              fontFamily = NewAppTheme.font.mono
-            ),
-            color = NewAppTheme.colors.text.quaternary
-          )
+          Section.Header("RECENTLY OPENED")
 
-          NewText(
-            "RESET",
-            style = NewAppTheme.font.sm.merge(
-              fontWeight = FontWeight.Medium,
-              fontFamily = NewAppTheme.font.mono
-            ),
-            color = NewAppTheme.colors.text.link,
-            modifier = Modifier.clickable(
-              interactionSource = null,
-              indication = null,
-              onClick = {
-                onAction(HomeAction.ResetRecentlyOpenedApps)
-              }
-            )
-          )
+          Section.Button("RESET", { onAction(HomeAction.ResetRecentlyOpenedApps) })
         }
 
         Spacer(NewAppTheme.spacing.`3`)

package/android/src/debug/java/expo/modules/devlauncher/compose/screens/SettingsScreen.kt

@@ -2,7 +2,6 @@ package expo.modules.devlauncher.compose.screens
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -10,14 +9,11 @@ import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.composeunstyled.Button
 import com.composeunstyled.Icon
 import expo.modules.devlauncher.R
 import expo.modules.devlauncher.compose.DefaultScreenContainer
@@ -31,15 +27,14 @@ import expo.modules.devmenu.compose.primitives.RoundedSurface
 import expo.modules.devmenu.compose.primitives.Spacer
 import expo.modules.devmenu.compose.primitives.ToggleSwitch
 import expo.modules.devmenu.compose.ui.NewMenuButton
-import expo.modules.devmenu.compose.utils.copyToClipboard
+import expo.modules.devmenu.compose.ui.Section
+import expo.modules.devmenu.compose.ui.SystemSection
 
 @Composable
 fun SettingsScreen(
   state: SettingsState = SettingsState(),
   onAction: (SettingsAction) -> Unit = {}
 ) {
-  val context = LocalContext.current
-
   Column(
     modifier = Modifier
       .statusBarsPadding()
@@ -90,14 +85,7 @@ fun SettingsScreen(
 
     Spacer(NewAppTheme.spacing.`6`)
 
-    NewText(
-      "MENU GESTURES",
-      style = NewAppTheme.font.sm.merge(
-        fontWeight = FontWeight.Medium,
-        fontFamily = NewAppTheme.font.mono
-      ),
-      color = NewAppTheme.colors.text.quaternary
-    )
+    Section.Header("MENU GESTURES")
 
     Spacer(NewAppTheme.spacing.`3`)
 
@@ -196,95 +184,12 @@ fun SettingsScreen(
 
     Spacer(NewAppTheme.spacing.`6`)
 
-    NewText(
-      "SYSTEM",
-      style = TextStyle(
-        fontSize = NewAppTheme.font.sm.fontSize,
-        fontFamily = NewAppTheme.font.mono,
-        fontWeight = FontWeight.Medium,
-        color = NewAppTheme.colors.text.quaternary
-      )
-    )
-
-    Spacer(NewAppTheme.spacing.`3`)
-
-    Divider(
-      thickness = 0.5.dp,
-      color = NewAppTheme.colors.border.default
+    val info = state.applicationInfo
+    SystemSection(
+      appVersion = info?.appVersion,
+      runtimeVersion = (info as? ApplicationInfo.Updates)?.runtimeVersion,
+      fullDataProvider = { info?.toJson() ?: "No application info available" }
     )
-
-    Row(
-      horizontalArrangement = Arrangement.SpaceBetween,
-      modifier = Modifier
-        .fillMaxWidth()
-        .padding(vertical = 12.dp)
-    ) {
-      NewText(
-        "Version",
-        color = NewAppTheme.colors.text.secondary
-      )
-
-      NewText(
-        state.applicationInfo?.appVersion ?: "N/A",
-        color = NewAppTheme.colors.text.secondary
-      )
-    }
-
-    Divider(
-      thickness = 0.5.dp,
-      color = NewAppTheme.colors.border.default
-    )
-
-    Row(
-      horizontalArrangement = Arrangement.SpaceBetween,
-      modifier = Modifier
-        .fillMaxWidth()
-        .padding(vertical = 12.dp)
-    ) {
-      NewText(
-        "Runtime version",
-        color = NewAppTheme.colors.text.secondary
-      )
-
-      val runtimeVersion = (state.applicationInfo as? ApplicationInfo.Updates)?.runtimeVersion
-      NewText(
-        runtimeVersion ?: "N/A",
-        color = NewAppTheme.colors.text.secondary
-      )
-    }
-
-    Divider(
-      thickness = 0.5.dp,
-      color = NewAppTheme.colors.border.default
-    )
-
-    Button(onClick = {
-      copyToClipboard(
-        context,
-        label = "Copy system info",
-        text = state.applicationInfo?.toJson() ?: "No application info available"
-      )
-    }) {
-      Row(
-        horizontalArrangement = Arrangement.SpaceBetween,
-        modifier = Modifier
-          .fillMaxWidth()
-          .padding(vertical = 12.dp)
-      ) {
-        NewText(
-          "Copy system info",
-          color = NewAppTheme.colors.text.link,
-          style = NewAppTheme.font.sm
-        )
-        Icon(
-          painter = painterResource(expo.modules.devmenu.R.drawable.copy),
-          contentDescription = "Copy system info",
-          tint = NewAppTheme.colors.text.link,
-          modifier = Modifier
-            .size(12.dp)
-        )
-      }
-    }
   }
 }
 

package/android/src/debug/java/expo/modules/devlauncher/compose/ui/ActionButton.kt

@@ -2,7 +2,6 @@ package expo.modules.devlauncher.compose.ui
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -15,34 +14,6 @@ import com.composeunstyled.Button
 import expo.modules.devmenu.compose.newtheme.NewAppTheme
 import expo.modules.devmenu.compose.primitives.NewText
 import expo.modules.devmenu.compose.ripple.ripple
-import expo.modules.devmenu.compose.theme.ButtonStyle
-import expo.modules.devmenu.compose.theme.Theme
-
-@Composable
-fun ActionButton(
-  text: String,
-  style: ButtonStyle,
-  onClick: () -> Unit = {}
-) {
-  Button(
-    onClick = onClick,
-    shape = RoundedCornerShape(NewAppTheme.borderRadius.xl),
-    backgroundColor = style.background,
-    indication = ripple(color = style.foreground)
-  ) {
-    Box(
-      contentAlignment = Alignment.Companion.Center,
-      modifier = Modifier.Companion
-        .padding(vertical = Theme.spacing.small)
-        .fillMaxWidth()
-    ) {
-      NewText(
-        text,
-        color = style.foreground
-      )
-    }
-  }
-}
 
 @Composable
 fun ActionButton(

package/android/src/debug/java/expo/modules/devlauncher/compose/ui/AppHeader.kt

@@ -131,10 +131,8 @@ fun AppHeader(
 @Composable
 @Preview(showBackground = true, widthDp = 300)
 fun AppHeaderPreview() {
-  ScreenHeaderContainer {
-    AppHeader(
-      appName = "BareExpo",
-      modifier = Modifier.padding(NewAppTheme.spacing.`4`)
-    )
-  }
+  AppHeader(
+    appName = "BareExpo",
+    modifier = Modifier.padding(NewAppTheme.spacing.`4`)
+  )
 }

package/android/src/debug/java/expo/modules/devlauncher/compose/ui/AppLoadingErrorDialog.kt

@@ -1,15 +1,20 @@
 package expo.modules.devlauncher.compose.ui
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.displayCutoutPadding
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.composables.core.Dialog
@@ -18,13 +23,12 @@ import com.composables.core.DialogState
 import com.composables.core.Scrim
 import com.composables.core.rememberDialogState
 import com.composeunstyled.Button
+import com.composeunstyled.Icon
 import com.composeunstyled.Text
 import expo.modules.devlauncher.R
-import expo.modules.devmenu.compose.primitives.DayNighIcon
+import expo.modules.devmenu.compose.newtheme.NewAppTheme
 import expo.modules.devmenu.compose.primitives.Divider
-import expo.modules.devmenu.compose.primitives.Heading
-import expo.modules.devmenu.compose.primitives.RowLayout
-import expo.modules.devmenu.compose.theme.Theme
+import expo.modules.devmenu.compose.primitives.NewText
 
 @Composable
 fun AppLoadingErrorDialog(
@@ -38,30 +42,39 @@ fun AppLoadingErrorDialog(
       modifier = Modifier
         .displayCutoutPadding()
         .systemBarsPadding()
-        .padding(horizontal = Theme.spacing.medium)
+        .padding(horizontal = NewAppTheme.spacing.`3`)
         .clip(RoundedCornerShape(12.dp))
-        .background(Theme.colors.background.default)
+        .background(NewAppTheme.colors.background.default)
     ) {
       Column {
-        RowLayout(
-          rightComponent = {
-            Button(onClick = {
-              dialogState.visible = false
-            }) {
-              DayNighIcon(
-                id = R.drawable.x_icon,
-                contentDescription = "Close dialog"
-              )
-            }
-          },
-          modifier = Modifier.padding(Theme.spacing.medium)
+        Row(
+          verticalAlignment = Alignment.CenterVertically,
+          horizontalArrangement = Arrangement.SpaceBetween,
+          modifier = Modifier
+            .fillMaxWidth()
+            .padding(NewAppTheme.spacing.`3`)
         ) {
-          Heading("Error loading app")
+          NewText(
+            "Error loading app",
+            style = NewAppTheme.font.lg.merge(
+              fontWeight = FontWeight.SemiBold
+            )
+          )
+
+          Button(onClick = {
+            dialogState.visible = false
+          }) {
+            Icon(
+              painter = painterResource(R.drawable.x_icon),
+              contentDescription = "Close dialog",
+              tint = NewAppTheme.colors.icon.tertiary
+            )
+          }
         }
 
         Divider()
 
-        Row(modifier = Modifier.padding(Theme.spacing.medium)) {
+        Row(modifier = Modifier.padding(NewAppTheme.spacing.`3`)) {
           Text(currentError ?: "No error message available.")
         }
       }

package/android/src/debug/java/expo/modules/devlauncher/compose/ui/FetchDevelopmentServersButton.kt

@@ -32,11 +32,8 @@ import kotlin.time.Instant
 
 @Composable
 @OptIn(ExperimentalTime::class)
-fun FetchDevelopmentServersButton(
-  isFetching: Boolean,
-  onAction: (HomeAction) -> Unit
-) {
-  // Users might spam the button, so after debouncing we need to get the current state.
+private fun rememberIsFetchingState(isFetching: Boolean): Boolean {
+// Users might spam the button, so after debouncing we need to get the current state.
   // We can't use `isFetching` directly in the `LaunchedEffect` as it would be captured in the lambda.
   var getCurrentState by remember { mutableStateOf({ isFetching }) }
   var isFetchingUIState by remember { mutableStateOf(isFetching) }
@@ -67,6 +64,16 @@ fun FetchDevelopmentServersButton(
     isFetchingUIState = getCurrentState()
   }
 
+  return isFetchingUIState
+}
+
+@Composable
+fun FetchDevelopmentServersButton(
+  isFetching: Boolean,
+  onAction: (HomeAction) -> Unit
+) {
+  val isFetchingUIState = rememberIsFetchingState(isFetching)
+
   RoundedSurface(
     color = NewAppTheme.colors.background.element,
     borderRadius = NewAppTheme.borderRadius.xl

package/android/src/debug/java/expo/modules/devlauncher/compose/ui/RunningAppCard.kt

@@ -25,7 +25,6 @@ import expo.modules.devmenu.compose.newtheme.NewAppTheme
 import expo.modules.devmenu.compose.primitives.NewText
 import expo.modules.devmenu.compose.primitives.RoundedSurface
 import expo.modules.devmenu.compose.primitives.pulseEffect
-import expo.modules.devmenu.compose.theme.Theme
 
 @Composable
 fun RunningAppCard(
@@ -55,7 +54,7 @@ fun RunningAppCard(
         val dotColor = Color.fromHex("#34C759")
         Box(
           modifier = Modifier
-            .size(Theme.spacing.small)
+            .size(12.dp)
             .drawBehind {
               drawCircle(dotColor)
             }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-dev-launcher",
   "title": "Expo Development Launcher",
-  "version": "6.0.6",
+  "version": "6.0.7",
   "description": "Pre-release version of the Expo development launcher package for testing.",
   "repository": {
     "type": "git",
@@ -15,11 +15,11 @@
   "license": "MIT",
   "homepage": "https://docs.expo.dev",
   "dependencies": {
-    "expo-dev-menu": "7.0.5",
+    "expo-dev-menu": "7.0.6",
     "expo-manifests": "~1.0.5"
   },
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "48faa7b9a9f93a7660cb80aa118c7f6bf0aeff38"
+  "gitHead": "5e15f3a5d68bc213ad36d59113d725fdea4f3411"
 }

package/android/src/debug/java/expo/modules/devlauncher/compose/ui/ProfileLayout.kt

@@ -1,53 +0,0 @@
-package expo.modules.devlauncher.compose.ui
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.dp
-import com.composeunstyled.Button
-import expo.modules.devlauncher.R
-import expo.modules.devmenu.compose.primitives.DayNighIcon
-import expo.modules.devmenu.compose.primitives.Heading
-import expo.modules.devmenu.compose.primitives.RoundedSurface
-import expo.modules.devmenu.compose.primitives.Spacer
-import expo.modules.devmenu.compose.theme.Theme
-
-@Composable
-fun ProfileLayout(
-  onClose: () -> Unit = {},
-  content: @Composable () -> Unit
-) {
-  Column(
-    modifier = Modifier
-      .padding(horizontal = 12.dp)
-      .padding(top = 12.dp)
-  ) {
-    Row(
-      verticalAlignment = Alignment.CenterVertically,
-      horizontalArrangement = Arrangement.SpaceBetween,
-      modifier = Modifier.fillMaxWidth()
-    ) {
-      Heading("Account", fontSize = Theme.typography.size22)
-      RoundedSurface(color = Color.Unspecified) {
-        Button(onClick = onClose) {
-          DayNighIcon(
-            id = R.drawable.x_icon,
-            contentDescription = "Close",
-            modifier = Modifier.size(Theme.sizing.icon.small)
-          )
-        }
-      }
-    }
-
-    Spacer(Theme.spacing.large)
-
-    content()
-  }
-}

package/android/src/debug/java/expo/modules/devlauncher/compose/ui/ScreenHeaderContainer.kt

@@ -1,25 +0,0 @@
-package expo.modules.devlauncher.compose.ui
-
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.RowScope
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.statusBarsPadding
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-
-@Composable
-fun ScreenHeaderContainer(
-  modifier: Modifier = Modifier,
-  content: @Composable RowScope.() -> Unit
-) {
-  Row(
-    verticalAlignment = Alignment.Companion.CenterVertically,
-    modifier = Modifier
-      .fillMaxWidth()
-      .statusBarsPadding()
-      .then(modifier)
-  ) {
-    content()
-  }
-}

package/android/src/debug/java/expo/modules/devlauncher/compose/ui/SectionHeader.kt

@@ -1,20 +0,0 @@
-package expo.modules.devlauncher.compose.ui
-
-import androidx.compose.runtime.Composable
-import expo.modules.devmenu.compose.primitives.Heading
-import expo.modules.devmenu.compose.primitives.RowLayout
-import expo.modules.devmenu.compose.theme.Theme
-
-@Composable
-fun SectionHeader(
-  title: String,
-  leftIcon: @Composable (() -> Unit)? = null,
-  rightIcon: @Composable (() -> Unit)? = null
-) {
-  RowLayout(
-    rightComponent = rightIcon,
-    leftComponent = leftIcon
-  ) {
-    Heading(title, color = Theme.colors.text.secondary)
-  }
-}