expo-dev-launcher 6.0.0 → 6.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (49) hide show
  1. package/CHANGELOG.md +10 -0
  2. package/android/build.gradle +3 -3
  3. package/android/src/debug/java/expo/modules/devlauncher/compose/BindingView.kt +4 -2
  4. package/android/src/debug/java/expo/modules/devlauncher/compose/DevLauncherBottomTabsNavigator.kt +4 -2
  5. package/android/src/debug/java/expo/modules/devlauncher/compose/models/BranchesViewModel.kt +57 -13
  6. package/android/src/debug/java/expo/modules/devlauncher/compose/primitives/Accordion.kt +40 -45
  7. package/android/src/debug/java/expo/modules/devlauncher/compose/routes/Profile.kt +98 -18
  8. package/android/src/debug/java/expo/modules/devlauncher/compose/routes/Updates.kt +3 -1
  9. package/android/src/debug/java/expo/modules/devlauncher/compose/screens/BranchScreen.kt +171 -146
  10. package/android/src/debug/java/expo/modules/devlauncher/compose/screens/BranchesScreen.kt +248 -150
  11. package/android/src/debug/java/expo/modules/devlauncher/compose/screens/CrashReportScreen.kt +75 -46
  12. package/android/src/debug/java/expo/modules/devlauncher/compose/screens/HomeScreen.kt +234 -238
  13. package/android/src/debug/java/expo/modules/devlauncher/compose/screens/NoUpdatesScreen.kt +52 -35
  14. package/android/src/debug/java/expo/modules/devlauncher/compose/screens/SettingsScreen.kt +246 -107
  15. package/android/src/debug/java/expo/modules/devlauncher/compose/ui/AccountAvatar.kt +17 -9
  16. package/android/src/debug/java/expo/modules/devlauncher/compose/ui/AccountSelector.kt +63 -46
  17. package/android/src/debug/java/expo/modules/devlauncher/compose/ui/ActionButton.kt +51 -3
  18. package/android/src/debug/java/expo/modules/devlauncher/compose/ui/AppHeader.kt +70 -44
  19. package/android/src/debug/java/expo/modules/devlauncher/compose/ui/BottomSheet.kt +42 -2
  20. package/android/src/debug/java/expo/modules/devlauncher/compose/ui/BottomTabBar.kt +14 -10
  21. package/android/src/debug/java/expo/modules/devlauncher/compose/ui/BottomTabButton.kt +46 -23
  22. package/android/src/debug/java/expo/modules/devlauncher/compose/ui/DevelopmentServerHelp.kt +23 -16
  23. package/android/src/debug/java/expo/modules/devlauncher/compose/ui/RunningAppCard.kt +65 -34
  24. package/android/src/debug/java/expo/modules/devlauncher/compose/ui/ScreenHeaderContainer.kt +0 -5
  25. package/android/src/debug/java/expo/modules/devlauncher/compose/ui/ServerUrlInput.kt +56 -17
  26. package/android/src/debug/java/expo/modules/devlauncher/compose/ui/SignUp.kt +20 -27
  27. package/android/src/main/res/drawable/arrow_right.xml +9 -0
  28. package/android/src/main/res/drawable/check_circle.xml +10 -0
  29. package/android/src/main/res/drawable/chevron_right.xml +10 -0
  30. package/android/src/main/res/drawable/copy.xml +13 -0
  31. package/android/src/main/res/drawable/expo_logo.xml +9 -0
  32. package/android/src/main/res/drawable/home.xml +10 -0
  33. package/android/src/main/res/drawable/inspect.xml +10 -0
  34. package/android/src/main/res/drawable/log_in.xml +12 -0
  35. package/android/src/main/res/drawable/pulse.xml +10 -0
  36. package/android/src/main/res/drawable/reload.xml +10 -0
  37. package/android/src/main/res/drawable/scan.xml +42 -0
  38. package/android/src/main/res/drawable/settings.xml +14 -0
  39. package/android/src/main/res/drawable/show_at_launch.xml +12 -0
  40. package/android/src/main/res/drawable/signal.xml +26 -0
  41. package/android/src/main/res/drawable/user.xml +13 -0
  42. package/ios/EXDevLauncherController.m +23 -4
  43. package/ios/SwiftUI/CrashReportView.swift +11 -3
  44. package/ios/SwiftUI/DevLauncherViews.swift +18 -2
  45. package/ios/SwiftUI/DevServersView.swift +2 -2
  46. package/ios/SwiftUI/HomeTabView.swift +4 -0
  47. package/ios/SwiftUI/Navigation/Navigation.swift +3 -0
  48. package/ios/SwiftUI/SettingsTabView.swift +4 -3
  49. package/package.json +4 -4
