diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 9bd5d7a..0000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ 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 b4855a6..5fd1011 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/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and /dev/null differ diff --git a/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 29d9806..ec08dde 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_number_of_buckets_file/debug/out b/app/build/intermediates/dex_number_of_buckets_file/debug/out index 62f9457..bf0d87a 100644 --- a/app/build/intermediates/dex_number_of_buckets_file/debug/out +++ b/app/build/intermediates/dex_number_of_buckets_file/debug/out @@ -1 +1 @@ -6 \ No newline at end of file +4 \ No newline at end of file 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 bbdaa85..c2cc7d7 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 @@ -#Fri Apr 07 18:47:29 CEST 2023 +#Sat Apr 08 15:09:46 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/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 e36933e..95a6258 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 @@ -27,67 +27,69 @@ 20 20-->[androidx.core:core:1.9.0] /home/scratch/piferreira/.gradle/caches/transforms-3/9baae2a0a064870b9506522ab355f7bf/transformed/core-1.9.0/AndroidManifest.xml:26:5-97 20-->[androidx.core:core:1.9.0] /home/scratch/piferreira/.gradle/caches/transforms-3/9baae2a0a064870b9506522ab355f7bf/transformed/core-1.9.0/AndroidManifest.xml:26:22-94 -21 /home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:10:5-29:19 -22 android:allowBackup="true" -22-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:11:9-35 -23 android:appComponentFactory="androidx.core.app.CoreComponentFactory" -23-->[androidx.core:core:1.9.0] /home/scratch/piferreira/.gradle/caches/transforms-3/9baae2a0a064870b9506522ab355f7bf/transformed/core-1.9.0/AndroidManifest.xml:28:18-86 -24 android:dataExtractionRules="@xml/data_extraction_rules" -24-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:12:9-65 -25 android:debuggable="true" -26 android:fullBackupContent="@xml/backup_rules" -26-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:13:9-54 -27 android:icon="@mipmap/ic_launcher" -27-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:14:9-43 -28 android:label="@string/app_name" -28-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:15:9-41 -29 android:roundIcon="@mipmap/ic_launcher_round" -29-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:16:9-54 -30 android:supportsRtl="true" -30-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:17:9-35 -31 android:testOnly="true" -32 android:theme="@style/Theme.PierrePierre" > -32-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:18:9-50 -33 /home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:21:9-27:20 -34 android:name="iut.android.pierrepierre.model.Activity.MoleGridActivity" -34-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:21:19-66 -35 android:exported="true" > -35-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:22:13-36 -36 -36-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:23:13-26:29 -37 -37-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:24:17-68 -37-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:24:25-66 -38 -39 -39-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:25:17-76 -39-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:25:27-74 -40 -41 -42 -43 [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 -44 android:name="androidx.startup.InitializationProvider" -44-->[androidx.emoji2:emoji2:1.2.0] /home/scratch/piferreira/.gradle/caches/transforms-3/848773e611bbde5d3ec0ec3e63d01c98/transformed/emoji2-1.2.0/AndroidManifest.xml:25:13-67 -45 android:authorities="iut.android.pierrepierre.androidx-startup" -45-->[androidx.emoji2:emoji2:1.2.0] /home/scratch/piferreira/.gradle/caches/transforms-3/848773e611bbde5d3ec0ec3e63d01c98/transformed/emoji2-1.2.0/AndroidManifest.xml:26:13-68 -46 android:exported="false" > -46-->[androidx.emoji2:emoji2:1.2.0] /home/scratch/piferreira/.gradle/caches/transforms-3/848773e611bbde5d3ec0ec3e63d01c98/transformed/emoji2-1.2.0/AndroidManifest.xml:27:13-37 -47 [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 -48 android:name="androidx.emoji2.text.EmojiCompatInitializer" -48-->[androidx.emoji2:emoji2:1.2.0] /home/scratch/piferreira/.gradle/caches/transforms-3/848773e611bbde5d3ec0ec3e63d01c98/transformed/emoji2-1.2.0/AndroidManifest.xml:30:17-75 -49 android:value="androidx.startup" /> -49-->[androidx.emoji2:emoji2:1.2.0] /home/scratch/piferreira/.gradle/caches/transforms-3/848773e611bbde5d3ec0ec3e63d01c98/transformed/emoji2-1.2.0/AndroidManifest.xml:31:17-49 -50 [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 -51 android:name="androidx.lifecycle.ProcessLifecycleInitializer" -51-->[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 -52 android:value="androidx.startup" /> -52-->[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 -53 -54 -55 -56 +21 +22 +23 /home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:13:5-32:19 +24 android:allowBackup="true" +24-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:14:9-35 +25 android:appComponentFactory="androidx.core.app.CoreComponentFactory" +25-->[androidx.core:core:1.9.0] /home/scratch/piferreira/.gradle/caches/transforms-3/9baae2a0a064870b9506522ab355f7bf/transformed/core-1.9.0/AndroidManifest.xml:28:18-86 +26 android:dataExtractionRules="@xml/data_extraction_rules" +26-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:15:9-65 +27 android:debuggable="true" +28 android:fullBackupContent="@xml/backup_rules" +28-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:16:9-54 +29 android:icon="@mipmap/ic_launcher" +29-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:17:9-43 +30 android:label="@string/app_name" +30-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:18:9-41 +31 android:roundIcon="@mipmap/ic_launcher_round" +31-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:19:9-54 +32 android:supportsRtl="true" +32-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:20:9-35 +33 android:testOnly="true" +34 android:theme="@style/Theme.PierrePierre" > +34-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:21:9-50 +35 /home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:24:9-30:20 +36 android:name="iut.android.pierrepierre.model.Activity.MoleGridActivity" +36-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:24:19-66 +37 android:exported="true" > +37-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:25:13-36 +38 +38-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:26:13-29:29 +39 +39-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:27:17-68 +39-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:27:25-66 +40 +41 +41-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:28:17-76 +41-->/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/AndroidManifest.xml:28:27-74 +42 +43 +44 +45 [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 +46 android:name="androidx.startup.InitializationProvider" +46-->[androidx.emoji2:emoji2:1.2.0] /home/scratch/piferreira/.gradle/caches/transforms-3/848773e611bbde5d3ec0ec3e63d01c98/transformed/emoji2-1.2.0/AndroidManifest.xml:25:13-67 +47 android:authorities="iut.android.pierrepierre.androidx-startup" +47-->[androidx.emoji2:emoji2:1.2.0] /home/scratch/piferreira/.gradle/caches/transforms-3/848773e611bbde5d3ec0ec3e63d01c98/transformed/emoji2-1.2.0/AndroidManifest.xml:26:13-68 +48 android:exported="false" > +48-->[androidx.emoji2:emoji2:1.2.0] /home/scratch/piferreira/.gradle/caches/transforms-3/848773e611bbde5d3ec0ec3e63d01c98/transformed/emoji2-1.2.0/AndroidManifest.xml:27:13-37 +49 [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 +50 android:name="androidx.emoji2.text.EmojiCompatInitializer" +50-->[androidx.emoji2:emoji2:1.2.0] /home/scratch/piferreira/.gradle/caches/transforms-3/848773e611bbde5d3ec0ec3e63d01c98/transformed/emoji2-1.2.0/AndroidManifest.xml:30:17-75 +51 android:value="androidx.startup" /> +51-->[androidx.emoji2:emoji2:1.2.0] /home/scratch/piferreira/.gradle/caches/transforms-3/848773e611bbde5d3ec0ec3e63d01c98/transformed/emoji2-1.2.0/AndroidManifest.xml:31:17-49 +52 [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 +53 android:name="androidx.lifecycle.ProcessLifecycleInitializer" +53-->[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 +54 android:value="androidx.startup" /> +54-->[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 +55 +56 +57 +58 diff --git a/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml index b7e7b56..14b84c1 100644 --- a/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ b/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -18,6 +18,8 @@ android:protectionLevel="signature" /> + + + + + + ) { moleUpdateJob = lifecycleScope.launch { // Boucle pour mettre à jour les moles aléatoirement pendant 5 secondes - val endTime = System.currentTimeMillis() + 60000 //durée de 5s - while (System.currentTimeMillis() < endTime) { - // Mettre à jour une taupe aléatoire - if (!allListAlive(moleList)){ - var index = Random.nextInt(0, 11)//(0 until moleList.size).random() - if (!moleList[index].isDead()) { - while (!moleList[index].isDead()) { - index = Random.nextInt(0, 11)//(0 until moleList.size).random() +// val endTime = System.currentTimeMillis() + 60000 //durée de 5s +// while (System.currentTimeMillis() < endTime) { +// // Mettre à jour une taupe aléatoire +// if (!allListAlive(moleList)){ +// var index = Random.nextInt(0, 11)//(0 until moleList.size).random() +// if (!moleList[index].isDead()) { +// while (!moleList[index].isDead()) { +// index = Random.nextInt(0, 11)//(0 until moleList.size).random() +// } +// } +// moleList[index].changeState() +// moleList[index].onMoleStateChanged(moleList[index]) +// Log.d("index", index.toString()) +// +// //reset dans 3s +// launchMoleDisappearCoroutine(moleList[index]) +// } +// // Attendre un court moment avant de mettre à jour une autre taupe +// delay(1000) +// } + + moleUpdateJob = lifecycleScope.launch { + // Boucle pour mettre à jour les moles aléatoirement pendant 5 secondes + val endTime = System.currentTimeMillis() + 60000 //durée de 60s + var atLeastOneDead = false // variable pour vérifier si au moins une taupe est morte + while (System.currentTimeMillis() < endTime) { + // Mettre à jour une taupe aléatoire + if (atLeastOneDead || !allListAlive(moleList)){ + var deadMoles = moleList.filter { it.isDead() } // filtrer les taupes mortes uniquement + if (deadMoles.isNotEmpty()) { + var index = Random.nextInt(0, deadMoles.size) + moleList[moleList.indexOf(deadMoles[index])].changeState() + moleList[moleList.indexOf(deadMoles[index])].onMoleStateChanged(moleList[moleList.indexOf(deadMoles[index])]) + atLeastOneDead = false // réinitialiser la variable atLeastOneDead à false + launchMoleDisappearCoroutine(moleList[moleList.indexOf(deadMoles[index])]) + } else { + atLeastOneDead = true // mettre la variable atLeastOneDead à true s'il n'y a pas de taupe morte } } - moleList[index].changeState() - moleList[index].onMoleStateChanged(moleList[index]) - Log.d("index", index.toString()) - - //reset dans 3s - launchMoleDisappearCoroutine(moleList[index]) + // Attendre un court moment avant de mettre à jour une autre taupe + delay(1000) } - // Attendre un court moment avant de mettre à jour une autre taupe - delay(1000) } } } diff --git a/app/src/main/java/iut/android/pierrepierre/model/Class/Mole.kt b/app/src/main/java/iut/android/pierrepierre/model/Class/Mole.kt index 8638877..4a8cc17 100644 --- a/app/src/main/java/iut/android/pierrepierre/model/Class/Mole.kt +++ b/app/src/main/java/iut/android/pierrepierre/model/Class/Mole.kt @@ -37,6 +37,7 @@ public class Mole (var dead : Boolean) : MoleObserver{ } + //FIXME dangereux fun changeState(){ if(pdp == R.drawable.limule) pdp = R.drawable.limule_dead else pdp = R.drawable.limule;