Merge pull request 'Alexis' (#2) from Alexis into master

Reviewed-on: #2

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>

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>

Tetris/app/src/main/java/activity/Game.kt

@@ -0,0 +1,17 @@
+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() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_game)
+    }
+
+
+}

Tetris/app/src/main/java/activity/Menu.kt

@@ -1,18 +1,25 @@
 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
 
 class Menu : AppCompatActivity() {
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_menu)
 
         val appName:TextView = findViewById(R.id.appName)
         appName.setText(R.string.app_name)
+
+        val buttonStart:Button = findViewById(R.id.buttonStart)
+        buttonStart.setOnClickListener {
+            val intent = Intent(this,Game::class.java)
+            startActivity(intent)
+        }
     }
 }

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 {
+}

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>

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>

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>

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>

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>

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>

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>

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

@@ -0,0 +1,34 @@
+<?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="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>

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_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     tools:context="activity.Menu">
 
     <LinearLayout
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        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>