miaoda-expo-dev-launcher-55 0.1.21 → 0.1.22
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.
- package/android/src/debug/java/expo/modules/devlauncher/compose/screens/ErrorScreen.kt +8 -7
- package/android/src/debug/java/expo/modules/devlauncher/compose/ui/DevLauncherPromptCopy.kt +6 -4
- package/ios/SwiftUI/CrashReportView.swift +2 -1
- package/ios/SwiftUI/DevLauncherPromptCopy.swift +7 -5
- package/ios/SwiftUI/DevLauncherViews.swift +2 -1
- package/ios/SwiftUI/ErrorView.swift +2 -1
- package/package.json +1 -1
|
@@ -103,13 +103,7 @@ fun ErrorScreen(
|
|
|
103
103
|
.fillMaxWidth()
|
|
104
104
|
.padding(top = NewAppTheme.spacing.`4`)
|
|
105
105
|
) {
|
|
106
|
-
|
|
107
|
-
DevLauncherPromptCopy.CANCEL_BUTTON_TITLE,
|
|
108
|
-
foreground = NewAppTheme.colors.buttons.secondary.foreground,
|
|
109
|
-
background = NewAppTheme.colors.buttons.secondary.background,
|
|
110
|
-
onClick = { onAction(ErrorAction.CancelCopy) },
|
|
111
|
-
modifier = Modifier.weight(1f)
|
|
112
|
-
)
|
|
106
|
+
// 「仍要复制」在左、「取消」在右。
|
|
113
107
|
ActionButton(
|
|
114
108
|
DevLauncherPromptCopy.COPY_CONFIRM_BUTTON_TITLE,
|
|
115
109
|
foreground = NewAppTheme.colors.buttons.primary.foreground,
|
|
@@ -117,6 +111,13 @@ fun ErrorScreen(
|
|
|
117
111
|
onClick = { onAction(ErrorAction.ConfirmCopy) },
|
|
118
112
|
modifier = Modifier.weight(1f)
|
|
119
113
|
)
|
|
114
|
+
ActionButton(
|
|
115
|
+
DevLauncherPromptCopy.CANCEL_BUTTON_TITLE,
|
|
116
|
+
foreground = NewAppTheme.colors.buttons.secondary.foreground,
|
|
117
|
+
background = NewAppTheme.colors.buttons.secondary.background,
|
|
118
|
+
onClick = { onAction(ErrorAction.CancelCopy) },
|
|
119
|
+
modifier = Modifier.weight(1f)
|
|
120
|
+
)
|
|
120
121
|
}
|
|
121
122
|
}
|
|
122
123
|
}
|
|
@@ -30,9 +30,11 @@ object DevLauncherPromptCopy {
|
|
|
30
30
|
const val CANCEL_BUTTON_TITLE: String = "取消"
|
|
31
31
|
const val COPY_RETRY_BUTTON_TITLE: String = "重试"
|
|
32
32
|
|
|
33
|
-
//
|
|
34
|
-
|
|
35
|
-
const val
|
|
36
|
-
val
|
|
33
|
+
// 能力问题(复制错误前系统弹窗)。复制专用正文不复用 INCOMPATIBLE_BODY(其「强制加载」
|
|
34
|
+
// 只适用于加载前的提示),也不展示缺失模块等原因列表。
|
|
35
|
+
const val COPY_INCOMPATIBLE_BODY: String = "当前调试包不支持部分新增能力,建议前往电脑端重新构建并安装新的调试包。"
|
|
36
|
+
const val COPY_CONFIRM_QUESTION: String = "确定还要复制报错吗?"
|
|
37
|
+
const val COPY_CONFIRM_BUTTON_TITLE: String = "仍要复制"
|
|
38
|
+
val COPY_INCOMPATIBLE_MESSAGE: String = COPY_INCOMPATIBLE_BODY + COPY_CONFIRM_QUESTION
|
|
37
39
|
val COPY_UNKNOWN_MESSAGE: String = UNKNOWN_BODY + COPY_CONFIRM_QUESTION
|
|
38
40
|
}
|
|
@@ -50,10 +50,11 @@ struct CrashReportView: View {
|
|
|
50
50
|
.navigationBarHidden(true)
|
|
51
51
|
#endif
|
|
52
52
|
.alert(DevLauncherPromptCopy.incompatibleTitle, isPresented: $copyState.showingWarning) {
|
|
53
|
+
// 「仍要复制」在左、「取消」在右:系统会把 cancel 角色的按钮固定在左侧,这里不设角色,按声明顺序展示。
|
|
53
54
|
Button(DevLauncherPromptCopy.copyConfirmButtonTitle) {
|
|
54
55
|
copyState.copyConfirmed()
|
|
55
56
|
}
|
|
56
|
-
Button(DevLauncherPromptCopy.cancelButtonTitle
|
|
57
|
+
Button(DevLauncherPromptCopy.cancelButtonTitle) { copyState.invalidate() }
|
|
57
58
|
} message: {
|
|
58
59
|
Text(DevLauncherPromptCopy.copyIncompatibleMessage)
|
|
59
60
|
}
|
|
@@ -48,13 +48,15 @@ enum DevLauncherPromptCopy {
|
|
|
48
48
|
|
|
49
49
|
// MARK: - 能力问题(复制错误前系统弹窗)
|
|
50
50
|
|
|
51
|
-
///
|
|
52
|
-
static let
|
|
51
|
+
/// 复制确认弹窗专用正文:不复用 incompatibleBody(其「强制加载」只适用于加载前的提示)。
|
|
52
|
+
static let copyIncompatibleBody = "当前调试包不支持部分新增能力,建议前往电脑端重新构建并安装新的调试包。"
|
|
53
|
+
/// 复制确认弹窗正文后追加的提问。
|
|
54
|
+
static let copyConfirmQuestion = "确定还要复制报错吗?"
|
|
53
55
|
/// 复制确认弹窗的确认按钮。
|
|
54
|
-
static let copyConfirmButtonTitle = "
|
|
56
|
+
static let copyConfirmButtonTitle = "仍要复制"
|
|
55
57
|
|
|
56
|
-
/// 复制确认弹窗正文(incompatible
|
|
57
|
-
static var copyIncompatibleMessage: String {
|
|
58
|
+
/// 复制确认弹窗正文(incompatible):复制专用正文 + 提问,不展示缺失模块等原因列表。
|
|
59
|
+
static var copyIncompatibleMessage: String { copyIncompatibleBody + copyConfirmQuestion }
|
|
58
60
|
/// 复制确认弹窗正文(unknown):统一正文 + 提问。
|
|
59
61
|
static var copyUnknownMessage: String { unknownBody + copyConfirmQuestion }
|
|
60
62
|
}
|
|
@@ -163,10 +163,11 @@ public struct DevLauncherRootView: View {
|
|
|
163
163
|
Text(viewModel.errorAlertMessage)
|
|
164
164
|
}
|
|
165
165
|
.alert(DevLauncherPromptCopy.incompatibleTitle, isPresented: $viewModel.showingCompatibilityCopyAlert) {
|
|
166
|
+
// 「仍要复制」在左、「取消」在右:系统会把 cancel 角色的按钮固定在左侧,这里不设角色,按声明顺序展示。
|
|
166
167
|
Button(DevLauncherPromptCopy.copyConfirmButtonTitle) {
|
|
167
168
|
viewModel.copyPendingError()
|
|
168
169
|
}
|
|
169
|
-
Button(DevLauncherPromptCopy.cancelButtonTitle
|
|
170
|
+
Button(DevLauncherPromptCopy.cancelButtonTitle) { viewModel.cancelErrorCopy() }
|
|
170
171
|
} message: {
|
|
171
172
|
Text(DevLauncherPromptCopy.copyIncompatibleMessage)
|
|
172
173
|
}
|
|
@@ -55,10 +55,11 @@ struct ErrorView: View {
|
|
|
55
55
|
.navigationBarHidden(true)
|
|
56
56
|
#endif
|
|
57
57
|
.alert(DevLauncherPromptCopy.incompatibleTitle, isPresented: $copyState.showingWarning) {
|
|
58
|
+
// 「仍要复制」在左、「取消」在右:系统会把 cancel 角色的按钮固定在左侧,这里不设角色,按声明顺序展示。
|
|
58
59
|
Button(DevLauncherPromptCopy.copyConfirmButtonTitle) {
|
|
59
60
|
copyState.copyConfirmed()
|
|
60
61
|
}
|
|
61
|
-
Button(DevLauncherPromptCopy.cancelButtonTitle
|
|
62
|
+
Button(DevLauncherPromptCopy.cancelButtonTitle) { copyState.invalidate() }
|
|
62
63
|
} message: {
|
|
63
64
|
Text(DevLauncherPromptCopy.copyIncompatibleMessage)
|
|
64
65
|
}
|
package/package.json
CHANGED