This repository was archived by the owner on Feb 25, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 6k
[ios] use interfaceOrientation orientation on iOS 13 and above #42846
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
4fecb34
use interfaceOrientation on window scene for iOS 13 and above
a1165e8
test
739dbae
bail if window scene does not exsit
f21f258
move interface to .h file
5b0b723
review
72a844e
Merge branch 'main' into status_bar_orientation
1130d20
add comment
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -618,11 +618,19 @@ - (UIScreen*)mainScreenIfViewLoaded { | |
| if (self.viewIfLoaded == nil) { | ||
| FML_LOG(WARNING) << "Trying to access the view before it is loaded."; | ||
| } | ||
| return self.viewIfLoaded.window.windowScene.screen; | ||
| return [self windowSceneIfViewLoaded].screen; | ||
| } | ||
| return UIScreen.mainScreen; | ||
| } | ||
|
|
||
| - (UIWindowScene*)windowSceneIfViewLoaded { | ||
| if (self.viewIfLoaded == nil) { | ||
| FML_LOG(WARNING) << "Trying to access the view before it is loaded."; | ||
| return nil; | ||
| } | ||
| return self.viewIfLoaded.window.windowScene; | ||
| } | ||
|
|
||
| - (BOOL)loadDefaultSplashScreenView { | ||
| NSString* launchscreenName = | ||
| [[[NSBundle mainBundle] infoDictionary] objectForKey:@"UILaunchStoryboardName"]; | ||
|
|
@@ -1858,8 +1866,19 @@ - (void)performOrientationUpdate:(UIInterfaceOrientationMask)new_preferences { | |
| [self setNeedsUpdateOfSupportedInterfaceOrientations]; | ||
| } | ||
| } else { | ||
| UIInterfaceOrientationMask currentInterfaceOrientation = | ||
| 1 << [[UIApplication sharedApplication] statusBarOrientation]; | ||
| UIInterfaceOrientationMask currentInterfaceOrientation; | ||
| if (@available(iOS 13.0, *)) { | ||
| UIWindowScene* windowScene = [self windowSceneIfViewLoaded]; | ||
| if (!windowScene) { | ||
| // When the view is not loaded, it does not make sense to access the interface | ||
| // orientation, bail. | ||
| FML_LOG(WARNING) << "Trying to access the window scene before the view is loaded."; | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. maybe add comment explaining when this will happen? |
||
| return; | ||
| } | ||
| currentInterfaceOrientation = 1 << windowScene.interfaceOrientation; | ||
| } else { | ||
| currentInterfaceOrientation = 1 << [[UIApplication sharedApplication] statusBarOrientation]; | ||
| } | ||
| if (!(_orientationPreferences & currentInterfaceOrientation)) { | ||
| [UIViewController attemptRotationToDeviceOrientation]; | ||
| // Force orientation switch if the current orientation is not allowed | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
unreachable