diff --git a/Tetris/app/build.gradle b/Tetris/app/build.gradle
index 97d1d9b..3e36356 100644
--- a/Tetris/app/build.gradle
+++ b/Tetris/app/build.gradle
@@ -39,6 +39,7 @@ dependencies {
implementation 'com.google.android.material:material:1.8.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.core:core-ktx:+'
+ 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 e9a4d06..5493402 100644
--- a/Tetris/app/src/main/AndroidManifest.xml
+++ b/Tetris/app/src/main/AndroidManifest.xml
@@ -12,19 +12,7 @@
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
index ff6cd48..788a13b 100644
--- a/Tetris/app/src/main/java/activity/Game.kt
+++ b/Tetris/app/src/main/java/activity/Game.kt
@@ -5,13 +5,17 @@ import android.os.Bundle
import android.widget.ImageView
import androidx.core.content.ContextCompat
import but.androidstudio.tetris.R
+import modele.CanvaView
class Game : AppCompatActivity() {
+ val canvaView:CanvaView = TODO()
+
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_game)
- }
-
+ // Mettre le canva ici
+ //canvaView.findViewById()
+ }
}
\ No newline at end of file
diff --git a/Tetris/app/src/main/java/activity/Option.kt b/Tetris/app/src/main/java/activity/Option.kt
index 23a0386..2493d8c 100644
--- a/Tetris/app/src/main/java/activity/Option.kt
+++ b/Tetris/app/src/main/java/activity/Option.kt
@@ -8,7 +8,5 @@ class Option : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_option)
-
-
}
}
\ No newline at end of file
diff --git a/Tetris/app/src/main/java/modele/CanvaView.kt b/Tetris/app/src/main/java/modele/CanvaView.kt
new file mode 100644
index 0000000..fb6cc5f
--- /dev/null
+++ b/Tetris/app/src/main/java/modele/CanvaView.kt
@@ -0,0 +1,39 @@
+package modele
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Matrix
+import android.graphics.Paint
+import android.graphics.Rect
+import android.view.View
+
+class CanvaView(context : Context) : View(context) {
+
+ val paint = Paint()
+
+ // Pour drawBitmap, mais a voir
+ val piece = Array(size = 16){ 0 }
+
+
+ init {
+ paint.color = Color.BLACK
+ paint.strokeWidth = 8F
+ paint.style = Paint.Style.FILL
+ }
+
+ override fun onDraw(canvas: Canvas) {
+ super.onDraw(canvas)
+
+ // Utiliser drawBitmap pour dessiner nos piece
+ canvas.drawBitmap()
+
+ val matrix = Bitmap()
+
+
+
+ }
+
+}
+
diff --git a/Tetris/app/src/main/java/modele/Draw.kt b/Tetris/app/src/main/java/modele/Draw.kt
index d4cfe30..f6f1716 100644
--- a/Tetris/app/src/main/java/modele/Draw.kt
+++ b/Tetris/app/src/main/java/modele/Draw.kt
@@ -6,5 +6,6 @@ import android.graphics.Paint
import android.graphics.Path
import android.view.View
-class Draw {
+class DrawView {
+
}
\ 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
index 972c55c..3e9a26c 100644
--- a/Tetris/app/src/main/res/layout/activity_game.xml
+++ b/Tetris/app/src/main/res/layout/activity_game.xml
@@ -4,4 +4,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context="activity.game"/>
\ No newline at end of file
+ tools:context="activity.Game">
+
+
+
+
\ No newline at end of file
diff --git a/Tetris/build.gradle b/Tetris/build.gradle
index f23bc2f..1532027 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.8.20-Beta' apply false
+ id 'org.jetbrains.kotlin.android' version '1.8.20-RC' apply false
}
\ No newline at end of file