Release v5.19.0

button · Sep 5, 2017 · 8a81c6a · 8a81c6a
1 parent 17a8faf
commit 8a81c6a
Show file tree

Hide file tree

Showing 27 changed files with 96 additions and 11 deletions.
diff --git a/Button.bundle/BTNAuthViewController.nib b/Button.bundle/BTNAuthViewController.nib
diff --git a/Button.bundle/BTNBaseModalController.nib b/Button.bundle/BTNBaseModalController.nib
diff --git a/Button.bundle/BTNDefaultItemButton.nib b/Button.bundle/BTNDefaultItemButton.nib
diff --git a/Button.bundle/BTNGroupNameCell.nib b/Button.bundle/BTNGroupNameCell.nib
diff --git a/Button.bundle/BTNInstallBannerView.nib b/Button.bundle/BTNInstallBannerView.nib
diff --git a/Button.bundle/BTNInteractiveButtonContentView.nib b/Button.bundle/BTNInteractiveButtonContentView.nib
diff --git a/Button.bundle/BTNInteractiveButtonInventoryCell.nib b/Button.bundle/BTNInteractiveButtonInventoryCell.nib
diff --git a/Button.bundle/BTNInventoryItemCell.nib b/Button.bundle/BTNInventoryItemCell.nib
diff --git a/Button.bundle/BTNInventoryListCell.nib b/Button.bundle/BTNInventoryListCell.nib
diff --git a/Button.bundle/BTNInventoryPreviewView.nib b/Button.bundle/BTNInventoryPreviewView.nib
diff --git a/Button.bundle/BTNInventoryView.nib b/Button.bundle/BTNInventoryView.nib
diff --git a/Button.bundle/BTNLoadingSheetController.nib b/Button.bundle/BTNLoadingSheetController.nib
diff --git a/Button.bundle/BTNLocationRequestView.nib b/Button.bundle/BTNLocationRequestView.nib
diff --git a/Button.bundle/BTNNavigationHeaderView.nib b/Button.bundle/BTNNavigationHeaderView.nib
diff --git a/Button.bundle/BTNSandboxAppStoreController.nib b/Button.bundle/BTNSandboxAppStoreController.nib
diff --git a/Button.bundle/BTNSimulatorInstallView.nib b/Button.bundle/BTNSimulatorInstallView.nib
diff --git a/Button.bundle/BTNTextBannerView.nib b/Button.bundle/BTNTextBannerView.nib
diff --git a/Button.bundle/BTNWebViewSheetController.nib b/Button.bundle/BTNWebViewSheetController.nib
diff --git a/Button.bundle/Info.plist b/Button.bundle/Info.plist
@@ -9,13 +9,13 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.usebutton.sdk</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.18.0</string>
+	<string>5.19.0</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>iPhoneOS</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>5.18.0</string>
+	<string>5.19.0</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>

diff --git a/Button.framework/Versions/A/Button b/Button.framework/Versions/A/Button
diff --git a/Button.framework/Versions/A/Headers/BTNMerchantAction.h b/Button.framework/Versions/A/Headers/BTNMerchantAction.h
@@ -1,5 +1,20 @@
 @import Foundation;
 
+/// Represents result of merchant action flow.
+typedef NS_ENUM(NSInteger, BTNMerchantActionResult) {
+    /// An error occurred and Button could not proceed.
+    BTNMerchantActionResultError = 0,
+    /**
+     No action was presented.
+     @discussion This result is posted only when shouldPresentUnattributedAction on BTNMerchantActionSettings was set to NO.
+     */
+    BTNMerchantActionResultNoActionPresented,
+    /// Button finished presenting an unattributed action.
+    BTNMerchantActionResultUnattributedActionEnded,
+    /// Button finished presenting an attributed action.
+    BTNMerchantActionResultAttributedActionEnded
+};
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface BTNMerchantAction : NSObject

diff --git a/Button.framework/Versions/A/Headers/BTNMerchantActionSettings.h b/Button.framework/Versions/A/Headers/BTNMerchantActionSettings.h
@@ -0,0 +1,32 @@
+@import Foundation;
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ Settings object is used to customize merchant action flow.
+ */
+@interface BTNMerchantActionSettings : NSObject
+
+/**
+ Unavailable. Use -initWithPresentUnattributedAction: instead.
+ @return Returns nil.
+ */
+- (instancetype)init NS_UNAVAILABLE;
+
+
+/**
+ Initializes a new settings instance.
+ @param shouldPresentUnattributedAction Indicates whether Button should present unattributed action to user.
+ */
+- (instancetype)initWithPresentUnattributedAction:(BOOL)shouldPresentUnattributedAction;
+
+
+/**
+ Indicates whether Button should present unattributed action to user.
+ Set YES and Button will present unattributed action in a web view. No-op otherwise.
+ */
+@property (nonatomic, assign, readonly) BOOL shouldPresentUnattributedAction;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Button.framework/Versions/A/Headers/Button.h b/Button.framework/Versions/A/Headers/Button.h
@@ -166,18 +166,55 @@
 
 
 
