From 98937d39f81d5bd8a6d9f6cd6e36b997e8898900 Mon Sep 17 00:00:00 2001
From: Cornelius Horstmann <site-github@brototyp.de>
Date: Sat, 3 Jun 2017 15:59:27 +0200
Subject: [PATCH] Added a way of setting customTrackingParameters to an Event
 and tracking custom Events.

---
 Example/Example.xcodeproj/project.pbxproj     |   4 +
 .../CustomEventsViewController.swift          |  24 ++++
 .../iOS Example/OptOutViewController.swift    |   6 +-
 .../en.lproj/MainStoryboard.storyboard        | 116 ++++++++++++++----
 PiwikTracker/Event.swift                      |  52 +++++++-
 PiwikTracker/PiwikTracker.swift               |  42 +++----
 PiwikTracker/URLSessionDispatcher.swift       |   3 +-
 Podfile.lock                                  |   8 +-
 8 files changed, 198 insertions(+), 57 deletions(-)
 create mode 100644 Example/iOS Example/CustomEventsViewController.swift

diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
index 61f43b35..f57823d3 100644
--- a/Example/Example.xcodeproj/project.pbxproj
+++ b/Example/Example.xcodeproj/project.pbxproj
@@ -40,6 +40,7 @@
 		1F72DA6F1E61ECAF00EFF764 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F72DA6E1E61ECAF00EFF764 /* AppDelegate.swift */; };
 		1F72DA711E62E55200EFF764 /* MenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F72DA701E62E55200EFF764 /* MenuViewController.swift */; };
 		1F72DA731E62E78E00EFF764 /* ConfigurationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F72DA721E62E78E00EFF764 /* ConfigurationViewController.swift */; };
+		1F8D35951EE2F4DC0058940F /* CustomEventsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F8D35941EE2F4DC0058940F /* CustomEventsViewController.swift */; };
 		1FEF8EFB1EDCB1B3001D907F /* OptOutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FEF8EFA1EDCB1B3001D907F /* OptOutViewController.swift */; };
 		CD93EC8C17E76E290062BE20 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD1EA93417B0DA4400F63E14 /* UIKit.framework */; };
 		CD93EC8D17E76E290062BE20 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD10FABF17B0378D0012BE50 /* Foundation.framework */; };
@@ -76,6 +77,7 @@
 		1F72DA6E1E61ECAF00EFF764 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		1F72DA701E62E55200EFF764 /* MenuViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuViewController.swift; sourceTree = "<group>"; };
 		1F72DA721E62E78E00EFF764 /* ConfigurationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfigurationViewController.swift; sourceTree = "<group>"; };
+		1F8D35941EE2F4DC0058940F /* CustomEventsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomEventsViewController.swift; sourceTree = "<group>"; };
 		1FEF8EFA1EDCB1B3001D907F /* OptOutViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OptOutViewController.swift; sourceTree = "<group>"; };
 		3AEBBD63B45D1F968424585B /* libPods-iosafnetworking2.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-iosafnetworking2.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		5D7BD4274A519A9E5A07FAB5 /* Pods-example-ios.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-ios.release.xcconfig"; path = "../Pods/Target Support Files/Pods-example-ios/Pods-example-ios.release.xcconfig"; sourceTree = "<group>"; };
@@ -207,6 +209,7 @@
 				1F03BC9A1E86CF770002F0AD /* ScreenViewController.swift */,
 				1F03BC9C1E86CFC30002F0AD /* SecondScreenViewController.swift */,
 				1FEF8EFA1EDCB1B3001D907F /* OptOutViewController.swift */,
+				1F8D35941EE2F4DC0058940F /* CustomEventsViewController.swift */,
 				CD5C9813193E65CF00A8A801 /* CampaignViewController.h */,
 				CD5C9814193E65CF00A8A801 /* CampaignViewController.m */,
 				CDD56BFC19F587A100816D5A /* ContentTrackerViewController.h */,
@@ -406,6 +409,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				1F8D35951EE2F4DC0058940F /* CustomEventsViewController.swift in Sources */,
 				1F03BC9D1E86CFC30002F0AD /* SecondScreenViewController.swift in Sources */,
 				1F72DA6F1E61ECAF00EFF764 /* AppDelegate.swift in Sources */,
 				1F03BC991E86CC7E0002F0AD /* EventsViewController.swift in Sources */,
