From 114f329337a8fe66a2ca4abb8901115126175885 Mon Sep 17 00:00:00 2001
From: Lucas Delanier <delanierlucas@gmail.com>
Date: Mon, 13 Mar 2023 22:15:44 +0100
Subject: [PATCH] Add player image on home screen and color to indicate not
 enough resource to craft :movie_camera:

---
 .../com/example/shakecraft/CraftFragment.kt   |   4 +-
 .../com/example/shakecraft/HomeFragment.kt    |   4 ++
 .../java/com/example/shakecraft/data/Stub.kt  |   1 +
 .../com/example/shakecraft/model/Player.kt    |  47 ++++++------------
 .../view/adapter/AdapterMaterials.kt          |   9 +++-
 .../src/main/res/drawable/player_image.png    | Bin 0 -> 4669 bytes
 .../app/src/main/res/layout/fragment_home.xml |  23 +++++++--
 7 files changed, 46 insertions(+), 42 deletions(-)
 create mode 100644 ShakeAndCraft/app/src/main/res/drawable/player_image.png

diff --git a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/CraftFragment.kt b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/CraftFragment.kt
index 7d92d27..ad53829 100644
--- a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/CraftFragment.kt
+++ b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/CraftFragment.kt
@@ -56,8 +56,8 @@ class CraftFragment : Fragment() {
         recyclerViewMaterials = view.findViewById(R.id.RecyclerviewMaterials)
         with(recyclerViewMaterials) {
             layoutManager = LinearLayoutManager(view.context)
-            if(recipe.type == "Objects")
-                adapter = AdapterMaterials(recipe.ingredients, currentPlayer)
+            adapter = AdapterMaterials(recipe.ingredients, currentPlayer)
+
         }
 
     }
