Merge pull request #10 from adtrace/beta

event value parameters revised!
adtrace · Jun 20, 2022 · 6bca034 · 6bca034
2 parents 59b0a43 + 1cf285a
commit 6bca034
Show file tree

Hide file tree

Showing 18 changed files with 43 additions and 56 deletions.
diff --git a/...xcode/package.xcworkspace/xcuserdata/nassernas.xcuserdatad/UserInterfaceState.xcuserstate b/...xcode/package.xcworkspace/xcuserdata/nassernas.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/.swiftpm/xcode/xcuserdata/nassernas.xcuserdatad/xcschemes/xcschememanagement.plist b/.swiftpm/xcode/xcuserdata/nassernas.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,12 +7,12 @@
 		<key>Adtrace-Package.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>0</integer>
 		</dict>
 		<key>Adtrace.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>1</integer>
 		</dict>
 		<key>WebBridge.xcscheme_^#shared#^_</key>
 		<dict>

diff --git a/Adtrace-sdk.podspec b/Adtrace-sdk.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name           = "Adtrace-sdk"
-  s.version        = "2.0.8"
+  s.version        = "2.1.0"
   s.summary        = "This is the iOS SDK of adtrace. You can read more about it at https://adtrace.io."
   s.homepage       = "https://github.com/adtrace/adtrace_sdk_iOS"
   s.license        = { :type => 'MIT', :file => 'MIT-LICENSE' }

