2 Commits

Author SHA1 Message Date
d03b4c4dd7 ios: send from software keyboard 2026-05-02 16:39:39 -07:00
05989e9fae ios: line spacing 2026-05-02 16:32:32 -07:00
4 changed files with 279 additions and 21 deletions

View File

@@ -15,7 +15,7 @@ struct SybilChatTranscriptView: View {
var body: some View { var body: some View {
ScrollViewReader { proxy in ScrollViewReader { proxy in
ScrollView { ScrollView {
LazyVStack(alignment: .leading, spacing: 24) { LazyVStack(alignment: .leading, spacing: 26) {
if isLoading && messages.isEmpty { if isLoading && messages.isEmpty {
Text("Loading messages…") Text("Loading messages…")
.font(.sybil(.footnote)) .font(.sybil(.footnote))
@@ -113,13 +113,11 @@ private struct MessageBubble: View {
Markdown(message.content) Markdown(message.content)
.tint(SybilTheme.primary) .tint(SybilTheme.primary)
.foregroundStyle(isUser ? SybilTheme.text : SybilTheme.text.opacity(0.95)) .foregroundStyle(isUser ? SybilTheme.text : SybilTheme.text.opacity(0.95))
.markdownTextStyle { .markdownTheme(.sybilReadable)
FontSize(15)
}
} }
} }
.padding(.horizontal, isUser ? 14 : 2) .padding(.horizontal, isUser ? 14 : 2)
.padding(.vertical, isUser ? 11 : 2) .padding(.vertical, isUser ? 13 : 2)
.background( .background(
Group { Group {
if isUser { if isUser {
@@ -224,6 +222,7 @@ private struct ToolCallActivityChip: View {
Text(summary) Text(summary)
.font(.sybil(.subheadline)) .font(.sybil(.subheadline))
.foregroundStyle(isFailed ? SybilTheme.danger.opacity(0.96) : SybilTheme.text.opacity(0.94)) .foregroundStyle(isFailed ? SybilTheme.danger.opacity(0.96) : SybilTheme.text.opacity(0.94))
.lineSpacing(3)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
HStack(spacing: 6) { HStack(spacing: 6) {

View File

@@ -0,0 +1,164 @@
import MarkdownUI
import SwiftUI
@MainActor
extension Theme {
static let sybilReadable: Theme = {
SybilFontRegistry.registerIfNeeded()
return Theme()
.text {
FontFamily(.custom("Inter"))
FontSize(15)
}
.code {
FontFamilyVariant(.monospaced)
FontSize(.em(0.88))
BackgroundColor(SybilTheme.surfaceStrong.opacity(0.78))
}
.strong {
FontWeight(.semibold)
}
.link {
ForegroundColor(SybilTheme.accent)
}
.heading1 { configuration in
configuration.label
.fixedSize(horizontal: false, vertical: true)
.relativeLineSpacing(.em(0.18))
.markdownMargin(top: .em(1.1), bottom: .em(0.5))
.markdownTextStyle {
FontWeight(.semibold)
FontSize(.em(1.45))
}
}
.heading2 { configuration in
configuration.label
.fixedSize(horizontal: false, vertical: true)
.relativeLineSpacing(.em(0.18))
.markdownMargin(top: .em(1.0), bottom: .em(0.45))
.markdownTextStyle {
FontWeight(.semibold)
FontSize(.em(1.25))
}
}
.heading3 { configuration in
configuration.label
.fixedSize(horizontal: false, vertical: true)
.relativeLineSpacing(.em(0.18))
.markdownMargin(top: .em(0.9), bottom: .em(0.4))
.markdownTextStyle {
FontWeight(.semibold)
FontSize(.em(1.12))
}
}
.heading4 { configuration in
configuration.label
.fixedSize(horizontal: false, vertical: true)
.relativeLineSpacing(.em(0.18))
.markdownMargin(top: .em(0.85), bottom: .em(0.35))
.markdownTextStyle {
FontWeight(.semibold)
}
}
.heading5 { configuration in
configuration.label
.fixedSize(horizontal: false, vertical: true)
.relativeLineSpacing(.em(0.18))
.markdownMargin(top: .em(0.8), bottom: .em(0.35))
.markdownTextStyle {
FontWeight(.semibold)
FontSize(.em(0.92))
}
}
.heading6 { configuration in
configuration.label
.fixedSize(horizontal: false, vertical: true)
.relativeLineSpacing(.em(0.18))
.markdownMargin(top: .em(0.8), bottom: .em(0.35))
.markdownTextStyle {
FontWeight(.semibold)
FontSize(.em(0.86))
}
}
.paragraph { configuration in
configuration.label
.fixedSize(horizontal: false, vertical: true)
.relativeLineSpacing(.em(0.36))
.markdownMargin(top: .zero, bottom: .em(0.82))
}
.blockquote { configuration in
HStack(alignment: .top, spacing: 10) {
RoundedRectangle(cornerRadius: 2)
.fill(SybilTheme.primary.opacity(0.55))
.frame(width: 3)
configuration.label
.markdownTextStyle {
ForegroundColor(SybilTheme.textMuted)
}
}
.fixedSize(horizontal: false, vertical: true)
.markdownMargin(top: .em(0.25), bottom: .em(0.9))
}
.codeBlock { configuration in
ScrollView(.horizontal) {
configuration.label
.fixedSize(horizontal: false, vertical: true)
.relativeLineSpacing(.em(0.28))
.markdownTextStyle {
FontFamilyVariant(.monospaced)
FontSize(.em(0.88))
}
.padding(12)
}
.background(
RoundedRectangle(cornerRadius: 10)
.fill(SybilTheme.surfaceStrong.opacity(0.82))
)
.overlay(
RoundedRectangle(cornerRadius: 10)
.stroke(SybilTheme.border.opacity(0.72), lineWidth: 1)
)
.markdownMargin(top: .em(0.2), bottom: .em(1))
}
.list { configuration in
configuration.label
.fixedSize(horizontal: false, vertical: true)
.markdownMargin(top: .em(0.08), bottom: .em(0.78))
}
.listItem { configuration in
configuration.label
.markdownMargin(top: .em(0.28))
}
.table { configuration in
configuration.label
.fixedSize(horizontal: false, vertical: true)
.markdownTableBorderStyle(.init(color: SybilTheme.border.opacity(0.85)))
.markdownTableBackgroundStyle(
.alternatingRows(
SybilTheme.surface.opacity(0.72),
SybilTheme.surfaceStrong.opacity(0.62)
)
)
.markdownMargin(top: .em(0.2), bottom: .em(1))
}
.tableCell { configuration in
configuration.label
.markdownTextStyle {
if configuration.row == 0 {
FontWeight(.semibold)
}
BackgroundColor(nil)
}
.fixedSize(horizontal: false, vertical: true)
.relativeLineSpacing(.em(0.30))
.padding(.vertical, 7)
.padding(.horizontal, 11)
}
.thematicBreak {
Divider()
.overlay(SybilTheme.border.opacity(0.82))
.markdownMargin(top: .em(1.2), bottom: .em(1.2))
}
}()
}

View File

@@ -97,9 +97,7 @@ struct SybilSearchResultsView: View {
Markdown(answer) Markdown(answer)
.tint(SybilTheme.primary) .tint(SybilTheme.primary)
.foregroundStyle(SybilTheme.text) .foregroundStyle(SybilTheme.text)
.markdownTextStyle { .markdownTheme(.sybilReadable)
FontSize(15)
}
} }
if let answerError = search?.answerError, !answerError.isEmpty { if let answerError = search?.answerError, !answerError.isEmpty {
@@ -180,6 +178,7 @@ private struct SearchResultCard: View {
Text(result.title.orEmpty.orFallback(result.url)) Text(result.title.orEmpty.orFallback(result.url))
.font(.sybil(.headline)) .font(.sybil(.headline))
.foregroundStyle(SybilTheme.primary.opacity(0.96)) .foregroundStyle(SybilTheme.primary.opacity(0.96))
.lineSpacing(2)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
} }
.buttonStyle(.plain) .buttonStyle(.plain)
@@ -187,6 +186,7 @@ private struct SearchResultCard: View {
Text(result.title.orEmpty.orFallback(result.url)) Text(result.title.orEmpty.orFallback(result.url))
.font(.sybil(.headline)) .font(.sybil(.headline))
.foregroundStyle(SybilTheme.primary.opacity(0.96)) .foregroundStyle(SybilTheme.primary.opacity(0.96))
.lineSpacing(2)
} }
if let date = result.publishedDate, !date.isEmpty { if let date = result.publishedDate, !date.isEmpty {
@@ -202,6 +202,7 @@ private struct SearchResultCard: View {
Text(result.url) Text(result.url)
.font(.sybil(.footnote)) .font(.sybil(.footnote))
.foregroundStyle(SybilTheme.text.opacity(0.92)) .foregroundStyle(SybilTheme.text.opacity(0.92))
.lineSpacing(2)
.lineLimit(3) .lineLimit(3)
.textSelection(.enabled) .textSelection(.enabled)
@@ -210,6 +211,7 @@ private struct SearchResultCard: View {
Text("\(highlight)") Text("\(highlight)")
.font(.sybil(.caption)) .font(.sybil(.caption))
.foregroundStyle(SybilTheme.textMuted) .foregroundStyle(SybilTheme.textMuted)
.lineSpacing(2)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
} }
} }

View File

@@ -1,5 +1,6 @@
import Observation import Observation
import SwiftUI import SwiftUI
import UIKit
struct SybilWorkspaceView: View { struct SybilWorkspaceView: View {
@Bindable var viewModel: SybilViewModel @Bindable var viewModel: SybilViewModel
@@ -216,19 +217,23 @@ struct SybilWorkspaceView: View {
private var composerBar: some View { private var composerBar: some View {
HStack(alignment: .bottom, spacing: 10) { HStack(alignment: .bottom, spacing: 10) {
TextField( ZStack(alignment: .topLeading) {
viewModel.isSearchMode ? "Search the web" : "Message Sybil", ComposerTextView(
text: $viewModel.composer, text: $viewModel.composer,
axis: .vertical isFocused: $composerFocused,
) isDisabled: viewModel.isSending
.focused($composerFocused) ) {
.textInputAutocapitalization(.sentences) Task {
.autocorrectionDisabled(false) await viewModel.sendComposer()
.lineLimit(1 ... 6) }
.submitLabel(.send) }
.onSubmit { .frame(minHeight: 24, maxHeight: 132)
Task {
await viewModel.sendComposer() if viewModel.composer.isEmpty {
Text(viewModel.isSearchMode ? "Search the web" : "Message Sybil")
.font(.body)
.foregroundStyle(SybilTheme.textMuted.opacity(0.72))
.allowsHitTesting(false)
} }
} }
.padding(.horizontal, 12) .padding(.horizontal, 12)
@@ -278,3 +283,91 @@ struct SybilWorkspaceView: View {
) )
} }
} }
private struct ComposerTextView: UIViewRepresentable {
@Binding var text: String
var isFocused: FocusState<Bool>.Binding
var isDisabled: Bool
var onSubmit: () -> Void
func makeUIView(context: Context) -> UITextView {
let textView = UITextView()
textView.delegate = context.coordinator
textView.backgroundColor = .clear
textView.font = .preferredFont(forTextStyle: .body)
textView.textColor = UIColor(SybilTheme.text)
textView.tintColor = UIColor(SybilTheme.primary)
textView.textContainerInset = .zero
textView.textContainer.lineFragmentPadding = 0
textView.isScrollEnabled = true
textView.alwaysBounceVertical = false
textView.keyboardDismissMode = .interactive
textView.returnKeyType = .send
textView.enablesReturnKeyAutomatically = true
textView.autocapitalizationType = .sentences
textView.autocorrectionType = .default
textView.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
return textView
}
func updateUIView(_ textView: UITextView, context: Context) {
context.coordinator.parent = self
if textView.text != text {
textView.text = text
}
textView.isEditable = !isDisabled
textView.alpha = isDisabled ? 0.74 : 1
if isFocused.wrappedValue, !textView.isFirstResponder {
textView.becomeFirstResponder()
} else if !isFocused.wrappedValue, textView.isFirstResponder {
textView.resignFirstResponder()
}
}
func sizeThatFits(_ proposal: ProposedViewSize, uiView: UITextView, context: Context) -> CGSize? {
let width = proposal.width ?? uiView.bounds.width
let fittingSize = uiView.sizeThatFits(
CGSize(width: width, height: CGFloat.greatestFiniteMagnitude)
)
return CGSize(width: width, height: min(max(fittingSize.height, 24), 132))
}
func makeCoordinator() -> Coordinator {
Coordinator(parent: self)
}
final class Coordinator: NSObject, UITextViewDelegate {
var parent: ComposerTextView
init(parent: ComposerTextView) {
self.parent = parent
}
func textViewDidChange(_ textView: UITextView) {
parent.text = textView.text
}
func textViewDidBeginEditing(_ textView: UITextView) {
parent.isFocused.wrappedValue = true
}
func textViewDidEndEditing(_ textView: UITextView) {
parent.isFocused.wrappedValue = false
}
func textView(
_ textView: UITextView,
shouldChangeTextIn range: NSRange,
replacementText replacement: String
) -> Bool {
if replacement == "\n" {
parent.onSubmit()
return false
}
return true
}
}
}