@@ -1,4 +1,5 @@
1
1
  // Copyright 2015-present 650 Industries. All rights reserved.
2
+ // swiftlint:disable closure_body_length
2
3
 
3
4
  import SwiftUI
4
5
  import React
@@ -35,7 +36,9 @@ struct CrashReportView: View {
35
36
  }
36
37
  .padding()
37
38
  }
39
+ #if !os(tvOS)
38
40
  .background(Color(.systemBackground))
41
+ #endif
39
42
  .navigationBarHidden(true)
40
43
  }
41
44
 
@@ -108,9 +111,9 @@ struct CrashReportView: View {
108
111
  .font(.system(.caption, design: .monospaced))
109
112
  .foregroundColor(.primary)
110
113
  .fixedSize(horizontal: true, vertical: false)
111
- #if !os(tvOS)
114
+ #if !os(tvOS)
112
115
  .textSelection(.enabled)
113
- #endif
116
+ #endif
114
117
  } else if let stack = error.stack, !stack.isEmpty {
115
118
  ForEach(Array(stack.enumerated()), id: \.offset) { _, frame in
116
119
  StackFrameView(frame: frame)
@@ -128,7 +131,9 @@ struct CrashReportView: View {
128
131
  .frame(maxWidth: .infinity, alignment: .leading)
129
132
  }
130
133
  .frame(maxHeight: 200)
134
+ #if !os(tvOS)
131
135
  .background(Color(.secondarySystemGroupedBackground))
136
+ #endif
132
137
  .cornerRadius(8)
133
138
  }
134
139
  .frame(maxWidth: .infinity, alignment: .leading)
@@ -146,7 +151,9 @@ struct CrashReportView: View {
146
151
  return nil
147
152
  }
148
153
  let file = frame.file ?? "Unknown file"
149
- return "\tat \(methodName) (\(file):\(frame.lineNumber):\(frame.column))"}.joined(separator: "\n")
154
+ return "\tat \(methodName) (\(file):\(frame.lineNumber):\(frame.column))"
155
+ }
156
+ .joined(separator: "\n")
150
157
  stackTrace = "\(stackString)"
151
158
  } else {
152
159
  stackTrace = "No stack trace available"
@@ -173,3 +180,4 @@ struct CrashReportView: View {
173
180
  return Date()
174
181
  }
175
182
  }
