expo-dev-launcher 6.0.0 → 6.0.1

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 6.0.1 — 2025-08-15
+
+### 🐛 Bug fixes
+
+- [ios] Fix tvOS and Swiftlint after UI refresh. ([#38808](https://github.com/expo/expo/pull/38808) by [@douglowder](https://github.com/douglowder))
+
 ## 6.0.0 — 2025-08-13
 
 ### 🎉 New features

package/android/build.gradle

@@ -20,13 +20,13 @@ expoModule {
 }
 
 group = "host.exp.exponent"
-version = "6.0.0"
+version = "6.0.1"
 
 android {
   namespace "expo.modules.devlauncher"
   defaultConfig {
     versionCode 9
-    versionName "6.0.0"
+    versionName "6.0.1"
   }
 
   buildTypes {
@@ -91,7 +91,7 @@ dependencies {
   api project.dependencies.platform("io.insert-koin:koin-bom:3.5.6")
   api "io.insert-koin:koin-core"
 
-  def composeVersion = "1.8.2"
+  def composeVersion = "1.9.0"
 
   implementation "androidx.compose.foundation:foundation-android:$composeVersion"
   implementation "androidx.compose.ui:ui:$composeVersion"

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

@@ -10,8 +10,10 @@ class BindingView(context: Context) : LinearLayout(context) {
     addView(
       ComposeView(context).apply {
         setContent {
-          AppTheme {
-            DevLauncherBottomTabsNavigator()
+          expo.modules.devmenu.compose.newtheme.AppTheme {
+            AppTheme {
+              DevLauncherBottomTabsNavigator()
+            }
           }
         }
       }

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

@@ -7,6 +7,7 @@ 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
@@ -25,7 +26,7 @@ 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.theme.Theme
+import expo.modules.devmenu.compose.newtheme.NewAppTheme
 import kotlinx.serialization.Serializable
 
 @Composable
@@ -35,7 +36,8 @@ fun DefaultScreenContainer(
   Box(
     modifier = Modifier
       .fillMaxSize()
-      .background(Theme.colors.background.secondary)
+      .background(NewAppTheme.colors.background.default)
+      .statusBarsPadding()
   ) {
     content()
   }

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

@@ -8,10 +8,13 @@ import expo.modules.devlauncher.compose.Update
 import expo.modules.devlauncher.services.ApolloClientService
 import expo.modules.devlauncher.services.AppService
 import expo.modules.devlauncher.services.ApplicationInfo
+import expo.modules.devlauncher.services.SessionService
+import expo.modules.devlauncher.services.UserState
 import expo.modules.devlauncher.services.inject
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted.Companion.WhileSubscribed
-import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 
@@ -22,12 +25,14 @@ sealed interface BranchesAction {
 
 data class BranchesState(
   val branches: List<Branch> = emptyList(),
-  val isLoading: Boolean = false
+  val isLoading: Boolean = false,
+  val needToSignIn: Boolean = false
 )
 
 class BranchesViewModel : ViewModel() {
   private val apolloClientService = inject<ApolloClientService>()
   private val appService = inject<AppService>()
+  private val sessionService = inject<SessionService>()
 
   private val hasMore = mutableStateOf(true)
 
@@ -36,20 +41,60 @@ class BranchesViewModel : ViewModel() {
   private var _state = MutableStateFlow(
     BranchesState(
       branches = emptyList(),
-      isLoading = areUpdatesConfigured
+      isLoading = areUpdatesConfigured,
+      needToSignIn = sessionService.user.value == UserState.LoggedOut
     )
   )
 
-  val state = _state.onStart {
-    if (areUpdatesConfigured) {
-      hasMore.value = true
-      loadMoreBranches()
+  private val _sessionState = sessionService.user.onEach { newUser ->
+    when (newUser) {
+      UserState.LoggedOut -> {
+        hasMore.value = false
+        _state.value = _state.value.copy(
+          branches = emptyList(),
+          isLoading = false
+        )
+      }
+
+      is UserState.LoggedIn -> {
+        if (areUpdatesConfigured) {
+          hasMore.value = true
+          _state.value.copy(branches = emptyList(), isLoading = true)
+          viewModelScope.launch {
+            loadMoreBranches()
+          }
+        }
+      }
+
+      is UserState.Fetching -> {
+        _state.value = _state.value.copy(
+          isLoading = true,
+          branches = emptyList()
+        )
+      }
     }
-  }.stateIn(
-    scope = viewModelScope,
-    started = WhileSubscribed(5_000),
-    initialValue = _state.value
-  )
+  }
+
+  val state = _state
+    .combine(_sessionState) { branchState, newUser ->
+      when (newUser) {
+        UserState.Fetching -> {
+          branchState.copy(needToSignIn = false)
+        }
+
+        UserState.LoggedOut -> {
+          branchState.copy(needToSignIn = true)
+        }
+
+        is UserState.LoggedIn -> {
+          branchState.copy(needToSignIn = false)
+        }
+      }
+    }.stateIn(
+      scope = viewModelScope,
+      started = WhileSubscribed(5_000),
+      initialValue = _state.value
+    )
 
   private suspend fun loadMoreBranches() {
     val updateConfiguration = appService.applicationInfo as? ApplicationInfo.Updates
@@ -97,7 +142,6 @@ class BranchesViewModel : ViewModel() {
     } ?: emptyList()
 
     hasMore.value = branches.size == limit
-
     _state.value = _state.value.copy(
       isLoading = false,
       branches = _state.value.branches + branches

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

@@ -6,11 +6,10 @@ import androidx.compose.animation.core.tween
 import androidx.compose.animation.expandVertically
 import androidx.compose.animation.shrinkVertically
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -20,11 +19,14 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.rotate
+import androidx.compose.ui.res.painterResource
 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.devmenu.compose.primitives.DayNighIcon
+import expo.modules.devmenu.compose.newtheme.NewAppTheme
+import expo.modules.devmenu.compose.primitives.NewText
 import expo.modules.devmenu.compose.primitives.Text
-import expo.modules.devmenu.compose.theme.Theme
 
 @Composable
 fun Accordion(
@@ -39,53 +41,46 @@ fun Accordion(
     label = "accordion-arrow"
   )
 
-  Box(
-    modifier = modifier
-  ) {
-    Column {
-      Box(
-        modifier = Modifier
-          .clickable { expanded = !expanded }
+  Column {
+    Box(
+      modifier = Modifier
+        .clickable { expanded = !expanded }
+    ) {
+      Row(
+        horizontalArrangement = Arrangement.spacedBy(NewAppTheme.spacing.`2`),
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = modifier
       ) {
-        Row(
-          verticalAlignment = Alignment.CenterVertically,
+        Icon(
+          painter = painterResource(R.drawable.arrow_right),
+          contentDescription = "Accordion Arrow",
+          tint = NewAppTheme.colors.text.link,
           modifier = Modifier
-            .padding(Theme.spacing.medium)
-        ) {
-          DayNighIcon(
-            id = R.drawable.chevron_right_icon,
-            contentDescription = "Accordion Arrow",
-            modifier = Modifier
-              .rotate(arrowRotation)
-              .size(Theme.sizing.icon.extraSmall)
-          )
-          Spacer(Modifier.size(Theme.spacing.small))
-          Text(
-            text = text,
-            modifier = Modifier.weight(1f)
-          )
-        }
-      }
+            .rotate(arrowRotation)
+            .size(16.dp)
+        )
 
-      AnimatedVisibility(
-        visible = expanded,
-        enter = expandVertically(
-          expandFrom = Alignment.Top,
-          animationSpec = tween()
-        ),
-        exit = shrinkVertically(
-          shrinkTowards = Alignment.Top,
-          animationSpec = tween()
+        NewText(
+          text = text,
+          style = NewAppTheme.font.sm,
+          color = NewAppTheme.colors.text.link
         )
-      ) {
-        Box(
-          modifier = Modifier
-            .padding(horizontal = Theme.spacing.small)
-        ) {
-          accordionContent()
-        }
       }
     }
+
+    AnimatedVisibility(
+      visible = expanded,
+      enter = expandVertically(
+        expandFrom = Alignment.Top,
+        animationSpec = tween()
+      ),
+      exit = shrinkVertically(
+        shrinkTowards = Alignment.Top,
+        animationSpec = tween()
+      )
+    ) {
+      accordionContent()
+    }
   }
 }
 

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

@@ -1,21 +1,43 @@
 package expo.modules.devlauncher.compose.routes
 
 import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+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
+import androidx.compose.ui.unit.sp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.composables.core.ModalBottomSheetState
-import com.composables.core.SheetDetent.Companion.Hidden
+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
 import expo.modules.devlauncher.compose.models.ProfileState
 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.ProfileLayout
 import expo.modules.devlauncher.compose.ui.SignUp
+import expo.modules.devmenu.compose.newtheme.NewAppTheme
+import expo.modules.devmenu.compose.primitives.NewText
 
 @Composable
 fun ProfileRoute(
@@ -34,24 +56,74 @@ fun ProfileRoute(
   }
 
   BottomSheet(bottomSheetState) {
-    ProfileLayout(onClose = {
-      bottomSheetState.targetDetent = Hidden
-    }) {
-      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))
+    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))
+          }
+        )
+      }
+
+      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(
+                  NewAppTheme.colors.background.default,
+                  shape = RoundedCornerShape(NewAppTheme.borderRadius.md)
+                )
+            ) {
+              Icon(
+                painter = painterResource(R.drawable.expo_logo),
+                contentDescription = "Expo logo",
+                tint = NewAppTheme.colors.icon.default,
+                modifier = Modifier
+                  .size(24.dp)
+                  .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.LoggedOut -> {
           SignUp(
             onLogIn = {
               authLauncher.launch(AuthRequestType.LOGIN)
@@ -61,8 +133,16 @@ fun ProfileRoute(
             }
           )
         }
+      }
 
-        ProfileState.Fetching -> {
+      ProfileState.Fetching -> {
+        Box(
+          contentAlignment = Alignment.Center,
+          modifier = Modifier
+            .fillMaxWidth()
+            .height(300.dp)
+        ) {
+          CircularProgressBar(size = 72.dp)
         }
       }
     }

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

@@ -44,11 +44,13 @@ fun UpdatesRoute(
       composable<Routes.Updates.Branches> {
         val viewModel = viewModel<BranchesViewModel>()
 
+        val state by viewModel.state.collectAsStateWithLifecycle()
+
         if (viewModel.areUpdatesConfigured) {
-          val state by viewModel.state.collectAsStateWithLifecycle()
           BranchesScreen(
             branches = state.branches,
             isLoading = state.isLoading,
+            needToSignIn = state.needToSignIn,
             onProfileClick = onProfileClick,
             onAction = { action ->
               when (action) {