Improved menu interface

.idea/misc.xml

@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>

app/src/main/java/it/edu/cassandroferminervi/flowschool/remote/ApiService.kt

@@ -1,6 +1,8 @@
 package it.edu.cassandroferminervi.flowschool.remote
 
 import it.edu.cassandroferminervi.flowschool.remote.dto.LoginResult
+import it.edu.cassandroferminervi.flowschool.remote.dto.PresenceResult
+import it.edu.cassandroferminervi.flowschool.remote.dto.TeacherInfoResult
 import retrofit2.Response
 import retrofit2.http.Field
 import retrofit2.http.FormUrlEncoded
@@ -9,5 +11,26 @@ import retrofit2.http.POST
 interface ApiService {
     @FormUrlEncoded
     @POST("login.php")
-    suspend fun postLogin(@Field("username") code: String, @Field("password") password: String): Response<LoginResult>
+    suspend fun postLogin(
+        @Field("username") code: String,
+        @Field("password") password: String
+    ): Response<LoginResult>
+
+    @FormUrlEncoded
+    @POST("presenza.php")
+    suspend fun postPresence(
+        @Field("token") token: String,
+        @Field("codice") qrcode: String
+    ): Response<PresenceResult>
+
+    @FormUrlEncoded
+    @POST("lista.php")
+    suspend fun postTeacherList(@Field("token") token: String): Response<List<TeacherInfoResult>>
+
+    @FormUrlEncoded
+    @POST("ottieni_prof.php")
+    suspend fun postTeacherInfo(
+        @Field("token") token: String,
+        @Field("profId") teacherId: Int
+    ): Response<TeacherInfoResult>
 }

app/src/main/java/it/edu/cassandroferminervi/flowschool/remote/dto/PresenceResult.kt

@@ -0,0 +1,6 @@
+package it.edu.cassandroferminervi.flowschool.remote.dto
+
+import androidx.annotation.Keep
+
+@Keep
+data class PresenceResult(val success: Boolean)

app/src/main/java/it/edu/cassandroferminervi/flowschool/remote/dto/TeacherInfoResult.kt

@@ -0,0 +1,11 @@
+package it.edu.cassandroferminervi.flowschool.remote.dto
+
+import androidx.annotation.Keep
+
+@Keep
+data class TeacherInfoResult(
+    val codice: Int,
+    val nome: String,
+    val cognome: String,
+    val email: String?
+)

app/src/main/java/it/edu/cassandroferminervi/flowschool/screens/CameraScreen.kt

@@ -14,10 +14,11 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.content.ContextCompat
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import it.edu.cassandroferminervi.flowschool.util.QrAnalyzer
 
 @Composable
-fun CameraScreen() {
+fun CameraScreen(navigator: DestinationsNavigator, token: String) {
     val localContext = LocalContext.current
     val lifecycleOwner = LocalLifecycleOwner.current
     val cameraProviderFuture = remember {
@@ -37,7 +38,7 @@ fun CameraScreen() {
             val imageAnalysis = ImageAnalysis.Builder().build()
             imageAnalysis.setAnalyzer(
                 ContextCompat.getMainExecutor(context),
-                QrAnalyzer(context)
+                QrAnalyzer(context, navigator, token)
             )
 
             runCatching {

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 = {
+        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.CenterHorizontally)) {
-            Text("Scannerizza codice QR")
+                    }, modifier = Modifier
+                        .align(Alignment.BottomEnd)
+                        .padding(16.dp)
+                ) {
+                    Text("Prosegui")
+                }
+            }
         }
         Spacer(modifier = Modifier.height(8.dp))
-        Button(onClick = {
+        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.CenterHorizontally)) {
-            Text("Cerca professore")
+                    }, modifier = Modifier
+                        .align(Alignment.BottomEnd)
+                        .padding(16.dp)
+                ) {
+                    Text("Prosegui")
+                }
+            }
         }
     }
 }

app/src/main/java/it/edu/cassandroferminervi/flowschool/screens/LoginScreen.kt

