mat.mey/CleverClass
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented one Button on PSE activity

Browse Source 
renamed arlrdbd font
Implementation of a .txt file based alternative for the JSON oopsie (needs work prob wrong while loop)
This commit is contained in:
matthias
2024-04-03 23:07:43 +02:00
parent f187b5899a
commit 29784348e5
13 changed files with 314 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.idea/androidTestResultsUserPreferences.xml generated Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AndroidTestResultsUserPreferences">
<option name="androidTestResultsTableState">
<map>
<entry key="28629151">
<value>
<AndroidTestResultsTableState>
<option name="preferredColumnWidths">
<map>
<entry key="Duration" value="90" />
<entry key="Tests" value="360" />
<entry key="samsung SM-A515F" value="120" />
</map>
</option>
</AndroidTestResultsTableState>
</value>
</entry>
</map>
</option>
</component>
</project>

123
.idea/codeStyles/Project.xml generated Normal file
View File

@@ -0,0 +1,123 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<JetCodeStyleSettings>
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</JetCodeStyleSettings>
<codeStyleSettings language="XML">
<option name="FORCE_REARRANGE_MODE" value="1" />
<indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" />
</indentOptions>
<arrangement>
<rules>
<section>
<rule>
<match>
<AND>
<NAME>xmlns:android</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>xmlns:.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:id</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>style</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
<order>ANDROID_ATTRIBUTE_ORDER</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>.*</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
</rules>
</arrangement>
</codeStyleSettings>
<codeStyleSettings language="kotlin">
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</codeStyleSettings>
</code_scheme>
</component>

5
.idea/codeStyles/codeStyleConfig.xml generated Normal file
View File

@@ -0,0 +1,5 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</state>
</component>

16
.idea/deploymentTargetDropDown.xml generated Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<value>
<entry key="All Tests">
<State />
</entry>
<entry key="PSEActivity">
<State />
</entry>
<entry key="app">
<State />
</entry>
</value>
</component>
</project>

5
.idea/gradle.xml generated
View File

@@ -4,16 +4,15 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="jbr-17" />
<option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
</set>
</option>
<option name="resolveExternalAnnotations" value="false" />
</GradleProjectSettings>
</option>
</component>

10
.idea/migrations.xml generated Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectMigrations">
<option name="MigrateToGradleLocalJavaHome">
<set>
<option value="$PROJECT_DIR$" />
</set>
</option>
</component>
</project>

2
app/build.gradle.kts
View File

@@ -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")

16
app/src/main/assets/elements_data.txt Normal file
View File

@@ -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:"

1
app/src/main/java/com/schoolapp/cleverclass/MainActivity.kt
View File

@@ -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(),

18
app/src/main/java/com/schoolapp/cleverclass/PSEActivity.kt
View File

@@ -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")
}
}
}
}

102
app/src/main/java/com/schoolapp/cleverclass/PSEData.kt Normal file
View File

@@ -0,0 +1,102 @@
package com.schoolapp.cleverclass
import java.io.File
import java.io.IOException
import java.util.Scanner
val elements = mutableListOf<PSEData>()
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++
}
}

0
app/src/main/res/font/ARLRDBD.TTF → app/src/main/res/font/arlrdbd.TTF
View File

1
app/src/main/res/values/strings.xml
View File

@@ -6,4 +6,5 @@
<string name="title_activity_stundenplan">StundenplanActivity</string>
<string name="title_activity_noten">NotenActivity</string>
<string name="title_activity_fach">FachActivity</string>
<string name="dialog_schließen">Schließen</string>
</resources>