Merge pull request #248 from Countly/feedback-rating-tags

Added feedback rating widget and tags

CHANGELOG.md

@@ -1,4 +1,6 @@
 ## 23.8.1
+- Expanded feedback widget functionality. Added ability to use rating widgets.
+- Added functionality to access tags for feedback widgets.
 - Fixed SPM public header issues of `CountlyViewTracking.h` 
 
 ## 23.8.0

Countly-PL.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'Countly-PL'
-  s.version = '23.8.0'
+  s.version = '23.8.1'
   s.license = { :type => 'MIT', :file => 'LICENSE' }
   s.summary  = 'Countly is an innovative, real-time, open source mobile analytics platform.'
   s.homepage = 'https://github.com/Countly/countly-sdk-ios'

Countly.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'Countly'
-  s.version = '23.8.0'
+  s.version = '23.8.1'
   s.license = { :type => 'MIT', :file => 'LICENSE' }
   s.summary  = 'Countly is an innovative, real-time, open source mobile analytics platform.'
   s.homepage = 'https://github.com/Countly/countly-sdk-ios'

Countly.xcodeproj/project.pbxproj

@@ -450,7 +450,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 23.8.0;
+				MARKETING_VERSION = 23.8.1;
 				PRODUCT_BUNDLE_IDENTIFIER = ly.count.CountlyiOSSDK;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -479,7 +479,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 23.8.0;
+				MARKETING_VERSION = 23.8.1;
 				PRODUCT_BUNDLE_IDENTIFIER = ly.count.CountlyiOSSDK;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

CountlyCommon.m

@@ -26,7 +26,7 @@ @interface CountlyCommon ()
 #endif
 @end
 
-NSString* const kCountlySDKVersion = @"23.8.0";
+NSString* const kCountlySDKVersion = @"23.8.1";
 NSString* const kCountlySDKName = @"objc-native-ios";
 
 NSString* const kCountlyErrorDomain = @"ly.count.ErrorDomain";

CountlyFeedbackWidget.h

@@ -11,16 +11,19 @@ NS_ASSUME_NONNULL_BEGIN
 typedef NSString* CLYFeedbackWidgetType NS_EXTENSIBLE_STRING_ENUM;
 extern CLYFeedbackWidgetType const CLYFeedbackWidgetTypeSurvey;
 extern CLYFeedbackWidgetType const CLYFeedbackWidgetTypeNPS;
+extern CLYFeedbackWidgetType const CLYFeedbackWidgetTypeRating;
 
 extern NSString* const kCountlyReservedEventSurvey;
 extern NSString* const kCountlyReservedEventNPS;
+extern NSString* const kCountlyReservedEventRating;
 
 @interface CountlyFeedbackWidget : NSObject
 #if (TARGET_OS_IOS)
 
 @property (nonatomic, readonly) CLYFeedbackWidgetType type;
 @property (nonatomic, readonly) NSString* ID;
 @property (nonatomic, readonly) NSString* name;
+@property (nonatomic, readonly) NSArray<NSString* >* tags;
 @property (nonatomic, readonly) NSDictionary* data;
 
 /**

CountlyFeedbackWidget.m

@@ -9,11 +9,13 @@
 #import <WebKit/WebKit.h>
 #endif
 
-CLYFeedbackWidgetType const CLYFeedbackWidgetTypeSurvey     = @"survey";
-CLYFeedbackWidgetType const CLYFeedbackWidgetTypeNPS        = @"nps";
+CLYFeedbackWidgetType const CLYFeedbackWidgetTypeSurvey = @"survey";
+CLYFeedbackWidgetType const CLYFeedbackWidgetTypeNPS    = @"nps";
+CLYFeedbackWidgetType const CLYFeedbackWidgetTypeRating = @"rating";
 
 NSString* const kCountlyReservedEventSurvey = @"[CLY]_survey";
 NSString* const kCountlyReservedEventNPS    = @"[CLY]_nps";
+NSString* const kCountlyReservedEventRating = @"[CLY]_rating";
 
 NSString* const kCountlyFBKeyClosed         = @"closed";
 NSString* const kCountlyFBKeyShown          = @"shown";
@@ -22,6 +24,7 @@ @interface CountlyFeedbackWidget ()
 @property (nonatomic) CLYFeedbackWidgetType type;
 @property (nonatomic) NSString* ID;
 @property (nonatomic) NSString* name;
+@property (nonatomic) NSArray<NSString*>* tags;
 @property (nonatomic) NSDictionary* data;
 @end
 
@@ -35,6 +38,7 @@ + (CountlyFeedbackWidget *)createWithDictionary:(NSDictionary *)dictionary
     feedback.ID = dictionary[kCountlyFBKeyID];
     feedback.type = dictionary[@"type"];
     feedback.name = dictionary[@"name"];
+    feedback.tags = dictionary[@"tg"];
     return feedback;
 }
 
@@ -209,6 +213,8 @@ - (void)recordReservedEventWithSegmentation:(NSDictionary *)segm
         eventName = kCountlyReservedEventSurvey;
     else if ([self.type isEqualToString:CLYFeedbackWidgetTypeNPS])
         eventName = kCountlyReservedEventNPS;
+    else if ([self.type isEqualToString:CLYFeedbackWidgetTypeRating])
+        eventName = kCountlyReservedEventRating;
 
     if (!eventName)
     {
@@ -227,7 +233,7 @@ - (void)recordReservedEventWithSegmentation:(NSDictionary *)segm
 
 - (NSString *)description
 {
-    NSString *customDescription = [NSString stringWithFormat:@"\rID: %@, Type: %@ \rName: %@", self.ID, self.type, self.name];
+    NSString *customDescription = [NSString stringWithFormat:@"\rID: %@, Type: %@ \rName: %@ \rTags: %@", self.ID, self.type, self.name, self.tags];
     return [[super description] stringByAppendingString:customDescription];
 }