Merge pull request #294 from apptentive/branch_5.3.3

frankus · web-flow · commit 7be72b9bf31e · 2021-06-16T13:22:32.000-07:00
Release 5.3.3
diff --git a/Apptentive/Apptentive.xcodeproj/project.pbxproj b/Apptentive/Apptentive.xcodeproj/project.pbxproj
@@ -2419,7 +2419,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 47;
+				CURRENT_PROJECT_VERSION = 48;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -2477,7 +2477,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 47;
+				CURRENT_PROJECT_VERSION = 48;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -2509,7 +2509,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 86WML2UN43;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 47;
+				DYLIB_CURRENT_VERSION = 48;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				GCC_PREFIX_HEADER = "Apptentive/Misc/ApptentiveConnect-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "APPTENTIVE_DEBUG=1";
@@ -2530,7 +2530,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 86WML2UN43;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 47;
+				DYLIB_CURRENT_VERSION = 48;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				GCC_PREFIX_HEADER = "Apptentive/Misc/ApptentiveConnect-Prefix.pch";
 				INFOPLIST_FILE = Apptentive/Info.plist;
diff --git a/Apptentive/Apptentive/Apptentive.storyboard b/Apptentive/Apptentive/Apptentive.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17124"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -119,7 +119,7 @@
                             </connections>
                         </view>
                         <view key="tableFooterView" contentMode="scaleToFill" id="6et-WJ-u3H">
-                            <rect key="frame" x="0.0" y="897.5" width="375" height="300"/>
+                            <rect key="frame" x="0.0" y="891.5" width="375" height="300"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Aj5-aD-yTM" customClass="ApptentiveMessageCenterInputView">
@@ -161,6 +161,10 @@
                                                         </button>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" text="New Message" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Mka-QN-zVs">
                                                             <rect key="frame" x="44" y="13" width="102" height="18"/>
+                                                            <accessibility key="accessibilityConfiguration">
+                                                                <accessibilityTraits key="traits" notEnabled="YES"/>
+                                                                <bool key="isElement" value="NO"/>
+                                                            </accessibility>
                                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
                                                             <color key="textColor" red="0.51764705879999995" green="0.51764705879999995" blue="0.56470588239999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                             <nil key="highlightedColor"/>
@@ -209,6 +213,10 @@
                                                 </textView>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Please leave detailed feedback" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ase-Kg-1uo">
                                                     <rect key="frame" x="17" y="54" width="199.5" height="17"/>
+                                                    <accessibility key="accessibilityConfiguration">
+                                                        <accessibilityTraits key="traits" notEnabled="YES"/>
+                                                        <bool key="isElement" value="NO"/>
+                                                    </accessibility>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                     <color key="textColor" red="0.73333333329999995" green="0.72941176470000002" blue="0.76078431369999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -423,7 +431,7 @@
                         </view>
                         <prototypes>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="ContextMessage" rowHeight="48" id="5ec-cK-c7K" userLabel="Context Message" customClass="ApptentiveMessageCenterContextMessageCell">
-                                <rect key="frame" x="0.0" y="313.5" width="375" height="48"/>
+                                <rect key="frame" x="0.0" y="307.5" width="375" height="48"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5ec-cK-c7K" id="jRh-G0-si1">
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="48"/>
@@ -450,7 +458,7 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="Reply" rowHeight="87" id="JK9-ui-0US" customClass="ApptentiveMessageCenterReplyCell">
-                                <rect key="frame" x="0.0" y="361.5" width="375" height="87"/>
+                                <rect key="frame" x="0.0" y="355.5" width="375" height="87"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="JK9-ui-0US" id="mF7-ws-xVD">
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="87"/>
@@ -498,7 +506,7 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="Message" rowHeight="93" id="hi8-Bq-GR3" customClass="ApptentiveMessageCenterMessageCell">
-                                <rect key="frame" x="0.0" y="448.5" width="375" height="93"/>
+                                <rect key="frame" x="0.0" y="442.5" width="375" height="93"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hi8-Bq-GR3" id="H0J-6d-bTN">
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="93"/>
@@ -536,7 +544,7 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="CompoundMessage" rowHeight="181" id="evQ-54-Bpq" userLabel="CompoundMessage" customClass="ApptentiveCompoundMessageCell">
-                                <rect key="frame" x="0.0" y="541.5" width="375" height="181"/>
+                                <rect key="frame" x="0.0" y="535.5" width="375" height="181"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="evQ-54-Bpq" id="cxM-mJ-g02">
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="181"/>
@@ -638,7 +646,7 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="CompoundReply" rowHeight="169" id="nj1-yL-vAx" customClass="ApptentiveCompoundReplyCell">
-                                <rect key="frame" x="0.0" y="722.5" width="375" height="169"/>
+                                <rect key="frame" x="0.0" y="716.5" width="375" height="169"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="nj1-yL-vAx" id="n4I-KM-rdG">
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="169"/>
@@ -855,7 +863,7 @@
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="contactAdd" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qyh-3U-iDJ">
-                                <rect key="frame" x="7.5" y="58" width="25" height="24"/>
+                                <rect key="frame" x="10" y="60" width="20" height="20"/>
                                 <connections>
                                     <action selector="chooseImage:" destination="lUk-lg-QHV" eventType="touchUpInside" id="L0p-LU-a4M"/>
                                 </connections>
