diff --git a/.gradle/7.4/executionHistory/executionHistory.bin b/.gradle/7.4/executionHistory/executionHistory.bin index b32137f..919d8c7 100644 Binary files a/.gradle/7.4/executionHistory/executionHistory.bin and b/.gradle/7.4/executionHistory/executionHistory.bin differ diff --git a/.gradle/7.4/executionHistory/executionHistory.lock b/.gradle/7.4/executionHistory/executionHistory.lock index 250333a..fb68559 100644 Binary files a/.gradle/7.4/executionHistory/executionHistory.lock and b/.gradle/7.4/executionHistory/executionHistory.lock differ diff --git a/.gradle/7.4/fileHashes/fileHashes.bin b/.gradle/7.4/fileHashes/fileHashes.bin index bd96f64..e46bbcd 100644 Binary files a/.gradle/7.4/fileHashes/fileHashes.bin and b/.gradle/7.4/fileHashes/fileHashes.bin differ diff --git a/.gradle/7.4/fileHashes/fileHashes.lock b/.gradle/7.4/fileHashes/fileHashes.lock index beeaf79..edb9473 100644 Binary files a/.gradle/7.4/fileHashes/fileHashes.lock and b/.gradle/7.4/fileHashes/fileHashes.lock differ diff --git a/.gradle/7.4/fileHashes/resourceHashesCache.bin b/.gradle/7.4/fileHashes/resourceHashesCache.bin index 29244c4..eff125f 100644 Binary files a/.gradle/7.4/fileHashes/resourceHashesCache.bin and b/.gradle/7.4/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 587a781..c1f2b2b 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/app/build/intermediates/apk/debug/app-debug.apk b/app/build/intermediates/apk/debug/app-debug.apk index 0f1b88f..8fd09cc 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/dex/debug/mergeDexDebug/classes.dex b/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index cb22c7b..c7b4ae9 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/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index ff78f5e..a463f50 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 Mar 31 16:41:03 CEST 2023 +#Fri Mar 31 17:27:07 CEST 2023 base.0=/home/UCA/piferreira/2A/Android/ProjetAndroid/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/iut/android/pierrepierre/MoleGridActivity$onResume$1.dex b/app/build/intermediates/project_dex_archive/debug/out/iut/android/pierrepierre/MoleGridActivity$onResume$1.dex index a39fced..60750c9 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/iut/android/pierrepierre/MoleGridActivity$onResume$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/iut/android/pierrepierre/MoleGridActivity$onResume$1.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/iut/android/pierrepierre/MoleGridActivity$onResume$2.dex b/app/build/intermediates/project_dex_archive/debug/out/iut/android/pierrepierre/MoleGridActivity$onResume$2.dex index 69e967a..c343cfc 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/iut/android/pierrepierre/MoleGridActivity$onResume$2.dex and b/app/build/intermediates/project_dex_archive/debug/out/iut/android/pierrepierre/MoleGridActivity$onResume$2.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/iut/android/pierrepierre/MoleGridActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/iut/android/pierrepierre/MoleGridActivity.dex index ba3994e..ffea032 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/iut/android/pierrepierre/MoleGridActivity.dex and b/app/build/intermediates/project_dex_archive/debug/out/iut/android/pierrepierre/MoleGridActivity.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/iut/android/pierrepierre/MyGridAdapter.dex b/app/build/intermediates/project_dex_archive/debug/out/iut/android/pierrepierre/MyGridAdapter.dex index 0e2e769..c3cd23d 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/iut/android/pierrepierre/MyGridAdapter.dex and b/app/build/intermediates/project_dex_archive/debug/out/iut/android/pierrepierre/MyGridAdapter.dex differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab index 1e38b85..9c79f56 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at index 4e7937d..7ace608 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab index 331aed7..2b89470 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at index f5ff014..90a102a 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab index 6f58c43..6d2b951 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at index b4455eb..01f5912 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab index 5a3a663..2b05bb8 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at index 6372e75..aeacb22 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab index deb6734..cd62520 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at index b1f9f64..3cdf48c 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab index e786a4f..f13aa0f 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at index 8ff5738..a9718ee 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab index ef8dad5..02ba11e 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at index 47fe516..6a3c578 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab index 4d02e80..8ec44a5 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at index 007cc51..73fe9e6 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab index a2d8d51..b14b01c 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at index 1f81e8f..30f82b6 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab index 0a959cc..e6f75c7 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream index 2459ed6..afd1b6e 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len index 379d85c..9a6f654 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len index 817b326..eb0b8a0 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at index b4455eb..01f5912 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i index 0667ccd..cdf4c62 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab index 50b7b81..5b16e38 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream index 6ec8dc0..de2d079 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len index fb572dd..45f2b83 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.len b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.len index de6619b..897d578 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.len and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.len differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values new file mode 100644 index 0000000..05c1e7e Binary files /dev/null and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at index 0c131cd..6be9c08 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.s b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.s new file mode 100644 index 0000000..7fa3f48 --- /dev/null +++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.s @@ -0,0 +1 @@ +ÏCùMûN \ No newline at end of file diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab_i b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab_i index 7f8d019..461187a 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab_i and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab_i differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/last-build.bin b/app/build/kotlin/compileDebugKotlin/cacheable/last-build.bin index cef691b..985bf4b 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/last-build.bin and b/app/build/kotlin/compileDebugKotlin/cacheable/last-build.bin differ diff --git a/app/build/kotlin/compileDebugKotlin/local-state/build-history.bin b/app/build/kotlin/compileDebugKotlin/local-state/build-history.bin index 8e9acd2..e46ef2c 100644 Binary files a/app/build/kotlin/compileDebugKotlin/local-state/build-history.bin and b/app/build/kotlin/compileDebugKotlin/local-state/build-history.bin differ diff --git a/app/build/tmp/kotlin-classes/debug/iut/android/pierrepierre/MoleGridActivity$onResume$1.class b/app/build/tmp/kotlin-classes/debug/iut/android/pierrepierre/MoleGridActivity$onResume$1.class index eab04a1..8046dd9 100644 Binary files a/app/build/tmp/kotlin-classes/debug/iut/android/pierrepierre/MoleGridActivity$onResume$1.class and b/app/build/tmp/kotlin-classes/debug/iut/android/pierrepierre/MoleGridActivity$onResume$1.class differ diff --git a/app/build/tmp/kotlin-classes/debug/iut/android/pierrepierre/MoleGridActivity$onResume$2.class b/app/build/tmp/kotlin-classes/debug/iut/android/pierrepierre/MoleGridActivity$onResume$2.class index 0f8a8b6..dcc0348 100644 Binary files a/app/build/tmp/kotlin-classes/debug/iut/android/pierrepierre/MoleGridActivity$onResume$2.class and b/app/build/tmp/kotlin-classes/debug/iut/android/pierrepierre/MoleGridActivity$onResume$2.class differ diff --git a/app/build/tmp/kotlin-classes/debug/iut/android/pierrepierre/MoleGridActivity.class b/app/build/tmp/kotlin-classes/debug/iut/android/pierrepierre/MoleGridActivity.class index a71dbfc..f5d9982 100644 Binary files a/app/build/tmp/kotlin-classes/debug/iut/android/pierrepierre/MoleGridActivity.class and b/app/build/tmp/kotlin-classes/debug/iut/android/pierrepierre/MoleGridActivity.class differ diff --git a/app/build/tmp/kotlin-classes/debug/iut/android/pierrepierre/MyGridAdapter.class b/app/build/tmp/kotlin-classes/debug/iut/android/pierrepierre/MyGridAdapter.class index f516913..ec73bdb 100644 Binary files a/app/build/tmp/kotlin-classes/debug/iut/android/pierrepierre/MyGridAdapter.class and b/app/build/tmp/kotlin-classes/debug/iut/android/pierrepierre/MyGridAdapter.class differ diff --git a/app/src/main/java/iut/android/pierrepierre/Mole.kt b/app/src/main/java/iut/android/pierrepierre/Mole.kt index 93a5034..daeafa6 100644 --- a/app/src/main/java/iut/android/pierrepierre/Mole.kt +++ b/app/src/main/java/iut/android/pierrepierre/Mole.kt @@ -2,7 +2,7 @@ package iut.android.pierrepierre public class Mole (var dead : Boolean){ - var nbPoint = 0 + var nbPoint = 0 //recompter tout les points avec cette attribut ? var pdp = R.drawable.limule diff --git a/app/src/main/java/iut/android/pierrepierre/MoleGridActivity.kt b/app/src/main/java/iut/android/pierrepierre/MoleGridActivity.kt index 2fde1cb..23d3982 100644 --- a/app/src/main/java/iut/android/pierrepierre/MoleGridActivity.kt +++ b/app/src/main/java/iut/android/pierrepierre/MoleGridActivity.kt @@ -30,9 +30,6 @@ class MoleGridActivity : AppCompatActivity() { private val sensorManager by lazy { getSystemService(Context.SENSOR_SERVICE) as SensorManager } private lateinit var sensorEventListener: SensorEventListener - //private var value = 0 - - //Countdown private lateinit var countDownTimer: CountDownTimer private lateinit var DisplaycountDownTimer: TextView @@ -51,26 +48,20 @@ class MoleGridActivity : AppCompatActivity() { super.onResume() - val MoleName = arrayOf( - "Mole1", "Mole2", "Mole3", "Mole4", - "Mole5", "Mole6", "Mole7", "Mole8", "Mole9", "Mole10", "Mole11", "Mole12" + val MoleList = arrayOf( //12 taupes + Mole(false), + Mole(false), + Mole(false), + Mole(false), + Mole(false), + Mole(false), + Mole(false), + Mole(false), + Mole(false), + Mole(false), + Mole(false), + Mole(false) ) - val MoleImages = intArrayOf( // au cas ou on change les images de chaque taupes - R.drawable.limule, - R.drawable.limule, - R.drawable.limule, - R.drawable.limule, - R.drawable.limule, - R.drawable.limule, - R.drawable.limule, - R.drawable.limule, - R.drawable.limule, - R.drawable.limule, - R.drawable.limule, - R.drawable.limule - ) - - val shakeSensor = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER) @@ -86,13 +77,17 @@ class MoleGridActivity : AppCompatActivity() { // Si l'accélération est supérieure à 12, et que la progresse bar est au maximum, la progressBar est réinitialisée à 0 if (acceleration > 12 && progressBar.progress == 100) { progressBar.progress = 0 + for (i in MoleList){ + //FIXME pas d'actualisation de l'état des taupes sur la vue + + if (!i.isDead()) i.changeState() + } } } override fun onAccuracyChanged(sensor: Sensor, accuracy: Int) {} }, shakeSensor, SensorManager.SENSOR_DELAY_GAME) - // utilisation d'un objet anno countDownTimer = object : CountDownTimer(90000, 1000) { @@ -105,13 +100,13 @@ class MoleGridActivity : AppCompatActivity() { override fun onFinish() { //mettre la fin de parti ici => appel de l'interface de fin + //TODO affichage du menu de fin de partie DisplaycountDownTimer.text = "STOP!" } }.start() - gridViewMole.layoutManager = GridLayoutManager(this, 4) - gridViewMole.adapter = MyGridAdapter(user, MoleName, MoleImages, progressBar, scoreDisplay) + gridViewMole.adapter = MyGridAdapter(user, MoleList, progressBar, scoreDisplay) } override fun onPause() { diff --git a/app/src/main/java/iut/android/pierrepierre/MyGridAdapter.kt b/app/src/main/java/iut/android/pierrepierre/MyGridAdapter.kt index d07d155..8baa25e 100644 --- a/app/src/main/java/iut/android/pierrepierre/MyGridAdapter.kt +++ b/app/src/main/java/iut/android/pierrepierre/MyGridAdapter.kt @@ -12,46 +12,30 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder import iut.android.pierrepierre.model.User -class MyGridAdapter(var user : User, var MoleName: Array, var images: IntArray, var progressBar : ProgressBar, var scoreDisplay : TextView) : RecyclerView.Adapter(){ - - - val MoleImagesClicked = intArrayOf( //array si les têtes des taupes changes - R.drawable.limule_dead, - R.drawable.limule_dead, - R.drawable.limule_dead, - R.drawable.limule_dead, - R.drawable.limule_dead, - R.drawable.limule_dead, - R.drawable.limule_dead, - R.drawable.limule_dead, - R.drawable.limule_dead, - R.drawable.limule_dead, - R.drawable.limule_dead, - R.drawable.limule_dead - ) - - +class MyGridAdapter(var user : User, var MoleList: Array, var progressBar : ProgressBar, var scoreDisplay : TextView) : RecyclerView.Adapter(){ override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyViewHolder { return MyViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.moleitem, parent, false)) } override fun onBindViewHolder(holder: MyViewHolder, position: Int) { - holder.img.setImageResource(images[position]) - //holder.label.setOnClickListener{ Toast.makeText(this@MyGridAdapter, "clicked !!!", Toast.LENGTH_SHORT)} - - holder.img.setOnClickListener { - // Action à exécuter lors du clic sur l'image - - //TODO verifier si l'objet cliqué et de type "vivant" - holder.img.setImageResource(MoleImagesClicked[position]) - progressBar.progress = progressBar.progress + 10 //Augmentation de la progresse bar - user.score += 100 - scoreDisplay.text = user.score.toString() + //TODO Implémenter une coroutine pour actualiser l'état des pdp des taupes ? + holder.img.setImageResource(MoleList[position].pdp) + + holder.img.setOnClickListener { // Action à exécuter lors du clic sur l'image + if (!MoleList[position].isDead()){ + MoleList[position].takeHit() + progressBar.progress = progressBar.progress + 10 //Augmentation de la progresse bar + user.score += 100 + + //TODO Coroutine ici : (?) ==>listener avec les moles observable + scoreDisplay.text = user.score.toString() + holder.img.setImageResource(MoleList[position].pdp) + } } } - override fun getItemCount() = MoleName.size + override fun getItemCount() = MoleList.size fun updateScoreDisplay(){