Merge branch 'release-2.2.0'

CustomDesignFilePropertyCompatibility.md

@@ -20,6 +20,13 @@
 * **subTitleShadowColor**: Initial Release - Latest
 * **subTitleShadowOffsetX**: Initial Release - Latest
 * **subTitleShadowOffsetY**: Initial Release - Latest
+* **buttonTitleFontName**: 2.2.0 - Latest
+* **buttonTitleFontSize**: 2.2.0 - Latest
+* **buttonResizeableBackgroundImage**: 2.2.0 - Latest
+* **buttonTitleTextColor**: 2.2.0 - Latest
+* **buttonTitleShadowColor**: 2.2.0 - Latest
+* **buttonTitleShadowOffsetX**: 2.2.0 - Latest
+* **buttonTitleShadowOffsetY**: 2.2.0 - Latest
 * **blurBackground**: 2.1.3 - Latest
 
 ### Deprecated (Last Release Supported Shown)

CustomDesignFilePropertySpecs.md

@@ -21,6 +21,13 @@
 * **subTitleShadowColor**: Color of the subtitle shadow. String: [#000000, #FFFFFF].
 * **subTitleShadowOffsetX**: Amount of pt to offset in x direction subtitle shadow from subtitle text. Numeric.
 * **subTitleShadowOffsetY**: Amount of pt to offset in y direction subtitle shadow from subtitle text. Numeric.
+* **buttonTitleFontName**: Name of font to use for the button title text. String.
+* **buttonTitleFontSize**: Size of the button title font. Numeric: [0, Max depending on font used]
+* **buttonResizeableBackgroundImage**: Filename of image (in app bundle) to use as a resizeable background image for the button. String.
+* **buttonTitleTextColor**: Color of the button title text. String: [#000000, #FFFFFF].
+* **buttonTitleShadowColor**: Color of the button title shadow. String: [#000000, #FFFFFF].
+* **buttonTitleShadowOffsetX**: Amount of pt to offset in x direction the button title text shadow. Numeric.
+* **buttonTitleShadowOffsetY**: Amount of pt to offset in y direction the button title text shadow. Numeric.
 * **blurBackground**: Enable/disable blurring of the background behind the RMessage. Use in conjunction with
   backgroundColorAlpha. Numeric boolean [0, 1].
 
@@ -33,3 +40,6 @@ For example:
 "backgroundColor": "#FFFFFF",
 "opacity": 1.0
 ```
+
+**Note**: Design file button properties (properties starting with button*) will not take effect when a UIButton is passed in programmatically such as in customizeMessageView:.
+

Example/DemoViewController.m

@@ -21,6 +21,7 @@ - (void)viewDidLoad
   [super viewDidLoad];
   [self.navigationController.navigationBar setTranslucent:YES];
   self.extendedLayoutIncludesOpaqueBars = YES;
+  //[[RMessageView appearance] setTitleSubtitleLabelsSizeToFit:YES];
 }
 
 - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator
@@ -90,6 +91,7 @@ - (IBAction)didTapButton:(id)sender
                                     callback:nil
                                  buttonTitle:NSLocalizedString(@"Update", nil)
                               buttonCallback:^{
+                                [RMessage dismissActiveNotification];
                                 [RMessage showNotificationWithTitle:NSLocalizedString(@"Thanks for updating", nil)
                                                                type:RMessageTypeSuccess
                                                      customTypeName:nil
@@ -127,7 +129,9 @@ - (IBAction)didTapEndless:(id)sender
                                         type:RMessageTypeSuccess
                               customTypeName:nil
                                     duration:RMessageDurationEndless
-                                    callback:nil
+                                    callback:^{NSLog(@"tapped");}
+                        presentingCompletion:^{NSLog(@"presented");}
+                           dismissCompletion:^{NSLog(@"dismissed");}
                                  buttonTitle:nil
                               buttonCallback:nil
                                   atPosition:RMessagePositionTop
@@ -145,7 +149,9 @@ - (IBAction)didTapLong:(id)sender
                                         type:RMessageTypeWarning
                               customTypeName:nil
                                     duration:10.0
-                                    callback:nil
+                                    callback:^{NSLog(@"tapped");}
+                        presentingCompletion:^{NSLog(@"presented");}
+                           dismissCompletion:^{NSLog(@"dismissed");}
                                  buttonTitle:nil
                               buttonCallback:nil
                                   atPosition:RMessagePositionTop
@@ -263,10 +269,22 @@ - (IBAction)didTapNavbarHidden:(id)sender
 }
 */
 
-/*- (void)customizeMessageView:(RMessageView *)messageView
-{
-  messageView.messageOpacity = 0.5f;
-}
-*/
+//- (void)customizeMessageView:(RMessageView *)messageView
+//{
+//  UIButton *button = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 100, 500)];
+//  button.contentEdgeInsets = UIEdgeInsetsMake(250, 25, 250, 25);
+//  [button setTitle:@"hey there" forState:UIControlStateNormal];
+//  button.titleLabel.font = [UIFont boldSystemFontOfSize:12.f];
+//  button.titleLabel.textColor = [UIColor whiteColor];
+//  button.backgroundColor = [UIColor blueColor];
+//  [button addTarget:self action:@selector(buttonTapped) forControlEvents:UIControlEventTouchUpInside];
+//  [messageView setButton:button];
+//  messageView.layer.cornerRadius = 20.f;
+//}
+
+//- (void)buttonTapped
+//{
+//  NSLog(@"button was tapped");
+//}
 
 @end

Example/Podfile

@@ -1,8 +1,13 @@
 source 'https://github.com/CocoaPods/Specs.git'
 
 target "RMessage" do
+  platform :ios, '9.0'
   pod 'HexColors', '~> 4.0'
   pod 'PPTopMostController', :git => 'https://github.com/donileo/PPTopMostController.git'
   pod 'RMessage', :path => '..' 
-  #pod 'Reveal-SDK', :configurations => ['Debug']
+  pod 'Reveal-SDK', :configurations => ['Debug']
+end
+
+target "RMessageTests" do
+  platform :ios, '9.0'
 end

Example/Podfile.lock

@@ -1,20 +1,22 @@
 PODS:
   - HexColors (4.0.0)
   - PPTopMostController (0.0.1)
-  - RMessage (2.1.3):
+  - Reveal-SDK (13)
+  - RMessage (2.1.5):
     - HexColors (~> 4.0)
     - PPTopMostController
 
 DEPENDENCIES:
   - HexColors (~> 4.0)
   - PPTopMostController (from `https://github.com/donileo/PPTopMostController.git`)
+  - Reveal-SDK
   - RMessage (from `..`)
 
 EXTERNAL SOURCES:
   PPTopMostController:
     :git: https://github.com/donileo/PPTopMostController.git
   RMessage:
-    :path: ".."
+    :path: ..
 
 CHECKOUT OPTIONS:
   PPTopMostController:
@@ -24,8 +26,9 @@ CHECKOUT OPTIONS:
 SPEC CHECKSUMS:
   HexColors: 5f95843ef89aff6a72e1fd3a8ebabf205cc43379
   PPTopMostController: ca6c8fd33abd2895d57d86bfe27ae7425b44eea8
-  RMessage: ddccf3531d5aa4c902521a1f3370a1263492a658
+  Reveal-SDK: ccc2b0f8014965ea448b7534a7c2c8da232b75e8
+  RMessage: 31d44bd26a8f353f987d2e7194f3e9ffb203cbf2
 
-PODFILE CHECKSUM: 131e7ff6e87a27628a4f9d5975267cd96e4e7b12
+PODFILE CHECKSUM: 2233336b4650c094ca22d899ca4bcf6aa1acc70d
 
-COCOAPODS: 1.2.1
+COCOAPODS: 1.3.1