🍱 ajout d'une progresse bar en fonction de du nombre de taupe frappé

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

@@ -1,4 +1,4 @@
-#Tue Mar 28 18:26:39 CEST 2023
+#Tue Mar 28 18:55:31 CEST 2023
 iut.android.pierrepierre.app-pngs-0\:/drawable-ldpi/ic_launcher_background.png=/home/UCA/piferreira/2A/Android/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/ProjetAndroid/app/build/intermediates/merged_res/debug/mipmap-anydpi-v26_ic_launcher.xml.flat
 iut.android.pierrepierre.app-mergeDebugResources-4\:/layout/moleitem.xml=/home/UCA/piferreira/2A/Android/ProjetAndroid/app/build/intermediates/merged_res/debug/layout_moleitem.xml.flat

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

@@ -1,4 +1,4 @@
-#Tue Mar 28 18:26:39 CEST 2023
+#Tue Mar 28 18:55:31 CEST 2023
 iut.android.pierrepierre.app-main-6\:/mipmap-xhdpi/ic_launcher_round.webp=/home/UCA/piferreira/2A/Android/ProjetAndroid/app/build/intermediates/packaged_res/debug/mipmap-xhdpi-v4/ic_launcher_round.webp
 iut.android.pierrepierre.app-packageDebugResources-3\:/layout/main_activity.xml=/home/UCA/piferreira/2A/Android/ProjetAndroid/app/build/intermediates/packaged_res/debug/layout/main_activity.xml
 iut.android.pierrepierre.app-main-6\:/mipmap-hdpi/ic_launcher.webp=/home/UCA/piferreira/2A/Android/ProjetAndroid/app/build/intermediates/packaged_res/debug/mipmap-hdpi-v4/ic_launcher.webp

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

@@ -1,4 +1,4 @@
-#Tue Mar 28 18:26:57 CEST 2023
+#Tue Mar 28 18:55:39 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

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

@@ -13,7 +13,7 @@ drawable ic_launcher_foreground
 drawable limule
 id MoleGrid
 id grid_image
-id item_name
+id progressBar
 layout main_activity
 layout mole_grid
 layout moleitem

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

