diff --git a/app/src/main/assets/elements_data.txt b/app/src/main/assets/elements_data.txt index 10bff3f..8f4847a 100644 --- a/app/src/main/assets/elements_data.txt +++ b/app/src/main/assets/elements_data.txt @@ -13,4 +13,1876 @@ radiaktiv: Nein künstlich: Nein langlebigstes Isotop: Halbwertszeit: -Strahlungsart: \ No newline at end of file +Strahlungsart: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/schoolapp/cleverclass/MainActivity.kt b/app/src/main/java/com/schoolapp/cleverclass/MainActivity.kt index 0917423..f3b2805 100644 --- a/app/src/main/java/com/schoolapp/cleverclass/MainActivity.kt +++ b/app/src/main/java/com/schoolapp/cleverclass/MainActivity.kt @@ -42,7 +42,7 @@ import com.schoolapp.cleverclass.ui.theme.TextOnColouredButton class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - readData() + readData(applicationContext) setContent { CleverClassTheme { Surface(modifier = Modifier.fillMaxSize(), diff --git a/app/src/main/java/com/schoolapp/cleverclass/PSEActivity.kt b/app/src/main/java/com/schoolapp/cleverclass/PSEActivity.kt index af2adf3..06f3b79 100644 --- a/app/src/main/java/com/schoolapp/cleverclass/PSEActivity.kt +++ b/app/src/main/java/com/schoolapp/cleverclass/PSEActivity.kt @@ -78,10 +78,4 @@ fun PSEContent(activity: ComponentActivity){ } } } -} - -fun main() { - readData() - println(elements[0].data0) - println(elements[0].data10) } \ No newline at end of file diff --git a/app/src/main/java/com/schoolapp/cleverclass/PSEData.kt b/app/src/main/java/com/schoolapp/cleverclass/PSEData.kt index 7bd5884..1882c7d 100644 --- a/app/src/main/java/com/schoolapp/cleverclass/PSEData.kt +++ b/app/src/main/java/com/schoolapp/cleverclass/PSEData.kt @@ -1,10 +1,20 @@ package com.schoolapp.cleverclass +import android.content.Context +import android.content.res.AssetManager +import android.content.res.Resources +import android.content.res.loader.ResourcesProvider +import android.net.Uri +import java.io.BufferedReader import java.io.File +import java.io.FileDescriptor +import java.io.FileInputStream +import java.io.FileReader import java.io.IOException -import java.util.Scanner +import java.io.InputStreamReader val elements = mutableListOf() +var i = 0 class PSEData() { var data0: String = "" @@ -60,45 +70,43 @@ class PSEData() { } } -fun main() { - readData() -} -fun readData() { - val elementInput = mutableListOf("", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "") - val fileName = "app/src/main/assets/elements_data.txt" - var i = 0 - while (i < 1) { - try { - val sc = Scanner(File(fileName)) - var j = 0 - while (j < 1) { - elementInput[j] = sc.nextLine() - j++ +fun readData(context: Context) { + val elementInput = mutableListOf() + val file = "elements_data.txt" + val assetManager = context.assets + val inputStream = assetManager.open(file) + try { + BufferedReader(InputStreamReader(inputStream)).use { br -> + br.lines().forEach { + elementInput.add(it) } - } catch (e: IOException) { - e.printStackTrace() } - val pseobject = PSEData( - string0 = elementInput[0], - string1 = elementInput[1], - string2 = elementInput[2], - string3 = elementInput[3], - string4 = elementInput[4], - string5 = elementInput[5], - string6 = elementInput[6], - string7 = elementInput[7], - string8 = elementInput[8], - string9 = elementInput[9], - string10 = elementInput[10], - string11 = elementInput[11], - string12 = elementInput[12], - string13 = elementInput[13], - string14 = elementInput[14], - string15 = elementInput[15] - ) - elements.add(pseobject) - i++ } - println(elements[0].data0) - println("hi") + catch (e: IOException) { + e.printStackTrace() + } + if (i < 118) { + while (i < 118) { + val pseobject = PSEData( + string0 = elementInput[(i * 16)], + string1 = elementInput[(i * 16) + 1], + string2 = elementInput[(i * 16) + 2], + string3 = elementInput[(i * 16) + 3], + string4 = elementInput[(i * 16) + 4], + string5 = elementInput[(i * 16) + 5], + string6 = elementInput[(i * 16) + 6], + string7 = elementInput[(i * 16) + 7], + string8 = elementInput[(i * 16) + 8], + string9 = elementInput[(i * 16) + 9], + string10 = elementInput[(i * 16) + 10], + string11 = elementInput[(i * 16) + 11], + string12 = elementInput[(i * 16) + 12], + string13 = elementInput[(i * 16) + 13], + string14 = elementInput[(i * 16) + 14], + string15 = elementInput[(i * 16) + 15] + ) + elements.add(pseobject) + i++ + } + } }