Pushwoosh Inbox UI 6.0.1

https://github.com/Pushwoosh/pushwoosh-inbox-ui-ios-sdk/releases/tag/6.0.1

Framework/PushwooshInboxUI.framework/Versions/A/Headers/PWIInboxStyle.h

@@ -26,6 +26,9 @@ typedef NSString * (^PWIDateFormatterBlock)(NSDate *date, NSObject *owner);
 //! The default text color
 @property (nonatomic, readwrite) UIColor *defaultTextColor;
 
+//! The text color of a read notification
+@property (nonatomic, readwrite) UIColor *readTextColor;
+
 //! The default background color
 @property (nonatomic, readwrite) UIColor *backgroundColor;
 
@@ -53,6 +56,9 @@ typedef NSString * (^PWIDateFormatterBlock)(NSDate *date, NSObject *owner);
 //! The color of message titles
 @property (nonatomic, readwrite) UIColor *titleColor;
 
+//! The title color for read notifications
+@property (nonatomic, readwrite) UIColor *readTitleColor;
+
 //! The color of messages descriptions
 @property (nonatomic, readwrite) UIColor *descriptionColor;
 

Framework/PushwooshInboxUI.framework/Versions/A/Headers/PWIInboxUI.h

@@ -31,4 +31,9 @@
  */
 + (PWIInboxViewController *)createInboxControllerWithStyle:(PWIInboxStyle *)style;
 
+/**
+ @return PWIInboxViewController with a specified style and height of table view
+ */
++ (PWIInboxViewController *)createInboxControllerWithStyle:(PWIInboxStyle *)style andContentHeight:(CGFloat)contentHeight;
+
 @end

PushwooshInboxUI.podspec

@@ -5,7 +5,7 @@ Pod::Spec.new do |s|
   s.summary      = "Pushwoosh Inbox UI library by Pushwoosh."
   s.platform     = :ios
   s.ios.deployment_target  = '8.0'
-  s.version      = "6.0.0"
+  s.version      = "6.0.1"
   s.description  = "Pushwoosh Inbox UI library by Pushwoosh. " \
                    "http://www.pushwoosh.com "
 

PushwooshInboxUI/PushwooshInboxUI/Info.plist

@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.0.0</string>
+	<string>6.0.1</string>
 	<key>CFBundleVersion</key>
-	<string>6.0.0</string>
+	<string>6.0.1</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

PushwooshInboxUI/PushwooshInboxUI/Public/PWIInboxStyle.h

@@ -26,6 +26,9 @@ typedef NSString * (^PWIDateFormatterBlock)(NSDate *date, NSObject *owner);
 //! The default text color
 @property (nonatomic, readwrite) UIColor *defaultTextColor;
 
+//! The text color of a read notification
+@property (nonatomic, readwrite) UIColor *readTextColor;
+
 //! The default background color
 @property (nonatomic, readwrite) UIColor *backgroundColor;
 
@@ -53,6 +56,9 @@ typedef NSString * (^PWIDateFormatterBlock)(NSDate *date, NSObject *owner);
 //! The color of message titles
 @property (nonatomic, readwrite) UIColor *titleColor;
 
+//! The title color for read notifications
+@property (nonatomic, readwrite) UIColor *readTitleColor;
+
 //! The color of messages descriptions
 @property (nonatomic, readwrite) UIColor *descriptionColor;
 

PushwooshInboxUI/PushwooshInboxUI/Public/PWIInboxUI.h

@@ -31,4 +31,9 @@
  */
 + (PWIInboxViewController *)createInboxControllerWithStyle:(PWIInboxStyle *)style;
 
+/**
+ @return PWIInboxViewController with a specified style and height of table view
+ */
++ (PWIInboxViewController *)createInboxControllerWithStyle:(PWIInboxStyle *)style andContentHeight:(CGFloat)contentHeight;
+
 @end

PushwooshInboxUI/PushwooshInboxUI/Public/PWIInboxUI.m

@@ -19,4 +19,9 @@ + (UIViewController *)createInboxControllerWithStyle:(PWIInboxStyle *)style {
     return inboxViewController;
 }
 
++ (UIViewController *)createInboxControllerWithStyle:(PWIInboxStyle *)style andContentHeight:(CGFloat)contentHeight {
+    PWIInboxViewController *inboxViewController = [[PWIInboxViewController alloc] initWithStyle:style andContentHeight:contentHeight];
+    return inboxViewController;
+}
+
 @end

