Changeset 205f525 in advance-wars

Timestamp:

Jan 30, 2011, 8:26:19 PM (14 years ago)

Author:

dportnoy <devnull@…>

Branches:

master

Children:

26a9fd6, a0f5455

Parents:

90838a1

Message:

Added some buttons to the main menu. Added a new package to the project to make gui creation easier.

Files:

• res/values/strings.xml (modified) (1 diff)
• src/com/example/advancewars/Game.java (modified) (3 diffs)
• src/com/example/advancewars/GameView.java (modified) (9 diffs)
• src/com/example/gui/Button.java (added)
• src/com/example/gui/GUIObject.java (added)
• src/com/example/gui/Text.java (added)

res/values/strings.xml

@@ -2 +2 @@
 <resources>
     <string name="hello">Hello World, advancewars!</string>
-    <string name="app_name"></string>
+    <string name="app_name">Advance Wars</string>
     <string name="menu_exit">Exit</string>
 </resources>

src/com/example/advancewars/Game.java

@@ -52 +52 @@
                 this.finish();
                 break;
-            case MENU_NEW:
-                break;
         }
 
@@ -67 +65 @@
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        Log.w("Blackjack", "We're inside onCreate");
+        Log.w("AdvanceWars", "We're inside onCreate");
         
         super.onCreate(savedInstanceState);
         
-        Log.w("Blackjack", "the super constructor was called successfully");
+        Log.w("AdvanceWars", "the super constructor was called successfully");
 
         // turn off the window's title bar
@@ -81 +79 @@
         mGameView = (GameView) findViewById(R.id.lunar);
         mThread = mGameView.getThread();
+        mGameView.mGame = this;
 
         mGameView.setTextView((TextView) findViewById(R.id.text));
 
         if (savedInstanceState == null) {       // we were just launched: set up a new game
-                Log.w("Blackjack", "SIS is null");
+                Log.w("AdvanceWars", "SIS is null");
                 
                 mThread.setState(AppState.RUNNING);
         } else {
-            Log.w("Blackjack", "SIS is nonnull");
+            Log.w("AdvanceWars", "SIS is nonnull");
             
             mThread.setState(AppState.RUNNING);

src/com/example/advancewars/GameView.java

@@ -2 +2 @@
 
 import java.util.*;
+
+import com.example.gui.*;
 
 import android.content.Context;
@@ -57 +59 @@
         private SurfaceHolder mSurfaceHolder;
         
-        public DrawingThread(SurfaceHolder surfaceHolder, Context context,
-                Handler handler) {
+        private Hashtable<String, GUIObject> drawableObjects;
+        
+        public DrawingThread(SurfaceHolder surfaceHolder, Context context, Handler handler) {
             // get handles to some important objects
             mSurfaceHolder = surfaceHolder;
@@ -72 +75 @@
             mTextPaint.setARGB(255, 255, 255, 255);
             mTextPaint.setTextSize(12);
+            mTextPaint.setTextAlign(Paint.Align.CENTER);
             
             mButtonPaint = new Paint();
@@ -86 +90 @@
             mTilePaint2.setAntiAlias(true);
             mTilePaint2.setARGB(255, 0, 0, 255);
+            
+            drawableObjects = new Hashtable<String, GUIObject>();
+            
+            drawableObjects.put("txtTitle", new Text("Main Menu", 100, 30, 120, 20, mTextPaint));
+            drawableObjects.put("btnNewGame", new Button("New Game", 100, 90, 120, 20, mLinePaint, mButtonPaint));
+            drawableObjects.put("btnLoadGame", new Button("Load Game", 100, 125, 120, 20, mLinePaint, mButtonPaint));
+            drawableObjects.put("btnMapEditor", new Button("Map Editor", 100, 160, 120, 20, mLinePaint, mButtonPaint));
+            drawableObjects.put("btnQuit", new Button("Quit", 100, 195, 120, 20, mLinePaint, mButtonPaint));
             
             Tile grassTile = new Tile(mTilePaint1);
@@ -116 +128 @@
                 mLastTime = System.currentTimeMillis() + 100;
                 setState(AppState.RUNNING);
-                Log.i("Blackjack", "Player's turn starting now");
+                Log.i("AdvanceWars", "Player's turn starting now");
                 mGameState = GameState.MAIN_MENU;
             }
@@ -234 +246 @@
                 mCanvasHeight = height;
                 
-                Log.i("Blackjack", "width: "+mCanvasWidth+", height: "+mCanvasHeight);
+                Log.i("AdvanceWars", "width: "+mCanvasWidth+", height: "+mCanvasHeight);
             }
         }
@@ -319 +331 @@
                 switch(mGameState) {
                 case MAIN_MENU:
-                        text = "Main Menu";
-                canvas.drawText(text, 0, 450-(metrics.ascent+metrics.descent)/2, mTextPaint);
+                for (GUIObject o : drawableObjects.values()) {
+                        o.draw(canvas);
+                }
                         break;
                 case BATTLE_MAP:
@@ -360 +373 @@
     /** The thread that actually draws the animation */
     private DrawingThread thread;
+    
+    public Game mGame;
 
     public GameView(Context context, AttributeSet attrs) {
@@ -381 +396 @@
 
     @Override public boolean onTouchEvent(MotionEvent event) {
-        Log.i("Blackjack", "Detected touch event");
+        Log.i("AdvanceWars", "Detected touch event");
         
         if(event.getAction() == MotionEvent.ACTION_UP) {
-                Log.i("Blackjack", "Detected UP touch action");
+                Log.i("AdvanceWars", "Detected UP touch action");
                 switch(thread.mGameState) {
                 case MAIN_MENU:
-                        Log.i("Blackjack", "Switching to battle map");
-                        thread.mGameState = GameState.BATTLE_MAP;
+                        Log.i("AdvanceWars", "Switching to battle map");
+                        if(thread.drawableObjects.get("btnNewGame").isClicked(event.getX(), event.getY())) {
+                                thread.mGameState = GameState.BATTLE_MAP;
+                        }else if(thread.drawableObjects.get("btnLoadGame").isClicked(event.getX(), event.getY())) {
+                                thread.mGameState = GameState.BATTLE_MAP;
+                        }else if(thread.drawableObjects.get("btnQuit").isClicked(event.getX(), event.getY())) {
+                                mGame.finish();
+                        }
                         break;
                 case BATTLE_MAP:
-                        Log.i("Blackjack", "Touch event detected on battle map");
+                        Log.i("AdvanceWars", "Touch event detected on battle map");
+                        thread.mGameState = GameState.MAIN_MENU;
                         break;
                 }