Skip to content

56 using interface orientation #2

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
prcolaco wants to merge 2 commits into
base: master
Choose a base branch
from
Open

56 using interface orientation #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d94441f
Updating to use Interface Orientation instead of Device Orientation
Apr 4, 2016
1e09ad8
Merge remote-tracking branch 'yamill/master' into 56-Using-Interface-…
Jun 28, 2016
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
28 changes: 14 additions & 14 deletions iOS/RCTOrientation/Orientation.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ - (void)dealloc

- (void)deviceOrientationDidChange:(NSNotification *)notification
{
UIDeviceOrientation orientation = [[UIDevice currentDevice] orientation];
UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
[self.bridge.eventDispatcher sendDeviceEventWithName:@"specificOrientationDidChange"
body:@{@"specificOrientation": [self getSpecificOrientationStr:orientation]}];

Expand All @@ -41,19 +41,19 @@ - (void)deviceOrientationDidChange:(NSNotification *)notification

}

- (NSString *)getOrientationStr: (UIDeviceOrientation)orientation {
- (NSString *)getOrientationStr: (UIInterfaceOrientation)orientation {
NSString *orientationStr;
switch (orientation) {
case UIDeviceOrientationPortrait:
case UIInterfaceOrientationPortrait:
orientationStr = @"PORTRAIT";
break;
case UIDeviceOrientationLandscapeLeft:
case UIDeviceOrientationLandscapeRight:
case UIInterfaceOrientationLandscapeLeft:
case UIInterfaceOrientationLandscapeRight:

orientationStr = @"LANDSCAPE";
break;

case UIDeviceOrientationPortraitUpsideDown:
case UIInterfaceOrientationPortraitUpsideDown:
orientationStr = @"PORTRAITUPSIDEDOWN";
break;

Expand All @@ -64,22 +64,22 @@ - (NSString *)getOrientationStr: (UIDeviceOrientation)orientation {
return orientationStr;
}

- (NSString *)getSpecificOrientationStr: (UIDeviceOrientation)orientation {
- (NSString *)getSpecificOrientationStr: (UIInterfaceOrientation)orientation {
NSString *orientationStr;
switch (orientation) {
case UIDeviceOrientationPortrait:
case UIInterfaceOrientationPortrait:
orientationStr = @"PORTRAIT";
break;

case UIDeviceOrientationLandscapeLeft:
case UIInterfaceOrientationLandscapeLeft:
orientationStr = @"LANDSCAPE-LEFT";
break;

case UIDeviceOrientationLandscapeRight:
case UIInterfaceOrientationLandscapeRight:
orientationStr = @"LANDSCAPE-RIGHT";
break;

case UIDeviceOrientationPortraitUpsideDown:
case UIInterfaceOrientationPortraitUpsideDown:
orientationStr = @"PORTRAITUPSIDEDOWN";
break;

Expand All @@ -94,14 +94,14 @@ - (NSString *)getSpecificOrientationStr: (UIDeviceOrientation)orientation {

RCT_EXPORT_METHOD(getOrientation:(RCTResponseSenderBlock)callback)
{
UIDeviceOrientation orientation = [[UIDevice currentDevice] orientation];
UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
NSString *orientationStr = [self getOrientationStr:orientation];
callback(@[[NSNull null], orientationStr]);
}

RCT_EXPORT_METHOD(getSpecificOrientation:(RCTResponseSenderBlock)callback)
{
UIDeviceOrientation orientation = [[UIDevice currentDevice] orientation];
UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
NSString *orientationStr = [self getSpecificOrientationStr:orientation];
callback(@[[NSNull null], orientationStr]);
}
Expand Down Expand Up @@ -176,7 +176,7 @@ - (NSString *)getSpecificOrientationStr: (UIDeviceOrientation)orientation {
- (NSDictionary *)constantsToExport
{

UIDeviceOrientation orientation = [[UIDevice currentDevice] orientation];
UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
NSString *orientationStr = [self getOrientationStr:orientation];

return @{
Expand Down