expo-dev-launcher 6.0.7 → 6.0.8

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

@@ -0,0 +1,220 @@
+package expo.modules.devlauncher.compose.ui
+
+import androidx.compose.foundation.layout.size
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.Dp
+import com.composeunstyled.Icon
+import expo.modules.devlauncher.R
+
+object LauncherIcons {
+  @Composable
+  fun Plus(
+    size: Dp,
+    tint: Color,
+    modifier: Modifier = Modifier
+  ) {
+    Icon(
+      painter = painterResource(R.drawable.plus),
+      contentDescription = "Plus",
+      tint = tint,
+      modifier = Modifier
+        .size(size)
+        .then(modifier)
+    )
+  }
+
+  @Composable
+  fun ExpoLogo(
+    size: Dp,
+    tint: Color,
+    modifier: Modifier = Modifier
+  ) {
+    Icon(
+      painter = painterResource(R.drawable.expo_logo),
+      contentDescription = "Expo Logo",
+      tint = tint,
+      modifier = Modifier
+        .size(size)
+        .then(modifier)
+    )
+  }
+
+  @Composable
+  fun ShowAtLaunch(
+    size: Dp,
+    tint: Color,
+    modifier: Modifier = Modifier
+  ) {
+    Icon(
+      painter = painterResource(R.drawable.show_at_launch),
+      contentDescription = "Show at launch",
+      tint = tint,
+      modifier = Modifier
+        .size(size)
+        .then(modifier)
+    )
+  }
+
+  @Composable
+  fun Settings(
+    size: Dp,
+    tint: Color,
+    modifier: Modifier = Modifier
+  ) {
+    Icon(
+      painter = painterResource(R.drawable.settings),
+      contentDescription = "Settings",
+      tint = tint,
+      modifier = Modifier
+        .size(size)
+        .then(modifier)
+    )
+  }
+
+  @Composable
+  fun User(
+    size: Dp,
+    tint: Color,
+    modifier: Modifier = Modifier
+  ) {
+    Icon(
+      painter = painterResource(R.drawable.user),
+      contentDescription = "User",
+      tint = tint,
+      modifier = Modifier
+        .size(size)
+        .then(modifier)
+    )
+  }
+
+  @Composable
+  fun CheckCircle(
+    size: Dp,
+    tint: Color,
+    modifier: Modifier = Modifier
+  ) {
+    Icon(
+      painter = painterResource(R.drawable.check_circle),
+      contentDescription = "Check",
+      tint = tint,
+      modifier = Modifier
+        .size(size)
+        .then(modifier)
+    )
+  }
+
+  @Composable
+  fun UpdatesNav(
+    size: Dp,
+    tint: Color,
+    modifier: Modifier = Modifier
+  ) {
+    Icon(
+      painter = painterResource(R.drawable.updates_nav),
+      contentDescription = "Updates",
+      tint = tint,
+      modifier = Modifier
+        .size(size)
+        .then(modifier)
+    )
+  }
+
+  @Composable
+  fun Updates(
+    size: Dp,
+    tint: Color,
+    modifier: Modifier = Modifier
+  ) {
+    Icon(
+      painter = painterResource(R.drawable.update_icon),
+      contentDescription = "Updates",
+      tint = tint,
+      modifier = Modifier
+        .size(size)
+        .then(modifier)
+    )
+  }
+
+  @Composable
+  fun Home(
+    size: Dp,
+    tint: Color,
+    modifier: Modifier = Modifier
+  ) {
+    Icon(
+      painter = painterResource(R.drawable.home),
+      contentDescription = "Home",
+      tint = tint,
+      modifier = Modifier
+        .size(size)
+        .then(modifier)
+    )
+  }
+
+  @Composable
+  fun Download(
+    size: Dp,
+    tint: Color,
+    modifier: Modifier = Modifier
+  ) {
+    Icon(
+      painter = painterResource(R.drawable.download),
+      contentDescription = "Download",
+      tint = tint,
+      modifier = Modifier
+        .size(size)
+        .then(modifier)
+    )
+  }
+
+  @Composable
+  fun Scan(
+    size: Dp,
+    tint: Color,
+    modifier: Modifier = Modifier
+  ) {
+    Icon(
+      painter = painterResource(R.drawable.scan),
+      contentDescription = "Scan",
+      tint = tint,
+      modifier = Modifier
+        .size(size)
+        .then(modifier)
+    )
+  }
+
+  @Composable
+  fun Chevron(
+    size: Dp,
+    tint: Color,
+    modifier: Modifier = Modifier
+  ) {
+    Icon(
+      painter = painterResource(R.drawable.chevron_right),
+      contentDescription = "Chevron",
+      tint = tint,
+      modifier = Modifier
+        .size(size)
+        .then(modifier)
+    )
+  }
+
+  @Composable
+  fun Branch(
+    size: Dp,
+    tint: Color,
+    modifier: Modifier = Modifier
+  ) {
+    Icon(
+      painter = painterResource(R.drawable.branch_icon),
+      contentDescription = "Branch",
+      tint = tint,
+      modifier = Modifier
+        .size(size)
+        .then(modifier)
+    )
+  }
+}

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