@@ -90,7 +90,7 @@ fun LoginScreen(navigator: DestinationsNavigator) {
 
                 val description = if (passwordVisible) "Nascondi password" else "Mostra password"
 
-                IconButton(onClick = {passwordVisible = !passwordVisible}){
+                IconButton(onClick = { passwordVisible = !passwordVisible }) {
                     Icon(imageVector = image, description)
                 }
             },

app/src/main/java/it/edu/cassandroferminervi/flowschool/screens/PermissionScreen.kt

@@ -12,17 +12,18 @@ import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
 import com.google.accompanist.permissions.shouldShowRationale
 import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 
 @OptIn(ExperimentalPermissionsApi::class)
 @Destination
 @Composable
-fun PermissionScreen(token: String) {
+fun PermissionScreen(navigator: DestinationsNavigator, token: String) {
     val cameraPermissionState = rememberPermissionState(android.Manifest.permission.CAMERA)
 
     if (cameraPermissionState.status.isGranted) {
-        CameraScreen()
+        CameraScreen(navigator, token)
     } else {
-        Box (
+        Box(
             contentAlignment = Alignment.Center,
             modifier = Modifier.fillMaxSize()
         ) {

app/src/main/java/it/edu/cassandroferminervi/flowschool/screens/SearchingScreen.kt

@@ -1,129 +1,104 @@
 package it.edu.cassandroferminervi.flowschool.screens
 
+import android.widget.Toast
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.material3.TextField
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import com.ramcosta.composedestinations.TeacherScreenDestination
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import it.edu.cassandroferminervi.flowschool.remote.RetrofitInstance
+import it.edu.cassandroferminervi.flowschool.remote.dto.TeacherInfoResult
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
+@OptIn(ExperimentalFoundationApi::class)
 @Destination
 @Composable
-fun SearchingScreen(navigator: DestinationsNavigator, token: String) {
-    val teachers = listOf(
-        "Mario Rossi",
-        "Michele Verdi",
-        "Fabio Bianchi"
-    ).groupBy {
-        it.first()
-    }.toSortedMap()
-        .map {
-            Category(
-                it.key.toString(),
-                items = it.value
-            )
+fun SearchingScreen(
+    navigator: DestinationsNavigator,
+    token: String,
+) {
+    val context = LocalContext.current
+
+    var professorList by remember { mutableStateOf<List<TeacherInfoResult>>(emptyList()) }
+    var searchText by remember { mutableStateOf("") }
+
+    LaunchedEffect(Unit) {
+        val response = withContext(Dispatchers.IO) {
+            RetrofitInstance.api.postTeacherList(token)
         }
-    var filter by remember { mutableStateOf("") }
+        if (response.isSuccessful) {
+            professorList = response.body() ?: emptyList()
+        } else {
+            Toast.makeText(context, "Errore nel server", Toast.LENGTH_SHORT).show()
+        }
+    }
+
+    val groupedByLetter = professorList.sortedWith(compareBy({ it.cognome }, { it.nome }))
+        .groupBy { it.cognome.first().uppercaseChar() }
 
     Column {
-        TextField(
-            value = filter,
-            onValueChange = { filter = it },
-            label = { Text("Cerca") },
-            singleLine = true,
+        OutlinedTextField(
+            value = searchText,
+            onValueChange = { searchText = it },
+            label = { Text("Cerca professore") },
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(16.dp)
         )
-        CategorizedLazyColumn(
-            categories = teachers,
-            navigator = navigator,
-            filter = filter
-        )
-    }
-}
-
-data class Category(
-    val name: String,
-    val items: List<String>
-)
-
-@Composable
-private fun CategoryHeader(
-    text: String,
-    modifier: Modifier = Modifier
-) {
-    Text(
-        text = text,
-        fontSize = 16.sp,
-        fontWeight = FontWeight.Bold,
-        modifier = modifier
-            .fillMaxWidth()
-            .background(MaterialTheme.colorScheme.primaryContainer)
-            .padding(16.dp)
-    )
-}
-
-@Composable
-private fun CategoryItem(
-    text: String,
-    navigator: DestinationsNavigator,
-    modifier: Modifier = Modifier
-) {
-    TextButton(onClick = {
-        navigator.navigate(TeacherScreenDestination("test"))
-    }) {
-        Text(
-            text = text,
-            fontSize = 14.sp,
-            modifier = modifier
-                .fillMaxWidth()
-                .background(MaterialTheme.colorScheme.background)
-                .padding(16.dp)
-        )
-    }
-}
-
-@OptIn(ExperimentalFoundationApi::class)
-@Composable
-private fun CategorizedLazyColumn(
-    categories: List<Category>,
-    navigator: DestinationsNavigator,
-    filter: String,
-    modifier: Modifier = Modifier
-) {
-    LazyColumn(modifier) {
-        categories.forEach { category ->
-            if (category.items.any {
-                    it.contains(filter, ignoreCase = true)
-                }) {
+        LazyColumn {
+            groupedByLetter.forEach { (letter, professors) ->
                 stickyHeader {
-                    CategoryHeader(category.name)
+                    Text(
+                        text = letter.toString(),
+                        style = TextStyle(fontWeight = FontWeight.Bold),
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .background(Color.LightGray)
+                            .padding(horizontal = 16.dp, vertical = 8.dp)
+                    )
                 }
+                items(professors.filter {
+                    it.nome.contains(searchText, ignoreCase = true) ||
+                            it.cognome.contains(searchText, ignoreCase = true)
+                }) { professor ->
+                    ProfessorItem(navigator = navigator, token = token, professor = professor)
                 }
-
-                items(items = category.items.filter {
-                it.contains(filter, ignoreCase = true)
-            }) { text ->
-                CategoryItem(text, navigator)
             }
         }
     }
 }
+
+@Composable
+fun ProfessorItem(navigator: DestinationsNavigator, token: String, professor: TeacherInfoResult) {
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable(onClick = {
+                navigator.navigate(TeacherScreenDestination(token, professor.codice))
+            })
+            .padding(16.dp)
+    ) {
+        Text(text = "${professor.nome} ${professor.cognome}")
+    }
+}

app/src/main/java/it/edu/cassandroferminervi/flowschool/screens/TeacherScreen.kt

@@ -1,23 +1,59 @@
 package it.edu.cassandroferminervi.flowschool.screens
 
+import android.widget.Toast
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import com.ramcosta.composedestinations.annotation.Destination
+import it.edu.cassandroferminervi.flowschool.remote.RetrofitInstance
+import it.edu.cassandroferminervi.flowschool.remote.dto.TeacherInfoResult
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
 @Destination
 @Composable
-fun TeacherScreen(codice: String) {
+fun TeacherScreen(token: String, code: Int) {
+    val context = LocalContext.current
+    var resBody by remember {
+        mutableStateOf(
+            TeacherInfoResult(
+                code,
+                "err",
+                "err",
+                null
+            )
+        )
+    }
+
+    LaunchedEffect(Unit) {
+        val response = withContext(Dispatchers.IO) {
+            RetrofitInstance.api.postTeacherInfo(token, code)
+        }
+
+        if (response.isSuccessful && response.body() != null) {
+            resBody = response.body()!!
+        } else {
+            Toast.makeText(context, "Errore nel server", Toast.LENGTH_SHORT).show()
+        }
+    }
+
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Center,
         modifier = Modifier.fillMaxSize()
     ) {
-        Text("Codice prof: $codice")
-        Text("Presente: si")
+        Text("Nome: ${resBody.nome}")
+        Text("Cognome: ${resBody.cognome}")
+        Text("Email: ${resBody.email}")
     }
 }

app/src/main/java/it/edu/cassandroferminervi/flowschool/util/QrAnalyzer.kt

@@ -9,8 +9,14 @@ import com.google.mlkit.vision.barcode.BarcodeScannerOptions
 import com.google.mlkit.vision.barcode.BarcodeScanning
 import com.google.mlkit.vision.barcode.common.Barcode
 import com.google.mlkit.vision.common.InputImage
+import com.ramcosta.composedestinations.HomeScreenDestination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import it.edu.cassandroferminervi.flowschool.remote.RetrofitInstance
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
-class QrAnalyzer(private val context: Context) : 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()
@@ -29,7 +35,18 @@ class QrAnalyzer(private val context: Context) : ImageAnalysis.Analyzer {
                     barcode?.takeIf { it.isNotEmpty() }
                         ?.mapNotNull { it.rawValue }
                         ?.joinToString(",")
-                        ?.let { Toast.makeText(context, it, Toast.LENGTH_SHORT).show() }
+                        ?.let {
+                            CoroutineScope(Dispatchers.Main).launch {
+                                val response = RetrofitInstance.api.postPresence(token, it)
+                                val resBody = response.body()
+
+                                if (resBody != null && resBody.success) {
+                                        navigator.navigate(HomeScreenDestination(token))
+                                } else {
+                                    Toast.makeText(context, "Errore", Toast.LENGTH_LONG).show()
+                                }
+                            }
+                        }
                 }.addOnCompleteListener {
                     imageProxy.close()
                 }

build.gradle.kts

@@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.3.1" apply false
+    id("com.android.application") version "8.3.2" apply false
     id("org.jetbrains.kotlin.android") version "1.9.0" apply false
 }