add todo list file and update jigsawBoardView to show images.shuffle …

…them and more
wahajali · Aug 9, 2011 · 2279475 · 2279475
1 parent cb245c5
commit 2279475
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 19 deletions.
diff --git a/.todo.text.swp b/.todo.text.swp
diff --git a/bin/GamePack.apk b/bin/GamePack.apk
diff --git a/bin/classes.dex b/bin/classes.dex
diff --git a/bin/com/nav/gamepack/puzzle/jigsaw/JigsawBoardView$1.class b/bin/com/nav/gamepack/puzzle/jigsaw/JigsawBoardView$1.class
diff --git a/bin/com/nav/gamepack/puzzle/jigsaw/JigsawBoardView.class b/bin/com/nav/gamepack/puzzle/jigsaw/JigsawBoardView.class
diff --git a/bin/com/nav/gamepack/puzzle/jigsaw/JigsawCell.class b/bin/com/nav/gamepack/puzzle/jigsaw/JigsawCell.class
diff --git a/src/com/nav/gamepack/puzzle/jigsaw/JigsawBoardView.java b/src/com/nav/gamepack/puzzle/jigsaw/JigsawBoardView.java
@@ -46,7 +46,7 @@ private void init(final Context context) {
 			@Override
 			public void onClick(View v) {
 				new AlertDialog.Builder(context).setMessage(
-						((JigsawCell) v).getCellCurrentPosition() + "").show();
+						((JigsawCell) v).getCurrentPosition() + "").show();
 			}
 		};
 
@@ -78,7 +78,7 @@ private void prepareJigsawBoardImage() {
 				cells[currentCell] = new JigsawCell(context);
 				cells[currentCell].layout(imageStartX, imageStartY, imageStartX
 						+ width, imageStartY + height);
-				cells[currentCell].setCellImageIndex(currentCell);
+				cells[currentCell].setJigsawImageIndex(currentCell);
 				cells[currentCell].setClickable(true);
 				cells[currentCell].setOnClickListener(jigsawCellClickListener);
 				// cells[currentCell].onTouchEvent(jigsawCellTouchListener);
@@ -91,7 +91,7 @@ private void prepareJigsawBoardImage() {
 		cells[currentCell] = new JigsawCell(context);
 		cells[currentCell].layout((columns - 1) * width, imageStartY, columns
 				* width, imageStartY + height);
-		cells[currentCell].setCellImageIndex(currentCell);
+		cells[currentCell].setJigsawImageIndex(currentCell);
 
 		// new
 		// AlertDialog.Builder(context).setMessage("w="+height+"\nh="+width+"\nrows"+rows).setNegativeButton("cancle",
@@ -107,7 +107,7 @@ private void prepareJigsawBoardImage() {
 	protected void onDraw(Canvas canvas) {
 		super.onDraw(canvas);
 		if (!isBoardInitialized)
-			initBoard(false);
+			initBoard(true);
 
 		Paint p1 = new Paint();
 		p1.setStyle(Style.STROKE);
@@ -120,10 +120,10 @@ protected void onDraw(Canvas canvas) {
 		// else
 		// canvas.drawRect(10, 10, getRight() - 10, getBottom() - 10, p1);
 		// int i=0;
-		for (int i = 0; i < cells.length; i++) {
+		for (int i = 0; i < cells.length-1; i++) {
 
-			// canvas.drawBitmap(jigsawCellImages[i], cells[i].getLeft(),
-			// cells[i].getTop(), p1);
+			canvas.drawBitmap(jigsawCellImages[cells[i].getJigsawImageIndex()], cells[i].getLeft(),
+			 cells[i].getTop(), p1);
 			canvas.drawRect(cells[i].getLeft(), cells[i].getTop(), cells[i]
 					.getRight(), cells[i].getBottom(), p1);
 
@@ -172,11 +172,11 @@ public void initBoard(boolean shuffleCells) {
 	public void shuffleCells(int shuffleCount) {
 		Random r = new Random();
 		for (int i = 0; i < shuffleCount; i++) {
-			int num1 = r.nextInt(cells.length);
-			int num2 = r.nextInt(cells.length);
-			JigsawCell c = cells[num1];
-			cells[num1] = cells[num2];
-			cells[num2] = c;
+			int num1 = r.nextInt(cells.length-2);
+			int num2 = r.nextInt(cells.length-2);
+			int tempImageIndex=cells[num1].getJigsawImageIndex();
+			cells[num1].setJigsawImageIndex(cells[num2].getJigsawImageIndex());
+	        cells[num2].setJigsawImageIndex(tempImageIndex);
 		}
 	}
 
@@ -199,9 +199,12 @@ private int findClickedCellIndex(final float x, final float y) {
 	public boolean onTouchEvent(MotionEvent event) {
 		int cellIndex=findClickedCellIndex(event.getX(), event.getY());
 		if (cellIndex>0)
-		new AlertDialog.Builder(context).setMessage(
-				cells[cellIndex].getLeft() + " R "+cells[cellIndex].getRight()+" T: "+cells[cellIndex].getTop()+" D "+cells[cellIndex].getBottom()).show();
-		else
+		//new AlertDialog.Builder(context).setMessage(
+			//	cells[cellIndex].getLeft() + " R "+cells[cellIndex].getRight()+" T: "+cells[cellIndex].getTop()+" D "+cells[cellIndex].getBottom()).show();
+			new AlertDialog.Builder(context).setMessage(
+					cells[cellIndex].getJigsawImageIndex() + " P "+cells[cellIndex].getCurrentPosition()).show();
+
+			else
 			new AlertDialog.Builder(context).setMessage("zero").show();
 
 		return true;

diff --git a/src/com/nav/gamepack/puzzle/jigsaw/JigsawCell.java b/src/com/nav/gamepack/puzzle/jigsaw/JigsawCell.java
@@ -39,14 +39,14 @@ public JigsawCell(Context context) {
 	/**
 	 * @param cellImageIndex the cellImageIndex to set
 	 */
-	public void setCellImageIndex(int cellImageIndex) {
-		this.cellImageIndex = cellImageIndex;
+	public void setJigsawImageIndex(int jigsawImageIndex) {
+		this.cellImageIndex = jigsawImageIndex;
 	}
 
 	/**
 	 * @return the cellImageIndex
 	 */
-	public int getCellImageIndex() {
+	public int getJigsawImageIndex() {
 		return cellImageIndex;
 	}
 
@@ -60,7 +60,7 @@ public void setCellCurrentPosition(int cellCurrentPosition) {
 	/**
 	 * @return the cellCurrentPosition
 	 */
-	public int getCellCurrentPosition() {
+	public int getCurrentPosition() {
 		return cellCurrentPosition;
 	}
 

diff --git a/todo.text b/todo.text
@@ -0,0 +1,7 @@
+voice reconginzation for movement instruction]
+git pic from cam
+search pic from mem/sdcard
+image selector
+save game in db
+ColorPicker
+