permissionlesstech/bitchat
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat.git synced 2026-07-25 01:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Limit PhotosPicker to iOS only to fix CI

Browse Source 
PhotosPickerItem has SDK availability issues on macOS in CI.
Change PhotosPicker from canImport(PhotosUI) to os(iOS) only.

macOS users can still import images via file importer (.fileImporter).
This is actually cleaner as macOS file picker is more familiar to users.

Fixes CI build failures.
This commit is contained in:
jack
2025-10-15 00:11:30 +02:00
parent 826c7537bf
commit 1207ac2af5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitchat/Views/ContentView.swift
+4 -4
View File
@@ -73,7 +73,7 @@ struct ContentView: View {
@State private var recordingTimer: Timer? @State private var recordingTimer: Timer?
@State private var recordingStartDate: Date? @State private var recordingStartDate: Date?
@State private var showFileImporter = false @State private var showFileImporter = false
#if canImport(PhotosUI) && ((os(iOS) && compiler(>=5.7)) || (os(macOS) && compiler(>=5.7))) #if os(iOS)
@State private var showPhotoPicker = false @State private var showPhotoPicker = false
@State private var selectedPhotoPickerItem: PhotosPickerItem? @State private var selectedPhotoPickerItem: PhotosPickerItem?
#endif #endif
@@ -210,7 +210,7 @@ struct ContentView: View {
FingerprintView(viewModel: viewModel, peerID: peerID) FingerprintView(viewModel: viewModel, peerID: peerID)
} }
} }
#if canImport(PhotosUI) && ((os(iOS) && compiler(>=5.7)) || (os(macOS) && compiler(>=5.7))) #if os(iOS)
.photosPicker(isPresented: $showPhotoPicker, selection: $selectedPhotoPickerItem, matching: .images) .photosPicker(isPresented: $showPhotoPicker, selection: $selectedPhotoPickerItem, matching: .images)
.onChange(of: selectedPhotoPickerItem) { newItem in .onChange(of: selectedPhotoPickerItem) { newItem in
guard let item = newItem else { return } guard let item = newItem else { return }
@@ -229,7 +229,7 @@ struct ContentView: View {
} }
} }
.confirmationDialog("Attach", isPresented: $showAttachmentActions, titleVisibility: .visible) { .confirmationDialog("Attach", isPresented: $showAttachmentActions, titleVisibility: .visible) {
#if canImport(PhotosUI) && ((os(iOS) && compiler(>=5.7)) || (os(macOS) && compiler(>=5.7))) #if os(iOS)
Button("Image") { Button("Image") {
showAttachmentActions = false showAttachmentActions = false
DispatchQueue.main.async { showPhotoPicker = true } DispatchQueue.main.async { showPhotoPicker = true }
@@ -1982,7 +1982,7 @@ private extension ContentView {
} }
} }
#if canImport(PhotosUI) && ((os(iOS) && compiler(>=5.7)) || (os(macOS) && compiler(>=5.7))) #if os(iOS)
func handlePhotoSelection(_ item: PhotosPickerItem) async { func handlePhotoSelection(_ item: PhotosPickerItem) async {
defer { Task { @MainActor in selectedPhotoPickerItem = nil } } defer { Task { @MainActor in selectedPhotoPickerItem = nil } }
do { do {