Skip to content

Commit

Permalink
Pushwoosh iOS SDK 6.4.12
Browse files Browse the repository at this point in the history 
https://github.com/Pushwoosh/pushwoosh-ios-sdk/releases/tag/6.4.12
  • Loading branch information
@PushwooshCI
PushwooshCI committed Apr 10, 2023
1 parent c0c5d02 commit 79ebcfe
Show file tree
Hide file tree
Showing 34 changed files with 44 additions and 37 deletions.
2 changes: 1 addition & 1 deletion Framework/Pushwoosh.framework/Versions/A/Headers/Pushwoosh.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#endif

#define PUSHWOOSH_VERSION @"6.4.11"
#define PUSHWOOSH_VERSION @"6.4.12"


@class Pushwoosh, PWMessage, PWNotificationCenterDelegateProxy;
Expand Down
Binary file modified Framework/Pushwoosh.framework/Versions/A/Pushwoosh
View file
Binary file not shown.
Binary file modified Framework/PushwooshGeozones.framework/Versions/A/PushwooshGeozones
View file
Binary file not shown.
18 changes: 9 additions & 9 deletions XCFramework/Pushwoosh.xcframework/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,47 +6,47 @@
<array>
<dict>
<key>LibraryIdentifier</key>
<string>ios-arm64_i386_x86_64-simulator</string>
<string>ios-arm64_armv7</string>
<key>LibraryPath</key>
<string>Pushwoosh.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>i386</string>
<string>x86_64</string>
<string>armv7</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>LibraryIdentifier</key>
<string>ios-arm64_armv7</string>
<string>ios-arm64_x86_64-maccatalyst</string>
<key>LibraryPath</key>
<string>Pushwoosh.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>armv7</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>maccatalyst</string>
</dict>
<dict>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-maccatalyst</string>
<string>ios-arm64_i386_x86_64-simulator</string>
<key>LibraryPath</key>
<string>Pushwoosh.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>i386</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>maccatalyst</string>
<string>simulator</string>
</dict>
</array>
<key>CFBundlePackageType</key>
Expand Down
2 changes: 1 addition & 1 deletion XCFramework/Pushwoosh.xcframework/ios-arm64_armv7/Pushwoosh.framework/Headers/Pushwoosh.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#endif

#define PUSHWOOSH_VERSION @"6.4.11"
#define PUSHWOOSH_VERSION @"6.4.12"


@class Pushwoosh, PWMessage, PWNotificationCenterDelegateProxy;
Expand Down
Binary file modified XCFramework/Pushwoosh.xcframework/ios-arm64_armv7/Pushwoosh.framework/Pushwoosh
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion ...woosh.xcframework/ios-arm64_i386_x86_64-simulator/Pushwoosh.framework/Headers/Pushwoosh.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#endif

#define PUSHWOOSH_VERSION @"6.4.11"
#define PUSHWOOSH_VERSION @"6.4.12"


@class Pushwoosh, PWMessage, PWNotificationCenterDelegateProxy;
Expand Down
Binary file modified ...ework/Pushwoosh.xcframework/ios-arm64_i386_x86_64-simulator/Pushwoosh.framework/Pushwoosh
View file
Binary file not shown.
6 changes: 3 additions & 3 deletions ...ramework/ios-arm64_i386_x86_64-simulator/Pushwoosh.framework/_CodeSignature/CodeResources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
</data>
<key>Headers/Pushwoosh.h</key>
<data>
c4UgVT1fS42FU1ajrwoSAAFfML0=
Ek90jlV9yYCWmZh0AaNMXC0c/Nw=
</data>
<key>Info.plist</key>
<data>
Expand Down Expand Up @@ -188,11 +188,11 @@
<dict>
<key>hash</key>
<data>
c4UgVT1fS42FU1ajrwoSAAFfML0=
Ek90jlV9yYCWmZh0AaNMXC0c/Nw=
</data>
<key>hash2</key>
<data>
8zEUy5QMTN6Lo0gahAz/OTjkEAN6xdjfEZfZp+0Equg=
rQSUtDU1h0LQYz3UeWX3rjKJp/JlwYG+qngmun11hDA=
</data>
</dict>
<key>Modules/module.modulemap</key>
Expand Down
2 changes: 1 addition & 1 deletion ...framework/ios-arm64_x86_64-maccatalyst/Pushwoosh.framework/Versions/A/Headers/Pushwoosh.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#endif

