diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml new file mode 100644 index 0000000..41a82ef --- /dev/null +++ b/.idea/androidTestResultsUserPreferences.xml @@ -0,0 +1,22 @@ + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..7643783 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,123 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..8aec840 --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ae388c2..0897082 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,16 +4,15 @@ diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e5b1218..603f9f2 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,7 +1,6 @@ plugins { id("com.android.application") id("org.jetbrains.kotlin.android") - kotlin("plugin.serialization") version "1.9.23" } android { @@ -69,7 +68,6 @@ dependencies { implementation(platform("androidx.compose:compose-bom:2023.03.00")) implementation(platform("androidx.compose:compose-bom:2023.03.00")) implementation(platform("androidx.compose:compose-bom:2023.03.00")) - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0") testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.5") androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") diff --git a/app/src/main/assets/elements_data.txt b/app/src/main/assets/elements_data.txt new file mode 100644 index 0000000..480c267 --- /dev/null +++ b/app/src/main/assets/elements_data.txt @@ -0,0 +1,16 @@ +"Ordnungszahl: 1" +"Name: Wasserstoff" +"Elementsymbol: H" +"Molare Masse in g/mol: 1.0080" +"Elektronegativität: 2.55" +"Dichte in g/cm³ g/l: 2.25" +"Schmelztemperatur: -259" +"Schmelzdruckabhängig: Nein" +"Schmelzsublimation: Ja" +"Siedetemperatur: -253" +"Siededruckabhängig: Nein" +"radiaktiv: Nein" +"künstlich: Nein" +"langlebigstes Isotop:" +"Halbwertszeit:" +"Strahlungsart:" \ No newline at end of file diff --git a/app/src/main/java/com/schoolapp/cleverclass/MainActivity.kt b/app/src/main/java/com/schoolapp/cleverclass/MainActivity.kt index fcd0ad2..0917423 100644 --- a/app/src/main/java/com/schoolapp/cleverclass/MainActivity.kt +++ b/app/src/main/java/com/schoolapp/cleverclass/MainActivity.kt @@ -42,6 +42,7 @@ import com.schoolapp.cleverclass.ui.theme.TextOnColouredButton class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + readData() 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 9e46c00..2f904b5 100644 --- a/app/src/main/java/com/schoolapp/cleverclass/PSEActivity.kt +++ b/app/src/main/java/com/schoolapp/cleverclass/PSEActivity.kt @@ -1,5 +1,6 @@ package com.schoolapp.cleverclass +import android.app.AlertDialog import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent @@ -15,6 +16,7 @@ import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.material3.Text +import androidx.compose.material3.TextButton import androidx.compose.material3.TopAppBar import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable @@ -44,9 +46,11 @@ fun PSEContent(activity: ComponentActivity){ TopAppBar( colors = TopAppBarDefaults.centerAlignedTopAppBarColors(MaterialTheme.colorScheme.primaryContainer), title = { - Text(text = "Periodensystem", + Text( + text = "Periodensystem", style = MaterialTheme.typography.headlineSmall - )}, + ) + }, navigationIcon = { IconButton(onClick = { activity.finish() }) { Icon( @@ -60,7 +64,17 @@ fun PSEContent(activity: ComponentActivity){ ) Column() { + //region //Element dialog definitions + val HBuilder = AlertDialog.Builder(activity) + HBuilder.setTitle("EL TITEL") + HBuilder.setMessage(elements[0].data1) + HBuilder.setPositiveButton(R.string.dialog_schließen, null) + //endregion + TextButton( + onClick = { HBuilder.show() }) { + Text(text = "H") + } } } } diff --git a/app/src/main/java/com/schoolapp/cleverclass/PSEData.kt b/app/src/main/java/com/schoolapp/cleverclass/PSEData.kt new file mode 100644 index 0000000..030053c --- /dev/null +++ b/app/src/main/java/com/schoolapp/cleverclass/PSEData.kt @@ -0,0 +1,102 @@ +package com.schoolapp.cleverclass + +import java.io.File +import java.io.IOException +import java.util.Scanner + +val elements = mutableListOf() + +class PSEData() { + private var data0: String = "" + var data1: String = "" + private var data2: String = "" + private var data3: String = "" + private var data4: String = "" + private var data5: String = "" + private var data6: String = "" + private var data7: String = "" + private var data8: String = "" + private var data9: String = "" + private var data10: String = "" + private var data11: String = "" + private var data12: String = "" + private var data13: String = "" + private var data14: String = "" + private var data15: String = "" + constructor( + string0: String, + string1: String, + string2: String, + string3: String, + string4: String, + string5: String, + string6: String, + string7: String, + string8: String, + string9: String, + string10: String, + string11: String, + string12: String, + string13: String, + string14: String, + string15: String + ) : this() { + data0 = string0 + data1 = string1 + data2 = string2 + data3 = string3 + data4 = string4 + data5 = string5 + data6 = string6 + data7 = string7 + data8 = string8 + data9 = string9 + data10 = string10 + data11 = string11 + data12 = string12 + data13 = string13 + data14 = string14 + data15 = string15 + } +} + +fun readData() { + val elementInput = mutableListOf("", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "") + val fileName = "app/src/main/assets/elements_data.txt" + var i = 0 + while (i < 118) { + try { + val sc = Scanner(File(fileName)) + var j = 0 + for (x in elementInput) { + elementInput[j] = sc.nextLine() + j++ + if (j == 16) { + j = 0 + } + } + } catch (e: IOException) { + e.printStackTrace() + } + val pseobject = PSEData( + elementInput[0], + elementInput[1], + elementInput[2], + elementInput[3], + elementInput[4], + elementInput[5], + elementInput[6], + elementInput[7], + elementInput[8], + elementInput[9], + elementInput[10], + elementInput[11], + elementInput[12], + elementInput[13], + elementInput[14], + elementInput[15] + ) + elements.add(pseobject) + i++ + } +} diff --git a/app/src/main/res/font/ARLRDBD.TTF b/app/src/main/res/font/arlrdbd.TTF similarity index 100% rename from app/src/main/res/font/ARLRDBD.TTF rename to app/src/main/res/font/arlrdbd.TTF diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 74a510a..6554835 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,4 +6,5 @@ StundenplanActivity NotenActivity FachActivity + Schließen \ No newline at end of file