null?

[FreeShisen] / src / de / cwde / freeshisen / ShisenShoView.java

diff --git a/src/de/cwde/freeshisen/ShisenShoView.java b/src/de/cwde/freeshisen/ShisenShoView.java
index ecb476387bc7f3e62d74deebf183b7fad07a8cf0..6f567ce21e92bf57302e0ea426f0fd1fb35bbb27 100644 (file)
--- a/src/de/cwde/freeshisen/ShisenShoView.java
+++ b/src/de/cwde/freeshisen/ShisenShoView.java
@@ -1,12 +1,15 @@
 package de.cwde.freeshisen;
 
 package de.cwde.freeshisen;
 

+import java.lang.ref.WeakReference;

 import java.util.List;
 import java.util.Locale;
 import java.util.Timer;
 import java.util.TimerTask;
 
 import android.app.Activity;
 import java.util.List;
 import java.util.Locale;
 import java.util.Timer;
 import java.util.TimerTask;
 
 import android.app.Activity;

+import android.app.AlertDialog;

 import android.content.Context;
 import android.content.Context;

+import android.content.SharedPreferences;

 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;


@@ -21,6 +24,7 @@ import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.os.Handler;
 import android.os.Message;
 import android.graphics.Typeface;
 import android.os.Handler;
 import android.os.Message;

+import android.preference.PreferenceManager;

 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.SurfaceHolder;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.SurfaceHolder;


@@ -28,6 +32,7 @@ import android.view.SurfaceView;
 
 class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 
 
 class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 

+       private static final String INVALID_TIME = "9:99:99";

        private static final String COLOR_TEXT = "#FFFFFF";
        private static final String COLOR_TEXT_SHADOW = "#000000";
        private static final String COLOR_HINT = "#F0C000";
        private static final String COLOR_TEXT = "#FFFFFF";
        private static final String COLOR_TEXT_SHADOW = "#000000";
        private static final String COLOR_HINT = "#F0C000";


@@ -44,24 +49,42 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
        private int tileWidth;
        private Bitmap bg;
        private Bitmap tile[];
        private int tileWidth;
        private Bitmap bg;
        private Bitmap tile[];

-       private int[] selection1=new int[2];
-       private int[] selection2=new int[2];
-       private List<Point> path=null;
-       private List<Line> pairs=null;
+       private Point selection1 = new Point(0, 0);
+       private Point selection2 = new Point(0, 0);
+       private List<Point> path = null;
+       private List<Line> pairs = null;

        private long startTime;
        private long playTime;
        private long baseTime;
        private Timer timer;
        private long startTime;
        private long playTime;
        private long baseTime;
        private Timer timer;

-       private static Handler timerHandler;

 
 

-       private boolean timerRegistered=false;
+       static class hHandler extends Handler {
+               private final WeakReference<ShisenShoView> mTarget;
+
+               hHandler(ShisenShoView target) {
+                       mTarget = new WeakReference<ShisenShoView>(target);
+               }
+
+               @Override
+               public void handleMessage(Message msg) {
+                       ShisenShoView target = mTarget.get();
+                       if (target != null)
+                               target.onUpdateTime();
+               }
+       }
+
+       private Handler timerHandler = new hHandler(this);
+
+       private boolean timerRegistered = false;

        private ShisenSho app;
        private StatePlay cstate;
        private StatePaint pstate;
        private Canvas canvas = null;
        private SurfaceHolder surfaceHolder = null;
        private ShisenSho app;
        private StatePlay cstate;
        private StatePaint pstate;
        private Canvas canvas = null;
        private SurfaceHolder surfaceHolder = null;

