From: gumartinm <gustavo@gumartinm.name>
Date: Tue, 24 Apr 2012 07:10:27 +0000 (+0200)
Subject: Working on my AndroidTetris.
X-Git-Url: https://git.gumartinm.name/?a=commitdiff_plain;h=11df54a6430a825737006e423b725e34b1932818;p=JavaForFun

Working on my AndroidTetris.

Messing around with the views.
---

diff --git a/Android/AndroidTetris/AndroidManifest.xml b/Android/AndroidTetris/AndroidManifest.xml
index 046dc01..80d109a 100644
--- a/Android/AndroidTetris/AndroidManifest.xml
+++ b/Android/AndroidTetris/AndroidManifest.xml
@@ -4,6 +4,7 @@
       android:versionCode="1"
       android:versionName="1.0">
     <uses-sdk android:minSdkVersion="13" />
+    <supports-screens android:requiresSmallestWidthDp="720" />
 
     <application android:label="My AndroidTetris">
         <activity android:name=".AndroidTetrisActivity"
diff --git a/Android/AndroidTetris/gen/de/android/androidtetris/BuildConfig.java b/Android/AndroidTetris/gen/de/android/androidtetris/BuildConfig.java
new file mode 100644
index 0000000..14d8347
--- /dev/null
+++ b/Android/AndroidTetris/gen/de/android/androidtetris/BuildConfig.java
@@ -0,0 +1,6 @@
+/** Automatically generated file. DO NOT MODIFY */
+package de.android.androidtetris;
+
+public final class BuildConfig {
+    public final static boolean DEBUG = true;
+}
\ No newline at end of file
diff --git a/Android/AndroidTetris/gen/de/android/androidtetris/R.java b/Android/AndroidTetris/gen/de/android/androidtetris/R.java
index 17497a4..f19d335 100644
--- a/Android/AndroidTetris/gen/de/android/androidtetris/R.java
+++ b/Android/AndroidTetris/gen/de/android/androidtetris/R.java
@@ -16,11 +16,15 @@ public final class R {
         public static final int redstar=0x7f020002;
         public static final int yellowstar=0x7f020003;
     }
+    public static final class id {
+        public static final int level_display=0x7f050001;
+        public static final int score_display=0x7f050000;
+    }
     public static final class layout {
         public static final int main=0x7f030000;
     }
     public static final class string {
-        public static final int app_name=0x7f040001;
-        public static final int hello=0x7f040000;
+        public static final int level=0x7f040001;
+        public static final int score=0x7f040000;
     }
 }
diff --git a/Android/AndroidTetris/res/layout/main.xml b/Android/AndroidTetris/res/layout/main.xml
index 4361cfe..ad10b77 100644
--- a/Android/AndroidTetris/res/layout/main.xml
+++ b/Android/AndroidTetris/res/layout/main.xml
@@ -1,7 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    >
+    android:orientation="vertical">
+    <TextView android:id="@+id/score_display"
+       android:layout_height="wrap_content"
+       android:layout_width="wrap_content"
+       android:textSize="20dip"
+       android:typeface="monospace"
+       android:text="@string/score" >
+    </TextView>
+    <TextView android:id="@+id/level_display"
+       android:layout_height="wrap_content"
+       android:layout_width="wrap_content"
+       android:textSize="20dip"
+       android:typeface="monospace"
+       android:text="@string/level" >
+    </TextView>
+
 </LinearLayout>
diff --git a/Android/AndroidTetris/res/values/strings.xml b/Android/AndroidTetris/res/values/strings.xml
index 8c45b4c..ab72029 100644
--- a/Android/AndroidTetris/res/values/strings.xml
+++ b/Android/AndroidTetris/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="hello">Hello World, AndroidTetrisActivity!</string>
-    <string name="app_name">AndroidTetris</string>
+    <string name="score">Score: </string>
+    <string name="level">Level: </string>
 </resources>
