Merge pull request #96 from apptentive/develop

Updating to version 6.0.1

CHANGELOG.md

@@ -5,6 +5,11 @@ This document lets you know what has changed in the Cordova plugin. For changes
 - [Android Changelog](https://github.com/apptentive/apptentive-android/blob/master/CHANGELOG.md)
 - [iOS Changelog](https://github.com/apptentive/apptentive-kit-ios/blob/master/CHANGELOG.md)
 
+# 2022-09-28 - v6.0.1
+
+- Apptentive Android SDK: 5.8.4
+- Apptentive iOS SDK: 6.0.4
+
 # 2022-06-21 - v6.0.0
 
 - Apptentive Android SDK: 5.8.3

package.json

@@ -1,6 +1,6 @@
 {
   "name": "apptentive-cordova",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "Apptentive Plugin For Cordova",
   "cordova": {
     "id": "apptentive-cordova",

plugin.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="apptentive-cordova" version="6.0.0">
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="apptentive-cordova" version="6.0.1">
 
     <name>Apptentive</name>
     <description>Apptentive Plugin For Cordova</description>
@@ -42,9 +42,9 @@
         </config-file>
         <config-file target="./res/values/strings.xml" parent="/resources">
             <string name="apptentive_distribution">Cordova</string>
-            <string name="apptentive_distribution_version">6.0.0</string>
+            <string name="apptentive_distribution_version">6.0.1</string>
         </config-file>
-        <framework src="com.apptentive:apptentive-android:5.8.3"/>
+        <framework src="com.apptentive:apptentive-android:5.8.4"/>
         <source-file src="src/android/ApptentiveBridge.java" target-dir="src/com/apptentive/cordova"/>
         <source-file src="src/android/JsonHelper.java" target-dir="src/com/apptentive/cordova"/>
     </platform>
@@ -75,7 +75,7 @@
         </config-file>
 
         <config-file target="*-Info.plist" parent="ApptentivePluginVersion">
-            <string>6.0.0</string>
+            <string>6.0.1</string>
         </config-file>
 
         <!-- ApptentiveBridge -->

src/ios/ApptentiveKit.xcframework/Info.plist

@@ -6,30 +6,30 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>ApptentiveKit.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>ApptentiveKit.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

src/ios/ApptentiveKit.xcframework/ios-arm64/ApptentiveKit.framework/Headers/ApptentiveKit-Swift.h

@@ -537,22 +537,34 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class) CGFloat apptentiveCornerRadius
 
 
 @interface UIColor (SWIFT_EXTENSION(ApptentiveKit))
+/// The color to use for the background in text inputs for message center.
+SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) UIColor * _Nonnull apptentiveMessageCenterTextInputBackground;)
++ (UIColor * _Nonnull)apptentiveMessageCenterTextInputBackground SWIFT_WARN_UNUSED_RESULT;
++ (void)setApptentiveMessageCenterTextInputBackground:(UIColor * _Nonnull)value;
+/// The placeholder color to use for text inputs for message center.
+SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) UIColor * _Nonnull apptentiveMessageCenterTextInputPlaceholder;)
++ (UIColor * _Nonnull)apptentiveMessageCenterTextInputPlaceholder SWIFT_WARN_UNUSED_RESULT;
++ (void)setApptentiveMessageCenterTextInputPlaceholder:(UIColor * _Nonnull)value;
+/// The text color to use for all text inputs in message center.
+SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) UIColor * _Nonnull apptentiveMessageCenterTextInput;)
++ (UIColor * _Nonnull)apptentiveMessageCenterTextInput SWIFT_WARN_UNUSED_RESULT;
++ (void)setApptentiveMessageCenterTextInput:(UIColor * _Nonnull)value;
+/// The tint color for text inputs for surveys.
+SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) UIColor * _Nonnull apptentivetextInputTint;)
++ (UIColor * _Nonnull)apptentivetextInputTint SWIFT_WARN_UNUSED_RESULT;
++ (void)setApptentivetextInputTint:(UIColor * _Nonnull)value;
 /// The border color to use for the message text view.
-SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) UIColor * _Nonnull apptentiveMessageCenterTextViewBorder;)
-+ (UIColor * _Nonnull)apptentiveMessageCenterTextViewBorder SWIFT_WARN_UNUSED_RESULT;
-+ (void)setApptentiveMessageCenterTextViewBorder:(UIColor * _Nonnull)value;
+SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) UIColor * _Nonnull apptentiveMessageCenterTextInputBorder;)
++ (UIColor * _Nonnull)apptentiveMessageCenterTextInputBorder SWIFT_WARN_UNUSED_RESULT;
++ (void)setApptentiveMessageCenterTextInputBorder:(UIColor * _Nonnull)value;
 /// The color to use for the attachment button for the compose view for message center.
 SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) UIColor * _Nonnull apptentiveMessageCenterAttachmentButton;)
 + (UIColor * _Nonnull)apptentiveMessageCenterAttachmentButton SWIFT_WARN_UNUSED_RESULT;
 + (void)setApptentiveMessageCenterAttachmentButton:(UIColor * _Nonnull)value;
 /// The color to use for the text view placeholder for the compose view for message center.
-SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) UIColor * _Nonnull apptentiveMessageTextViewPlaceholder;)
-+ (UIColor * _Nonnull)apptentiveMessageTextViewPlaceholder SWIFT_WARN_UNUSED_RESULT;
-+ (void)setApptentiveMessageTextViewPlaceholder:(UIColor * _Nonnull)value;
-/// The color to use for the text view border for the compose view for message center.
-SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) UIColor * _Nonnull apptentiveMessageTextViewBorder;)
-+ (UIColor * _Nonnull)apptentiveMessageTextViewBorder SWIFT_WARN_UNUSED_RESULT;
-+ (void)setApptentiveMessageTextViewBorder:(UIColor * _Nonnull)value;
+SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) UIColor * _Nonnull apptentiveMessageTextInputPlaceholder;)
++ (UIColor * _Nonnull)apptentiveMessageTextInputPlaceholder SWIFT_WARN_UNUSED_RESULT;
++ (void)setApptentiveMessageTextInputPlaceholder:(UIColor * _Nonnull)value;
 /// The color to use for the status message in message center.
 SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) UIColor * _Nonnull apptentiveMessageCenterStatus;)
 + (UIColor * _Nonnull)apptentiveMessageCenterStatus SWIFT_WARN_UNUSED_RESULT;
@@ -669,6 +681,18 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) UIColor * _Nonnull app
 
 
 @interface UIFont (SWIFT_EXTENSION(ApptentiveKit))
+/// The font to use for placeholder for text inputs in message center.
+SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) UIFont * _Nonnull apptentiveMessageCenterTextInputPlaceholder;)
++ (UIFont * _Nonnull)apptentiveMessageCenterTextInputPlaceholder SWIFT_WARN_UNUSED_RESULT;
++ (void)setApptentiveMessageCenterTextInputPlaceholder:(UIFont * _Nonnull)value;
+/// The font to use for text inputs in message menter.
+SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) UIFont * _Nonnull apptentiveMessageCenterTextInput;)
++ (UIFont * _Nonnull)apptentiveMessageCenterTextInput SWIFT_WARN_UNUSED_RESULT;
++ (void)setApptentiveMessageCenterTextInput:(UIFont * _Nonnull)value;
+/// The font to use for placeholder text for text inputs in surveys.
+SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) UIFont * _Nonnull apptentiveTextInputPlaceholder;)
++ (UIFont * _Nonnull)apptentiveTextInputPlaceholder SWIFT_WARN_UNUSED_RESULT;
++ (void)setApptentiveTextInputPlaceholder:(UIFont * _Nonnull)value;
 /// The font to use for the greeting title for message center.
 SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) UIFont * _Nonnull apptentiveMessageCenterStatus;)
 + (UIFont * _Nonnull)apptentiveMessageCenterStatus SWIFT_WARN_UNUSED_RESULT;
@@ -790,6 +814,7 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class) NSInteger apptentiveStyle;)
 + (void)setApptentiveStyle:(NSInteger)newValue;
 @end
 
+
 enum ToolbarMode : NSInteger;
 
 @interface UIToolbar (SWIFT_EXTENSION(ApptentiveKit))

src/ios/ApptentiveKit.xcframework/ios-arm64/ApptentiveKit.framework/Modules/ApptentiveKit.swiftmodule/arm64-apple-ios.swiftinterface

