diff --git a/Documentation/PWLoadingView.md b/Documentation/PWLoadingView.md deleted file mode 100644 index e302076d..00000000 --- a/Documentation/PWLoadingView.md +++ /dev/null @@ -1,25 +0,0 @@ - -# class PWLoadingView : UIView -Custom Rich Media loading view. It is shown while Rich Media is loading. -## Members - - - - - - - - -
@property IBOutlet *UIActivityIndicatorView
@property IBOutlet *UIButton
- - ----------- - - -#### @property IBOutlet \*UIActivityIndicatorView - - ----------- - - -#### @property IBOutlet \*UIButton diff --git a/Documentation/PWNotificationCenterDelegateProxy.md b/Documentation/PWNotificationCenterDelegateProxy.md deleted file mode 100644 index abc089d3..00000000 --- a/Documentation/PWNotificationCenterDelegateProxy.md +++ /dev/null @@ -1,17 +0,0 @@ - -# class PWNotificationCenterDelegateProxy : NSObject<UNUserNotificationCenterDelegate> -PWNotificationCenterDelegateProxy class handles notifications on iOS 10 and forwards methods of UNUserNotificationCenterDelegate to all added delegates. -## Members - - - - - -
- (void)addNotificationCenterDelegate:(id<UNUserNotificationCenterDelegate>)delegate
- - ----------- - - -#### - (void)addNotificationCenterDelegate:(id<UNUserNotificationCenterDelegate>)delegate -Returns UNUserNotificationCenterDelegate that handles foreground push notifications on iOS10 Adds extra UNUserNotificationCenterDelegate that handles foreground push notifications on iOS10. \ No newline at end of file diff --git a/Documentation/PWRichMediaStyle.md b/Documentation/PWRichMediaStyle.md index 6f0609d4..73ebc1b9 100644 --- a/Documentation/PWRichMediaStyle.md +++ b/Documentation/PWRichMediaStyle.md @@ -1,18 +1,12 @@ # class PWRichMediaStyle : NSObject -'PWRichMediaStyle' class allows customizing the appearance of Rich Media pages. +Custom Rich Media loading view. It is shown while Rich Media is loading. 'PWRichMediaStyle' class allows customizing the appearance of Rich Media pages. ## Members - - - - - - @@ -31,32 +25,20 @@ ---------- -#### @property UIColor \*backgroundColor -Background color of Rich Media pages. - ----------- - - #### @property id<PWRichMediaStyleAnimationDelegate> animationDelegate -Delegate to manage Rich Media presenting animation. +Background color of Rich Media pages. Delegate to manage Rich Media presenting animation. ---------- -#### @property PWRichMediaLoadingViewBlock loadingViewBlock +#### @property NSTimeInterval closeButtonPresentingDelay Block to customize Rich Media loading view.
Example: ```Objective-C style.loadingViewBlock = ^PWLoadingView *{ return [[[NSBundle mainBundle] loadNibNamed:@"LoadingView" owner:self options:nil] lastObject]; }; ``` - - ----------- - - -#### @property NSTimeInterval closeButtonPresentingDelay -Delay of the close button presenting in seconds. + Delay of the close button presenting in seconds. ---------- diff --git a/Documentation/PWRichMediaStyleAnimationDelegate-p.md b/Documentation/PWRichMediaStyleAnimationDelegate-p.md index 7a284ae7..171b428f 100644 --- a/Documentation/PWRichMediaStyleAnimationDelegate-p.md +++ b/Documentation/PWRichMediaStyleAnimationDelegate-p.md @@ -1,26 +1,3 @@ # protocol PWRichMediaStyleAnimationDelegate<NSObject> -Interface for Rich Media Custom Animation. -## Members - -
@property UIColor *backgroundColor
@property id<PWRichMediaStyleAnimationDelegate> animationDelegate
@property PWRichMediaLoadingViewBlock loadingViewBlock
@property NSTimeInterval closeButtonPresentingDelay
- - - - - - -
- (void)runPresentingAnimationWithContentView:(UIView *)contentView parentView:(UIView *)parentView completion:(dispatch_block_t)completion
- (void)runDismissingAnimationWithContentView:(UIView *)contentView parentView:(UIView *)parentView completion:(dispatch_block_t)completion
- - ----------- - - -#### - (void)runPresentingAnimationWithContentView:(UIView \*)contentView parentView:(UIView \*)parentView completion:(dispatch\_block\_t)completion -This method can be used to animate Rich Media presenting view. - ----------- - - -#### - (void)runDismissingAnimationWithContentView:(UIView \*)contentView parentView:(UIView \*)parentView completion:(dispatch\_block\_t)completion -This method can be used to animate Rich Media dismissing view. \ No newline at end of file +Interface for Rich Media Custom Animation. \ No newline at end of file diff --git a/Documentation/PWTagsBuilder.md b/Documentation/PWTagsBuilder.md index fa479287..4b9254f1 100644 --- a/Documentation/PWTagsBuilder.md +++ b/Documentation/PWTagsBuilder.md @@ -1,6 +1,6 @@ # class PWTagsBuilder : NSObject -PWTagsBuilder class encapsulates the methods for creating tags parameters for sending them to the server. +PWNotificationCenterDelegateProxy class handles notifications on iOS 10 and forwards methods of UNUserNotificationCenterDelegate to all added delegates. Returns UNUserNotificationCenterDelegate that handles foreground push notifications on iOS10 Adds extra UNUserNotificationCenterDelegate that handles foreground push notifications on iOS10. PWTagsBuilder class encapsulates the methods for creating tags parameters for sending them to the server. ## Members diff --git a/Documentation/Pushwoosh.md b/Documentation/Pushwoosh.md index 6c2fca0f..60b1d89c 100644 --- a/Documentation/Pushwoosh.md +++ b/Documentation/Pushwoosh.md @@ -100,9 +100,6 @@ Pushwoosh class offers access to the singleton-instance of the push manager resp - - - @@ -118,9 +115,6 @@ Pushwoosh class offers access to the singleton-instance of the push manager resp - - -
- (void)setUser:(NSString *)userId email:(NSString *)email completion:(void(^)(NSError *error))completion
- (void)setUser:(NSString *)userId email:(NSString *)email
- (void)setEmails:(NSArray *)emails completion:(void(^)(NSError *error))completion
- (void)mergeUserId:(NSString *)oldUserId to:(NSString *)newUserId doMerge:(BOOL)doMerge completion:(void(^)(NSError *error))completion
- (BOOL)handleOpenURL:(NSURL *)url
@@ -145,7 +139,7 @@ Returns push notification payload if the app was started in response to push not ---------- -#### @property PWNotificationCenterDelegateProxy \*notificationCenterDelegateProxy +#### @property PWNotificationCenterDelegateProxy \*notificationCenterDelegateProxy Proxy contains UNUserNotificationCenterDelegate objects. ---------- @@ -435,23 +429,6 @@ Set User indentifier. This could be Facebook ID, username or email, or any other ---------- -#### - (void)setUser:(NSString \*)userId email:(NSString \*)email -Set User indentifier. This could be Facebook ID, username or email, or any other user ID. This allows data and events to be matched across multiple user devices.