diff --git a/Example/iOS Example/CustomEventsViewController.swift b/Example/iOS Example/CustomEventsViewController.swift
new file mode 100644
index 00000000..76a09aa6
--- /dev/null
+++ b/Example/iOS Example/CustomEventsViewController.swift	
@@ -0,0 +1,24 @@
+//
+//  CustomEventsViewController.swift
+//  Example
+//
+//  Created by Cornelius Horstmann on 03.06.17.
+//  Copyright © 2017 Mattias Levin. All rights reserved.
+//
+
+import UIKit
+import PiwikTracker
+
+class CustomEventsViewController: UIViewController {
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        PiwikTracker.shared?.track(view: ["menu","custom event"])
+    }
+    
+    @IBAction func trackCustomEventButtonTapped(_ sender: Any) {
+        guard let tracker = PiwikTracker.shared else { return }
+        let downloadURL = URL(string: "https://builds.piwik.org/piwik.zip")!
+        let event = tracker.event().setting(url: downloadURL).setting(customTrackingParameters: ["download":downloadURL.absoluteString])
+        tracker.track(event)
+    }
+}
diff --git a/Example/iOS Example/OptOutViewController.swift b/Example/iOS Example/OptOutViewController.swift
index 9a6887ff..d8a3c32c 100644
--- a/Example/iOS Example/OptOutViewController.swift	
+++ b/Example/iOS Example/OptOutViewController.swift	
@@ -5,16 +5,16 @@ class OptOutViewController: UIViewController {
     
     @IBOutlet weak var optOutSwitch: UISwitch!
     @IBAction func optOutSwitchChanged(_ sender: Any) {
-        Tracker.shared?.isOptedOut = optOutSwitch.isOn
+        PiwikTracker.shared?.isOptedOut = optOutSwitch.isOn
     }
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        optOutSwitch.isOn = Tracker.shared?.isOptedOut ?? false
+        optOutSwitch.isOn = PiwikTracker.shared?.isOptedOut ?? false
     }
     
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
-        Tracker.shared?.track(view: ["menu","opt out"])
+        PiwikTracker.shared?.track(view: ["menu","opt out"])
     }
 }
diff --git a/Example/iOS Example/en.lproj/MainStoryboard.storyboard b/Example/iOS Example/en.lproj/MainStoryboard.storyboard
index 9d69a04b..83b22c69 100644
--- a/Example/iOS Example/en.lproj/MainStoryboard.storyboard	
+++ b/Example/iOS Example/en.lproj/MainStoryboard.storyboard	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="3">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="3">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -41,7 +41,7 @@
                                         <rect key="frame" x="0.0" y="55.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="q3h-dc-9VC" id="6QM-lt-Nvm">
-                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Screens" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="EYc-RM-MMH">
@@ -177,12 +177,32 @@
                                             <segue destination="zpc-4j-H26" kind="push" id="Lim-Xs-kmO"/>
                                         </connections>
                                     </tableViewCell>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="blue" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="MaB-48-OYq" style="IBUITableViewCellStyleDefault" id="ifd-6P-qve" userLabel="Table View Cell - Content tracking">
+                                        <rect key="frame" x="0.0" y="363.5" width="375" height="44"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ifd-6P-qve" id="XFP-3j-HtE">
+                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Custom" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="MaB-48-OYq">
+                                                    <rect key="frame" x="15" y="0.0" width="325" height="43.5"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                </label>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                        <connections>
+                                            <segue destination="8Cc-CO-lh0" kind="push" id="Oqg-Qe-jzt"/>
+                                        </connections>
+                                    </tableViewCell>
                                 </cells>
                             </tableViewSection>
                             <tableViewSection headerTitle="Search" id="D2G-yR-FkY" userLabel="Table View Section - Search">
                                 <cells>
                                     <tableViewCell hidden="YES" contentMode="scaleToFill" selectionStyle="blue" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="9Go-tE-Ysp" style="IBUITableViewCellStyleDefault" id="dij-ud-Cse" userLabel="Table View Cell - Search">
