From da7b834a8e903a70cfcfe09f4da45ff5c00e2ac4 Mon Sep 17 00:00:00 2001
From: Jolys Enzo <Jolys Enzo@DESKTOP-JLR66CN>
Date: Tue, 14 Mar 2023 10:34:16 +0100
Subject: [PATCH] organisation fichier

---
 Tetris/app/src/main/java/modele/Draw.kt       | 10 -------
 .../java/{ => tetrisGame}/activity/Game.kt    |  2 +-
 .../java/{ => tetrisGame}/activity/Menu.kt    |  5 ++--
 .../java/{ => tetrisGame}/activity/Option.kt  |  2 +-
 .../main/java/tetrisGame/views/ViewsGame.kt   | 12 +++++++++
 Tetris/app/src/main/java/views/ViewsGame.kt   |  7 -----
 .../app/src/main/res/layout/activity_game.xml | 26 +------------------
 .../app/src/main/res/layout/activity_menu.xml |  2 +-
 .../src/main/res/layout/activity_option.xml   |  2 +-
 9 files changed, 19 insertions(+), 49 deletions(-)
 delete mode 100644 Tetris/app/src/main/java/modele/Draw.kt
 rename Tetris/app/src/main/java/{ => tetrisGame}/activity/Game.kt (92%)
 rename Tetris/app/src/main/java/{ => tetrisGame}/activity/Menu.kt (85%)
 rename Tetris/app/src/main/java/{ => tetrisGame}/activity/Option.kt (91%)
 create mode 100644 Tetris/app/src/main/java/tetrisGame/views/ViewsGame.kt
 delete mode 100644 Tetris/app/src/main/java/views/ViewsGame.kt

diff --git a/Tetris/app/src/main/java/modele/Draw.kt b/Tetris/app/src/main/java/modele/Draw.kt
deleted file mode 100644
index d4cfe30..0000000
--- a/Tetris/app/src/main/java/modele/Draw.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-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/java/activity/Game.kt b/Tetris/app/src/main/java/tetrisGame/activity/Game.kt
similarity index 92%
rename from Tetris/app/src/main/java/activity/Game.kt
rename to Tetris/app/src/main/java/tetrisGame/activity/Game.kt
index ff6cd48..ebc73a9 100644
--- a/Tetris/app/src/main/java/activity/Game.kt
+++ b/Tetris/app/src/main/java/tetrisGame/activity/Game.kt
@@ -1,4 +1,4 @@
-package activity
+package tetrisGame.activity
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
diff --git a/Tetris/app/src/main/java/activity/Menu.kt b/Tetris/app/src/main/java/tetrisGame/activity/Menu.kt
similarity index 85%
rename from Tetris/app/src/main/java/activity/Menu.kt
rename to Tetris/app/src/main/java/tetrisGame/activity/Menu.kt
index 81f3763..89806c4 100644
--- a/Tetris/app/src/main/java/activity/Menu.kt
+++ b/Tetris/app/src/main/java/tetrisGame/activity/Menu.kt
@@ -1,6 +1,5 @@
-package activity
+package tetrisGame.activity
 
-import android.annotation.SuppressLint
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
@@ -18,7 +17,7 @@ class Menu : AppCompatActivity() {
 
         val buttonStart:Button = findViewById(R.id.buttonStart)
         buttonStart.setOnClickListener {
-            val intent = Intent(this,Game::class.java)
+            val intent = Intent(this, Game::class.java)
             startActivity(intent)
         }
     }
diff --git a/Tetris/app/src/main/java/activity/Option.kt b/Tetris/app/src/main/java/tetrisGame/activity/Option.kt
similarity index 91%
rename from Tetris/app/src/main/java/activity/Option.kt
rename to Tetris/app/src/main/java/tetrisGame/activity/Option.kt
index 23a0386..20599a8 100644
--- a/Tetris/app/src/main/java/activity/Option.kt
+++ b/Tetris/app/src/main/java/tetrisGame/activity/Option.kt
@@ -1,4 +1,4 @@
-package activity
+package tetrisGame.activity
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
diff --git a/Tetris/app/src/main/java/tetrisGame/views/ViewsGame.kt b/Tetris/app/src/main/java/tetrisGame/views/ViewsGame.kt
new file mode 100644
index 0000000..6b1af05
--- /dev/null
+++ b/Tetris/app/src/main/java/tetrisGame/views/ViewsGame.kt
@@ -0,0 +1,12 @@
+package tetrisGame.views
+
+import android.content.Context
+import android.graphics.Canvas
+import android.view.View
+
+class ViewsGame(context:Context) : View(context) {
+
+    override fun onDraw(canvas: Canvas?) {
+        super.onDraw(canvas)
+    }
+}
\ No newline at end of file
diff --git a/Tetris/app/src/main/java/views/ViewsGame.kt b/Tetris/app/src/main/java/views/ViewsGame.kt
deleted file mode 100644
index 4b081fc..0000000
--- a/Tetris/app/src/main/java/views/ViewsGame.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package views
-
-import android.content.Context
-import android.view.View
-
-class ViewsGame(context:Context) : View(context) {
-}
\ 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 6c2c868..6352c22 100644
--- a/Tetris/app/src/main/res/layout/activity_game.xml
+++ b/Tetris/app/src/main/res/layout/activity_game.xml
@@ -4,31 +4,7 @@
     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">
+    tools:context="tetrisGame.activity.Game">
 
-        <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 05137dc..49375a2 100644
--- a/Tetris/app/src/main/res/layout/activity_menu.xml
+++ b/Tetris/app/src/main/res/layout/activity_menu.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="activity.Menu">
+    tools:context="tetrisGame.activity.Menu">
 
     <LinearLayout
         android:layout_width="wrap_content"
diff --git a/Tetris/app/src/main/res/layout/activity_option.xml b/Tetris/app/src/main/res/layout/activity_option.xml
index 5a26581..835a137 100644
--- a/Tetris/app/src/main/res/layout/activity_option.xml
+++ b/Tetris/app/src/main/res/layout/activity_option.xml
@@ -4,6 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="activity.Option">
+    tools:context="tetrisGame.activity.Option">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file