#define PUSHWOOSH_VERSION @"6.4.11"
#define PUSHWOOSH_VERSION @"6.4.12"


@class Pushwoosh, PWMessage, PWNotificationCenterDelegateProxy;
Expand Down
Binary file modified ...shwoosh.xcframework/ios-arm64_x86_64-maccatalyst/Pushwoosh.framework/Versions/A/Pushwoosh
View file
Binary file not shown.
12 changes: 6 additions & 6 deletions XCFramework/PushwooshGeozones.xcframework/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,31 @@
<array>
<dict>
<key>LibraryIdentifier</key>
<string>ios-arm64_armv7</string>
<string>ios-arm64_x86_64-maccatalyst</string>
<key>LibraryPath</key>
<string>PushwooshGeozones.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>armv7</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>maccatalyst</string>
</dict>
<dict>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-maccatalyst</string>
<string>ios-arm64_armv7</string>
<key>LibraryPath</key>
<string>PushwooshGeozones.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
<string>armv7</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>maccatalyst</string>
</dict>
<dict>
<key>LibraryIdentifier</key>
Expand Down
Binary file modified ...shwooshGeozones.xcframework/ios-arm64_armv7/PushwooshGeozones.framework/PushwooshGeozones
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion iOS_SDK/Pushwoosh/Pushwoosh.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Pod::Spec.new do |s|

s.name = "Pushwoosh"
s.version = "6.4.11"
s.version = "6.4.12"
s.summary = "Push notifications library by Pushwoosh."
s.platform = :ios

