X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/FreeShisen/blobdiff_plain/341682548c876653db2cd7892cac65858c42d215..HEAD:/src/de/cwde/freeshisen/ShisenShoView.java

diff --git a/src/de/cwde/freeshisen/ShisenShoView.java b/src/de/cwde/freeshisen/ShisenShoView.java
index 2864811..6a38ffc 100644
--- a/src/de/cwde/freeshisen/ShisenShoView.java
+++ b/src/de/cwde/freeshisen/ShisenShoView.java
@@ -7,12 +7,13 @@ 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;
 import android.graphics.Color;
-import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Paint.Align;
 import android.graphics.Paint.Cap;
@@ -22,6 +23,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;
@@ -40,12 +42,7 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 
 	private int screenWidth;
 	private int screenHeight;
-	private int tilesetRows;
-	private int tilesetCols;
-	private int tileHeight;
-	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;
@@ -54,6 +51,7 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 	private long playTime;
 	private long baseTime;
 	private Timer timer;
+	private Tileset tileset;
 
 	static class hHandler extends Handler {
 		private final WeakReference<ShisenShoView> mTarget;
@@ -80,17 +78,21 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 	private SurfaceHolder surfaceHolder = null;
 	private String time = INVALID_TIME;
 
-	public ShisenShoView(ShisenSho shishenSho) {
-		super((Context) shishenSho);
-		this.app = shishenSho;
+	public ShisenShoView(ShisenSho shisenSho) {
+		super((Context) shisenSho);
+		this.app = shisenSho;
 		cstate = StatePlay.UNINITIALIZED;
 		surfaceHolder = getHolder();
 		surfaceHolder.addCallback(this);
+		tileset = new Tileset(shisenSho);
 	}
 
 	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) {
@@ -102,45 +104,6 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 		this.cstate=cstate;
 	}
 
-	private void loadTileset() {
-		BitmapFactory.Options ops = new BitmapFactory.Options();
-		ops.inScaled = false;
-		Bitmap tileset = BitmapFactory.decodeResource(getResources(), R.drawable.tileset, ops);
-		tileset.setDensity(Bitmap.DENSITY_NONE);
-
-		// The tile set has 4 rows x 9 columns
-		tilesetRows = 4;
-		tilesetCols = 9;
-		int loadedtileWidth = tileset.getWidth()/tilesetCols;
-		int loadedtileHeight = tileset.getHeight()/tilesetRows;
-		tile = new Bitmap[tilesetRows*tilesetCols];
-
-		// align to screen:
-		// "large" is 16x6, and we want to have a nice border, so we use 17x7 and
-		// choose the lowest scale so everything fits
-		float scalex = ((float) screenWidth/17) / loadedtileWidth;
-		float scaley = ((float) screenHeight/7) / loadedtileHeight;
-		if (scaley < scalex) {
-			scalex = scaley;
-		} else {
-			scaley = scalex;
-		}
-		Matrix matrix = new Matrix();
-		matrix.setScale(scalex, scaley);
-
-		int k=0;
-		for (int i=0; i<tilesetRows; i++) {
-			for (int j=0; j<tilesetCols; j++) {
-				tile[k] = Bitmap.createBitmap(tileset, j*loadedtileWidth, i*loadedtileHeight,
-						loadedtileWidth, loadedtileHeight, matrix, false);
-				tile[k].setDensity(Bitmap.DENSITY_NONE);
-				k++;
-			}
-		}
-		tileWidth = tile[0].getWidth();
-		tileHeight = tile[0].getHeight();
-	}
-
 	private void loadBackground() {
 		BitmapFactory.Options ops = new BitmapFactory.Options();
 		ops.inScaled = false;
@@ -186,6 +149,10 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 		}
 	}
 
+	public void loadTileset() {
+		tileset.loadTileset(screenWidth, screenHeight);
+	}
+	
 	private void initializeGame() {
 		loadBackground();
 		screenWidth=getWidth();
@@ -198,7 +165,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);
@@ -242,7 +209,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();
@@ -255,7 +222,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();
@@ -264,7 +231,7 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 
 	private void onUpdateTime() {
 		paint(pstate);
-		if (!(app.timeCounter && cstate!=StatePlay.GAMEOVER)) {
+		if (cstate==StatePlay.GAMEOVER) {
 			unregisterTimer();
 		}
 	}
@@ -290,7 +257,7 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 		try {
 			if (canvas == null) canvas = surfaceHolder.lockCanvas(null);
 			if (canvas == null) return;
-			if (cstate==StatePlay.UNINITIALIZED) initializeGame();
+			if (cstate == StatePlay.UNINITIALIZED) initializeGame();
 			synchronized (surfaceHolder) {
 				doDraw(canvas);
 			}
@@ -311,8 +278,8 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 			int y0=0;
 
 			if (app!=null && app.board!=null) {
-				x0=(screenWidth-app.board.boardSize[1]*tileWidth)/2;
-				y0=(screenHeight-app.board.boardSize[0]*tileHeight)/2;
+				x0=(screenWidth-app.board.boardSize[1]*tileset.tileWidth)/2;
+				y0=(screenHeight-app.board.boardSize[0]*tileset.tileHeight)/2;
 			}
 
 			int selectcolor = Color.parseColor(COLOR_SELECTED);
@@ -345,7 +312,11 @@ 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, null);
+								canvas.drawBitmap(
+										tileset.tile[piece],
+										x0+j*tileset.tileWidth,
+										y0+i*tileset.tileHeight,
+										null);
 							}
 						}
 					}
@@ -468,10 +439,10 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 		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);
+				x0 + p0.j * tileset.tileWidth - 2 + (tileset.tileWidth / 2),
+				y0 + p0.i * tileset.tileHeight - 2 + (tileset.tileHeight / 2),
+				x0 + p1.j * tileset.tileWidth - 2 + (tileset.tileWidth / 2),
+				y0 + p1.i * tileset.tileHeight - 2 + (tileset.tileHeight / 2), paint);
 	}
 
 	private void highlightTile(Canvas canvas, int x0, int y0, Point p, int color) {
@@ -483,10 +454,10 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 		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);
+				x0 + p.j * tileset.tileWidth - 2,
+				y0 + p.i * tileset.tileHeight - 2,
+				x0 + p.j * tileset.tileWidth + tileset.tileWidth + 2,
+				y0 + p.i * tileset.tileHeight + tileset.tileHeight + 2);
 		canvas.drawRect(r, paint);
 	}
 
@@ -500,8 +471,8 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 
 	private void onClick(int x, int y) {
 		try {
-			int i=(y-(screenHeight-app.board.boardSize[0]*tileHeight)/2)/tileHeight;
-			int j=(x-(screenWidth-app.board.boardSize[1]*tileWidth)/2)/tileWidth;
+			int i=(y-(screenHeight-app.board.boardSize[0]*tileset.tileHeight)/2)/tileset.tileHeight;
+			int j=(x-(screenWidth-app.board.boardSize[1]*tileset.tileWidth)/2)/tileset.tileWidth;
 
 			switch (cstate) {
 			case IDLE:
@@ -540,6 +511,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);
 							}
@@ -561,10 +533,45 @@ 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(R.string.hiscore_title)
+				.setCancelable(true)
+				.setIcon(R.drawable.icon)
+				.setPositiveButton(android.R.string.ok, null)
+				.setMessage(R.string.hiscore_text)
+				.create()
+				.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();