From 8f6156235551ad966ef8e10119a7f2e9704c8586 Mon Sep 17 00:00:00 2001 From: Rose <83477269+AtariDreams@users.noreply.github.com> Date: Fri, 18 Nov 2022 19:36:14 -0500 Subject: [PATCH] Fix compiler warnings Including fixing some deprecations --- MastodonSDK/Sources/MastodonExtension/UIImage.swift | 2 +- .../Attachment/AttachmentViewModel+Compress.swift | 2 +- .../Attachment/AttachmentViewModel+Upload.swift | 2 +- .../Attachment/AttachmentViewModel.swift | 2 +- .../View/Content/StatusView+ViewModel.swift | 11 ++++++++--- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/MastodonSDK/Sources/MastodonExtension/UIImage.swift b/MastodonSDK/Sources/MastodonExtension/UIImage.swift index e3560af63..1e02e705e 100644 --- a/MastodonSDK/Sources/MastodonExtension/UIImage.swift +++ b/MastodonSDK/Sources/MastodonExtension/UIImage.swift @@ -48,7 +48,7 @@ extension UIImage { guard let outputImage = filter.outputImage else { return nil } var bitmap = [UInt8](repeating: 0, count: 4) - let context = CIContext(options: [.workingColorSpace: kCFNull]) + let context = CIContext(options: [.workingColorSpace: kCFNull!]) context.render(outputImage, toBitmap: &bitmap, rowBytes: 4, bounds: CGRect(x: 0, y: 0, width: 1, height: 1), format: .RGBA8, colorSpace: nil) return UIColor(red: CGFloat(bitmap[0]) / 255, green: CGFloat(bitmap[1]) / 255, blue: CGFloat(bitmap[2]) / 255, alpha: CGFloat(bitmap[3]) / 255) diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel+Compress.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel+Compress.swift index e5d6702ad..43b2e11e4 100644 --- a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel+Compress.swift +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel+Compress.swift @@ -12,7 +12,7 @@ import SessionExporter import MastodonCore extension AttachmentViewModel { - func comporessVideo(url: URL) async throws -> URL { + func compressVideo(url: URL) async throws -> URL { let urlAsset = AVURLAsset(url: url) let exporter = NextLevelSessionExporter(withAsset: urlAsset) exporter.outputFileType = .mp4 diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel+Upload.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel+Upload.swift index e26e97d35..4f99f0ba1 100644 --- a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel+Upload.swift +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel+Upload.swift @@ -199,7 +199,7 @@ extension AttachmentViewModel { } else { AttachmentViewModel.logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): attachment processing. Retry \(waitProcessRetryCount)/\(waitProcessRetryLimit)") - await Task.sleep(1_000_000_000 * 3) // 3s + try await Task.sleep(nanoseconds: 1_000_000_000 * 3) // 3s } } while waitProcessRetryCount < waitProcessRetryLimit diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel.swift index 18da157c5..ec6f36321 100644 --- a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel.swift +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel.swift @@ -140,7 +140,7 @@ final public class AttachmentViewModel: NSObject, ObservableObject, Identifiable case .video(let fileURL, let mimeType): self.output = output self.update(uploadState: .compressing) - let compressedFileURL = try await comporessVideo(url: fileURL) + let compressedFileURL = try await compressVideo(url: fileURL) output = .video(compressedFileURL, mimeType: mimeType) try? FileManager.default.removeItem(at: fileURL) // remove old file default: diff --git a/MastodonSDK/Sources/MastodonUI/View/Content/StatusView+ViewModel.swift b/MastodonSDK/Sources/MastodonUI/View/Content/StatusView+ViewModel.swift index 1c09cd3f3..65bb9a0c6 100644 --- a/MastodonSDK/Sources/MastodonUI/View/Content/StatusView+ViewModel.swift +++ b/MastodonSDK/Sources/MastodonUI/View/Content/StatusView+ViewModel.swift @@ -304,9 +304,14 @@ extension StatusView.ViewModel { } let paragraphStyle = statusView.contentMetaText.paragraphStyle - if let language = language { - let direction = Locale.characterDirection(forLanguage: language) - paragraphStyle.alignment = direction == .rightToLeft ? .right : .left + if let language = language { + if #available(iOS 16, *) { + let direction = Locale.Language(identifier: language).characterDirection + paragraphStyle.alignment = direction == .rightToLeft ? .right : .left + } else { + let direction = Locale.characterDirection(forLanguage: language) + paragraphStyle.alignment = direction == .rightToLeft ? .right : .left + }; } else { paragraphStyle.alignment = .natural }