Expand Down
12 changes: 10 additions & 2 deletions iOS_SDK/Pushwoosh/Pushwoosh/In-App Messages/PWInAppMessagesManager.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ - (void)presentRichMediaFromPush:(NSDictionary *)userInfo {
[resource getHTMLDataWithCompletion:^(NSString *htmlData, NSError *error) {
if (!error) {
dispatch_async(dispatch_get_main_queue(), ^{
if ([resource presentationStyle:resource.config.presentationStyleKey] == IAResourcePresentationTopBanner || [resource presentationStyle:resource.config.presentationStyleKey] == IAResourcePresentationBottomBanner) {
if ([resource presentationStyle:resource.config.presentationStyleKey] == IAResourcePresentationTopBanner || [resource presentationStyle:resource.config.presentationStyleKey] == IAResourcePresentationBottomBanner || [resource presentationStyle:resource.config.presentationStyleKey] == IAResourcePresentationCenter) {
[self createToastViewWith:resource config:resource.config];
} else {
PWRichMedia *richMedia = [[PWRichMedia alloc] initWithSource:PWRichMediaSourcePush resource:resource pushPayload:userInfo];
Expand All @@ -454,7 +454,7 @@ - (void)createToastViewWith:(PWResource *)resource config:(PWRichMediaConfig *)c

[NSLayoutConstraint activateConstraints:@[
[_toastView.trailingAnchor constraintEqualToAnchor:safe.trailingAnchor],
[_toastView.leadingAnchor constraintEqualToAnchor:safe.leadingAnchor],
[_toastView.leadingAnchor constraintEqualToAnchor:safe.leadingAnchor]
]];

if ([resource presentationStyle:config.presentationStyleKey] == IAResourcePresentationTopBanner) {
Expand All @@ -465,6 +465,11 @@ - (void)createToastViewWith:(PWResource *)resource config:(PWRichMediaConfig *)c
[NSLayoutConstraint activateConstraints:@[
[_toastView.bottomAnchor constraintEqualToAnchor:safe.bottomAnchor constant:-20]
]];
} else if ([resource presentationStyle:config.presentationStyleKey] == IAResourcePresentationCenter) {
[NSLayoutConstraint activateConstraints:@[
[_toastView.centerYAnchor constraintEqualToAnchor:safe.centerYAnchor],
[_toastView.centerXAnchor constraintEqualToAnchor:safe.centerXAnchor]
]];
}
} else {
CGFloat topInset = 40.f;
Expand All @@ -477,6 +482,9 @@ - (void)createToastViewWith:(PWResource *)resource config:(PWRichMediaConfig *)c
[_toastView.topAnchor constraintEqualToAnchor:window.bottomAnchor constant:topInset].active = YES;
} else if ([resource presentationStyle:config.presentationStyleKey] == IAResourcePresentationBottomBanner) {
[_toastView.topAnchor constraintEqualToAnchor:window.bottomAnchor constant:bottomInset].active = YES;
} else if ([resource presentationStyle:config.presentationStyleKey] == IAResourcePresentationCenter) {
[_toastView.centerYAnchor constraintEqualToAnchor:window.centerYAnchor].active = YES;
[_toastView.centerXAnchor constraintEqualToAnchor:window.centerXAnchor].active = YES;
}
}
[_toastView createToastView:resource position:[resource presentationStyle:config.presentationStyleKey]];
Expand Down
19 changes: 9 additions & 10 deletions iOS_SDK/Pushwoosh/Pushwoosh/In-App Messages/PWToastView.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ - (void)createToastView:(PWResource *)resource position:(IAResourcePresentationS
[_richMediaView removeFromSuperview];
_richMediaView = nil;

CGFloat yPositionTop = 250.f;
CGFloat yPositionBottom = 250.f;
CGFloat yPositionInitialize = 1000.f;

_richMediaView = [[PWRichMediaView alloc] initWithFrame:self.bounds];
_richMediaView.webClient.webView.scrollView.scrollEnabled = NO;
Expand Down Expand Up @@ -73,9 +72,9 @@ - (void)createToastView:(PWResource *)resource position:(IAResourcePresentationS
if (!error) {
[wself animateViewWithCompletion:^{
if (position == IAResourcePresentationTopBanner) {
wself.frame = CGRectOffset(wself.richMediaView.frame, 0.f, -yPositionTop);
} else if (position == IAResourcePresentationBottomBanner) {
wself.frame = CGRectOffset(wself.richMediaView.frame, 0.f, yPositionBottom);
wself.frame = CGRectOffset(wself.richMediaView.frame, 0.f, -yPositionInitialize);
} else if (position == IAResourcePresentationBottomBanner || position == IAResourcePresentationCenter) {
wself.frame = CGRectOffset(wself.richMediaView.frame, 0.f, yPositionInitialize);
}

wself.richMediaView.alpha = 1.0;
Expand All @@ -86,10 +85,10 @@ - (void)createToastView:(PWResource *)resource position:(IAResourcePresentationS
initialSpringVelocity:1.0
options:0 animations:^{
if (position == IAResourcePresentationTopBanner) {
frame.origin.y += yPositionTop;
frame.origin.y += yPositionInitialize;
wself.frame = frame;
} else if (position == IAResourcePresentationBottomBanner) {
frame.origin.y -= yPositionBottom;
} else if (position == IAResourcePresentationBottomBanner || position == IAResourcePresentationCenter) {
frame.origin.y -= yPositionInitialize;
wself.frame = frame;
}
}
Expand Down Expand Up @@ -152,13 +151,13 @@ - (void)swipeHandler:(UISwipeGestureRecognizer *)recognizer {
}

- (void)hideToastViewWith:(IAResourcePresentationStyle)position {
CGFloat hideAnimationPosition = 250.f;
CGFloat hideAnimationPosition = 1000.f;
CGRect frame = self.frame;

if (position == IAResourcePresentationTopBanner) {
frame.origin.y -= hideAnimationPosition;
self.frame = frame;
} else if (position == IAResourcePresentationBottomBanner) {
} else if (position == IAResourcePresentationBottomBanner || position == IAResourcePresentationCenter) {
frame.origin.y += hideAnimationPosition;
self.frame = frame;
}
Expand Down
2 changes: 1 addition & 1 deletion iOS_SDK/Pushwoosh/Pushwoosh/Public/Pushwoosh.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#endif

#define PUSHWOOSH_VERSION @"6.4.11"
#define PUSHWOOSH_VERSION @"6.4.12"


@class Pushwoosh, PWMessage, PWNotificationCenterDelegateProxy;
Expand Down
2 changes: 1 addition & 1 deletion iOS_SDK/Pushwoosh/PushwooshXCFramework.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Pod::Spec.new do |s|

s.name = "PushwooshXCFramework"
s.version = "6.4.11"
s.version = "6.4.12"
s.summary = "Push notifications library by Pushwoosh."
s.platform = :ios

Expand Down
0 ...c58c3ddb5e43df0b0d7cb8c-buildRequest.json → ...5b4961164338484b134ae47-buildRequest.json
View file
File renamed without changes.
Binary file renamed ...c4765c58c3ddb5e43df0b0d7cb8c-desc.xcbuild → ...d27225b4961164338484b134ae47-desc.xcbuild
View file
Binary file not shown.
0 ...5c58c3ddb5e43df0b0d7cb8c-manifest.xcbuild → ...25b4961164338484b134ae47-manifest.xcbuild
View file
File renamed without changes.
0 ...65c58c3ddb5e43df0b0d7cb8c-targetGraph.txt → ...225b4961164338484b134ae47-targetGraph.txt
View file
File renamed without changes.
Binary file modified ...K/Pushwoosh/build/XCBuildData/BuildDescriptionCacheIndex-1126319bfddfb9469469760d5f189dd4
View file
Binary file not shown.
Binary file modified iOS_SDK/Pushwoosh/build/XCBuildData/build.db
View file
Binary file not shown.
0 ...5593d85fb1b85a8f0f284a7-buildRequest.json → ...286b29253ca340b57aff0ee-buildRequest.json
View file
File renamed without changes.
Binary file renamed ...72ad05593d85fb1b85a8f0f284a7-desc.xcbuild → ...8ebe2286b29253ca340b57aff0ee-desc.xcbuild
View file
Binary file not shown.
0 ...05593d85fb1b85a8f0f284a7-manifest.xcbuild → ...2286b29253ca340b57aff0ee-manifest.xcbuild
View file
File renamed without changes.
0 ...400adc78e28dc4b2d8cad693d-targetGraph.txt → ...e2286b29253ca340b57aff0ee-targetGraph.txt
View file
File renamed without changes.
0 ...0adc78e28dc4b2d8cad693d-buildRequest.json → ...d4686c9492c93d2966f4b5e-buildRequest.json
View file
File renamed without changes.
Binary file renamed ...5e1400adc78e28dc4b2d8cad693d-desc.xcbuild → ...d6077d4686c9492c93d2966f4b5e-desc.xcbuild
View file
Binary file not shown.
0 ...00adc78e28dc4b2d8cad693d-manifest.xcbuild → ...7d4686c9492c93d2966f4b5e-manifest.xcbuild
View file
File renamed without changes.
0 ...d05593d85fb1b85a8f0f284a7-targetGraph.txt → ...77d4686c9492c93d2966f4b5e-targetGraph.txt
View file
File renamed without changes.
Binary file modified .../Pushwoosh/buildI/XCBuildData/BuildDescriptionCacheIndex-1126319bfddfb9469469760d5f189dd4
View file
Binary file not shown.
Binary file modified iOS_SDK/Pushwoosh/buildI/XCBuildData/build.db
View file
Binary file not shown.

0 comments on commit 79ebcfe

Please sign in to comment.