From 94c309a84b6f5d9148881f3aeed2cd62c608a7ce Mon Sep 17 00:00:00 2001
From: Duarte Pinto <duartemr.pinto@gmail.com>
Date: Mon, 3 May 2021 15:42:13 +0100
Subject: [PATCH 1/3] Update README and Sample project to use Map and Array
 literals in Kotlin.

---
 README.md                                     | 15 +++---
 .../com/velocidi/sampleapp/MainActivity.kt    | 53 ++++++++-----------
 2 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/README.md b/README.md
index 4f1debe..0800fd0 100644
--- a/README.md
+++ b/README.md
@@ -64,13 +64,14 @@ val eventJsonString =
 Velocidi.getInstance().track(UserId("<Advertising ID>", "gaid"), eventJsonString)
 
 // Using a JSONObject
-val eventJsonObj = JSONObject()
-eventJsonObj.put("clientId", "velocidi")
-eventJsonObj.put("siteId", "velocidi.com")
-eventJsonObj.put("type", "appView")
-eventJsonObj.put("title", "Welcome Screen")
-
-Velocidi.getInstance().track(UserId("<Advertising ID>", "gaid"), eventJsonObj)
+val eventJsonObj = mapOf(
+    "clientId" to "velocidi",
+    "siteId" to "velocidi.com",
+    "type" to "appView",
+    "title" to "Welcome Screen"
+)
+
+Velocidi.getInstance().track(UserId("<Advertising ID>", "gaid"), JSONObject(eventJsonObj))
 ```
 
 ### Match
diff --git a/velocidi-sample/src/main/java/com/velocidi/sampleapp/MainActivity.kt b/velocidi-sample/src/main/java/com/velocidi/sampleapp/MainActivity.kt
index 1115c3b..268d994 100644
--- a/velocidi-sample/src/main/java/com/velocidi/sampleapp/MainActivity.kt
+++ b/velocidi-sample/src/main/java/com/velocidi/sampleapp/MainActivity.kt
@@ -18,40 +18,33 @@ class MainActivity : AppCompatActivity() {
         val matchButton = findViewById<Button>(R.id.match_button)
 
         trackButton.setOnClickListener {
-            val eventJsonString =
-                """
-                {
-                  "clientId": "velocidi",
-                  "siteId": "velocidi.com",
-                  "type": "appView",
-                  "customFields": {
-                    "debug": true,
-                    "role": "superuser"
-                  },
-                  "title": "Welcome Screen"
-                }
-                """.trimIndent()
-
-            Velocidi.getInstance().track(
-                UserId("user_email_hash", "email_sha256"),
-                eventJsonString
+            val eventJsonObj = mapOf(
+                "foo" to "exampleA",
+                "bar" to 42,
+                "baz" to true,
+                "quuxFoo" to arrayOf(
+                    mapOf(
+                        "a" to "1",
+                        "b" to 2,
+                        "c" to mapOf(
+                            "a" to arrayOf(
+                                1,
+                                2,
+                                3
+                            ),
+                            "b" to "bGrault",
+                            "c" to arrayOf<Any>(),
+                            "d" to mapOf<String, Any>()
+                        ),
+                        "d" to true
+                    )
+                ),
+                "corge" to false
             )
 
-            // OR using a JSONObject
-            val customFields = JSONObject()
-            customFields.put("debug", true)
-            customFields.put("role", "superuser")
-
-            val eventJsonObj = JSONObject()
-            eventJsonObj.put("clientId", "velocidi")
-            eventJsonObj.put("siteId", "velocidi.com")
-            eventJsonObj.put("type", "appView")
-            eventJsonObj.put("customFields", customFields)
-            eventJsonObj.put("title", "Welcome Screen")
-
             Velocidi.getInstance().track(
                 UserId("user_email_hash", "email_sha256"),
-                eventJsonObj
+                JSONObject(eventJsonObj)
             )
         }
 

From 28867b0a797760271617fc0b569b9036f33aa31d Mon Sep 17 00:00:00 2001
From: Duarte Pinto <duartemr.pinto@gmail.com>
Date: Wed, 5 May 2021 17:22:46 +0100
Subject: [PATCH 2/3] Update Java activity

---
 .../main/java/com/velocidi/sampleapp/JavaActivity.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/velocidi-sample/src/main/java/com/velocidi/sampleapp/JavaActivity.java b/velocidi-sample/src/main/java/com/velocidi/sampleapp/JavaActivity.java
index 557c7a2..e0b8071 100644
--- a/velocidi-sample/src/main/java/com/velocidi/sampleapp/JavaActivity.java
+++ b/velocidi-sample/src/main/java/com/velocidi/sampleapp/JavaActivity.java
@@ -29,10 +29,10 @@ protected void onCreate(Bundle savedInstanceState) {
         Velocidi.init(config, this);
 
         try {
-            JSONObject eventJsonObj = new JSONObject();
-            eventJsonObj.put("clientId", "velocidi");
-            eventJsonObj.put("siteId", "velocidi.com");
-            eventJsonObj.put("type", "appView");
+            JSONObject eventJsonObj = new JSONObject()
+                .put("clientId", "velocidi")
+                .put("siteId", "velocidi.com")
+                .put("type", "appView");
 
             Velocidi.getInstance().track(
                     new UserId("user_email_hash", "email_sha256"),

From 4a10ea8ea9f6422036eacf413dd09c074ddbc23f Mon Sep 17 00:00:00 2001
From: Duarte Pinto <duartemr.pinto@gmail.com>
Date: Thu, 6 May 2021 14:11:31 +0100
Subject: [PATCH 3/3] Revert unwanted changes

---
 README.md                                     |  6 ++-
 .../com/velocidi/sampleapp/MainActivity.kt    | 48 +++++++++++--------
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 0800fd0..fc6a7bc 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,11 @@ val eventJsonObj = mapOf(
     "clientId" to "velocidi",
     "siteId" to "velocidi.com",
     "type" to "appView",
-    "title" to "Welcome Screen"
+    "title" to "Welcome Screen",
+    "customFields" to mapOf(
+        "debug" to true,
+        "role" to "superuser"
+    )
 )
 
 Velocidi.getInstance().track(UserId("<Advertising ID>", "gaid"), JSONObject(eventJsonObj))
diff --git a/velocidi-sample/src/main/java/com/velocidi/sampleapp/MainActivity.kt b/velocidi-sample/src/main/java/com/velocidi/sampleapp/MainActivity.kt
index 268d994..da4d098 100644
--- a/velocidi-sample/src/main/java/com/velocidi/sampleapp/MainActivity.kt
+++ b/velocidi-sample/src/main/java/com/velocidi/sampleapp/MainActivity.kt
@@ -18,28 +18,34 @@ class MainActivity : AppCompatActivity() {
         val matchButton = findViewById<Button>(R.id.match_button)
 
         trackButton.setOnClickListener {
+            val eventJsonString =
+                """
+                {
+                  "clientId": "velocidi",
+                  "siteId": "velocidi.com",
+                  "type": "appView",
+                  "customFields": {
+                    "debug": true,
+                    "role": "superuser"
+                  },
+                  "title": "Welcome Screen"
+                }
+                """.trimIndent()
+
+            Velocidi.getInstance().track(
+                UserId("user_email_hash", "email_sha256"),
+                eventJsonString
+            )
+
             val eventJsonObj = mapOf(
-                "foo" to "exampleA",
-                "bar" to 42,
-                "baz" to true,
-                "quuxFoo" to arrayOf(
-                    mapOf(
-                        "a" to "1",
-                        "b" to 2,
-                        "c" to mapOf(
-                            "a" to arrayOf(
-                                1,
-                                2,
-                                3
-                            ),
-                            "b" to "bGrault",
-                            "c" to arrayOf<Any>(),
-                            "d" to mapOf<String, Any>()
-                        ),
-                        "d" to true
-                    )
-                ),
-                "corge" to false
+                "clientId" to "velocidi",
+                "siteId" to "velocidi.com",
+                "type" to "appView",
+                "title" to "Welcome Screen",
+                "customFields" to mapOf(
+                    "debug" to true,
+                    "role" to "superuser"
+                )
             )
 
             Velocidi.getInstance().track(