From 8479d273d4a5c7799ea3222adad7343688d2b58f Mon Sep 17 00:00:00 2001
From: Alexis1663 <92861778+Alexis1663@users.noreply.github.com>
Date: Fri, 3 Mar 2023 17:38:43 +0100
Subject: [PATCH 1/2] ajout rectange + basculement de vue avec le bouton start

---
 Tetris/app/src/main/java/activity/Game.kt     | 15 ++++++++
 Tetris/app/src/main/java/activity/Menu.kt     |  7 ++++
 Tetris/app/src/main/java/modele/Draw.kt       | 10 ++++++
 Tetris/app/src/main/res/drawable/blue.xml     | 12 +++++++
 Tetris/app/src/main/res/drawable/cyan.xml     | 12 +++++++
 Tetris/app/src/main/res/drawable/green.xml    | 12 +++++++
 Tetris/app/src/main/res/drawable/orange.xml   | 12 +++++++
 Tetris/app/src/main/res/drawable/purple.xml   | 12 +++++++
 Tetris/app/src/main/res/drawable/red.xml      | 12 +++++++
 Tetris/app/src/main/res/drawable/yellow.xml   | 12 +++++++
 .../app/src/main/res/layout/activity_game.xml | 30 ++++++++++++++++
 .../app/src/main/res/layout/activity_menu.xml | 34 ++++++++++++++++---
 12 files changed, 175 insertions(+), 5 deletions(-)
 create mode 100644 Tetris/app/src/main/java/activity/Game.kt
 create mode 100644 Tetris/app/src/main/java/modele/Draw.kt
 create mode 100644 Tetris/app/src/main/res/drawable/blue.xml
 create mode 100644 Tetris/app/src/main/res/drawable/cyan.xml
 create mode 100644 Tetris/app/src/main/res/drawable/green.xml
 create mode 100644 Tetris/app/src/main/res/drawable/orange.xml
 create mode 100644 Tetris/app/src/main/res/drawable/purple.xml
 create mode 100644 Tetris/app/src/main/res/drawable/red.xml
 create mode 100644 Tetris/app/src/main/res/drawable/yellow.xml
 create mode 100644 Tetris/app/src/main/res/layout/activity_game.xml

diff --git a/Tetris/app/src/main/java/activity/Game.kt b/Tetris/app/src/main/java/activity/Game.kt
new file mode 100644
index 0000000..817aaf7
--- /dev/null
+++ b/Tetris/app/src/main/java/activity/Game.kt
@@ -0,0 +1,15 @@
+package activity
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import but.androidstudio.tetris.R
+
+class Game : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_game)
+    }
+
+
+}
\ No newline at end of file
diff --git a/Tetris/app/src/main/java/activity/Menu.kt b/Tetris/app/src/main/java/activity/Menu.kt
index c6c0ffd..63bfe04 100644
--- a/Tetris/app/src/main/java/activity/Menu.kt
+++ b/Tetris/app/src/main/java/activity/Menu.kt
@@ -1,8 +1,10 @@
 package activity
 
 import android.annotation.SuppressLint
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.widget.Button
 import android.widget.TextView
 import but.androidstudio.tetris.R
 
@@ -14,5 +16,10 @@ class Menu : AppCompatActivity() {
 
         val appName:TextView = findViewById(R.id.appName)
         appName.setText(R.string.app_name)
+
+        val buttonStart:Button = findViewById(R.id.buttonStart)
+        buttonStart.setOnClickListener {
+
+        }
     }
 }
