Self hosted runners, very basic testing, fixed bad webview start, fixed navbar bounce (#11)

* test self hosted runner

* fix yaml

* fix runs on

* ugh

* bunch of stuff

* minor tweaks

* fix

* more tweaks

* even more fixes

* missed one

* ok more

* fix nav bar jitter

* cleanup

Author: raluaces

.github/workflows/ci.yml

@@ -0,0 +1,28 @@
+# name: build-ios-app
+# on:
+#   release:
+#     types: [published]
+# concurrency:
+#   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+#   cancel-in-progress: true
+# jobs:
+#   build:
+#     if: github.event.release.prerelease == false
+#     runs-on: runs-on: ['self-hosted', 'macOS', 'ARM64']
+#     steps:
+#       - name: "Add SSH Key"
+#         uses: webfactory/[email protected]
+#         with:
+#           ssh-private-key: ${{ secrets.SSH_KEY }}
+#       - uses: actions/checkout@v4
+#       - name: "Publish App to App Store"
+#         run: fastlane appstore
+#         env:
+#           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+#           MATCH_URL: [email protected]:django-files/ios-match-certs.git
+#           CI: false
+#           APPLE_ID: ${{ secrets.APPLE_ID }}
+#           ASC_ISSUER_ID: ${{ secrets.ASC_ISSUER_ID }}
+#           ASC_API_KEY: ${{ secrets.ASC_API_KEY }}
+#           ASC_API_ID: ${{ secrets.ASC_API_ID }}
+#           BUILD_NUMBER: ${{ github.run_number }}

.github/workflows/publish.yml

@@ -1,16 +1,15 @@
-name: build-ios-app
+name: build-ios-app-testflight
 on:
-  push:
-    branches:
-      - 'main'
+  release:
+    types: [published]
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: true
 jobs:
   build:
-    runs-on: macos-15
+    if: ${{ github.event.release.prerelease }}
+    runs-on: runs-on: ['self-hosted', 'macOS', 'ARM64']
     steps:
-      - name: "Debug"
-        run: |
-          fastlane env
-          /usr/bin/xcodebuild -version
       - name: "Add SSH Key"
         uses: webfactory/[email protected]
         with:
@@ -26,3 +25,4 @@ jobs:
           ASC_API_KEY: ${{ secrets.ASC_API_KEY }}
           ASC_API_ID: ${{ secrets.ASC_API_ID }}
           BUILD_NUMBER: ${{ github.run_number }}
+          VERSION_NUMBER: ${{ github.event.release.tag_name }}

.github/workflows/ios-testflight.yml renamed to .github/workflows/testflight.yml

@@ -0,0 +1,22 @@
+name: "Django Files iOS CI"
+on:
+  push:
+    branches:
+      - '**'
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+  cancel-in-progress: true
+jobs:
+  build:
+    name: "Tests"
+    runs-on: ['self-hosted', 'macOS', 'ARM64'] 
+    steps:
+      - name: "Add Match Repo SSH Key"
+        uses: webfactory/[email protected]
+        with:
+          ssh-private-key: ${{ secrets.SSH_KEY }}
+      - uses: actions/checkout@v4
+      - name: "Fastlane Tests"
+        run: fastlane tests
+        env:
+          CI: true

.github/workflows/tests.yml

@@ -13,4 +13,7 @@ xcuserdata/
 *.dSYM
 
 .build/
-fastlane/
+.DS_Store
+report.xml
+report.html
+report.junit

.gitignore

@@ -22,6 +22,37 @@ struct Django_FilesApp: App {
         }
     }()
 
