diff --git a/app/src/main/java/it/edu/cassandroferminervi/flowschool/screens/HomeScreen.kt b/app/src/main/java/it/edu/cassandroferminervi/flowschool/screens/HomeScreen.kt index a819f82..7fcf083 100644 --- a/app/src/main/java/it/edu/cassandroferminervi/flowschool/screens/HomeScreen.kt +++ b/app/src/main/java/it/edu/cassandroferminervi/flowschool/screens/HomeScreen.kt @@ -1,12 +1,18 @@ package it.edu.cassandroferminervi.flowschool.screens import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.material3.Button +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.ElevatedCard +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -24,18 +30,79 @@ fun HomeScreen(navigator: DestinationsNavigator, token: String) { verticalArrangement = Arrangement.Center, modifier = Modifier .fillMaxSize() - .padding(horizontal = 50.dp) ) { - Button(onClick = { - navigator.navigate(PermissionScreenDestination(token)) - }, modifier = Modifier.align(Alignment.CenterHorizontally)) { - Text("Scannerizza codice QR") + ElevatedCard( + elevation = CardDefaults.cardElevation( + defaultElevation = 6.dp + ), + + modifier = Modifier + .fillMaxHeight(0.5F) + .fillMaxWidth() + .padding(25.dp) + ) { + Text( + "Scannerizza codice QR", + style = MaterialTheme.typography.headlineMedium, + modifier = Modifier + .padding(16.dp) + ) + Text( + "Scannerizzando il codice QR generato dinamicamente dal dispositivo situato nella scuola ti permette di segnare la presenza in modo efficiente.", + modifier = Modifier + .padding(16.dp) + ) + Box( + modifier = Modifier + .fillMaxSize() + ) { + Button( + onClick = { + navigator.navigate(PermissionScreenDestination(token)) + }, modifier = Modifier + .align(Alignment.BottomEnd) + .padding(16.dp) + ) { + Text("Prosegui") + } + } } Spacer(modifier = Modifier.height(8.dp)) - Button(onClick = { - navigator.navigate(SearchingScreenDestination(token)) - }, modifier = Modifier.align(Alignment.CenterHorizontally)) { - Text("Cerca professore") + ElevatedCard( + elevation = CardDefaults.cardElevation( + defaultElevation = 6.dp + ), + + modifier = Modifier + .fillMaxHeight() + .fillMaxWidth() + .padding(25.dp) + ) { + Text( + "Cerca professore", + style = MaterialTheme.typography.headlineMedium, + modifier = Modifier + .padding(16.dp) + ) + Text( + "Cerca il professore sul quale vuoi ottenere informazioni come l'orario di entrata, l'orario di uscita e la classe in cui presiede attualmente.", + modifier = Modifier + .padding(16.dp) + ) + Box( + modifier = Modifier + .fillMaxSize() + ) { + Button( + onClick = { + navigator.navigate(SearchingScreenDestination(token)) + }, modifier = Modifier + .align(Alignment.BottomEnd) + .padding(16.dp) + ) { + Text("Prosegui") + } + } } } } \ No newline at end of file diff --git a/app/src/main/java/it/edu/cassandroferminervi/flowschool/util/QrAnalyzer.kt b/app/src/main/java/it/edu/cassandroferminervi/flowschool/util/QrAnalyzer.kt index 8d54da7..18fae16 100644 --- a/app/src/main/java/it/edu/cassandroferminervi/flowschool/util/QrAnalyzer.kt +++ b/app/src/main/java/it/edu/cassandroferminervi/flowschool/util/QrAnalyzer.kt @@ -16,7 +16,7 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -class QrAnalyzer(private val context: Context, val navigator: DestinationsNavigator, val token: String) : ImageAnalysis.Analyzer { +class QrAnalyzer(private val context: Context, private val navigator: DestinationsNavigator, val token: String) : ImageAnalysis.Analyzer { private val options = BarcodeScannerOptions.Builder() .setBarcodeFormats(Barcode.FORMAT_QR_CODE) .build()