From cb943f181d85a8bcc759c1ef8a193b8440f10688 Mon Sep 17 00:00:00 2001 From: supersimple33 <40609224+supersimple33@users.noreply.github.com> Date: Tue, 30 Sep 2025 14:31:08 -0400 Subject: [PATCH 1/2] feat: Moving initializer to public viz --- Sources/Internal/Models/MCameraMedia.swift | 11 +++-------- .../Public/Models/Public+Model+MCameraMedia.swift | 13 ++++++++++++- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Sources/Internal/Models/MCameraMedia.swift b/Sources/Internal/Models/MCameraMedia.swift index bd055ffd2..ff1bc4aeb 100644 --- a/Sources/Internal/Models/MCameraMedia.swift +++ b/Sources/Internal/Models/MCameraMedia.swift @@ -8,21 +8,16 @@ // // Copyright ©2024 Mijick. All rights reserved. - import SwiftUI public struct MCameraMedia: Sendable { let image: UIImage? let video: URL? - - init?(data: Any?) { - if let image = data as? UIImage { self.image = image; self.video = nil } - else if let video = data as? URL { self.video = video; self.image = nil } - else { return nil } - } } // MARK: Equatable extension MCameraMedia: Equatable { - public static func == (lhs: MCameraMedia, rhs: MCameraMedia) -> Bool { lhs.image == rhs.image && lhs.video == rhs.video } + public static func == (lhs: MCameraMedia, rhs: MCameraMedia) -> Bool { + lhs.image == rhs.image && lhs.video == rhs.video + } } diff --git a/Sources/Public/Models/Public+Model+MCameraMedia.swift b/Sources/Public/Models/Public+Model+MCameraMedia.swift index 16ceecbce..49a1b6293 100644 --- a/Sources/Public/Models/Public+Model+MCameraMedia.swift +++ b/Sources/Public/Models/Public+Model+MCameraMedia.swift @@ -8,11 +8,22 @@ // // Copyright ©2024 Mijick. All rights reserved. - import SwiftUI // MARK: Getters public extension MCameraMedia { + init?(data: Any?) { + if let image = data as? UIImage { + self.image = image + self.video = nil + } else if let video = data as? URL { + self.video = video + self.image = nil + } else { + return nil + } + } + /** Gets the image from the media object. */ From 15d648f8963265ee35f966276068b9db54639c1a Mon Sep 17 00:00:00 2001 From: supersimple33 <40609224+supersimple33@users.noreply.github.com> Date: Tue, 30 Sep 2025 14:39:35 -0400 Subject: [PATCH 2/2] Making setCapturedMedia to public viz --- Sources/Internal/Manager/CameraManager.swift | 7 ------- .../Manager/Public+Manager+CameraManager.swift | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 Sources/Public/Manager/Public+Manager+CameraManager.swift diff --git a/Sources/Internal/Manager/CameraManager.swift b/Sources/Internal/Manager/CameraManager.swift index 1a1cc327e..6f24b2bb7 100644 --- a/Sources/Internal/Manager/CameraManager.swift +++ b/Sources/Internal/Manager/CameraManager.swift @@ -151,13 +151,6 @@ extension CameraManager { } } -// MARK: Set Captured Media -extension CameraManager { - func setCapturedMedia(_ capturedMedia: MCameraMedia?) { withAnimation(.mSpring) { - attributes.capturedMedia = capturedMedia - }} -} - // MARK: Set Camera Output extension CameraManager { func setOutputType(_ outputType: CameraOutputType) { diff --git a/Sources/Public/Manager/Public+Manager+CameraManager.swift b/Sources/Public/Manager/Public+Manager+CameraManager.swift new file mode 100644 index 000000000..a2b22f041 --- /dev/null +++ b/Sources/Public/Manager/Public+Manager+CameraManager.swift @@ -0,0 +1,17 @@ +// +// Public+Manager+CameraManager.swift of MijickCamera +// +// Created by Addison Hanrattie. Sending ❤️ from US! +// +// Copyright ©2024 Mijick. All rights reserved. + +import SwiftUI + +// MARK: Set Captured Media +public extension CameraManager { + func setCapturedMedia(_ capturedMedia: MCameraMedia?) { + withAnimation(.mSpring) { + attributes.capturedMedia = capturedMedia + } + } +}