X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/FreeShisen/blobdiff_plain/d0e04237b00df7c11616f359200255a8b47e79d7..952b2e4dbd6df39b40e72e1be918812a5b2fb34a:/src/de/cwde/shisensho/ShisenShoView.java

diff --git a/src/de/cwde/shisensho/ShisenShoView.java b/src/de/cwde/shisensho/ShisenShoView.java
index cb1a57c..06162c1 100644
--- a/src/de/cwde/shisensho/ShisenShoView.java
+++ b/src/de/cwde/shisensho/ShisenShoView.java
@@ -5,14 +5,13 @@ import java.util.Locale;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import de.cwde.shisensho.R;
-
 import android.app.Activity;
 import android.content.Context;
 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;
@@ -64,6 +63,11 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 		surfaceHolder.addCallback(this);
 	}
 
+	public ShisenShoView(Context ctx) {
+		super((Context)ctx);
+		// silence lint?
+	}
+
 	private void paint(StatePaint pstate) {
 		this.pstate=pstate;
 		repaint();
@@ -82,13 +86,28 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 		// The tile set has 4 rows x 9 columns
 		tilesetRows = 4;
 		tilesetCols = 9;
-		tileWidth = tileset.getWidth()/tilesetCols;
-		tileHeight = tileset.getHeight()/tilesetRows;
+		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*tileWidth, i*tileHeight, tileWidth, tileHeight, null, false);
+				tile[k] = Bitmap.createBitmap(tileset, j*loadedtileWidth, i*loadedtileHeight,
+						loadedtileWidth, loadedtileHeight, matrix, false);
 				tile[k].setDensity(Bitmap.DENSITY_NONE);
 				k++;
 			}
@@ -112,18 +131,18 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 			}
 		};
 		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;
 	}
 
 	private void unregisterTimer() {
 		if (timer==null) return; // Already unregistered
 		timer.cancel();
-    	timer = null;
+		timer = null;
 		timerHandler = null;
 		timerRegistered=false;
 	}
@@ -148,9 +167,9 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 
 	private void initializeGame() {
 		loadBackground();
-		loadTileset();
 		screenWidth=getWidth();
 		screenHeight=getHeight();
+		loadTileset();
 		//undo.sensitive=false;
 		pstate=StatePaint.BOARD;
 		app.newPlay();
@@ -165,24 +184,24 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 	}
 
 	public boolean onOptionsItemSelected(MenuItem item) {
-	    // Handle item selection
-	    switch (item.getItemId()) {
-	    case R.id.hint:
-	    	this.postDelayed(new Runnable() { public void run() { onHintActivate(); } }, 100);
-	        return true;
-	    case R.id.undo:
-	    	this.postDelayed(new Runnable() { public void run() { onUndoActivate(); } }, 100);
-	        return true;
-	    case R.id.clean:
-	    	this.postDelayed(new Runnable() { public void run() { reset(); } }, 100);
-	        return true;
-	    case R.id.options:
-	        return true;
-	    case R.id.about:
-	        return true;
-	    default:
-	        return false;
-	    }
+		// Handle item selection
+		switch (item.getItemId()) {
+		case R.id.hint:
+			this.postDelayed(new Runnable() { public void run() { onHintActivate(); } }, 100);
+			return true;
+		case R.id.undo:
+			this.postDelayed(new Runnable() { public void run() { onUndoActivate(); } }, 100);
+			return true;
+		case R.id.clean:
+			this.postDelayed(new Runnable() { public void run() { reset(); } }, 100);
+			return true;
+		case R.id.options:
+			return true;
+		case R.id.about:
+			return true;
+		default:
+			return false;
+		}
 	}
 
 	public void reset() {
@@ -224,11 +243,12 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 
 	private void onUpdateTime() {
 		paint(pstate);
-	    if (!(app.timeCounter && cstate!=StatePlay.GAMEOVER)) {
-	    	unregisterTimer();
-	    }
+		if (!(app.timeCounter && cstate!=StatePlay.GAMEOVER)) {
+			unregisterTimer();
+		}
 	}
 
+	@SuppressWarnings("deprecation")
 	public void drawMessage(Canvas canvas, int x, int y, boolean centered, String message, String color, float textSize)  {
 		Paint paint = new Paint();
 		paint.setColor(Color.parseColor(color));
@@ -471,7 +491,7 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 					l+=30;
 				}
 			}
-			*/
+			 */
 
 			// Double buffer dumping
 			// canvas.drawBitmap(buffer, 0, 0, null);
@@ -498,9 +518,9 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 			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) {
+				i<app.board.boardSize[0] &&
+				j>=0 && j<app.board.boardSize[1] &&
+				app.board.board[i][j]!=0) {
 					selection1[0]=i;
 					selection1[1]=j;
 					paint(StatePaint.SELECTED1);
@@ -509,8 +529,8 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 				break;
 			case SELECTED1:
 				if (i>=0 && i<app.board.boardSize[0] &&
-						j>=0 && j<app.board.boardSize[1] &&
-						app.board.board[i][j]!=0) {
+				j>=0 && j<app.board.boardSize[1] &&
+				app.board.board[i][j]!=0) {
 					if (i==selection1[0] && j==selection1[1]) {
 						paint(StatePaint.BOARD);
 						control(StatePlay.IDLE);
@@ -658,5 +678,5 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 		paint.setColor(Color.parseColor("#006666"));
 		paint.setFlags(Paint.ANTI_ALIAS_FLAG);
 	}
-*/
-}
\ No newline at end of file
+	 */
+}