Marc/PTS3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

suppresion classes inutile

Browse Source
This commit is contained in:
marc
2020-09-19 16:21:59 +02:00
parent be52f30dc7
commit 5426c1edef
3 changed files with 9 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java
+9 -6
View File
@@ -27,7 +27,10 @@ public class DrawableCard extends Drawable{
private static final float TITLE_FONT_SIZE =30F; private static final float TITLE_FONT_SIZE =30F;
private static int DESCRIPTION_TEXT_X_RES = 281; private static int DESCRIPTION_TEXT_X_RES = 281;
private static int DESCRIPTION_TEXT_Y_RES = 195; private static int DESCRIPTION_TEXT_Y_RES = 195;
private static int TEXT_TITLE_X_RES = 281;
private static int TEXT_TITLE_Y_RES = 60;
private static int TEXT_ATK_HP_X_RES = 110;
private static int TEXT_ATK_HP_Y_RES = 60;
//des floats sont utiliser card ils prenne moin de ram que des doubles et que l'on a pas besoin de la precision supplementaire //des floats sont utiliser card ils prenne moin de ram que des doubles et que l'on a pas besoin de la precision supplementaire
//dimentions //dimentions
@@ -121,7 +124,7 @@ public class DrawableCard extends Drawable{
//to string retourne le hash code de l'objet qui est donc unique ce qui fait de lui un id parfait //to string retourne le hash code de l'objet qui est donc unique ce qui fait de lui un id parfait
cardDescription = new Drawable(c.getDescription(),0,0,toString()+"description",DESCRIPTION_WIDTH,DESCRIPTION_HEIGHT,DESCRIPTION_FONT_SIZE,DESCRIPTION_TEXT_X_RES,DESCRIPTION_TEXT_Y_RES); cardDescription = new Drawable(c.getDescription(),0,0,toString()+"description",DESCRIPTION_WIDTH,DESCRIPTION_HEIGHT,DESCRIPTION_FONT_SIZE,DESCRIPTION_TEXT_X_RES,DESCRIPTION_TEXT_Y_RES);
cardTitle = new DrawableCardTitle(c.getName(),0,0,toString()+"name",TITLE_WIDTH,TITLE_HEIGHT,TITLE_FONT_SIZE); cardTitle = new Drawable(c.getName(),0,0,toString()+"name",TITLE_WIDTH,TITLE_HEIGHT,TITLE_FONT_SIZE,TEXT_TITLE_X_RES,TEXT_TITLE_Y_RES);
Rectangle opacityRect = new Rectangle(x,y,OPACITY_RECT_WIDTH+x,OPACITY_RECT_HEIGHT+x); Rectangle opacityRect = new Rectangle(x,y,OPACITY_RECT_WIDTH+x,OPACITY_RECT_HEIGHT+x);
Bitmap pictureBitmap = BitmapFactory.decodeResource(context.getResources(),c.getCardPicture()); Bitmap pictureBitmap = BitmapFactory.decodeResource(context.getResources(),c.getCardPicture());
@@ -178,14 +181,14 @@ public class DrawableCard extends Drawable{
{ {
if(onBoard) { if(onBoard) {
if (atk != null) if (atk != null)
cardAtkDrawable = new DrawableHpAtk(atk+"", 0, 0, toString() + "atk", ONBOARD_ATK_HP_WIDTH, ONBOARD_ATK_HP_HEIGHT, HP_ATK_FONT_SIZE_BOARD); cardAtkDrawable = new Drawable(atk+"", 0, 0, toString() + "atk", ONBOARD_ATK_HP_WIDTH, ONBOARD_ATK_HP_HEIGHT, HP_ATK_FONT_SIZE_BOARD,TEXT_ATK_HP_X_RES,TEXT_ATK_HP_Y_RES);
if (hp != null) if (hp != null)
cardHpDrawable = new DrawableHpAtk(hp+"", 0, 0, toString() + "hp", ONBOARD_ATK_HP_WIDTH, ONBOARD_ATK_HP_HEIGHT, HP_ATK_FONT_SIZE_BOARD); cardHpDrawable = new Drawable(hp+"", 0, 0, toString() + "hp", ONBOARD_ATK_HP_WIDTH, ONBOARD_ATK_HP_HEIGHT, HP_ATK_FONT_SIZE_BOARD,TEXT_ATK_HP_X_RES,TEXT_ATK_HP_Y_RES);
}else{ }else{
if (atk != null) if (atk != null)
cardAtkDrawable = new DrawableHpAtk(atk + "", 0, 0, toString() + "atk", OFFBOARD_ATK_HP_WIDTH, OFFBOARD_ATK_HP_HEIGHT, HP_ATK_FONT_SIZE_BIG_CARD); cardAtkDrawable = new Drawable(atk + "", 0, 0, toString() + "atk", OFFBOARD_ATK_HP_WIDTH, OFFBOARD_ATK_HP_HEIGHT, HP_ATK_FONT_SIZE_BIG_CARD,TEXT_ATK_HP_X_RES,TEXT_ATK_HP_Y_RES);
if (hp != null) if (hp != null)
cardHpDrawable = new DrawableHpAtk(hp + "", 0, 0, toString() + "hp", OFFBOARD_ATK_HP_WIDTH, OFFBOARD_ATK_HP_HEIGHT, HP_ATK_FONT_SIZE_BIG_CARD); cardHpDrawable = new Drawable(hp + "", 0, 0, toString() + "hp", OFFBOARD_ATK_HP_WIDTH, OFFBOARD_ATK_HP_HEIGHT, HP_ATK_FONT_SIZE_BIG_CARD,TEXT_ATK_HP_X_RES,TEXT_ATK_HP_Y_RES);
} }
setCoordinates(getX(), getY()); setCoordinates(getX(), getY());
} }
app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCardTitle.java
-10
View File
@@ -1,10 +0,0 @@
package com.iutlaval.myapplication.Video.Drawables;
public class DrawableCardTitle extends Drawable{
private static int TEXT_X_RES = 281;
private static int TEXT_Y_RES = 60;
public DrawableCardTitle(String text, float x_pos, float y_pos, String name, float x_size, float y_size, float textSize) {
super(text,x_pos,y_pos,name,x_size,y_size,textSize,TEXT_X_RES,TEXT_Y_RES);
}
}
app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableHpAtk.java
-12
View File
@@ -1,12 +0,0 @@
package com.iutlaval.myapplication.Video.Drawables;
public class DrawableHpAtk extends Drawable {
private static int TEXT_X_RES = 110;
private static int TEXT_Y_RES = 60;
public DrawableHpAtk(String text, float x_pos, float y_pos, String name, float x_size, float y_size, float textSize) {
super(text,x_pos,y_pos,name,x_size,y_size,textSize,TEXT_X_RES,TEXT_Y_RES);
}
}