Skip to content

Commit 40a693a

Browse files
frankusfrankus
authored
Merge pull request #240 from apptentive/branch_5.2.6
Release 5.2.6
2 parents 74fbf7f + 63d0d8b commit 40a693a

File tree

8 files changed

+30
-15
lines changed

8 files changed

+30
-15
lines changed

‎Apptentive/Apptentive.xcodeproj/project.pbxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -2371,7 +2371,7 @@
23712371
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
23722372
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
23732373
COPY_PHASE_STRIP = NO;
2374-
CURRENT_PROJECT_VERSION = 25;
2374+
CURRENT_PROJECT_VERSION = 26;
23752375
DEBUG_INFORMATION_FORMAT = dwarf;
23762376
ENABLE_STRICT_OBJC_MSGSEND = YES;
23772377
ENABLE_TESTABILITY = YES;
@@ -2429,7 +2429,7 @@
24292429
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
24302430
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
24312431
COPY_PHASE_STRIP = NO;
2432-
CURRENT_PROJECT_VERSION = 25;
2432+
CURRENT_PROJECT_VERSION = 26;
24332433
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
24342434
ENABLE_NS_ASSERTIONS = NO;
24352435
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -2461,7 +2461,7 @@
24612461
DEFINES_MODULE = YES;
24622462
DEVELOPMENT_TEAM = 86WML2UN43;
24632463
DYLIB_COMPATIBILITY_VERSION = 1;
2464-
DYLIB_CURRENT_VERSION = 25;
2464+
DYLIB_CURRENT_VERSION = 26;
24652465
DYLIB_INSTALL_NAME_BASE = "@rpath";
24662466
GCC_PREFIX_HEADER = "Apptentive/Misc/ApptentiveConnect-Prefix.pch";
24672467
GCC_PREPROCESSOR_DEFINITIONS = "APPTENTIVE_DEBUG=1";
@@ -2483,7 +2483,7 @@
24832483
DEFINES_MODULE = YES;
24842484
DEVELOPMENT_TEAM = 86WML2UN43;
24852485
DYLIB_COMPATIBILITY_VERSION = 1;
2486-
DYLIB_CURRENT_VERSION = 25;
2486+
DYLIB_CURRENT_VERSION = 26;
24872487
DYLIB_INSTALL_NAME_BASE = "@rpath";
24882488
GCC_PREFIX_HEADER = "Apptentive/Misc/ApptentiveConnect-Prefix.pch";
24892489
GCC_TREAT_WARNINGS_AS_ERRORS = YES;

‎Apptentive/Apptentive/Apptentive.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ FOUNDATION_EXPORT double ApptentiveVersionNumber;
2020
FOUNDATION_EXPORT const unsigned char ApptentiveVersionString[];
2121

2222
/** The version number of the Apptentive SDK. */
23-
#define kApptentiveVersionString @"5.2.5"
23+
#define kApptentiveVersionString @"5.2.6"
2424

2525
/** The version number of the Apptentive API platform. */
2626
#define kApptentiveAPIVersionString @"9"

‎Apptentive/Apptentive/ApptentiveStyleSheet.m

