fmt

app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/HomeScreen.kt

@@ -79,15 +79,13 @@ fun HomeScreen(padding: PaddingValues, model: HomeViewModel = viewModel()) {
 
     if (creationRequest) {
         CreationDialog(
-            dismiss = model::dismissCreation,
+            dismiss = model::dismissCreation, model = model
-            model = model
         )
     }
 
     if (importationRequest) {
         ImportDialog(
-            dismiss = model::dismissImportation,
+            dismiss = model::dismissImportation, model = model
-            model = model
         )
     }
 
@@ -104,15 +102,13 @@ fun HomeScreen(padding: PaddingValues, model: HomeViewModel = viewModel()) {
     }
 
     Column(
-        modifier = Modifier.padding(padding),
+        modifier = Modifier.padding(padding), horizontalAlignment = Alignment.CenterHorizontally
-        horizontalAlignment = Alignment.CenterHorizontally
     ) {
         ShowList(setOfQuestions, currentSelection, model::updateSelection)
 
         ActionRow(context, model)
 
-        Button(
+        Button(onClick = { Toast.makeText(context, "Start", Toast.LENGTH_SHORT).show() }) {
-            onClick = { Toast.makeText(context, "Start", Toast.LENGTH_SHORT).show() }) {
             Text(text = context.getString(R.string.main_button_start), fontSize = 30.sp)
         }
 
@@ -124,12 +120,10 @@ fun HomeScreen(padding: PaddingValues, model: HomeViewModel = viewModel()) {
 
 @Composable
 private fun DeleteRow(
-    context: Context,
+    context: Context, model: HomeViewModel
-    model: HomeViewModel
 ) {
     Row(
-        modifier = Modifier.fillMaxWidth(),
+        modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center
-        horizontalArrangement = Arrangement.Center
     ) {
         Button(
             onClick = {
@@ -142,8 +136,7 @@ private fun DeleteRow(
 
         Spacer(modifier = Modifier.padding(2.dp))
 
-        Button(
+        Button(enabled = false, /*TODO: Activer uniquement quand on a qqch de sélectionner */
-            enabled = false, /*TODO: Activer uniquement quand on a qqch de sélectionner */
             onClick = {
                 (model::doAction)(ActionHome.DELETION_SELECT)
             }) {
@@ -154,8 +147,7 @@ private fun DeleteRow(
 
 @Composable
 private fun ActionRow(
-    context: Context,
+    context: Context, model: HomeViewModel
-    model: HomeViewModel
 ) {
     Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center) {
         Button(onClick = {
@@ -183,41 +175,25 @@ private fun ActionRow(
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun CreationDialog(
-    dismiss: () -> Unit,
+    dismiss: () -> Unit, model: HomeViewModel = viewModel()
-    model: HomeViewModel = viewModel()
 ) {
     val sujet by model.sujet
 
-    AlertDialog(
+    AlertDialog(onDismissRequest = dismiss, title = { Text(text = "Créer un sujet") }, text = {
-        onDismissRequest = dismiss,
+        OutlinedTextField(
-        title = { Text(text = "Créer un sujet") },
+            sujet, label = { Text("Nouveau sujet") }, onValueChange = model::onSujetChange
-        text = {
+        )
-            OutlinedTextField(
+    }, confirmButton = {
-                sujet,
+        Button(onClick = model::addSet, content = { Text("Ajouter") })
-                label = { Text("Nouveau sujet") },
+    }, dismissButton = {
-                onValueChange = model::onSujetChange
+        Button(onClick = dismiss, content = { Text("Annuler") })
-            )
+    })
-        },
-        confirmButton = {
-            Button(
-                onClick = model::addSet,
-                content = { Text("Ajouter") }
-            )
-        },
-        dismissButton = {
-            Button(
-                onClick = dismiss,
-                content = { Text("Annuler") }
-            )
-        }
-    )
 }
 
 @OptIn(ExperimentalMaterial3Api::class, DelicateCoroutinesApi::class)
 @Composable
 fun ImportDialog(
-    dismiss: () -> Unit,
+    dismiss: () -> Unit, model: HomeViewModel
-    model: HomeViewModel
 ) {
     val (selectedOption, onOptionSelected) = remember { mutableStateOf(ActionImport.FILE) }
 
@@ -233,8 +209,7 @@ fun ImportDialog(
         }
     }
 
-    AlertDialog(
+    AlertDialog(onDismissRequest = dismiss,
-        onDismissRequest = dismiss,
         title = { Text(text = "Importer un jeu de question") },
         text = {
             Column {
@@ -251,8 +226,7 @@ fun ImportDialog(
                             verticalAlignment = Alignment.CenterVertically,
                         ) {
                             RadioButton(
-                                selected = (text == selectedOption),
+                                selected = (text == selectedOption), onClick = null
-                                onClick = null
                             )
                             Text(
                                 text = text.toString(),
@@ -261,17 +235,14 @@ fun ImportDialog(
                             )
 
                             if (text == ActionImport.FILE) {
-                                Button(
+                                Button(enabled = selectedOption == ActionImport.FILE,
-                                    enabled = selectedOption == ActionImport.FILE,
                                     modifier = Modifier.padding(start = 16.dp),
                                     onClick = {
                                         filePickerLauncher.launch(
-                                            Intent(Intent.ACTION_OPEN_DOCUMENT)
+                                            Intent(Intent.ACTION_OPEN_DOCUMENT).addCategory(Intent.CATEGORY_OPENABLE)
-                                                .addCategory(Intent.CATEGORY_OPENABLE)
                                                 .setType("*/*")
                                         )
-                                    }
+                                    }) {
-                                ) {
                                     Text(
                                         text = "Explorateur",
                                         style = MaterialTheme.typography.labelSmall
@@ -282,52 +253,38 @@ fun ImportDialog(
                     }
                 }
 
-                OutlinedTextField(
+                OutlinedTextField(enabled = selectedOption == ActionImport.INTERNET,
-                    enabled = selectedOption == ActionImport.INTERNET,
                     value = lien,
                     onValueChange = { newTextValue -> lien = newTextValue },
-                    label = { Text(text = "Lien") }
+                    label = { Text(text = "Lien") })
-                )
             }
         },
         confirmButton = {
-            Button(
+            Button(onClick = { GlobalScope.launch { model.import(ctx, lien) } },
-                onClick = { GlobalScope.launch { model.import(ctx, lien) } },
+                content = { Text("Importer") })
-                content = { Text("Importer") }
-            )
         },
         dismissButton = {
-            Button(
+            Button(onClick = dismiss, content = { Text("Annuler") })
-                onClick = dismiss,
+        })
-                content = { Text("Annuler") }
-            )
-        }
-    )
 }
 
 @Composable
-fun ErrorDialog(errMsg: String, dismiss: () -> Unit) =
+fun ErrorDialog(errMsg: String, dismiss: () -> Unit) = AlertDialog(onDismissRequest = dismiss,
-    AlertDialog(onDismissRequest = dismiss,
+    title = { Text(text = "Erreur") },
-        title = { Text(text = "Erreur") },
+    text = { Text(text = errMsg) },
-        text = { Text(text = errMsg) },
+    confirmButton = { Button(onClick = dismiss) { Text(text = "Ok") } })
-        confirmButton = { Button(onClick = dismiss) { Text(text = "Ok") } }
-    )
 
 @Composable
-fun DeletionDialog(dismiss: () -> Unit) =
+fun DeletionDialog(dismiss: () -> Unit) = AlertDialog(onDismissRequest = dismiss,
-    AlertDialog(onDismissRequest = dismiss,
+    title = { Text(text = "Supprimer un jeu de question") },
-        title = { Text(text = "Supprimer un jeu de question") },
+    text = { Text(text = "Voulez-vous supprimer ce jeu de question ?") },
-        text = { Text(text = "Voulez-vous supprimer ce jeu de question ?") },
+    confirmButton = { Button(onClick = dismiss) { Text(text = "Ok") } })
-        confirmButton = { Button(onClick = dismiss) { Text(text = "Ok") } }
-    )
 
 @Composable
-fun DeletionDBDialog(dismiss: () -> Unit) =
+fun DeletionDBDialog(dismiss: () -> Unit) = AlertDialog(onDismissRequest = dismiss,
-    AlertDialog(onDismissRequest = dismiss,
+    title = { Text(text = "Supprimer la base de données") },
-        title = { Text(text = "Supprimer la base de données") },
+    text = { Text(text = "Voulez-vous supprimer la base de données ?") },
-        text = { Text(text = "Voulez-vous supprimer la base de données ?") },
+    confirmButton = { Button(onClick = dismiss) { Text(text = "Ok") } })
-        confirmButton = { Button(onClick = dismiss) { Text(text = "Ok") } }
-    )
 
 @Composable
 fun ShowList(
@@ -336,8 +293,7 @@ fun ShowList(
     updateSelection: (SetQuestions) -> Unit
 ) {
     LazyColumn(
-        Modifier
+        Modifier.fillMaxHeight(0.6f)
-            .fillMaxHeight(0.6f)
     ) {
         itemsIndexed(sets) { index, item ->
             ListItem(index, item, currentSelection, updateSelection)
@@ -365,8 +321,7 @@ fun ListItem(
         colors = CardDefaults.cardColors(containerColor)
     ) {
         Row(
-            modifier = Modifier.fillMaxWidth(),
+            modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceEvenly
-            horizontalArrangement = Arrangement.SpaceEvenly
         ) {
             Text(set.toString(), modifier = Modifier.padding(2.dp))
         }

app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/MainActivity.kt

@@ -35,8 +35,7 @@ class MainActivity : ComponentActivity() {
             MemorisationApplicationTheme {
                 // A surface container using the 'background' color from the theme
                 Surface(
-                    modifier = Modifier.fillMaxSize(),
+                    modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background
-                    color = MaterialTheme.colorScheme.background
                 ) {
                     MainScreenMainActivity()
                 }
@@ -61,8 +60,7 @@ fun MainScreenActivityPreview() {
 fun MainScreen() {
     val navController = rememberNavController()
 
-    Scaffold(topBar = { TopBar() },
+    Scaffold(topBar = { TopBar() }, bottomBar = { BottomBar(navController) }) { padding ->
-        bottomBar = { BottomBar(navController) }) { padding ->
         NavHost(
             navController = navController,
             startDestination = HOME,
@@ -77,13 +75,12 @@ fun MainScreen() {
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun TopBar() =
+fun TopBar() = CenterAlignedTopAppBar(title = {
-    CenterAlignedTopAppBar(title = {
+    Text(
-        Text(
+        text = LocalContext.current.getString(R.string.app_name),
-            text = LocalContext.current.getString(R.string.app_name),
+        style = MaterialTheme.typography.displayMedium
-            style = MaterialTheme.typography.displayMedium
+    )
-        )
+})
-    })
 
 @Composable
 fun BottomBar(navController: NavHostController) =
@@ -91,15 +88,12 @@ fun BottomBar(navController: NavHostController) =
         val navBackStackEntry by navController.currentBackStackEntryAsState()
         val currentRoute = navBackStackEntry?.destination?.route
 
-        BottomNavigationItem(
+        BottomNavigationItem(selected = currentRoute == HOME, onClick = {
-            selected = currentRoute == HOME,
+            navController.navigate(HOME) { launchSingleTop = true }
-            onClick = {
+        }, icon = {
-                navController.navigate(HOME) { launchSingleTop = true }
+            Icon(
-            },
+                imageVector = Icons.Default.Home,
-            icon = {
+                contentDescription = LocalContext.current.getString(R.string.home_button)
-                Icon(
+            )
-                    imageVector = Icons.Default.Home,
+        })
-                    contentDescription = LocalContext.current.getString(R.string.home_button)
-                )
-            })
     }

app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/data/Question.kt

@@ -5,14 +5,12 @@ import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
 
 @Entity(
-    foreignKeys = [
+    foreignKeys = [ForeignKey(
-        ForeignKey(
+        entity = SetQuestions::class,
-            entity = SetQuestions::class,
+        parentColumns = ["idSet"],
-            parentColumns = ["idSet"],
+        childColumns = ["setId"],
-            childColumns = ["setId"],
+        onDelete = ForeignKey.CASCADE
-            onDelete = ForeignKey.CASCADE
+    )]
-        )
-    ]
 )
 data class Question(
     @PrimaryKey(autoGenerate = true) val idQuestion: Int = 0,

app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/data/QuestionsDB.kt

@@ -18,9 +18,8 @@ abstract class QuestionsDB : RoomDatabase() {
 
         fun getDataBase(c: Context): QuestionsDB {
             if (instance != null) return instance!!
-            val db =
+            val db = Room.databaseBuilder(c.applicationContext, QuestionsDB::class.java, "memo")
-                Room.databaseBuilder(c.applicationContext, QuestionsDB::class.java, "memo")
+                .fallbackToDestructiveMigration().build()
-                    .fallbackToDestructiveMigration().build()
             instance = db
             return instance!!
         }

app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/data/SetOfQuestions.kt

@@ -4,12 +4,9 @@ import androidx.room.Embedded
 import androidx.room.Relation
 
 data class SetOfQuestions(
-    @Embedded val set: SetQuestions,
+    @Embedded val set: SetQuestions, @Relation(
-    @Relation(
+        parentColumn = "idSet", entityColumn = "setId"
-        parentColumn = "idSet",
+    ) val questions: List<Question>
-        entityColumn = "setId"
-    )
-    val questions: List<Question>
 ) {
     override fun toString() = set.name
 }

app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/data/Sets.kt

@@ -7,19 +7,16 @@ import androidx.room.Index
 @Entity(
     indices = [Index(value = ["idQuestion"])],
     primaryKeys = ["idSet", "idQuestion"],
-    foreignKeys = [
+    foreignKeys = [ForeignKey(
-        ForeignKey(
+        entity = SetQuestions::class,
-            entity = SetQuestions::class,
+        parentColumns = ["idSet"],
-            parentColumns = ["idSet"],
+        childColumns = ["idSet"],
-            childColumns = ["idSet"],
+        onDelete = ForeignKey.CASCADE
-            onDelete = ForeignKey.CASCADE
+    ), ForeignKey(
-        ),
+        entity = Question::class,
-        ForeignKey(
+        parentColumns = ["idQuestion"],
-            entity = Question::class,
+        childColumns = ["idQuestion"],
-            parentColumns = ["idQuestion"],
+        onDelete = ForeignKey.CASCADE
-            childColumns = ["idQuestion"],
+    )]
-            onDelete = ForeignKey.CASCADE
-        )
-    ]
 )
 data class Sets(val idSet: Int, val idQuestion: Int)

app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/ui/ErrorsAjout.kt

@@ -1,5 +1,3 @@
 package fr.uparis.diamantkennel.memorisationapplication.ui
 
 enum class ErrorsAjout { BAD_ENTRY, DUPLICATE }
-
-class Duplicate : Exception(ErrorsAjout.DUPLICATE.toString())

app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/ui/HomeViewModel.kt

@@ -138,38 +138,36 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) {
     }
 
     suspend fun import(ctx: Context, path: String) {
-        val data =
+        val data = flow {
-            flow {
+            if (path.startsWith("content://")) {
-                if (path.startsWith("content://")) {
+                // Local file
-                    // Local file
+                val reader = BufferedReader(
-                    val reader =
+                    InputStreamReader(
-                        BufferedReader(
+                        ctx.contentResolver.openInputStream(
-                            InputStreamReader(
+                            Uri.parse(
-                                ctx.contentResolver.openInputStream(
+                                path
-                                    Uri.parse(
-                                        path
-                                    )
-                                )
                             )
                         )
+                    )
+                )
 
-                    emit(reader.use { it.readText() })
+                emit(reader.use { it.readText() })
-                } else {
+            } else {
-                    // File from internet
+                // File from internet
-                    val url = URL(path)
+                val url = URL(path)
-                    val connection = url.openConnection() as HttpURLConnection
+                val connection = url.openConnection() as HttpURLConnection
-                    connection.requestMethod = "GET"
+                connection.requestMethod = "GET"
 
-                    val inputStream = connection.inputStream
+                val inputStream = connection.inputStream
-                    val reader = BufferedReader(InputStreamReader(inputStream))
+                val reader = BufferedReader(InputStreamReader(inputStream))
 
-                    val content = reader.use { it.readText() }
+                val content = reader.use { it.readText() }
 
-                    connection.disconnect()
+                connection.disconnect()
 
-                    emit(content)
+                emit(content)
-                }
+            }
-            }.flowOn(Dispatchers.IO)
+        }.flowOn(Dispatchers.IO)
 
         dismissImportation()