diff --git a/Android/AndroidTetris/src/de/android/androidtetris/AndroidTetrisActivity.java b/Android/AndroidTetris/src/de/android/androidtetris/AndroidTetrisActivity.java
index 82b604f..283a20a 100644
--- a/Android/AndroidTetris/src/de/android/androidtetris/AndroidTetrisActivity.java
+++ b/Android/AndroidTetris/src/de/android/androidtetris/AndroidTetrisActivity.java
@@ -1,8 +1,10 @@
 package de.android.androidtetris;
 
 import android.app.Activity;
+import android.content.Context;
 import android.os.Bundle;
 import android.util.DisplayMetrics;
+import android.view.inputmethod.InputMethodManager;
 
 public class AndroidTetrisActivity extends Activity {
 	DrawView drawView;
diff --git a/Android/AndroidTetris/src/de/android/androidtetris/DrawView.java b/Android/AndroidTetris/src/de/android/androidtetris/DrawView.java
index 1a2e892..4277223 100644
--- a/Android/AndroidTetris/src/de/android/androidtetris/DrawView.java
+++ b/Android/AndroidTetris/src/de/android/androidtetris/DrawView.java
@@ -22,7 +22,7 @@ import android.view.SurfaceView;
 public class DrawView extends SurfaceView {
 	private SurfaceHolder holder;
     private final MainLoop mainLoop;
-    private static final int TILESIZE=16;
+    private static final int TILESIZE=32;
     private static final int MAPWIDTH=10;
     private static final int MAPHEIGHT=20;
     private static final int GREY=8;
@@ -168,30 +168,30 @@ public class DrawView extends SurfaceView {
     	//canvas.getWidth() <----------------- retrieve the screen width
     	//canvas.getWidth()/TILESIZE <-------- the tile size is 16, so we have to count on it when finding the center
     	//((canvas.getWidth()/TILESIZE))/2 <-- this is the middle of our screen, it depends on the tile size.
-    	final int initX = (((canvas.getWidth()/TILESIZE)/2) - MAPWIDTH);
+        final int initX = ((((canvas.getWidth()/TILESIZE)/2) - MAPWIDTH) + 1);
     	
     	
     	//draw the left bar (with scores, and next pieces
     	for(int x=MAPWIDTH; x< MAPWIDTH + GREY; x++)
     		for(int y=0; y< MAPHEIGHT; y++)
-    			drawTile(canvas, Tile.GRAY.getColor(), x + initX, y);
+                drawTile(canvas, Tile.GRAY.getColor(), x + initX, y + 10);
     	
     	//draw the pre-piece
     	for(int x=0; x < PrePiece.WIDTH; x++)
     		for(int y=0; y< PrePiece.HEIGHT; y++)
     			if(prePiece.size[x][y] != Tile.NOCOLOR)
-    				drawTile(canvas, prePiece.size[x][y].getColor(), prePiece.x + x + initX, prePiece.y +y);
+                    drawTile(canvas, prePiece.size[x][y].getColor(), prePiece.x + x + initX, prePiece.y + y + 10);
     	
     	//draw grid
     	for(int x=0; x < MAPWIDTH; x++)
     		for(int y=0; y < MAPHEIGHT; y++)
-    			drawTile(canvas, mapMatrix[x][y].getColor(), x + initX, y);
+                drawTile(canvas, mapMatrix[x][y].getColor(), x + initX, y+10);
 
     	//draw the current block
     	for(int x=0; x < CurrentPiece.WIDTH; x++)
     		for(int y=0; y < CurrentPiece.HEIGHT; y++)
     			if(currentPiece.size[x][y] != Tile.NOCOLOR)
-    				drawTile(canvas, currentPiece.size[x][y].getColor(), currentPiece.x + x + initX, currentPiece.y +y);
+                    drawTile(canvas, currentPiece.size[x][y].getColor(), currentPiece.x + x + initX, currentPiece.y +y +10);
     }
     
     
@@ -371,4 +371,4 @@ public class DrawView extends SurfaceView {
     	
     	return false;
     }
-}
\ No newline at end of file
+}