diff --git a/damus/Components/SelectableText.swift b/damus/Components/SelectableText.swift index 679f14e1..f084a702 100644 --- a/damus/Components/SelectableText.swift +++ b/damus/Components/SelectableText.swift @@ -15,12 +15,14 @@ struct SelectableText: View { @State private var selectedTextHeight: CGFloat = .zero @State private var selectedTextWidth: CGFloat = .zero + let size: EventViewKind + var body: some View { GeometryReader { geo in TextViewRepresentable( attributedString: attributedString, textColor: UIColor.label, - font: UIFont.preferredFont(forTextStyle: .title2), + font: eventviewsize_to_uifont(size), fixedWidth: selectedTextWidth, height: $selectedTextHeight ) diff --git a/damus/Components/TranslateView.swift b/damus/Components/TranslateView.swift index cced9e6e..03114412 100644 --- a/damus/Components/TranslateView.swift +++ b/damus/Components/TranslateView.swift @@ -11,6 +11,7 @@ import NaturalLanguage struct TranslateView: View { let damus_state: DamusState let event: NostrEvent + let size: EventViewKind @State var checkingTranslationStatus: Bool = false @State var currentLanguage: String = "en" @@ -65,7 +66,7 @@ struct TranslateView: View { } .translate_button_style() - SelectableText(attributedString: artifacts.content) + SelectableText(attributedString: artifacts.content, size: self.size) } } @@ -129,6 +130,6 @@ extension View { struct TranslateView_Previews: PreviewProvider { static var previews: some View { let ds = test_damus_state() - TranslateView(damus_state: ds, event: test_event) + TranslateView(damus_state: ds, event: test_event, size: .normal) } } diff --git a/damus/Views/EventView.swift b/damus/Views/EventView.swift index 8961845f..9ea6dde3 100644 --- a/damus/Views/EventView.swift +++ b/damus/Views/EventView.swift @@ -25,7 +25,16 @@ func eventviewsize_to_font(_ size: EventViewKind) -> Font { } } - +func eventviewsize_to_uifont(_ size: EventViewKind) -> UIFont { + switch size { + case .small: + return .preferredFont(forTextStyle: .body) + case .normal: + return .preferredFont(forTextStyle: .body) + case .selected: + return .preferredFont(forTextStyle: .title2) + } +} struct EventView: View { let event: NostrEvent diff --git a/damus/Views/NoteContentView.swift b/damus/Views/NoteContentView.swift index 7c37d34c..cbd122ff 100644 --- a/damus/Views/NoteContentView.swift +++ b/damus/Views/NoteContentView.swift @@ -63,7 +63,7 @@ struct NoteContentView: View { } var translateView: some View { - TranslateView(damus_state: damus_state, event: event) + TranslateView(damus_state: damus_state, event: event, size: self.size) } var previewView: some View { @@ -85,7 +85,7 @@ struct NoteContentView: View { var MainContent: some View { VStack(alignment: .leading) { if size == .selected { - SelectableText(attributedString: artifacts.content) + SelectableText(attributedString: artifacts.content, size: self.size) } else { if with_padding { truncatedText