mise en place de convention de nomage

app/src/main/java/com/iutlaval/myapplication/Game/Board.java

@@ -1,8 +1,8 @@
 package com.iutlaval.myapplication.Game;
 
 import com.iutlaval.myapplication.Game.Cards.Card;
-import com.iutlaval.myapplication.Game.Player.Player;
-import com.iutlaval.myapplication.Game.Player.PlayerLocal;
+import com.iutlaval.myapplication.Game.Players.Player;
+import com.iutlaval.myapplication.Game.Players.PlayerLocal;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/iutlaval/myapplication/Game/Cards/Card.java

@@ -5,7 +5,7 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 
 import com.iutlaval.myapplication.Game.Board;
-import com.iutlaval.myapplication.Game.Player.Player;
+import com.iutlaval.myapplication.Game.Players.Player;
 import com.iutlaval.myapplication.R;
 import com.iutlaval.myapplication.Video.Drawables.DrawableCard;
 
@@ -56,12 +56,11 @@ public abstract class Card {
      */
     public Bitmap getFrameBitmap(Context c)
     {
-        //TODO add a frame
         if(frameBitmap == null) {
-            frameBitmap=BitmapFactory.decodeResource(c.getResources(), R.drawable.cadre_carte);
+            frameBitmap=BitmapFactory.decodeResource(c.getResources(), R.drawable.t_cc_defaut);
         }
 
-        if(getFrameTexture() == R.drawable.cadre_carte)
+        if(getFrameTexture() == R.drawable.t_cc_defaut)
         {
             return frameBitmap;
         }else{
@@ -79,7 +78,7 @@ public abstract class Card {
      */
     public int getFrameTexture()
     {
-        return R.drawable.cadre_carte;
+        return R.drawable.t_cc_defaut;
     }
 
 

app/src/main/java/com/iutlaval/myapplication/Game/Cards/DemoCard.java

@@ -20,7 +20,7 @@ public class DemoCard extends Card{
 
     @Override
     public int getCardPicture() {
-        return R.drawable.elfe_fournisseur;
+        return R.drawable.t_cp_elfe_fournisseur;
     }
 
 

app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java

@@ -33,7 +33,7 @@ public class GameLogicThread extends Thread{
     public void run() {
 
         //renderer.addToDraw(new Drawable(new Rectangle(0,0,100,100),"background", Color.BLUE));
-        Bitmap bitmap= BitmapFactory.decodeResource(cont.getResources(), R.drawable.background);
+        Bitmap bitmap= BitmapFactory.decodeResource(cont.getResources(), R.drawable.t_b_board_background);
         renderer.addToDraw(new Drawable(bitmap, 0,0, "background", 100, 100 ));
         //renderer.addToDraw(new Drawable(bm,0.0F,0.0F,"running",8F,16F));
         //renderer.addToDraw(new DrawableCard(new DemoCard(),0.0F,0.0F,"card2",cont));

app/src/main/java/com/iutlaval/myapplication/Game/Player/PlayerBot.java

@@ -1,4 +0,0 @@
-package com.iutlaval.myapplication.Game.Player;
-
-public class PlayerBot extends Player{
-}

app/src/main/java/com/iutlaval/myapplication/Game/Player/PlayerLocal.java

@@ -1,4 +0,0 @@
-package com.iutlaval.myapplication.Game.Player;
-
-public class PlayerLocal extends Player{
-}

app/src/main/java/com/iutlaval/myapplication/Game/Players/Player.java

@@ -1,11 +1,10 @@
-package com.iutlaval.myapplication.Game.Player;
+package com.iutlaval.myapplication.Game.Players;
 
 import com.iutlaval.myapplication.Game.Cards.Card;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Random;
 
 public abstract class Player {
     private static final int MAX_HAND_SIZE = 10;

app/src/main/java/com/iutlaval/myapplication/Game/Players/PlayerBot.java

@@ -0,0 +1,4 @@
+package com.iutlaval.myapplication.Game.Players;
+
+public class PlayerBot extends Player{
+}

app/src/main/java/com/iutlaval/myapplication/Game/Players/PlayerLocal.java

@@ -0,0 +1,4 @@
+package com.iutlaval.myapplication.Game.Players;
+
+public class PlayerLocal extends Player{
+}

app/src/main/java/com/iutlaval/myapplication/Game/Players/PlayerOnlineAdversary.java

@@ -1,4 +1,4 @@
-package com.iutlaval.myapplication.Game.Player;
+package com.iutlaval.myapplication.Game.Players;
 
 public class PlayerOnlineAdversary extends Player{
 }