Fixed a bug where bounces weren't reset when losing. Other minor fixes.

Jonathan / BallJumper

Browse code Fixed a bug where bounces weren't reset when losing. Other minor fixes. master
1 parent 585cf8f commit 9d83b5978ffb88047e949c6369ef4177325e0c20 Jonathan Ström authored on 23 Aug 2017

Patch

Showing 1 changed file

Ignore Space Show notes View app/src/main/java/jonathan/balljumper/classes/HighscoreHandler.java
package jonathan.balljumper.classes; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; import java.util.Locale; /** * Created by Jonathan on 23/08/2017. / public class HighscoreHandler { private final Paint paint; private int currentBounces; // Keeps track of how many times you have bounced. private float currentHeight; // Keeps track of how far you've gotten. private long startTime; // Keeps track of the time you've played. public HighscoreHandler() { paint = new Paint(); paint.setColor(Color.BLACK); paint.setTextSize(25); startTime = System.currentTimeMillis(); } public final void draw(Canvas canvas) { String[] text = { String.format(Locale.ENGLISH, "Height: %d meters", (int) (currentHeight / 10)), String.format(Locale.ENGLISH, "Bounces: %d", (currentBounces)), String.format(Locale.ENGLISH, "Time: %s", getTimePlayed()), }; for (int i = 0; i < text.length; ++i) { canvas.drawText(text[i], 7, 30 + 26 i, paint); } } private String getTimePlayed() { long currentTime = (System.currentTimeMillis() - startTime) / 1000; int s = ((int)(currentTime % 60)); int m = ((int)(currentTime / 60 % 60)); int h = ((int)(currentTime / 60 / 60 % 60)); int d = ((int)(currentTime / 60 / 60 / 60 % 24)); if (d > 0) { return d + ":" + h + ":" + m + ":" + s; } else if (h > 0) { return h + ":" + m + ":" + s; } else if (m > 0) { return m + "m " + s + "s"; } else { return s + "s"; } } public void resetAndSave() { // TODO: Save function. currentHeight = 0; currentBounces = 0; startTime = System.currentTimeMillis(); } public void addHeight(float height) { this.currentHeight += height; } public void addBounce() { this.currentBounces++; } } package jonathan.balljumper.classes; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; /** * Created by Jonathan on 23/08/2017. / public class HighscoreHandler { private final Paint paint; private int currentBounces; // Keeps track of how many times you have bounced. private float currentHeight; // Keeps track of how far you've gotten. private long startTime; // Keeps track of the time you've played. public HighscoreHandler() { paint = new Paint(); paint.setColor(Color.BLACK); paint.setTextSize(25); startTime = System.currentTimeMillis(); } public final void draw(Canvas canvas) { String[] text = { String.format("Height: %d meters", (int) (currentHeight / 10)), String.format("Bounces: %d", (currentBounces)), String.format("Time: %s", getTimePlayed()), }; for (int i = 0; i < text.length; ++i) { canvas.drawText(text[i], 7, 30 + 26 i, paint); } } private final String getTimePlayed() { long currentTime = (System.currentTimeMillis() - startTime) / 1000; int s = ((int)(currentTime % 60)); int m = ((int)(currentTime / 60 % 60)); int h = ((int)(currentTime / 60 / 60 % 60)); int d = ((int)(currentTime / 60 / 60 / 60 % 24)); if (d > 0) { return d + ":" + h + ":" + m + ":" + s; } else if (h > 0) { return h + ":" + m + ":" + s; } else if (m > 0) { return m + "m " + s + "s"; } else { return s + "s"; } } public void resetAndSave() { // TODO: Save function. currentHeight = 0; startTime = System.currentTimeMillis(); } public void addHeight(float height) { this.currentHeight += height; } public void addBounce() { this.currentBounces++; } }

Ignore Space Show notes View

app/src/main/java/jonathan/balljumper/classes/HighscoreHandler.java

package jonathan.balljumper.classes;

import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;

import java.util.Locale;

/**
 * Created by Jonathan on 23/08/2017.
 */

public class HighscoreHandler {
    private final Paint paint;

private int currentBounces; // Keeps track of how many times you have bounced.
    private float currentHeight; // Keeps track of how far you've gotten.
    private long startTime; // Keeps track of the time you've played.

public HighscoreHandler() {
        paint = new Paint();
        paint.setColor(Color.BLACK);
        paint.setTextSize(25);

startTime = System.currentTimeMillis();
    }

public final void draw(Canvas canvas) {
        String[] text = {
                String.format(Locale.ENGLISH, "Height: %d meters", (int) (currentHeight / 10)),
                String.format(Locale.ENGLISH, "Bounces: %d", (currentBounces)),
                String.format(Locale.ENGLISH, "Time: %s", getTimePlayed()),
        };

for (int i = 0; i < text.length; ++i) {
            canvas.drawText(text[i], 7, 30 + 26 * i, paint);
        }
    }

private String getTimePlayed() {
        long currentTime = (System.currentTimeMillis() - startTime) / 1000;
        int s = ((int)(currentTime % 60));
        int m = ((int)(currentTime / 60 % 60));
        int h = ((int)(currentTime / 60 / 60 % 60));
        int d = ((int)(currentTime / 60 / 60 / 60 % 24));

if (d > 0) { return d + ":" + h + ":" + m + ":" + s; }
        else if (h > 0) { return h + ":" + m + ":" + s; }
        else if (m > 0) { return m + "m " + s + "s"; }
        else { return s + "s"; }
    }

public void resetAndSave() {
        // TODO: Save function.

currentHeight = 0;
        currentBounces = 0;
        startTime = System.currentTimeMillis();
    }

public void addHeight(float height) {
        this.currentHeight += height;
    }

public void addBounce() {
        this.currentBounces++;
    }
}

package jonathan.balljumper.classes;

import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;

/**
 * Created by Jonathan on 23/08/2017.
 */

public class HighscoreHandler {
    private final Paint paint;

public HighscoreHandler() {
        paint = new Paint();
        paint.setColor(Color.BLACK);
        paint.setTextSize(25);

startTime = System.currentTimeMillis();
    }

public final void draw(Canvas canvas) {
        String[] text = {
                String.format("Height: %d meters", (int) (currentHeight / 10)),
                String.format("Bounces: %d", (currentBounces)),
                String.format("Time: %s", getTimePlayed()),
        };

for (int i = 0; i < text.length; ++i) {
            canvas.drawText(text[i], 7, 30 + 26 * i, paint);
        }
    }

private final String getTimePlayed() {
        long currentTime = (System.currentTimeMillis() - startTime) / 1000;
        int s = ((int)(currentTime % 60));
        int m = ((int)(currentTime / 60 % 60));
        int h = ((int)(currentTime / 60 / 60 % 60));
        int d = ((int)(currentTime / 60 / 60 / 60 % 24));

public void resetAndSave() {
        // TODO: Save function.

currentHeight = 0;
        startTime = System.currentTimeMillis();
    }

public void addHeight(float height) {
        this.currentHeight += height;
    }

public void addBounce() {
        this.currentBounces++;
    }
}

Show line notes below