Commit c8ef4ed8 authored by Derek Xu's avatar Derek Xu
Browse files

Change joystick styling for hollow circle, change back if not wanted

parent c76096b0

app/src/main/java/com/example/a8_bitinvader/GameView.java

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ public class GameView extends SurfaceView implements Runnable{ 


    public GameView(Context context, int screenWidth, int screenHeight) {

        super(context);

        joystick = new Joystick(screenWidth/2,screenHeight*9/10,100,40);

        joystick = new Joystick(screenWidth/2,screenHeight*9/10,130,40);

        p1 = new Player(screenWidth/2,screenHeight*7/10,0,0, getResources());

        this.screenWidth = screenWidth;

        this.screenHeight = screenHeight;

app/src/main/java/com/example/a8_bitinvader/Joystick.java

+3 −2
Original line number Diff line number Diff line
@@ -39,8 +39,9 @@ public class Joystick { 
        innerCircleRadii = innerCircleRad;



        outerCirclePaint= new Paint();

        outerCirclePaint.setColor(Color.YELLOW);

        outerCirclePaint.setStyle(Paint.Style.FILL_AND_STROKE);

        outerCirclePaint.setColor(Color.CYAN);

        outerCirclePaint.setStyle(Paint.Style.STROKE);

        outerCirclePaint.setStrokeWidth(5);



        innerCirclePaint= new Paint();

        innerCirclePaint.setColor(Color.WHITE);

app/src/main/java/com/example/a8_bitinvader/Player.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ public class Player extends Sprite{ 
    private int health = 3;



    /** Speed */

    public final int SPEED_MULTIPLIER = 5;

    public final int SPEED_MULTIPLIER = 10;



    /**

     * Constructs a new player at given coordinates and

app/src/main/java/com/example/a8_bitinvader/Sprite.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ public class Sprite { 
    Bitmap spriteImage;



    //private properties

    private final int spriteHeight = 128, spriteWidth = 128;

    private final int spriteHeight = 160, spriteWidth = 160;



    //private properties