diff --git a/Apptentive/Apptentive/ApptentiveMain.h b/Apptentive/Apptentive/ApptentiveMain.h
@@ -20,7 +20,7 @@ FOUNDATION_EXPORT double ApptentiveVersionNumber;
 FOUNDATION_EXPORT const unsigned char ApptentiveVersionString[];
 
 /** The version number of the Apptentive SDK. */
-#define kApptentiveVersionString @"5.3.2"
+#define kApptentiveVersionString @"5.3.3"
 
 /** The version number of the Apptentive API platform. */
 #define kApptentiveAPIVersionString @"9"
diff --git a/Apptentive/Apptentive/Engagement/Model/ApptentiveAppRelease.h b/Apptentive/Apptentive/Engagement/Model/ApptentiveAppRelease.h
@@ -62,6 +62,11 @@ NS_ASSUME_NONNULL_BEGIN
 @property (readonly, assign, nonatomic, getter=isOverridingStyles) BOOL overridingStyles;
 
 
+/**
+ The minimum iOS version the app can run on.
+ */
+@property (readonly, strong, nonatomic) NSString *deploymentTarget;
+
 /**
  Indicates whether the version has changed since the first release that 
  included the Apptentive SDK.
diff --git a/Apptentive/Apptentive/Engagement/Model/ApptentiveAppRelease.m b/Apptentive/Apptentive/Engagement/Model/ApptentiveAppRelease.m
@@ -18,6 +18,7 @@
 static NSString *const HasAppStoreReceiptKey = @"hasAppStoreReceipt";
 static NSString *const DebugBuildKey = @"debugBuild";
 static NSString *const OverridingStylesKey = @"overridingStyles";
+static NSString *const DeploymentTargetKey = @"deploymentTarget";
 static NSString *const UpdateVersionKey = @"updateVersion";
 static NSString *const UpdateBuildKey = @"updateBuild";
 static NSString *const TimeAtInstallTotalKey = @"timeAtInstallTotal";
@@ -71,6 +72,7 @@ - (instancetype)initWithCurrentAppRelease {
 		_version = [[ApptentiveVersion alloc] initWithString:[NSBundle mainBundle].infoDictionary[@"CFBundleShortVersionString"]];
 		_build = [[ApptentiveVersion alloc] initWithString:[NSBundle mainBundle].infoDictionary[(NSString *)kCFBundleVersionKey]];
 		_hasAppStoreReceipt = [NSData dataWithContentsOfURL:[NSBundle mainBundle].appStoreReceiptURL] != nil;
+		_deploymentTarget = [NSBundle mainBundle].infoDictionary[@"MinimumOSVersion"];
 
 		_compiler = [NSBundle mainBundle].infoDictionary[@"DTCompiler"];
 		_platformBuild = [NSBundle mainBundle].infoDictionary[@"DTPlatformBuild"];
@@ -101,6 +103,7 @@ - (nullable instancetype)initWithCoder:(NSCoder *)coder {
 		_hasAppStoreReceipt = [coder decodeBoolForKey:HasAppStoreReceiptKey];
 		_debugBuild = [coder decodeBoolForKey:DebugBuildKey];
 		_overridingStyles = [coder decodeBoolForKey:OverridingStylesKey];
+		_deploymentTarget = [coder decodeObjectOfClass:[NSString class] forKey:DeploymentTargetKey];
 
 		_updateVersion = [coder decodeBoolForKey:UpdateVersionKey];
 		_updateBuild = [coder decodeBoolForKey:UpdateBuildKey];
@@ -132,6 +135,7 @@ - (void)encodeWithCoder:(NSCoder *)coder {
 	[coder encodeBool:self.hasAppStoreReceipt forKey:HasAppStoreReceiptKey];
 	[coder encodeBool:self.debugBuild forKey:DebugBuildKey];
 	[coder encodeBool:self.overridingStyles forKey:OverridingStylesKey];
+	[coder encodeObject:self.deploymentTarget forKey:DeploymentTargetKey];
 
 	[coder encodeBool:self.updateVersion forKey:UpdateVersionKey];
 	[coder encodeBool:self.updateBuild forKey:UpdateBuildKey];
@@ -163,6 +167,7 @@ - (instancetype)initAndMigrate {
 		_hasAppStoreReceipt = [appRelease[@"app_store_receipt"][@"has_receipt"] boolValue];
 		_debugBuild = [appRelease[@"debug"] boolValue];
 		_overridingStyles = [appRelease[@"overriding_styles"] boolValue];
+		_deploymentTarget = @"";
 
 		_updateVersion = YES;
 		_updateBuild = YES;
@@ -249,6 +254,7 @@ + (NSDictionary *)JSONKeyPathMapping {
 		@"app_store_receipt": NSStringFromSelector(@selector(appStoreReceiptDictionary)),
 		@"debug": NSStringFromSelector(@selector(boxedDebugBuild)),
 		@"overriding_styles": NSStringFromSelector(@selector(boxedOverridingStyles)),
+		@"deployment_target": NSStringFromSelector(@selector(deploymentTarget)),
 		@"dt_compiler": NSStringFromSelector(@selector(compiler)),
 		@"dt_platform_build": NSStringFromSelector(@selector(platformBuild)),
 		@"dt_platform_name": NSStringFromSelector(@selector(platformName)),
diff --git a/Apptentive/Apptentive/Info.plist b/Apptentive/Apptentive/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.3.2</string>
+	<string>5.3.3</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>
diff --git a/Apptentive/Apptentive/Message Center/Controllers/ApptentiveMessageCenterViewController.m b/Apptentive/Apptentive/Message Center/Controllers/ApptentiveMessageCenterViewController.m
@@ -1222,6 +1222,7 @@ - (BOOL)shouldShowProfileViewBeforeComposing:(BOOL)beforeComposing {
 
 - (void)discardDraft {
 	self.messageInputView.messageView.text = nil;
+	self.messageInputView.placeholderLabel.hidden = false;
 	[self.messageInputView.messageView resignFirstResponder];
 
 	[self.attachmentController clear];
diff --git a/Apptentive/ApptentiveTests/Info.plist b/Apptentive/ApptentiveTests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.3.2</string>
+	<string>5.3.3</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 2021-06-16 - v5.3.3
+
+#### Bugs Fixed
+
+* Remove duplicate VoiceOver elements in Message Center
+* Fix a bug where Message Center placeholder text would disappear
+
 # 2021-05-11 - v5.3.2
 
 #### Improvements
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - apptentive-ios (5.3.2)
+  - apptentive-ios (5.3.3)
 
 DEPENDENCIES:
   - apptentive-ios (from `..`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: ".."
 
 SPEC CHECKSUMS:
-  apptentive-ios: 8254c0c93038b951a196b7912b5e9760ecb4b080
+  apptentive-ios: 90329e56e39cc4df71e67f6dd8eadc899cd8aba1
 
 PODFILE CHECKSUM: 785a9d76c0ca2535819b754c6fe8c5c6413dbc30
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.8.4
diff --git a/apptentive-ios.podspec b/apptentive-ios.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name     = 'apptentive-ios'
   s.module_name = 'Apptentive'
-  s.version  = '5.3.2'
+  s.version  = '5.3.3'
   s.license  = 'BSD'
   s.summary  = 'Apptentive Customer Communications SDK.'
   s.homepage = 'https://www.apptentive.com/'
