Revert sample app changes

Signed-off-by: penguindan <[email protected]>

Author: PenguinDan

sampleapp/src/main/kotlin/dev/openfeature/kotlin/sdk/sampleapp/ExampleProvider.kt

@@ -1,40 +1,39 @@
 package dev.openfeature.kotlin.sdk.sampleapp
 
 import dev.openfeature.kotlin.sdk.*
-import dev.openfeature.kotlin.sdk.events.OpenFeatureProviderEvents
-import dev.openfeature.kotlin.sdk.exceptions.ErrorCode
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
 
-class ExampleProvider(
-    providerName: String,
-    private val flags: Map<String, Any>,
-    override val hooks: List<Hook<*>> = listOf()
-) : FeatureProvider {
+class ExampleProvider(override val hooks: List<Hook<*>> = listOf()) : FeatureProvider {
+
     private var currentContext: EvaluationContext? = ImmutableContext()
     var delayTime = 1000L
     var returnDefaults = false
-    private val eventFlow = MutableSharedFlow<OpenFeatureProviderEvents>()
-
-    override val metadata: ProviderMetadata = object : ProviderMetadata {
-        override val name: String = providerName
+    val flags = mutableMapOf<String, Any>().apply {
+        put("booleanFlag", true)
+        put("stringFlag", "this is a string")
+        put("intFlag", 1337)
+        put("doubleFlag", 42.0)
+        put(
+            "objectFlag",
+            Value.Structure(mapOf("key1" to Value.String("value"), "key2" to Value.Integer(10)))
+        )
     }
 
+    override val metadata: ProviderMetadata
+        get() = object : ProviderMetadata {
+            override val name: String = "ExampleProvider"
+        }
+
     override suspend fun initialize(initialContext: EvaluationContext?) {
         currentContext = initialContext
         // Simulate a delay in the provider initialization
         delay(delayTime)
-        eventFlow.emit(OpenFeatureProviderEvents.ProviderReady)
     }
 
     override fun shutdown() {
 
     }
 
-    override fun observe(): Flow<OpenFeatureProviderEvents> = eventFlow.asSharedFlow()
-
     override suspend fun onContextSet(
         oldContext: EvaluationContext?,
         newContext: EvaluationContext
@@ -86,7 +85,7 @@ class ExampleProvider(
             } else if (containsKey(key)) {
                 ProviderEvaluation(defaultValue, null, reason = "invalid type")
             } else {
-                ProviderEvaluation(defaultValue, null, reason = "notfound", errorCode = ErrorCode.FLAG_NOT_FOUND)
+                ProviderEvaluation(defaultValue, null, reason = "notfound")
             }
         }
     }

sampleapp/src/main/kotlin/dev/openfeature/kotlin/sdk/sampleapp/MainActivity.kt

@@ -43,69 +43,38 @@ import dev.openfeature.kotlin.sdk.ImmutableContext
 import dev.openfeature.kotlin.sdk.OpenFeatureAPI
 import dev.openfeature.kotlin.sdk.OpenFeatureStatus
 import dev.openfeature.kotlin.sdk.Value
-import dev.openfeature.kotlin.sdk.multiprovider.MultiProvider
 import dev.openfeature.kotlin.sdk.sampleapp.ui.theme.OpenFeatureTheme
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlin.random.Random
 
 class MainActivity : ComponentActivity() {
-    private val exampleProvider1 = ExampleProvider(
-        "ExampleProvider1",
-        flags = mapOf(
-            "stringFlag" to "this is a string",
-            "intFlag" to 1337,
-            "doubleFlag" to 42.0
-        )
-    )
-    private val exampleProvider2 = ExampleProvider(
-        "ExampleProvider2",
-        flags = mapOf(
-            "booleanFlag" to true,
-            "objectFlag" to Value.Structure(
-                mapOf("key1" to Value.String("value"), "key2" to Value.Integer(10))
-            )
-        )
-    )
+    private val exampleProvider = ExampleProvider()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
-        val multiProvider = MultiProvider(listOf(exampleProvider1, exampleProvider2))
-        lifecycleScope.launch(Dispatchers.IO) {
-            OpenFeatureAPI.setProviderAndWait(multiProvider)
+        lifecycleScope.launch {
+            OpenFeatureAPI.setProviderAndWait(exampleProvider)
             OpenFeatureAPI.statusFlow.collect {
                 Log.i("OpenFeature", "Status: $it")
             }
         }
-
         val statusFlow = OpenFeatureAPI.statusFlow.map {
             if (it is OpenFeatureStatus.Error) {
                 "Error: ${it.error.errorCode()} - ${it.error.message}"
             } else it.javaClass.simpleName
         }
-
-        val multiProviderEventFlow = multiProvider.statusFlow.map {
-            it.javaClass.simpleName
-        }
-
         setContent {
             OpenFeatureTheme {
                 Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
                     MainPage(
                         modifier = Modifier.padding(innerPadding),
-                        setDelay = {
-                            exampleProvider1.delayTime = it
-                            exampleProvider2.delayTime = it
-                        },
+                        setDelay = { exampleProvider.delayTime = it },
                         statusFlow = statusFlow,
-                        multiProviderStatusFlow = multiProviderEventFlow,
                         toggleDefaults = {
-                            exampleProvider1.returnDefaults = !exampleProvider1.returnDefaults
-                            exampleProvider2.returnDefaults = !exampleProvider2.returnDefaults
+                            exampleProvider.returnDefaults = !exampleProvider.returnDefaults
                         }
                     )
                 }
@@ -119,7 +88,6 @@ fun MainPage(
     modifier: Modifier = Modifier,
     setDelay: (Long) -> Unit,
     statusFlow: Flow<String>,
-    multiProviderStatusFlow: Flow<String>,
     defaultTab: Int = 0,
     toggleDefaults: () -> Unit
 ) {
@@ -153,11 +121,7 @@ fun MainPage(
 
             // Content for the currently selected tab
             when (selectedTabIndex) {
-                0 -> ProviderAndStatus(
-                    setDelay = setDelay,
-                    statusFlow = statusFlow,
-                    multiProviderStatusFlow = multiProviderStatusFlow,
-                )
+                0 -> ProviderAndStatus(setDelay = setDelay, statusFlow = statusFlow)
                 1 -> Evaluations(toggleDefaults = toggleDefaults)
                 2 -> Hooks()
             }
@@ -221,14 +185,8 @@ fun Evaluations(toggleDefaults: () -> Unit) {
 }
 
 @Composable
-fun ProviderAndStatus(
-    statusFlow: Flow<String>,
-    multiProviderStatusFlow: Flow<String>,
-    setDelay: (Long) -> Unit,
-) {
+fun ProviderAndStatus(statusFlow: Flow<String>, setDelay: (Long) -> Unit) {
     val statusState by statusFlow.collectAsState(initial = "initial")
-    val multiProviderState by multiProviderStatusFlow.collectAsState(initial = "initial")
-
     val coroutineScope = rememberCoroutineScope()
     Column(modifier = Modifier.fillMaxSize()) {
         var sliderValue by remember { mutableStateOf(0.1f) }
@@ -290,10 +248,6 @@ fun ProviderAndStatus(
         Row(Modifier.padding(top = 8.dp)) {
             Text(text = "Current SDK status: $statusState")
         }
-
-        Row(Modifier.padding(top = 8.dp)) {
-            Text(text = "MultiProvider Latest event: $multiProviderState")
-        }
     }
 }
 
@@ -369,8 +323,7 @@ fun MainPagePreview() {
     OpenFeatureTheme {
         MainPage(
             setDelay = { },
-            statusFlow = flowOf("initial"),
-            multiProviderStatusFlow = flowOf("initial"),
+            statusFlow = emptyFlow(),
             defaultTab = 0,
             toggleDefaults = { }
         )