diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/DemoCard.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/DemoCard.java index 5ce7e93..4682f44 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/DemoCard.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/DemoCard.java @@ -15,6 +15,6 @@ public class DemoCard extends Card{ //#AARRGGBB @Override public String getColor() { - return "#70FF0000"; + return "#70000000"; } } diff --git a/app/src/main/java/com/iutlaval/myapplication/GameActivity.java b/app/src/main/java/com/iutlaval/myapplication/GameActivity.java index 095f38e..5df8c21 100644 --- a/app/src/main/java/com/iutlaval/myapplication/GameActivity.java +++ b/app/src/main/java/com/iutlaval/myapplication/GameActivity.java @@ -8,7 +8,6 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Color; import android.graphics.Point; -import android.graphics.Rect; import android.os.Bundle; import android.view.Display; @@ -99,7 +98,7 @@ public class GameActivity extends Activity { if(i==0)increm=-increm; //TODO get x,y coordinate form name - view.moveToDraw(i,i,"running"); + view.moveToDraw(i,i,"card2"); FpsTime.waitFrameTime(); } } diff --git a/app/src/main/java/com/iutlaval/myapplication/Video/DrawableCard.java b/app/src/main/java/com/iutlaval/myapplication/Video/DrawableCard.java index f019c3a..3142f59 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Video/DrawableCard.java +++ b/app/src/main/java/com/iutlaval/myapplication/Video/DrawableCard.java @@ -39,4 +39,11 @@ public class DrawableCard extends Drawable{ OpacityRectangleDrawable.drawOn(c,p); PictureDrawable.drawOn(c,p); } + + @Override + public void setCoordinates(float x, float y) { + super.setCoordinates(x, y); + OpacityRectangleDrawable.setCoordinates(x,y); + PictureDrawable.setCoordinates(x+1.1F,y+2.5F); + } } diff --git a/app/src/main/res/drawable/cadre_carte.png b/app/src/main/res/drawable/cadre_carte.png index 58bac02..7465e55 100644 Binary files a/app/src/main/res/drawable/cadre_carte.png and b/app/src/main/res/drawable/cadre_carte.png differ