Skip to content

Commit 0c10bbd

Browse files
committed
change app name, remove test libs, migrate to material3
1 parent ba5c8e1 commit 0c10bbd

File tree

8 files changed

+41
-12
lines changed

8 files changed

+41
-12
lines changed

.idea/deploymentTargetDropDown.xml

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/git_toolbox_prj.xml

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,4 @@ dependencies {
4040
implementation 'androidx.appcompat:appcompat:1.6.1'
4141
implementation 'com.google.android.material:material:1.9.0'
4242
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
43-
testImplementation 'junit:junit:4.13.2'
44-
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
45-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
4643
}

app/src/main/java/com/example/tictactoemvc/TicTacToeGame.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ class TicTacToeGame {
99
private lateinit var context: Context
1010

1111
companion object {
12-
val ROWS = 3
13-
val COLUMNS = 3
12+
const val ROWS = 3
13+
const val COLUMNS = 3
1414
}
1515

1616
enum class Mark {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<resources xmlns:tools="http://schemas.android.com/tools">
22
<!-- Base application theme. -->
3-
<style name="Theme.TicTacToeMVC" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
3+
<style name="Theme.TicTacToeMVC" parent="Theme.Material3.DayNight.NoActionBar">
44
<!-- Primary brand color. -->
55
<item name="colorPrimary">@color/purple_200</item>
66
<item name="colorPrimaryVariant">@color/purple_700</item>
@@ -10,7 +10,7 @@
1010
<item name="colorSecondaryVariant">@color/teal_200</item>
1111
<item name="colorOnSecondary">@color/black</item>
1212
<!-- Status bar color. -->
13-
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
13+
<item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
1414
<!-- Customize your theme here. -->
1515
</style>
1616
</resources>
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<resources>
2-
<string name="app_name">TicTacToeMVC</string>
2+
<string name="app_name">TicTacToe</string>
33

44
<string name="x_turn">X Turn</string>
55
<string name="o_turn">O Turn</string>
66
<string name="x_wins">X Wins</string>
77
<string name="o_wins">O Wins</string>
88
<string name="tie_game">Tie Game</string>
9-
109
<string name="new_game">New Game</string>
1110
<string name="space">" "</string>
1211
</resources>

app/src/main/res/values/themes.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<resources xmlns:tools="http://schemas.android.com/tools">
22
<!-- Base application theme. -->
3-
<style name="Theme.TicTacToeMVC" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
3+
<style name="Theme.TicTacToeMVC" parent="Theme.Material3.DayNight.NoActionBar">
44
<!-- Primary brand color. -->
55
<item name="colorPrimary">@color/purple_500</item>
66
<item name="colorPrimaryVariant">@color/purple_700</item>
@@ -10,7 +10,7 @@
1010
<item name="colorSecondaryVariant">@color/teal_700</item>
1111
<item name="colorOnSecondary">@color/black</item>
1212
<!-- Status bar color. -->
13-
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
13+
<item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
1414
<!-- Customize your theme here. -->
1515
</style>
1616
</resources>

0 commit comments

Comments
 (0)