-                                        <rect key="frame" x="0.0" y="411.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="455.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="dij-ud-Cse" id="wfU-9V-eCn">
                                             <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
@@ -206,7 +226,7 @@
                             <tableViewSection headerTitle="Conversion" id="Ykb-Nf-a3l" userLabel="Table View Section - Conversion">
                                 <cells>
                                     <tableViewCell hidden="YES" contentMode="scaleToFill" selectionStyle="blue" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="ooA-xC-jHs" style="IBUITableViewCellStyleDefault" id="QY8-q1-L0P" userLabel="Table View Cell - Goals">
-                                        <rect key="frame" x="0.0" y="503.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="547.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="QY8-q1-L0P" id="gNI-EU-T3B">
                                             <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
@@ -226,7 +246,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell hidden="YES" contentMode="scaleToFill" selectionStyle="blue" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="wFM-RN-ccQ" style="IBUITableViewCellStyleDefault" id="opC-Eg-HGF" userLabel="Table View Cell - Ecommerce">
-                                        <rect key="frame" x="0.0" y="547.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="591.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="opC-Eg-HGF" id="H1r-jj-weM">
                                             <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
@@ -250,10 +270,10 @@
                             <tableViewSection headerTitle="Other" id="6kC-bt-yx9">
                                 <cells>
                                     <tableViewCell hidden="YES" contentMode="scaleToFill" selectionStyle="blue" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="YlU-MW-xot" style="IBUITableViewCellStyleDefault" id="2Bz-NF-AGQ" userLabel="Table View Cell - User ID">
-                                        <rect key="frame" x="0.0" y="639.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="683.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2Bz-NF-AGQ" id="XPR-nN-VPk">
-                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="User ID" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="YlU-MW-xot">
@@ -270,10 +290,10 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell hidden="YES" contentMode="scaleToFill" selectionStyle="blue" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="WVV-vG-MDD" style="IBUITableViewCellStyleDefault" id="2t3-Re-M7O" userLabel="Table View Cell - Campaign">
-                                        <rect key="frame" x="0.0" y="683.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="727.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2t3-Re-M7O" id="ffB-O7-QqS">
-                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Campaign" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="WVV-vG-MDD">
@@ -290,10 +310,10 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="0JJ-uO-Kcd" style="IBUITableViewCellStyleDefault" id="lXW-WA-gLT" userLabel="Table View Cell - OptOut">
-                                        <rect key="frame" x="0.0" y="727.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="771.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="lXW-WA-gLT" id="eVL-TU-VbE">
-                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Optout" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="0JJ-uO-Kcd">
@@ -310,10 +330,10 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="x17-Qe-MIr" style="IBUITableViewCellStyleDefault" id="kGR-0X-zCv" userLabel="Table View Cell - Configuration">
-                                        <rect key="frame" x="0.0" y="771.5" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="815.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="kGR-0X-zCv" id="wkf-i6-Rie">
-                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Configuration" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="x17-Qe-MIr">
@@ -442,7 +462,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="2nh-Ps-MWQ" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1545.5" y="1862.5"/>
+            <point key="canvasLocation" x="1153" y="2692"/>
         </scene>
         <!--Optout-->
         <scene sceneID="aBm-gG-tsm">
@@ -508,7 +528,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Tyf-Nd-tt9" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2109.5" y="1703.5"/>
+            <point key="canvasLocation" x="1717" y="2533"/>
         </scene>
         <!--Ecommerce-->
         <scene sceneID="deo-cP-bhp">
@@ -608,7 +628,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="4Vr-eb-14W" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2110" y="773"/>
+            <point key="canvasLocation" x="1588" y="2375"/>
         </scene>
         <!--Download-->
         <scene sceneID="VWi-2I-pHn">
@@ -649,7 +669,7 @@ Tracked downloads are presetned in a seperate section in the Piwik server.
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Sir-hE-PUJ" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2604" y="283"/>
+            <point key="canvasLocation" x="2029" y="2335"/>
         </scene>
         <!--Social-->
         <scene sceneID="EPK-0i-p81">