PushwooshInboxUI/PushwooshInboxUI/ViewControllers/PWIInboxMessageViewCell.m

@@ -49,7 +49,7 @@ - (void)updateStyle:(PWIInboxStyle *)style {
 - (void)updateMessage:(NSObject<PWInboxMessageProtocol> *)message {
     _message = message;
     _titleLabel.attributedText = [self titleAttributedStringForMessage:message];
-    _messageLabel.text = message.message;
+    _messageLabel.attributedText = [self textAttributedStringForMessage:message];
     [_inboxImageView pwi_loadImageFromUrl:message.imageUrl callback:nil];
     if (!message.imageUrl.length) {
         _inboxImageView.image = _style.defaultImageIcon;
@@ -87,7 +87,11 @@ - (NSAttributedString *)titleAttributedStringForMessage:(NSObject<PWInboxMessage
     }
 
     if (message.title) {
-        [string appendAttributedString:[[NSAttributedString alloc] initWithString:message.title]];
+        if (message.isRead && _style.readTitleColor) {
+            [string appendAttributedString:[[NSAttributedString alloc] initWithString:message.title attributes:@{NSForegroundColorAttributeName : _style.readTitleColor}]];
+        } else {
+            [string appendAttributedString:[[NSAttributedString alloc] initWithString:message.title]];
+        }
     }
 
     if (message.sendDate) {
@@ -102,6 +106,16 @@ - (NSAttributedString *)titleAttributedStringForMessage:(NSObject<PWInboxMessage
     return string;
 }
 
+- (NSAttributedString *)textAttributedStringForMessage:(NSObject<PWInboxMessageProtocol> *)message {
+    return (message.isRead && _style.readTextColor) ? [self textMessage:message.message textColor:_style.readTextColor] : [self textMessage:message.message textColor:_style.defaultTextColor];
+}
+
+- (NSMutableAttributedString *)textMessage:(NSString *)message textColor:(UIColor *)color {
+    NSMutableAttributedString *modifiedMessage = [[NSMutableAttributedString alloc] init];
+    [modifiedMessage appendAttributedString:[[NSAttributedString alloc] initWithString:message attributes:@{NSForegroundColorAttributeName : color}]];
+    return modifiedMessage;
+}
+
 - (IBAction)attachmentButtonTapped:(id)sender {
     _inboxAttachmentTappedCallback(_inboxAttachmentImageView, _message.attachmentUrl);
 }

PushwooshInboxUI/PushwooshInboxUI/ViewControllers/PWIInboxViewController.h

@@ -13,5 +13,6 @@
 @interface PWIInboxViewController (Internal)
 
 - (instancetype)initWithStyle:(PWIInboxStyle *)style;
+- (instancetype)initWithStyle:(PWIInboxStyle *)style andContentHeight:(CGFloat)contentHeight;
 
 @end

PushwooshInboxUI/PushwooshInboxUI/ViewControllers/PWIInboxViewController.m

@@ -32,6 +32,7 @@ @interface PWIInboxViewController () <UITableViewDelegate, UITableViewDataSource
 @property (weak, nonatomic) UIRefreshControl *refreshControl;
 @property (weak, nonatomic) NSObject *observer;
 @property (nonatomic) BOOL isLoading;
+@property (nonatomic) CGFloat tableViewHeight;
 
 @end
 
@@ -46,6 +47,16 @@ - (instancetype)initWithStyle:(PWIInboxStyle *)style {
     return self;
 }
 
+- (instancetype)initWithStyle:(PWIInboxStyle *)style andContentHeight:(CGFloat)contentHeight {
+    NSString *stringName = self.nibName;
+    if (self = [super initWithNibName:stringName bundle:[NSBundle pwi_bundleForClass:self.class]]) {
+        _style = style;
+        _tableViewHeight = contentHeight;
+        self.title = NSLocalizedString(@"Inbox",);
+    }
+    return self;
+}
+
 - (NSString *)nibName {
     return @"PWIInboxViewController";
 }
@@ -138,6 +149,9 @@ - (void)viewDidLoad {
 
 - (void)viewDidLayoutSubviews {
     [super viewDidLayoutSubviews];
+
+    _tableView.frame = CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height-self.tableViewHeight);
+
     if (self.navigationController.navigationBar.translucent) {
         CGRect navigationBarRect = self.navigationController.navigationBar.frame;
         float insetsY = navigationBarRect.size.height + navigationBarRect.origin.y;