Merge remote-tracking branch 'origin/master'

app/src/main/AndroidManifest.xml

@@ -51,6 +51,7 @@
             android:name=".PSEActivity"
             android:exported="false"
             android:label="@string/title_activity_pseactivity"
+            android:screenOrientation="landscape"
             android:theme="@style/Theme.CleverClass" />
         <activity
             android:name=".MainActivity"

app/src/main/assets/elements_data.txt

@@ -1,15 +1,12 @@
+Wasserstoff
 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
+radioaktiv: Nein
-radiaktiv: Nein
 künstlich: Nein
 langlebigstes Isotop:
 Halbwertszeit:

app/src/main/java/com/schoolapp/cleverclass/PSEActivity.kt

@@ -65,17 +65,31 @@ fun PSEContent(activity: ComponentActivity){
             modifier = Modifier.fillMaxWidth()
         )
 
-        Column() {
+        //region //Element dialog builders
-            //region //Element dialog definitions
+        val listofbuilder = mutableListOf<AlertDialog.Builder>()
-            val HBuilder = AlertDialog.Builder(activity)
+        for (i in 0..117) {
-            HBuilder.setIcon(null)
+            listofbuilder.add(AlertDialog.Builder(activity))
-            HBuilder.setTitle(elements[0].data0)
+            listofbuilder[i].setTitle(elements[i].data0 + "(" + elements[i].data1 + ", " + elements[i].data2)
-            HBuilder.setMessage(elements[0].data0)
+            listofbuilder[i].setMessage(
-            HBuilder.setPositiveButton(R.string.dialog_schließen, null)
+                elements[i].data1 + "\n" +
-            //endregion
+                elements[i].data2 + "\n" +
+                elements[i].data3 + "\n" +
+                elements[i].data4 + "\n" +
+                elements[i].data5 + "\n" +
+                elements[i].data6 + "\n" +
+                elements[i].data7 + "\n" +
+                elements[i].data8 + "\n" +
+                elements[i].data9 + "\n" +
+                elements[i].data10 + "\n" +
+                elements[i].data11 + "\n" +
+                elements[i].data12
+            )
+        }
+        //endregion
 
+        Column() {
             TextButton(
-                onClick = { HBuilder.show() }) {
+                onClick = { listofbuilder[0].show() }) {
                 Text(text = "H")
             }
         }

app/src/main/java/com/schoolapp/cleverclass/PSEData.kt

@@ -22,9 +22,6 @@ class PSEData() {
     var data10: String = ""
     var data11: String = ""
     var data12: String = ""
-    var data13: String = ""
-    var data14: String = ""
-    var data15: String = ""
     constructor(
         string0: String,
         string1: String,
@@ -39,9 +36,6 @@ class PSEData() {
         string10: String,
         string11: String,
         string12: String,
-        string13: String,
-        string14: String,
-        string15: String
     ) : this() {
         data0 = string0
         data1 = string1
@@ -56,9 +50,6 @@ class PSEData() {
         data10 = string10
         data11 = string11
         data12 = string12
-        data13 = string13
-        data14 = string14
-        data15 = string15
     }
 }
 
@@ -80,22 +71,19 @@ fun readData(context: Context) {
     if (i < 118) {
         while (i < 118) {
             val pseobject = PSEData(
-                string0 = elementInput[(i * 16)],
+                string0 = elementInput[(i * 13)],
-                string1 = elementInput[(i * 16) + 1],
+                string1 = elementInput[(i * 13) + 1],
-                string2 = elementInput[(i * 16) + 2],
+                string2 = elementInput[(i * 13) + 2],
-                string3 = elementInput[(i * 16) + 3],
+                string3 = elementInput[(i * 13) + 3],
-                string4 = elementInput[(i * 16) + 4],
+                string4 = elementInput[(i * 13) + 4],
-                string5 = elementInput[(i * 16) + 5],
+                string5 = elementInput[(i * 13) + 5],
-                string6 = elementInput[(i * 16) + 6],
+                string6 = elementInput[(i * 13) + 6],
-                string7 = elementInput[(i * 16) + 7],
+                string7 = elementInput[(i * 13) + 7],
-                string8 = elementInput[(i * 16) + 8],
+                string8 = elementInput[(i * 13) + 8],
-                string9 = elementInput[(i * 16) + 9],
+                string9 = elementInput[(i * 13) + 9],
-                string10 = elementInput[(i * 16) + 10],
+                string10 = elementInput[(i * 13) + 10],
-                string11 = elementInput[(i * 16) + 11],
+                string11 = elementInput[(i * 13) + 11],
-                string12 = elementInput[(i * 16) + 12],
+                string12 = elementInput[(i * 13) + 12],
-                string13 = elementInput[(i * 16) + 13],
-                string14 = elementInput[(i * 16) + 14],
-                string15 = elementInput[(i * 16) + 15]
             )
             elements.add(pseobject)
             i++