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.

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

[TIMOB-19694] Added support for launch screen storyboards for iOS 9 #7412

Merged
merged 17 commits into from
Dec 9, 2015
Merged

[TIMOB-19694] Added support for launch screen storyboards for iOS 9 #7412

merged 17 commits into from
Dec 9, 2015

Conversation

cb1kenobi
Copy link
Contributor

@cb1kenobi
Copy link
Contributor Author

Fixed merge conflicts.

#else
chosenColor = [UIColor blackColor];
#endif
}
Copy link
Collaborator

Choose a reason for hiding this comment

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

If bgColor is not nil, it will not be assigned here. Is that intended?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure what you mean. chosenColor is either bgColor or black. If bgColor is nil, then chosenColor is nil. If chosenColor is nil, then we used to set it to black, but now we check if the colors are defined otherwise fallback to black. The code is good. Not sure what your concern is.

…generateXcodeUuid to member function so that plugins can use it.
… Changed the platform/iphone dest dir from the xcode app dir to the build dir to be in parity with Android and Windows. This will cause issues with existing apps and modules. However, added support for <project-dir>/hooks so people can add logic to copy files to the correct place.
…launch logos with a fallback to DefaultIcon.png. Added logic to remove certain app icons and launch images based on min iOS version and Xcode version. Removed --platform-dir from Android as it was an undocumented hack.
@cheekiatng
Copy link
Contributor

CR and FT passed! APPROVED!

cheekiatng added a commit that referenced this pull request Dec 9, 2015
[TIMOB-19694] Added support for launch screen storyboards for iOS 9
@cheekiatng cheekiatng merged commit bbb64b8 into tidev:master Dec 9, 2015
@cb1kenobi cb1kenobi deleted the timob-19694 branch December 9, 2015 05:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants