From c9919afa5cef97545be95ba884fa09fb26d9986a Mon Sep 17 00:00:00 2001
From: Jolys Enzo <Jolys Enzo@DESKTOP-JLR66CN>
Date: Fri, 3 Mar 2023 15:20:22 +0100
Subject: [PATCH] =?UTF-8?q?cr=C3=A9ation=20des=20activity=20menu,=20game?=
 =?UTF-8?q?=20et=20des=20layouts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tetris/app/build.gradle                       |  1 +
 .../app/src/main/res/layout/activity_game.xml | 31 ++-----------------
 Tetris/build.gradle                           |  2 +-
 3 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/Tetris/app/build.gradle b/Tetris/app/build.gradle
index ba3fe66..97d1d9b 100644
--- a/Tetris/app/build.gradle
+++ b/Tetris/app/build.gradle
@@ -38,6 +38,7 @@ 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:+'
     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/res/layout/activity_game.xml b/Tetris/app/src/main/res/layout/activity_game.xml
index 6c2c868..972c55c 100644
--- a/Tetris/app/src/main/res/layout/activity_game.xml
+++ b/Tetris/app/src/main/res/layout/activity_game.xml
@@ -1,34 +1,7 @@
 <?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"
-    >
-    
-    <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>
\ 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 7cadbe8..f23bc2f 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.7.21' apply false
+    id 'org.jetbrains.kotlin.android' version '1.8.20-Beta' apply false
 }
\ No newline at end of file