diff options
| -rw-r--r-- | iGopherBrowser/BrowserView.swift | 156 | ||||
| -rw-r--r-- | iGopherBrowser/FileView.swift | 5 |
2 files changed, 95 insertions, 66 deletions
diff --git a/iGopherBrowser/BrowserView.swift b/iGopherBrowser/BrowserView.swift index 2e158f6..aea4980 100644 --- a/iGopherBrowser/BrowserView.swift +++ b/iGopherBrowser/BrowserView.swift @@ -37,92 +37,114 @@ struct BrowserView: View { @State private var showPreferences = false + @Namespace var topID + @State private var scrollToTop: Bool = false + let client = GopherClient() var body: some View { NavigationStack { VStack(spacing: 0) { if gopherItems.count >= 1 { - List { - ForEach(Array(gopherItems.enumerated()), id: \.offset) { idx, item in - if item.parsedItemType == .info { - Text(item.message) - .font(.system(size: 12, design: .monospaced)) - .frame(height: 20) - .listRowSeparator(.hidden) - .padding(.vertical, -8) - } else if item.parsedItemType == .directory { - Button(action: { - performGopherRequest(host: item.host, port: item.port, selector: item.selector) - }) { - HStack { - Text(Image(systemName: "folder")) - Text(item.message) - Spacer() + ScrollViewReader { proxy in + + List { + ForEach(Array(gopherItems.enumerated()), id: \.offset) { idx, item in + if item.parsedItemType == .info { + Text(item.message) + .font(.system(size: 12, design: .monospaced)) + .frame(height: 20) + .listRowSeparator(.hidden) + .padding(.vertical, -8) + } else if item.parsedItemType == .directory { + Button(action: { + performGopherRequest(host: item.host, port: item.port, selector: item.selector) + }) { + HStack { + Text(Image(systemName: "folder")) + Text(item.message) + Spacer() + } + }.buttonStyle(PlainButtonStyle()) + + } else if item.parsedItemType == .search { + Button(action: { + self.selectedSearchItem = idx + self.showSearchInput = true + }) { + HStack { + Text(Image(systemName: "magnifyingglass")) + Text(item.message) + Spacer() + } + }.buttonStyle(PlainButtonStyle()) + + } else if item.parsedItemType == .text { + NavigationLink(destination: FileView(item: item)) { + HStack { + Text(Image(systemName: "doc.plaintext")) + Text(item.message) + Spacer() + } } - }.buttonStyle(PlainButtonStyle()) - - } else if item.parsedItemType == .search { - Button(action: { - self.selectedSearchItem = idx - self.showSearchInput = true - }) { - HStack { - Text(Image(systemName: "magnifyingglass")) - Text(item.message) - Spacer() + } else if item.selector.hasPrefix("URL:") { + if let url = URL(string: item.selector.replacingOccurrences(of: "URL:", with: "")) + { + //UIApplication.shared.canOpenURL(url) { + Button(action: { + openURL(url: url) + }) { + HStack { + Image(systemName: "link") + Text(item.message) + Spacer() + } + }.buttonStyle(PlainButtonStyle()) } - }.buttonStyle(PlainButtonStyle()) - - } else if item.parsedItemType == .text { - NavigationLink(destination: FileView(item: item)) { - HStack { - Text(Image(systemName: "doc.plaintext")) - Text(item.message) - Spacer() + } else if [.doc, .image, .gif, .movie, .sound, .bitmap].contains( + item.parsedItemType) + { + NavigationLink(destination: FileView(item: item)) { + HStack { + Text(Image(systemName: itemToImageType(item))) + Text(item.message) + Spacer() + } } - } - } else if item.selector.hasPrefix("URL:") { - if let url = URL(string: item.selector.replacingOccurrences(of: "URL:", with: "")) { - //UIApplication.shared.canOpenURL(url) { + } else { Button(action: { - openURL(url: url) + TelemetryManager.send( + "applicationBrowsedUnknown", + with: ["gopherURL": "\(item.host):\(item.port)\(item.selector)"]) + performGopherRequest(host: item.host, port: item.port, selector: item.selector) }) { HStack { - Image(systemName: "link") + Text(Image(systemName: "questionmark.app.dashed")) Text(item.message) Spacer() } }.buttonStyle(PlainButtonStyle()) + } - } else if [.doc, .image, .gif, .movie, .sound, .bitmap].contains(item.parsedItemType) - { - NavigationLink(destination: FileView(item: item)) { - HStack { - Text(Image(systemName: itemToImageType(item))) - Text(item.message) - Spacer() - } - } - } else { - Button(action: { - TelemetryManager.send( - "applicationBrowsedUnknown", - with: ["gopherURL": "\(item.host):\(item.port)\(item.selector)"]) - performGopherRequest(host: item.host, port: item.port, selector: item.selector) - }) { - HStack { - Text(Image(systemName: "questionmark.app.dashed")) - Text(item.message) - Spacer() - } - }.buttonStyle(PlainButtonStyle()) } - } + }.id(topID) + + .background(Color.white) + .cornerRadius(10) + .onChange(of: scrollToTop) { + // TODO: Cleanup + withAnimation { + // TODO: Fix for macOS + #if os(macOS) + proxy.scrollTo(topID, anchor: .top) + #else + proxy.scrollTo(0, anchor: .top) + #endif + + } + } } - .background(Color.white) - .cornerRadius(10) .sheet(isPresented: $showSearchInput) { if let index = selectedSearchItem, gopherItems.indices.contains(index) { let searchItem = gopherItems[index] @@ -395,6 +417,8 @@ struct BrowserView: View { print("created new") } self.gopherItems = resp + scrollToTop = !scrollToTop + print("ScrollToTop \(scrollToTop), \(self.scrollToTop)") case .failure(let error): TelemetryManager.send( diff --git a/iGopherBrowser/FileView.swift b/iGopherBrowser/FileView.swift index b0578d8..e764373 100644 --- a/iGopherBrowser/FileView.swift +++ b/iGopherBrowser/FileView.swift @@ -29,6 +29,11 @@ func determineFileType(data: Data) -> String? { // Add other file signatures as needed ] + // Debug file signatures + // for byte in data.prefix(10) { + // print(String(format: "%02x", byte), terminator: " ") + // } + // Check for each signature for (signature, fileType) in signatures { if data.starts(with: signature) { |