boutton image et commencement des piece

Tetris/app/src/main/java/tetrisGame/views/ViewsGame.kt

@@ -12,35 +12,32 @@ 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)
 
-        val tailleGrille:Float = 5F
+        val tailleGrille:Float = 10F
-        val tailleTableauHauteur:Float = 1175F
+        val tailleTableauHauteur:Float = measuredHeight.toFloat()
-        val tailleTableauLargeur:Float = 655F
+        val tailleTableauLargeur:Float = measuredWidth.toFloat()
-        val nbCaseLargeur:Int = 12
+        val nbCaseLargeur:Int = 7
-        val nbCaseHauteur:Int = 22
+        val nbCaseHauteur:Int = 15
 
         // Tableau
         myPaint.color = Color.GRAY
         canvas.drawRect(0F,0F,tailleTableauLargeur,tailleTableauHauteur,myPaint)
-        // case
+        // Color
         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)
+        //Contour
-        canvas.drawRect(0F,tailleTableauHauteur-tailleGrille,tailleTableauLargeur,tailleTableauHauteur,myPaint)
+        myPaint.strokeWidth = 15F
-        */
-
-        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)
 
+        /*
+        //    tableau Case
+        myPaint.color = Color.GRAY
         var tailleCase:Float = tailleTableauLargeur/nbCaseLargeur
         //canvas.drawRect(tailleGrille+tailleCase,0F,tailleGrille,tailleTableauHauteur,myPaint);
         for (i in 1..nbCaseLargeur){
@@ -50,9 +47,14 @@ class ViewsGame(context:Context, attrs: AttributeSet?) : View(context, attrs) {
         tailleCase = tailleTableauHauteur/nbCaseHauteur
         for (i in 1..nbCaseHauteur){
             canvas.drawLine(0F,tailleCase*i,tailleTableauLargeur,tailleCase*i,myPaint)
-        }
+        }*/
 
         // Test piece
-        
+        // Carré
+        myPaint.color = Color.YELLOW
+        canvas.drawRect(tailleGrille,tailleGrille,(tailleTableauLargeur/nbCaseLargeur)*2,(tailleTableauHauteur/nbCaseHauteur)*2,myPaint)
+
+        myPaint.color = Color.BLUE
+        canvas.drawRect((tailleTableauLargeur/nbCaseLargeur)*2+tailleGrille,tailleGrille,(tailleTableauLargeur/nbCaseLargeur)*(nbCaseLargeur-4),(tailleTableauHauteur/nbCaseHauteur)*6,myPaint)
     }
 }

Tetris/app/src/main/res/drawable/button_left.xml

@@ -1,7 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
 
     <solid android:color="@color/white"/>
 
-</shape>
+
+</shape>-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/white"/>
+        </shape>
+    </item>
+    <item
+        android:drawable="@drawable/flechedroite"
+        android:bottom="20dp"
+        android:left="20dp"
+        android:right="20dp"
+        android:top="20dp"/>
+</layer-list>

Tetris/app/src/main/res/drawable/flechedroite.xml

@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z"/>
+</vector>

Tetris/app/src/main/res/drawable/flechegauche.xml

@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>

Tetris/app/src/main/res/drawable/rotationdroite.xml

@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M15.55,5.55L11,1v3.07C7.06,4.56 4,7.92 4,12s3.05,7.44 7,7.93v-2.02c-2.84,-0.48 -5,-2.94 -5,-5.91s2.16,-5.43 5,-5.91L11,10l4.55,-4.45zM19.93,11c-0.17,-1.39 -0.72,-2.73 -1.62,-3.89l-1.42,1.42c0.54,0.75 0.88,1.6 1.02,2.47h2.02zM13,17.9v2.02c1.39,-0.17 2.74,-0.71 3.9,-1.61l-1.44,-1.44c-0.75,0.54 -1.59,0.89 -2.46,1.03zM16.89,15.48l1.42,1.41c0.9,-1.16 1.45,-2.5 1.62,-3.89h-2.02c-0.14,0.87 -0.48,1.72 -1.02,2.48z"/>
+</vector>

Tetris/app/src/main/res/drawable/rotationgauche.xml

@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M7.11,8.53L5.7,7.11C4.8,8.27 4.24,9.61 4.07,11h2.02c0.14,-0.87 0.49,-1.72 1.02,-2.47zM6.09,13L4.07,13c0.17,1.39 0.72,2.73 1.62,3.89l1.41,-1.42c-0.52,-0.75 -0.87,-1.59 -1.01,-2.47zM7.1,18.32c1.16,0.9 2.51,1.44 3.9,1.61L11,17.9c-0.87,-0.15 -1.71,-0.49 -2.46,-1.03L7.1,18.32zM13,4.07L13,1L8.45,5.55 13,10L13,6.09c2.84,0.48 5,2.94 5,5.91s-2.16,5.43 -5,5.91v2.02c3.95,-0.49 7,-3.85 7,-7.93s-3.05,-7.44 -7,-7.93z"/>
+</vector>

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

@@ -35,14 +35,14 @@
                 android:id="@+id/Button_Left"
                 android:layout_width="100dp"
                 android:layout_height="100dp"
-                android:background="@drawable/button_left"
+                android:background="@drawable/flechegauche"
                 android:layout_marginStart="15dp"/>
 
             <Button
                 android:id="@+id/Button_Right"
                 android:layout_width="100dp"
                 android:layout_height="100dp"
-                android:background="@drawable/button_left"
+                android:background="@drawable/flechedroite"
                 android:layout_marginStart="150dp"/>
 
         </LinearLayout>
@@ -57,14 +57,14 @@
                 android:id="@+id/Button_Left_Rotation"
                 android:layout_width="100dp"
                 android:layout_height="100dp"
-                android:background="@drawable/button_left"
+                android:background="@drawable/rotationgauche"
                 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:background="@drawable/rotationdroite"
                 android:layout_marginStart="75dp"/>
         </LinearLayout>
 

Tetris/app/src/main/res/values-night/themes.xml

@@ -4,11 +4,11 @@
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_200</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
+        <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>
         <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
+        <item name="colorOnSecondary">@color/white</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="21">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->