183
+ // swiftlint:enable closure_body_length
@@ -70,6 +70,22 @@ public struct DevLauncherRootView: View {
70
70
  struct RecentlyOpenedAppRow: View {
71
71
  let app: RecentlyOpenedApp
72
72
  let onTap: () -> Void
73
+ @EnvironmentObject var viewModel: DevLauncherViewModel
74
+
75
+ private var isServerActive: Bool {
76
+ guard let url = URL(string: app.url),
77
+ let port = url.port else {
78
+ return false
79
+ }
80
+
81
+ return viewModel.devServers.contains { server in
82
+ guard let serverURL = URL(string: server.url),
83
+ let serverPort = serverURL.port else {
84
+ return false
85
+ }
86
+ return serverPort == port
87
+ }
88
+ }
73
89
 
74
90
  var body: some View {
75
91
  Button {
@@ -77,7 +93,7 @@ struct RecentlyOpenedAppRow: View {
77
93
  } label: {
78
94
  HStack(alignment: .center) {
79
95
  Circle()
80
- .fill(Color.green)
96
+ .fill(isServerActive ? Color.green : Color.gray)
81
97
  .frame(width: 12, height: 12)
82
98
  VStack(alignment: .leading) {
83
99
  Text(app.name)
@@ -96,7 +112,7 @@ struct RecentlyOpenedAppRow: View {
96
112
  }
97
113
  .padding()
98
114
  #if !os(tvOS)
99
- .background(Color(.systemGroupedBackground))
115
+ .background(Color(.secondarySystemBackground))
100
116
  #endif
101
117
  .clipShape(RoundedRectangle(cornerRadius: 12))
102
118
  }
@@ -90,7 +90,7 @@ struct DevServersView: View {
90
90
  .animation(.easeInOut, value: showingURLInput)
91
91
  .padding()
92
92
  #if !os(tvOS)
93
- .background(Color(showingURLInput ? .systemGroupedBackground : .systemBackground))
93
+ .background(Color(showingURLInput ? .secondarySystemBackground : .systemBackground))
94
94
  #endif
95
95
  .clipShape(RoundedRectangle(cornerRadius: 12))
96
96
  }
@@ -173,7 +173,7 @@ struct DevServerRow: View {
173
173
  }
174
174
  .padding()
175
175
  #if !os(tvOS)
176
- .background(Color(.systemGroupedBackground))
176
+ .background(Color(.secondarySystemBackground))
177
177
  #endif
178
178
  .clipShape(RoundedRectangle(cornerRadius: 12))
179
179
  }
@@ -1,4 +1,5 @@
1
1
  // Copyright 2015-present 650 Industries. All rights reserved.
2
+ // swiftlint:disable closure_body_length
2
3
 
3
4
  import SwiftUI
4
5
 
@@ -64,7 +65,9 @@ struct HomeTabView: View {
64
65
  .padding()
65
66
  }
66
67
  .buttonStyle(PlainButtonStyle())
68
+ #if !os(tvOS)
67
69
  .background(Color(.secondarySystemGroupedBackground))
70
+ #endif
68
71
  .cornerRadius(18)
69
72
  }
70
73
  }
@@ -72,3 +75,4 @@ struct HomeTabView: View {
72
75
  #Preview {
73
76
  HomeTabView()
74
77
  }
78
+ // swiftlint:enable closure_body_length
@@ -1,3 +1,4 @@
1
+ // swiftlint:disable closure_body_length
1
2
  import SwiftUI
2
3
 
3
4
  class DevLauncherNavigation: ObservableObject {
@@ -129,3 +130,5 @@ struct DevLauncherNavigationHeader: View {
129
130
  }
130
131
  }
131
132
  }
133
+
134
+ // swiftlint:enable closure_body_length
@@ -2,6 +2,7 @@
2
2
 
3
3
  import SwiftUI
4
4
 
5
+ // swiftlint:disable:next line_length
5
6
  private let selectedGesturesInfoMessage = "Selected gestures will toggle the developer menu while inside a preview. The menu allows you to reload or return to home and exposes developer tools."
6
7
 
7
8
  struct SettingsTabView: View {
@@ -68,7 +69,7 @@ struct SettingsTabView: View {
68
69
  }
69
70
  .padding()
70
71
  #if !os(tvOS)
71
- .background(Color(.systemGroupedBackground))
72
+ .background(Color(.secondarySystemBackground))
72
73
  #endif
73
74
  .cornerRadius(12)
74
75
  }
@@ -80,7 +81,7 @@ struct SettingsTabView: View {
80
81
  Image(systemName: "gearshape")
81
82
  .resizable()
82
83
  .frame(width: 56, height: 56)
83
- .foregroundColor(.black.opacity(0.3))
84
+ .opacity(0.3)
84
85
 
85
86
  Text("Settings")
86
87
  .font(.title2)
@@ -118,7 +119,7 @@ struct SettingsTabView: View {
118
119
  .padding()
119
120
  }
120
121
  #if !os(tvOS)
121
- .background(Color(.systemGroupedBackground))
122
+ .background(Color(.secondarySystemBackground))
122
123
  #endif
123
124
  .cornerRadius(12)
124
125
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "expo-dev-launcher",
3
3
  "title": "Expo Development Launcher",
4
- "version": "6.0.0",
4
+ "version": "6.0.2",
5
5
  "description": "Pre-release version of the Expo development launcher package for testing.",
6
6
  "repository": {
7
7
  "type": "git",
@@ -15,11 +15,11 @@
15
15
  "license": "MIT",
16
16
  "homepage": "https://docs.expo.dev",
17
17
  "dependencies": {
18
- "expo-dev-menu": "7.0.0",
19
- "expo-manifests": "~1.0.0"
18
+ "expo-dev-menu": "7.0.2",
19
+ "expo-manifests": "~1.0.2"
20
20
  },
21
21
  "peerDependencies": {
22
22
  "expo": "*"
23
23
  },
24
- "gitHead": "cb7062e2c17d1fb09522834aaaac0e19b766df62"
24
+ "gitHead": "eaa9b645058cf2233fbb27bb21a19bc605c90a88"
25
25
  }