diff --git a/app/src/main/java/com/example/game/Knb.kt b/app/src/main/java/com/example/game/Knb.kt index cae56367d2eaef458dd7ad30deaecfbd11b036d6..b46ff62ab9f1a2b0e4278d9325d2896585fb0902 100644 --- a/app/src/main/java/com/example/game/Knb.kt +++ b/app/src/main/java/com/example/game/Knb.kt @@ -1,5 +1,6 @@ package com.example.game +import android.annotation.SuppressLint import android.content.Intent import android.graphics.Bitmap import android.graphics.drawable.BitmapDrawable @@ -35,6 +36,7 @@ class Knb : ComponentActivity() { private lateinit var winnerTextView: TextView private var currentPlayer: Int = 1 private var gameOver: Boolean = false + private var whoWon: Int = -10 private lateinit var imageWin: ImageView @@ -135,6 +137,7 @@ class Knb : ComponentActivity() { } } + @SuppressLint("ResourceType", "UseCompatLoadingForDrawables") private fun onButtonClicked(view: View?, id: Int) { // TODO: gui @a1sarpi var number = id @@ -151,9 +154,7 @@ class Knb : ComponentActivity() { if (checkWin(id, ans) == 1) { Log.d("Debug", "В данной битве пользователь выиграл") - val w: Drawable = Drawable.createFromPath("/home/sarpi/AndroidStudioProjects/lab3-os/app/src/main/res/drawable/win")!! - imageWin.setImageDrawable(w) - winnerTextView.setText("{$playerEmail} выиграл") + whoWon = 1 round-- writer.println("win") writer.flush() @@ -167,16 +168,12 @@ class Knb : ComponentActivity() { } } else if (checkWin(id, ans) == 0) { Log.d("Debug", "В данной битве ничья") - val w: Drawable = Drawable.createFromPath("/home/sarpi/AndroidStudioProjects/lab3-os/app/src/main/res/drawable/draw")!! - imageWin.setImageDrawable(w) - winnerTextView.setText("Ничья") + whoWon = 0 writer.println("dontwin") writer.flush() } else if (checkWin(id, ans) == -1) { Log.d("Debug", "В данной битве пользователь проиграл") - val w: Drawable = Drawable.createFromPath("/home/sarpi/AndroidStudioProjects/lab3-os/app/src/main/res/drawable/cross")!! - imageWin.setImageDrawable(w) - winnerTextView.setText("{$enemyEmail} выиграл") + whoWon = -1 round-- if (round == 0) gameOver = true @@ -186,6 +183,20 @@ class Knb : ComponentActivity() { // UI в основном потоке launch(Dispatchers.Main) { if (gameOver) { + lateinit var w: Drawable + if (whoWon == 1) { + w = resources.getDrawable(R.drawable.win) + winnerTextView.setText("{$playerEmail} выиграл") + } + else if (whoWon == 0) { + w = resources.getDrawable(R.drawable.draw) + winnerTextView.setText("Ничья") + } + else if (whoWon == -1) { + w = resources.getDrawable(R.drawable.cross_red) + winnerTextView.setText("{$enemyEmail} выиграл") + } + imageWin.setImageDrawable(w) Log.d("Debug", "Игра окончена") disableAllButtons() incrementStats() diff --git a/app/src/main/res/drawable/button_selector.xml b/app/src/main/res/drawable/button_selector.xml index 3b0d1fb8a7f659b2bee6030ed9d6ca5297c18cc6..8014870c16b10f9f0770031c752fd819495fd61a 100644 --- a/app/src/main/res/drawable/button_selector.xml +++ b/app/src/main/res/drawable/button_selector.xml @@ -1,10 +1,8 @@ + - - - - - - - - + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/button_transparent.xml b/app/src/main/res/drawable/button_transparent.xml new file mode 100644 index 0000000000000000000000000000000000000000..183f567b7c4c386aa45121732c1eea7a25719a00 --- /dev/null +++ b/app/src/main/res/drawable/button_transparent.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/buttons_knb.xml b/app/src/main/res/layout/buttons_knb.xml index 6314fdbeb32463e66cc39c34f1846515fa502d71..1dd9a72706a2a6d8170b24004a755714f1d2c4e6 100644 --- a/app/src/main/res/layout/buttons_knb.xml +++ b/app/src/main/res/layout/buttons_knb.xml @@ -10,20 +10,20 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/rock" - android:background="@drawable/button_background" /> + android:background="@drawable/button_transparent" /> + android:background="@drawable/button_transparent" /> + android:background="@drawable/button_transparent" /> \ 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 index e1291d15aee976cf5c80014a7ced796aa09f1d4f..c87c1395269e10ae80ae2c1f6b400a058867ed82 100644 --- a/app/src/main/res/layout/buttons_ttt.xml +++ b/app/src/main/res/layout/buttons_ttt.xml @@ -40,7 +40,7 @@ android:text="-" android:fontFamily="@font/zerocool" android:textSize="36sp" - android:background="@android:color/transparent" + android:background="@drawable/button_transparent" android:padding="16dp" android:layout_columnWeight="1" android:layout_rowWeight="1"/> @@ -94,7 +94,7 @@ android:text="-" android:fontFamily="@font/zerocool" android:textSize="36sp" - android:background="@android:color/transparent" + android:background="@drawable/button_transparent" android:padding="16dp" android:layout_columnWeight="1" android:layout_rowWeight="1"/> @@ -147,7 +147,7 @@ android:text="-" android:fontFamily="@font/zerocool" android:textSize="36sp" - android:background="@android:color/transparent" + android:background="@drawable/button_transparent" android:padding="16dp" android:layout_columnWeight="1" android:layout_rowWeight="1"/> @@ -200,7 +200,7 @@ android:text="-" android:fontFamily="@font/zerocool" android:textSize="36sp" - android:background="@android:color/transparent" + android:background="@drawable/button_transparent" android:padding="16dp" android:layout_columnWeight="1" android:layout_rowWeight="1"/> @@ -253,7 +253,7 @@ android:text="-" android:fontFamily="@font/zerocool" android:textSize="36sp" - android:background="@android:color/transparent" + android:background="@drawable/button_transparent" android:padding="16dp" android:layout_columnWeight="1" android:layout_rowWeight="1"/> @@ -306,7 +306,7 @@ android:text="-" android:fontFamily="@font/zerocool" android:textSize="36sp" - android:background="@android:color/transparent" + android:background="@drawable/button_transparent" android:padding="16dp" android:layout_columnWeight="1" android:layout_rowWeight="1"/> @@ -359,7 +359,7 @@ android:text="-" android:fontFamily="@font/zerocool" android:textSize="36sp" - android:background="@android:color/transparent" + android:background="@drawable/button_transparent" android:padding="16dp" android:layout_columnWeight="1" android:layout_rowWeight="1"/> @@ -412,7 +412,7 @@ android:text="-" android:fontFamily="@font/zerocool" android:textSize="36sp" - android:background="@android:color/transparent" + android:background="@drawable/button_transparent" android:padding="16dp" android:layout_columnWeight="1" android:layout_rowWeight="1"/> @@ -465,7 +465,7 @@ android:text="-" android:fontFamily="@font/zerocool" android:textSize="36sp" - android:background="@android:color/transparent" + android:background="@drawable/button_transparent" android:padding="16dp" android:layout_columnWeight="1" android:layout_rowWeight="1"/> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 11d4872535d00f739edc791858a7411c5a392ec5..65ee43b39411c624bd7a6dbc72e4e746160bfa17 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -12,4 +12,5 @@ #FF6392 #FFE45E #F9F9F9 + #00000000 \ No newline at end of file