From 1dcc88316dbeb91edc3024759af8fe943a3abbab Mon Sep 17 00:00:00 2001
From: Alexis1663 <92861778+Alexis1663@users.noreply.github.com>
Date: Sun, 5 Mar 2023 18:38:56 +0100
Subject: [PATCH] correction bug bouton start + ajout des ressources drawalable
 + debut du dev de la grid du jeu

---
 Tetris/.idea/vcs.xml                             |  1 +
 Tetris/app/src/main/AndroidManifest.xml          |  7 +++++++
 Tetris/app/src/main/java/activity/Game.kt        |  2 ++
 Tetris/app/src/main/java/activity/Menu.kt        |  4 ++--
 Tetris/app/src/main/res/layout/activity_game.xml | 12 ++++++++----
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Tetris/.idea/vcs.xml b/Tetris/.idea/vcs.xml
index 6c0b863..d23592a 100644
--- a/Tetris/.idea/vcs.xml
+++ b/Tetris/.idea/vcs.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
     <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Tetris/app/src/main/AndroidManifest.xml b/Tetris/app/src/main/AndroidManifest.xml
index 12fd643..f35f69d 100644
--- a/Tetris/app/src/main/AndroidManifest.xml
+++ b/Tetris/app/src/main/AndroidManifest.xml
@@ -18,6 +18,13 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <activity android:name="activity.Game"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/Tetris/app/src/main/java/activity/Game.kt b/Tetris/app/src/main/java/activity/Game.kt
index 817aaf7..ff6cd48 100644
--- a/Tetris/app/src/main/java/activity/Game.kt
+++ b/Tetris/app/src/main/java/activity/Game.kt
@@ -2,6 +2,8 @@ package activity
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.widget.ImageView
+import androidx.core.content.ContextCompat
 import but.androidstudio.tetris.R
 
 class Game : AppCompatActivity() {
diff --git a/Tetris/app/src/main/java/activity/Menu.kt b/Tetris/app/src/main/java/activity/Menu.kt
index 63bfe04..81f3763 100644
--- a/Tetris/app/src/main/java/activity/Menu.kt
+++ b/Tetris/app/src/main/java/activity/Menu.kt
@@ -9,7 +9,6 @@ import android.widget.TextView
 import but.androidstudio.tetris.R
 
 class Menu : AppCompatActivity() {
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_menu)
@@ -19,7 +18,8 @@ class Menu : AppCompatActivity() {
 
         val buttonStart:Button = findViewById(R.id.buttonStart)
         buttonStart.setOnClickListener {
-
+            val intent = Intent(this,Game::class.java)
+            startActivity(intent)
         }
     }
 }
\ 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 7ae50f4..6c2c868 100644
--- a/Tetris/app/src/main/res/layout/activity_game.xml
+++ b/Tetris/app/src/main/res/layout/activity_game.xml
@@ -4,16 +4,18 @@
     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="3"
-        android:rowCount="3"
+        android:columnCount="10"
+        android:rowCount="20"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent">
 
         <TextView
             android:id="@+id/tilePageGame"
@@ -26,5 +28,7 @@
             android:layout_marginTop="2mm"
             />
 
+
+
     </GridLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file