@@ -687,7 +707,7 @@ Tracked downloads are presetned in a seperate section in the Piwik server.
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="e4O-6M-aMq" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1626" y="-537"/>
+            <point key="canvasLocation" x="1526" y="2326"/>
         </scene>
         <!--Search-->
         <scene sceneID="VIK-2u-TLt">
@@ -728,7 +748,7 @@ Log keywords used and the number of results found.

 Searches are shown in a
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="bQx-GN-4e9" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1626" y="241"/>
+            <point key="canvasLocation" x="1057" y="2392"/>
         </scene>
         <!--Content Tracking-->
         <scene sceneID="59A-61-H45">
@@ -771,7 +791,53 @@ Log keywords used and the number of results found.

 Searches are shown in a
                     </connections>
                 </tapGestureRecognizer>
             </objects>
-            <point key="canvasLocation" x="2123" y="-184"/>
+            <point key="canvasLocation" x="1617" y="117"/>
+        </scene>
+        <!--Custom-->
+        <scene sceneID="leL-M8-blx">
+            <objects>
+                <viewController id="8Cc-CO-lh0" customClass="CustomEventsViewController" customModule="ios" customModuleProvider="target" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="30s-Om-csf"/>
+                        <viewControllerLayoutGuide type="bottom" id="mBl-X6-zPM"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="1sN-yf-4Be">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UeB-Qc-Tax">
+                                <rect key="frame" x="26" y="114" width="323" height="81.5"/>
+                                <string key="text">It is possible to track custom Events and add customTrackingParameters. With this it is possible to use every feature of the HTTP Api.</string>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xYV-rB-3Aj">
+                                <rect key="frame" x="120.5" y="245.5" width="134" height="30"/>
+                                <state key="normal" title="Track Custon Event">
+                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                </state>
+                                <connections>
+                                    <action selector="trackCustomEventButtonTapped:" destination="8Cc-CO-lh0" eventType="touchUpInside" id="cGv-Ce-KdF"/>
+                                </connections>
+                            </button>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstAttribute="trailingMargin" secondItem="UeB-Qc-Tax" secondAttribute="trailing" constant="10" id="0r3-Ye-hFt"/>
+                            <constraint firstAttribute="trailingMargin" relation="greaterThanOrEqual" secondItem="xYV-rB-3Aj" secondAttribute="trailing" constant="10" id="6U0-yd-cI8"/>
+                            <constraint firstItem="xYV-rB-3Aj" firstAttribute="top" secondItem="UeB-Qc-Tax" secondAttribute="bottom" constant="50" id="G97-Ew-chg"/>
+                            <constraint firstItem="UeB-Qc-Tax" firstAttribute="leading" secondItem="1sN-yf-4Be" secondAttribute="leadingMargin" constant="10" id="OMg-95-Atz"/>
+                            <constraint firstItem="UeB-Qc-Tax" firstAttribute="top" secondItem="30s-Om-csf" secondAttribute="bottom" constant="50" id="RbG-W9-9QP"/>
+                            <constraint firstItem="xYV-rB-3Aj" firstAttribute="centerX" secondItem="1sN-yf-4Be" secondAttribute="centerX" id="hKJ-tb-9kT"/>
+                            <constraint firstItem="xYV-rB-3Aj" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="1sN-yf-4Be" secondAttribute="leadingMargin" constant="10" id="q8v-8d-hRR"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" title="Custom" id="6xr-es-KlL"/>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="hP3-5o-x0d" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1616.5" y="842.5"/>
         </scene>
         <!--User ID-->
         <scene sceneID="YPh-mF-L4v">
@@ -871,7 +937,7 @@ Store the id locally in the app and set it directly after the tracker is created
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="XJa-KD-lnQ" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="892" y="2055"/>
+            <point key="canvasLocation" x="499" y="2884"/>
         </scene>
         <!--Goals-->
         <scene sceneID="kdY-CR-wlV">
@@ -909,7 +975,7 @@ Store the id locally in the app and set it directly after the tracker is created
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="alD-RZ-1zC" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1626" y="1045"/>
+            <point key="canvasLocation" x="1104" y="2647"/>
         </scene>
         <!--Exceptions-->
         <scene sceneID="MWf-Xp-ias">