-///-------------------------
-/// @name Presenting Actions
-///-------------------------
+///----------------------------------
+/// @name Presenting Merchant Actions
+///----------------------------------
 
 
 /**
- Presents the merchant action after exchanging for a Button attributed action. If the merchant action cannot be exchanged, it will be presented in an in-app web view.
+ Pass your URL to Button via BTNMerchantAction.
+ 
+ When starting a BTNMerchantAction, Button will take control and detect whether the URL
+ can be exchanged for a commissioned Checkout Flow including installing the merchant app if necessary.
+ If Button cannot exchange the URL, it will open it in an in-app web view.
+
  @param merchantAction The merchant link url and additional associated data.
  */
 - (void)presentMerchantAction:(nonnull BTNMerchantAction *)merchantAction;
 
 
+/**
+ Similar to -presentMerchantAction:
+ Includes a callback to know when the Button Checkout Flow has completed.
+
+ @param merchantAction The merchant link url and additional associated data.
+ @param completionHandler A block to be executed upon completion.
+ 
+ @discussion The completion handler takes two parameters
+    - result Result code of presentation.
+    - error An error will be present if an error occurred.
+ */
+- (void)presentMerchantAction:(nonnull BTNMerchantAction *)merchantAction
+                   completion:(nonnull void (^)(BTNMerchantActionResult result, NSError * __nullable error))completionHandler;
+
+
+/**
+ Similar to -presentMerchantAction:
+ Includes a BTNMerchantActionSettings to configure whether Button should handle URLs that it cannot commission.
+ 
+ @param merchantAction The merchant link url and additional associated data.
+ @param settings Merchant Action presentation settings.
+ @param completionHandler A block to be executed upon completion.
+ 
+ @discussion The completion handler takes two parameters
+    - result Result code of presentation.
+    - error An error will be present if an error occurred.
+ */
+- (void)presentMerchantAction:(nonnull BTNMerchantAction *)merchantAction
+                     settings:(nonnull BTNMerchantActionSettings *)settings
+                   completion:(nonnull void (^)(BTNMerchantActionResult result, NSError * __nullable error))completionHandler;
+
+
 ///-------------------------
 /// @name Deep Link Handling
 ///-------------------------

diff --git a/Button.framework/Versions/A/Headers/Button_Public.h b/Button.framework/Versions/A/Headers/Button_Public.h
@@ -12,6 +12,7 @@
 // Actions
 #import "BTNAppAction.h"
 #import "BTNMerchantAction.h"
+#import "BTNMerchantActionSettings.h"
 
 // Orders
 #import "BTNLineItem.h"

diff --git a/Button.podspec b/Button.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name    = "Button"
-  s.version = "5.18.0"
+  s.version = "5.19.0"
   s.summary = "Button iOS SDK."
 
   s.description = <<-DESC

diff --git a/Examples/Objective-C/Button-CocoaPods/Podfile.lock b/Examples/Objective-C/Button-CocoaPods/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - Button (5.18.0)
+  - Button (5.19.0)
 
 DEPENDENCIES:
   - Button (from `../../../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../../../"
 
 SPEC CHECKSUMS:
-  Button: 11c623cc38a484dbec09f4c935abda7864651c03
+  Button: 2242fa04061f42e5972c52f859d473fae0b5e165
 
 PODFILE CHECKSUM: b62f13ba0b325840ecb1fce12a2403f20a0d77fe
 

diff --git a/Examples/Swift/Button-CocoaPods/Podfile.lock b/Examples/Swift/Button-CocoaPods/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - Button (5.18.0)
+  - Button (5.19.0)
 
 DEPENDENCIES:
   - Button (from `../../../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../../../"
 
 SPEC CHECKSUMS:
-  Button: 11c623cc38a484dbec09f4c935abda7864651c03
+  Button: 2242fa04061f42e5972c52f859d473fae0b5e165
 
 PODFILE CHECKSUM: 293fc3ed68c3abd2dca24349c320c6f18e87dbfc