diff --git a/...eproj/project.xcworkspace/xcuserdata/nassernas.xcuserdatad/UserInterfaceState.xcuserstate b/...eproj/project.xcworkspace/xcuserdata/nassernas.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Adtrace/ADTEvent.h b/Adtrace/ADTEvent.h
@@ -82,11 +82,11 @@
 - (void)addCallbackParameter:(nonnull NSString *)key value:(nonnull NSString *)value;
 
 /**
- * @brief Add a key-pair to be fowarded to a partner.
+ * @brief Add a key-pair to be sent with event.
  *
- * @param key String key to be fowarded to the partner.
- * @param value String value of the key to be fowarded to the partner.
- */
+ * @param key String key to be sent with event.
+ * @param value String value of the key to be sent with event.
+ *  */
 - (void)addEventValueParameter:(nonnull NSString *)key value:(nonnull NSString *)value;
 
 /**

diff --git a/Adtrace/ADTPackageBuilder.m b/Adtrace/ADTPackageBuilder.m
@@ -484,12 +484,12 @@ - (NSMutableDictionary *)getEventParameters:(BOOL)isInDelay forEventPackage:(ADT
         NSDictionary *mergedCallbackParameters = [ADTUtil mergeParameters:[self.sessionParameters.callbackParameters copy]
                                                                    source:[event.callbackParameters copy]
                                                             parameterName:@"Callback"];
-        NSDictionary *mergedPartnerParameters = [ADTUtil mergeParameters:[self.sessionParameters.partnerParameters copy]
+        NSDictionary *mergedValueParameters = [ADTUtil mergeParameters:[self.sessionParameters.partnerParameters copy]
                                                                   source:[event.addEventParameters copy]
-                                                           parameterName:@"Partner"];
+                                                           parameterName:@"Value"];
 
         [ADTPackageBuilder parameters:parameters setDictionary:mergedCallbackParameters forKey:@"callback_params"];
-        [ADTPackageBuilder parameters:parameters setDictionary:mergedPartnerParameters forKey:@"partner_params"];
+        [ADTPackageBuilder parameters:parameters setDictionary:mergedValueParameters forKey:@"event_value_params"];
     }
 
     if (event.emptyReceipt) {

diff --git a/Adtrace/ADTPackageHandler.m b/Adtrace/ADTPackageHandler.m
@@ -282,12 +282,12 @@ - (void)updatePackagesI:(ADTPackageHandler *)selfI
                                forKey:@"callback_params"];
 
 
-        NSDictionary * mergedPartnerParameters = [ADTUtil mergeParameters:sessionParameters.partnerParameters
+        NSDictionary * mergedValueParameters = [ADTUtil mergeParameters:sessionParameters.partnerParameters
                                                                    source:activityPackage.eventValueParameters
                                                             parameterName:@"Value"];
 
         [ADTPackageBuilder parameters:activityPackage.parameters
-                        setDictionary:mergedPartnerParameters
+                        setDictionary:mergedValueParameters
                                forKey:@"event_value_params"];
     }
 

diff --git a/Adtrace/ADTUtil.m b/Adtrace/ADTUtil.m
@@ -39,7 +39,7 @@
 static NSRegularExpression *shortUniversalLinkRegex = nil;
 static NSRegularExpression *excludedDeeplinkRegex = nil;
 
-static NSString * const kClientSdk                  = @"ios2.0.8";
+static NSString * const kClientSdk                  = @"ios2.1.0";
 static NSString * const kDeeplinkParam              = @"deep_link=";
 static NSString * const kSchemeDelimiter            = @"://";
 static NSString * const kDefaultScheme              = @"AdtraceUniversalScheme";

diff --git a/README.md b/README.md
@@ -75,14 +75,14 @@ We will describe the steps to integrate the Adtrace SDK into your iOS project. W
 If you're using [CocoaPods][cocoapods], you can add the following line to your `Podfile` and continue from [this step](#sdk-integrate):
 
 ```ruby
-pod 'Adtrace-sdk', '~> 2.0.8'
+pod 'Adtrace-sdk', '~> 2.1.0'
 
 ```
 
 or:
 
 ```ruby
-pod 'Adtrace-sdk', :git => 'https://github.com/adtrace/adtrace_sdk_iOS', :tag => 'v2.0.8'
+pod 'Adtrace-sdk', :git => 'https://github.com/adtrace/adtrace_sdk_iOS', :tag => 'v2.1.0'
 ```
 
 ---

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.8
+2.1.0
diff --git a/...eproj/project.xcworkspace/xcuserdata/nassernas.xcuserdatad/UserInterfaceState.xcuserstate b/...eproj/project.xcworkspace/xcuserdata/nassernas.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/examples/AdtraceExample-ObjC/AdtraceExample-ObjC/Base.lproj/Main.storyboard b/examples/AdtraceExample-ObjC/AdtraceExample-ObjC/Base.lproj/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -116,7 +116,7 @@
                             <constraint firstItem="Nz4-ql-pka" firstAttribute="leading" secondItem="CtA-LW-sfH" secondAttribute="leading" id="9GO-Cv-FrB" userLabel="Button Enable SDK - Left"/>
                             <constraint firstItem="WkT-aw-5FP" firstAttribute="leading" secondItem="qOy-JF-sz3" secondAttribute="leading" id="CJF-Q6-e7Z" userLabel="Button Track Callback Event - Left"/>
                             <constraint firstItem="h38-T3-Es8" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" multiplier="1.64" id="F0k-JU-12S" userLabel="Button Is SDK Enabled - Center Y"/>
-                            <constraint firstItem="xdn-OV-t7P" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" multiplier="0.84" id="L8f-G1-kEA" userLabel="Button Track Partner Event - Center Y"/>
+                            <constraint firstItem="xdn-OV-t7P" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" multiplier="0.84" id="L8f-G1-kEA" userLabel="Button Track Value Event - Center Y"/>
                             <constraint firstItem="pcl-gg-Wh1" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" id="NHS-Ap-Qt8" userLabel="Button Enable Offline Mode - Center Y"/>
                             <constraint firstItem="G0l-tK-3Xp" firstAttribute="leading" secondItem="Nz4-ql-pka" secondAttribute="leading" id="NNY-X4-9w9" userLabel="Button Disable SDK - Left"/>
                             <constraint firstItem="h38-T3-Es8" firstAttribute="leading" secondItem="G0l-tK-3Xp" secondAttribute="leading" id="Ppc-dh-GZU" userLabel="Button Is SDK Enabled - Left"/>
@@ -126,7 +126,7 @@
                             <constraint firstItem="CtA-LW-sfH" firstAttribute="leading" secondItem="pcl-gg-Wh1" secondAttribute="leading" id="avj-OZ-xkQ" userLabel="Button Disable Offline Mode - Left"/>
                             <constraint firstItem="GIu-rR-F7C" firstAttribute="trailing" secondItem="8bC-Xf-vdC" secondAttribute="trailing" constant="-50" id="b67-VF-K9H" userLabel="Button Track Simple Event - Right"/>
                             <constraint firstItem="GIu-rR-F7C" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" constant="50" id="b9I-zW-S0s" userLabel="Button Track Simple Event - Left"/>
-                            <constraint firstItem="xdn-OV-t7P" firstAttribute="leading" secondItem="WkT-aw-5FP" secondAttribute="leading" id="cpC-AL-syT" userLabel="Button Track Partner Event - Left"/>
+                            <constraint firstItem="xdn-OV-t7P" firstAttribute="leading" secondItem="WkT-aw-5FP" secondAttribute="leading" id="cpC-AL-syT" userLabel="Button Track Value Event - Left"/>
                             <constraint firstItem="CtA-LW-sfH" firstAttribute="trailing" secondItem="pcl-gg-Wh1" secondAttribute="trailing" id="gck-Oj-n7R" userLabel="Button Disable Offline Mode - Right"/>
                             <constraint firstItem="qOy-JF-sz3" firstAttribute="leading" secondItem="GIu-rR-F7C" secondAttribute="leading" id="j38-xp-iIV" userLabel="Button Track Revenue Event - Left"/>
                             <constraint firstItem="G0l-tK-3Xp" firstAttribute="trailing" secondItem="Nz4-ql-pka" secondAttribute="trailing" id="jEc-Dd-B2q" userLabel="Button Disable SDK - Right"/>
@@ -135,7 +135,7 @@
                             <constraint firstItem="Nz4-ql-pka" firstAttribute="trailing" secondItem="CtA-LW-sfH" secondAttribute="trailing" id="oII-Wo-jTT" userLabel="Button Enable SDK - Right"/>
                             <constraint firstItem="qOy-JF-sz3" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" multiplier="0.52" id="qFt-9H-RmJ" userLabel="Button Track Revenue Event - Center Y"/>
                             <constraint firstItem="Nz4-ql-pka" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" multiplier="1.32" id="t8W-D5-kvX" userLabel="Button Enable SDK - Center Y"/>
-                            <constraint firstItem="xdn-OV-t7P" firstAttribute="trailing" secondItem="WkT-aw-5FP" secondAttribute="trailing" id="umj-lw-QZG" userLabel="Button Track Partner Event - Right"/>
+                            <constraint firstItem="xdn-OV-t7P" firstAttribute="trailing" secondItem="WkT-aw-5FP" secondAttribute="trailing" id="umj-lw-QZG" userLabel="Button Track Value Event - Right"/>
                             <constraint firstItem="CtA-LW-sfH" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" multiplier="1.16" id="wIb-2M-xGQ" userLabel="Button Disable Offline Mode - Center Y"/>
                             <constraint firstItem="qOy-JF-sz3" firstAttribute="trailing" secondItem="GIu-rR-F7C" secondAttribute="trailing" id="xsR-c3-YDy" userLabel="Button Track Revenue Event - Right"/>
                             <constraint firstItem="pcl-gg-Wh1" firstAttribute="trailing" secondItem="xdn-OV-t7P" secondAttribute="trailing" id="ys8-TB-urQ" userLabel="Button Enable Offline Mode - Right"/>

diff --git a/...eproj/project.xcworkspace/xcuserdata/nassernas.xcuserdatad/UserInterfaceState.xcuserstate b/...eproj/project.xcworkspace/xcuserdata/nassernas.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/examples/AdtraceExample-WebView/AdtraceExample-WebView/AdjustExample-WebView.html b/examples/AdtraceExample-WebView/AdtraceExample-WebView/AdjustExample-WebView.html
@@ -96,14 +96,14 @@ <h1 style="width:300px;height:35px;text-align:center;">Adtrace Web View Demo</h1
             Adtrace.trackEvent(adtraceEvent)
         }
 
-        var btnTrackPartnerEvent = document.getElementById('btnTrackPartnerEvent')
-        btnTrackPartnerEvent.onclick = function(e) {
+        var btnTrackValueEvent = document.getElementById('btnTrackValueEvent')
+        btnTrackValueEvent.onclick = function(e) {
             e.preventDefault()
             var adtraceEvent = new AdtraceEvent('w788qs')
-            adtraceEvent.addPartnerParameter('foo', 'bar')
-            adtraceEvent.addPartnerParameter('x', 'y')
-            adtraceEvent.addPartnerParameter('foo', 'foot')
-            adtraceEvent.addPartnerParameter('x', 'z')
+            adtraceEvent.addEventValueParameter('foo', 'bar')
+            adtraceEvent.addEventValueParameter('x', 'y')
+            adtraceEvent.addEventValueParameter('foo', 'foot')
+            adtraceEvent.addEventValueParameter('x', 'z')
             Adtrace.trackEvent(adtraceEvent);
         }
 
@@ -168,7 +168,7 @@ <h1 style="width:300px;height:35px;text-align:center;">Adtrace Web View Demo</h1
             <button id='btnTrackCallbackEvent'>Track Callback event</button>
         </div>
         <div style="width:300px;height:35px;text-align:center;">
-            <button id='btnTrackPartnerEvent'>Track Partner event</button>
+            <button id='btnTrackValueEvent'>Track Value event</button>
         </div>
         <div style="width:300px;height:35px;text-align:center;">
             <button id='btnEnableOfflineMode'>Enable Offline mode</button>

diff --git a/...ples/AdtraceExample-iWatch/AdtraceExample-iWatch WatchKit Extension/InterfaceController.m b/...ples/AdtraceExample-iWatch/AdtraceExample-iWatch WatchKit Extension/InterfaceController.m
@@ -34,7 +34,7 @@ - (void)awakeWithContext:(id)context {
     [row1.wkLblTitle setText:@"Simple Event"];
     [row2.wkLblTitle setText:@"Revenue Event"];
     [row3.wkLblTitle setText:@"Callback Event"];
-    [row4.wkLblTitle setText:@"Partner Event"];
+    [row4.wkLblTitle setText:@"Value Event"];
 }
 
 - (void)willActivate {
@@ -235,7 +235,7 @@ - (void)table:(WKInterfaceTable *)table didSelectRowAtIndex:(NSInteger)rowIndex
             break;
         }
         case 3: {
-            NSDictionary *requst = @{@"request":@"event_partner"};
+            NSDictionary *requst = @{@"request":@"event_value_params"};
 
             [InterfaceController openParentApplication:requst reply:^(NSDictionary *replyInfo, NSError *error) {
 
@@ -246,10 +246,10 @@ - (void)table:(WKInterfaceTable *)table didSelectRowAtIndex:(NSInteger)rowIndex
 
                     if ([[replyInfo objectForKey:@"response"] isEqualToString:@"ack"]) {
                         
-                        message = @"Partner event tracked!";
+                        message = @"Value event tracked!";
                     } else {
                         
-                        message = @"Partner event not tracked!";
+                        message = @"Value event not tracked!";
                     }
                     
                     [self pushControllerWithName:@"EventTrackedController" context:message];

diff --git a/...ample-iWatch.xcodeproj/xcshareddata/xcschemes/AdtraceExample-iWatch WatchKit App.xcscheme b/...ample-iWatch.xcodeproj/xcshareddata/xcschemes/AdtraceExample-iWatch WatchKit App.xcscheme
@@ -54,46 +54,33 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/Adtrace Example">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "9DF7AC2A1CB4FEDB00D3591F"
             BuildableName = "AdtraceExample-iWatch WatchKit App.app"
             BlueprintName = "AdtraceExample-iWatch WatchKit App"
             ReferencedContainer = "container:AdtraceExample-iWatch.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
+      </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/Adtrace Example">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "9DF7AC2A1CB4FEDB00D3591F"
             BuildableName = "AdtraceExample-iWatch WatchKit App.app"
             BlueprintName = "AdtraceExample-iWatch WatchKit App"
             ReferencedContainer = "container:AdtraceExample-iWatch.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "9DF7AC2A1CB4FEDB00D3591F"
-            BuildableName = "AdtraceExample-iWatch WatchKit App.app"
-            BlueprintName = "AdtraceExample-iWatch WatchKit App"
-            ReferencedContainer = "container:AdtraceExample-iWatch.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
+      </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/examples/AdtraceExample-iWatch/AdtraceExample-iWatch/AppDelegate.m b/examples/AdtraceExample-iWatch/AdtraceExample-iWatch/AppDelegate.m
@@ -69,7 +69,7 @@ - (void)session:(WCSession *)session didReceiveMessage:(NSDictionary<NSString *,
         replyHandler(response);
 
         [[AdtraceLoggingHelper sharedInstance] logText:@"Callback event tracked!"];
-    } else if ([[message objectForKey:@"request"] isEqualToString:@"event_partner"]) {
+    } else if ([[message objectForKey:@"request"] isEqualToString:@"event_value_params"]) {
         NSLog(@"Received request from Apple Watch to track simple event.");
 
         [[AdtraceTrackingHelper sharedInstance] trackEventValue];
@@ -111,15 +111,15 @@ - (void)application:(UIApplication *)application handleWatchKitExtensionRequest:
         reply(response);
 
         [[AdtraceLoggingHelper sharedInstance] logText:@"Callback event tracked!"];
-    } else if ([[userInfo objectForKey:@"request"] isEqualToString:@"event_partner"]) {
+    } else if ([[userInfo objectForKey:@"request"] isEqualToString:@"event_value_params"]) {
         NSLog(@"Received request from Apple Watch to track simple event.");
 
-        [[AdtraceTrackingHelper sharedInstance] trackPartnerEvent];
+        [[AdtraceTrackingHelper sharedInstance] trackValueEvent];
 
         NSDictionary *response = @{@"response" : @"ack"};
         reply(response);
         
-        [[AdtraceLoggingHelper sharedInstance] logText:@"Partner event tracked!"];
+        [[AdtraceLoggingHelper sharedInstance] logText:@"Value event tracked!"];
     }
 }
  */

diff --git a/examples/AdtraceExample-iWatch/AdtraceExample-iWatch/ViewControllerWatch.m b/examples/AdtraceExample-iWatch/AdtraceExample-iWatch/ViewControllerWatch.m
@@ -15,7 +15,7 @@ @interface ViewControllerWatch ()
 @property (weak, nonatomic) IBOutlet UIButton *btnTrackSimpleEvent;
 @property (weak, nonatomic) IBOutlet UIButton *btnTrackRevenueEvent;
 @property (weak, nonatomic) IBOutlet UIButton *btnTrackEventWithCallback;
-@property (weak, nonatomic) IBOutlet UIButton *btnTrackEventWithPartner;
+@property (weak, nonatomic) IBOutlet UIButton *btnTrackEventWithValue;
 
 @end