diff --git a/README.md b/README.md index a84a1f0..9ce8869 100755 --- a/README.md +++ b/README.md @@ -15,9 +15,12 @@ pod 'EvernoteSDK', '~> 3.0' Drag & Drop `evernote-sdk-ios.xcodeproj` into your project. -Now open your target's `Build Phases` and add the following items to your `Link Binary With Libraries` section: +Now open your target's `Build Phases` and add the following items to your `Embed Frameworks` section: - EvernoteSDKiOS.framework + +and add the following items to your `Link Binary With Libraries` section: + - MobileCoreServices.framework - libxml2.dylib diff --git a/evernote-sdk-ios/ENSDK/Private/ENNotebookCell.m b/evernote-sdk-ios/ENSDK/Private/ENNotebookCell.m index f45f601..02c07cc 100644 --- a/evernote-sdk-ios/ENSDK/Private/ENNotebookCell.m +++ b/evernote-sdk-ios/ENSDK/Private/ENNotebookCell.m @@ -44,7 +44,7 @@ - (id)initWithReuseIdentifier:(NSString *)reuseIdentifier [self setSeparatorInset:UIEdgeInsetsMake(0.0, kCellInsetLeft, 0.0, 0.0)]; self.checkButton = [[UIButton alloc] init]; [self.contentView addSubview:self.checkButton]; - [self.checkButton setImage:[[UIImage imageNamed:@"ENSDKResources.bundle/ENCheckIcon"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate] forState:UIControlStateNormal]; + [self.checkButton setImage:[[UIImage imageNamed:@"ENSDKResources.bundle/ENCheckIcon" inBundle:[NSBundle bundleForClass:[self class]] compatibleWithTraitCollection:nil] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate] forState:UIControlStateNormal]; [self.checkButton sizeToFit]; [self.checkButton setTintColor:[ENTheme defaultTintColor]]; [self.checkButton setCenter:CGPointMake(0.6 * kCellInsetLeft, CGRectGetMidY(self.bounds) + 1.0)]; diff --git a/evernote-sdk-ios/ENSDK/Private/ENNotebookTypeView.m b/evernote-sdk-ios/ENSDK/Private/ENNotebookTypeView.m index ff8d0a8..6aac1c2 100644 --- a/evernote-sdk-ios/ENSDK/Private/ENNotebookTypeView.m +++ b/evernote-sdk-ios/ENSDK/Private/ENNotebookTypeView.m @@ -52,7 +52,7 @@ - (id)initWithFrame:(CGRect)frame - (void)setIsBusiness:(BOOL)isBusiness { _isBusiness = isBusiness; - UIImage* notebookTypeIcon = isBusiness? [UIImage imageNamed:@"ENSDKResources.bundle/ENBusinessIcon"] : [UIImage imageNamed:@"ENSDKResources.bundle/ENMultiplePeopleIcon"]; + UIImage* notebookTypeIcon = isBusiness? [UIImage imageNamed:@"ENSDKResources.bundle/ENBusinessIcon" inBundle:[NSBundle bundleForClass:[self class]] compatibleWithTraitCollection:nil] : [UIImage imageNamed:@"ENSDKResources.bundle/ENMultiplePeopleIcon" inBundle:[NSBundle bundleForClass:[self class]] compatibleWithTraitCollection:nil]; _imageView.image = [notebookTypeIcon imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; [_imageView sizeToFit]; [self updateNotebookTypeIconColor]; diff --git a/evernote-sdk-ios/ENSDK/SendToEvernoteActivity/ENNotebookPickerButton.m b/evernote-sdk-ios/ENSDK/SendToEvernoteActivity/ENNotebookPickerButton.m index d563c97..4e5bb57 100644 --- a/evernote-sdk-ios/ENSDK/SendToEvernoteActivity/ENNotebookPickerButton.m +++ b/evernote-sdk-ios/ENSDK/SendToEvernoteActivity/ENNotebookPickerButton.m @@ -48,7 +48,7 @@ - (id)initWithFrame:(CGRect)frame // Initialization code self.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight; - UIImage *dislosureImage = [[UIImage imageNamed:@"ENSDKResources.bundle/ENNextIcon"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; + UIImage *dislosureImage = [[UIImage imageNamed:@"ENSDKResources.bundle/ENNextIcon" inBundle:[NSBundle bundleForClass:[self class]] compatibleWithTraitCollection:nil] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; self.discloureIndicator = [[UIImageView alloc] initWithImage:dislosureImage]; [self.discloureIndicator setTintColor:[UIColor colorWithRed:0.8 green:0.8 blue:0.8 alpha:1]]; @@ -65,7 +65,7 @@ - (void)setIsBusinessNotebook:(BOOL)isBusinessNotebook { if (_isBusinessNotebook == isBusinessNotebook) return; _isBusinessNotebook = isBusinessNotebook; if (_isBusinessNotebook) { - [self setImage:[[UIImage imageNamed:@"ENSDKResources.bundle/ENBusinessIcon"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate] forState:UIControlStateNormal]; + [self setImage:[[UIImage imageNamed:@"ENSDKResources.bundle/ENBusinessIcon" inBundle:[NSBundle bundleForClass:[self class]] compatibleWithTraitCollection:nil] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate] forState:UIControlStateNormal]; } else { [self setImage:nil forState:UIControlStateNormal]; } diff --git a/evernote-sdk-ios/ENSDK/SendToEvernoteActivity/ENSaveToEvernoteActivity.m b/evernote-sdk-ios/ENSDK/SendToEvernoteActivity/ENSaveToEvernoteActivity.m index 94bff0f..349ac0f 100644 --- a/evernote-sdk-ios/ENSDK/SendToEvernoteActivity/ENSaveToEvernoteActivity.m +++ b/evernote-sdk-ios/ENSDK/SendToEvernoteActivity/ENSaveToEvernoteActivity.m @@ -54,7 +54,7 @@ - (NSString *)activityTitle - (UIImage *)activityImage { - return [UIImage imageNamed:@"ENSDKResources.bundle/ENActivityIcon"]; + return [UIImage imageNamed:@"ENSDKResources.bundle/ENActivityIcon" inBundle:[NSBundle bundleForClass:[self class]] compatibleWithTraitCollection:nil]; } - (BOOL)canPerformWithActivityItems:(NSArray *)activityItems