mariano/flowschool-mobile-application
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 10 Wiki Activity

Compare commits

base: mariano:master
Branches Tags
mariano:master
mariano:ui
mariano:2024-05-03
mariano:2024-04-14
mariano:2024-04-13
mariano:2024-04-12
mariano:2024-04-11
mariano:2024-03-01
mariano:2024-02-29
mariano:2024-04-26
mariano:2024-02-25
mariano:2024-02-24
..
compare: mariano:2024-04-12
Branches Tags
mariano:master
mariano:ui
mariano:2024-05-03
mariano:2024-04-14
mariano:2024-04-13
mariano:2024-04-12
mariano:2024-04-11
mariano:2024-03-01
mariano:2024-02-29
mariano:2024-04-26
mariano:2024-02-25
mariano:2024-02-24

No commits in common. "master" and "2024-04-12" have entirely different histories.
master ... 2024-04-12

8 changed files with 19 additions and 116 deletions
Show Stats Expand all files Collapse all files

3
.idea/misc.xml
View File

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

2
.idea/vcs.xml
View File

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

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

@ -1,7 +1,6 @@
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
@ -18,17 +17,14 @@ interface ApiService {
@FormUrlEncoded
@POST("presenza.php")
suspend fun postPresence(
@Field("token") token: String,
@Field("codice") qrcode: String
): Response<PresenceResult>
suspend fun postPresence(@Field("token") token: String): Response<Boolean>
@FormUrlEncoded
@POST("lista.php")
suspend fun postTeacherList(@Field("token") token: String): Response<List<TeacherInfoResult>>
@FormUrlEncoded
@POST("ottieni_prof.php")
@POST("ricerca.php")
suspend fun postTeacherInfo(
@Field("token") token: String,
@Field("profId") teacherId: Int

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

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

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

@ -14,11 +14,10 @@ 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(navigator: DestinationsNavigator, token: String) {
fun CameraScreen() {
val localContext = LocalContext.current
val lifecycleOwner = LocalLifecycleOwner.current
val cameraProviderFuture = remember {
@ -38,7 +37,7 @@ fun CameraScreen(navigator: DestinationsNavigator, token: String) {
val imageAnalysis = ImageAnalysis.Builder().build()
imageAnalysis.setAnalyzer(
ContextCompat.getMainExecutor(context),
QrAnalyzer(context, navigator, token)
QrAnalyzer(context)
)
runCatching {

81
app/src/main/java/it/edu/cassandroferminervi/flowschool/screens/HomeScreen.kt
View File

@ -1,18 +1,12 @@
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
@ -30,79 +24,18 @@ fun HomeScreen(navigator: DestinationsNavigator, token: String) {
verticalArrangement = Arrangement.Center,
modifier = Modifier
.fillMaxSize()
.padding(horizontal = 50.dp)
) {
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 = {
Button(onClick = {
navigator.navigate(PermissionScreenDestination(token))
}, modifier = Modifier
.align(Alignment.BottomEnd)
.padding(16.dp)
) {
Text("Prosegui")
}
}
}, modifier = Modifier.align(Alignment.CenterHorizontally)) {
Text("Scannerizza codice QR")
}
Spacer(modifier = Modifier.height(8.dp))
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 = {
Button(onClick = {
navigator.navigate(SearchingScreenDestination(token))
}, modifier = Modifier
.align(Alignment.BottomEnd)
.padding(16.dp)
) {
Text("Prosegui")
}
}
}, modifier = Modifier.align(Alignment.CenterHorizontally)) {
Text("Cerca professore")
}
}
}

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

@ -12,16 +12,15 @@ 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(navigator: DestinationsNavigator, token: String) {
fun PermissionScreen(token: String) {
val cameraPermissionState = rememberPermissionState(android.Manifest.permission.CAMERA)
if (cameraPermissionState.status.isGranted) {
CameraScreen(navigator, token)
CameraScreen()
} else {
Box(
contentAlignment = Alignment.Center,

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

@ -9,14 +9,8 @@ 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, private val navigator: DestinationsNavigator, val token: String) : ImageAnalysis.Analyzer {
class QrAnalyzer(private val context: Context) : ImageAnalysis.Analyzer {
private val options = BarcodeScannerOptions.Builder()
.setBarcodeFormats(Barcode.FORMAT_QR_CODE)
.build()
@ -35,18 +29,7 @@ class QrAnalyzer(private val context: Context, private val navigator: Destinatio
barcode?.takeIf { it.isNotEmpty() }
?.mapNotNull { it.rawValue }
?.joinToString(",")
?.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()
}
}
}
?.let { Toast.makeText(context, it, Toast.LENGTH_SHORT).show() }
}.addOnCompleteListener {
imageProxy.close()
}