v0.2 - add X or O options in 1 Player mode, minor code cleanup and optimization

unkver · unkver · commit d0cc5e8297c4 · 2025-11-26T23:23:00.000+02:00
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/README.md b/README.md
@@ -1,18 +1,17 @@
-# OpenTicTacToe (OpenTTT) v0.1
+# OpenTicTacToe (OpenTTT)
 ### Play your (probably) favorite FOSS game on your (probably) favorite android.
 <img width="303" height="640" alt="image" src="https://github.com/user-attachments/assets/0de0fd35-a0bc-46b8-823f-6ab05507d3a8" />
 
 For now it features:
 - Responsive views (aka buttons don't go crazy depending on your screen size)
-- 1 Player mode (an AI that just presses buttons randomly (better than nothing though))
-- 2 Player mode
+- 1 Player mode (an AI that just presses buttons randomly (better than nothing though); (You can also pick between going X or O!))
+- 2 Player mode 
 - Nice and simple UI
 - Supports Android 7 and higher
 - Personally tested on numerous devices (Xiaomi Note 13 Pro, Lenovo K3 Note, Lenovo Tab 4 8 (TB-8504F))
 
 TODO:
 - Ukrainian localization
-- Have player choose between going X or O in 1 Player mode
 - Light mode
 - Custom app icon
 - Much nicer design, at least the main menu
diff --git a/app/src/main/java/com/example/opentictactoe/gameplay_2.java b/app/src/main/java/com/example/opentictactoe/gameplay_2.java
@@ -4,10 +4,8 @@
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
-
 import androidx.appcompat.app.AppCompatActivity;
 
-
 public class gameplay_2 extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -16,12 +14,12 @@ protected void onCreate(Bundle savedInstanceState) {
     }
     int turn = 0;
     String[][] board = new String[3][3];
-    private void disableAllButtons() {
-        int[] ids = {
-                R.id.button00, R.id.button01, R.id.button02,
-                R.id.button10, R.id.button11, R.id.button12,
-                R.id.button20, R.id.button21, R.id.button22
-        };
+    int[] ids = {
+            R.id.button00, R.id.button01, R.id.button02,
+            R.id.button10, R.id.button11, R.id.button12,
+            R.id.button20, R.id.button21, R.id.button22
+    };
+    private void disableAllButtons(int[] ids) {
         for (int id : ids) {
             findViewById(id).setEnabled(false);
         }
@@ -58,7 +56,6 @@ public boolean checkDraw(String[][] board) {
                 if (board[r][c] == null) return false;
             }
         }
-        // If no empty cells AND no win → it's a draw
         return !checkWin(board);
     }
     public void onPress(View v){
@@ -68,7 +65,6 @@ public void onPress(View v){
         int row = Character.getNumericValue(tag.charAt(0));
         int col = Character.getNumericValue(tag.charAt(2));
 
-        // Set X and O accordingly
         if (turn == 0) {
             board[row][col] = "X";
             b.setText("X");
@@ -78,13 +74,13 @@ public void onPress(View v){
             b.setText("O");
             tv.setText("It's X's turn!");
         }
-        // Then make the button disabled
+
         v.setEnabled(false);
-        // Then check for a win
+
         if (checkWin(board)) {
             tv.setText(turn == 0 ? "X wins!" : "O wins!");
             // Disable all buttons since we won
-            disableAllButtons();
+            disableAllButtons(ids);
             return;
         }
         if (checkDraw(board)) {
diff --git a/app/src/main/java/com/example/opentictactoe/gameplay_ai.java b/app/src/main/java/com/example/opentictactoe/gameplay_ai.java
@@ -9,25 +9,32 @@
 import androidx.appcompat.app.AppCompatActivity;
 import java.util.Random;
 
-
 public class gameplay_ai extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_gameplay_2);
+        setContentView(R.layout.activity_gameplay_ai);
+        setBoardVisibility(View.GONE, ids);
     }
     int turn = 0;
+    String playerSymbol;
+    String aiSymbol;
     String[][] board = new String[3][3];
-    private void disableAllButtons() {
-        int[] ids = {
-                R.id.button00, R.id.button01, R.id.button02,
-                R.id.button10, R.id.button11, R.id.button12,
-                R.id.button20, R.id.button21, R.id.button22
-        };
+    int[] ids = {
+            R.id.button00, R.id.button01, R.id.button02,
+            R.id.button10, R.id.button11, R.id.button12,
+            R.id.button20, R.id.button21, R.id.button22
+    };
+    private void disableAllButtons(int[] ids) {
         for (int id : ids) {
             findViewById(id).setEnabled(false);
         }
     }
+    private void setBoardVisibility(int visibility, int[] ids) {
+        for (int id : ids) {
+            findViewById(id).setVisibility(visibility);
+        }
+    }
     public boolean checkWin(String[][] board) {
         // rows
         for (int r = 0; r < 3; r++) {
@@ -52,15 +59,30 @@ public boolean checkWin(String[][] board) {
         return false;
     }
     public boolean checkDraw(String[][] board) {
-        // If ANY cell is still null, it's not a draw
         for (int r = 0; r < 3; r++) {
             for (int c = 0; c < 3; c++) {
                 if (board[r][c] == null) return false;
             }
         }
-        // If no empty cells AND no win → it's a draw
         return !checkWin(board);
     }
+    public void startAsX(View v){
+        playerSymbol = "X";
+        aiSymbol = "O";
+        findViewById(R.id.buttonStartX).setVisibility(View.GONE);
+        findViewById(R.id.buttonStartO).setVisibility(View.GONE);
+        setBoardVisibility(View.VISIBLE, ids);
+        TextView tv = findViewById(R.id.turnIndicator);
+        tv.setText("Your turn!");
+    }
+    public void startAsO(View v){
+        playerSymbol = "O";
+        aiSymbol = "X";
+        findViewById(R.id.buttonStartX).setVisibility(View.GONE);
+        findViewById(R.id.buttonStartO).setVisibility(View.GONE);
+        setBoardVisibility(View.VISIBLE, ids);
+        makeAIMove(findViewById(R.id.turnIndicator));
+    }
     private void makeAIMove(TextView tv) {
         Random r = new Random();
         int row, col;
@@ -71,53 +93,49 @@ private void makeAIMove(TextView tv) {
             col = r.nextInt(3);
         } while (board[row][col] != null);
 
-        // Get the button by ID
         String buttonID = "button" + row + col;
         int id = getResources().getIdentifier(buttonID, "id", getPackageName());
         Button b = findViewById(id);
 
-        // AI always plays O
-        board[row][col] = "O";
-        b.setText("O");
+        board[row][col] = aiSymbol;
+        b.setText(aiSymbol);
         b.setEnabled(false);
         tv.setText("Your turn!");
 
         if (checkWin(board)) {
-            tv.setText("O wins!");
-            disableAllButtons();
+            tv.setText(aiSymbol + " wins!");
+            disableAllButtons(ids);
             return;
         }
         if (checkDraw(board)) {
             tv.setText("It's a draw!");
-            disableAllButtons();
+            disableAllButtons(ids);
             return;
         }
         turn = 0; // Back to player
     }
     public void onPress(View v){
-        Button b = (Button) v;
-        TextView tv = findViewById(R.id.turnIndicator);
         String tag = (String) v.getTag();
         int row = Character.getNumericValue(tag.charAt(0));
         int col = Character.getNumericValue(tag.charAt(2));
-
-        // Set X and O accordingly
-        board[row][col] = "X";
-        b.setText("X");
+        Button b = (Button) v;
+        TextView tv = findViewById(R.id.turnIndicator);
+        board[row][col] = playerSymbol;
+        b.setText(playerSymbol);
         v.setEnabled(false);
 
         if (checkWin(board)) {
-            tv.setText("X wins!");
-            disableAllButtons();
+            tv.setText(playerSymbol + " wins!");
+            disableAllButtons(ids);
             return;
         }
         if (checkDraw(board)) {
             tv.setText("It's a draw!");
-            disableAllButtons();
+            disableAllButtons(ids);
             return;
         }
-        tv.setText("Thinking...");
 
+        tv.setText("Thinking...");
         getWindow().setFlags(
                 WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE,
                 WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE
diff --git a/app/src/main/res/drawable/custom_button.xml b/app/src/main/res/drawable/custom_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#FF6200EE"/> <!-- Button background color -->
+    <solid android:color="#FF49352C"/> <!-- Button background color -->
     <corners android:radius="32dp"/> <!-- Corner radius -->
 </shape>
diff --git a/app/src/main/res/layout/activity_gameplay_ai.xml b/app/src/main/res/layout/activity_gameplay_ai.xml
@@ -8,7 +8,7 @@
     android:background="#140C0C"
     android:backgroundTint="#433540"
     android:splitMotionEvents="false"
-    tools:context=".gameplay_2">
+    tools:context=".gameplay_ai">
 
     <Button
         android:id="@+id/button21"
@@ -19,6 +19,7 @@
         android:onClick="onPress"
         android:tag="2,1"
         android:textSize="48sp"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.498"
@@ -36,6 +37,7 @@
         android:onClick="onPress"
         android:tag="2,2"
         android:textSize="48sp"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.062"
@@ -53,6 +55,7 @@
         android:onClick="onPress"
         android:tag="2,0"
         android:textSize="48sp"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/button21"
         app:layout_constraintHorizontal_bias="1.0"
@@ -69,6 +72,7 @@
         android:onClick="onPress"
         android:tag="1,0"
         android:textSize="48sp"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/button11"
         app:layout_constraintHorizontal_bias="1.0"
@@ -84,6 +88,7 @@
         android:onClick="onPress"
         android:tag="1,1"
         android:textSize="48sp"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.498"
@@ -100,6 +105,7 @@
         android:onClick="onPress"
         android:tag="1,2"
         android:textSize="48sp"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.062"
@@ -117,6 +123,7 @@
         android:onClick="onPress"
         android:tag="0,0"
         android:textSize="48sp"
+        android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/button10"
         app:layout_constraintEnd_toStartOf="@+id/button01"
         app:layout_constraintHorizontal_bias="1.0"
@@ -134,6 +141,7 @@
         android:onClick="onPress"
         android:tag="0,2"
         android:textSize="48sp"
+        android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/button12"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
@@ -150,6 +158,7 @@
         android:onClick="onPress"
         android:tag="0,1"
         android:textSize="48sp"
+        android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/button11"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.501"
@@ -161,7 +170,7 @@
         android:id="@+id/turnIndicator"
         android:layout_width="284dp"
         android:layout_height="70dp"
-        android:text="It's X's turn!"
+        android:text="It's..."
         android:textAlignment="center"
         android:textColor="#FFFFFF"
         android:textSize="48sp"
@@ -197,4 +206,30 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <Button
+        android:id="@+id/buttonStartX"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:onClick="startAsX"
+        android:text="Start as X"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.341" />
+
+    <Button
+        android:id="@+id/buttonStartO"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:onClick="startAsO"
+        android:text="Start as O"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/buttonStartX"
+        app:layout_constraintVertical_bias="0.0" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -77,7 +77,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
-        android:text="    v0.1\nby unkver"
+        android:text="    v0.2\nby unkver"
         android:textColor="#EDEDED"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
