diff --git a/app/src/main/java/com/schoolapp/cleverclass/PSEActivity.kt b/app/src/main/java/com/schoolapp/cleverclass/PSEActivity.kt index ec3390a..062e90a 100644 --- a/app/src/main/java/com/schoolapp/cleverclass/PSEActivity.kt +++ b/app/src/main/java/com/schoolapp/cleverclass/PSEActivity.kt @@ -93,14 +93,6 @@ private val colors = listOf( private val shells = listOf( "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 @OptIn(ExperimentalMaterial3Api::class) @@ -175,15 +167,9 @@ fun PSEMainContent(activity: ComponentActivity) { ) { var dialogCounter = 0 - Row { - groups.forEach { element -> - InformationBox(text = element, color = MaterialTheme.colorScheme.onBackground, false) - } - } - for (row in 0..6) { 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) { 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 -fun InformationBox(text: String, color: Color, outline: Boolean){ +fun InformationBox(text: String, color: Color){ Box(modifier = Modifier .padding(3.dp) .size(60.dp) .border( width = 1.dp, - color = if (outline) MaterialTheme.colorScheme.primaryContainer else Color.Transparent + color = MaterialTheme.colorScheme.primaryContainer ) ) { Text(