diff --git a/Tetris/app/build.gradle b/Tetris/app/build.gradle index ba3fe66..97d1d9b 100644 --- a/Tetris/app/build.gradle +++ b/Tetris/app/build.gradle @@ -38,6 +38,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.8.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.core:core-ktx:+' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' diff --git a/Tetris/app/src/main/AndroidManifest.xml b/Tetris/app/src/main/AndroidManifest.xml index 12fd643..2f6b1fd 100644 --- a/Tetris/app/src/main/AndroidManifest.xml +++ b/Tetris/app/src/main/AndroidManifest.xml @@ -11,11 +11,13 @@ android:supportsRtl="true" android:theme="@style/Theme.Tetris" tools:targetApi="31"> - - - + + + diff --git a/Tetris/app/src/main/java/activity/Game.kt b/Tetris/app/src/main/java/activity/Game.kt new file mode 100644 index 0000000..817aaf7 --- /dev/null +++ b/Tetris/app/src/main/java/activity/Game.kt @@ -0,0 +1,15 @@ +package activity + +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import but.androidstudio.tetris.R + +class Game : AppCompatActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_game) + } + + +} \ No newline at end of file diff --git a/Tetris/app/src/main/java/modele/Draw.kt b/Tetris/app/src/main/java/modele/Draw.kt new file mode 100644 index 0000000..16186d7 --- /dev/null +++ b/Tetris/app/src/main/java/modele/Draw.kt @@ -0,0 +1,12 @@ +package modele + +import android.annotation.SuppressLint +import android.content.Context +import android.graphics.Paint +import android.graphics.Path +import android.view.View + +class Draw { + + +} \ No newline at end of file diff --git a/Tetris/app/src/main/res/layout/activity_game.xml b/Tetris/app/src/main/res/layout/activity_game.xml new file mode 100644 index 0000000..972c55c --- /dev/null +++ b/Tetris/app/src/main/res/layout/activity_game.xml @@ -0,0 +1,7 @@ + + \ No newline at end of file diff --git a/Tetris/app/src/main/res/layout/activity_menu.xml b/Tetris/app/src/main/res/layout/activity_menu.xml index 6c3f41d..05137dc 100644 --- a/Tetris/app/src/main/res/layout/activity_menu.xml +++ b/Tetris/app/src/main/res/layout/activity_menu.xml @@ -2,14 +2,20 @@ + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.5"> + + + + + + + \ No newline at end of file diff --git a/Tetris/build.gradle b/Tetris/build.gradle index 7cadbe8..f23bc2f 100644 --- a/Tetris/build.gradle +++ b/Tetris/build.gradle @@ -2,5 +2,5 @@ plugins { id 'com.android.application' version '7.4.0' apply false id 'com.android.library' version '7.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.21' apply false + id 'org.jetbrains.kotlin.android' version '1.8.20-Beta' apply false } \ No newline at end of file