\ No newline at end of file
diff --git a/Tetris/app/src/main/java/modele/Draw.kt b/Tetris/app/src/main/java/modele/Draw.kt
new file mode 100644
index 0000000..d4cfe30
--- /dev/null
+++ b/Tetris/app/src/main/java/modele/Draw.kt
@@ -0,0 +1,10 @@
+package modele
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.Paint
+import android.graphics.Path
+import android.view.View
+
+class Draw {
+}
\ No newline at end of file
diff --git a/Tetris/app/src/main/res/drawable/blue.xml b/Tetris/app/src/main/res/drawable/blue.xml
new file mode 100644
index 0000000..5ee8131
--- /dev/null
+++ b/Tetris/app/src/main/res/drawable/blue.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke android:width="2dp"
+        android:color="#A7B8A8"/>
+
+    <solid android:color="#0000FF"/>
+
+    <corners android:radius="2dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/Tetris/app/src/main/res/drawable/cyan.xml b/Tetris/app/src/main/res/drawable/cyan.xml
new file mode 100644
index 0000000..4f59262
--- /dev/null
+++ b/Tetris/app/src/main/res/drawable/cyan.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke android:width="2dp"
+        android:color="#A7B8A8"/>
+
+    <solid android:color="#00FFFF"/>
+
+    <corners android:radius="2dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/Tetris/app/src/main/res/drawable/green.xml b/Tetris/app/src/main/res/drawable/green.xml
new file mode 100644
index 0000000..55d6c34
--- /dev/null
+++ b/Tetris/app/src/main/res/drawable/green.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke android:width="2dp"
+        android:color="#A7B8A8"/>
+
+    <solid android:color="#008A64"/>
+
+    <corners android:radius="2dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/Tetris/app/src/main/res/drawable/orange.xml b/Tetris/app/src/main/res/drawable/orange.xml
new file mode 100644
index 0000000..e4974bc
--- /dev/null
+++ b/Tetris/app/src/main/res/drawable/orange.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke android:width="2dp"
+        android:color="#A7B8A8"/>
+
+    <solid android:color="#FF8000"/>
+
+    <corners android:radius="2dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/Tetris/app/src/main/res/drawable/purple.xml b/Tetris/app/src/main/res/drawable/purple.xml
new file mode 100644
index 0000000..7b663f3
--- /dev/null
+++ b/Tetris/app/src/main/res/drawable/purple.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke android:width="2dp"
+        android:color="#A7B8A8"/>
+
+    <solid android:color="#EE82EE"/>
+
+    <corners android:radius="2dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/Tetris/app/src/main/res/drawable/red.xml b/Tetris/app/src/main/res/drawable/red.xml
new file mode 100644
index 0000000..755c82c
--- /dev/null
+++ b/Tetris/app/src/main/res/drawable/red.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke android:width="2dp"
+        android:color="#A7B8A8"/>
+
+    <solid android:color="#FF0000"/>
+
+    <corners android:radius="2dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/Tetris/app/src/main/res/drawable/yellow.xml b/Tetris/app/src/main/res/drawable/yellow.xml
new file mode 100644
index 0000000..d1be99c
--- /dev/null
+++ b/Tetris/app/src/main/res/drawable/yellow.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke android:width="2dp"
+        android:color="#A7B8A8"/>
+
+    <solid android:color="#FFFF00"/>
+
+    <corners android:radius="2dp"/>
+
+</shape>
\ 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
new file mode 100644
index 0000000..7ae50f4
--- /dev/null
+++ b/Tetris/app/src/main/res/layout/activity_game.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    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="3"
+        android:rowCount="3"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="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
diff --git a/Tetris/app/src/main/res/layout/activity_menu.xml b/Tetris/app/src/main/res/layout/activity_menu.xml
index 6c3f41d..05137dc 100644
--- a/Tetris/app/src/main/res/layout/activity_menu.xml
+++ b/Tetris/app/src/main/res/layout/activity_menu.xml
@@ -2,14 +2,20 @@
 <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="wrap_content"
-    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     tools:context="activity.Menu">
 
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.5">
 
         <TextView
             android:id="@+id/appName"
@@ -28,5 +34,23 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Options" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/bestScore"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Best Score :" />
+
+            <TextView
+                android:id="@+id/lastScore"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="X" />
+        </LinearLayout>
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-- 
2.36.3


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 2/2] 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
-- 
2.36.3