@@ -1,4 +1,8 @@
 [
+    {
+        "merged": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-merged_res-5:/drawable_capybara.png.flat",
+        "source": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-main-7:/drawable/capybara.png"
+    },
     {
         "merged": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-merged_res-5:/layout_mole_grid.xml.flat",
         "source": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-main-7:/layout/mole_grid.xml"
@@ -47,10 +51,6 @@
         "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:/drawable_capybara.png.flat",
-        "source": "iut.android.pierrepierre.app-main-7:/drawable/capybara.png"
-    },
     {
         "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"
@@ -79,6 +79,10 @@
         "merged": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-merged_res-5:/mipmap-mdpi_ic_launcher.webp.flat",
         "source": "/home/scratch/piferreira/.gradle/daemon/7.4/iut.android.pierrepierre.app-main-7:/mipmap-mdpi/ic_launcher.webp"
     },
+    {
+        "merged": "iut.android.pierrepierre.app-merged_res-5:/layout_mole_grid.xml.flat",
+        "source": "iut.android.pierrepierre.app-main-7:/layout/mole_grid.xml"
+    },
     {
         "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"

app/build/intermediates/runtime_symbol_list/debug/R.txt

@@ -2933,7 +2933,6 @@ int id info 0x7f0800c5
 int id invisible 0x7f0800c6
 int id inward 0x7f0800c7
 int id italic 0x7f0800c8
-int id item_name 0x7f0800c9
 int id item_touch_helper_previous_elevation 0x7f0800ca
 int id jumpToEnd 0x7f0800cb
 int id jumpToStart 0x7f0800cc
@@ -3038,6 +3037,7 @@ int id pin 0x7f08012e
 int id position 0x7f08012f
 int id postLayout 0x7f080130
 int id pressed 0x7f080131
+int id progressBar 0x7f0801c3
 int id progress_circular 0x7f080132
 int id progress_horizontal 0x7f080133
 int id radio 0x7f080134

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

@@ -2934,7 +2934,6 @@ id info
 id invisible
 id inward
 id italic
-id item_name
 id item_touch_helper_previous_elevation
 id jumpToEnd
 id jumpToStart
@@ -3039,6 +3038,7 @@ id pin
 id position
 id postLayout
 id pressed
+id progressBar
 id progress_circular
 id progress_horizontal
 id radio

app/src/main/java/MyViewHolder.kt

@@ -6,6 +6,6 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import iut.android.pierrepierre.R
 
 class MyViewHolder(var label: View) : ViewHolder(label) {
-    var textView: TextView = label.findViewById(R.id.item_name)
+    //var textView: TextView = label.findViewById(R.id.item_name)
     var img: ImageView = label.findViewById(R.id.grid_image)
 }

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

@@ -1,6 +1,7 @@
 package iut.android.pierrepierre
 
 import android.os.Bundle
+import android.widget.ProgressBar
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.GridLayoutManager
@@ -11,10 +12,12 @@ class MoleGridActivity : AppCompatActivity() {
 
     private lateinit var gridViewMole : RecyclerView
 
+    private lateinit var progressBar: ProgressBar
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.mole_grid)
         gridViewMole = findViewById(R.id.MoleGrid)
+        progressBar = findViewById(R.id.progressBar)
     }
 
 
@@ -55,7 +58,7 @@ class MoleGridActivity : AppCompatActivity() {
         )
 
         gridViewMole.layoutManager = GridLayoutManager(this, 4)
-        gridViewMole.adapter = MyGridAdapter(MoleName, MoleImages)
+        gridViewMole.adapter = MyGridAdapter(MoleName, MoleImages, progressBar)
     }
 
 }

app/src/main/java/iut/android/pierrepierre/MyGridAdapter.kt

@@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 
 
-class MyGridAdapter(var MoleName: Array<String>, var images: IntArray) : RecyclerView.Adapter<MyViewHolder>(){
+class MyGridAdapter(var MoleName: Array<String>, var images: IntArray, var progressBar : ProgressBar) : RecyclerView.Adapter<MyViewHolder>(){
 
 
     val MoleImagesClicked = intArrayOf(
@@ -29,23 +29,26 @@ class MyGridAdapter(var MoleName: Array<String>, var images: IntArray) : Recycle
         R.drawable.capybara
     )
 
+
+
+
     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.textView.text = MoleName[position]
+        //holder.textView.text = MoleName[position]
         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
             //Toast.makeText(holder.img.context, "Image clicked !!!", Toast.LENGTH_SHORT).show()
 
-            var index = position
-            if (index < MoleImagesClicked.size) {
-                holder.img.setImageResource(MoleImagesClicked[index])
-                index++
-            }
+
+            //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
         }
     }
 

app/src/main/res/layout/mole_grid.xml

@@ -19,8 +19,18 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:numColumns="4"
-        android:horizontalSpacing="20dp"
-        android:verticalSpacing="20dp"
+        android:horizontalSpacing="15dp"
+        android:verticalSpacing="15dp"
         />
 
+    <ProgressBar
+        android:id="@+id/progressBar"
+        style="@android:style/Widget.ProgressBar.Horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:max="100"
+        android:progress="0"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/moleitem.xml

@@ -13,12 +13,12 @@
         android:id="@+id/grid_image"/>
 
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/item_name"
-        android:text="@string/mole"
-        android:textSize="12sp"
-        android:layout_marginTop="3dp"/>
+<!--    <TextView-->
+<!--        android:layout_width="wrap_content"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:id="@+id/item_name"-->
+<!--        android:text="@string/mole"-->
+<!--        android:textSize="12sp"-->
+<!--        android:layout_marginTop="3dp"/>-->
 
 </LinearLayout>