From 4e5fbbf1dc3f2d477bc2c2d4624a65ad6e08ef3b Mon Sep 17 00:00:00 2001
From: kl <haruspex47>
Date: Mon, 22 May 2023 01:19:24 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D1=87=D1=82=D0=B8=20=D0=B4=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D0=BA=D1=80=D0=B5=D1=81=D1=82?=
 =?UTF-8?q?=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |   2 +
 app/src/main/AndroidManifest.xml              |   5 +
 .../main/java/com/example/game/GameNull.kt    |   2 +-
 app/src/main/java/com/example/game/Quiz.kt    |  12 +-
 .../main/java/com/example/game/TicTacToe.kt   | 357 ++++++++++++++++++
 app/src/main/res/layout/activity_ttt.xml      |  59 +++
 app/src/main/res/layout/buttons_ttt.xml       | 127 +++++++
 app/src/main/res/values/strings.xml           |   1 +
 app/src/main/res/values/themes.xml            |   2 +-
 9 files changed, 557 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/java/com/example/game/TicTacToe.kt
 create mode 100644 app/src/main/res/layout/activity_ttt.xml
 create mode 100644 app/src/main/res/layout/buttons_ttt.xml

diff --git a/app/build.gradle b/app/build.gradle
index 526f966..1fcf796 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -75,6 +75,7 @@ dependencies {
     implementation platform('androidx.compose:compose-bom:2022.10.00')
     implementation platform('androidx.compose:compose-bom:2022.10.00')
     implementation platform('androidx.compose:compose-bom:2022.10.00')
+    implementation platform('androidx.compose:compose-bom:2022.10.00')
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
@@ -83,6 +84,7 @@ dependencies {
     androidTestImplementation platform('androidx.compose:compose-bom:2022.10.00')
     androidTestImplementation platform('androidx.compose:compose-bom:2022.10.00')
     androidTestImplementation platform('androidx.compose:compose-bom:2022.10.00')
+    androidTestImplementation platform('androidx.compose:compose-bom:2022.10.00')
     debugImplementation 'androidx.compose.ui:ui-tooling'
     debugImplementation 'androidx.compose.ui:ui-test-manifest'
     implementation 'com.airbnb.android:lottie:4.2.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b096808..d2f8832 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,6 +16,11 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.MyGame"
         tools:targetApi="31">
+        <activity
+            android:name=".TicTacToe"
+            android:exported="false"
+            android:label="@string/title_activity_tic_tac_toe"
+            android:theme="@style/Theme.MyGame" />
         <activity
             android:name=".QuizQuestion"
             android:exported="false"
diff --git a/app/src/main/java/com/example/game/GameNull.kt b/app/src/main/java/com/example/game/GameNull.kt
index 215dafe..dbf4a23 100644
--- a/app/src/main/java/com/example/game/GameNull.kt
+++ b/app/src/main/java/com/example/game/GameNull.kt
@@ -157,6 +157,7 @@ class GameNull : AppCompatActivity() {
                 val response = reader.readLine()
                 if (response.toInt() == 0) {
                     Log.d("Error", "Игрок отключился")
+                    exitToMenu()
                     // TODO: сообщение о сожалении @a1sarpi
 
                     //Тоже надеюсь что правильно сделал, не было возможности проверить
@@ -180,7 +181,6 @@ class GameNull : AppCompatActivity() {
                         showDialog()
                     }
                 }
-                var number = response.toInt()
 
                 // Обновляем UI в основном потоке
                 launch(Dispatchers.Main) {
diff --git a/app/src/main/java/com/example/game/Quiz.kt b/app/src/main/java/com/example/game/Quiz.kt
index e6fd8e2..4011e15 100644
--- a/app/src/main/java/com/example/game/Quiz.kt
+++ b/app/src/main/java/com/example/game/Quiz.kt
@@ -552,8 +552,8 @@ class Quiz : AppCompatActivity() {
             try {
                 if (clientSocket.isConnected) {
                     // Получаем идентификатор игрока от сервера
-                    val playerId = reader.readLine().toInt()
-                    if (playerId == 1) {
+                    player_id = reader.readLine().toInt()
+                    if (player_id == 1) {
                         myCastle = buttons.last()
                         enemyCastle = buttons[0]
                     } else {
@@ -562,11 +562,8 @@ class Quiz : AppCompatActivity() {
                     }
                     myCastle.status = 1
                     enButtons.clear()
-                    //enButtons.add(myCastle)
-
                     enemyEmail = reader.readLine()
-                    Log.d("Debug.", "Id ${playerId}, Почта ${playerEmail}")
-                    //player = Player(playerId, playerEmail)
+                    Log.d("Debug.", "Id ${player_id}, Почта ${playerEmail}")
 
                     // Обновляем UI в основном потоке
                     launch(Dispatchers.Main) {
@@ -575,7 +572,7 @@ class Quiz : AppCompatActivity() {
                         tv = findViewById(R.id.currentPlayerTV)
 
 
-                        if (playerId != 0) {
+                        if (player_id != 0) {
                             // Через сервер ждём ответ другого игрока
                             tv.text = "Сейчас ход игрока ${enemyEmail?.removeSuffix("@whatever.ru")}"
                             for (bt in myCastle.getNeighbors()) {
@@ -586,7 +583,6 @@ class Quiz : AppCompatActivity() {
                         } else {
                             tv.text = "Сейчас ход игрока ${playerEmail}"
                             enableButtons(myCastle.getNeighbors())
-                            //enableAllButtons()
                         }
                     }
                 } else {
diff --git a/app/src/main/java/com/example/game/TicTacToe.kt b/app/src/main/java/com/example/game/TicTacToe.kt
new file mode 100644
index 0000000..68e4172
--- /dev/null
+++ b/app/src/main/java/com/example/game/TicTacToe.kt
@@ -0,0 +1,357 @@
+package com.example.game
+
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import android.view.View
+import android.widget.Button
+import android.widget.TextView
+import androidx.activity.ComponentActivity
+import androidx.appcompat.app.AlertDialog
+import androidx.core.content.ContextCompat
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import java.io.BufferedReader
+import java.io.IOException
+import java.io.InputStreamReader
+import java.io.PrintWriter
+import java.net.Socket
+
+class TicTacToe : ComponentActivity() {
+    private var enButtons: MutableList<Button> = mutableListOf()
+    private var myButtonsId: MutableList<Pair<Int, Int>> = mutableListOf()
+    val GAME_ID = "1"
+    private lateinit var buttons: MutableList<Button>
+    private var currentPlayer: Int = 1
+    private var gameOver: Boolean = false
+
+    private lateinit var tv: TextView
+
+    private lateinit var clientSocket: Socket
+    private lateinit var reader: BufferedReader
+    private lateinit var writer: PrintWriter
+
+    //private var playerEmail: String ? = FirebaseAuth.getInstance().currentUser!!.email?.removeSuffix("@whatever.ru")
+    private var playerEmail: String ? = "login${(0..10).random()}" // !!! временно
+    private var player_id: Int = -1
+
+    private lateinit var enemyEmail: String
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_ttt)
+
+        // Получение ссылок на кнопки
+        buttons = mutableListOf(
+            findViewById(R.id.button1),
+            findViewById(R.id.button2),
+            findViewById(R.id.button3),
+            findViewById(R.id.button4),
+            findViewById(R.id.button5),
+            findViewById(R.id.button6),
+            findViewById(R.id.button7),
+            findViewById(R.id.button8),
+            findViewById(R.id.button9)
+        )
+
+
+        // Назначение слушателя нажатия кнопок
+        for (i in 0..8) {
+            buttons[i].setOnClickListener {view -> onButtonClicked(view, i) }
+        }
+
+        enButtons = buttons
+
+        disableAllButtons()
+        // TODO: загрузка сервера - фронтенд @a1sarpi
+        GlobalScope.launch(Dispatchers.IO) {
+            try {
+                val serverAddress = "10.0.2.2" // IP-адрес сервера
+                val serverPort = 1234 // Порт сервера
+
+                clientSocket = Socket(serverAddress, serverPort)
+                if (clientSocket.isConnected) {
+                    Log.d("Server", "Try to connect to the server.")
+
+                    reader = BufferedReader(InputStreamReader(clientSocket.getInputStream()))
+                    writer = PrintWriter(clientSocket.getOutputStream())
+
+                    writer.println(GAME_ID) // !!!
+                    writer.flush()
+                    writer.println(playerEmail)
+                    writer.flush()
+
+                    // Получаем идентификатор игрока от сервера
+                    player_id = reader.readLine().toInt()
+                    enemyEmail = reader.readLine()
+                    Log.d("Debug.", "Id ${player_id}, почта: $playerEmail")
+
+                    // Обновляем UI в основном потоке
+                    launch(Dispatchers.Main) {
+                        // TODO: конец ожидания сервера (фронтенд) @a1sarpi
+                        currentPlayer = 1
+                        tv = findViewById(R.id.currentPlayerTextView)
+
+
+                        if (player_id != 0) {    // if (currentPlayer != player.id + 1) {
+                            // Через сервер ждём ответ другого игрока
+                            tv.text =
+                                "Сейчас ход игрока ${enemyEmail?.removeSuffix("@whatever.ru")}"
+                            waitForOtherPlayer()
+                        } else {
+                            tv.text = "Сейчас ход игрока ${playerEmail}"
+                            enableAllButtons()
+                        }
+                    }
+                } else {
+                    // Обработка ошибки подключения
+                    Log.d("Server", "Failed to connect to the server.")
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+    }
+
+    private fun waitForOtherPlayer() {
+        GlobalScope.launch(Dispatchers.IO) {
+            try {
+                val response = reader.readLine()
+                if (response.toInt() == -111) {
+                    Log.d("Error", "Игрок отключился")
+                    exitToMenu()
+                    // TODO: сообщение о сожалении @a1sarpi
+                }
+                var number = Pair<Int, Int>(response.toInt(), reader.readLine().toInt())
+                buttons[number.first*3 + number.second].text = currentPlayer.toString()
+                if (reader.readLine() == "win") {
+                    gameOver = true
+                    Log.d("Debug", "Враг выиграл")
+                    launch(Dispatchers.Main) {
+                        showDialog()
+                    }
+                }
+
+
+                // UI в основном потоке
+                launch(Dispatchers.Main) {
+                    enableAllButtons()
+                    // Смена текущего игрока
+                    currentPlayer = if (currentPlayer == 1) 2 else 1
+                    tv.text = "Сейчас ход игрока " +
+                            if (currentPlayer == player_id + 1)
+                                playerEmail?.removeSuffix("@whatever.ru") else enemyEmail?.removeSuffix("@whatever.ru")
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+    }
+
+    private fun enableAllButtons() {
+        for (button in enButtons) {
+            button.setBackgroundColor(
+                ContextCompat.getColor(
+                    this,
+                    android.R.color.holo_red_light
+                )
+            )
+            button.isEnabled = true
+        }
+    }
+
+    private fun disableAllButtons() {
+        for (button in buttons) {
+                button.isEnabled = false
+        }
+    }
+
+    private fun onButtonClicked(view: View?, id: Int) {
+        // TODO: gui @a1sarpi
+        val button = view as Button
+        enButtons.remove(button)
+
+        // number
+        Log.d("Debug", "id: $id, id/3 = ${id / 3}")
+        var number = Pair<Int, Int>(id / 3, id - id / 3)
+        myButtonsId.add(number)
+        buttons[number.first*3 + number.second].text = player_id.toString()
+
+        // посылаем серверу число
+        GlobalScope.launch(Dispatchers.IO) {
+            try {
+                writer.println((id / 3).toString())
+                writer.flush()
+                writer.println((id - id / 3).toString())
+                writer.flush()
+                Log.d("Server", "На сервер отправлено число ${number}")
+                // UI в основном потоке
+                launch(Dispatchers.Main) {
+                    // Проверка, угадана ли цифра
+                    if (checkWin(Pair<Int, Int>(id / 3, id - id / 3))) {
+                        writer.println("win")
+                        writer.flush()
+                        // TODO: сообщение о победе/ничье (выше) gui @a1sarpi
+                        disableAllButtons()
+                        gameOver = true
+                        showDialog()
+                    } else {
+                        if (enButtons.size == 0) {
+                            writer.println("nobody")
+                            writer.flush()
+                            disableAllButtons()
+                            gameOver = true
+                            showDialog()
+                        } else {
+                            writer.println("dontwin")
+                            writer.flush()
+                            disableAllButtons()
+                            waitForOtherPlayer()
+                        }
+                    }
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+    }
+
+    private fun checkWin(id: Pair<Int, Int>): Boolean {
+        var flag = true
+        if (id.first == id.second) {
+            for (i in 0..2) {
+                if (!myButtonsId.contains(Pair<Int, Int>(i, i))) {
+                    flag = false
+                    break
+                }
+            }
+        }
+        if (flag)
+            return true
+
+        flag = true
+        if (id.first == 2 - id.second) {
+            for (i in 0..2) {
+                if (!myButtonsId.contains(Pair<Int, Int>(i, 2 - i))) {
+                    flag = false
+                    break
+                }
+            }
+        }
+        if (flag)
+            return true
+
+        flag = true
+        for (i in 0..2) {
+            if (!myButtonsId.contains(Pair<Int, Int>(i, id.second))) {
+                flag = false
+                break
+            }
+        }
+        if (flag)
+            return true
+        flag = true
+        for (i in 0..2) {
+            if (!myButtonsId.contains(Pair<Int, Int>(id.first, i))) {
+                flag = false
+                break
+            }
+        }
+        if (flag)
+            return true
+
+        return false
+    }
+
+    fun showDialog() {
+        val dialogBuilder = AlertDialog.Builder(this)
+        dialogBuilder.setMessage("Начать новую игру?")
+            .setCancelable(false)
+            .setPositiveButton("Да") { dialog, id ->
+                GlobalScope.launch(Dispatchers.IO) {
+                    sendData("${player_id}")
+                }
+                // TODO: показать ещё окно о переподключении @a1sarpi
+                resetGame()
+            }
+            .setNegativeButton("Нет") { dialog, id ->
+                GlobalScope.launch(Dispatchers.IO) {
+                    sendData("-1")
+                }
+                dialog.dismiss()
+                exitToMenu()
+            }
+
+        val alert = dialogBuilder.create()
+        alert.show()
+    }
+
+    private fun resetGame() {
+        enButtons = buttons
+        disableAllButtons()
+        gameOver = false
+
+        GlobalScope.launch(Dispatchers.IO) {
+            try {
+                if (clientSocket.isConnected) {
+                    // Получаем идентификатор игрока от сервера
+                    player_id = reader.readLine().toInt()
+                    enemyEmail = reader.readLine()
+                    Log.d("Debug.", "Id ${player_id}, Почта ${playerEmail}")
+
+                    // Обновляем UI в основном потоке
+                    launch(Dispatchers.Main) {
+                        // TODO: конец ожидания сервера (фронтенд) @a1sarpi
+                        currentPlayer = 1
+
+                        if (player_id != 0) {
+                            // Через сервер ждём ответ другого игрока
+                            tv.text = "Сейчас ход игрока ${enemyEmail?.removeSuffix("@whatever.ru")}"
+                            waitForOtherPlayer()
+                        } else {
+                            tv.text = "Сейчас ход игрока ${playerEmail}"
+                            enableAllButtons()
+                        }
+                    }
+                } else {
+                    // Обработка ошибки подключения
+                    Log.d("Server", "Failed to connect to the server.")
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+    }
+
+    fun sendData(message: String) {
+        try {
+            writer.println(message)
+            writer.flush()
+        } catch (e: IOException) {
+            // ошибка отправки данных
+            e.printStackTrace()
+        }
+    }
+
+    override fun onBackPressed() {
+        exitToMenu()
+    }
+
+    private fun exitToMenu() {
+        val intent = Intent(this, MenuActivity::class.java)
+        startActivity(intent)
+        clientSocket.close()
+        writer.close()
+        reader.close()
+        finish() // Закрываем меню после запуска игры
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+
+        clientSocket.close()
+        writer.close()
+        reader.close()
+    }
+}
diff --git a/app/src/main/res/layout/activity_ttt.xml b/app/src/main/res/layout/activity_ttt.xml
new file mode 100644
index 0000000..c95cd0d
--- /dev/null
+++ b/app/src/main/res/layout/activity_ttt.xml
@@ -0,0 +1,59 @@
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/mainLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="16dp">
+
+    <TextView
+        android:id="@+id/currentPlayerTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:fontFamily="@font/zerocool"
+        android:text="Ожидается подключение второго игрока..."
+        android:textColor="#FF6392"
+        android:textSize="20sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.003"
+        tools:ignore="MissingConstraints"></TextView>
+
+    <TextView
+        android:id="@+id/welcomeTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Добро пожаловать!"
+        android:fontFamily="@font/zerocool"
+        android:textColor="#FF6392"
+        android:textSize="20sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/currentPlayerTextView" />
+
+    <include
+        layout="@layout/buttons_ttt"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toBottomOf="@id/welcomeTextView"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintVertical_bias="0.244"
+        android:layout_marginTop="10dp"/>
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:backgroundTint="#FFE45E"
+        android:fontFamily="@font/zerocool"
+        android:text="@string/logout"
+        android:textSize="20dp"
+        tools:ignore="MissingConstraints"
+        tools:layout_editor_absoluteX="273dp"
+        tools:layout_editor_absoluteY="29dp" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/buttons_ttt.xml b/app/src/main/res/layout/buttons_ttt.xml
new file mode 100644
index 0000000..53d9887
--- /dev/null
+++ b/app/src/main/res/layout/buttons_ttt.xml
@@ -0,0 +1,127 @@
+<GridLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:columnCount="3"
+    android:orientation="horizontal">
+
+    <Button
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/button1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="1"
+        android:fontFamily="@font/zerocool"
+        android:textSize="36sp"
+        android:background="@drawable/button_selector"
+        android:padding="16dp"
+        android:layout_columnWeight="1"
+        android:layout_rowWeight="1"/>
+
+    <Button
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/button2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="2"
+        android:fontFamily="@font/zerocool"
+        android:textSize="36sp"
+        android:background="@drawable/button_selector"
+        android:padding="16dp"
+        android:layout_columnWeight="1"
+        android:layout_rowWeight="1"/>
+
+    <Button
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/button3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="3"
+        android:fontFamily="@font/zerocool"
+        android:textSize="36sp"
+        android:background="@drawable/button_selector"
+        android:padding="16dp"
+        android:layout_columnWeight="1"
+        android:layout_rowWeight="1"/>
+
+    <Button
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/button4"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="4"
+        android:fontFamily="@font/zerocool"
+        android:textSize="36sp"
+        android:background="@drawable/button_selector"
+        android:padding="16dp"
+        android:layout_columnWeight="1"
+        android:layout_rowWeight="1"/>
+
+    <Button
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/button5"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="5"
+        android:fontFamily="@font/zerocool"
+        android:textSize="36sp"
+        android:background="@drawable/button_selector"
+        android:padding="16dp"
+        android:layout_columnWeight="1"
+        android:layout_rowWeight="1"/>
+
+    <Button
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/button6"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="6"
+        android:fontFamily="@font/zerocool"
+        android:textSize="36sp"
+        android:background="@drawable/button_selector"
+        android:padding="16dp"
+        android:layout_columnWeight="1"
+        android:layout_rowWeight="1"/>
+
+    <Button
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/button7"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="7"
+        android:fontFamily="@font/zerocool"
+        android:textSize="36sp"
+        android:background="@drawable/button_selector"
+        android:padding="16dp"
+        android:layout_columnWeight="1"
+        android:layout_rowWeight="1"/>
+
+    <Button
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/button8"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="8"
+        android:fontFamily="@font/zerocool"
+        android:textSize="36sp"
+        android:background="@drawable/button_selector"
+        android:padding="16dp"
+        android:layout_columnWeight="1"
+        android:layout_rowWeight="1"/>
+
+    <Button
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/button9"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="9"
+        android:fontFamily="@font/zerocool"
+        android:textSize="36sp"
+        android:background="@drawable/button_selector"
+        android:padding="16dp"
+        android:layout_columnWeight="1"
+        android:layout_rowWeight="1"/>
+
+
+</GridLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f14671c..8640863 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -52,4 +52,5 @@
         vestibulum. Fusce dictum libero quis erat maximus, vitae volutpat diam dignissim.
     </string>
     <string name="castle1_button">Castle I</string>
+    <string name="title_activity_tic_tac_toe">TicTacToe</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 2fcc6fd..e62016f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -13,7 +13,7 @@
         <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
-  <!-- Base application theme. -->
+    <!-- Base application theme. -->
     <style name="Base.Theme.MyGame" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Customize your light theme here. -->
         <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
-- 
GitLab