From 429e5aea4aa6aea10953496b67974e81343f6440 Mon Sep 17 00:00:00 2001
From: kalahel <mathieu95480@gmail.com>
Date: Sat, 6 Jan 2018 19:20:57 +0100
Subject: [PATCH] Added : sprites to spells blocks

---
 .../java/com/app/remi/test/engine/Engine.java | 15 ++++-
 .../com/app/remi/test/engine/SpellBlock.java  | 64 +++++++++++++++++++
 2 files changed, 78 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/app/remi/test/engine/Engine.java b/app/src/main/java/com/app/remi/test/engine/Engine.java
index 81fe2aa..b9c5f8d 100644
--- a/app/src/main/java/com/app/remi/test/engine/Engine.java
+++ b/app/src/main/java/com/app/remi/test/engine/Engine.java
@@ -2,6 +2,8 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
@@ -20,6 +22,7 @@
 import android.view.WindowManager;
 import android.widget.Toast;
 
+import com.app.remi.test.R;
 import com.app.remi.test.activities.MainMenuActivity;
 import com.app.remi.test.network.backend.services.NetworkBackendService;
 import com.app.remi.test.soundServices.BallBounceService;
@@ -130,8 +133,10 @@ public Engine(Context context, Boolean playWithSensor, SensorManager sensorManag
             double xposition = screenX * 0.1 + (i * (70 / numberSpellBlocks * 3) + (i * (150 / numberSpellBlocks * 3)));
             if (!MainMenuActivity.BRICKEST_OFFLINE_MODE) {
                 String name = ownPlayer.getSelectedSpells().get(i);
+
                 spellBlock = new SpellBlock(screenX, screenY, xposition, screenY * 0.3, 150 / numberSpellBlocks * 3, 150 / numberSpellBlocks * 3, name);
 
+
             } else {
                 spellBlock = new SpellBlock(screenX, screenY, xposition, screenY * 0.3, 150 / numberSpellBlocks * 3, 150 / numberSpellBlocks * 3, "spellblock" + i + 1);
 
@@ -204,8 +209,16 @@ public void draw() {
             for (int i = 0; i < listeB.size(); i++)
                 canvas.drawRect(listeB.get(i).getRect(), paint);
 
-            for (int i = 0; i < listeS.size(); i++)
+            for (int i = 0; i < listeS.size(); i++) {
                 canvas.drawRect(listeS.get(i).getRect(), paint);
+                if(!MainMenuActivity.BRICKEST_OFFLINE_MODE) {
+                    // Drawing of the spells blocks sprites
+                    String spriteName = listeS.get(i).getSpell() + "_sprite";
+                    Bitmap bitmapSpell = BitmapFactory.decodeResource(getResources(), getResources().getIdentifier(spriteName, "drawable", mainActivityContext.getPackageName()));
+                    canvas.drawBitmap(bitmapSpell, null, listeS.get(i).getRect(), null);
+                }
+
+            }
 
             //this is the HUD
             canvas.drawRect(0, (float) (screenY * 0.2), screenX, 0, paint);
diff --git a/app/src/main/java/com/app/remi/test/engine/SpellBlock.java b/app/src/main/java/com/app/remi/test/engine/SpellBlock.java
index c32cff8..a5157b8 100644
--- a/app/src/main/java/com/app/remi/test/engine/SpellBlock.java
+++ b/app/src/main/java/com/app/remi/test/engine/SpellBlock.java
@@ -127,4 +127,68 @@ public float getCooldownDuration() {
     public void setCooldownDuration(float cooldownDuration) {
         this.cooldownDuration = cooldownDuration;
     }
+
+    public void setLeftSide(RectF leftSide) {
+        this.leftSide = leftSide;
+    }
+
+    public void setRightSide(RectF rightSide) {
+        this.rightSide = rightSide;
+    }
+
+    public void setTopSide(RectF topSide) {
+        this.topSide = topSide;
+    }
+
+    public void setBotSide(RectF botSide) {
+        this.botSide = botSide;
+    }
+
+    public int getWidth() {
+        return width;
+    }
+
+    public void setWidth(int width) {
+        this.width = width;
+    }
+
+    public int getHeight() {
+        return height;
+    }
+
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    public double getxPosition() {
+        return xPosition;
+    }
+
+    public void setxPosition(double xPosition) {
+        this.xPosition = xPosition;
+    }
+
+    public double getyPosition() {
+        return yPosition;
+    }
+
+    public void setyPosition(double yPosition) {
+        this.yPosition = yPosition;
+    }
+
+    public int getxScreen() {
+        return xScreen;
+    }
+
+    public void setxScreen(int xScreen) {
+        this.xScreen = xScreen;
+    }
+
+    public int getyScreen() {
+        return yScreen;
+    }
+
+    public void setyScreen(int yScreen) {
+        this.yScreen = yScreen;
+    }
 }