diff --git a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/HomeFragment.kt b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/HomeFragment.kt
index 0f19267..4a37742 100644
--- a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/HomeFragment.kt
+++ b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/HomeFragment.kt
@@ -5,6 +5,7 @@ import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
@@ -23,6 +24,7 @@ class HomeFragment : Fragment() {
     private lateinit var buttonCollect : ConstraintLayout
     private lateinit var buttonBoss : ConstraintLayout
     private lateinit var buttonForge : ConstraintLayout
+    private lateinit var playermage : ImageView
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -47,6 +49,7 @@ class HomeFragment : Fragment() {
         rank = view.findViewById(R.id.rankTextView)
         maxXp = view.findViewById(R.id.maxXpTextView)
         xp = view.findViewById(R.id.xpTextView)
+        playermage = view.findViewById(R.id.playerImage)
         buttonCollect = view.findViewById(R.id.buttonCollect)
         buttonCollect.setOnClickListener{
             findNavController().navigate(R.id.action_homeFragment_to_collectFragment, null, NavOptions.Builder().setPopUpTo(R.id.homeFragment, false).build())
@@ -66,6 +69,7 @@ class HomeFragment : Fragment() {
         maxXp.text = (currentPlayer.level*100).toString()
         progressbar.progress = currentPlayer.xp
         progressbar.max = currentPlayer.level*100
+        playermage.setImageResource(currentPlayer.image)
     }
 
 
diff --git a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/data/Stub.kt b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/data/Stub.kt
index 2c1b20d..7265d3d 100644
--- a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/data/Stub.kt
+++ b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/data/Stub.kt
@@ -11,6 +11,7 @@ class Stub {
         val currentPlayer = Player("Winker",0)
         val items : MutableList<Item> = mutableListOf()
         items.add(Item(type = ITEMS.BEECH_LOG.itemtype, stack = 30))
+        items.add(Item(type = ITEMS.BRONZE_INGOT.itemtype, stack = 30))
 
         currentPlayer.items = items
         return currentPlayer
diff --git a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/Player.kt b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/Player.kt
index 8a136c8..2949d97 100644
--- a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/Player.kt
+++ b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/Player.kt
@@ -1,45 +1,26 @@
 package com.example.shakecraft.model
 
+import com.example.shakecraft.R
+
 class Player(val pseudo: String, var xp: Int = 0) {
     var level: Int = 1
-
+    val image: Int = R.drawable.player_image
     var items: MutableList<Item> = mutableListOf()
     var rank: String = "Beginner"
 
 
     fun changeRank(){
-        if(this.level<=2){
-            this.rank = "Beginner"
-        }
-        else if(this.level<=5){
-            this.rank = "Intermediate"
-        }
-        else if(this.level<=8){
-            this.rank = "Proficient"
-        }
-        else if(this.level<=11){
-            this.rank = "Expert"
-        }
-        else if(this.level<=14){
-            this.rank = "Master"
-        }
-        else if(this.level<=17){
-            this.rank = "Professional"
-        }
-        else if(this.level<=20){
-            this.rank = "Champion"
-        }
-        else if(this.level<=23){
-            this.rank = "Beginner"
-        }
-        else if(this.level<=26){
-            this.rank = "Legend"
-        }
-        else if(this.level<=29){
-            this.rank = "Invincible"
-        }
-        else if(this.level<=32){
-            this.rank = "Divine"
+        this.rank = when(level){
+            in 1..2 -> "Beginner"
+            in 3..5 -> "Intermediate"
+            in 6..8 -> "Proficient"
+            in 9..11 -> "Expert"
+            in 12..14 -> "Master"
+            in 15..17 -> "Professional"
+            in 18..19 -> "Champion"
+            in 20..22 -> "Legend"
+            in 23..25 -> "Invincible"
+            else -> {"Divine"}
         }
     }
     fun addItem(item: Item) {
diff --git a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/view/adapter/AdapterMaterials.kt b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/view/adapter/AdapterMaterials.kt
index b2a9a81..ab28f20 100644
--- a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/view/adapter/AdapterMaterials.kt
+++ b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/view/adapter/AdapterMaterials.kt
@@ -1,5 +1,6 @@
 package com.example.shakecraft.view.adapter
 
+import android.graphics.Color
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -34,9 +35,13 @@ class AdapterMaterials(private val materials: List<Item>, val currentplayer: Pla
             textView.text = item.type.name
             val itemSearch = currentplayer.items.find { it.type.name == item.type.name }
             textViewNumberNeeded.text = item.stack.toString()
-            textViewNumberPlayer.text = if (itemSearch != null) itemSearch.stack.toString() else  "0"
-
+            textViewNumberPlayer.text = itemSearch?.stack?.toString() ?: "0"
             imageView.setImageResource(item.type.image)
+            if (itemSearch != null) {
+                if(item.stack > itemSearch.stack) textViewNumberPlayer.setTextColor(Color.RED) else textViewNumberPlayer.setTextColor(Color.WHITE)
+
+            }
+            else textViewNumberPlayer.setTextColor(Color.RED)
         }
     }
 
diff --git a/ShakeAndCraft/app/src/main/res/drawable/player_image.png b/ShakeAndCraft/app/src/main/res/drawable/player_image.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1fbfd4a4521420a77037fbb2be37690e8ede645
GIT binary patch
literal 4669
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
Rgugui9Zdrbgqls%e*n6#+B*OM

literal 0
HcmV?d00001

diff --git a/ShakeAndCraft/app/src/main/res/layout/fragment_home.xml b/ShakeAndCraft/app/src/main/res/layout/fragment_home.xml
index 2a87f89..da2ef7d 100644
--- a/ShakeAndCraft/app/src/main/res/layout/fragment_home.xml
+++ b/ShakeAndCraft/app/src/main/res/layout/fragment_home.xml
@@ -43,12 +43,25 @@
             android:orientation="horizontal"
             app:layout_constraintStart_toStartOf="parent">
 
-            <ImageView
-                android:contentDescription="Landscape"
-                android:id="@+id/imageView2"
-                android:layout_width="60dp"
+            <FrameLayout
+                android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:src="@drawable/background" />
+                android:layout_marginVertical="10dp">
+
+                <ImageView
+                    android:id="@+id/imageView2"
+                    android:layout_gravity="bottom"
+                    android:layout_width="60dp"
+                    android:layout_height="95dp"
+                    android:contentDescription="@string/landscape"
+                    android:src="@drawable/background" />
+                <ImageView
+                    android:id="@+id/playerImage"
+                    android:layout_gravity="bottom"
+                    android:layout_width="50dp"
+                    android:layout_height="80dp"
+                    android:contentDescription="Landscape" />
+            </FrameLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"