Parameters
- - - - - - - - - -
userIduser identifier
emailuser's email string
- - ----------- - - #### - (void)setEmails:(NSArray \*)emails completion:(void(^)(NSError \*error))completion Register emails list associated to the current user. If setEmails succeeds competion is called with nil argument. If setEmails fails completion is called with error.


Parameters
@@ -524,16 +501,3 @@ Move all events from oldUserId to newUserId if doMerge is true. If doMerge is fa
callback
- - ----------- - - -#### - (BOOL)handleOpenURL:(NSURL \*)url -Process URL of some deep link. Primarly used for register test devices.


Parameters
- - - - - -
urlDeep Link URL
diff --git a/Framework/Pushwoosh.framework/Versions/A/Headers/PWRichMediaStyle.h b/Framework/Pushwoosh.framework/Versions/A/Headers/PWRichMediaStyle.h index 8ea94e22..663da33a 100644 --- a/Framework/Pushwoosh.framework/Versions/A/Headers/PWRichMediaStyle.h +++ b/Framework/Pushwoosh.framework/Versions/A/Headers/PWRichMediaStyle.h @@ -5,7 +5,10 @@ // #import + +#if TARGET_OS_IOS || TARGET_OS_WATCH #import +#endif FOUNDATION_EXPORT NSTimeInterval const PWRichMediaStyleDefaultAnimationDuration; @@ -17,13 +20,14 @@ FOUNDATION_EXPORT NSTimeInterval const PWRichMediaStyleDefaultAnimationDuration; /** This method can be used to animate Rich Media presenting view. */ +#if TARGET_OS_IOS || TARGET_OS_WATCH - (void)runPresentingAnimationWithContentView:(UIView *)contentView parentView:(UIView *)parentView completion:(dispatch_block_t)completion; /** This method can be used to animate Rich Media dismissing view. */ - (void)runDismissingAnimationWithContentView:(UIView *)contentView parentView:(UIView *)parentView completion:(dispatch_block_t)completion; - +#endif @end /** @@ -52,6 +56,7 @@ FOUNDATION_EXPORT NSTimeInterval const PWRichMediaStyleDefaultAnimationDuration; /** Custom Rich Media loading view. It is shown while Rich Media is loading. */ +#if TARGET_OS_IOS || TARGET_OS_WATCH @interface PWLoadingView : UIView @property (nonatomic) IBOutlet UIActivityIndicatorView *activityIndicatorView; @@ -59,10 +64,8 @@ FOUNDATION_EXPORT NSTimeInterval const PWRichMediaStyleDefaultAnimationDuration; @end - typedef PWLoadingView *(^PWRichMediaLoadingViewBlock)(void); - - +#endif /** 'PWRichMediaStyle' class allows customizing the appearance of Rich Media pages. */ @@ -71,7 +74,11 @@ typedef PWLoadingView *(^PWRichMediaLoadingViewBlock)(void); /** Background color of Rich Media pages. */ +#if TARGET_OS_IOS || TARGET_OS_WATCH @property (nonatomic) UIColor *backgroundColor; +#elif TARGET_OS_OSX +@property (nonatomic) NSColor *backgroundColor; +#endif /** Delegate to manage Rich Media presenting animation. @@ -88,8 +95,9 @@ typedef PWLoadingView *(^PWRichMediaLoadingViewBlock)(void); }; @endcode */ +#if TARGET_OS_IOS @property (nonatomic) PWRichMediaLoadingViewBlock loadingViewBlock; - +#endif /** Delay of the close button presenting in seconds. */ diff --git a/Framework/Pushwoosh.framework/Versions/A/Headers/Pushwoosh.h b/Framework/Pushwoosh.framework/Versions/A/Headers/Pushwoosh.h index 65e258bb..32c34fa4 100644 --- a/Framework/Pushwoosh.framework/Versions/A/Headers/Pushwoosh.h +++ b/Framework/Pushwoosh.framework/Versions/A/Headers/Pushwoosh.h @@ -18,8 +18,7 @@ #endif - -#define PUSHWOOSH_VERSION @"6.1.1" +#define PUSHWOOSH_VERSION @"6.2.0" @class Pushwoosh, PWMessage, PWNotificationCenterDelegateProxy; @@ -391,15 +390,6 @@ Unregisters from push notifications. */ - (void)setUser:(NSString *)userId email:(NSString *)email completion:(void(^)(NSError * error))completion; -/** - Set User indentifier. This could be Facebook ID, username or email, or any other user ID. - This allows data and events to be matched across multiple user devices. - - @param userId user identifier - @param email user's email string - */ -- (void)setUser:(NSString *)userId email:(NSString *)email; - /** Register emails list associated to the current user. If setEmails succeeds competion is called with nil argument. If setEmails fails completion is called with error. @@ -445,15 +435,20 @@ Unregisters from push notifications. @param url Deep Link URL */ +#if TARGET_OS_IOS || TARGET_OS_WATCH - (BOOL)handleOpenURL:(NSURL *)url; +#endif @end /** `PWNotificationCenterDelegateProxy` class handles notifications on iOS 10 and forwards methods of UNUserNotificationCenterDelegate to all added delegates. */ +#if TARGET_OS_IOS || TARGET_OS_WATCH @interface PWNotificationCenterDelegateProxy : NSObject - +#elif TARGET_OS_OSX +@interface PWNotificationCenterDelegateProxy : NSObject +#endif /** Returns UNUserNotificationCenterDelegate that handles foreground push notifications on iOS10 */ @@ -466,8 +461,9 @@ Unregisters from push notifications. /** Adds extra UNUserNotificationCenterDelegate that handles foreground push notifications on iOS10. */ +#if TARGET_OS_IOS || TARGET_OS_WATCH - (void)addNotificationCenterDelegate:(id)delegate; - +#endif @end diff --git a/Framework/Pushwoosh.framework/Versions/A/Pushwoosh b/Framework/Pushwoosh.framework/Versions/A/Pushwoosh index 1a791466..dcb79073 100644 Binary files a/Framework/Pushwoosh.framework/Versions/A/Pushwoosh and b/Framework/Pushwoosh.framework/Versions/A/Pushwoosh differ diff --git a/Framework/PushwooshGeozones.framework/Versions/A/PushwooshGeozones b/Framework/PushwooshGeozones.framework/Versions/A/PushwooshGeozones index d6d8d3fb..93ad4b69 100644 Binary files a/Framework/PushwooshGeozones.framework/Versions/A/PushwooshGeozones and b/Framework/PushwooshGeozones.framework/Versions/A/PushwooshGeozones differ