+       private String time = INVALID_TIME;
+

        public ShisenShoView(ShisenSho shishenSho) {
        public ShisenShoView(ShisenSho shishenSho) {

-               super((Context)shishenSho);
+               super((Context) shishenSho);

                this.app = shishenSho;
                cstate = StatePlay.UNINITIALIZED;
                surfaceHolder = getHolder();
                this.app = shishenSho;
                cstate = StatePlay.UNINITIALIZED;
                surfaceHolder = getHolder();


@@ -69,8 +92,11 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
        }
 
        public ShisenShoView(Context ctx) {
        }
 
        public ShisenShoView(Context ctx) {

-               super((Context)ctx);
-               // silence lint?
+               super(ctx);
+               this.app = (ShisenSho) ctx;
+               cstate = StatePlay.UNINITIALIZED;
+               surfaceHolder = getHolder();
+               surfaceHolder.addCallback(this);

        }
 
        private void paint(StatePaint pstate) {
        }
 
        private void paint(StatePaint pstate) {


@@ -129,27 +155,23 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
        }
 
        private void registerTimer() {
        }
 
        private void registerTimer() {

-               if (timer!=null) return; // Already registered
-               timerHandler = new Handler() {
-                       public void handleMessage(Message msg) {
-                               onUpdateTime();
-                       }
-               };
-               timer=new Timer();
+               if (timer != null)
+                       return; // Already registered
+               timer = new Timer();

                timer.scheduleAtFixedRate(new TimerTask() {
                        public void run() {
                                timerHandler.sendEmptyMessage(Activity.RESULT_OK);
                        }
                }, 0, 1000);
                timer.scheduleAtFixedRate(new TimerTask() {
                        public void run() {
                                timerHandler.sendEmptyMessage(Activity.RESULT_OK);
                        }
                }, 0, 1000);

-               timerRegistered=true;
+               timerRegistered = true;

        }
 
        private void unregisterTimer() {
        }
 
        private void unregisterTimer() {

-               if (timer==null) return; // Already unregistered
+               if (timer == null)
+                       return; // Already unregistered

                timer.cancel();
                timer = null;
                timer.cancel();
                timer = null;

-               timerHandler = null;
-               timerRegistered=false;
+               timerRegistered = false;

        }
 
        public void pauseTime() {
        }
 
        public void pauseTime() {


@@ -182,7 +204,7 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
                startTime=System.currentTimeMillis();
                playTime=0;
                baseTime=0;
                startTime=System.currentTimeMillis();
                playTime=0;
                baseTime=0;

-               if (app.timeCounter && !timerRegistered) {
+               if (!timerRegistered) {

                        registerTimer();
                }
                pairs=app.board.getPairs(1);
                        registerTimer();
                }
                pairs=app.board.getPairs(1);


@@ -226,7 +248,7 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 
        private void onUndoActivate() {
                if (app.board.getCanUndo()) {
 
        private void onUndoActivate() {
                if (app.board.getCanUndo()) {

-                       if (cstate==StatePlay.GAMEOVER && app.timeCounter && !timerRegistered) {
+                       if (cstate==StatePlay.GAMEOVER && !timerRegistered) {

                                // Reprogram the time update that had been
                                // deactivated with the game over status
                                registerTimer();
                                // Reprogram the time update that had been
                                // deactivated with the game over status
                                registerTimer();


@@ -239,7 +261,7 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
        }
 
        public void onTimeCounterActivate() {
        }
 
        public void onTimeCounterActivate() {

-               if (app.timeCounter && cstate!=StatePlay.GAMEOVER && !timerRegistered) {
+               if (cstate!=StatePlay.GAMEOVER && !timerRegistered) {

                        // Reprogram the time update that had been
                        // deactivated with the time_counter=false
                        registerTimer();
                        // Reprogram the time update that had been
                        // deactivated with the time_counter=false
                        registerTimer();


@@ -248,7 +270,7 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 
        private void onUpdateTime() {
                paint(pstate);
 
        private void onUpdateTime() {
                paint(pstate);

-               if (!(app.timeCounter && cstate!=StatePlay.GAMEOVER)) {
+               if (cstate==StatePlay.GAMEOVER) {

                        unregisterTimer();
                }
        }
                        unregisterTimer();
                }
        }


@@ -288,14 +310,8 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 
        protected void doDraw(Canvas canvas) {
                try {
 
        protected void doDraw(Canvas canvas) {
                try {

-                       // Double buffering
-                       // Bitmap buffer = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888);
-                       //Canvas cbuffer = new Canvas(buffer);
-                       Canvas cbuffer = canvas;

                        if (canvas == null) return;
 
                        if (canvas == null) return;
 

-                       //super.onDraw(canvas);
-

                        // Board upper left corner on screen
                        int x0=0;
                        int y0=0;
                        // Board upper left corner on screen
                        int x0=0;
                        int y0=0;


@@ -307,8 +323,6 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 
                        int selectcolor = Color.parseColor(COLOR_SELECTED);
                        int hintcolor = Color.parseColor(COLOR_HINT);
 
                        int selectcolor = Color.parseColor(COLOR_SELECTED);
                        int hintcolor = Color.parseColor(COLOR_HINT);

-                       Paint paint = new Paint();
-                       paint.setFlags(Paint.ANTI_ALIAS_FLAG);

 
                        // Background & board painting
                        switch (pstate) {
 
                        // Background & board painting
                        switch (pstate) {


@@ -325,7 +339,7 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
                                int bgHeight = bg.getHeight();
                                for (int i=0; i<screenHeight/bgHeight+1; i++) {
                                        for (int j=0; j<screenWidth/bgWidth+1; j++) {
                                int bgHeight = bg.getHeight();
                                for (int i=0; i<screenHeight/bgHeight+1; i++) {
                                        for (int j=0; j<screenWidth/bgWidth+1; j++) {

-                                               cbuffer.drawBitmap(bg, j*bgWidth, i*bgHeight, paint);
+                                               canvas.drawBitmap(bg, j*bgWidth, i*bgHeight, null);

                                        }
                                }
 
                                        }
                                }
 


@@ -337,7 +351,7 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
                                                        // Tiles are 56px height, 40px width each
                                                        char piece=app.board.board[i][j];
                                                        if (piece!=0) {
                                                        // Tiles are 56px height, 40px width each
                                                        char piece=app.board.board[i][j];
                                                        if (piece!=0) {

-                                                               cbuffer.drawBitmap(tile[piece], x0+j*tileWidth, y0+i*tileHeight, paint);
+                                                               canvas.drawBitmap(tile[piece], x0+j*tileWidth, y0+i*tileHeight, null);

                                                        }
                                                }
                                        }
                                                        }
                                                }
                                        }


@@ -345,62 +359,31 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
                                break;
                        }
 
                                break;
                        }
 

-                       // Red rectangle for selection 1
+                       // rectangle for selection 1

                        switch (pstate) {
                        case SELECTED1:
                        case SELECTED2:
                        case MATCHED:
                        switch (pstate) {
                        case SELECTED1:
                        case SELECTED2:
                        case MATCHED:

-                               paint.setColor(selectcolor);
-                               paint.setStyle(Style.STROKE);
-                               paint.setStrokeCap(Cap.ROUND);
-                               paint.setStrokeJoin(Join.ROUND);
-                               paint.setStrokeWidth(3);
-                               cbuffer.drawRect(new Rect(
-                                               x0+selection1[1]*tileWidth-2,
-                                               y0+selection1[0]*tileHeight-2,
-                                               x0+selection1[1]*tileWidth-2+tileWidth+2*2,
-                                               y0+selection1[0]*tileHeight-2+tileHeight+2*2),
-                                               paint);
+                               highlightTile(canvas, x0, y0, selection1, selectcolor);

                                break;
                        }
 
                                break;
                        }
 

-                       // Red rectangle for selection 2
+                       // rectangle for selection 2

                        switch (pstate) {
                        case SELECTED2:
                        case MATCHED:
                        switch (pstate) {
                        case SELECTED2:
                        case MATCHED:

-                               paint.setColor(selectcolor);
-                               paint.setStyle(Style.STROKE);
-                               paint.setStrokeCap(Cap.ROUND);
-                               paint.setStrokeJoin(Join.ROUND);
-                               paint.setStrokeWidth(3);
-                               cbuffer.drawRect(new Rect(
-                                               x0+selection2[1]*tileWidth-2,
-                                               y0+selection2[0]*tileHeight-2,
-                                               x0+selection2[1]*tileWidth-2+tileWidth+2*2,
-                                               y0+selection2[0]*tileHeight-2+tileHeight+2*2),
-                                               paint);
+                               highlightTile(canvas, x0, y0, selection2, selectcolor);

                                break;
                        }
 
                        // Matching path
                        switch (pstate) {
                        case MATCHED:
                                break;
                        }
 
                        // Matching path
                        switch (pstate) {
                        case MATCHED:

-                               paint.setColor(selectcolor);
-                               paint.setStyle(Style.STROKE);
-                               paint.setStrokeCap(Cap.ROUND);
-                               paint.setStrokeJoin(Join.ROUND);
-                               paint.setStrokeWidth(3);
-

                                if (path!=null) {
                                        Point p0=null;
                                        for (Point p1 : path) {
                                                if (p0!=null) {
                                if (path!=null) {
                                        Point p0=null;
                                        for (Point p1 : path) {
                                                if (p0!=null) {

-                                                       cbuffer.drawLine(
-                                                                       x0+p0.j*tileWidth-2+(tileWidth/2),
-                                                                       y0+p0.i*tileHeight-2+(tileHeight/2),
-                                                                       x0+p1.j*tileWidth-2+(tileWidth/2),
-                                                                       y0+p1.i*tileHeight-2+(tileHeight/2),
-                                                                       paint);
+                                                       drawLine(canvas, x0, y0, p0, p1, selectcolor);

                                                }
                                                p0=p1;
                                        }
                                                }
                                                p0=p1;
                                        }


@@ -408,49 +391,29 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
                                break;
                        }
 
                                break;
                        }
 

-                       // Orange hint rectangles
+                       // hint rectangles

                        switch (pstate) {
                        case HINT:
                        switch (pstate) {
                        case HINT:

-                               if (pairs!=null && pairs.size()>0) {
-                                       Line pair=pairs.get(0);
-                                       Point a=pair.a;
-                                       Point b=pair.b;
-                                       path=app.board.getPath(a,b);
-                                       paint.setColor(hintcolor);
-                                       paint.setStyle(Style.STROKE);
-                                       paint.setStrokeCap(Cap.ROUND);
-                                       paint.setStrokeJoin(Join.ROUND);
-                                       paint.setStrokeWidth(3);
-
-                                       cbuffer.drawRect(new Rect(
-                                                       x0+a.j*tileWidth-2,
-                                                       y0+a.i*tileHeight-2,
-                                                       x0+a.j*tileWidth-2+tileWidth+2*2,
-                                                       y0+a.i*tileHeight-2+tileHeight+2*2),
-                                                       paint);
-
-                                       if (path!=null) {
-                                               Point p0=null;
+                               if (pairs != null && pairs.size() > 0) {
+                                       Line pair = pairs.get(0);
+                                       Point a = pair.a;
+                                       Point b = pair.b;
+                                       path = app.board.getPath(a, b);
+
+                                       highlightTile(canvas, x0, y0, a, hintcolor);
+
+                                       if (path != null) {
+                                               Point p0 = null;

                                                for (Point p1 : path) {
                                                for (Point p1 : path) {

-                                                       if (p0!=null) {
-                                                               cbuffer.drawLine(
-                                                                               x0+p0.j*tileWidth-2+(tileWidth/2),
-                                                                               y0+p0.i*tileHeight-2+(tileHeight/2),
-                                                                               x0+p1.j*tileWidth-2+(tileWidth/2),
-                                                                               y0+p1.i*tileHeight-2+(tileHeight/2),
-                                                                               paint);
+                                                       if (p0 != null) {
+                                                               drawLine(canvas, x0, y0, p0, p1, hintcolor);

                                                        }
                                                        }

-                                                       p0=p1;
+                                                       p0 = p1;

                                                }
                                                }

-                                               path=null;
+                                               path = null;

                                        }
 
                                        }
 

-                                       cbuffer.drawRect(new Rect(
-                                                       x0+b.j*tileWidth-2,
-                                                       y0+b.i*tileHeight-2,
-                                                       x0+b.j*tileWidth-2+tileWidth+2*2,
-                                                       y0+b.i*tileHeight-2+tileHeight+2*2),
-                                                       paint);
+                                       highlightTile(canvas, x0, y0, b, hintcolor);

                                }
                                break;
                        }
                                }
                                break;
                        }


@@ -458,16 +421,16 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
                        // Win & loose notifications
                        switch (pstate) {
                        case WIN:
                        // Win & loose notifications
                        switch (pstate) {
                        case WIN:

-                               drawMessage(cbuffer, screenWidth / 2, screenHeight / 2, true,
+                               drawMessage(canvas, screenWidth / 2, screenHeight / 2, true,

                                                "You Win!", 100);
                                break;
                        case LOSE:
                                                "You Win!", 100);
                                break;
                        case LOSE:

-                               drawMessage(cbuffer, screenWidth / 2, screenHeight / 2, true,
+                               drawMessage(canvas, screenWidth / 2, screenHeight / 2, true,

                                                "Game Over", 100);
                                break;
                        }
 
                                                "Game Over", 100);
                                break;
                        }
 

-                       if (app.timeCounter) switch (pstate) {
+                       switch (pstate) {

                        case BOARD:
                        case SELECTED1:
                        case SELECTED2:
                        case BOARD:
                        case SELECTED1:
                        case SELECTED2:


@@ -480,31 +443,21 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
                                int hours = (int) (playTime / (60 * 60));
                                int minutes = (int) ((playTime / 60) % 60);
                                int seconds = (int) (playTime % 60);
                                int hours = (int) (playTime / (60 * 60));
                                int minutes = (int) ((playTime / 60) % 60);
                                int seconds = (int) (playTime % 60);

-                               String time = String.format(Locale.US, "%01d:%02d:%02d",
-                                               hours, minutes, seconds);
+                               if (hours < 10) {
+                                       time = String.format(Locale.US, "%01d:%02d:%02d",
+                                                       hours, minutes, seconds);
+                               } else {
+                                       time = INVALID_TIME;
+                               }

 
                                int timePosX=screenWidth-120;
                                int timePosY=screenHeight-10;
 
                                int timePosX=screenWidth-120;
                                int timePosY=screenHeight-10;

-
-                               drawMessage(cbuffer, timePosX, timePosY, false, time, 30);
-                               break;
-                       }
-
-                       // Debug messages
-                       /*
-                       debugMessage="StatePlay: "+cstate+"\n"+"StatePaint: "+pstate;
-                       if (debugMessage!=null && debugMessage.length()>0) {
-                               int l = 20;
-                               String lines[] = debugMessage.split("\n");
-                               for (int i=0; i<lines.length; i++) {
-                                       drawMessage(cbuffer,1,l,false,lines[i],"#FFFF00",30);
-                                       l+=30;
+                               
+                               if (app.timeCounter) {
+                                       drawMessage(canvas, timePosX, timePosY, false, time, 30);

                                }
                                }

+                               break;

                        }
                        }

-                        */
-
-                       // Double buffer dumping
-                       // canvas.drawBitmap(buffer, 0, 0, null);

 
                } catch (Exception e) {
                        e.printStackTrace();
 
                } catch (Exception e) {
                        e.printStackTrace();


@@ -512,6 +465,37 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 
        }
 
 
        }
 

+       private void drawLine(Canvas canvas, int x0, int y0, Point p0, Point p1, int color) {
+               Paint paint = new Paint();
+               paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+               paint.setColor(color);
+               paint.setStyle(Style.STROKE);
+               paint.setStrokeCap(Cap.ROUND);
+               paint.setStrokeJoin(Join.ROUND);
+               paint.setStrokeWidth(3);
+               canvas.drawLine(
+                               x0 + p0.j * tileWidth - 2 + (tileWidth / 2),
+                               y0 + p0.i * tileHeight - 2 + (tileHeight / 2),
+                               x0 + p1.j * tileWidth - 2 + (tileWidth / 2),
+                               y0 + p1.i * tileHeight - 2 + (tileHeight / 2), paint);
+       }
+
+       private void highlightTile(Canvas canvas, int x0, int y0, Point p, int color) {
+               Paint paint = new Paint();
+               paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+               paint.setColor(color);
+               paint.setStyle(Style.STROKE);
+               paint.setStrokeCap(Cap.ROUND);
+               paint.setStrokeJoin(Join.ROUND);
+               paint.setStrokeWidth(3);
+               Rect r = new Rect(
+                               x0 + p.j * tileWidth - 2,
+                               y0 + p.i * tileHeight - 2,
+                               x0 + p.j * tileWidth + tileWidth + 2,
+                               y0 + p.i * tileHeight + tileHeight + 2);
+               canvas.drawRect(r, paint);
+       }
+

        @Override
        public boolean onTouchEvent(MotionEvent event) {
                if (event.getAction()==MotionEvent.ACTION_DOWN) {
        @Override
        public boolean onTouchEvent(MotionEvent event) {
                if (event.getAction()==MotionEvent.ACTION_DOWN) {


@@ -527,44 +511,42 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 
                        switch (cstate) {
                        case IDLE:
 
                        switch (cstate) {
                        case IDLE:

-                               if (i>=0 &&
-                               i<app.board.boardSize[0] &&
-                               j>=0 && j<app.board.boardSize[1] &&
-                               app.board.board[i][j]!=0) {
-                                       selection1[0]=i;
-                                       selection1[1]=j;
+                               if (i >= 0 && i < app.board.boardSize[0] && j >= 0
+                               && j < app.board.boardSize[1]
+                                               && app.board.board[i][j] != 0) {
+                                       selection1.set(i, j);

                                        paint(StatePaint.SELECTED1);
                                        control(StatePlay.SELECTED1);
                                }
                                break;
                        case SELECTED1:
                                        paint(StatePaint.SELECTED1);
                                        control(StatePlay.SELECTED1);
                                }
                                break;
                        case SELECTED1:

-                               if (i>=0 && i<app.board.boardSize[0] &&
-                               j>=0 && j<app.board.boardSize[1] &&
-                               app.board.board[i][j]!=0) {
-                                       if (i==selection1[0] && j==selection1[1]) {
+                               if (i >= 0 && i < app.board.boardSize[0] && j >= 0
+                               && j < app.board.boardSize[1]
+                                               && app.board.board[i][j] != 0) {
+                                       if (selection1.equals(i, j)) {

                                                paint(StatePaint.BOARD);
                                                control(StatePlay.IDLE);
                                        } else {
                                                paint(StatePaint.BOARD);
                                                control(StatePlay.IDLE);
                                        } else {

-                                               selection2[0]=i;
-                                               selection2[1]=j;
+                                               selection2.set(i, j);

                                                paint(StatePaint.SELECTED2);
 
                                                paint(StatePaint.SELECTED2);
 

-                                               Point a=new Point(selection1[0],selection1[1]);
-                                               Point b=new Point(selection2[0],selection2[1]);
-                                               path=app.board.getPath(a,b);
+                                               Point a = selection1.copy();
+                                               Point b = selection2.copy();
+                                               path = app.board.getPath(a, b);

                                                paint(StatePaint.MATCHED);
                                                app.sleep(2);
                                                paint(StatePaint.BOARD);
                                                paint(StatePaint.MATCHED);
                                                app.sleep(2);
                                                paint(StatePaint.BOARD);

-                                               if (path.size()>0) {
-                                                       app.board.play(a,b);
+                                               if (path.size() > 0) {
+                                                       app.board.play(a, b);

                                                }
                                                }

-                                               path=null;
+                                               path = null;

                                                paint(StatePaint.BOARD);
 
                                                paint(StatePaint.BOARD);
 

-                                               pairs=app.board.getPairs(1);
-                                               if (pairs.size()==0) {
-                                                       if (app.board.getNumPieces()==0) {
+                                               pairs = app.board.getPairs(1);
+                                               if (pairs.size() == 0) {
+                                                       if (app.board.getNumPieces() == 0) {

                                                                paint(StatePaint.WIN);
                                                                paint(StatePaint.WIN);

+                                                               checkforhiscore();

                                                        } else {
                                                                paint(StatePaint.LOSE);
                                                        }
                                                        } else {
                                                                paint(StatePaint.LOSE);
                                                        }


@@ -586,10 +568,44 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
                }
        }
 
                }
        }
 

+       private void checkforhiscore() {
+               if (timerRegistered) {
+                       unregisterTimer();
+               }
+               final String[] sizes = { "S", "M", "L" };
+               final String[] diffs = { "E", "H" };
+               String prefname1 = "hiscore_" + diffs[app.difficulty-1] + sizes[app.size-1] + "1";
+               String prefname2 = "hiscore_" + diffs[app.difficulty-1] + sizes[app.size-1] + "2";
+               // get hiscores for current size/difficulty
+               SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(app);
+               String besttime1 = sp.getString(prefname1, INVALID_TIME);
+               String besttime2 = sp.getString(prefname2, INVALID_TIME);
+               // did we win something?
+               if (time.compareTo(besttime2) < 0) {
+                       // score!
+                       new AlertDialog.Builder(app.activity)
+                               .setTitle("Hiscore!")
+                               .setCancelable(true)
+                               .setIcon(R.drawable.icon)
+                               .setPositiveButton(app.getString(android.R.string.ok), null)
+                               .setMessage("You've made the highscore list!").create() // FIXME: hardcoded string
+                               .show();
+
+                       SharedPreferences.Editor editor = sp.edit();
+                       if (time.compareTo(besttime1) < 0) {
+                               editor.putString(prefname1, time);
+                               editor.putString(prefname2, besttime1);
+                       } else {
+                               editor.putString(prefname2, time);
+                       }
+                       editor.commit();
+               }
+       }
+

        public void surfaceChanged(SurfaceHolder holder, int format, int width,
                        int height) {
                surfaceHolder = holder;
        public void surfaceChanged(SurfaceHolder holder, int format, int width,
                        int height) {
                surfaceHolder = holder;

-               if (cstate!=StatePlay.GAMEOVER && app.timeCounter && !timerRegistered) {
+               if (cstate!=StatePlay.GAMEOVER && !timerRegistered) {

                        registerTimer();
                }
                repaint();
                        registerTimer();
                }
                repaint();


@@ -606,87 +622,4 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
                        unregisterTimer();
                }
        }
                        unregisterTimer();
                }
        }

-
-       /*
-       @Override
-       protected void onDraw(Canvas canvas) {
-               super.onDraw(canvas);
-
-               if (!initialized) initialize();
-
-               long currTime = System.currentTimeMillis();
-
-               a = (float)(currTime - startTime) / (float)duration;
-               if (a > (float)1.0) a = (float)1.0;
-
-               x = Math.round(nextx*a + prevx*(1-a));
-               y = Math.round(nexty*a + prevy*(1-a));
-
-               if (a == (float)1.0) computeNextTarget();
-
-               int bgWidth = bg.getWidth();
-               int bgHeight = bg.getHeight();
-               for (int i=0; i<height/bgHeight+1; i++) {
-                       for (int j=0; j<width/bgWidth+1; j++) {
-                               canvas.drawBitmap(bg, j*bgWidth, i*bgHeight, paint);
-                       }
-               }
-
-               canvas.drawBitmap(tile[randomtile], x, y, paint);
-
-               repaint();
-       }
-
-       @Override
-       public boolean onTouchEvent(MotionEvent event) {
-               if (event.getActionMasked()==MotionEvent.ACTION_DOWN) {
-                       //computeNextTarget();
-                       //nextx=Math.round(event.getX());
-                       //nexty=Math.round(event.getY());
-               }
-               return super.onTouchEvent(event);
-       }
-
-       private void initialize() {
-               width = getWidth();
-               height = getHeight();
-
-               bg = BitmapFactory.decodeResource(getResources(), R.drawable.kshisen_bgnd);
-               Bitmap tileset = BitmapFactory.decodeResource(getResources(), R.drawable.tileset);
-
-               // The tile set has 4 rows x 9 columns
-               tsrows = 4;
-               tscols = 9;
-               twidth = tileset.getWidth()/tscols;
-               theight = tileset.getHeight()/tsrows;
-               tile = new Bitmap[tsrows*tscols];
-               int k=0;
-               for (int i=0; i<tsrows; i++) {
-                       for (int j=0; j<tscols; j++) {
-                               tile[k] = Bitmap.createBitmap(tileset, j*twidth, i*theight, twidth, theight, null, false);
-                               k++;
-                       }
-               }
-
-               x = width/2;
-               y = height/2;
-
-               computeNextTarget();
-
-               initialized = true;
-       }
-
-       private void computeNextTarget() {
-               startTime = System.currentTimeMillis();
-               prevx = x;
-               prevy = y;
-               nextx = (int) Math.floor(Math.random() * width);
-               nexty = (int) Math.floor(Math.random() * height);
-               randomtile = (int) Math.floor(Math.random() * tile.length);
-
-               paint = new Paint();
-               paint.setColor(Color.parseColor("#006666"));
-               paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-       }
-        */

 }
 }