diff --git a/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json index 9e26dfe..2ec6b27 100644 --- a/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json +++ b/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json @@ -1 +1 @@ -{} \ No newline at end of file +{"room-compiler-2.5.1.jar (androidx.room:room-compiler:2.5.1)":true} \ No newline at end of file diff --git a/app/build/intermediates/apk/debug/app-debug.apk b/app/build/intermediates/apk/debug/app-debug.apk index b615db1..94c3d28 100644 Binary files a/app/build/intermediates/apk/debug/app-debug.apk and b/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index c805219..ae66dfe 100644 Binary files a/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 15298fa..89ab113 100644 Binary files a/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 1e280d0..a7f80f2 100644 Binary files a/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex b/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex index d9e3a4e..d942ddd 100644 Binary files a/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex and b/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex differ diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state index 34c5496..799fc34 100644 Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state and b/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index ab53e53..e3912b6 100644 --- a/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Sat Apr 08 16:22:58 CEST 2023 +#Sat Apr 08 20:29:52 CEST 2023 iut.android.pierrepierre.app-main-7\:/drawable/limule_dead.png=/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/build/intermediates/merged_res/debug/drawable_limule_dead.png.flat iut.android.pierrepierre.app-pngs-0\:/drawable-ldpi/ic_launcher_background.png=/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/build/intermediates/merged_res/debug/drawable-ldpi_ic_launcher_background.png.flat iut.android.pierrepierre.app-main-7\:/mipmap-anydpi-v26/ic_launcher.xml=/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/build/intermediates/merged_res/debug/mipmap-anydpi-v26_ic_launcher.xml.flat diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index b45ec42..e68c758 100644 --- a/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -1,5 +1,5 @@ -androidx.startup#FF424242#FFFFFFFF#03000000#37000000 +androidx.startup#FF424242#FFFFFFFF#03000000#37000000 @@ -10040,7 +10040,7 @@ @style/Widget.Material3.PopupMenu.ContextMenu #FFBB86FC#FF6200EE#FF3700B3#FF03DAC5#FF018786#FF000000#FFFFFFFFPierre&PierreItemMole0[0%1$d:%2$s]Retour au menuTemps écoulé!Game Over!#FFBB86FC#FF6200EE#FF3700B3#FF03DAC5#FF018786#FF000000#FFFFFFFFPierre&PierreItemMole0[0%1$d:%2$s]Retour au menuTemps écoulé!Game Over! + diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 4c50990..d723367 100644 --- a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Sat Apr 08 16:23:05 CEST 2023 +#Sat Apr 08 21:37:44 CEST 2023 base.0=/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index a933fb2..337e867 100644 Binary files a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 index e608b82..45d6c51 100644 Binary files a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 and b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 differ diff --git a/app/build/intermediates/javac/debug/classes/iut/android/pierrepierre/databinding/MainActivityBinding.class b/app/build/intermediates/javac/debug/classes/iut/android/pierrepierre/databinding/MainActivityBinding.class index 7fdbfe7..ce35040 100644 Binary files a/app/build/intermediates/javac/debug/classes/iut/android/pierrepierre/databinding/MainActivityBinding.class and b/app/build/intermediates/javac/debug/classes/iut/android/pierrepierre/databinding/MainActivityBinding.class differ diff --git a/app/build/intermediates/javac/debug/classes/iut/android/pierrepierre/databinding/MoleGridBinding.class b/app/build/intermediates/javac/debug/classes/iut/android/pierrepierre/databinding/MoleGridBinding.class index f390fe8..eaa504a 100644 Binary files a/app/build/intermediates/javac/debug/classes/iut/android/pierrepierre/databinding/MoleGridBinding.class and b/app/build/intermediates/javac/debug/classes/iut/android/pierrepierre/databinding/MoleGridBinding.class differ diff --git a/app/build/intermediates/javac/debug/classes/iut/android/pierrepierre/databinding/MoleitemBinding.class b/app/build/intermediates/javac/debug/classes/iut/android/pierrepierre/databinding/MoleitemBinding.class index 0770451..821267b 100644 Binary files a/app/build/intermediates/javac/debug/classes/iut/android/pierrepierre/databinding/MoleitemBinding.class and b/app/build/intermediates/javac/debug/classes/iut/android/pierrepierre/databinding/MoleitemBinding.class differ diff --git a/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index 5207324..585db04 100644 --- a/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -76,27 +76,36 @@ 46-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:33:13-36 47 48 -49 [androidx.emoji2:emoji2:1.2.0] /home/scratch/piferreira/.gradle/caches/transforms-3/848773e611bbde5d3ec0ec3e63d01c98/transformed/emoji2-1.2.0/AndroidManifest.xml:24:9-32:20 -50 android:name="androidx.startup.InitializationProvider" -50-->[androidx.emoji2:emoji2:1.2.0] /home/scratch/piferreira/.gradle/caches/transforms-3/848773e611bbde5d3ec0ec3e63d01c98/transformed/emoji2-1.2.0/AndroidManifest.xml:25:13-67 -51 android:authorities="iut.android.pierrepierre.androidx-startup" -51-->[androidx.emoji2:emoji2:1.2.0] /home/scratch/piferreira/.gradle/caches/transforms-3/848773e611bbde5d3ec0ec3e63d01c98/transformed/emoji2-1.2.0/AndroidManifest.xml:26:13-68 -52 android:exported="false" > -52-->[androidx.emoji2:emoji2:1.2.0] /home/scratch/piferreira/.gradle/caches/transforms-3/848773e611bbde5d3ec0ec3e63d01c98/transformed/emoji2-1.2.0/AndroidManifest.xml:27:13-37 -53 [androidx.emoji2:emoji2:1.2.0] /home/scratch/piferreira/.gradle/caches/transforms-3/848773e611bbde5d3ec0ec3e63d01c98/transformed/emoji2-1.2.0/AndroidManifest.xml:29:13-31:52 -54 android:name="androidx.emoji2.text.EmojiCompatInitializer" -54-->[androidx.emoji2:emoji2:1.2.0] /home/scratch/piferreira/.gradle/caches/transforms-3/848773e611bbde5d3ec0ec3e63d01c98/transformed/emoji2-1.2.0/AndroidManifest.xml:30:17-75 -55 android:value="androidx.startup" /> -55-->[androidx.emoji2:emoji2:1.2.0] /home/scratch/piferreira/.gradle/caches/transforms-3/848773e611bbde5d3ec0ec3e63d01c98/transformed/emoji2-1.2.0/AndroidManifest.xml:31:17-49 -56 [androidx.lifecycle:lifecycle-process:2.4.1] /home/scratch/piferreira/.gradle/caches/transforms-3/a4f0fb44e9b56370f8c2ed23c9d5d030/transformed/lifecycle-process-2.4.1/AndroidManifest.xml:31:13-33:52 -57 android:name="androidx.lifecycle.ProcessLifecycleInitializer" -57-->[androidx.lifecycle:lifecycle-process:2.4.1] /home/scratch/piferreira/.gradle/caches/transforms-3/a4f0fb44e9b56370f8c2ed23c9d5d030/transformed/lifecycle-process-2.4.1/AndroidManifest.xml:32:17-78 -58 android:value="androidx.startup" /> -58-->[androidx.lifecycle:lifecycle-process:2.4.1] /home/scratch/piferreira/.gradle/caches/transforms-3/a4f0fb44e9b56370f8c2ed23c9d5d030/transformed/lifecycle-process-2.4.1/AndroidManifest.xml:33:17-49 -59 -60 -61 -62 +49 [androidx.room:room-runtime:2.5.1] /home/scratch/piferreira/.gradle/caches/transforms-3/0051acfb8a58a8c8c7c1e74e37ce8ab2/transformed/room-runtime-2.5.1/AndroidManifest.xml:24:9-28:63 +50 android:name="androidx.room.MultiInstanceInvalidationService" +50-->[androidx.room:room-runtime:2.5.1] /home/scratch/piferreira/.gradle/caches/transforms-3/0051acfb8a58a8c8c7c1e74e37ce8ab2/transformed/room-runtime-2.5.1/AndroidManifest.xml:25:13-74 +51 android:directBootAware="true" +51-->[androidx.room:room-runtime:2.5.1] /home/scratch/piferreira/.gradle/caches/transforms-3/0051acfb8a58a8c8c7c1e74e37ce8ab2/transformed/room-runtime-2.5.1/AndroidManifest.xml:26:13-43 +52 android:exported="false" /> +52-->[androidx.room:room-runtime:2.5.1] /home/scratch/piferreira/.gradle/caches/transforms-3/0051acfb8a58a8c8c7c1e74e37ce8ab2/transformed/room-runtime-2.5.1/AndroidManifest.xml:27:13-37 +53 +54 [androidx.emoji2:emoji2:1.2.0] /home/scratch/piferreira/.gradle/caches/transforms-3/848773e611bbde5d3ec0ec3e63d01c98/transformed/emoji2-1.2.0/AndroidManifest.xml:24:9-32:20 +55 android:name="androidx.startup.InitializationProvider" +55-->[androidx.emoji2:emoji2:1.2.0] /home/scratch/piferreira/.gradle/caches/transforms-3/848773e611bbde5d3ec0ec3e63d01c98/transformed/emoji2-1.2.0/AndroidManifest.xml:25:13-67 +56 android:authorities="iut.android.pierrepierre.androidx-startup" +56-->[androidx.emoji2:emoji2:1.2.0] /home/scratch/piferreira/.gradle/caches/transforms-3/848773e611bbde5d3ec0ec3e63d01c98/transformed/emoji2-1.2.0/AndroidManifest.xml:26:13-68 +57 android:exported="false" > +57-->[androidx.emoji2:emoji2:1.2.0] /home/scratch/piferreira/.gradle/caches/transforms-3/848773e611bbde5d3ec0ec3e63d01c98/transformed/emoji2-1.2.0/AndroidManifest.xml:27:13-37 +58 [androidx.emoji2:emoji2:1.2.0] /home/scratch/piferreira/.gradle/caches/transforms-3/848773e611bbde5d3ec0ec3e63d01c98/transformed/emoji2-1.2.0/AndroidManifest.xml:29:13-31:52 +59 android:name="androidx.emoji2.text.EmojiCompatInitializer" +59-->[androidx.emoji2:emoji2:1.2.0] /home/scratch/piferreira/.gradle/caches/transforms-3/848773e611bbde5d3ec0ec3e63d01c98/transformed/emoji2-1.2.0/AndroidManifest.xml:30:17-75 +60 android:value="androidx.startup" /> +60-->[androidx.emoji2:emoji2:1.2.0] /home/scratch/piferreira/.gradle/caches/transforms-3/848773e611bbde5d3ec0ec3e63d01c98/transformed/emoji2-1.2.0/AndroidManifest.xml:31:17-49 +61 [androidx.lifecycle:lifecycle-process:2.4.1] /home/scratch/piferreira/.gradle/caches/transforms-3/a4f0fb44e9b56370f8c2ed23c9d5d030/transformed/lifecycle-process-2.4.1/AndroidManifest.xml:31:13-33:52 +62 android:name="androidx.lifecycle.ProcessLifecycleInitializer" +62-->[androidx.lifecycle:lifecycle-process:2.4.1] /home/scratch/piferreira/.gradle/caches/transforms-3/a4f0fb44e9b56370f8c2ed23c9d5d030/transformed/lifecycle-process-2.4.1/AndroidManifest.xml:32:17-78 +63 android:value="androidx.startup" /> +63-->[androidx.lifecycle:lifecycle-process:2.4.1] /home/scratch/piferreira/.gradle/caches/transforms-3/a4f0fb44e9b56370f8c2ed23c9d5d030/transformed/lifecycle-process-2.4.1/AndroidManifest.xml:33:17-49 +64 +65 +66 +67 diff --git a/app/build/intermediates/merged_java_res/debug/base.jar b/app/build/intermediates/merged_java_res/debug/base.jar index 452dfd7..97f2c10 100644 Binary files a/app/build/intermediates/merged_java_res/debug/base.jar and b/app/build/intermediates/merged_java_res/debug/base.jar differ diff --git a/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml index 4311ce4..226d5f7 100644 --- a/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ b/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -46,6 +46,11 @@ android:exported="true" > + + + + + + , var progres progressBar.progress = progressBar.progress + 10 //Augmentation de la progress bar if (progressBar.progress == 100) progressBar.progressTintList = ColorStateList.valueOf(Color.WHITE) user.score += 100 - scoreDisplay.text = user.score.toString() //optimiser avec un observable ou bind ? + updateScoreDisplay() //optimiser avec un observable ou bind ? holder.img.setImageResource(MoleList[position].pdp) } else{ diff --git a/app/src/main/java/MyViewHolder.kt b/app/src/main/java/iut/android/pierrepierre/model/Adapter/MyViewHolder.kt similarity index 87% rename from app/src/main/java/MyViewHolder.kt rename to app/src/main/java/iut/android/pierrepierre/model/Adapter/MyViewHolder.kt index 0f6dcb2..c1011c2 100644 --- a/app/src/main/java/MyViewHolder.kt +++ b/app/src/main/java/iut/android/pierrepierre/model/Adapter/MyViewHolder.kt @@ -1,3 +1,5 @@ +package iut.android.pierrepierre.model.Adapter + import android.view.View import android.widget.ImageView import androidx.recyclerview.widget.RecyclerView.ViewHolder diff --git a/app/src/main/java/iut/android/pierrepierre/model/DB/DAO/UserDAO.kt b/app/src/main/java/iut/android/pierrepierre/model/DB/DAO/UserDAO.kt index 57420b5..ec9df8c 100644 --- a/app/src/main/java/iut/android/pierrepierre/model/DB/DAO/UserDAO.kt +++ b/app/src/main/java/iut/android/pierrepierre/model/DB/DAO/UserDAO.kt @@ -6,7 +6,7 @@ import iut.android.pierrepierre.model.DB.Entity.UserEntity @Dao interface UserDAO { @Insert - fun insertUser(user: UserEntity): Long + fun insertUser(user: UserEntity) @Delete fun updateUser(user: UserEntity) @@ -18,11 +18,11 @@ interface UserDAO { fun getUserById(id: String): UserEntity? @Query("SELECT score FROM user ") - fun getUserScore()//liste des scores + fun getUserScore() : Int//liste des scores @Query("SELECT nbMiss FROM user ") - fun getUserMiss()//liste des scores + fun getUserMiss() : Int//liste des scores @Query("SELECT max(score) FROM user ") - fun getUserBestScore()//list des scores + fun getUserBestScore() : Int//list des scores } \ No newline at end of file diff --git a/app/src/main/java/iut/android/pierrepierre/model/Factory/UserViewModelFactory.kt b/app/src/main/java/iut/android/pierrepierre/model/Factory/UserViewModelFactory.kt new file mode 100644 index 0000000..a80063c --- /dev/null +++ b/app/src/main/java/iut/android/pierrepierre/model/Factory/UserViewModelFactory.kt @@ -0,0 +1,15 @@ +package iut.android.pierrepierre.model.Factory + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import iut.android.pierrepierre.model.DB.DAO.UserDAO +import iut.android.pierrepierre.model.Viewmodel.UserViewModel + +class UserViewModelFactory(private val userDao: UserDAO) : ViewModelProvider.Factory { + override fun create(modelClass: Class): T { + if (modelClass.isAssignableFrom(UserViewModel::class.java)) { + return UserViewModel(userDao) as T + } + throw IllegalArgumentException("Unknown ViewModel class") + } +} diff --git a/app/src/main/java/iut/android/pierrepierre/model/fragments/MenuFragment.kt b/app/src/main/java/iut/android/pierrepierre/model/fragments/MenuFragment.kt index f04e553..8e4c85d 100644 --- a/app/src/main/java/iut/android/pierrepierre/model/fragments/MenuFragment.kt +++ b/app/src/main/java/iut/android/pierrepierre/model/fragments/MenuFragment.kt @@ -8,11 +8,15 @@ import android.view.ViewGroup import android.widget.Button import android.widget.TextView import androidx.fragment.app.Fragment +import androidx.lifecycle.lifecycleScope import iut.android.pierrepierre.R import iut.android.pierrepierre.model.Activity.MenuActivity import iut.android.pierrepierre.model.Class.User import iut.android.pierrepierre.model.DB.DAO.UserDAO import iut.android.pierrepierre.model.DB.RoomDB +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext class MenuFragment(var user : User) : Fragment() { @@ -26,8 +30,11 @@ class MenuFragment(var user : User) : Fragment() { val database = RoomDB.getInstance(requireContext()) userDao = database.userDao() - userDao.updateUserScore(user.id, user.score) - + lifecycleScope.launch { + withContext(Dispatchers.IO) { + userDao.updateUserScore(user.id, user.score) + } + } score.text= "Votre score : "+ user.score val closeButton = view.findViewById