+    init() {
+        // Handle reset arguments
+        if CommandLine.arguments.contains("--DeleteAllData") {
+            // Clear UserDefaults
+            if let bundleID = Bundle.main.bundleIdentifier {
+                UserDefaults.standard.removePersistentDomain(forName: bundleID)
+            }
+            // Clear SwiftData store
+            do {
+                let context = sharedModelContainer.mainContext
+                // Delete all DjangoFilesSession objects
+                try context.delete(model: DjangoFilesSession.self)
+                try context.save()
+            } catch {
+                print("Error clearing SwiftData store: \(error)")
+            }
+            // Clear any files in the app's documents directory
+            if let documentsPath = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first {
+                do {
+                    let fileURLs = try FileManager.default.contentsOfDirectory(at: documentsPath, 
+                                                                             includingPropertiesForKeys: nil)
+                    for fileURL in fileURLs {
+                        try FileManager.default.removeItem(at: fileURL)
+                    }
+                } catch {
+                    print("Error clearing documents directory: \(error)")
+                }
+            }
+        }
+    }
+
     var body: some Scene {
         WindowGroup {
             ContentView()

Django Files/Django_FilesApp.swift

@@ -24,7 +24,7 @@ class AuthController: NSObject, WKNavigationDelegate, WKDownloadDelegate, UIScro
 
     var url: URL?
 
-    let webView: WKWebView = FullScreenWebView()
+    let webView: WKWebView = WKWebView()
 
     let customUserAgent = "DjangoFiles iOS \(String(describing: Bundle.main.releaseVersionNumber ?? "Unknown"))(\(String(describing: Bundle.main.buildVersionNumber ?? "-")))"
 
@@ -55,13 +55,15 @@ class AuthController: NSObject, WKNavigationDelegate, WKDownloadDelegate, UIScro
 
     func webView(_ webView: WKWebView, decidePolicyFor navigationResponse: WKNavigationResponse, decisionHandler: @escaping @MainActor @Sendable (WKNavigationResponsePolicy) -> Void){
         webView.isHidden = false
+        webView.scrollView.contentInsetAdjustmentBehavior = .never
         onLoadedAction?()
 
         if authComplete{
             decisionHandler(.allow)
             return
         }
-        
+
+
         if navigationResponse.response.url?.absoluteString == url!.appendingPathComponent("/").absoluteString {
             let code = (navigationResponse.response as! HTTPURLResponse).statusCode
             switch code{
@@ -105,9 +107,6 @@ class AuthController: NSObject, WKNavigationDelegate, WKDownloadDelegate, UIScro
                 reloadState = false
             }
         }
-        else{
-            updatePageSafeArea()
-        }
     }
 
     func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction) async -> WKNavigationActionPolicy{
@@ -195,14 +194,6 @@ class AuthController: NSObject, WKNavigationDelegate, WKDownloadDelegate, UIScro
         safeAreaInsets = insets
     }
 
-    public func updatePageSafeArea(){
-        if webView.url?.host() == url?.host(){
-            webView.evaluateJavaScript("document.body.getElementsByClassName(\"navbar\")[0].style.paddingTop = \"\(safeAreaInsets.top)px\";", completionHandler: { (jsonRaw: Any?, error: Error?) in })
-            webView.evaluateJavaScript("document.body.getElementsByClassName(\"flex-grow-1\")[0].style.paddingLeft = \"\(safeAreaInsets.trailing)px\";", completionHandler: { (jsonRaw: Any?, error: Error?) in })
-            webView.evaluateJavaScript("document.body.getElementsByClassName(\"flex-grow-1\")[0].style.paddingRight = \"\(safeAreaInsets.leading)px\";", completionHandler: { (jsonRaw: Any?, error: Error?) in })
-        }
-    }
-    
     public func reset(){
         authError = nil
         clearToken()
@@ -237,7 +228,7 @@ struct AuthView: UIViewRepresentable {
 
     func makeUIView(context: Context) -> WKWebView {
         guard let url = URL(string: httpsUrl) else {
-            return FullScreenWebView()
+            return WKWebView()
         }
 
         if doReset{
@@ -269,13 +260,6 @@ struct AuthView: UIViewRepresentable {
     }
 
     func updateUIView(_ uiView: WKWebView, context: Context) {
-        authController.updatePageSafeArea()
-    }
-}
-
-class FullScreenWebView: WKWebView {
-    override var safeAreaInsets: UIEdgeInsets {
-        return UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
     }
 }
 

Django Files/Views/Auth.swift

@@ -19,6 +19,7 @@ struct ContentView: View {
     @State private var selectedServer: DjangoFilesSession? = DjangoFilesSession()
     @State private var selectedSession: DjangoFilesSession? // Track session for settings
     @State private var showingSelector = false // Show SessionSelector
+    @State private var needsRefresh = false  // Added to handle refresh after adding server
 
     @State private var token: String?
 
@@ -42,14 +43,12 @@ struct ContentView: View {
                                     Label("Settings", systemImage: "gear")
                                 }
                                 .tint(.indigo)
-                        }
+                            }
                     }
                 }
-                .onDelete(perform: deleteItems)            }
+                .onDelete(perform: deleteItems)
+            }
             .toolbar {
-                ToolbarItem(placement: .navigationBarTrailing) {
-                    EditButton()
-                }
                 ToolbarItem {
                     Button(action: {
                         self.showingEditor.toggle()
@@ -60,24 +59,26 @@ struct ContentView: View {
                 }
             }
         } detail: {
-            AuthViewContainer(viewingSettings: $viewingSettings, selectedServer: $selectedServer, columnVisibility: $columnVisibility, showingEditor: $showingEditor)
+            AuthViewContainer(viewingSettings: $viewingSettings, selectedServer: $selectedServer, columnVisibility: $columnVisibility, showingEditor: $showingEditor, needsRefresh: $needsRefresh)
                 .navigationViewStyle(StackNavigationViewStyle())
         }
         .sheet(isPresented: $showingEditor){
-            SessionEditor(session: nil) // New session case
+            SessionEditor(session: nil)
+                .onDisappear {
+                    // When editor is dismissed, trigger a refresh and select the new server
+                    if items.count > 0 {
+                        needsRefresh = true
+                        selectedServer = items.last
+                    }
+                }
         }
         .sheet(item: $selectedSession) { session in
             SessionSelector(session: session)
         }
         .onAppear() {
             setDefaultServer()
-            if items.count > 0{
-                selectedServer = items.first(where: {
-                    $0.defaultSession == true
-                })
-                if selectedServer == nil{
-                    selectedServer = items.first
-                }
+            if items.count > 0 {
+                selectedServer = items.first(where: { $0.defaultSession }) ?? items.first
             }
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity)
@@ -123,9 +124,10 @@ public struct AuthViewContainer: View {
     var selectedServer: Binding<DjangoFilesSession?>
     var columnVisibility: Binding<NavigationSplitViewVisibility>
     var showingEditor: Binding<Bool>
+    var needsRefresh: Binding<Bool>
+
     @State private var toolbarHidden: Bool = false
     @State private var authError: Bool = false
-    
     @State private var authController: AuthController = AuthController()
 
     var backButton : some View { Button(action: {
@@ -193,31 +195,34 @@ public struct AuthViewContainer: View {
                             .onAppear(){
                                 authController.setSafeAreaInsets(geometry.safeAreaInsets)
                                 columnVisibility.wrappedValue = .automatic
+                                if needsRefresh.wrappedValue {
+                                    authController.reset()
+                                    needsRefresh.wrappedValue = false
+                                }
                             }
                             .onChange(of: geometry.safeAreaInsets){
                                 authController.setSafeAreaInsets(geometry.safeAreaInsets)
-                                authController.updatePageSafeArea()
-                            }
-                            .toolbar(toolbarHidden && UIDevice.current.userInterfaceIdiom == .phone ? .hidden : .visible)
-                            .navigationTitle(Text(""))
-                            .navigationBarBackButtonHidden(true)
-                            .navigationBarItems(leading: backButton)
-                            .alert(isPresented: $authError){
-                                Alert(title: Text("Error"), message: Text(authController.getAuthErrorMessage() ?? "Unknown Error"))
                             }
                     }
                     .frame(maxWidth: .infinity, maxHeight: .infinity)
                     .edgesIgnoringSafeArea(.all)
+                    .toolbar(toolbarHidden && UIDevice.current.userInterfaceIdiom == .phone ? .hidden : .visible)
+                    .navigationTitle(Text(""))
+                    .navigationBarBackButtonHidden(true)
+                    .navigationBarItems(leading: backButton)
+                    .alert(isPresented: $authError){
+                        Alert(title: Text("Error"), message: Text(authController.getAuthErrorMessage() ?? "Unknown Error"))
+                    }
                 }
-                else{
+                else {
                     Text("Loading...")
                         .onAppear(){
                             columnVisibility.wrappedValue = .automatic
                         }
                 }
             }
             else{
-                Text("Select an item")
+                Text("Select a Server")
                     .onAppear(){
                         columnVisibility.wrappedValue = .automatic
                     }

Django Files/Views/ContentView.swift

@@ -25,7 +25,7 @@ struct SessionEditor: View {
             session.token = token
             session.auth = false
         } else {
-            let session = DjangoFilesSession ()
+            let session = DjangoFilesSession()
             session.url = url?.absoluteString ?? ""
             for item in items{
                 item.defaultSession = false
@@ -37,7 +37,7 @@ struct SessionEditor: View {
             do {
                 try modelContext.save()
             } catch {
-                
+                print("Error saving session: \(error)")
             }
         }
     }
@@ -73,6 +73,7 @@ struct SessionEditor: View {
                     ))
                         .disableAutocorrection(true)
                         .textInputAutocapitalization(.never)
+                        .accessibilityIdentifier("urlTextField")
                 } label: {
                     Text("URL:")
                 }
@@ -104,8 +105,9 @@ struct SessionEditor: View {
                         }
                     })
                     {
-                        Text("Add Session")
+                        Text(editorTitle)
                     }
+                    .accessibilityIdentifier("serverSubmitButton")
                     .alert(isPresented: $badURL){
                         Alert(title: Text("Invalid URL"), message: Text("Invalid URL format or scheme (http or https).\nExample: https://df.myserver.com"))
                     }