diff --git a/Tetris/app/src/main/java/tetrisGame/views/ViewsGame.kt b/Tetris/app/src/main/java/tetrisGame/views/ViewsGame.kt index 71bba78..909355a 100644 --- a/Tetris/app/src/main/java/tetrisGame/views/ViewsGame.kt +++ b/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 tailleTableauHauteur:Float = 1175F - val tailleTableauLargeur:Float = 655F - val nbCaseLargeur:Int = 12 - val nbCaseHauteur:Int = 22 + val tailleGrille:Float = 10F + val tailleTableauHauteur:Float = measuredHeight.toFloat() + val tailleTableauLargeur:Float = measuredWidth.toFloat() + val nbCaseLargeur:Int = 7 + 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) - canvas.drawRect(0F,tailleTableauHauteur-tailleGrille,tailleTableauLargeur,tailleTableauHauteur,myPaint) - */ - - myPaint.strokeWidth = tailleGrille + //Contour + myPaint.strokeWidth = 15F 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) } } \ No newline at end of file diff --git a/Tetris/app/src/main/res/drawable/button_left.xml b/Tetris/app/src/main/res/drawable/button_left.xml index 1f57bf9..274e591 100644 --- a/Tetris/app/src/main/res/drawable/button_left.xml +++ b/Tetris/app/src/main/res/drawable/button_left.xml @@ -1,7 +1,23 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Tetris/app/src/main/res/drawable/flechedroite.xml b/Tetris/app/src/main/res/drawable/flechedroite.xml new file mode 100644 index 0000000..8d3848e --- /dev/null +++ b/Tetris/app/src/main/res/drawable/flechedroite.xml @@ -0,0 +1,5 @@ + + + diff --git a/Tetris/app/src/main/res/drawable/flechegauche.xml b/Tetris/app/src/main/res/drawable/flechegauche.xml new file mode 100644 index 0000000..8452791 --- /dev/null +++ b/Tetris/app/src/main/res/drawable/flechegauche.xml @@ -0,0 +1,5 @@ + + + diff --git a/Tetris/app/src/main/res/drawable/rotationdroite.xml b/Tetris/app/src/main/res/drawable/rotationdroite.xml new file mode 100644 index 0000000..434c51d --- /dev/null +++ b/Tetris/app/src/main/res/drawable/rotationdroite.xml @@ -0,0 +1,5 @@ + + + diff --git a/Tetris/app/src/main/res/drawable/rotationgauche.xml b/Tetris/app/src/main/res/drawable/rotationgauche.xml new file mode 100644 index 0000000..0b02b19 --- /dev/null +++ b/Tetris/app/src/main/res/drawable/rotationgauche.xml @@ -0,0 +1,5 @@ + + + diff --git a/Tetris/app/src/main/res/layout/activity_game.xml b/Tetris/app/src/main/res/layout/activity_game.xml index ca14802..8f35747 100644 --- a/Tetris/app/src/main/res/layout/activity_game.xml +++ b/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"/>