Skip to content
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

Fix issue #10 #11

Merged
merged 4 commits into from
Aug 18, 2015
Merged

Fix issue #10 #11

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2dbfd1
Fix crashes when using frameworks
serluca Aug 3, 2015
67207f7
Suppress warnings
serluca Aug 3, 2015
53d150e
Indentation
serluca Aug 4, 2015
f9aebce
Four spaces for each level of indentation
serluca Aug 5, 2015
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
15 changes: 7 additions & 8 deletions Source/PTEDashboard.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ - (instancetype)initWithFrame:(CGRect)frame
}

// Load Storyboard
self.rootViewController = [[UIStoryboard storyboardWithName:@"LumberjackConsole"
bundle:nil] instantiateInitialViewController];
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"LumberjackConsole" bundle:[NSBundle bundleForClass:[self class]]];
self.rootViewController = [storyboard instantiateInitialViewController];
Copy link
Member

Choose a reason for hiding this comment

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

Looks good. Just what happened to the indentation?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry, probably we are using different indentation settings

Copy link
Member

Choose a reason for hiding this comment

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

Yes, probably mines are the default ones. Could you just fix them so I can merge it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should be ok now, the problem is that it is perfectly indented in my Xcode.
Xcode automatically align the indentation

// Save references
NSArray * subviews = self.rootViewController.view.subviews;
_consoleTableView = subviews[0];
Expand Down Expand Up @@ -107,13 +107,12 @@ - (void)handleStatusBarOrientationChange:(NSNotification *)notification

// Flip the window's height and width?
CGRect frame = self.frame;
if ((UIDeviceOrientationIsLandscape(currentOrientation) && UIDeviceOrientationIsPortrait(nextOrientation)) ||
(UIDeviceOrientationIsPortrait(currentOrientation) && UIDeviceOrientationIsLandscape(nextOrientation)))
if ((UIInterfaceOrientationIsLandscape(currentOrientation) && UIInterfaceOrientationIsPortrait(nextOrientation)) ||
(UIInterfaceOrientationIsPortrait(currentOrientation) && UIInterfaceOrientationIsLandscape(nextOrientation)))
{
frame.size = CGSizeMake(frame.size.height,
frame.size.width);
frame.size = CGSizeMake(frame.size.height,frame.size.width);
}
Copy link
Member

Choose a reason for hiding this comment

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

Same here.

// Calculate the transform and origin
CGAffineTransform transform;
switch (nextOrientation)
Expand Down