diff --git a/app/build/intermediates/apk/debug/app-debug.apk b/app/build/intermediates/apk/debug/app-debug.apk index 5fd1011..7316aef 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 ec08dde..2e6f941 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 c2cc7d7..207244e 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 15:09:46 CEST 2023 +#Sat Apr 08 15:31:37 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/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab index 3d30aba..6a906b9 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 91e5898..0fb251d 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 54620db..a358567 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 c1f99d4..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 67f7751..2b618be 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 b7691b0..6c4033e 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 416eca9..0bfed15 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 485195e..46eeac6 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 9ae6422..653c378 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 547298b..ac66867 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 f715acd..11900bc 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 7e269b1..6f7aeda 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 618c1d2..ba41d85 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 1c1119f..c7cab1a 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 b199a05..84ffd4f 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 146a131..684e527 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 71dec95..a9736fc 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 3de687a..6edd359 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 a173919..85e66e0 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.values.at b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at index b7691b0..6c4033e 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/lookups.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab index 21b6e47..4f411ee 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 28cd09a..6118900 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 a7b78a2..701843e 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 1da9461..18564ac 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.at b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at index 94875e2..2e48759 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_i b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab_i index 20c5860..f5e8392 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 35b11f0..4cccf8c 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 7910fd5..66f7619 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/src/main/java/iut/android/pierrepierre/model/Activity/MoleGridActivity.kt b/app/src/main/java/iut/android/pierrepierre/model/Activity/MoleGridActivity.kt index 0e06fd1..a608fdd 100644 --- a/app/src/main/java/iut/android/pierrepierre/model/Activity/MoleGridActivity.kt +++ b/app/src/main/java/iut/android/pierrepierre/model/Activity/MoleGridActivity.kt @@ -90,7 +90,7 @@ class MoleGridActivity : AppCompatActivity() { //FIXME pas d'actualisation de l'état des taupes sur la vue if (i.isDead()) { - i.changeState() + i.makeAlive() i.onMoleStateChanged(i) } } @@ -178,7 +178,7 @@ class MoleGridActivity : AppCompatActivity() { 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])].makeAlive() //ravive une taupe 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])]) @@ -203,7 +203,7 @@ class MoleGridActivity : AppCompatActivity() { delay(5000L) // attendre 5 secondes if (!mole.isDead()){ - mole.changeState() // mettre la taupe morte + mole.makeDead() // mettre la taupe morte mole.onMoleStateChanged(mole) // notifier la vue user.score -= 50 user.nbMiss += 1 diff --git a/app/src/main/java/iut/android/pierrepierre/model/Adapter/MyGridAdapter.kt b/app/src/main/java/iut/android/pierrepierre/model/Adapter/MyGridAdapter.kt index 0b55315..5c24ee7 100644 --- a/app/src/main/java/iut/android/pierrepierre/model/Adapter/MyGridAdapter.kt +++ b/app/src/main/java/iut/android/pierrepierre/model/Adapter/MyGridAdapter.kt @@ -1,17 +1,21 @@ package iut.android.pierrepierre.model.Adapter import MyViewHolder +import android.content.res.ColorStateList +import android.graphics.Color +import android.os.Build import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import android.widget.* +import androidx.annotation.RequiresApi +import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import iut.android.pierrepierre.model.Class.Mole import iut.android.pierrepierre.R import iut.android.pierrepierre.model.Class.MoleObserver import iut.android.pierrepierre.model.Class.User - class MyGridAdapter(var user: User, var MoleList: MutableList, var progressBar: ProgressBar, var scoreDisplay: TextView) : RecyclerView.Adapter(), MoleObserver { @@ -23,6 +27,7 @@ class MyGridAdapter(var user: User, var MoleList: MutableList, var progres return MyViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.moleitem, parent, false)) } + @RequiresApi(Build.VERSION_CODES.LOLLIPOP) override fun onBindViewHolder(holder: MyViewHolder, position: Int) { holder.img.setImageResource(MoleList[position].pdp) @@ -32,6 +37,7 @@ class MyGridAdapter(var user: User, var MoleList: MutableList, var progres Log.d("passed", "if passed") MoleList[position].takeHit() //kill + attribut les points 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 ? holder.img.setImageResource(MoleList[position].pdp) 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 4a8cc17..894c55b 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 @@ -31,15 +31,38 @@ public class Mole (var dead : Boolean) : MoleObserver{ } fun takeHit(){ - this.dead = true + makeDead() nbPoint += 100 - changeState() + //changeState() } //FIXME dangereux - fun changeState(){ - if(pdp == R.drawable.limule) pdp = R.drawable.limule_dead - else pdp = R.drawable.limule; +// fun changeState(){ +// if(pdp == R.drawable.limule) pdp = R.drawable.limule_dead +// else pdp = R.drawable.limule; +// } + + fun makeDead(){ + if (!dead) { + this.dead = true + this.pdp = R.drawable.limule_dead + } + else{ + System.out.print("cant kill a dead mole") + //throw ? + } + } + + fun makeAlive(){ + if(dead){ + this.dead = false + this.pdp = R.drawable.limule + } + else{ + System.out.print("cant revive a living mole") + //throw ? + } + } } \ No newline at end of file