expo-dev-launcher 6.0.7 → 6.0.8

package/CHANGELOG.md

@@ -10,6 +10,10 @@
 
 ### 💡 Others
 
+## 6.0.8 — 2025-08-31
+
+_This version does not introduce any user-facing changes._
+
 ## 6.0.7 — 2025-08-28
 
 _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.7"
+version = "6.0.8"
 
 android {
   namespace "expo.modules.devlauncher"
   defaultConfig {
     versionCode 9
-    versionName "6.0.7"
+    versionName "6.0.8"
   }
 
   buildTypes {

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

@@ -4,14 +4,8 @@ import androidx.compose.animation.AnimatedContentTransitionScope
 import androidx.compose.animation.EnterTransition
 import androidx.compose.animation.ExitTransition
 import androidx.compose.animation.core.tween
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.painter.Painter
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
@@ -27,31 +21,6 @@ import expo.modules.devlauncher.compose.routes.UpdatesRoute
 import expo.modules.devlauncher.compose.ui.BottomTabBar
 import expo.modules.devlauncher.compose.ui.Full
 import expo.modules.devlauncher.compose.ui.rememberBottomSheetState
-import expo.modules.devmenu.compose.newtheme.NewAppTheme
-import kotlinx.serialization.Serializable
-
-@Composable
-fun DefaultScreenContainer(
-  content: @Composable () -> Unit
-) {
-  Box(
-    modifier = Modifier
-      .fillMaxSize()
-      .background(NewAppTheme.colors.background.default)
-      .statusBarsPadding()
-  ) {
-    content()
-  }
-}
-
-data class Tab(
-  val label: String,
-  val icon: Painter,
-  val screen: Any
-)
-
-@Serializable
-object Main
 
 @Composable
 fun DevLauncherBottomTabsNavigator() {
@@ -70,9 +39,9 @@ fun DevLauncherBottomTabsNavigator() {
 
   NavHost(
     navController = mainNavController,
-    startDestination = Main
+    startDestination = Routes.Main
   ) {
-    composable<Main>(
+    composable<Routes.Main>(
       enterTransition = {
         slideIntoContainer(
           AnimatedContentTransitionScope.SlideDirection.Right,

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

@@ -11,7 +11,6 @@ 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.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -19,11 +18,10 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.composeunstyled.Icon
-import expo.modules.devlauncher.R
+import expo.modules.devlauncher.compose.ui.LauncherIcons
 import expo.modules.devmenu.compose.newtheme.NewAppTheme
 import expo.modules.devmenu.compose.primitives.NewText
 import expo.modules.devmenu.compose.primitives.RoundedSurface
@@ -45,7 +43,9 @@ fun Accordion(
     Column(
       modifier = Modifier
         .fillMaxWidth()
-        .clickable { expanded = !expanded }
+        .clickable(
+          role = Role.Button
+        ) { expanded = !expanded }
         .padding(NewAppTheme.spacing.`3`)
     ) {
       Box {
@@ -54,12 +54,9 @@ fun Accordion(
           verticalAlignment = Alignment.CenterVertically,
           modifier = modifier
         ) {
-          Icon(
-            painter = painterResource(R.drawable.plus),
-            contentDescription = "Accordion Arrow",
-            tint = NewAppTheme.colors.text.link,
-            modifier = Modifier
-              .size(16.dp)
+          LauncherIcons.Plus(
+            size = 16.dp,
+            tint = NewAppTheme.colors.text.link
           )
 
           NewText(

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

@@ -8,15 +8,14 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.asImageBitmap
 import expo.modules.devlauncher.services.ImageLoaderService
 import expo.modules.devlauncher.services.inject
 import kotlinx.coroutines.launch
 
 @Composable
-fun AsyncImage(
-  url: String
-) {
+private fun rememberImageBitmap(url: String): ImageBitmap? {
   val imageLoaderService = inject<ImageLoaderService>()
   val scope = rememberCoroutineScope()
   var imageBitmap by remember { mutableStateOf(imageLoaderService.loadFromMemory(url)?.asImageBitmap()) }
@@ -30,10 +29,20 @@ fun AsyncImage(
     }
   }
 
-  imageBitmap?.let {
-    Image(
-      bitmap = it,
-      contentDescription = url
-    )
+  return imageBitmap
+}
+
+@Composable
+fun AsyncImage(
+  url: String
+) {
+  val imageBitmap = rememberImageBitmap(url)
+  if (imageBitmap == null) {
+    return
   }
+
+  Image(
+    bitmap = imageBitmap,
+    contentDescription = url
+  )
 }

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

@@ -20,7 +20,6 @@ import androidx.compose.ui.unit.dp
 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
 

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

@@ -13,9 +13,11 @@ fun DefaultScaffold(
     val maxWidth = constraints.maxWidth
     val maxHeight = constraints.maxHeight
 
-    val bottomTabPlaceables = subcompose("bottomTab", bottomTab).map { it.measure(constraints) }
+    val bottomTabPlaceables = subcompose("bottomTab", bottomTab)
+      .map { it.measure(constraints) }
     val bottomTabsHeight = bottomTabPlaceables.fastMaxBy { it.height }?.height ?: 0
-    val contentPlaceables = subcompose("content", content).map { it.measure(constraints.copy(maxHeight = maxHeight - bottomTabsHeight)) }
+    val contentPlaceables = subcompose("content", content)
+      .map { it.measure(constraints.copy(maxHeight = maxHeight - bottomTabsHeight)) }
 
     layout(maxWidth, maxHeight) {
       contentPlaceables.forEach { it.place(0, 0) }

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

@@ -2,7 +2,7 @@ package expo.modules.devlauncher.compose.routes
 
 import androidx.compose.runtime.Composable
 import androidx.lifecycle.viewmodel.compose.viewModel
-import expo.modules.devlauncher.compose.DefaultScreenContainer
+import expo.modules.devlauncher.compose.ui.DefaultScreenContainer
 import expo.modules.devlauncher.compose.models.CrashReportModel
 import expo.modules.devlauncher.compose.screens.CrashReportScreen
 import expo.modules.devlauncher.launcher.errors.DevLauncherErrorInstance

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

@@ -5,7 +5,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
-import expo.modules.devlauncher.compose.DefaultScreenContainer
+import expo.modules.devlauncher.compose.ui.DefaultScreenContainer
 import expo.modules.devlauncher.compose.models.HomeAction
 import expo.modules.devlauncher.compose.models.HomeViewModel
 import expo.modules.devlauncher.compose.screens.HomeScreen

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

@@ -1,5 +1,6 @@
 package expo.modules.devlauncher.compose.routes
 
+import androidx.activity.compose.ManagedActivityResultLauncher
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -17,7 +18,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.dropShadow
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.shadow.Shadow
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
@@ -25,8 +25,6 @@ import androidx.compose.ui.unit.sp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.composables.core.ModalBottomSheetState
-import com.composeunstyled.Icon
-import expo.modules.devlauncher.R
 import expo.modules.devlauncher.compose.AuthActivity
 import expo.modules.devlauncher.compose.AuthRequestType
 import expo.modules.devlauncher.compose.AuthResult
@@ -35,6 +33,7 @@ import expo.modules.devlauncher.compose.models.ProfileViewModel
 import expo.modules.devlauncher.compose.primitives.CircularProgressBar
 import expo.modules.devlauncher.compose.ui.AccountSelector
 import expo.modules.devlauncher.compose.ui.BottomSheet
+import expo.modules.devlauncher.compose.ui.LauncherIcons
 import expo.modules.devlauncher.compose.ui.SignUp
 import expo.modules.devmenu.compose.newtheme.NewAppTheme
 import expo.modules.devmenu.compose.primitives.NewText
@@ -56,95 +55,101 @@ fun ProfileRoute(
   }
 
   BottomSheet(bottomSheetState) {
+    val state = state // capture state for when statement
     when (state) {
-      is ProfileState.LoggedIn -> {
-        val state = state as ProfileState.LoggedIn
-        AccountSelector(
-          accounts = state.accounts,
-          onSignOut = {
-            viewModel.onAction(ProfileViewModel.Action.SignOut)
-          },
-          onClick = { account ->
-            viewModel.onAction(ProfileViewModel.Action.SwitchAccount(account))
-          }
-        )
-      }
+      is ProfileState.LoggedIn -> LoggedIn(state, viewModel)
+      ProfileState.LoggedOut -> LoggedOut(authLauncher)
+      ProfileState.Fetching -> Loading()
+    }
+  }
+}
 
-      ProfileState.LoggedOut -> {
-        Column(
-          verticalArrangement = Arrangement.spacedBy(NewAppTheme.spacing.`4`)
-        ) {
-          Row(
-            horizontalArrangement = Arrangement.Center,
-            modifier = Modifier
-              .fillMaxWidth()
-          ) {
-            Box(
-              modifier = Modifier
-                .size(44.dp)
-                .dropShadow(
-                  shape = RoundedCornerShape(NewAppTheme.borderRadius.md),
-                  shadow = Shadow(
-                    radius = 10.dp,
-                    offset = DpOffset(0.dp, 5.dp),
-                    color = Color.Black.copy(alpha = 0.05f)
-                  )
-                )
-                .dropShadow(
-                  shape = RoundedCornerShape(NewAppTheme.borderRadius.md),
-                  shadow = Shadow(
-                    radius = 25.dp,
-                    offset = DpOffset(0.dp, 15.dp),
-                    color = Color.Black.copy(alpha = 0.12f)
-                  )
-                )
-                .background(
-                  Color.White,
-                  shape = RoundedCornerShape(NewAppTheme.borderRadius.md)
-                )
-            ) {
-              Icon(
-                painter = painterResource(R.drawable.expo_logo),
-                contentDescription = "Expo logo",
-                tint = Color.Black,
-                modifier = Modifier
-                  .size(24.dp)
-                  .align(Alignment.Center)
-              )
-            }
-          }
+@Composable
+private fun Loading() {
+  Box(
+    contentAlignment = Alignment.Center,
+    modifier = Modifier
+      .fillMaxWidth()
+      .height(300.dp)
+  ) {
+    CircularProgressBar(size = 72.dp)
+  }
+}
 
-          NewText(
-            "Login or create an account to view local\ndevelopment servers and more",
-            style = NewAppTheme.font.sm.merge(
-              lineHeight = 19.sp,
-              textAlign = TextAlign.Center
-            ),
-            color = NewAppTheme.colors.text.secondary,
-            modifier = Modifier.fillMaxWidth()
-          )
+@Composable
+private fun LoggedOut(authLauncher: ManagedActivityResultLauncher<AuthRequestType, AuthResult>) {
+  Column(
+    verticalArrangement = Arrangement.spacedBy(NewAppTheme.spacing.`4`)
+  ) {
+    Row(
+      horizontalArrangement = Arrangement.Center,
+      modifier = Modifier
+        .fillMaxWidth()
+    ) {
+      val shape = RoundedCornerShape(NewAppTheme.borderRadius.md)
 
-          SignUp(
-            onLogIn = {
-              authLauncher.launch(AuthRequestType.LOGIN)
-            },
-            onSignUp = {
-              authLauncher.launch(AuthRequestType.SIGNUP)
-            }
+      Box(
+        modifier = Modifier
+          .size(44.dp)
+          .dropShadow(
+            shape = shape,
+            shadow = Shadow(
+              radius = 10.dp,
+              offset = DpOffset(0.dp, 5.dp),
+              color = Color.Black.copy(alpha = 0.05f)
+            )
           )
-        }
+          .dropShadow(
+            shape = shape,
+            shadow = Shadow(
+              radius = 25.dp,
+              offset = DpOffset(0.dp, 15.dp),
+              color = Color.Black.copy(alpha = 0.12f)
+            )
+          )
+          .background(
+            Color.White,
+            shape = shape
+          )
+      ) {
+        LauncherIcons.ExpoLogo(
+          size = 24.dp,
+          tint = Color.Black,
+          modifier = Modifier.align(Alignment.Center)
+        )
       }
+    }
+
+    NewText(
+      "Login or create an account to view local\ndevelopment servers and more",
+      style = NewAppTheme.font.sm.merge(
+        lineHeight = 19.sp,
+        textAlign = TextAlign.Center
+      ),
+      color = NewAppTheme.colors.text.secondary,
+      modifier = Modifier.fillMaxWidth()
+    )
 
-      ProfileState.Fetching -> {
-        Box(
-          contentAlignment = Alignment.Center,
-          modifier = Modifier
-            .fillMaxWidth()
-            .height(300.dp)
-        ) {
-          CircularProgressBar(size = 72.dp)
-        }
+    SignUp(
+      onLogIn = {
+        authLauncher.launch(AuthRequestType.LOGIN)
+      },
+      onSignUp = {
+        authLauncher.launch(AuthRequestType.SIGNUP)
       }
-    }
+    )
   }
 }
+
+@Composable
+private fun LoggedIn(state: ProfileState.LoggedIn, viewModel: ProfileViewModel) {
+  AccountSelector(
+    accounts = state.accounts,
+    onSignOut = {
+      viewModel.onAction(ProfileViewModel.Action.SignOut)
+    },
+    onClick = { account ->
+      viewModel.onAction(ProfileViewModel.Action.SwitchAccount(account))
+    }
+  )
+}

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

@@ -3,6 +3,9 @@ package expo.modules.devlauncher.compose.routes
 import kotlinx.serialization.Serializable
 
 object Routes {
+  @Serializable
+  object Main
+
   @Serializable
   object Home
 

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

@@ -2,7 +2,7 @@ package expo.modules.devlauncher.compose.routes
 
 import androidx.compose.runtime.Composable
 import androidx.lifecycle.viewmodel.compose.viewModel
-import expo.modules.devlauncher.compose.DefaultScreenContainer
+import expo.modules.devlauncher.compose.ui.DefaultScreenContainer
 import expo.modules.devlauncher.compose.models.SettingsViewModel
 import expo.modules.devlauncher.compose.screens.SettingsScreen
 

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

@@ -6,11 +6,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
-import expo.modules.devlauncher.compose.DefaultScreenContainer
+import expo.modules.devlauncher.compose.ui.DefaultScreenContainer
 import expo.modules.devlauncher.compose.models.BranchViewModel
 import expo.modules.devlauncher.compose.models.BranchesAction
 import expo.modules.devlauncher.compose.models.BranchesViewModel
@@ -42,56 +43,65 @@ fun UpdatesRoute(
       }
     ) {
       composable<Routes.Updates.Branches> {
-        val viewModel = viewModel<BranchesViewModel>()
-
-        val state by viewModel.state.collectAsStateWithLifecycle()
-
-        if (viewModel.areUpdatesConfigured) {
-          BranchesScreen(
-            branches = state.branches,
-            isLoading = state.isLoading,
-            needToSignIn = state.needToSignIn,
-            onProfileClick = onProfileClick,
-            onAction = { action ->
-              when (action) {
-                is BranchesAction.OpenBranch -> {
-                  updatesNavController.navigate(
-                    Routes.Updates.Branch(action.branchName)
-                  )
-                }
-
-                else -> {
-                  viewModel.onAction(action)
-                }
-              }
-            }
-          )
-        } else {
-          NoUpdatesScreen(
-            onProfileClick = onProfileClick
-          )
-        }
+        Branches(onProfileClick, updatesNavController)
       }
 
       composable<Routes.Updates.Branch> { navBackStackEntry ->
         val route = navBackStackEntry.toRoute<Routes.Updates.Branch>()
+        Branch(route, updatesNavController)
+      }
+    }
+  }
+}
 
-        val viewModel = viewModel {
-          BranchViewModel(
-            branchName = route.name
-          )
-        }
+@Composable
+private fun Branch(route: Routes.Updates.Branch, updatesNavController: NavHostController) {
+  val viewModel = viewModel {
+    BranchViewModel(
+      branchName = route.name
+    )
+  }
 
-        val state by viewModel.state.collectAsStateWithLifecycle()
+  val state by viewModel.state.collectAsStateWithLifecycle()
 
-        BranchScreen(
-          branchName = route.name,
-          updates = state.updates,
-          isLoading = state.isLoading,
-          goBack = { updatesNavController.navigateUp() },
-          onAction = viewModel::onAction
-        )
+  BranchScreen(
+    branchName = route.name,
+    updates = state.updates,
+    isLoading = state.isLoading,
+    goBack = { updatesNavController.navigateUp() },
+    onAction = viewModel::onAction
+  )
+}
+
+@Composable
+private fun Branches(onProfileClick: () -> Unit, updatesNavController: NavHostController) {
+  val viewModel = viewModel<BranchesViewModel>()
+
+  val state by viewModel.state.collectAsStateWithLifecycle()
+
+  if (viewModel.areUpdatesConfigured) {
+    BranchesScreen(
+      branches = state.branches,
+      isLoading = state.isLoading,
+      needToSignIn = state.needToSignIn,
+      onProfileClick = onProfileClick,
+      onAction = { action ->
+        when (action) {
+          is BranchesAction.OpenBranch -> {
+            updatesNavController.navigate(
+              Routes.Updates.Branch(action.branchName)
+            )
+          }
+
+          else -> {
+            viewModel.onAction(action)
+          }
+        }
       }
-    }
+    )
+  } else {
+    NoUpdatesScreen(
+      onProfileClick = onProfileClick
+    )
   }
 }

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

@@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
@@ -20,21 +19,18 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.composeunstyled.Button
-import com.composeunstyled.Icon
-import expo.modules.devlauncher.R
-import expo.modules.devlauncher.compose.DefaultScreenContainer
 import expo.modules.devlauncher.compose.Update
 import expo.modules.devlauncher.compose.models.BranchAction
 import expo.modules.devlauncher.compose.primitives.CircularProgressBar
+import expo.modules.devlauncher.compose.ui.DefaultScreenContainer
+import expo.modules.devlauncher.compose.ui.LauncherIcons
 import expo.modules.devlauncher.compose.utils.DateFormat
 import expo.modules.devmenu.compose.newtheme.NewAppTheme
 import expo.modules.devmenu.compose.primitives.Divider
@@ -63,13 +59,9 @@ fun BranchScreen(
         Button(
           onClick = goBack
         ) {
-          Icon(
-            painter = painterResource(R.drawable.chevron_right_icon),
-            contentDescription = "Back icon",
-            tint = NewAppTheme.colors.icon.default,
-            modifier = Modifier
-              .rotate(180f)
-              .size(20.dp)
+          LauncherIcons.Chevron(
+            size = 20.dp,
+            tint = NewAppTheme.colors.icon.default
           )
         }
       }
@@ -135,11 +127,9 @@ fun BranchScreen(
                   .fillMaxWidth()
                   .padding(NewAppTheme.spacing.`3`)
               ) {
-                Icon(
-                  painter = painterResource(R.drawable.update_icon),
-                  contentDescription = "Update Icon",
-                  tint = NewAppTheme.colors.icon.tertiary,
-                  modifier = Modifier.size(20.dp)
+                LauncherIcons.Updates(
+                  size = 20.dp,
+                  tint = NewAppTheme.colors.icon.tertiary
                 )
 
                 Column(
@@ -172,11 +162,9 @@ fun BranchScreen(
                   }
                 }
 
-                Icon(
-                  painter = painterResource(R.drawable.chevron_right),
-                  contentDescription = "Chevron Icon",
-                  tint = NewAppTheme.colors.icon.tertiary,
-                  modifier = Modifier.size(16.dp)
+                LauncherIcons.Chevron(
+                  size = 16.dp,
+                  tint = NewAppTheme.colors.icon.tertiary
                 )
               }
             }