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

PSE remove groups

Browse Source
This commit is contained in:
BuildTools
2024-05-17 13:31:10 +02:00
parent c54a79e218
commit 25bbf0f6b9
1 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,14 +93,6 @@ private val colors = listOf(
private val shells = listOf( private val shells = listOf(
"K", "L", "M", "N", "O", "P", "Q" "K", "L", "M", "N", "O", "P", "Q"
) )
private val groups = listOf(
"",
"I", "II",
"", "", "", "", "", "", "", "", "", "", "", "", "", "",
"IIIb", "IVb", "Vb", "VIb", "VIIb", "VIIIb", "VIIIb", "VIIIb", "Ib", "IIb",
"III", "IV", "V", "VI", "VII", "VIII",
""
)
// Content of PSE // Content of PSE
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
@@ -175,15 +167,9 @@ fun PSEMainContent(activity: ComponentActivity) {
) { ) {
var dialogCounter = 0 var dialogCounter = 0
Row {
groups.forEach { element ->
InformationBox(text = element, color = MaterialTheme.colorScheme.onBackground, false)
}
}
for (row in 0..6) { for (row in 0..6) {
Row { Row {
InformationBox(text = (row + 1).toString(), color = MaterialTheme.colorScheme.onBackground, true) InformationBox(text = (row + 1).toString(), color = MaterialTheme.colorScheme.onBackground)
for (element in 0..31) { for (element in 0..31) {
val index = row * 32 + element val index = row * 32 + element
@@ -213,7 +199,7 @@ fun PSEMainContent(activity: ComponentActivity) {
} }
} }
InformationBox(text = shells[row], color = colors[row], true) InformationBox(text = shells[row], color = colors[row])
} }
} }
} }
@@ -279,13 +265,13 @@ fun PSEMainContent(activity: ComponentActivity) {
} }
@Composable @Composable
fun InformationBox(text: String, color: Color, outline: Boolean){ fun InformationBox(text: String, color: Color){
Box(modifier = Modifier Box(modifier = Modifier
.padding(3.dp) .padding(3.dp)
.size(60.dp) .size(60.dp)
.border( .border(
width = 1.dp, width = 1.dp,
color = if (outline) MaterialTheme.colorScheme.primaryContainer else Color.Transparent color = MaterialTheme.colorScheme.primaryContainer
) )
) { ) {
Text( Text(