Skip to content

Commit

Permalink
Add -Wno-implicit-retain-self to podspec + smaller cleanups (#1209)
Browse files Browse the repository at this point in the history
  • Loading branch information
maicki committed Nov 4, 2018
1 parent a3194f8 commit aad0b5d
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Texture.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Pod::Spec.new do |spec|
# These will be lowered into subspecs in the future. Only here for ASVideoNode.
core.frameworks = ['AVFoundation', 'CoreMedia']

core.compiler_flags = '-fno-exceptions'
core.compiler_flags = '-fno-exceptions -Wno-implicit-retain-self'
core.public_header_files = [
'Source/*.h',
'Source/Details/**/*.h',
Expand Down
4 changes: 4 additions & 0 deletions examples/ASDKgram/Sample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,7 @@
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -443,6 +444,7 @@
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -470,6 +472,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
Expand All @@ -489,6 +492,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
Expand Down
9 changes: 5 additions & 4 deletions examples/ASDKgram/Sample/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,23 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
// ASDK Home Feed viewController & navController
PhotoFeedNodeController *asdkHomeFeedVC = [[PhotoFeedNodeController alloc] init];
UINavigationController *asdkHomeFeedNavCtrl = [[UINavigationController alloc] initWithRootViewController:asdkHomeFeedVC];
asdkHomeFeedNavCtrl.navigationBar.barStyle = UIBarStyleBlack;
asdkHomeFeedNavCtrl.tabBarItem = [[UITabBarItem alloc] initWithTitle:@"ASDK" image:[UIImage imageNamed:@"home"] tag:0];
asdkHomeFeedNavCtrl.hidesBarsOnSwipe = YES;

// ListKit Home Feed viewController & navController
PhotoFeedListKitViewController *listKitHomeFeedVC = [[PhotoFeedListKitViewController alloc] init];
UINavigationController *listKitHomeFeedNavCtrl = [[UINavigationController alloc] initWithRootViewController:listKitHomeFeedVC];
listKitHomeFeedNavCtrl.navigationBar.barStyle = UIBarStyleBlack;
listKitHomeFeedNavCtrl.tabBarItem = [[UITabBarItem alloc] initWithTitle:@"ListKit" image:[UIImage imageNamed:@"home"] tag:0];
listKitHomeFeedNavCtrl.hidesBarsOnSwipe = YES;



// UIKit Home Feed viewController & navController
PhotoFeedViewController *uikitHomeFeedVC = [[PhotoFeedViewController alloc] init];
UINavigationController *uikitHomeFeedNavCtrl = [[UINavigationController alloc] initWithRootViewController:uikitHomeFeedVC];
uikitHomeFeedNavCtrl.navigationBar.barStyle = UIBarStyleBlack;
uikitHomeFeedNavCtrl.tabBarItem = [[UITabBarItem alloc] initWithTitle:@"UIKit" image:[UIImage imageNamed:@"home"] tag:0];
uikitHomeFeedNavCtrl.hidesBarsOnSwipe = YES;

Expand All @@ -70,10 +75,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
[[UINavigationBar appearance] setBarTintColor:[UIColor darkBlueColor]];
[[UINavigationBar appearance] setTranslucent:NO];

// iOS8 hides the status bar in landscape orientation, this forces the status bar hidden status to NO
[application setStatusBarHidden:YES withAnimation:UIStatusBarAnimationNone];
[application setStatusBarHidden:NO withAnimation:UIStatusBarAnimationNone];

#if WEAVER
WVDebugger *debugger = [WVDebugger defaultInstance];
[debugger enableLayoutElementDebuggingWithApplication:application];
Expand Down
4 changes: 1 addition & 3 deletions examples/ASDKgram/Sample/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
<array>
<string>armv7</string>
</array>
<key>UIStatusBarStyle</key>
<string>UIStatusBarStyleLightContent</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
Expand All @@ -46,6 +44,6 @@
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<true/>
</dict>
</plist>
5 changes: 5 additions & 0 deletions examples/ASDKgram/Sample/PhotoFeedBaseController.m
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@ - (UIStatusBarStyle)preferredStatusBarStyle
return UIStatusBarStyleLightContent;
}

- (BOOL)prefersStatusBarHidden
{
return NO;
}

- (CGSize)imageSizeForScreenWidth
{
CGRect screenRect = [[UIScreen mainScreen] bounds];
Expand Down
12 changes: 12 additions & 0 deletions examples/ASDKgram/Sample/PhotoFeedListKitViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ - (instancetype)init
UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
ASCollectionNode *node = [[ASCollectionNode alloc] initWithCollectionViewLayout:layout];
if (self = [super initWithNode:node]) {
self.navigationItem.title = @"ListKit";

CGRect screenRect = [[UIScreen mainScreen] bounds];
CGFloat screenScale = [[UIScreen mainScreen] scale];
CGSize screenWidthImageSize = CGSizeMake(screenRect.size.width * screenScale, screenRect.size.width * screenScale);
Expand Down Expand Up @@ -81,6 +83,16 @@ - (UIActivityIndicatorView *)spinner
return _spinner;
}

- (UIStatusBarStyle)preferredStatusBarStyle
{
return UIStatusBarStyleLightContent;
}

- (BOOL)prefersStatusBarHidden
{
return NO;
}

#pragma mark - IGListAdapterDataSource

- (NSArray<id <IGListDiffable>> *)objectsForListAdapter:(IGListAdapter *)listAdapter
Expand Down

0 comments on commit aad0b5d

Please sign in to comment.