⚡ Augmentation de la difficulté avec le temps

app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Sun Apr 09 18:22:56 CEST 2023
+#Sun Apr 09 21:56:26 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

app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml

@@ -10064,7 +10064,14 @@
         
         <item name="android:statusBarColor" ns2:targetApi="21">?attr/colorPrimaryVariant</item>
         
-    </style></file><file name="ic_launcher" path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/mipmap-hdpi/ic_launcher.webp" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_launcher_round" path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp" qualifiers="hdpi-v4" type="mipmap"/><file name="history" path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/layout/history.xml" qualifiers="" type="layout"/><file name="activity_menu" path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/layout-land/activity_menu.xml" qualifiers="land" type="layout"/><file name="mole_grid" path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/layout-land/mole_grid.xml" qualifiers="land" type="layout"/></source><source path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/build/generated/res/rs/debug"/><source path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems><configuration qualifiers=""><declare-styleable name="AlertDialog">
+    </style></file><file name="ic_launcher" path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/mipmap-hdpi/ic_launcher.webp" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_launcher_round" path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp" qualifiers="hdpi-v4" type="mipmap"/><file name="history" path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/layout/history.xml" qualifiers="" type="layout"/><file name="activity_menu" path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/layout-land/activity_menu.xml" qualifiers="land" type="layout"/><file name="mole_grid" path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/layout-land/mole_grid.xml" qualifiers="land" type="layout"/><file path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/values/styles.xml" qualifiers=""><style name="BootstrapTextView" parent="@android:style/Widget.TextView">
+        <item name="android:background">#f8f9fa</item>
+        <item name="android:textColor">#343a40</item>
+        <item name="android:padding">8dp</item>
+        <item name="android:layout_marginTop">8dp</item>
+        <item name="android:layout_marginBottom">8dp</item>
+        <item name="android:textSize">16sp</item>
+    </style></file></source><source path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/build/generated/res/rs/debug"/><source path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems><configuration qualifiers=""><declare-styleable name="AlertDialog">
         <attr name="android:layout"/>
         <attr format="reference" name="buttonPanelSideLayout"/>
         <attr format="reference" name="listLayout"/>

app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Sun Apr 09 18:22:56 CEST 2023
+#Sun Apr 09 21:56:26 CEST 2023
 iut.android.pierrepierre.app-packageDebugResources-3\:/layout-land/mole_grid.xml=/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/build/intermediates/packaged_res/debug/layout-land/mole_grid.xml
 iut.android.pierrepierre.app-packageDebugResources-3\:/layout/game_over.xml=/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/build/intermediates/packaged_res/debug/layout/game_over.xml
 iut.android.pierrepierre.app-main-6\:/mipmap-mdpi/ic_launcher_round.webp=/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/build/intermediates/packaged_res/debug/mipmap-mdpi-v4/ic_launcher_round.webp

app/build/intermediates/incremental/debug/packageDebugResources/merger.xml

@@ -23,4 +23,11 @@
         
         <item name="android:statusBarColor" ns1:targetApi="21">?attr/colorPrimaryVariant</item>
         
-    </style></file><file name="ic_launcher" path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/mipmap-hdpi/ic_launcher.webp" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_launcher_round" path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp" qualifiers="hdpi-v4" type="mipmap"/><file name="game_over" path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/layout/game_over.xml" qualifiers="" type="layout"/><file name="activity_menu" path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/layout/activity_menu.xml" qualifiers="" type="layout"/><file name="history" path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/layout/history.xml" qualifiers="" type="layout"/><file name="activity_menu" path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/layout-land/activity_menu.xml" qualifiers="land" type="layout"/><file name="mole_grid" path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/layout-land/mole_grid.xml" qualifiers="land" type="layout"/></source><source path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/build/generated/res/rs/debug"/><source path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
+    </style></file><file name="ic_launcher" path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/mipmap-hdpi/ic_launcher.webp" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_launcher_round" path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp" qualifiers="hdpi-v4" type="mipmap"/><file name="game_over" path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/layout/game_over.xml" qualifiers="" type="layout"/><file name="activity_menu" path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/layout/activity_menu.xml" qualifiers="" type="layout"/><file name="history" path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/layout/history.xml" qualifiers="" type="layout"/><file name="activity_menu" path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/layout-land/activity_menu.xml" qualifiers="land" type="layout"/><file name="mole_grid" path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/layout-land/mole_grid.xml" qualifiers="land" type="layout"/><file path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/main/res/values/styles.xml" qualifiers=""><style name="BootstrapTextView" parent="@android:style/Widget.TextView">
+        <item name="android:background">#f8f9fa</item>
+        <item name="android:textColor">#343a40</item>
+        <item name="android:padding">8dp</item>
+        <item name="android:layout_marginTop">8dp</item>
+        <item name="android:layout_marginBottom">8dp</item>
+        <item name="android:textSize">16sp</item>
+    </style></file></source><source path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/build/generated/res/rs/debug"/><source path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>

