Merge pull request #46 from velocidi/kotlin-literals

Update README and Sample project to use Map and Array literals.
adzerk · May 6, 2021 · 7535d19 · 7535d19
2 parents 38e38f9 + 4a10ea8
commit 7535d19
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -64,13 +64,18 @@ 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",
+    "customFields" to mapOf(
+        "debug" to true,
+        "role" to "superuser"
+    )
+)
+
+Velocidi.getInstance().track(UserId("<Advertising ID>", "gaid"), JSONObject(eventJsonObj))
 ```
 
 ### Match

diff --git 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"),

diff --git a/velocidi-sample/src/main/java/com/velocidi/sampleapp/MainActivity.kt b/velocidi-sample/src/main/java/com/velocidi/sampleapp/MainActivity.kt
@@ -37,21 +37,20 @@ class MainActivity : AppCompatActivity() {
                 eventJsonString
             )
 
-            // 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")
+            val eventJsonObj = mapOf(
+                "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(
                 UserId("user_email_hash", "email_sha256"),
-                eventJsonObj
+                JSONObject(eventJsonObj)
             )
         }