update logic for track event example

Author: fadi-george

Examples/OneSignalDemoV2/app/src/main/java/com/onesignal/sdktest/data/repository/OneSignalRepository.kt

@@ -142,13 +142,8 @@ class OneSignalRepository {
     }
 
     // Track Event
-    fun trackEvent(name: String, value: String?) {
-        Log.d(TAG, "Tracking event: $name with value: $value")
-        val properties: Map<String, Any?>? = if (!value.isNullOrEmpty()) {
-            mapOf("value" to value)
-        } else {
-            null
-        }
+    fun trackEvent(name: String, properties: Map<String, Any?>?) {
+        Log.d(TAG, "Tracking event: $name with properties: $properties")
         OneSignal.User.trackEvent(name, properties)
     }
 

Examples/OneSignalDemoV2/app/src/main/java/com/onesignal/sdktest/ui/main/MainActivity.kt

@@ -17,6 +17,7 @@ import android.widget.LinearLayout
 import android.widget.Spinner
 import android.widget.TextView
 import android.widget.Toast
+import org.json.JSONObject
 import androidx.activity.viewModels
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
@@ -614,24 +615,50 @@ class MainActivity : AppCompatActivity() {
     private fun showTrackEventDialog() {
         val dialogView = layoutInflater.inflate(R.layout.dialog_add_pair, null)
         val etName = dialogView.findViewById<EditText>(R.id.et_key)
-        val etValue = dialogView.findViewById<EditText>(R.id.et_value)
+        val etProperties = dialogView.findViewById<EditText>(R.id.et_value)
 
-        // Update hints for track event context
-        etName.hint = getString(R.string.event_name)
-        etValue.hint = getString(R.string.event_value)
+        dialogView.findViewById<TextView>(R.id.tv_key_label).text = getString(R.string.event_name)
+        dialogView.findViewById<TextView>(R.id.tv_value_label).text = getString(R.string.event_properties)
+        etProperties.hint = getString(R.string.event_properties_placeholder)
 
-        AlertDialog.Builder(this, R.style.AlertDialogTheme)
+        val dialog = AlertDialog.Builder(this, R.style.AlertDialogTheme)
             .setTitle(R.string.track_event)
             .setView(dialogView)
-            .setPositiveButton(R.string.send) { _, _ ->
+            .setPositiveButton(R.string.send, null)
+            .setNegativeButton(R.string.cancel, null)
+            .create()
+
+        dialog.setOnShowListener {
+            dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
                 val name = etName.text.toString().trim()
-                val value = etValue.text.toString().trim()
-                if (name.isNotEmpty()) {
-                    viewModel.trackEvent(name, value.ifEmpty { null })
+                val propsText = etProperties.text.toString().trim()
+
+                if (name.isEmpty()) {
+                    etName.error = "Required"
+                    return@setOnClickListener
                 }
+
+                var properties: Map<String, Any?>? = null
+                if (propsText.isNotEmpty()) {
+                    try {
+                        val json = JSONObject(propsText)
+                        val map = mutableMapOf<String, Any?>()
+                        for (key in json.keys()) {
+                            map[key] = json.get(key)
+                        }
+                        properties = map
+                    } catch (e: Exception) {
+                        etProperties.error = "Invalid JSON"
+                        return@setOnClickListener
+                    }
+                }
+
+                viewModel.trackEvent(name, properties)
+                dialog.dismiss()
             }
-            .setNegativeButton(R.string.cancel, null)
-            .show()
+        }
+
+        dialog.show()
     }
 
     private fun showCustomNotificationDialog() {

Examples/OneSignalDemoV2/app/src/main/java/com/onesignal/sdktest/ui/main/MainViewModel.kt

@@ -568,12 +568,12 @@ class MainViewModel(application: Application) : AndroidViewModel(application), I
     }
 
     // Track Event
-    fun trackEvent(name: String, value: String?) {
+    fun trackEvent(name: String, properties: Map<String, Any?>?) {
         viewModelScope.launch(Dispatchers.IO) {
-            repository.trackEvent(name, value)
+            repository.trackEvent(name, properties)
             withContext(Dispatchers.Main) {
-                val message = if (!value.isNullOrEmpty()) {
-                    "Event tracked: $name = $value"
+                val message = if (!properties.isNullOrEmpty()) {
+                    "Event tracked: $name with properties"
                 } else {
                     "Event tracked: $name"
                 }

Examples/OneSignalDemoV2/app/src/main/res/layout/dialog_add_pair.xml

@@ -6,6 +6,7 @@
     android:padding="16dp">
 
     <TextView
+        android:id="@+id/tv_key_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/key"
@@ -25,6 +26,7 @@
         android:hint=""/>
 
     <TextView
+        android:id="@+id/tv_value_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/value"

Examples/OneSignalDemoV2/app/src/main/res/values/strings.xml

@@ -86,7 +86,8 @@
     <string name="track_event">Track Event</string>
     <string name="track_event_button">TRACK EVENT</string>
     <string name="event_name">Event Name</string>
-    <string name="event_value">Event Value (optional)</string>
+    <string name="event_properties">Properties (optional)</string>
+    <string name="event_properties_placeholder">{\"ABC\":123}</string>
 
     <!-- Location -->
     <string name="location">Location</string>