misc fixes and onboarding screen

raluaces · raluaces · commit d52a2a6bf24e · 2025-05-30T21:23:52.000-05:00
diff --git a/Django Files/Django_FilesApp.swift b/Django Files/Django_FilesApp.swift
@@ -42,7 +42,7 @@ struct Django_FilesApp: App {
                 } else if hasExistingSessions {
                     TabViewWindow(sessionManager: sessionManager)
                 } else {
-                    SessionEditor(session: nil, onSessionCreated: { newSession in
+                    SessionEditor(onBoarding: true, session: nil, onSessionCreated: { newSession in
                         sessionManager.selectedSession = newSession
                         hasExistingSessions = true
                     })
diff --git a/Django Files/Views/FileList.swift b/Django Files/Views/FileList.swift
@@ -262,9 +262,12 @@ struct FileListView: View {
             }
             
             if isLoading && hasNextPage {
-                Spacer()
-                LoadingView()
-                Spacer()
+                HStack {
+                    Spacer()
+                    LoadingView()
+                        .frame(width: 100, height: 100)
+                    Spacer()
+                }
             }
         }
         .fullScreenCover(isPresented: $showingPreview) {
@@ -410,12 +413,6 @@ struct FileListView: View {
         .onAppear {
             loadFiles()
         }
-        
-        if isLoading && hasNextPage {
-            HStack {
-                ProgressView()
-            }
-        }
     }
     
     @MainActor
diff --git a/Django Files/Views/Preview.swift b/Django Files/Views/Preview.swift
@@ -2,6 +2,7 @@ import SwiftUI
 import AVKit
 import HighlightSwift
 import UIKit
+import PDFKit
 
 struct ContentPreview: View {
     let mimeType: String
@@ -54,6 +55,8 @@ struct ContentPreview: View {
                 videoPreview
             } else if mimeType.starts(with: "audio/") {
                 audioPreview
+            } else if mimeType == "application/pdf" {
+                pdfPreview
             } else {
                 genericFilePreview
             }
@@ -112,6 +115,14 @@ struct ContentPreview: View {
             .padding()
     }
     
+    // PDF Preview
+    private var pdfPreview: some View {
+        PDFView(url: fileURL)
+            .padding(.top, 45)
+            .background(.black)
+
+    }
+    
     // Generic File Preview
     private var genericFilePreview: some View {
         VStack {
@@ -132,8 +143,8 @@ struct ContentPreview: View {
     private func loadContent() {
         isLoading = true
         
-        // For video, audio, and audio, we don't need to download the content as we'll use the URL directly
-        if mimeType.starts(with: "video/") || mimeType.starts(with: "audio/") {
+        // For video, audio, and PDF, we don't need to download the content as we'll use the URL directly
+        if mimeType.starts(with: "video/") || mimeType.starts(with: "audio/") || mimeType == "application/pdf" {
             isLoading = false
             return
         }
@@ -759,7 +770,7 @@ struct FilePreviewView: View {
                             } label: {
                                 Image(systemName: "square.and.arrow.up")
                                     .font(.system(size: 20))
-                                    .offset(y: -3)
+                                    .offset(y: -2)
                                     .padding()
                             }
                             .menuStyle(.button)
@@ -852,4 +863,23 @@ struct FilePreviewView: View {
     }
 }
 
+// PDF View SwiftUI Wrapper
+struct PDFView: UIViewRepresentable {
+    let url: URL
+    
+    func makeUIView(context: Context) -> PDFKit.PDFView {
+        let pdfView = PDFKit.PDFView()
+        pdfView.autoScales = true
+        pdfView.displayMode = .singlePageContinuous
+        pdfView.displayDirection = .vertical
+        return pdfView
+    }
+    
+    func updateUIView(_ pdfView: PDFKit.PDFView, context: Context) {
+        if let document = PDFDocument(url: url) {
+            pdfView.document = document
+        }
+    }
+}
+
 
diff --git a/Django Files/Views/SessionEditor.swift b/Django Files/Views/SessionEditor.swift
@@ -16,9 +16,10 @@ struct SessionEditor: View {
     @State private var showLoginSheet: Bool = false
     @State private var tempSession: DjangoFilesSession?
     
+    let onBoarding: Bool
     let session: DjangoFilesSession?
     var onSessionCreated: ((DjangoFilesSession) -> Void)?
-    
+
     private var editorTitle: String {
         session == nil ? "Add Server" : "Edit Server"
     }
@@ -41,7 +42,7 @@ struct SessionEditor: View {
             
             // Create a temporary DFAPI instance to check auth methods
             let api = DFAPI(url: url!, token: "")
-            if let authResponse = await api.getAuthMethods() {
+            if let _ = await api.getAuthMethods() {
                 isCheckingServer = false
                 
                 // Server is valid, proceed with login
@@ -73,6 +74,26 @@ struct SessionEditor: View {
     var body: some View {
         NavigationStack {
             Form {
+                if onBoarding {
+                    HStack {
+                        Spacer()
+                        Label("", systemImage: "hand.wave.fill")
+                            .font(.system(size: 50))
+                            .padding(.bottom)
+                            .shadow(color: .purple, radius: 20)
+                            .listRowSeparator(.hidden)
+                        Spacer()
+                    }
+                    Text("Welcome to Django Files!")
+                        .font(.system(size: 25))
+                        .padding(.bottom)
+                        .shadow(color: .purple, radius: 20)
+                        .listRowSeparator(.hidden)
+                    Text("Thanks for using our iOS app! If you don’t have a server set up yet, check out our GitHub README to get started.")
+                        .listRowSeparator(.hidden)
+                    Text("https://github.com/django-files/django-files")
+                        .listRowSeparator(.hidden)
+                }
                 Section(header: Text("Server URL")) {
                     TextField("", text: Binding(
                         get: {
@@ -197,5 +218,6 @@ struct SessionEditor: View {
                 }
             }
         }
+        .scrollDisabled(true)
     }
 }
diff --git a/Django Files/Views/ShortList.swift b/Django Files/Views/ShortList.swift
@@ -25,7 +25,7 @@ struct ShortListView: View {
             if server.wrappedValue != nil {
                 NavigationStack {
                     List {
-                        if shorts.isEmpty {
+                        if shorts.isEmpty && !isLoading {
                             HStack {
                                 Spacer()
                                 VStack {
@@ -52,6 +52,14 @@ struct ShortListView: View {
                                     ToastManager.shared.showToast(message: "Short URL copied to clipboard")
                                 }
                         }
+                        if isLoading {
+                            HStack {
+                                Spacer()
+                                LoadingView()
+                                    .frame(width: 100, height: 100)
+                                Spacer()
+                            }
+                        }
                     }
                     .listStyle(.plain)
                     .refreshable{
diff --git a/Django Files/Views/TabView.swift b/Django Files/Views/TabView.swift
@@ -222,7 +222,7 @@ struct ServerSelector: View {
                 SessionSelector(session: session)
             }
             .sheet(isPresented: $showAddServerSheet) {
-                SessionEditor(session: nil)
+                SessionEditor(onBoarding: false, session: nil)
             }
             .confirmationDialog("Delete Server", isPresented: $showingDeleteAlert) {
                 Button("Cancel", role: .cancel) {}
diff --git a/UploadAndCopy/Base.lproj/MainInterface.storyboard b/UploadAndCopy/Base.lproj/MainInterface.storyboard
@@ -40,6 +40,15 @@
                                         <rect key="frame" x="169" y="117" width="20" height="20"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     </activityIndicatorView>
+                                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="JQU-no-kae">
+                                        <rect key="frame" x="24" y="37" width="311" height="217"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                        <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
+                                        <color key="textColor" systemColor="labelColor"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                        <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                                    </textView>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="T3b-pJ-MQ3">
                                         <rect key="frame" x="24" y="37" width="311" height="210"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -129,6 +138,7 @@
                         <outlet property="shareLabel" destination="h6M-o6-yR9" id="IY1-ab-l1d"/>
                         <outlet property="shortText" destination="etx-MM-w5d" id="HZN-xL-9My"/>
                         <outlet property="shortTextLabel" destination="UaI-eI-l62" id="bAS-e8-jIr"/>
+                        <outlet property="textView" destination="JQU-no-kae" id="YMR-ww-xe8"/>
                         <outlet property="viewOverlay" destination="mZN-4f-xCI" id="Lgi-2P-TJe"/>
                     </connections>
                 </viewController>
@@ -138,9 +148,15 @@
         </scene>
     </scenes>
     <resources>
+        <systemColor name="labelColor">
+            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
         <systemColor name="lightTextColor">
             <color white="1" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
         <systemColor name="systemGrayColor">
             <color red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
diff --git a/UploadAndCopy/ShareViewController.swift b/UploadAndCopy/ShareViewController.swift
@@ -10,7 +10,7 @@ import Social
 import SwiftData
 import CoreHaptics
 
-class ShareViewController: UIViewController, UITextFieldDelegate, URLSessionTaskDelegate {
+class ShareViewController: UIViewController, UITextFieldDelegate, URLSessionTaskDelegate, UITextViewDelegate {
     var sharedModelContainer: ModelContainer = {
         let schema = Schema([
             DjangoFilesSession.self,
@@ -31,6 +31,7 @@ class ShareViewController: UIViewController, UITextFieldDelegate, URLSessionTask
     @IBOutlet weak var availableServers: UIButton!
     @IBOutlet weak var activityIndicator: UIActivityIndicatorView!
     @IBOutlet weak var shortTextLabel: UILabel!
+    @IBOutlet weak var textView: UITextView!
     @IBOutlet weak var shortText: UITextField!
     @IBOutlet weak var shareLabel: UILabel!
     
@@ -45,6 +46,7 @@ class ShareViewController: UIViewController, UITextFieldDelegate, URLSessionTask
         self.activityIndicator.hidesWhenStopped = true
         
         shortText.delegate = self
+        textView.delegate = self
         
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow), name: UIResponder.keyboardWillShowNotification, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide), name: UIResponder.keyboardWillHideNotification, object: nil)
@@ -126,6 +128,36 @@ class ShareViewController: UIViewController, UITextFieldDelegate, URLSessionTask
                     loaded = true
                     break
                 }
+                else if itemProvider.hasItemConformingToTypeIdentifier("public.text") || itemProvider.hasItemConformingToTypeIdentifier("public.plain-text") {
+                    itemProvider.loadItem(forTypeIdentifier: itemProvider.registeredTypeIdentifiers[0], options: nil, completionHandler: { (item, error) in
+                        DispatchQueue.main.async {
+                            self.shortText.isHidden = true
+                            self.shortTextLabel.isHidden = true
+                            self.textView.isHidden = false
+                            
+                            if let text = item as? String {
+                                // Show the text preview
+                                self.textView.text = text
+                                
+                                // Create a temporary file to store the text
+                                let tempDirectoryURL = NSURL.fileURL(withPath: NSTemporaryDirectory(), isDirectory: true)
+                                let targetURL = tempDirectoryURL.appendingPathComponent("\(UUID.init().uuidString).txt")
+                                do {
+                                    try text.write(to: targetURL, atomically: true, encoding: .utf8)
+                                    self.isTempFile = true
+                                    self.shareURL = targetURL
+                                    self.shareLabel.text = "Upload Text"
+                                } catch {
+                                    self.showMessageAndDismiss(message: "Could not share text.")
+                                }
+                            }
+                            self.activityIndicator.stopAnimating()
+                            self.shareButton.isEnabled = true
+                        }
+                    })
+                    loaded = true
+                    break
+                }
                 else {
                     itemProvider.loadItem(forTypeIdentifier: "public.data", options: nil, completionHandler: { (item, error) in
                         DispatchQueue.main.async {
@@ -219,6 +251,16 @@ class ShareViewController: UIViewController, UITextFieldDelegate, URLSessionTask
         self.progressBar.isHidden = false
         self.progressBar.progress = 0
         
+        // If we're sharing text and it's been edited, update the file content
+        if let text = textView.text, !textView.isHidden {
+            do {
+                try text.write(to: shareURL!, atomically: true, encoding: .utf8)
+            } catch {
+                self.showMessageAndDismiss(message: "Could not update text content.")
+                return
+            }
+        }
+        
         let api = DFAPI(url: URL(string: session.url)!, token: session.token)
         Task{
             let task = await api.uploadFileStreamed(url: shareURL!, taskDelegate: self)

Original file line number	Diff line number	Diff line change
`@@ -262,9 +262,12 @@ struct FileListView: View {`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`if isLoading && hasNextPage {`
`265`		`- Spacer()`
`266`		`- LoadingView()`
`267`		`- Spacer()`
	`265`	`+ HStack {`
	`266`	`+ Spacer()`
	`267`	`+ LoadingView()`
	`268`	`+ .frame(width: 100, height: 100)`
	`269`	`+ Spacer()`
	`270`	`+ }`
`268`	`271`	`}`
`269`	`272`	`}`
`270`	`273`	`.fullScreenCover(isPresented: $showingPreview) {`
`@@ -410,12 +413,6 @@ struct FileListView: View {`
`410`	`413`	`.onAppear {`
`411`	`414`	`loadFiles()`
`412`	`415`	`}`
`413`		`-`
`414`		`- if isLoading && hasNextPage {`
`415`		`- HStack {`
`416`		`- ProgressView()`
`417`		`- }`
`418`		`- }`
`419`	`416`	`}`
`420`	`417`
`421`	`418`	`@MainActor`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ struct ServerSelector: View {`
`222`	`222`	`SessionSelector(session: session)`
`223`	`223`	`}`
`224`	`224`	`.sheet(isPresented: $showAddServerSheet) {`
`225`		`- SessionEditor(session: nil)`
	`225`	`+ SessionEditor(onBoarding: false, session: nil)`
`226`	`226`	`}`
`227`	`227`	`.confirmationDialog("Delete Server", isPresented: $showingDeleteAlert) {`
`228`	`228`	`Button("Cancel", role: .cancel) {}`