Merge pull request #13 from OpacityLabs/nero/ENG-101-dynamic-params-textbox

add dynamic params textbox

Author: ospfranco

…tylabs/opacitycore/JsonToAnyConverter.kt …opacitylabs/opacitycore/JsonConverter.ktOpacityCore/src/main/kotlin/com/opacitylabs/opacitycore/JsonToAnyConverter.kt renamed to OpacityCore/src/main/kotlin/com/opacitylabs/opacitycore/JsonConverter.kt OpacityCore/src/main/kotlin/com/opacitylabs/opacitycore/JsonToAnyConverter.kt renamed to OpacityCore/src/main/kotlin/com/opacitylabs/opacitycore/JsonConverter.kt

@@ -12,9 +12,26 @@ import kotlinx.serialization.json.doubleOrNull
 import kotlinx.serialization.json.int
 import kotlinx.serialization.json.intOrNull
 
-class JsonToAnyConverter {
-
+class JsonConverter {
     companion object {
+        fun mapToJsonElement(map: Map<String, Any?>): JsonElement {
+            fun toJsonElement(value: Any?): JsonElement = when (value) {
+                null -> JsonNull
+                is Boolean -> JsonPrimitive(value)
+                is Number -> JsonPrimitive(value)
+                is String -> JsonPrimitive(value)
+                is Map<*, *> -> {
+                    @Suppress("UNCHECKED_CAST")
+                    JsonObject((value as Map<String, Any?>).mapValues { toJsonElement(it.value) })
+                }
+
+                is List<*> -> JsonArray(value.map { toJsonElement(it) })
+                else -> throw IllegalArgumentException("Unsupported type: ${value::class}")
+            }
+
+            return JsonObject(map.mapValues { toJsonElement(it.value) })
+        }
+        
         fun parseJsonElementToAny(jsonElement: JsonElement): Any? {
             return when (jsonElement) {
                 is JsonObject -> {

OpacityCore/src/main/kotlin/com/opacitylabs/opacitycore/OpacityCore.kt

@@ -4,7 +4,8 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import com.opacitylabs.opacitycore.JsonToAnyConverter.Companion.parseJsonElementToAny
+import com.opacitylabs.opacitycore.JsonConverter.Companion.mapToJsonElement
+import com.opacitylabs.opacitycore.JsonConverter.Companion.parseJsonElementToAny
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.encodeToString
@@ -134,7 +135,11 @@ object OpacityCore {
     @JvmStatic
     suspend fun get(name: String, params: Map<String, Any?>?): Result<Map<String, Any?>> {
         return withContext(Dispatchers.IO) {
-            val paramsString = params?.let { Json.encodeToString(it) }
+            val paramsString = params?.let {
+                val jsonElement = mapToJsonElement(it)
+                Json.encodeToString(jsonElement)
+            }
+
             val res = getNative(name, paramsString)
             if (res.status != 0) {
                 return@withContext Result.failure(parseOpacityError(res.err))

app/build.gradle.kts

@@ -58,6 +58,7 @@ android {
 }
 
 dependencies {
+    implementation(libs.androidx.appcompat)
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.activity.compose)
@@ -68,6 +69,7 @@ dependencies {
     implementation(libs.androidx.material3)
     implementation(project(":OpacityCore"))
     implementation(libs.androidx.espresso.intents)
+    implementation(libs.kotlinx.serialization.json)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)

app/src/main/java/com/opacitylabs/opacitycoreexample/MainActivity.kt

@@ -17,10 +17,12 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.lifecycleScope
+import com.opacitylabs.opacitycore.JsonConverter
 import com.opacitylabs.opacitycore.OpacityCore
 import com.opacitylabs.opacitycore.OpacityError
 import com.opacitylabs.opacitycoreexample.ui.theme.OpacityCoreExampleTheme
 import kotlinx.coroutines.launch
+import kotlinx.serialization.json.Json
 import java.io.BufferedReader
 import java.io.InputStreamReader
 
@@ -51,18 +53,37 @@ class MainActivity : ComponentActivity() {
                     containerColor = androidx.compose.ui.graphics.Color.Black
                 ) { innerPadding ->
                     Column(modifier = Modifier.padding(innerPadding)) {
-                        val flowInput = remember { mutableStateOf("github:profile") }
+                        val flowInput = remember { mutableStateOf("instagram:comments") }
+                        val paramsInput =
+                            remember { mutableStateOf("{\"previous_response\":\"\"}") }
 
                         TextField(
                             value = flowInput.value,
                             onValueChange = { flowInput.value = it },
                             label = { Text("Enter flow") }
                         )
 
+                        TextField(
+                            value = paramsInput.value,
+                            onValueChange = { paramsInput.value = it },
+                            label = { Text("Enter JSON parameters (optional)") }
+                        )
+
                         Button(
                             onClick = {
                                 lifecycleScope.launch {
-                                    val res = OpacityCore.get(flowInput.value, null)
+                                    var params: Map<String, Any>? = null
+
+                                    if (!paramsInput.value.isBlank()) {
+                                        params =
+                                            JsonConverter.parseJsonElementToAny(
+                                                Json.parseToJsonElement(
+                                                    paramsInput.value
+                                                )
+                                            ) as Map<String, Any>?
+                                    }
+
+                                    val res = OpacityCore.get(flowInput.value, params)
                                     res.fold(
                                         onSuccess = { value ->
                                             Log.e(
@@ -80,6 +101,7 @@ class MainActivity : ComponentActivity() {
                                                 else -> Log.e("MainActivity", it.toString())
                                             }
                                         })
+
                                 }
                             },
                         ) { Text(text = "Run Flow") }