@@ -12,14 +12,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 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.devmenu.compose.fromHex
 import expo.modules.devmenu.compose.newtheme.NewAppTheme
 import expo.modules.devmenu.compose.primitives.NewText
@@ -91,12 +88,9 @@ fun RunningAppCard(
           }
         }
 
-        Icon(
-          painter = painterResource(R.drawable.chevron_right),
-          contentDescription = "Open app",
-          tint = NewAppTheme.colors.icon.quaternary,
-          modifier = Modifier
-            .size(20.dp)
+        LauncherIcons.Chevron(
+          size = 20.dp,
+          tint = NewAppTheme.colors.icon.quaternary
         )
       }
     }
@@ -109,6 +103,5 @@ fun RunningAppCardPreview() {
   RunningAppCard(
     appIp = "http://10.0.2.2:8081",
     appName = "Expo Dev Launcher"
-
   )
 }

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

@@ -4,16 +4,12 @@ import androidx.compose.foundation.layout.Arrangement
 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.res.painterResource
 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.models.HomeAction
 import expo.modules.devmenu.compose.newtheme.NewAppTheme
 import expo.modules.devmenu.compose.primitives.NewText
@@ -34,8 +30,8 @@ fun ScanQRCodeButton(
     ) {
       Row(
         horizontalArrangement = Arrangement.SpaceBetween,
-        verticalAlignment = Alignment.Companion.CenterVertically,
-        modifier = Modifier.Companion
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier
           .fillMaxWidth()
           .padding(NewAppTheme.spacing.`3`)
       ) {
@@ -43,12 +39,9 @@ fun ScanQRCodeButton(
           "Scan QR Code"
         )
 
-        Icon(
-          painter = painterResource(R.drawable.scan),
-          contentDescription = "Fetch development servers icon",
-          tint = NewAppTheme.colors.icon.quaternary,
-          modifier = Modifier
-            .size(20.dp)
+        LauncherIcons.Scan(
+          size = 20.dp,
+          tint = NewAppTheme.colors.icon.quaternary
         )
       }
     }

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

@@ -24,21 +24,12 @@ import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.core.net.toUri
 import com.composeunstyled.TextField
 import com.composeunstyled.TextInput
+import expo.modules.devlauncher.compose.utils.validateUrl
 import expo.modules.devmenu.compose.newtheme.NewAppTheme
 import expo.modules.devmenu.compose.primitives.NewText
 
-private fun validateUrl(url: String): Boolean {
-  return try {
-    val uri = url.toUri()
-    uri.scheme != null && uri.host != null
-  } catch (_: Throwable) {
-    false
-  }
-}
-
 @Composable
 fun ServerUrlInput(
   openApp: (url: String) -> Unit

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

@@ -0,0 +1,50 @@
+package expo.modules.devlauncher.compose.ui
+
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
+import expo.modules.devlauncher.compose.utils.horizontalScrollbar
+import expo.modules.devlauncher.compose.utils.verticalScrollbar
+import expo.modules.devmenu.compose.newtheme.NewAppTheme
+import expo.modules.devmenu.compose.primitives.NewText
+
+@Composable
+fun StackTrace(
+  stack: String,
+  modifier: Modifier = Modifier
+) {
+  val verticalScrollState = rememberScrollState()
+  val horizontalScrollState = rememberScrollState()
+  Box(
+    modifier = Modifier
+      .verticalScrollbar(verticalScrollState)
+      .horizontalScrollbar(horizontalScrollState)
+      .then(modifier)
+  ) {
+    Box(
+      Modifier
+        .verticalScroll(verticalScrollState)
+        .horizontalScroll(horizontalScrollState)
+
+    ) {
+      Box(modifier = Modifier.padding(horizontal = NewAppTheme.spacing.`4`)) {
+        NewText(
+          stack,
+          style = TextStyle.Default.merge(
+            lineHeight = 16.sp,
+            fontSize = 10.sp,
+            fontFamily = NewAppTheme.font.mono,
+            fontWeight = FontWeight.Light
+          )
+        )
+      }
+    }
+  }
+}

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

@@ -0,0 +1,65 @@
+package expo.modules.devlauncher.compose.utils
+
+import androidx.compose.foundation.ScrollState
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun Modifier.verticalScrollbar(
+  scrollState: ScrollState,
+  width: Dp = 6.dp,
+  scrollBarColor: Color = Color.LightGray,
+  endPadding: Float = 12f
+): Modifier {
+  return drawWithContent {
+    drawContent()
+
+    val viewportHeight = this.size.height
+    val totalContentHeight = scrollState.maxValue.toFloat() + viewportHeight
+    val scrollValue = scrollState.value.toFloat()
+
+    val scrollBarHeight =
+      (viewportHeight / totalContentHeight) * viewportHeight
+    val scrollBarStartOffset =
+      (scrollValue / totalContentHeight) * viewportHeight
+
+    drawRoundRect(
+      color = scrollBarColor,
+      topLeft = Offset(this.size.width - endPadding, scrollBarStartOffset),
+      size = Size(width.toPx(), scrollBarHeight)
+    )
+  }
+}
+
+@Composable
+fun Modifier.horizontalScrollbar(
+  scrollState: ScrollState,
+  width: Dp = 6.dp,
+  scrollBarColor: Color = Color.LightGray,
+  endPadding: Float = 12f
+): Modifier {
+  return drawWithContent {
+    drawContent()
+
+    val viewportWidth = this.size.width
+    val totalContentWidth = scrollState.maxValue.toFloat() + viewportWidth
+    val scrollValue = scrollState.value.toFloat()
+
+    val scrollBarHeight =
+      (viewportWidth / totalContentWidth) * viewportWidth
+    val scrollBarStartOffset =
+      (scrollValue / totalContentWidth) * viewportWidth
+
+    drawRoundRect(
+      color = scrollBarColor,
+      topLeft = Offset(scrollBarStartOffset, this.size.height - endPadding),
+      size = Size(scrollBarHeight, width.toPx())
+    )
+  }
+}

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

@@ -0,0 +1,12 @@
+package expo.modules.devlauncher.compose.utils
+
+import androidx.core.net.toUri
+
+fun validateUrl(url: String): Boolean {
+  return try {
+    val uri = url.toUri()
+    uri.scheme != null && uri.host != null
+  } catch (_: Throwable) {
+    false
+  }
+}

package/android/src/main/res/values/colors.xml

@@ -9,7 +9,4 @@
   <color name="dev_launcher_colorPrimaryDark">#011A2D</color>
 
   <color name="dev_launcher_colorAccentDark">#FFFFFF</color>
-
-  <color name="dev_launcher_errorLogButton">#66FFFFFF</color>
-  <color name="dev_launcher_errorMessage">#FF0000</color>
 </resources>

package/ios/SwiftUI/GraphQL/APIClient.swift

@@ -6,11 +6,7 @@ class APIClient {
   static let shared = APIClient()
 
   private var useStaging: Bool {
-#if DEBUG
-    return true
-#else
     return false
-#endif
   }
 
   private var session: URLSession {

package/ios/SwiftUI/UpdatesTab/UpdateRow.swift

@@ -22,7 +22,9 @@ struct UpdateRow: View {
         openButton
       }
     }
-    .padding(.vertical, 4)
+    .padding()
+    .background(Color.expoSecondarySystemBackground)
+    .cornerRadius(12)
   }
 
   private var openButton: some View {

package/ios/SwiftUI/UpdatesTab/UpdatesListView.swift

@@ -12,20 +12,20 @@ struct UpdatesListView: View {
   @State private var errorMessage: String?
 
   var body: some View {
-    List {
-      Section {
-        HStack {
-          Toggle("Compatible only", isOn: $filterByCompatibility)
-          Spacer()
-          Button(sortByRecency ? "Newest first" : "Oldest first") {
-            sortByRecency.toggle()
-            applyFilters()
-          }
-          .font(.caption)
-          .foregroundColor(.blue)
+    VStack(spacing: 20) {
+      HStack {
+        Toggle("Compatible only", isOn: $filterByCompatibility)
+        Spacer()
+        Button(sortByRecency ? "Newest first" : "Oldest first") {
+          sortByRecency.toggle()
+          applyFilters()
         }
-        .padding(.vertical, 4)
+        .font(.caption)
+        .foregroundColor(.blue)
       }
+      .padding()
+      .background(Color.expoSecondarySystemBackground)
+      .cornerRadius(12)
 
       if isLoading {
         loading
@@ -34,14 +34,17 @@ struct UpdatesListView: View {
       } else if filteredUpdates.isEmpty {
         emptyUpdates
       } else {
-        Section("Updates (\(filteredUpdates.count))") {
+        LazyVStack(alignment: .leading) {
+          Text("Updates (\(filteredUpdates.count))".uppercased())
+            .font(.caption)
+            .foregroundColor(.primary.opacity(0.6))
           ForEach(filteredUpdates, id: \.update.id) { tuple in
             UpdateRow(update: tuple.update, branchName: tuple.branchName, isCompatible: viewModel.isCompatibleRuntime(tuple.update.runtimeVersion))
           }
         }
       }
     }
-    .background(Color.expoSystemGroupedBackground)
+    .padding()
     .onChange(of: filterByCompatibility) { _ in
       applyFilters()
     }
@@ -136,40 +139,36 @@ struct UpdatesListView: View {
   }
 
   private var loading: some View {
-    Section {
-      HStack {
-        Spacer()
-        ProgressView()
-          .scaleEffect(1.2)
-        Spacer()
-      }
-      .padding()
+    HStack {
+      Spacer()
+      ProgressView()
+        .scaleEffect(1.2)
+      Spacer()
     }
+    .padding()
   }
 
   @ViewBuilder
   func createError(message: String) -> some View {
-    Section {
-      VStack(spacing: 12) {
-        Image(systemName: "exclamationmark.triangle")
-          .foregroundColor(.red)
-          .font(.title2)
+    VStack(spacing: 12) {
+      Image(systemName: "exclamationmark.triangle")
+        .foregroundColor(.red)
+        .font(.title2)
 
-        Text("Error loading updates")
-          .font(.headline)
+      Text("Error loading updates")
+        .font(.headline)
 
-        Text(message)
-          .font(.caption)
-          .foregroundStyle(.secondary)
-          .multilineTextAlignment(.center)
+      Text(message)
+        .font(.caption)
+        .foregroundStyle(.secondary)
+        .multilineTextAlignment(.center)
 
-        Button("Retry") {
-          loadBranches()
-        }
-        .buttonStyle(.borderedProminent)
+      Button("Retry") {
+        loadBranches()
       }
-      .padding()
+      .buttonStyle(.borderedProminent)
     }
+    .padding()
   }
 
   private var emptyUpdates: some View {

package/ios/SwiftUI/UpdatesTab/UpdatesTabView.swift

@@ -9,13 +9,15 @@ struct UpdatesTabView: View {
     VStack(spacing: 0) {
       DevLauncherNavigationHeader()
 
-      if !viewModel.isLoggedIn {
-        NotSignedInView()
-          .padding()
-      } else if !viewModel.structuredBuildInfo.usesEASUpdates {
-        NotUsingUpdatesView()
-      } else {
-        UpdatesListView()
+      ScrollView {
+        if !viewModel.isLoggedIn {
+          NotSignedInView()
+            .padding()
+        } else if !viewModel.structuredBuildInfo.usesEASUpdates {
+          NotUsingUpdatesView()
+        } else {
+          UpdatesListView()
+        }
       }
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-dev-launcher",
   "title": "Expo Development Launcher",
-  "version": "6.0.7",
+  "version": "6.0.8",
   "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.6",
-    "expo-manifests": "~1.0.5"
+    "expo-dev-menu": "7.0.7",
+    "expo-manifests": "~1.0.6"
   },
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "5e15f3a5d68bc213ad36d59113d725fdea4f3411"
+  "gitHead": "1dafdaa317c182191909a94a355c8b08a2654783"
 }