From d8909c42f50272293d1404bcc3508bfafa1578db Mon Sep 17 00:00:00 2001
From: Jolys Enzo <Jolys Enzo@DESKTOP-JLR66CN>
Date: Fri, 17 Mar 2023 15:30:37 +0100
Subject: [PATCH] =?UTF-8?q?tableau=20cadrill=C3=A9=20et=20ajoute=20de=202?=
 =?UTF-8?q?=20bouton?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/tetrisGame/views/ViewsGame.kt   | 43 +++++++++-
 .../app/src/main/res/layout/activity_game.xml | 78 ++++++++++++++-----
 2 files changed, 100 insertions(+), 21 deletions(-)

diff --git a/Tetris/app/src/main/java/tetrisGame/views/ViewsGame.kt b/Tetris/app/src/main/java/tetrisGame/views/ViewsGame.kt
index 72cd9d8..71bba78 100644
--- a/Tetris/app/src/main/java/tetrisGame/views/ViewsGame.kt
+++ b/Tetris/app/src/main/java/tetrisGame/views/ViewsGame.kt
@@ -1,19 +1,58 @@
 package tetrisGame.views
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Paint
+import android.graphics.Rect
 import android.util.AttributeSet
 import android.view.View
 
 class ViewsGame(context:Context, attrs: AttributeSet?) : View(context, attrs) {
 
     val myPaint:Paint = Paint()
+    @SuppressLint("DrawAllocation")
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
 
-        myPaint.color = Color.WHITE
-        canvas.drawRect(5F,5F,1000F,1000F,myPaint)
+        val tailleGrille:Float = 5F
+        val tailleTableauHauteur:Float = 1175F
+        val tailleTableauLargeur:Float = 655F
+        val nbCaseLargeur:Int = 12
+        val nbCaseHauteur:Int = 22
+
+        // Tableau
+        myPaint.color = Color.GRAY
+        canvas.drawRect(0F,0F,tailleTableauLargeur,tailleTableauHauteur,myPaint)
+        // case
+        myPaint.color = Color.BLACK
+        /*
+        canvas.drawRect(0F,0F,tailleGrille,tailleTableauHauteur,myPaint)
+        canvas.drawRect(0F,0F,tailleTableauLargeur,tailleGrille,myPaint)
+
+        canvas.drawRect(tailleTableauLargeur-tailleGrille,0F,tailleTableauLargeur,tailleTableauHauteur,myPaint)
+        canvas.drawRect(0F,tailleTableauHauteur-tailleGrille,tailleTableauLargeur,tailleTableauHauteur,myPaint)
+        */
+
+        myPaint.strokeWidth = tailleGrille
+        canvas.drawLine(0F,0F,0F,tailleTableauHauteur,myPaint)
+        canvas.drawLine(0F,0F,tailleTableauLargeur,0F,myPaint)
+        canvas.drawLine(tailleTableauLargeur,0F,tailleTableauLargeur,tailleTableauHauteur,myPaint)
+        canvas.drawLine(0F,tailleTableauHauteur,tailleTableauLargeur,tailleTableauHauteur,myPaint)
+
+        var tailleCase:Float = tailleTableauLargeur/nbCaseLargeur
+        //canvas.drawRect(tailleGrille+tailleCase,0F,tailleGrille,tailleTableauHauteur,myPaint);
+        for (i in 1..nbCaseLargeur){
+            canvas.drawLine(tailleCase*i,0F,tailleCase*i,tailleTableauHauteur,myPaint)
+        }
+
+        tailleCase = tailleTableauHauteur/nbCaseHauteur
+        for (i in 1..nbCaseHauteur){
+            canvas.drawLine(0F,tailleCase*i,tailleTableauLargeur,tailleCase*i,myPaint)
+        }
+
+        // Test piece
+        
     }
 }
\ 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 929ddaa..ca14802 100644
--- a/Tetris/app/src/main/res/layout/activity_game.xml
+++ b/Tetris/app/src/main/res/layout/activity_game.xml
@@ -4,29 +4,69 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="tetrisGame.activity.Game">
+    tools:context="tetrisGame.activity.Game"
+    android:background="@color/white">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <tetrisGame.views.ViewsGame
-            android:id="@+id/tabGame"
-            android:layout_width="100dp"
-            android:layout_height="100dp" />
-
-        <Button
-            android:id="@+id/Button_Left"
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            android:background="@drawable/button_left" />
-
-        <Button
-            android:id="@+id/Button_Right"
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            android:background="@drawable/button_left" />
+        android:orientation="vertical"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginRight="15dp">
+
+        <FrameLayout
+            android:layout_width="250dp"
+            android:layout_height="450dp">
+
+            <tetrisGame.views.ViewsGame
+                android:id="@+id/tabGame"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        </FrameLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="50dp">
+
+            <Button
+                android:id="@+id/Button_Left"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:background="@drawable/button_left"
+                android:layout_marginStart="15dp"/>
+
+            <Button
+                android:id="@+id/Button_Right"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:background="@drawable/button_left"
+                android:layout_marginStart="150dp"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            android:layout_marginTop="15dp">
+
+            <Button
+                android:id="@+id/Button_Left_Rotation"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:background="@drawable/button_left"
+                android:layout_marginStart="50dp"/>
+
+            <Button
+                android:id="@+id/Button_Right_Rotation"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:background="@drawable/button_left"
+                android:layout_marginStart="75dp"/>
+        </LinearLayout>
 
 
     </LinearLayout>