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"
- >
-
-
+ tools:context="tetrisGame.activity.Game">
-
-
-
-
\ 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">
+ tools:context="tetrisGame.activity.Option">
\ No newline at end of file