Skip to content

Fix orientation lock setting app to all after closing camera #105

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
samdogg7 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix orientation lock setting app to all after closing camera #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Sources/Internal/UI/MCamera/MCamera+Config.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ extension MCamera { @MainActor class Config {

// MARK: Others
var appDelegate: MApplicationDelegate.Type? = nil
var originalOrientationLock: UIInterfaceOrientationMask = .all
var isCameraConfigured: Bool = false
}}
2 changes: 1 addition & 1 deletion Sources/Internal/UI/MCamera/MCamera.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ private extension MCamera {
}
private extension MCamera {
func lockScreenOrientation(_ orientation: UIInterfaceOrientationMask?) {
config.appDelegate?.orientationLock = orientation ?? .all
config.appDelegate?.orientationLock = orientation ?? config.originalOrientationLock
Copy link
Author

@samdogg7 samdogg7 May 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When calling lockScreenOrientation(nil) we will fallback to the original value set in AppDelegate (such as .portrait)

UINavigationController.attemptRotationToDeviceOrientation()
}
func notifyUserOfMediaCaptured(_ capturedMedia: MCameraMedia) {
Expand Down
8 changes: 7 additions & 1 deletion Sources/Public/Camera Settings/Public+CameraSettings+MCamera.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,13 @@ public extension MCamera {
}
```
*/
func lockCameraInPortraitOrientation(_ appDelegate: MApplicationDelegate.Type) -> Self { config.appDelegate = appDelegate; manager.attributes.orientationLocked = true; return self }
func lockCameraInPortraitOrientation(_ appDelegate: MApplicationDelegate.Type) -> Self {
config.appDelegate = appDelegate
config.originalOrientationLock = appDelegate.orientationLock
Copy link
Author

@samdogg7 samdogg7 May 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Captures the AppDelegate's orientationLock and stores it as a default

manager.attributes.orientationLocked = true

return self
}

/**
Starts the camera session.
Expand Down