From 6c5ca252b9699843b0ba53dd9896f6734374e59f Mon Sep 17 00:00:00 2001
From: Jolys Enzo <Jolys Enzo@DESKTOP-JLR66CN>
Date: Tue, 14 Mar 2023 10:50:30 +0100
Subject: [PATCH] avancement

---
 Tetris/app/src/main/AndroidManifest.xml       | 15 ++----------
 .../src/main/java/tetrisGame/activity/Game.kt |  1 -
 .../app/src/main/res/layout/activity_game.xml | 23 +++++++++++++++++++
 Tetris/app/src/main/res/values/strings.xml    |  1 +
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/Tetris/app/src/main/AndroidManifest.xml b/Tetris/app/src/main/AndroidManifest.xml
index e9a4d06..78bd0dd 100644
--- a/Tetris/app/src/main/AndroidManifest.xml
+++ b/Tetris/app/src/main/AndroidManifest.xml
@@ -11,20 +11,9 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Tetris"
         tools:targetApi="31">
+        <activity android:name="tetrisGame.activity.Game"/>
         <activity
-            android:name=".Option"
-            android:exported="false" />
-        <activity
-            android:name=".Menu"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".Game"
+            android:name="tetrisGame.activity.Menu"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/Tetris/app/src/main/java/tetrisGame/activity/Game.kt b/Tetris/app/src/main/java/tetrisGame/activity/Game.kt
index ebc73a9..73aec77 100644
--- a/Tetris/app/src/main/java/tetrisGame/activity/Game.kt
+++ b/Tetris/app/src/main/java/tetrisGame/activity/Game.kt
@@ -13,5 +13,4 @@ class Game : AppCompatActivity() {
         setContentView(R.layout.activity_game)
     }
 
-
 }
\ 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 6352c22..e038eab 100644
--- a/Tetris/app/src/main/res/layout/activity_game.xml
+++ b/Tetris/app/src/main/res/layout/activity_game.xml
@@ -6,5 +6,28 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context="tetrisGame.activity.Game">
 
+    <tetrisGame.views.ViewsGame
+        android:id="@+id/tabGame"
+        android:layout_width="300dp"
+        android:layout_height="300dp"
+        android:layout_marginEnd="111dp"
+        android:layout_marginBottom="431dp"
+        android:background="@color/black"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/TextScore"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/TextScore"
+        app:layout_constraintBottom_toTopOf="@+id/tabGame"
+        app:layout_constraintEnd_toStartOf="@+id/tabGame"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Tetris/app/src/main/res/values/strings.xml b/Tetris/app/src/main/res/values/strings.xml
index 1d94892..05be9ee 100644
--- a/Tetris/app/src/main/res/values/strings.xml
+++ b/Tetris/app/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name">Tetris</string>
+    <string name="TextScore">Score : ??</string>
 </resources>
\ No newline at end of file