From d0243477fa6b5a8d6a1d535f72a485bb3861491c Mon Sep 17 00:00:00 2001
From: FirephoenixX02 <otis.schmedt@gmx.de>
Date: Thu, 11 Apr 2024 16:13:38 +0200
Subject: [PATCH] Fix Loading Animation

---
 .gitignore                              | 15 +++++
 composeApp/src/commonMain/kotlin/App.kt | 86 ++++++++++++++-----------
 2 files changed, 63 insertions(+), 38 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c839f28
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,15 @@
+/.gradle/config.properties
+/.idea/vcs.xml
+/gradle/
+/local.properties
+/.idea/.gitignore
+/.gradle/8.4/checksums/checksums.lock
+/.gradle/8.4/fileHashes/fileHashes.lock
+/.idea/gradle.xml
+/.idea/migrations.xml
+/.idea/misc.xml
+/.gradle/
+/.idea/
+/.fleet/
+/composeApp/build/
+build/reports/
\ No newline at end of file
diff --git a/composeApp/src/commonMain/kotlin/App.kt b/composeApp/src/commonMain/kotlin/App.kt
index 1116e61..1ca9b6d 100644
--- a/composeApp/src/commonMain/kotlin/App.kt
+++ b/composeApp/src/commonMain/kotlin/App.kt
@@ -27,6 +27,8 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import io.kamel.image.KamelImage
 import io.kamel.image.asyncPainterResource
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import org.jetbrains.compose.ui.tooling.preview.Preview
 import org.json.JSONObject
 import org.jetbrains.compose.resources.ExperimentalResourceApi
@@ -39,9 +41,9 @@ import java.net.URL
 @Composable
 @Preview
 fun App() {
-    val pokemap = ArrayList<Pokemon>()
+    var pokemap = ArrayList<Pokemon>()
     val apiString = "https://pokeapi.co/api/v2/pokemon/"
-    var dataLoaded by mutableStateOf(false)
+    var dataLoaded by remember { mutableStateOf(false) }
     val orange = Color(0xFFffa500)
 
     val pokemonTypeDrawableMap = hashMapOf(
@@ -66,13 +68,26 @@ fun App() {
     )
 
     MaterialTheme {
-        Box(modifier = Modifier.background(color = orange).fillMaxSize()) {
-            if (!dataLoaded) {
-                println("Should show indicator")
-                //For some reason the application calls this code but does not diplay the ui if the launchedeffect is running
-                //This should not happen as launched-effect is an async co routine and non blocking
+        if (!dataLoaded) {
+            // Load data asynchronously
+            LaunchedEffect(Unit) {
+                 pokemap = withContext(Dispatchers.IO) {
+                     loadPokemonData(apiString)
+                 } as ArrayList<Pokemon>
+
+                pokemap.forEach { pokemon ->
+                    println(pokemon)
+                }
+
+                dataLoaded = true
+            }
+            //Show Loading Circle
+            Box(modifier = Modifier.background(color = orange).fillMaxSize()) {
                 Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-                    CircularProgressIndicator(modifier = Modifier.size(128.dp), color = Color.White)
+                    CircularProgressIndicator(
+                        modifier = Modifier.size(128.dp),
+                        color = Color.White
+                    )
                     Text(
                         "Fetching data from API...",
                         color = Color.White,
@@ -80,7 +95,11 @@ fun App() {
                         modifier = Modifier.height(200.dp)
                     )
                 }
-            } else {
+            }
+        } else {
+            println("Pokemon should show up any second!")
+            //Display Pokemon Grid
+            Box(modifier = Modifier.background(color = orange).fillMaxSize()) {
                 LazyVerticalGrid(
                     columns = GridCells.Adaptive(minSize = 256.dp),
                 ) {
@@ -116,8 +135,7 @@ fun App() {
                                     Image(
                                         org.jetbrains.compose.resources.painterResource(
                                             pokemonTypeDrawableMap[type]!!
-                                        ),
-                                        contentDescription = null
+                                        ), contentDescription = null
                                     )
                                 }
                                 Spacer(modifier = Modifier.height(8.dp))
@@ -134,31 +152,23 @@ fun App() {
             }
         }
     }
-    //Blocks ui rendering thread?
-    LaunchedEffect(Unit) {
-        //PokeDex API: https://pokeapi.co/api/v2/pokemon/
-        for (i in 1..10) {
-            val json = JSONObject(URL(apiString + i).readText());
-            val sprites = json.optJSONObject("sprites")
-            val types = json.getJSONArray("types")
-            val firstType = types.optJSONObject(0)
-            val type: String = firstType.optJSONObject("type").optString("name")
-
-            val pokemon = Pokemon(
-                json.optString("name"),
-                URL(sprites.optString("front_default")),
-                type,
-                json.optInt("id")
-            )
-
-            println(pokemon)
-
-            //println(type)
-            pokemap.add(
-                pokemon
-            )
-        }
-        dataLoaded = true;
-    }
-
+}
+
+// Function to load Pokemon data asynchronously
+suspend fun loadPokemonData(apiString: String): List<Pokemon> {
+    val pokemap = ArrayList<Pokemon>()
+    for (i in 1..10) {
+        val json = JSONObject(URL(apiString + i).readText());
+        val sprites = json.optJSONObject("sprites")
+        val types = json.getJSONArray("types")
+        val firstType = types.optJSONObject(0)
+        val type: String = firstType.optJSONObject("type").optString("name")
+
+        val pokemon = Pokemon(
+            json.optString("name"), URL(sprites.optString("front_default")), type, json.optInt("id")
+        )
+
+        pokemap.add(pokemon)
+    }
+    return pokemap
 }