Merge branch 'release-2.2.2'

isadon · Mar 14, 2018 · 5650beb · 5650beb
2 parents 15ac53d + 002b9a4
commit 5650beb
Show file tree

Hide file tree

Showing 42 changed files with 767 additions and 976 deletions.
diff --git a/CustomDesignFilePropertySpecs.md b/CustomDesignFilePropertySpecs.md
@@ -29,7 +29,7 @@
 * **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].
+  backgroundColorAlpha. Numeric boolean [0, 1]. **Does nothing on devices running iOS7 and below.**
 
 Property keys are always strings, values can be string or numeric. If specifying a numeric value don't encapsulate the numeric value in a string.
 [x,y] Signifies the range of values x to y that are allowed for the field.

diff --git a/Example/DemoViewController.m b/Example/DemoViewController.m
@@ -45,35 +45,35 @@ - (void)viewDidAppear:(BOOL)animated
 - (IBAction)didTapError:(id)sender
 {
   [RMessage
-    showNotificationWithTitle:NSLocalizedString(@"Something failed", nil)
-                     subtitle:NSLocalizedString(@"The internet connection seems to be down. Please check it!", nil)
+    showNotificationWithTitle:@"Something failed"
+                     subtitle:@"The internet connection seems to be down. Please check it!"
                          type:RMessageTypeError
                customTypeName:nil
                      callback:nil];
 }
 
 - (IBAction)didTapWarning:(id)sender
 {
-  [RMessage showNotificationWithTitle:NSLocalizedString(@"Some random warning", nil)
-                             subtitle:NSLocalizedString(@"Look out! Something is happening there!", nil)
+  [RMessage showNotificationWithTitle:@"Some random warning"
+                             subtitle:@"Look out! Something is happening there!"
                                  type:RMessageTypeWarning
                        customTypeName:nil
                              callback:nil];
 }
 
 - (IBAction)didTapMessage:(id)sender
 {
-  [RMessage showNotificationWithTitle:NSLocalizedString(@"Tell the user something", nil)
-                             subtitle:NSLocalizedString(@"This is a neutral notification!", nil)
+  [RMessage showNotificationWithTitle:@"Tell the user something"
+                             subtitle:@"This is a neutral notification!"
                                  type:RMessageTypeNormal
                        customTypeName:nil
                              callback:nil];
 }
 
 - (IBAction)didTapSuccess:(id)sender
 {
-  [RMessage showNotificationWithTitle:NSLocalizedString(@"Success", nil)
-                             subtitle:NSLocalizedString(@"Some task was successfully completed!", nil)
+  [RMessage showNotificationWithTitle:@"Success"
+                             subtitle:@"Some task was successfully completed!"
                                  type:RMessageTypeSuccess
                        customTypeName:nil
                              callback:nil];
@@ -82,17 +82,17 @@ - (IBAction)didTapSuccess:(id)sender
 - (IBAction)didTapButton:(id)sender
 {
   [RMessage showNotificationInViewController:self
-                                       title:NSLocalizedString(@"New version available", nil)
-                                    subtitle:NSLocalizedString(@"Please update our app. We would be very thankful", nil)
+                                       title:@"New version available"
+                                    subtitle:@"Please update our app. We would be very thankful"
                                    iconImage:nil
                                         type:RMessageTypeNormal
                               customTypeName:nil
                                     duration:RMessageDurationAutomatic
                                     callback:nil
-                                 buttonTitle:NSLocalizedString(@"Update", nil)
+                                 buttonTitle:@"Update"
                               buttonCallback:^{
                                 [RMessage dismissActiveNotification];
-                                [RMessage showNotificationWithTitle:NSLocalizedString(@"Thanks for updating", nil)
+                                [RMessage showNotificationWithTitle:@"Thanks for updating"
                                                                type:RMessageTypeSuccess
                                                      customTypeName:nil
                                                            callback:nil];
@@ -104,8 +104,8 @@ - (IBAction)didTapButton:(id)sender
 - (IBAction)didTapCustomImage:(id)sender
 {
   [RMessage showNotificationInViewController:self
-                                       title:NSLocalizedString(@"Custom image", nil)
-                                    subtitle:NSLocalizedString(@"This uses an image you can define", nil)
+                                       title:@"Custom image"
+                                    subtitle:@"This uses an image you can define"
                                    iconImage:[UIImage imageNamed:@"NotificationButtonBackground.png"]
                                         type:RMessageTypeNormal
                               customTypeName:nil
@@ -120,11 +120,10 @@ - (IBAction)didTapCustomImage:(id)sender
 - (IBAction)didTapEndless:(id)sender
 {
   [RMessage showNotificationInViewController:self
-                                       title:NSLocalizedString(@"Endless", nil)
-                                    subtitle:NSLocalizedString(@"This message can not be dismissed and will not be "
-                                                               @"hidden automatically. Tap the 'Dismiss' button "
-                                                               @"to dismiss the currently shown message",
-                                                               nil)
+                                       title:@"Endless"
+                                    subtitle:@"This message can not be dismissed and will not be "
+                                             @"hidden automatically. Tap the 'Dismiss' button "
+                                             @"to dismiss the currently shown message"
                                    iconImage:nil
                                         type:RMessageTypeSuccess
                               customTypeName:nil
@@ -141,10 +140,9 @@ - (IBAction)didTapEndless:(id)sender
 - (IBAction)didTapLong:(id)sender
 {
   [RMessage showNotificationInViewController:self
-                                       title:NSLocalizedString(@"Long", nil)
-                                    subtitle:NSLocalizedString(@"This message is displayed 10 seconds "
-                                                               @"instead of the calculated value",
-                                                               nil)
+                                       title:@"Long"
+                                    subtitle:@"This message is displayed 10 seconds "
+                                             @"instead of the calculated value"
                                    iconImage:nil
                                         type:RMessageTypeWarning
                               customTypeName:nil
@@ -161,8 +159,8 @@ - (IBAction)didTapLong:(id)sender
 - (IBAction)didTapBottom:(id)sender
 {
   [RMessage showNotificationInViewController:self
-                                       title:NSLocalizedString(@"Hu!", nil)
-                                    subtitle:NSLocalizedString(@"I'm down here :)", nil)
+                                       title:@"Hi!"
+                                    subtitle:@"I'm down here :)"
                                    iconImage:nil
                                         type:RMessageTypeSuccess
                               customTypeName:nil
@@ -177,21 +175,20 @@ - (IBAction)didTapBottom:(id)sender
 - (IBAction)didTapText:(id)sender
 {
   [RMessage
-    showNotificationWithTitle:NSLocalizedString(@"With 'Text' I meant a long text, so here it is", nil)
-                     subtitle:NSLocalizedString(@"Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed "
-                                                @"diam nonumy eirmod tempor invidunt ut labore et dolore magna "
-                                                @"aliquyam erat, sed diam voluptua. At vero eos et accusam et "
-                                                @"justo duo dolores et ea rebum. Stet clita kasd gubergren, no "
-                                                @"sea takimata sanctus.At vero eos et accusam et justo duo "
-                                                @"dolores et ea rebum. Stet clita kasd gubergren, no sea takimata "
-                                                @"sanctus.Lorem ipsum dolor sit amet, consetetur sadipscing "
-                                                @"elitr, sed diam nonumy eirmod tempor invidunt ut labore et "
-                                                @"dolore magna aliquyam erat, sed diam voluptua. At vero eos et "
-                                                @"accusam et justo duo dolores et ea rebum. Stet clita kasd "
-                                                @"gubergren, no sea takimata sanctus.At vero eos et accusam et "
-                                                @"justo duo dolores et ea rebum. Stet clita kasd gubergren, no "
-                                                @"sea takimata sanctus.",
-                                                nil)
+    showNotificationWithTitle:@"With 'Text' I meant a long text, so here it is"
+                     subtitle:@"Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed "
+                              @"diam nonumy eirmod tempor invidunt ut labore et dolore magna "
+                              @"aliquyam erat, sed diam voluptua. At vero eos et accusam et "
+                              @"justo duo dolores et ea rebum. Stet clita kasd gubergren, no "
+                              @"sea takimata sanctus.At vero eos et accusam et justo duo "
+                              @"dolores et ea rebum. Stet clita kasd gubergren, no sea takimata "
+                              @"sanctus.Lorem ipsum dolor sit amet, consetetur sadipscing "
+                              @"elitr, sed diam nonumy eirmod tempor invidunt ut labore et "
+                              @"dolore magna aliquyam erat, sed diam voluptua. At vero eos et "
+                              @"accusam et justo duo dolores et ea rebum. Stet clita kasd "
+                              @"gubergren, no sea takimata sanctus.At vero eos et accusam et "
+                              @"justo duo dolores et ea rebum. Stet clita kasd gubergren, no "
+                              @"sea takimata sanctus."
                          type:RMessageTypeWarning
                customTypeName:nil
                      callback:nil];
@@ -201,11 +198,10 @@ - (IBAction)didTapCustomDesign:(id)sender
 {
   // This is an example on how to apply a custom design
   [RMessage addDesignsFromFileWithName:@"AlternativeDesigns" inBundle:[NSBundle mainBundle]];
-  [RMessage showNotificationWithTitle:NSLocalizedString(@"Added custom design file", nil)
-                             subtitle:NSLocalizedString(@"This background is blue while the "
-                                                        @"subtitles are white. Yes this is still "
-                                                        @"an alternate error design :)",
-                                                        nil)
+  [RMessage showNotificationWithTitle:@"Added custom design file"
+                             subtitle:@"This background is blue while the "
+                                      @"subtitles are white. Yes this is still "
+                                      @"an alternate error design :)"
                                  type:RMessageTypeCustom
                        customTypeName:@"alternate-error"
                              callback:nil];
@@ -245,8 +241,8 @@ - (IBAction)didTapNavBarOverlay:(id)sender
   }
 
   [RMessage showNotificationInViewController:self.navigationController
-                                       title:NSLocalizedString(@"Whoa!", nil)
-                                    subtitle:NSLocalizedString(@"Over the Navigation Bar!", nil)
+                                       title:@"Whoa!"
+                                    subtitle:@"Over the Navigation Bar!"
                                    iconImage:nil
                                         type:RMessageTypeSuccess
                               customTypeName:nil

diff --git a/Example/Podfile b/Example/Podfile
@@ -1,13 +1,15 @@
 source 'https://github.com/CocoaPods/Specs.git'
 
 target "RMessage" do
-  platform :ios, '9.0'
+  #Set platform to iOS 7 to Catch Property API available warnings in XCode
+  platform :ios, '7.0'
   pod 'HexColors', '~> 4.0'
   pod 'PPTopMostController', :git => 'https://github.com/donileo/PPTopMostController.git'
   pod 'RMessage', :path => '..' 
-  pod 'Reveal-SDK', :configurations => ['Debug']
+  pod 'Reveal-iOS-SDK', :configurations => ['Debug']
 end
 
 target "RMessageTests" do
-  platform :ios, '9.0'
+  #Set platform to iOS 7 to Catch Property API available warnings in XCode
+  platform :ios, '7.0'
 end
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,15 +1,15 @@
 PODS:
   - HexColors (4.0.0)
   - PPTopMostController (0.0.1)
-  - Reveal-SDK (13)
-  - RMessage (2.1.5):
+  - Reveal-iOS-SDK (1.6.2)
+  - RMessage (2.2.1):
     - HexColors (~> 4.0)
     - PPTopMostController
 
 DEPENDENCIES:
   - HexColors (~> 4.0)
   - PPTopMostController (from `https://github.com/donileo/PPTopMostController.git`)
-  - Reveal-SDK
+  - Reveal-iOS-SDK
   - RMessage (from `..`)
 
 EXTERNAL SOURCES:
@@ -26,9 +26,9 @@ CHECKOUT OPTIONS:
 SPEC CHECKSUMS:
   HexColors: 5f95843ef89aff6a72e1fd3a8ebabf205cc43379
   PPTopMostController: ca6c8fd33abd2895d57d86bfe27ae7425b44eea8
-  Reveal-SDK: ccc2b0f8014965ea448b7534a7c2c8da232b75e8
-  RMessage: 31d44bd26a8f353f987d2e7194f3e9ffb203cbf2
+  Reveal-iOS-SDK: e2250b3c155bcfac53ae223ddc1f76d08f206c33
+  RMessage: f1e920df6c1f1e55930abd2179955724ec332e19
 
-PODFILE CHECKSUM: 2233336b4650c094ca22d899ca4bcf6aa1acc70d
+PODFILE CHECKSUM: 5211deb0d86fd992039b836d3b6181ca1ef136f3
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.4.0
diff --git a/Example/Pods/Headers/Public/Reveal-SDK/RevealServer/RevealServer.h b/Example/Pods/Headers/Public/Reveal-SDK/RevealServer/RevealServer.h
diff --git a/Example/Pods/Headers/Public/Reveal-iOS-SDK/Reveal/IBANetServiceTypes.h b/Example/Pods/Headers/Public/Reveal-iOS-SDK/Reveal/IBANetServiceTypes.h
diff --git a/Example/Pods/Headers/Public/Reveal-iOS-SDK/Reveal/IBARevealLoader.h b/Example/Pods/Headers/Public/Reveal-iOS-SDK/Reveal/IBARevealLoader.h
diff --git a/Example/Pods/Headers/Public/Reveal-iOS-SDK/Reveal/IBARevealLogger.h b/Example/Pods/Headers/Public/Reveal-iOS-SDK/Reveal/IBARevealLogger.h
diff --git a/Example/Pods/Headers/Public/Reveal-iOS-SDK/Reveal/Reveal.h b/Example/Pods/Headers/Public/Reveal-iOS-SDK/Reveal/Reveal.h
diff --git a/Example/Pods/Local Podspecs/RMessage.podspec.json b/Example/Pods/Local Podspecs/RMessage.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock