From 7525747cd60b366adfb238477d262bbfb8f5a840 Mon Sep 17 00:00:00 2001
From: gumartinm <gustavo@gumartinm.name>
Date: Fri, 31 Aug 2012 15:05:09 +0200
Subject: [PATCH] Next step: IA

---
 res/layout/activity_reversi.xml         |  4 ++--
 res/values/strings.xml                  |  6 +++---
 src/de/android/reversi/ReversiView.java | 20 ++++++++++++++++++++
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/res/layout/activity_reversi.xml b/res/layout/activity_reversi.xml
index 2996699..7316fc0 100644
--- a/res/layout/activity_reversi.xml
+++ b/res/layout/activity_reversi.xml
@@ -16,7 +16,7 @@
             android:layout_width="wrap_content" 
             android:layout_height="wrap_content"/>
         <TextView android:text=" 2" 
-            android:id="@+id/txtPlayer1Counter"
+            android:id="@+id/txtPlayer1Score"
             android:minWidth="30dp" 
             android:layout_width="wrap_content"
             android:layout_height="wrap_content">    
@@ -29,7 +29,7 @@
         </TextView>
         <TextView 
             android:text=" 2" 
-            android:id="@+id/txtPlayer2Counter"
+            android:id="@+id/txtPlayer2Score"
             android:minWidth="30dp" 
             android:layout_width="wrap_content"
             android:layout_height="wrap_content">
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1b88f05..1f1e715 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4,7 +4,7 @@
     <string name="hello_world">Hello world!</string>
     <string name="menu_settings">Settings</string>
     <string name="title_activity_reversi">ReversiActivity</string>
-    <string name="player1">Blue</string>
-    <string name="player2">Red</string>
-
+    <string name="player1">Black: </string>
+    <string name="player2">White: </string>
+    <string name="discs"> discs</string>
 </resources>
\ No newline at end of file
diff --git a/src/de/android/reversi/ReversiView.java b/src/de/android/reversi/ReversiView.java
index 566bca3..4d4d607 100644
--- a/src/de/android/reversi/ReversiView.java
+++ b/src/de/android/reversi/ReversiView.java
@@ -3,6 +3,7 @@ package de.android.reversi;
 import java.util.ArrayList;
 import java.util.List;
 
+import android.app.Activity;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -11,6 +12,7 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
+import android.widget.TextView;
 
 
 public class ReversiView extends SurfaceView {
@@ -22,6 +24,7 @@ public class ReversiView extends SurfaceView {
 
     private final Square gameBoard[][] = new Square[NUMBER_OF_ROWS][NUMBER_OF_COLUMNS];
     private final Player IA = Player.NOPLAYER;
+    private final Context context;
 
     //¿Funciona bien volatile con enum? Ver mi codigo de Singletons y enums.
     private volatile Player currentPlayer = Player.PLAYER1;
@@ -36,18 +39,21 @@ public class ReversiView extends SurfaceView {
 
     public ReversiView(final Context context) {
         super(context);
+        this.context = context;
         this.preInitBoard();
         this.initialize();
     }
 
     public ReversiView(final Context context, final AttributeSet attrs) {
         super(context, attrs);
+        this.context = context;
         this.preInitBoard();
         this.initialize();
     }
 
     public ReversiView(final Context context, final AttributeSet attrs, final int defStyle) {
         super(context, attrs, defStyle);
+        this.context = context;
         this.preInitBoard();
         this.initialize();
     }
@@ -249,13 +255,27 @@ public class ReversiView extends SurfaceView {
     }
 
     private void drawPositions(final Canvas canvas) {
+        int player1Score = 0;
+        int player2Score = 0;
+
         for (short column = 0; column < NUMBER_OF_COLUMNS; column++) {
             for (short row = 0; row < NUMBER_OF_ROWS; row++) {
                 if (this.gameBoard[column][row].getPlayer() != Player.NOPLAYER) {
+                    if (this.gameBoard[column][row].getPlayer() == Player.PLAYER1 &&
+                            !this.gameBoard[column][row].isSuggestion() ) {
+                        player1Score++;
+                    }
+                    if (this.gameBoard[column][row].getPlayer() == Player.PLAYER2 &&
+                            !this.gameBoard[column][row].isSuggestion() ) {
+                        player2Score++;
+                    }
                     drawDisk(canvas, this.gameBoard[column][row], column, row);
                 }
             }
         }
+
+        ((TextView)((Activity)this.context).findViewById(R.id.txtPlayer1Score)).setText(String.format(" %d %s", player1Score, "discs"));
+        ((TextView)((Activity)this.context).findViewById(R.id.txtPlayer2Score)).setText(String.format(" %d %s", player2Score, "discs"));
     }
 
     private void preInitBoard() {
-- 
2.1.4