feat: [ANDROAPP-6693] adapt json to common resources

dhis2 · Dec 20, 2024 · d9cbc3d · d9cbc3d
1 parent 7138cd2
commit d9cbc3d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/...in/resources/multi_header_table_list.json → ...ources/files/multi_header_table_list.json b/...in/resources/multi_header_table_list.json → ...ources/files/multi_header_table_list.json
diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/table/TableScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/table/TableScreen.kt
@@ -1,29 +1,34 @@
 package org.hisp.dhis.common.screens.table
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import kotlinx.serialization.json.Json
+import mobile_ui.common.generated.resources.Res
 import org.hisp.dhis.mobile.ui.designsystem.component.table.model.TableModel
 import org.hisp.dhis.mobile.ui.designsystem.component.table.ui.DataTable
-import java.io.InputStream
+import org.jetbrains.compose.resources.ExperimentalResourceApi
 
+@OptIn(ExperimentalResourceApi::class)
 @Composable
 fun TableScreen() {
-    DataTable(
-        tableList = getTableData(),
-    )
-}
-
-fun getTableData(): List<TableModel> {
-    val jsonString = readJsonFile("multi_header_table_list.json")
-    val data = parseJson(jsonString)
-    return data
-}
+    var bytes by remember {
+        mutableStateOf(ByteArray(0))
+    }
+    LaunchedEffect(Unit) {
+        bytes = Res.readBytes("files/multi_header_table_list.json")
+    }
+    val jsonString = bytes.decodeToString()
+    if (jsonString.isNotEmpty()) {
+        val data = parseJson(jsonString)
+        DataTable(
+            tableList = data,
+        )
+    }
 
-fun readJsonFile(fileName: String): String {
-    val classLoader = Thread.currentThread().contextClassLoader
-    val inputStream: InputStream = classLoader!!.getResourceAsStream(fileName)
-        ?: throw IllegalArgumentException("File not found: $fileName")
-    return inputStream.bufferedReader().use { it.readText() }
 }
 
 fun parseJson(jsonString: String): List<TableModel> {