app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Sun Apr 09 19:45:35 CEST 2023
+#Sun Apr 09 22:56:12 CEST 2023
 base.1=/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/build/intermediates/dex/debug/mergeDexDebug/classes2.dex
 path.1=classes2.dex
 base.0=/home/UCA/piferreira/2A/Android/testsansgradle/ProjetAndroid/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex

app/build/intermediates/local_only_symbol_list/debug/R-def.txt

@@ -42,6 +42,7 @@ string mole
 string retour_au_menu
 string temps_coul
 string timer
+style BootstrapTextView
 style Theme.PierrePierre
 xml backup_rules
 xml data_extraction_rules

app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json

@@ -11,6 +11,10 @@
         "merged": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-merged_res-5:/xml_data_extraction_rules.xml.flat",
         "source": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-main-7:/xml/data_extraction_rules.xml"
     },
+    {
+        "merged": "iut.android.pierrepierre.app-merged_res-5:/layout_game_over.xml.flat",
+        "source": "iut.android.pierrepierre.app-main-7:/layout/game_over.xml"
+    },
     {
         "merged": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-merged_res-5:/drawable-hdpi_ic_launcher_background.png.flat",
         "source": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-pngs-0:/drawable-hdpi/ic_launcher_background.png"
@@ -51,6 +55,10 @@
         "merged": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-merged_res-5:/drawable_limule_dead.png.flat",
         "source": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-main-7:/drawable/limule_dead.png"
     },
+    {
+        "merged": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-merged_res-5:/layout-land_mole_grid.xml.flat",
+        "source": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-main-7:/layout-land/mole_grid.xml"
+    },
     {
         "merged": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-merged_res-5:/drawable-xxhdpi_ic_launcher_background.png.flat",
         "source": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-pngs-0:/drawable-xxhdpi/ic_launcher_background.png"
@@ -63,6 +71,10 @@
         "merged": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-merged_res-5:/mipmap-xhdpi_ic_launcher.webp.flat",
         "source": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-main-7:/mipmap-xhdpi/ic_launcher.webp"
     },
+    {
+        "merged": "iut.android.pierrepierre.app-merged_res-5:/layout-land_activity_menu.xml.flat",
+        "source": "iut.android.pierrepierre.app-main-7:/layout-land/activity_menu.xml"
+    },
     {
         "merged": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-merged_res-5:/mipmap-hdpi_ic_launcher.webp.flat",
         "source": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-main-7:/mipmap-hdpi/ic_launcher.webp"
@@ -95,10 +107,6 @@
         "merged": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-merged_res-5:/drawable-xhdpi_ic_launcher_background.png.flat",
         "source": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-pngs-0:/drawable-xhdpi/ic_launcher_background.png"
     },
-    {
-        "merged": "iut.android.pierrepierre.app-merged_res-5:/layout-land_mole_grid.xml.flat",
-        "source": "iut.android.pierrepierre.app-main-7:/layout-land/mole_grid.xml"
-    },
     {
         "merged": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-merged_res-5:/drawable-anydpi-v21_ic_launcher_background.xml.flat",
         "source": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-pngs-0:/drawable-anydpi-v21/ic_launcher_background.xml"
@@ -123,12 +131,12 @@
         "merged": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-merged_res-5:/mipmap-xhdpi_ic_launcher_round.webp.flat",
         "source": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-main-7:/mipmap-xhdpi/ic_launcher_round.webp"
     },
