Skip to content

iOS 26 #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

iOS 26 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7d326ee
ios 26 build target
raluaces Aug 24, 2025
e01697d
xcode 26
raluaces Aug 24, 2025
6de1f14
make preview toolbars conform to ios
raluaces Sep 28, 2025
35d2cbf
fix file details appearance in ios26
raluaces Sep 28, 2025
052ca68
fix preview drag dismissal, text preview loading
raluaces Sep 28, 2025
cf3b18d
patch overeager dismissing
raluaces Sep 28, 2025
eaa09f7
support ios 18, preview cleanup, misc fixes
raluaces Oct 11, 2025
c05e5b3
fix swipe between text files
raluaces Oct 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

- name: "Install iOS 18.3 Platform"
run: |
sudo xcode-select --switch /Applications/Xcode_16.4.app
sudo xcode-select --switch /Applications/Xcode_26.0.app
# sudo xcodebuild -downloadPlatform iOS
# sudo xcodebuild -downloadPlatform iOS -platform iOS -version 18.4

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

- name: "Install iOS 18.3 Platform"
run: |
sudo xcode-select --switch /Applications/Xcode_16.4.app
sudo xcode-select --switch /Applications/Xcode_26.0.app
# sudo xcodebuild -downloadPlatform iOS
# sudo xcodebuild -downloadPlatform iOS -platform iOS -version 18.4

Expand Down
12 changes: 6 additions & 6 deletions Django Files.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
IPHONEOS_DEPLOYMENT_TARGET = 18.6;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -513,7 +513,7 @@
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
IPHONEOS_DEPLOYMENT_TARGET = 18.6;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -585,7 +585,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
IPHONEOS_DEPLOYMENT_TARGET = 18.6;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
Expand Down Expand Up @@ -642,7 +642,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
IPHONEOS_DEPLOYMENT_TARGET = 18.6;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
Expand All @@ -660,7 +660,7 @@
CURRENT_PROJECT_VERSION = 0;
DEVELOPMENT_TEAM = ZY6BPTGK47;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
IPHONEOS_DEPLOYMENT_TARGET = 18.6;
MARKETING_VERSION = 0.0;
PRODUCT_BUNDLE_IDENTIFIER = blastsoftstudios.djangofilesTests;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -679,7 +679,7 @@
CURRENT_PROJECT_VERSION = 0;
DEVELOPMENT_TEAM = ZY6BPTGK47;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
IPHONEOS_DEPLOYMENT_TARGET = 18.6;
MARKETING_VERSION = 0.0;
PRODUCT_BUNDLE_IDENTIFIER = blastsoftstudios.djangofilesTests;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
28 changes: 14 additions & 14 deletions Django Files/Views/ContextMenus/FileContextMenu.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,22 @@ struct FileContextMenuButtons: View {
} label: {
Label("Open Preview", systemImage: "arrow.up.forward.app")
}


Button {
onCopyShareLink()
notifyClipboard()
} label: {
Label("Copy Share Link", systemImage: "link")
}

Button {
onCopyRawLink()
notifyClipboard()
} label: {
Label("Copy Raw Link", systemImage: "link.circle")
}
}
Button {
onCopyShareLink()
notifyClipboard()
} label: {
Label("Copy Share Link", systemImage: "link")
}

Button {
onCopyRawLink()
notifyClipboard()
} label: {
Label("Copy Raw Link", systemImage: "link.circle")
}
// }

Button {
openRawBrowser()
Expand Down
2 changes: 1 addition & 1 deletion Django Files/Views/Lists/FileList.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ struct FileListView: View {
@State private var showFileInfo: Bool = false
@State private var showingUserFilter: Bool = false
@State private var users: [DFUser] = []

// Add computed property for selected username
private var selectedUsername: String? {
if let userID = filterUserID {
Expand Down
19 changes: 19 additions & 0 deletions Django Files/Views/Preview/Image.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import SwiftUI

struct ImageScrollView: UIViewRepresentable {
let image: UIImage
@Binding var isContentScrolling: Bool

func makeCoordinator() -> Coordinator {
Coordinator(self)
Expand Down Expand Up @@ -120,6 +121,24 @@ struct ImageScrollView: UIViewRepresentable {

imageView.frame = frameToCenter
}

func scrollViewWillBeginDragging(_ scrollView: UIScrollView) {
parent.isContentScrolling = true
}

func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) {
if !decelerate {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
self.parent.isContentScrolling = false
}
}
}

func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
self.parent.isContentScrolling = false
}
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions Django Files/Views/Preview/Info.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ struct PreviewFileInfo: View {
// Photo Information Section
if let dateTime = file.exif?["DateTimeOriginal"]?.value as? String {
HStack {
Image(systemName: "camera")
Image(systemName: "calendar.badge.clock")
.frame(width: 15, height: 15)
.font(.caption)
Text("Captured: \(formatExifDate(dateTime))")
Expand Down Expand Up @@ -142,7 +142,7 @@ struct PreviewFileInfo: View {
let make = file.exif?["Make"]?.value as? String ?? ""
let cameraName = make.isEmpty || model.contains(make) ? model : "\(make) \(model)"
HStack {
Image(systemName: "camera.aperture")
Image(systemName: "camera")
.frame(width: 15, height: 15)
Text("Camera: \(cameraName)")
.font(.caption)
Expand Down
Loading
Loading