Tetris/app/build.gradle

@@ -38,6 +38,8 @@ 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:+'
+    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'

Tetris/app/src/main/AndroidManifest.xml

@@ -12,19 +12,7 @@
         android:theme="@style/Theme.Tetris"
         tools:targetApi="31">
         <activity
-            android:name=".Option"
+            android:name=".activity.Menu"
-            android:exported="false" />
-        <activity
-            android:name=".Menu"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".Game"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

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<CanvaView>()
+    }
 }

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)
-
-
     }
 }

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<Int>(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()
+
+
+
+    }
+
+}
+

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 {
+
 }

Tetris/app/src/main/res/layout/activity_game.xml

@@ -1,34 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:context="activity.Game">
-    tools:context="activity.Game"
-    >
-    
-    <GridLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:columnCount="10"
-        android:rowCount="20"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent">
-
-        <TextView
-            android:id="@+id/tilePageGame"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="TextView"
-            android:layout_row="0"
-            android:layout_column="0"
-            android:layout_gravity="center"
-            android:layout_marginTop="2mm"
-            />
 
 
 
-    </GridLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>

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-RC' apply false
 }