From 8a895b70c8cd94549fdd602d7ba3f873490b71fc Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Tue, 29 Sep 2020 16:28:37 -0400 Subject: [PATCH] Tweak link icons --- BrowserCore/BrowserView.swift | 1 + GeminiRenderer/RenderingBlockView.swift | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/BrowserCore/BrowserView.swift b/BrowserCore/BrowserView.swift index 538bc9a..bf58206 100644 --- a/BrowserCore/BrowserView.swift +++ b/BrowserCore/BrowserView.swift @@ -39,6 +39,7 @@ public struct BrowserView: View { Text("An error occurred") .font(.headline) Text(message) + .lineLimit(nil) case let .document(doc): DocumentView(document: doc, scrollingEnabled: scrollingEnabled, changeURL: navigator.changeURL) Spacer() diff --git a/GeminiRenderer/RenderingBlockView.swift b/GeminiRenderer/RenderingBlockView.swift index 35d6b99..3be30ac 100644 --- a/GeminiRenderer/RenderingBlockView.swift +++ b/GeminiRenderer/RenderingBlockView.swift @@ -39,7 +39,7 @@ struct RenderingBlockView: View { } private func text(_ text: String) -> some View { - Text(text) + Text(verbatim: text) .font(.documentBody) .frame(maxWidth: .infinity, alignment: .leading) } @@ -54,12 +54,18 @@ struct RenderingBlockView: View { #endif let imageName: String - if url.scheme != "gemini" { - imageName = "arrow.up.left.square" - } else if url.host == document.url.host { - imageName = "arrow.right" + if url.scheme == "gemini" { + if url.host == document.url.host { + imageName = "arrow.right" + } else { + imageName = "link" + } + } else if url.scheme == "http" || url.scheme == "https" { + imageName = "safari" + } else if url.scheme == "mailto" { + imageName = "envelope" } else { - imageName = "link" + imageName = "arrow.up.left.square" } let button: some View = Button { @@ -67,6 +73,7 @@ struct RenderingBlockView: View { } label: { HStack(alignment: .firstTextBaseline, spacing: 4) { Image(systemName: imageName) + .frame(minWidth: 23, alignment: .leading) Text(verbatim: text) .font(.documentBody)