From 2e6192f96763ad3f348a9b499437b91ecb7c474b Mon Sep 17 00:00:00 2001
From: Lucas Delanier <delanierlucas@gmail.com>
Date: Sun, 12 Mar 2023 01:39:50 +0100
Subject: [PATCH] fix bugs

---
 .../com/example/shakecraft/BossFragment.kt    | 25 +++++++++++--------
 .../com/example/shakecraft/MainActivity.kt    |  1 +
 .../com/example/shakecraft/model/Player.kt    | 22 ++++++++--------
 .../main/res/drawable/navbar_background.xml   |  5 ++++
 app/src/main/res/layout/activity_main.xml     |  1 +
 5 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/example/shakecraft/BossFragment.kt b/app/src/main/java/com/example/shakecraft/BossFragment.kt
index 84123e2..4eda005 100644
--- a/app/src/main/java/com/example/shakecraft/BossFragment.kt
+++ b/app/src/main/java/com/example/shakecraft/BossFragment.kt
@@ -107,16 +107,6 @@ class BossFragment() : Fragment() {
                     println(item)
                     player.addItem(item)
                     player.gainXp(boss.xpReward)
-                    boss = Generator.generateBoss()
-                    println(boss)
-                    imageView.setImageResource(boss.image)
-                    val vibrator = context?.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
-                    vibrator.vibrate(100)
-                    progressBar.max = boss.maxlife
-                    with(recyclerView) {
-                        layoutManager = LinearLayoutManager(view.context)
-                        adapter = AdapterBossLoot(boss.possibleLoot)
-                    }
                     val maVue = view.findViewById<View>(R.id.toast)
                     val image = maVue.findViewById<ImageView>(R.id.imageViewLoot)
                     val name = maVue.findViewById<TextView>(R.id.nameLoot)
@@ -124,11 +114,22 @@ class BossFragment() : Fragment() {
                     maVue.visibility = View.VISIBLE
                     image.setImageResource(item.image)
                     name.text = item.name
-                    xp.text = item.xpReward.toString()
+                    xp.text = boss.xpReward.toString()
                     maVue.postDelayed({
                         maVue.visibility = View.GONE
 
                     }, 3000)
+                    boss = Generator.generateBoss()
+                    println(boss)
+                    imageView.setImageResource(boss.image)
+                    val vibrator = context?.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
+                    vibrator.vibrate(100)
+                    progressBar.max = boss.maxlife
+                    with(recyclerView) {
+                        layoutManager = LinearLayoutManager(view.context)
+                        adapter = AdapterBossLoot(boss.possibleLoot)
+                    }
+
 
                     // Définissez la propriété scaleX et scaleY de l'image sur 0.5f
 
@@ -143,6 +144,8 @@ class BossFragment() : Fragment() {
                     progressBar.progress = boss.life
 
                 }
+
+
             }
         }
 
diff --git a/app/src/main/java/com/example/shakecraft/MainActivity.kt b/app/src/main/java/com/example/shakecraft/MainActivity.kt
index 927d5e0..e2d7a7d 100644
--- a/app/src/main/java/com/example/shakecraft/MainActivity.kt
+++ b/app/src/main/java/com/example/shakecraft/MainActivity.kt
@@ -29,6 +29,7 @@ class MainActivity : AppCompatActivity() {
 
             controller.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
         }
+
     }
 
     private lateinit var bottomNav : BottomNavigationView
diff --git a/app/src/main/java/com/example/shakecraft/model/Player.kt b/app/src/main/java/com/example/shakecraft/model/Player.kt
index 2a924f4..e9da6ed 100644
--- a/app/src/main/java/com/example/shakecraft/model/Player.kt
+++ b/app/src/main/java/com/example/shakecraft/model/Player.kt
@@ -8,37 +8,37 @@ class Player(val pseudo: String, var xp: Int = 0) {
 
 
     fun changeRank(){
-        if(this.level<2){
+        if(this.level<=2){
             this.rank = "Beginner"
         }
-        else if(this.level<5){
+        else if(this.level<=5){
             this.rank = "Intermediate"
         }
-        else if(this.level<8){
+        else if(this.level<=8){
             this.rank = "Proficient"
         }
-        else if(this.level<11){
+        else if(this.level<=11){
             this.rank = "Expert"
         }
-        else if(this.level<14){
+        else if(this.level<=14){
             this.rank = "Master"
         }
-        else if(this.level<17){
+        else if(this.level<=17){
             this.rank = "Professional"
         }
-        else if(this.level<20){
+        else if(this.level<=20){
             this.rank = "Champion"
         }
-        else if(this.level<23){
+        else if(this.level<=23){
             this.rank = "Beginner"
         }
-        else if(this.level<26){
+        else if(this.level<=26){
             this.rank = "Legend"
         }
-        else if(this.level<26){
+        else if(this.level<=26){
             this.rank = "Invincible"
         }
-        else if(this.level<29){
+        else if(this.level<=29){
             this.rank = "Divine"
         }
     }
diff --git a/app/src/main/res/drawable/navbar_background.xml b/app/src/main/res/drawable/navbar_background.xml
index 84401ce..705d735 100644
--- a/app/src/main/res/drawable/navbar_background.xml
+++ b/app/src/main/res/drawable/navbar_background.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
     <item>
         <shape android:shape="rectangle">
             <solid android:color="@color/grey_100" />
         </shape>
+
     </item>
     <item  android:top="2dp" >
         <shape android:shape="rectangle">
             <solid android:color="@color/black_800" />
         </shape>
     </item>
+
+
+
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0628e2f..df9110d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -19,6 +19,7 @@
         app:menu="@menu/nav_menu"
         app:itemIconTint="@drawable/botom_nav_colors"
         app:itemTextColor="@drawable/botom_nav_colors"
+
         />
 
     <fragment