@@ -947,7 +1013,7 @@ Store the id locally in the app and set it directly after the tracker is created
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="wfZ-K1-HBt" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1634" y="-1243"/>
+            <point key="canvasLocation" x="1617" y="-1335"/>
         </scene>
         <!--Events-->
         <scene sceneID="MgX-5m-tVq">
@@ -991,7 +1057,7 @@ Store the id locally in the app and set it directly after the tracker is created
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="2aL-fE-DAD" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1617" y="-2054"/>
+            <point key="canvasLocation" x="1617" y="-2062"/>
         </scene>
         <!--Custom variables-->
         <scene sceneID="ynN-jo-rwj">
@@ -1056,7 +1122,7 @@ The Piwik server will visualize how many visits, conversions, etc. occured for e
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Uev-I5-hgA" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2070" y="-1524"/>
+            <point key="canvasLocation" x="1617" y="-611"/>
         </scene>
         <!--Screen Views-->
         <scene sceneID="24">
diff --git a/PiwikTracker/Event.swift b/PiwikTracker/Event.swift
index 43d38fb7..6e12cd9e 100644
--- a/PiwikTracker/Event.swift
+++ b/PiwikTracker/Event.swift
@@ -10,8 +10,7 @@ import Foundation
 
 /// Represents an event of any kind.
 ///
-/// - Note: Should we store the resolution in the Event (cleaner) or add it before transmission (smaller)?
-/// - Todo: 
+/// - Todo:
 ///     - Add Campaign Parameters: _rcn, _rck
 ///     - Add Action info
 ///     - Event Tracking info