-    {
-        "merged": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-merged_res-5:/layout-land_activity_menu.xml.flat",
-        "source": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-main-7:/layout-land/activity_menu.xml"
-    },
     {
         "merged": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-merged_res-5:/layout_history.xml.flat",
         "source": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-main-7:/layout/history.xml"
+    },
+    {
+        "merged": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-merged_res-5:/layout-land_activity_menu.xml.flat",
+        "source": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-main-7:/layout-land/activity_menu.xml"
     }
 ]

app/build/intermediates/merged_res_blame_folder/debug/out/single/layout.json

@@ -1,4 +1,8 @@
 [
+    {
+        "merged": "iut.android.pierrepierre.app-mergeDebugResources-4:/layout/game_over.xml",
+        "source": "iut.android.pierrepierre.app-main-7:/layout/game_over.xml"
+    },
     {
         "merged": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-mergeDebugResources-4:/layout/moleitem.xml",
         "source": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-main-7:/layout/moleitem.xml"

app/build/intermediates/packaged_res/debug/values/values.xml

@@ -15,6 +15,14 @@
     <string name="retour_au_menu">Retour au menu</string>
     <string name="temps_coul">Temps écoulé!</string>
     <string name="timer">[0%1$d:%2$s]</string>
+    <style name="BootstrapTextView" parent="@android:style/Widget.TextView">
+        <item name="android:background">#f8f9fa</item>
+        <item name="android:textColor">#343a40</item>
+        <item name="android:padding">8dp</item>
+        <item name="android:layout_marginTop">8dp</item>
+        <item name="android:layout_marginBottom">8dp</item>
+        <item name="android:textSize">16sp</item>
+    </style>
     <style name="Theme.PierrePierre" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         
         <item name="colorPrimary">@color/purple_500</item>

app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt

@@ -3831,6 +3831,7 @@ style Base_Widget_MaterialComponents_Snackbar
 style Base_Widget_MaterialComponents_TextInputEditText
 style Base_Widget_MaterialComponents_TextInputLayout
 style Base_Widget_MaterialComponents_TextView
+style BootstrapTextView
 style CardView
 style CardView_Dark
 style CardView_Light

app/src/main/java/iut/android/pierrepierre/model/Activity/MoleGridActivity.kt

@@ -1,18 +1,22 @@
 package iut.android.pierrepierre.model.Activity
 
 import android.content.Context
+import android.content.res.ColorStateList
 import android.content.res.Configuration
 import android.content.res.Resources
+import android.graphics.Color
 import android.hardware.Sensor
 import android.hardware.SensorEvent
 import android.hardware.SensorEventListener
 import android.hardware.SensorManager
+import android.os.Build
 import android.os.Bundle
 import android.os.CountDownTimer
 import android.util.DisplayMetrics
 import android.view.View
 import android.widget.ProgressBar
 import android.widget.TextView
+import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
@@ -57,13 +61,13 @@ class MoleGridActivity : AppCompatActivity() {
     //Countdown
     private lateinit var countDownTimer: CountDownTimer
     private lateinit var DisplaycountDownTimer: TextView
-
+    private var endGame = false
     //coroutine
     private var moleUpdateJob: Job? = null
 
 
     //saveintance
-    private var initialTime: Long = 10000
+    private var initialTime: Long = 60000
     private var timeLeft: Long = initialTime
     private var moleList = mutableListOf<Mole>()
 
@@ -151,6 +155,7 @@ class MoleGridActivity : AppCompatActivity() {
         val shakeSensor = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER)
 
         sensorEventListener = object : SensorEventListener {
+            @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
             override fun onSensorChanged(event: SensorEvent) {
                 val x = event.values[0]
                 val y = event.values[1]
@@ -162,6 +167,7 @@ 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 > 15 && progressBar.progress == 100) {
                     progressBar.progress = 0
+                    progressBar.progressTintList = ColorStateList.valueOf(Color.YELLOW)
                     for (i in moleList){
                         //FIXME pas d'actualisation de l'état des taupes sur la vue
 
@@ -185,6 +191,7 @@ class MoleGridActivity : AppCompatActivity() {
                 timeLeft = millisUntilFinished
                 val min = millisUntilFinished/60000
                 val timerMsg = getString(R.string.timer, min, (((millisUntilFinished/1000) - 60 * min).toString()).padStart(2, '0') )
+                if (timeLeft == initialTime/2) endGame = true
                 DisplaycountDownTimer.text = timerMsg
             }
 
@@ -197,11 +204,6 @@ class MoleGridActivity : AppCompatActivity() {
                 fragmentTransaction.replace(android.R.id.content, menuFragment)
                 fragmentTransaction.commit()
 
-//                supportFragmentManager.commit {
-//                    setReorderingAllowed(true)
-//                    add(android.R.id.content, menuFragment)
-//                }
-
                 DisplaycountDownTimer.text = "STOP!"
 
             }
@@ -245,33 +247,37 @@ class MoleGridActivity : AppCompatActivity() {
         moleList.forEachIndexed { index, mole -> mole.dead = !moleStates?.get(index)!! }
     }
 
-
-
-    //TODO voir si utiliser une coroutine est optimal, ou si mettre en lien avec le timer ne serait pas mieux
     //Fonction pour mettre une seule taupe aléatoire
     private fun startMoleUpdateCoroutine(moleList: MutableList<Mole>) {
-            moleUpdateJob = lifecycleScope.launch {
+        var baseDelai = 1000
-                // Boucle pour mettre à jour les moles aléatoirement pendant 5 secondes
+        moleUpdateJob = lifecycleScope.launch {
-                val endTime = System.currentTimeMillis() + 60000 //durée de 60s
+            // Boucle pour mettre à jour les moles aléatoirement pendant 5 secondes
-                var atLeastOneDead = false // variable pour vérifier si au moins une taupe est morte
+            val endTime = System.currentTimeMillis() + 60000 //durée de 60s
-                while (System.currentTimeMillis() < endTime) {
+            var atLeastOneDead = false // variable pour vérifier si au moins une taupe est morte
-                    // Mettre à jour une taupe aléatoire
+            while (System.currentTimeMillis() < endTime) {
-                    if (atLeastOneDead || !allListAlive(moleList)){
+                // Mettre à jour une taupe aléatoire
-                        var deadMoles = moleList.filter { it.isDead() } // filtrer les taupes mortes uniquement
+                if (atLeastOneDead || !allListAlive(moleList)){
-                        if (deadMoles.isNotEmpty()) {
+                    val deadMoles = moleList.filter { it.isDead() } // filtrer les taupes mortes uniquement
-                            var index = Random.nextInt(0, deadMoles.size)
+                    if (deadMoles.isNotEmpty()) {
-                            moleList[moleList.indexOf(deadMoles[index])].makeAlive() //ravive une taupe
+                        val index = Random.nextInt(0, deadMoles.size)
-                            moleList[moleList.indexOf(deadMoles[index])].onMoleStateChanged(moleList[moleList.indexOf(deadMoles[index])])
+                        moleList[moleList.indexOf(deadMoles[index])].makeAlive() //ravive une taupe
-                            atLeastOneDead = false // réinitialiser la variable atLeastOneDead à false
+                        moleList[moleList.indexOf(deadMoles[index])].onMoleStateChanged(moleList[moleList.indexOf(deadMoles[index])])
-                            launchMoleDisappearCoroutine(moleList[moleList.indexOf(deadMoles[index])])
+                        atLeastOneDead = false // réinitialiser la variable atLeastOneDead à false
-                        } else {
+                        launchMoleDisappearCoroutine(moleList[moleList.indexOf(deadMoles[index])])
-                            atLeastOneDead = true // mettre la variable atLeastOneDead à true s'il n'y a pas de taupe morte
+                    } else {
-                        }
+                        atLeastOneDead = true // mettre la variable atLeastOneDead à true s'il n'y a pas de taupe morte
                     }
-                    // Attendre un court moment avant de mettre à jour une autre taupe
+                }
+                // Attendre un court moment avant de mettre à jour une autre taupe
+
+                if (endGame){
+                    delay(300) //taupes spawn plus vite
+                }
+                else{
                     delay(1000)
                 }
             }
+        }
     }
 
     private fun allListAlive(moleList: MutableList<Mole>) : Boolean{