From fdcbac0cf2e52033426156bc855593bd3676b697 Mon Sep 17 00:00:00 2001
From: AlinaStepanova <astepanova@yukon.cv.ua>
Date: Mon, 24 Jun 2024 21:16:13 +0200
Subject: [PATCH] remove old xmls, upgrade dependencies

---
 app/build.gradle                              |   1 -
 .../res/layout-land-v21/activity_main.xml     | 154 ---------------
 .../main/res/layout-land/activity_main.xml    |   2 +
 app/src/main/res/layout-v21/activity_main.xml | 187 ------------------
 app/src/main/res/layout/activity_main.xml     |   5 +-
 gradle.properties                             |   1 -
 6 files changed, 5 insertions(+), 345 deletions(-)
 delete mode 100644 app/src/main/res/layout-land-v21/activity_main.xml
 delete mode 100644 app/src/main/res/layout-v21/activity_main.xml

diff --git a/app/build.gradle b/app/build.gradle
index a1c73a3..b8f732d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,7 +10,6 @@ keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
     compileSdk 34
-    buildToolsVersion = '30.0.3'
     defaultConfig {
         applicationId "com.avs.sea.battle"
         minSdkVersion 21
diff --git a/app/src/main/res/layout-land-v21/activity_main.xml b/app/src/main/res/layout-land-v21/activity_main.xml
deleted file mode 100644
index 51d1344..0000000
--- a/app/src/main/res/layout-land-v21/activity_main.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout 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">
-
-    <data>
-
-        <variable
-            name="mainViewModel"
-            type="com.avs.sea.battle.main.MainViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal"
-        tools:context=".main.MainActivity">
-
-        <ImageView
-            android:id="@+id/ivMore"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:clickable="true"
-            android:contentDescription="@string/more_settings"
-            android:focusable="true"
-            android:padding="@dimen/dimen_8dp"
-            app:srcCompat="@drawable/ic_more"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/tvStatus"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dimen_10dp"
-            android:ellipsize="end"
-            android:fontFamily="@font/neucha"
-            android:gravity="center"
-            android:paddingStart="@dimen/dimen_10dp"
-            android:paddingEnd="@dimen/dimen_10dp"
-            android:singleLine="true"
-            android:text="@string/status_welcome_text"
-            android:textSize="@dimen/text_size_16sp"
-            app:layout_constraintEnd_toEndOf="@+id/viewComputer"
-            app:layout_constraintStart_toStartOf="@+id/viewPerson"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <include
-            android:id="@+id/lettersPerson"
-            layout="@layout/layout_letters_person" />
-
-        <include layout="@layout/layout_numbers_person" />
-
-        <com.avs.sea.battle.views.PersonSquareView
-            android:id="@+id/viewPerson"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginStart="@dimen/dimen_16dp"
-            android:layout_marginTop="@dimen/dimen_24dp"
-            android:layout_marginEnd="@dimen/dimen_8dp"
-            android:background="@drawable/square_background"
-            app:layout_constraintBottom_toBottomOf="@id/guideline"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toLeftOf="@+id/viewComputer"
-            app:layout_constraintTop_toBottomOf="@+id/tvStatus" />
-
-        <TextView
-            android:id="@+id/viewGenerate"
-            style="@style/MainButtonStyle"
-            android:onClick="@{() -> mainViewModel.generateShips()}"
-            android:text="@string/generate_ships_text"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@+id/viewPerson"
-            app:layout_constraintStart_toStartOf="@+id/viewPerson"
-            app:layout_constraintTop_toTopOf="@+id/guideline" />
-
-        <include
-            android:id="@+id/lettersPC"
-            layout="@layout/layout_letters_pc" />
-
-        <include layout="@layout/layout_numbers_pc" />
-
-        <com.avs.sea.battle.views.ComputerSquareView
-            android:id="@+id/viewComputer"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginStart="@dimen/dimen_16dp"
-            android:layout_marginTop="@dimen/dimen_24dp"
-            android:layout_marginEnd="@dimen/dimen_8dp"
-            android:background="@drawable/square_background"
-            app:layout_constraintBottom_toBottomOf="@id/guideline"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintLeft_toRightOf="@+id/viewPerson"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvStatus" />
-
-        <TextView
-            android:id="@+id/viewFire"
-            style="@style/FireButtonStyle"
-            android:onClick="@{() -> mainViewModel.makeFireAsPerson()}"
-            android:text="@string/fire_text"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@+id/viewComputer"
-            app:layout_constraintStart_toStartOf="@+id/viewComputer"
-            app:layout_constraintTop_toTopOf="@+id/guideline" />
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintGuide_percent="0.85" />
-
-        <TextView
-            android:id="@+id/viewStart"
-            style="@style/MainButtonStyle"
-            android:onClick="@{() -> mainViewModel.startGame()}"
-            android:text="@string/start_text"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/viewComputer"
-            app:layout_constraintStart_toEndOf="@+id/viewPerson"
-            app:layout_constraintTop_toTopOf="@+id/guideline" />
-
-        <TextView
-            android:id="@+id/viewNewGame"
-            style="@style/MainButtonStyle"
-            android:onClick="@{() -> mainViewModel.startNewGame()}"
-            android:text="@string/new_game_text"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/viewComputer"
-            app:layout_constraintStart_toEndOf="@+id/viewPerson"
-            app:layout_constraintTop_toTopOf="@+id/guideline" />
-
-        <ProgressBar
-            android:id="@+id/progressBar"
-            style="?android:attr/progressBarStyleSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:indeterminateTint="?attr/colorAccent"
-            android:indeterminateTintMode="src_in"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@+id/viewPerson"
-            app:layout_constraintStart_toStartOf="@+id/viewPerson"
-            app:layout_constraintTop_toTopOf="@+id/guideline" />
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
index 56e9be4..51d1344 100644
--- a/app/src/main/res/layout-land/activity_main.xml
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -141,6 +141,8 @@
             style="?android:attr/progressBarStyleSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:indeterminateTint="?attr/colorAccent"
+            android:indeterminateTintMode="src_in"
             android:visibility="invisible"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/viewPerson"
diff --git a/app/src/main/res/layout-v21/activity_main.xml b/app/src/main/res/layout-v21/activity_main.xml
deleted file mode 100644
index 79876e1..0000000
--- a/app/src/main/res/layout-v21/activity_main.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout 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">
-
-    <data>
-
-        <variable
-            name="mainViewModel"
-            type="com.avs.sea.battle.main.MainViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal"
-        tools:context=".main.MainActivity">
-
-        <ImageView
-            android:id="@+id/ivMore"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:clickable="true"
-            android:contentDescription="@string/more_settings"
-            android:focusable="true"
-            android:padding="@dimen/dimen_8dp"
-            app:srcCompat="@drawable/ic_more"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/tvStatus"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dimen_8dp"
-            android:ellipsize="end"
-            android:fontFamily="@font/neucha"
-            android:gravity="center"
-            android:paddingStart="@dimen/dimen_10dp"
-            android:paddingEnd="@dimen/dimen_10dp"
-            android:singleLine="false"
-            android:text="@string/status_welcome_text"
-            android:textSize="@dimen/text_size_16sp"
-            android:layout_marginStart="@dimen/dimen_4dp"
-            android:layout_marginEnd="@dimen/dimen_4dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <include
-            android:id="@+id/lettersPerson"
-            layout="@layout/layout_letters_person" />
-
-        <include
-            android:id="@+id/numbersPerson"
-            layout="@layout/layout_numbers_person" />
-
-        <com.avs.sea.battle.views.PersonSquareView
-            android:id="@+id/viewPerson"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginBottom="@dimen/dimen_16dp"
-            android:background="@drawable/square_background"
-            app:layout_constraintBottom_toTopOf="@+id/guideline2"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toStartOf="@+id/guideline5"
-            app:layout_constraintStart_toStartOf="@+id/guideline4"
-            app:layout_constraintTop_toTopOf="@+id/guideline6"
-            app:layout_constraintVertical_bias="0.0" />
-
-        <TextView
-            android:id="@+id/viewGenerate"
-            style="@style/MainButtonStyle"
-            android:gravity="center"
-            android:onClick="@{() -> mainViewModel.generateShips()}"
-            android:text="@string/generate_ships_text"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/viewStart"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/guideline" />
-
-        <include
-            android:id="@+id/lettersPC"
-            layout="@layout/layout_letters_pc" />
-
-        <include layout="@layout/layout_numbers_pc" />
-
-        <com.avs.sea.battle.views.ComputerSquareView
-            android:id="@+id/viewComputer"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginTop="@dimen/dimen_16dp"
-            android:background="@drawable/square_background"
-            app:layout_constraintBottom_toBottomOf="@id/guideline"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toStartOf="@+id/guideline5"
-            app:layout_constraintStart_toStartOf="@+id/guideline4"
-            app:layout_constraintTop_toTopOf="@+id/guideline2"
-            app:layout_constraintVertical_bias="0.0" />
-
-        <TextView
-            android:id="@+id/viewFire"
-            style="@style/FireButtonStyle"
-            android:onClick="@{() -> mainViewModel.makeFireAsPerson()}"
-            android:text="@string/fire_text"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/guideline" />
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintGuide_percent="0.9" />
-
-        <TextView
-            android:id="@+id/viewStart"
-            style="@style/MainButtonStyle"
-            android:onClick="@{() -> mainViewModel.startGame()}"
-            android:text="@string/start_text"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toEndOf="@+id/viewGenerate"
-            app:layout_constraintTop_toTopOf="@+id/guideline" />
-
-        <TextView
-            android:id="@+id/viewNewGame"
-            style="@style/MainButtonStyle"
-            android:onClick="@{() -> mainViewModel.startNewGame()}"
-            android:text="@string/new_game_text"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/guideline" />
-
-        <ProgressBar
-            android:id="@+id/progressBar"
-            style="?android:attr/progressBarStyleSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:indeterminateTint="?attr/colorAccent"
-            android:indeterminateTintMode="src_in"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/guideline" />
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintGuide_percent="0.5" />
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline4"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintGuide_percent="0.15" />
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline5"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintGuide_percent="0.85" />
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline6"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintGuide_percent="0.1" />
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4db1cf6..79876e1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -41,10 +41,9 @@
             android:paddingEnd="@dimen/dimen_10dp"
             android:singleLine="false"
             android:text="@string/status_welcome_text"
-            android:maxLines="2"
+            android:textSize="@dimen/text_size_16sp"
             android:layout_marginStart="@dimen/dimen_4dp"
             android:layout_marginEnd="@dimen/dimen_4dp"
-            android:textSize="@dimen/text_size_16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -147,6 +146,8 @@
             style="?android:attr/progressBarStyleSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:indeterminateTint="?attr/colorAccent"
+            android:indeterminateTintMode="src_in"
             android:visibility="invisible"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/gradle.properties b/gradle.properties
index 95b9377..0d290c2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,6 +19,5 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=true
 android.nonFinalResIds=false