X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/FreeShisen/blobdiff_plain/95d9287697cdeec9cc770d14179e0046482c68d4..9e75b0990e1af7f7a456395998025fc82b0cda79:/src/de/cwde/freeshisen/ShisenShoView.java?ds=sidebyside

diff --git a/src/de/cwde/freeshisen/ShisenShoView.java b/src/de/cwde/freeshisen/ShisenShoView.java
index 916dfb7..6f567ce 100644
--- a/src/de/cwde/freeshisen/ShisenShoView.java
+++ b/src/de/cwde/freeshisen/ShisenShoView.java
@@ -1,12 +1,15 @@
 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 android.app.AlertDialog;
 import android.content.Context;
+import android.content.SharedPreferences;
 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.preference.PreferenceManager;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.SurfaceHolder;
@@ -45,17 +49,33 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 	private int tileWidth;
 	private Bitmap bg;
 	private Bitmap tile[];
-	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 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 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;
@@ -72,8 +92,11 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 	}
 
 	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) {
@@ -132,27 +155,23 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 	}
 
 	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);
-		timerRegistered=true;
+		timerRegistered = true;
 	}
 
 	private void unregisterTimer() {
-		if (timer==null) return; // Already unregistered
+		if (timer == null)
+			return; // Already unregistered
 		timer.cancel();
 		timer = null;
-		timerHandler = null;
-		timerRegistered=false;
+		timerRegistered = false;
 	}
 
 	public void pauseTime() {
@@ -185,7 +204,7 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 		startTime=System.currentTimeMillis();
 		playTime=0;
 		baseTime=0;
-		if (app.timeCounter && !timerRegistered) {
+		if (!timerRegistered) {
 			registerTimer();
 		}
 		pairs=app.board.getPairs(1);
@@ -229,7 +248,7 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 
 	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();
@@ -242,7 +261,7 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 	}
 
 	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();
@@ -251,7 +270,7 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 
 	private void onUpdateTime() {
 		paint(pstate);
-		if (!(app.timeCounter && cstate!=StatePlay.GAMEOVER)) {
+		if (cstate==StatePlay.GAMEOVER) {
 			unregisterTimer();
 		}
 	}
@@ -304,8 +323,6 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 
 			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) {
@@ -322,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++) {
-						canvas.drawBitmap(bg, j*bgWidth, i*bgHeight, paint);
+						canvas.drawBitmap(bg, j*bgWidth, i*bgHeight, null);
 					}
 				}
 
@@ -334,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) {
-								canvas.drawBitmap(tile[piece], x0+j*tileWidth, y0+i*tileHeight, paint);
+								canvas.drawBitmap(tile[piece], x0+j*tileWidth, y0+i*tileHeight, null);
 							}
 						}
 					}
@@ -362,17 +379,11 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 			// 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) {
-							drawLine(canvas, x0, y0, p0, p1, paint);
+							drawLine(canvas, x0, y0, p0, p1, selectcolor);
 						}
 						p0=p1;
 					}
@@ -388,11 +399,6 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 					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);
 
 					highlightTile(canvas, x0, y0, a, hintcolor);
 
@@ -400,7 +406,7 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 						Point p0 = null;
 						for (Point p1 : path) {
 							if (p0 != null) {
-								drawLine(canvas, x0, y0, p0, p1, paint);
+								drawLine(canvas, x0, y0, p0, p1, hintcolor);
 							}
 							p0 = p1;
 						}
@@ -459,8 +465,14 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 
 	}
 
-	private void drawLine(Canvas canvas, int x0, int y0, Point p0, Point p1,
-			Paint paint) {
+	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),
@@ -534,6 +546,7 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 						if (pairs.size() == 0) {
 							if (app.board.getNumPieces() == 0) {
 								paint(StatePaint.WIN);
+								checkforhiscore();
 							} else {
 								paint(StatePaint.LOSE);
 							}
@@ -555,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;
-		if (cstate!=StatePlay.GAMEOVER && app.timeCounter && !timerRegistered) {
+		if (cstate!=StatePlay.GAMEOVER && !timerRegistered) {
 			registerTimer();
 		}
 		repaint();