expo-dev-launcher 5.2.0-canary-20250722-599a28f → 5.2.0-canary-20250811-5c940c0

package/CHANGELOG.md

@@ -7,15 +7,20 @@
 ### 🎉 New features
 
 - [iOS] Reimplement UI in SwiftUI. ([#37413](https://github.com/expo/expo/pull/37413) by [@alanjhughes](https://github.com/alanjhughes))
+- [Android] Add floating action button option in the settings menu. ([#38247](https://github.com/expo/expo/pull/38247) by [@behenate](https://github.com/behenate))
+- [iOS] Partial support for Apple TV. ([#38388](https://github.com/expo/expo/pull/38388) by [@douglowder](https://github.com/douglowder))
 
 ### 🐛 Bug fixes
 
 - [iOS] Fix missing CDP headers when using static frameworks. ([#37448](https://github.com/expo/expo/pull/37448) by [@alanjhughes](https://github.com/alanjhughes))
 - [Android] Use same strings in UI as iOS. ([#37786](https://github.com/expo/expo/pull/37786) by [@douglowder](https://github.com/douglowder))
+- [iOS] Fix an issue where the packager commands stop working after a reload. ([#38579](https://github.com/expo/expo/pull/38579) by [@alanjhughes](https://github.com/alanjhughes))
 
 ### 💡 Others
 
+- [Android] RN 0.81.0: patched some reflection issues after kotlin upgrade ([#38451](https://github.com/expo/expo/pull/38451) by [@chrfalch](https://github.com/chrfalch))
 - Fixed release build error on Android. ([#37579](https://github.com/expo/expo/pull/37579) by [@kudo](https://github.com/kudo))
+- Informational message for tvOS on signin page. ([#38518](https://github.com/expo/expo/pull/38518) by [@douglowder](https://github.com/douglowder))
 
 ### ⚠️ Notices
 

package/android/build.gradle

@@ -20,13 +20,13 @@ expoModule {
 }
 
 group = "host.exp.exponent"
-version = "5.2.0-canary-20250722-599a28f"
+version = "5.2.0-canary-20250811-5c940c0"
 
 android {
   namespace "expo.modules.devlauncher"
   defaultConfig {
     versionCode 9
-    versionName "5.2.0-canary-20250722-599a28f"
+    versionName "5.2.0-canary-20250811-5c940c0"
   }
 
   buildTypes {
@@ -97,6 +97,10 @@ dependencies {
   implementation "androidx.compose.ui:ui:$composeVersion"
   implementation "androidx.compose.ui:ui-tooling:$composeVersion"
   implementation "androidx.navigation:navigation-compose:2.9.0"
+  implementation "com.google.android.gms:play-services-code-scanner:16.1.0"
+  implementation "com.google.mlkit:barcode-scanning:17.3.0"
+
+  implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.7.1")
 
   implementation("com.apollographql.apollo:apollo-runtime:4.3.1")
 

package/android/src/debug/AndroidManifest.xml

@@ -1,15 +1,17 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
   <application>
     <activity
       android:name="expo.modules.devlauncher.launcher.DevLauncherActivity"
       android:exported="true"
       android:launchMode="singleTask"
-      android:theme="@style/Theme.DevLauncher.LauncherActivity" />
+      android:theme="@style/Theme.AppCompat.DayNight.NoActionBar" />
 
     <activity
       android:name="expo.modules.devlauncher.compose.AuthActivity"
       android:exported="true"
-      android:launchMode="singleTask">
+      android:launchMode="singleTask"
+      android:theme="@style/Theme.AppCompat.DayNight.NoActionBar">
       <intent-filter>
         <action android:name="android.intent.action.VIEW" />
 

package/android/src/debug/java/expo/modules/devlauncher/DevLauncherController.kt

@@ -5,6 +5,7 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.util.Log
 import androidx.annotation.UiThread
 import androidx.core.net.toUri
 import com.facebook.react.ReactActivity
@@ -52,10 +53,6 @@ import org.koin.core.component.get
 import org.koin.core.component.inject
 import org.koin.dsl.module
 
-// Use this to load from a development server for the development client launcher UI
-// private val DEV_LAUNCHER_HOST = "10.0.0.175:8090";
-private val DEV_LAUNCHER_HOST: String? = null
-
 private const val NEW_ACTIVITY_FLAGS = Intent.FLAG_ACTIVITY_NEW_TASK or
   Intent.FLAG_ACTIVITY_CLEAR_TASK or
   Intent.FLAG_ACTIVITY_NO_ANIMATION
@@ -90,7 +87,6 @@ class DevLauncherController private constructor() :
 
   override val coroutineScope = CoroutineScope(Dispatchers.Default)
 
-
   private val recentlyOpedAppsRegistry = DevLauncherRecentlyOpenedAppsRegistry(context)
   override var manifest: Manifest? = null
     private set
@@ -419,6 +415,17 @@ class DevLauncherController private constructor() :
 
     @JvmStatic
     internal fun initialize(context: Context, reactHost: ReactHostWrapper) {
+      try {
+        val splashScreenManagerClass = Class.forName("expo.modules.splashscreen.SplashScreenManager")
+        val splashScreenManager = splashScreenManagerClass
+          .kotlin
+          .objectInstance
+        splashScreenManagerClass.getMethod("hide")
+          .invoke(splashScreenManager)
+      } catch (e: Throwable) {
+        Log.e("DevLauncherController", "Failed to hide splash screen", e)
+      }
+
       val testInterceptor = DevLauncherKoinContext.app.koin.get<DevLauncherTestInterceptor>()
       if (!testInterceptor.allowReinitialization()) {
         check(!wasInitialized()) { "DevelopmentClientController was initialized." }

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

@@ -8,6 +8,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 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
@@ -16,11 +17,11 @@ import androidx.navigation.compose.rememberNavController
 import expo.modules.devlauncher.compose.primitives.DefaultScaffold
 import expo.modules.devlauncher.compose.routes.CrashReport
 import expo.modules.devlauncher.compose.routes.CrashReportRoute
-import expo.modules.devlauncher.compose.routes.Home
 import expo.modules.devlauncher.compose.routes.HomeRoute
 import expo.modules.devlauncher.compose.routes.ProfileRoute
-import expo.modules.devlauncher.compose.routes.Settings
+import expo.modules.devlauncher.compose.routes.Routes
 import expo.modules.devlauncher.compose.routes.SettingsRoute
+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
@@ -55,6 +56,10 @@ fun DevLauncherBottomTabsNavigator() {
   val bottomTabsNavController = rememberNavController()
   val bottomSheetState = rememberBottomSheetState()
 
+  val navigateToProfile = remember {
+    { bottomSheetState.targetDetent = Full }
+  }
+
   NavHost(
     navController = mainNavController,
     startDestination = Main
@@ -78,7 +83,7 @@ fun DevLauncherBottomTabsNavigator() {
       }) {
         NavHost(
           navController = bottomTabsNavController,
-          startDestination = Home,
+          startDestination = Routes.Home,
           enterTransition = {
             EnterTransition.None
           },
@@ -86,10 +91,13 @@ fun DevLauncherBottomTabsNavigator() {
             ExitTransition.None
           }
         ) {
-          composable<Home> {
-            HomeRoute(navController = mainNavController, onProfileClick = { bottomSheetState.jumpTo(Full) })
+          composable<Routes.Home> {
+            HomeRoute(navController = mainNavController, onProfileClick = navigateToProfile)
+          }
+          composable<Routes.Updates> {
+            UpdatesRoute(onProfileClick = navigateToProfile)
           }
-          composable<Settings> {
+          composable<Routes.Settings> {
             SettingsRoute()
           }
         }

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

@@ -0,0 +1,14 @@
+package expo.modules.devlauncher.compose
+
+data class Update(
+  val id: String,
+  val name: String,
+  val createdAt: String?,
+  val isCompatible: Boolean = false,
+  val permalink: String
+)
+
+data class Branch(
+  val name: String,
+  val compatibleUpdate: Update? = null
+)

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

@@ -0,0 +1,105 @@
+package expo.modules.devlauncher.compose.models
+
+import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import expo.modules.devlauncher.DevLauncherController
+import expo.modules.devlauncher.compose.Update
+import expo.modules.devlauncher.compose.utils.formatUpdateUrl
+import expo.modules.devlauncher.services.ApolloClientService
+import expo.modules.devlauncher.services.AppService
+import expo.modules.devlauncher.services.ApplicationInfo
+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.stateIn
+import kotlinx.coroutines.launch
+
+sealed interface BranchAction {
+  object LoadMoreUpdates : BranchAction
+  class OpenUpdate(val update: Update) : BranchAction
+}
+
+data class BranchState(
+  val updates: List<Update> = emptyList(),
+  val isLoading: Boolean = false
+)
+
+class BranchViewModel(private val branchName: String) : ViewModel() {
+  private val appService = inject<AppService>()
+  private val apolloClientService = inject<ApolloClientService>()
+  private val launcher = inject<DevLauncherController>()
+
+  private val hasMore = mutableStateOf(true)
+
+  private var _state = MutableStateFlow(
+    BranchState(
+      updates = emptyList(),
+      isLoading = true
+    )
+  )
+
+  val state = _state.onStart {
+    hasMore.value = true
+    loadMoreUpdates()
+  }.stateIn(
+    scope = viewModelScope,
+    started = WhileSubscribed(5_000),
+    initialValue = _state.value
+  )
+
+  private suspend fun loadMoreUpdates() {
+    if (!hasMore.value) {
+      return
+    }
+
+    val updateConfiguration = appService.applicationInfo as? ApplicationInfo.Updates
+    if (updateConfiguration == null) {
+      return
+    }
+
+    _state.value = _state.value.copy(isLoading = true)
+
+    val appId = updateConfiguration.appId
+    val runtimeVersion = updateConfiguration.runtimeVersion
+    val limit = 50
+
+    val updates = apolloClientService.fetchUpdates(
+      appId = appId,
+      branchName = branchName,
+      limit = limit,
+      offset = _state.value.updates.size
+    )
+
+    val uiUpdates = updates.data?.app?.byId?.updateBranchByName?.updates?.map { update ->
+      Update(
+        id = update.id,
+        name = update.message ?: "No message",
+        createdAt = update.createdAt as? String,
+        isCompatible = update.runtimeVersion == runtimeVersion,
+        permalink = update.manifestPermalink
+      )
+    } ?: emptyList()
+
+    hasMore.value = uiUpdates.size == limit
+
+    _state.value = _state.value.copy(
+      updates = _state.value.updates + uiUpdates,
+      isLoading = false
+    )
+  }
+
+  fun onAction(action: BranchAction) {
+    when (action) {
+      BranchAction.LoadMoreUpdates -> viewModelScope.launch { loadMoreUpdates() }
+      is BranchAction.OpenUpdate -> {
+        launcher.coroutineScope.launch {
+          launcher.loadApp(
+            formatUpdateUrl(action.update.permalink, action.update.name)
+          )
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,113 @@
+package expo.modules.devlauncher.compose.models
+
+import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import expo.modules.devlauncher.compose.Branch
+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.inject
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted.Companion.WhileSubscribed
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+
+sealed interface BranchesAction {
+  object LoadMoreBranches : BranchesAction
+  class OpenBranch(val branchName: String) : BranchesAction
+}
+
+data class BranchesState(
+  val branches: List<Branch> = emptyList(),
+  val isLoading: Boolean = false
+)
+
+class BranchesViewModel : ViewModel() {
+  private val apolloClientService = inject<ApolloClientService>()
+  private val appService = inject<AppService>()
+
+  private val hasMore = mutableStateOf(true)
+
+  val areUpdatesConfigured get() = appService.applicationInfo is ApplicationInfo.Updates
+
+  private var _state = MutableStateFlow(
+    BranchesState(
+      branches = emptyList(),
+      isLoading = areUpdatesConfigured
+    )
+  )
+
+  val state = _state.onStart {
+    if (areUpdatesConfigured) {
+      hasMore.value = true
+      loadMoreBranches()
+    }
+  }.stateIn(
+    scope = viewModelScope,
+    started = WhileSubscribed(5_000),
+    initialValue = _state.value
+  )
+
+  private suspend fun loadMoreBranches() {
+    val updateConfiguration = appService.applicationInfo as? ApplicationInfo.Updates
+
+    // If the app is not configured for updates, we don't need to fetch branches.
+    if (updateConfiguration == null || !hasMore.value) {
+      return
+    }
+
+    val appId = updateConfiguration.appId
+    val runtimeVersion = updateConfiguration.runtimeVersion
+    val limit = 50
+
+    val branches = if (runtimeVersion != null) {
+      apolloClientService.fetchBranches(
+        appId = appId,
+        runtimeVersion = runtimeVersion,
+        offset = _state.value.branches.size,
+        limit = limit
+      ).data?.app?.byId?.updateBranches?.map { updateBranch ->
+        Branch(
+          name = updateBranch.name,
+          compatibleUpdate = updateBranch.compatibleUpdates.firstOrNull()?.let { update ->
+            Update(
+              id = update.id,
+              name = update.message ?: "No message",
+              createdAt = update.createdAt as? String,
+              isCompatible = true,
+              permalink = update.manifestPermalink
+            )
+          }
+        )
+      }
+    } else {
+      apolloClientService.fetchBranches(
+        appId = appId,
+        offset = _state.value.branches.size,
+        limit = limit
+      ).data?.app?.byId?.updateBranches?.map { updateBranch ->
+        Branch(
+          name = updateBranch.name,
+          compatibleUpdate = null
+        )
+      }
+    } ?: emptyList()
+
+    hasMore.value = branches.size == limit
+
+    _state.value = _state.value.copy(
+      isLoading = false,
+      branches = _state.value.branches + branches
+    )
+  }
+
+  fun onAction(action: BranchesAction) {
+    when (action) {
+      BranchesAction.LoadMoreBranches -> viewModelScope.launch { loadMoreBranches() }
+      is BranchesAction.OpenBranch -> throw IllegalStateException("Opening branches should be handled in the screen, not in the ViewModel.")
+    }
+  }
+}

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

@@ -0,0 +1,50 @@
+package expo.modules.devlauncher.compose.models
+
+import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.ViewModel
+import com.facebook.react.ReactActivity
+import expo.modules.devlauncher.DevLauncherController
+import expo.modules.devlauncher.launcher.errors.DevLauncherAppError
+import expo.modules.devlauncher.services.inject
+import kotlinx.coroutines.launch
+
+sealed interface ErrorAction {
+  object Reload : ErrorAction
+  object GoToHome : ErrorAction
+}
+
+class ErrorViewModel() : ViewModel() {
+  private val devLauncher = inject<DevLauncherController>()
+
+  private val _appError = mutableStateOf<DevLauncherAppError?>(null)
+
+  val appError
+    get() = _appError.value
+
+  fun setError(error: DevLauncherAppError) {
+    _appError.value = error
+  }
+
+  fun onAction(action: ErrorAction) {
+    when (action) {
+      is ErrorAction.Reload -> {
+        val appUrl = devLauncher.latestLoadedApp
+
+        if (appUrl == null) {
+          devLauncher.navigateToLauncher()
+          return
+        }
+
+        devLauncher.coroutineScope.launch {
+          devLauncher
+            .loadApp(
+              appUrl,
+              devLauncher.appHost.currentReactContext?.currentActivity as? ReactActivity?
+            )
+        }
+      }
+
+      is ErrorAction.GoToHome -> devLauncher.navigateToLauncher()
+    }
+  }
+}

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

@@ -1,24 +1,22 @@
 package expo.modules.devlauncher.compose.models
 
-import android.util.Log
+import android.content.Context
 import androidx.compose.runtime.mutableStateOf
 import androidx.core.net.toUri
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.google.mlkit.vision.barcode.common.Barcode
+import com.google.mlkit.vision.codescanner.GmsBarcodeScannerOptions
+import com.google.mlkit.vision.codescanner.GmsBarcodeScanning
 import expo.modules.devlauncher.DevLauncherController
-import expo.modules.devlauncher.MeQuery
 import expo.modules.devlauncher.launcher.DevLauncherAppEntry
 import expo.modules.devlauncher.launcher.errors.DevLauncherErrorInstance
-import expo.modules.devlauncher.services.AppService
 import expo.modules.devlauncher.services.ErrorRegistryService
 import expo.modules.devlauncher.services.PackagerInfo
 import expo.modules.devlauncher.services.PackagerService
-import expo.modules.devlauncher.services.SessionService
-import expo.modules.devlauncher.services.UserState
 import expo.modules.devlauncher.services.inject
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.launch
 
 sealed interface HomeAction {
@@ -26,32 +24,26 @@ sealed interface HomeAction {
   object RefetchRunningApps : HomeAction
   object ResetRecentlyOpenedApps : HomeAction
   class NavigateToCrashReport(val crashReport: DevLauncherErrorInstance) : HomeAction
+  object ScanQRCode : HomeAction
+  object ClearLoadingError : HomeAction
 }
 
 data class HomeState(
-  val appName: String = "Unknown App",
   val runningPackagers: Set<PackagerInfo> = emptySet(),
   val isFetchingPackagers: Boolean = false,
-  val currentAccount: MeQuery.Account? = null,
   val recentlyOpenedApps: List<DevLauncherAppEntry> = emptyList(),
-  val crashReport: DevLauncherErrorInstance? = null
+  val crashReport: DevLauncherErrorInstance? = null,
+  val loadingError: String? = null
 )
 
 class HomeViewModel() : ViewModel() {
   val devLauncherController = inject<DevLauncherController>()
-  val sessionService = inject<SessionService>()
   val packagerService = inject<PackagerService>()
-  val appService = inject<AppService>()
   val errorRegistryService = inject<ErrorRegistryService>()
 
   private var _state = mutableStateOf(
     HomeState(
-      appName = appService.applicationInfo.appName,
       runningPackagers = packagerService.runningPackagers.value,
-      currentAccount = when (val userState = sessionService.user.value) {
-        UserState.Fetching, UserState.LoggedOut -> null
-        is UserState.LoggedIn -> userState.selectedAccount
-      },
       recentlyOpenedApps = devLauncherController.getRecentlyOpenedApps(),
       crashReport = errorRegistryService.consumeException()
     )
@@ -70,18 +62,6 @@ class HomeViewModel() : ViewModel() {
       }
       .launchIn(viewModelScope)
 
-    sessionService.user.onEach { newUser ->
-      when (newUser) {
-        UserState.Fetching, UserState.LoggedOut -> _state.value = _state.value.copy(
-          currentAccount = null
-        )
-
-        is UserState.LoggedIn -> _state.value = _state.value.copy(
-          currentAccount = newUser.selectedAccount
-        )
-      }
-    }.launchIn(viewModelScope)
-
     packagerService.isLoading.onEach { isLoading ->
       _state.value = _state.value.copy(
         isFetchingPackagers = isLoading
@@ -96,7 +76,9 @@ class HomeViewModel() : ViewModel() {
           try {
             devLauncherController.loadApp(action.url.toUri(), mainActivity = null)
           } catch (e: Exception) {
-            Log.e("DevLauncher", "Failed to open app: ${action.url}", e)
+            _state.value = _state.value.copy(
+              loadingError = e.message ?: "Unknown error"
+            )
           }
         }
 
@@ -107,7 +89,32 @@ class HomeViewModel() : ViewModel() {
         _state.value = _state.value.copy(recentlyOpenedApps = emptyList())
       }
 
+      is HomeAction.ClearLoadingError -> _state.value = _state.value.copy(loadingError = null)
+
       is HomeAction.NavigateToCrashReport -> IllegalStateException("Navigation action should be handled by the UI layer, not the ViewModel.")
+
+      is HomeAction.ScanQRCode -> IllegalStateException("QR code scanning should be handled by the UI layer, not the ViewModel.")
     }
   }
+
+  fun scanQRCode(context: Context, onResult: (String) -> Unit, onError: (String) -> Unit) {
+    val options = GmsBarcodeScannerOptions.Builder()
+      .setBarcodeFormats(Barcode.FORMAT_QR_CODE)
+      .build()
+
+    val scanner = GmsBarcodeScanning.getClient(context, options)
+
+    scanner.startScan()
+      .addOnSuccessListener { barcode ->
+        barcode.rawValue?.let {
+          onResult(it)
+        } ?: onError("No QR code data found")
+      }
+      .addOnCanceledListener {
+        onError("Scanning cancelled")
+      }
+      .addOnFailureListener { exception ->
+        onError("Scanning failed: ${exception.message ?: "Unknown error"}")
+      }
+  }
 }

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

@@ -13,7 +13,9 @@ data class SettingsState(
   val isShakeEnable: Boolean = true,
   val isThreeFingerLongPressEnable: Boolean = true,
   val isKeyCommandEnabled: Boolean = true,
-  val applicationInfo: ApplicationInfo? = null
+  val applicationInfo: ApplicationInfo? = null,
+  // TODO @behenate - make true the default for VR
+  val showFabAtLaunch: Boolean = false
 )
 
 sealed interface SettingsAction {
@@ -21,6 +23,7 @@ sealed interface SettingsAction {
   data class ToggleShakeEnable(val newValue: Boolean) : SettingsAction
   data class ToggleThreeFingerLongPressEnable(val newValue: Boolean) : SettingsAction
   data class ToggleKeyCommandEnable(val newValue: Boolean) : SettingsAction
+  data class ToggleShowFabAtLaunch(val newValue: Boolean) : SettingsAction
 }
 
 class SettingsViewModel(application: Application) : AndroidViewModel(application) {
@@ -33,7 +36,8 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application
       isShakeEnable = menuPreferences.motionGestureEnabled,
       isThreeFingerLongPressEnable = menuPreferences.touchGestureEnabled,
       isKeyCommandEnabled = menuPreferences.keyCommandsEnabled,
-      applicationInfo = appService.applicationInfo
+      applicationInfo = appService.applicationInfo,
+      showFabAtLaunch = menuPreferences.showFab
     )
   )
 
@@ -45,7 +49,8 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application
       showMenuAtLaunch = menuPreferences.showsAtLaunch,
       isShakeEnable = menuPreferences.motionGestureEnabled,
       isThreeFingerLongPressEnable = menuPreferences.touchGestureEnabled,
-      isKeyCommandEnabled = menuPreferences.keyCommandsEnabled
+      isKeyCommandEnabled = menuPreferences.keyCommandsEnabled,
+      showFabAtLaunch = menuPreferences.showFab
     )
   }
 
@@ -75,6 +80,10 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application
       is SettingsAction.ToggleKeyCommandEnable -> {
         menuPreferences.keyCommandsEnabled = action.newValue
       }
+
+      is SettingsAction.ToggleShowFabAtLaunch -> {
+        menuPreferences.showFab = action.newValue
+      }
     }
   }
 }

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

@@ -20,9 +20,9 @@ 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 com.composables.core.Icon
+import expo.modules.devlauncher.R
+import expo.modules.devmenu.compose.primitives.DayNighIcon
 import expo.modules.devmenu.compose.primitives.Text
 import expo.modules.devmenu.compose.theme.Theme
 
@@ -52,11 +52,12 @@ fun Accordion(
           modifier = Modifier
             .padding(Theme.spacing.medium)
         ) {
-          Icon(
-            painter = painterResource(expo.modules.devmenu.R.drawable._expodevclientcomponents_assets_chevronrighticon),
+          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(

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

@@ -8,7 +8,6 @@ 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
@@ -20,7 +19,7 @@ fun AsyncImage(
 ) {
   val imageLoaderService = inject<ImageLoaderService>()
   val scope = rememberCoroutineScope()
-  var imageBitmap by remember { mutableStateOf<ImageBitmap?>(null) }
+  var imageBitmap by remember { mutableStateOf(imageLoaderService.loadFromMemory(url)?.asImageBitmap()) }
 
   LaunchedEffect(url) {
     scope.launch {