Merge pull request #8 from CleverTap/0.1.4

SDK-290: Release v0.1.4

Author: Aditi3

CHANGELOG.md

@@ -1,25 +1,24 @@
 Change Log
 ==========
 
-Version 0.1.3 *(24 October, 2017)*
+Version 0.1.4 *(8 July, 2020)*
 -------------------------------------------
+- Add a method to return Push Notification response
 
+Version 0.1.3 *(24 October, 2017)*
+-------------------------------------------
 - Update podspec to weak link UIkit framework to allow safe linking to < iOS 10 targets
 
-
 Version 0.1.2 *(19 September, 2017)*
 -------------------------------------------
-
 - Update podspec to weak link UserNotifications framework to allow safe linking to < iOS 10 targets
 
-
 Version 0.1.1 *(23 July, 2017)*
 -------------------------------------------
-- add support for Back button in slideshow
-- add autoDismiss flag for granular control of notification dismissal on action url click
-- tweaks to item caption, subcaption, and imageview border display
+- Add support for Back button in slideshow
+- Add autoDismiss flag for granular control of notification dismissal on action url click
+- Tweaks to item caption, subcaption, and imageview border display
 
 Version 0.1.0 *(8 March, 2017)*
 -------------------------------------------
-
 - Initial release.

CTNotificationContent.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "CTNotificationContent"
-  s.version          = "0.1.3"
+  s.version          = "0.1.4"
   s.summary          = "A Notification Content Extension class to display custom content interfaces for iOS 10 push notifications"
   s.homepage         = "https://github.com/CleverTap/CTNotificationContent"
   s.license          = "MIT" 

CTNotificationContent.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 50;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -165,7 +165,7 @@
 		525715E01E67B8C0000E455B /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0820;
+				LastUpgradeCheck = 1130;
 				ORGANIZATIONNAME = CleverTap;
 				TargetAttributes = {
 					525715E81E67B8C0000E455B = {
@@ -176,11 +176,12 @@
 				};
 			};
 			buildConfigurationList = 525715E31E67B8C0000E455B /* Build configuration list for PBXProject "CTNotificationContent" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			compatibilityVersion = "Xcode 9.3";
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 525715DF1E67B8C0000E455B;
 			productRefGroup = 525715EA1E67B8C0000E455B /* Products */;
@@ -222,20 +223,29 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -259,7 +269,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -273,20 +283,29 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -304,7 +323,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -326,7 +345,12 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = CTNotificationContent/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.clevertap.CTNotificationContent;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -345,7 +369,12 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = CTNotificationContent/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.clevertap.CTNotificationContent;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

CTNotificationContent.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

CTNotificationContent/BaseCTNotificationContentViewController.h

@@ -1,4 +1,3 @@
-
 #import <UIKit/UIKit.h>
 #import <UserNotifications/UserNotifications.h>
 #import <UserNotificationsUI/UserNotificationsUI.h>
@@ -12,5 +11,4 @@
 
 - (CTNotificationViewController *)getParentViewController;
 
-
 @end

CTNotificationContent/BaseCTNotificationContentViewController.m

@@ -1,4 +1,3 @@
-
 #import "BaseCTNotificationContentViewController.h"
 #import "CTNotificationViewController.h"
 

CTNotificationContent/CTNotificationContent.h

@@ -1,4 +1,3 @@
- 
 #import <UIKit/UIKit.h>
 
 //! Project version number for CTNotificationContent.

CTNotificationContent/CTNotificationViewController.h

@@ -1,4 +1,3 @@
-
 #import <UIKit/UIKit.h>
 
 typedef NS_ENUM(NSInteger, CTNotificationContentType) {
@@ -13,4 +12,6 @@ typedef NS_ENUM(NSInteger, CTNotificationContentType) {
 
 - (void)openUrl:(NSURL * _Nonnull)url; // convenience method
 
+- (void)userDidReceiveNotificationResponse:(UNNotificationResponse *_Nullable)response; // implement in your subclass to get notification response
+
 @end

CTNotificationContent/CTNotificationViewController.m

@@ -1,4 +1,3 @@
-
 #import "CTNotificationViewController.h"
 #import "BaseCTNotificationContentViewController.h"
 #import <UserNotifications/UserNotifications.h>
@@ -11,7 +10,6 @@ @interface CTNotificationViewController () <UNNotificationContentExtension>
 
 @end
 
-
 @implementation CTNotificationViewController
 
 - (void)viewDidLoad {
@@ -43,6 +41,7 @@ - (void)didReceiveNotification:(UNNotification *)notification {
 - (void)didReceiveNotificationResponse:(UNNotificationResponse *)response
                      completionHandler:(void (^)(UNNotificationContentExtensionResponseOption))completion {
     UNNotificationContentExtensionResponseOption actionResponseOption = [self.contentViewController handleAction:response.actionIdentifier];
+    [self userDidReceiveNotificationResponse:response];
     completion(actionResponseOption);
 }
 
@@ -57,12 +56,16 @@ - (void)displayContentController: (BaseCTNotificationContentViewController *) co
     self.contentViewController = contentController;
 }
 
-
 - (void)userDidPerformAction:(NSString *)action withProperties:(NSDictionary *)properties {
     // no-op here
     // implement in your subclass to get user event type data
 }
 
+- (void)userDidReceiveNotificationResponse:(UNNotificationResponse *)response {
+    // no-op here
+    // implement in your subclass to get notification response
+}
+
 // convenience 
 - (void)openUrl:(NSURL *)url {
     [self.extensionContext openURL:url completionHandler:nil];

CTNotificationContent/Categories/UIImage+CTImage.h

@@ -1,4 +1,3 @@
-
 #import <UIKit/UIKit.h>
 
 @interface UIImage (CTImage)