+14-5
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,9 @@ - (instancetype)init {
341341
#ifdef __IPHONE_13_0
342342
_secondaryColor = [UIColor secondaryLabelColor];
343343
_failureColor = [UIColor systemRedColor];
344+
#else
345+
_secondaryColor = [UIColor colorWithRed:118.0 / 255.0 green:118.0 / 255.0 blue:122.0 / 255.0 alpha:1.0];
346+
_failureColor = [UIColor colorWithRed:218.0 / 255.0 green:53.0 / 255.0 blue:71.0 / 255.0 alpha:1.0];
344347
#endif
345348
} else {
346349
_secondaryColor = [UIColor colorWithRed:118.0 / 255.0 green:118.0 / 255.0 blue:122.0 / 255.0 alpha:1.0];
@@ -462,16 +465,22 @@ - (void)inheritDefaultColors {
462465
_backgroundColor = self.backgroundColor ?: [UIColor systemBackgroundColor];
463466
_collectionBackgroundColor = self.collectionBackgroundColor ?: [UIColor systemGroupedBackgroundColor];
464467
_placeholderColor = self.placeholderColor ?: [UIColor placeholderTextColor];
468+
#else
469+
[self inheritAppearanceColors];
465470
#endif
466471
} else {
467-
_primaryColor = self.primaryColor ?: [self appearanceColorForClass:[UILabel class] property:@selector(textColor) default:[UIColor blackColor]];
468-
_separatorColor = self.separatorColor ?: [self appearanceColorForClass:[UITableView class] property:@selector(separatorColor) default:[UIColor colorWithRed:199.0 / 255.0 green:200.0 / 255.0 blue:204.0 / 255.0 alpha:1.0]];
469-
_backgroundColor = self.backgroundColor ?: [self appearanceColorForClass:[UITableViewCell class] property:@selector(backgroundColor) default:[UIColor whiteColor]];
470-
_collectionBackgroundColor = self.collectionBackgroundColor ?: [self appearanceColorForClass:[UITableView class] property:@selector(backgroundColor) default:[UIColor groupTableViewBackgroundColor]];
471-
_placeholderColor = self.placeholderColor ?: [UIColor colorWithRed:0 green:0 blue:25.0 / 255.0 alpha:56.0 / 255.0];
472+
[self inheritAppearanceColors];
472473
}
473474
}
474475

476+
- (void)inheritAppearanceColors {
477+
_primaryColor = self.primaryColor ?: [self appearanceColorForClass:[UILabel class] property:@selector(textColor) default:[UIColor blackColor]];
478+
_separatorColor = self.separatorColor ?: [self appearanceColorForClass:[UITableView class] property:@selector(separatorColor) default:[UIColor colorWithRed:199.0 / 255.0 green:200.0 / 255.0 blue:204.0 / 255.0 alpha:1.0]];
479+
_backgroundColor = self.backgroundColor ?: [self appearanceColorForClass:[UITableViewCell class] property:@selector(backgroundColor) default:[UIColor whiteColor]];
480+
_collectionBackgroundColor = self.collectionBackgroundColor ?: [self appearanceColorForClass:[UITableView class] property:@selector(backgroundColor) default:[UIColor groupTableViewBackgroundColor]];
481+
_placeholderColor = self.placeholderColor ?: [UIColor colorWithRed:0 green:0 blue:25.0 / 255.0 alpha:56.0 / 255.0];
482+
}
483+
475484
- (void)setFontDescriptor:(UIFontDescriptor *)fontDescriptor forStyle:(ApptentiveStyleIdentifier)textStyle {
476485
ApptentiveDictionarySetKeyValue(self.fontDescriptorOverrides, textStyle, fontDescriptor);
477486
}

‎Apptentive/Apptentive/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>5.2.5</string>
18+
<string>5.2.6</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>NSPrincipalClass</key>

‎Apptentive/ApptentiveTests/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>5.2.5</string>
18+
<string>5.2.6</string>
1919
<key>CFBundleVersion</key>
2020
<string>1</string>
2121
</dict>

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# 2019-09-16 - v5.2.6
2+
3+
#### Bugs Fixed
4+
5+
* Fix a bug where running an app built with Xcode 10 on iOS 13 can result in unreadable (all-magenta) Survey and Message Center views.
6+
17
# 2019-09-05 - v5.2.5
28

39
#### Bugs Fixed

‎Example/Podfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- apptentive-ios (5.2.5)
2+
- apptentive-ios (5.2.6)
33

44
DEPENDENCIES:
55
- apptentive-ios (from `..`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
99
:path: ".."
1010

1111
SPEC CHECKSUMS:
12-
apptentive-ios: 0022edeee28b3c4ca0ddfc8848c56aa192b6de89
12+
apptentive-ios: 70093701d0d5aa9c56cd2a8cf03df28f7a45be40
1313

1414
PODFILE CHECKSUM: 89d2b5f4683b04482e89df6d46b268cc9ed1ef79
1515

‎apptentive-ios.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = 'apptentive-ios'
33
s.module_name = 'Apptentive'
4-
s.version = '5.2.5'
4+
s.version = '5.2.6'
55
s.license = 'BSD'
66
s.summary = 'Apptentive Customer Communications SDK.'
77
s.homepage = 'https://www.apptentive.com/'

0 commit comments

Comments
 (0)