@@ -36,7 +35,7 @@ public struct Event {
     /// api-key: h, m, s
     let date: Date
     
-    /// The full URL for the current action. 
+    /// The full URL for the current action.
     /// api-key: url
     let url: URL
     
@@ -65,4 +64,51 @@ public struct Event {
     let eventAction: String?
     let eventName: String?
     let eventValue: Float?
+    
+    let customTrackingParameters: [String:String]
+}
+
+extension Event {
+    init(event: Event,
+         siteId: String? = nil,
+         uuid: NSUUID? = nil,
+         visitor: Visitor? = nil,
+         session: Session? = nil,
+         date: Date? = nil,
+         url: URL? = nil,
+         actionName: [String]? = nil,
+         language: String? = nil,
+         isNewSession: Bool? = nil,
+         referer: URL? = nil,
+         eventCategory: String? = nil,
+         eventAction: String? = nil,
+         eventName: String? = nil,
+         eventValue: Float? = nil,
+         customTrackingParameters: [String:String]? = nil) {
+        self.siteId = siteId ?? event.siteId
+        self.uuid = uuid ?? event.uuid
+        self.visitor = visitor ?? event.visitor
+        self.session = session ?? event.session
+        self.date = date ?? event.date
+        self.url = url ?? event.url
+        self.actionName = actionName ?? event.actionName
+        self.language = language ?? event.language
+        self.isNewSession = isNewSession ?? event.isNewSession
+        self.referer = referer ?? event.referer
+        self.eventCategory = eventCategory ?? event.eventCategory
+        self.eventAction = eventAction ?? event.eventAction
+        self.eventName = eventName ?? event.eventName
+        self.eventValue = eventValue ?? event.eventValue
+        self.customTrackingParameters = customTrackingParameters ?? event.customTrackingParameters
+    }
+    
+    public func setting(customTrackingParameters: [String:String]) -> Event {
+        return Event(event: self, customTrackingParameters: customTrackingParameters)
+    }
+    public func setting(action: [String]) -> Event {
+        return Event(event: self, actionName: action)
+    }
+    public func setting(url: URL) -> Event {
+        return Event(event: self, url: url)
+    }
 }
diff --git a/PiwikTracker/PiwikTracker.swift b/PiwikTracker/PiwikTracker.swift
index 85e91e5a..d7aea022 100644
--- a/PiwikTracker/PiwikTracker.swift
+++ b/PiwikTracker/PiwikTracker.swift
@@ -161,46 +161,46 @@ extension PiwikTracker {
 }
 
 extension PiwikTracker {
-    internal func event(action: [String], url: URL? = nil) -> Event {
-        let url = url ?? URL(string: "http://example.com")!.appendingPathComponent(action.joined(separator: "/"))
+    public func event() -> Event {
         return Event(
             siteId: siteId,
             uuid: NSUUID(),
             visitor: visitor,
             session: session,
             date: Date(),
-            url: url,
-            actionName: action,
+            url: URL(string: "http://example.com")!,
+            actionName: [],
             language: Locale.httpAcceptLanguage,
             isNewSession: nextEventStartsANewSession,
             referer: nil,
             eventCategory: nil,
             eventAction: nil,
             eventName: nil,
-            eventValue: nil
+            eventValue: nil,
+            customTrackingParameters: [:]
         )
     }
+    
+    internal func event(action: [String], url: URL? = nil) -> Event {
+        let url = url ?? URL(string: "http://example.com")!.appendingPathComponent(action.joined(separator: "/"))
+        return Event(event: event(), url: url, actionName: action)
+    }
+    
     internal func event(withCategory category: String, action: String, name: String? = nil, value: Float? = nil) -> Event {
-        return Event(
-            siteId: siteId,
-            uuid: NSUUID(),
-            visitor: visitor,
-            session: session,
-            date: Date(),
-            url: URL(string: "http://example.com")!,
-            actionName: [],
-            language: Locale.httpAcceptLanguage,
-            isNewSession: nextEventStartsANewSession,
-            referer: nil,
-            eventCategory: category,
-            eventAction: action,
-            eventName: name,
-            eventValue: value
-        )
+        return Event(event: event(), eventCategory: category, eventAction: action, eventName: name, eventValue: value)
     }
 }
 
 extension PiwikTracker {
+    
+    /// Tracks a custom event. Use this method if you want to create your custom event or want to track an Event
+    /// with custom parameters.
+    ///
+    /// - Parameter event: The Event that should be tracked.
+    public func track(_ event: Event) {
+        queue(event: event)
+    }
+    
     /// Tracks a screenview.
     ///
     /// This method can be used to track hierarchical screen names, e.g. screen/settings/register. Use this to create a hierarchical and logical grouping of screen views in the Piwik web interface.
diff --git a/PiwikTracker/URLSessionDispatcher.swift b/PiwikTracker/URLSessionDispatcher.swift
index 50422859..c8a87b59 100644
--- a/PiwikTracker/URLSessionDispatcher.swift
+++ b/PiwikTracker/URLSessionDispatcher.swift
@@ -70,7 +70,7 @@ final class URLSessionDispatcher: Dispatcher {
 fileprivate extension Event {
     var queryItems: [URLQueryItem] {
         get {
-            return [
+            let basicQueryItems = [
                 URLQueryItem(name: "idsite", value: siteId),
                 URLQueryItem(name: "rec", value: "1"),
                 // Visitor
@@ -98,6 +98,7 @@ fileprivate extension Event {
                 URLQueryItem(name: "e_v", value: eventValue != nil ? "\(eventValue!)" : nil),
                 
                 ].filter({ $0.value != nil }) // remove the items that lack the value
+            return basicQueryItems + customTrackingParameters.map({ key, value in return URLQueryItem(name: key, value: value) })
         }
     }
 }
diff --git a/Podfile.lock b/Podfile.lock
index cdb50b2d..7c01efe4 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -1,8 +1,8 @@
 PODS:
   - Nimble (5.1.1)
-  - PiwikTracker (4.0.0-beta2):
-    - PiwikTracker/Core (= 4.0.0-beta2)
-  - PiwikTracker/Core (4.0.0-beta2)
+  - PiwikTracker (4.0.0):
+    - PiwikTracker/Core (= 4.0.0)
+  - PiwikTracker/Core (4.0.0)
   - Quick (0.10.0)
 
 DEPENDENCIES:
@@ -16,7 +16,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Nimble: 415e3aa3267e7bc2c96b05fa814ddea7bb686a29
-  PiwikTracker: d3407e913514f10ebade0afe4623e0f6d8f96b5e
+  PiwikTracker: 1fbb3b086dda92bf36e522137bc3a60d6d6ee306
   Quick: 5d290df1c69d5ee2f0729956dcf0fd9a30447eaa
 
 PODFILE CHECKSUM: a7f24eb0ec9a2aaa14dbc693f87f65c7b3ca1934