Merge nucleic/frosty-velvet-newt-dwmi into dev

This commit is contained in:
2026-07-13 01:39:49 -07:00
parent 80aca315e7
commit 5903f8ed14
2 changed files with 3 additions and 3 deletions
@@ -156,7 +156,6 @@ struct StartChatComposer: View {
.textFieldStyle(.plain) .textFieldStyle(.plain)
.lineLimit(1...5) .lineLimit(1...5)
.padding(.vertical, 3) .padding(.vertical, 3)
.orchestraGlow(active: MobileEfforts.isOrchestra(effort) && controlled)
.focused(focus) .focused(focus)
Button { Button {
if let project = selected { if let project = selected {
@@ -195,6 +194,7 @@ struct StartChatComposer: View {
.padding(.horizontal, 14) .padding(.horizontal, 14)
.padding(.vertical, 12) .padding(.vertical, 12)
.glassSurface(cornerRadius: 26) .glassSurface(cornerRadius: 26)
.orchestraGlow(active: MobileEfforts.isOrchestra(effort) && controlled, cornerRadius: 26)
// Prefill the base branch with the project's default so it actually appears (mirroring the // Prefill the base branch with the project's default so it actually appears (mirroring the
// Mac composer's `effectiveBranch`), rather than sitting as an empty placeholder. // Mac composer's `effectiveBranch`), rather than sitting as an empty placeholder.
.onAppear(perform: syncToProject) .onAppear(perform: syncToProject)
@@ -398,8 +398,8 @@ extension View {
/// composer no dismiss affordance (no Return key on a vertical/multiline field, nothing to /// composer no dismiss affordance (no Return key on a vertical/multiline field, nothing to
/// tap) and the keyboard stays up. See `KeyboardDismissable`. /// tap) and the keyboard stays up. See `KeyboardDismissable`.
func keyboardDismissable() -> some View { modifier(KeyboardDismissable()) } func keyboardDismissable() -> some View { modifier(KeyboardDismissable()) }
/// Wrap a composer field in the orchestra purple ring while `active` (mirrors the Mac's /// Wrap a composer in the orchestra gold ring while `active` (mirrors the Mac's animated
/// animated composer glow, lighter touch). /// composer glow, lighter touch).
func orchestraGlow(active: Bool, cornerRadius: CGFloat = 8) -> some View { func orchestraGlow(active: Bool, cornerRadius: CGFloat = 8) -> some View {
modifier(OrchestraGlowModifier(active: active, cornerRadius: cornerRadius)) modifier(OrchestraGlowModifier(active: active, cornerRadius: cornerRadius))
} }