@@ -52,7 +52,8 @@ public protocol SurveyViewModelDelegate : AnyObject {
   final public let closeConfirmationBackButtonLabel: Swift.String
   final public let closeConfirmationCloseButtonLabel: Swift.String
   weak public var delegate: ApptentiveKit.SurveyViewModelDelegate?
-  public var termsAndConditionsLabel: Swift.String?
+  public var termsAndConditionsLinkText: Swift.String?
+  public var rangeChoiceLabelNumberFormatter: Foundation.NumberFormatter
   public var isValid: Swift.Bool {
     get
   }
@@ -296,6 +297,7 @@ public enum ApptentiveError : Swift.Error {
   case fileExistsAtContainerDirectoryPath
   case mismatchedCredentials
 }
+public var apptentiveAssertionHandler: (@autoclosure () -> Swift.String, Swift.StaticString, Swift.UInt) -> ()
 public protocol CustomDataCompatible {
 }
 extension Swift.String : ApptentiveKit.CustomDataCompatible {
@@ -351,7 +353,7 @@ public protocol MessageCenterViewModelDelegate : AnyObject {
   final public let greetingTitle: Swift.String
   final public let greetingBody: Swift.String
   final public let greetingImageURL: Foundation.URL
-  final public let statusBody: Swift.String
+  final public let statusBody: Swift.String?
   public var groupedMessages: [[ApptentiveKit.MessageCenterViewModel.Message]]
   public var hasLoadedMessages: Swift.Bool
   public var thumbnailSize: CoreGraphics.CGSize {
@@ -455,8 +457,19 @@ public enum MessageCenterViewModelError : Swift.Error {
   }
 }
 extension ApptentiveKit.Apptentive {
-  public func presentInteraction(_ interaction: ApptentiveKit.Interaction, from presentingViewController: UIKit.UIViewController) throws
-  public func loadEngagementManifest(at url: Foundation.URL?)
+  public var engagementManifestURL: Foundation.URL? {
+    get
+  }
+  public func loadEngagementManifest(at url: Foundation.URL?, completion: @escaping (Swift.Result<Swift.Void, Swift.Error>) -> Swift.Void)
+  public func getInteractionList(_ completion: @escaping ([ApptentiveKit.Apptentive.InteractionListItem]) -> Swift.Void)
+  public func presentInteraction(with id: Swift.String, completion: @escaping (Swift.Result<Swift.Void, Swift.Error>) -> Swift.Void)
+  public func presentInteraction(at url: Foundation.URL, completion: @escaping (Swift.Result<Swift.Void, Swift.Error>) -> Swift.Void)
+  public struct InteractionListItem {
+    public let id: Swift.String
+    public let displayName: Swift.String
+    public let typeName: Swift.String
+  }
+  public func getEventList(_ completion: @escaping ([Swift.String]) -> Swift.Void)
 }
 extension ApptentiveKit.SurveyViewModel {
   @_hasMissingDesignatedInitializers public class Question {
@@ -472,9 +485,6 @@ extension ApptentiveKit.SurveyViewModel {
     public var accessibilityLabel: Swift.String {
       get
     }
-    public var accessibilityHint: Swift.String? {
-      get
-    }
     @objc deinit
   }
 }
@@ -892,10 +902,6 @@ public struct Sysctl {
     get
   }
 }
-public struct Interaction : Swift.Decodable {
-  public let typeName: Swift.String
-  public init(from decoder: Swift.Decoder) throws
-}
 @objc @_inheritsConvenienceInitializers @_Concurrency.MainActor(unsafe) public class ApptentiveNavigationController : UIKit.UINavigationController {
   @_Concurrency.MainActor(unsafe) @objc override dynamic public var preferredStatusBarStyle: UIKit.UIStatusBarStyle {
     @_Concurrency.MainActor(unsafe) @objc get
@@ -907,6 +913,9 @@ public struct Interaction : Swift.Decodable {
   @_Concurrency.MainActor(unsafe) @objc required dynamic public init?(coder aDecoder: Foundation.NSCoder)
   @objc deinit
 }
+extension UIKit.UITableView {
+  @_Concurrency.MainActor(unsafe) public static var apptentiveQuestionSeparatorHeight: CoreGraphics.CGFloat
+}
 extension UIKit.UITableView.Style {
   public static var apptentive: UIKit.UITableView.Style
 }
@@ -938,10 +947,13 @@ extension UIKit.UIImage {
   @objc public static var apptentiveCheckboxSelected: UIKit.UIImage?
 }
 extension UIKit.UIColor {
-  @objc public static var apptentiveMessageCenterTextViewBorder: UIKit.UIColor
+  @objc public static var apptentiveMessageCenterTextInputBackground: UIKit.UIColor
+  @objc public static var apptentiveMessageCenterTextInputPlaceholder: UIKit.UIColor
+  @objc public static var apptentiveMessageCenterTextInput: UIKit.UIColor
+  @objc public static var apptentivetextInputTint: UIKit.UIColor
+  @objc public static var apptentiveMessageCenterTextInputBorder: UIKit.UIColor
   @objc public static var apptentiveMessageCenterAttachmentButton: UIKit.UIColor
-  @objc public static var apptentiveMessageTextViewPlaceholder: UIKit.UIColor
-  @objc public static var apptentiveMessageTextViewBorder: UIKit.UIColor
+  @objc public static var apptentiveMessageTextInputPlaceholder: UIKit.UIColor
   @objc public static var apptentiveMessageCenterStatus: UIKit.UIColor
   @objc public static var apptentiveMessageCenterGreetingBody: UIKit.UIColor
   @objc public static var apptentiveMessageCenterGreetingTitle: UIKit.UIColor
@@ -973,8 +985,12 @@ extension UIKit.UIColor {
   @objc public static var apptentiveTermsOfServiceLabel: UIKit.UIColor
   @objc public static var apptentiveSubmitButtonTitle: UIKit.UIColor
   public static var apptentiveSubmitButtonBorder: UIKit.UIColor
+  public static var apptentiveQuestionSeparator: UIKit.UIColor
 }
 extension UIKit.UIFont {
+  @objc public static var apptentiveMessageCenterTextInputPlaceholder: UIKit.UIFont
+  @objc public static var apptentiveMessageCenterTextInput: UIKit.UIFont
+  @objc public static var apptentiveTextInputPlaceholder: UIKit.UIFont
   @objc public static var apptentiveMessageCenterStatus: UIKit.UIFont
   @objc public static var apptentiveMessageCenterGreetingTitle: UIKit.UIFont
   @objc public static var apptentiveMessageCenterGreetingBody: UIKit.UIFont