From b0f1f15deb9cebc587ac192354680ce27ae472d5 Mon Sep 17 00:00:00 2001 From: Jolys Enzo Date: Tue, 14 Mar 2023 10:29:08 +0100 Subject: [PATCH 1/9] viewGame --- Tetris/app/src/main/java/views/ViewsGame.kt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Tetris/app/src/main/java/views/ViewsGame.kt diff --git a/Tetris/app/src/main/java/views/ViewsGame.kt b/Tetris/app/src/main/java/views/ViewsGame.kt new file mode 100644 index 0000000..4b081fc --- /dev/null +++ b/Tetris/app/src/main/java/views/ViewsGame.kt @@ -0,0 +1,7 @@ +package views + +import android.content.Context +import android.view.View + +class ViewsGame(context:Context) : View(context) { +} \ No newline at end of file From da7b834a8e903a70cfcfe09f4da45ff5c00e2ac4 Mon Sep 17 00:00:00 2001 From: Jolys Enzo Date: Tue, 14 Mar 2023 10:34:16 +0100 Subject: [PATCH 2/9] 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" - > - - + 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 From 6c5ca252b9699843b0ba53dd9896f6734374e59f Mon Sep 17 00:00:00 2001 From: Jolys Enzo Date: Tue, 14 Mar 2023 10:50:30 +0100 Subject: [PATCH 3/9] 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"> + - - - - - - - - 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"> + + + + \ 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 @@ Tetris + Score : ?? \ No newline at end of file From c8b9911dd4898b24b5ba115cb6c7f8a9456d6fda Mon Sep 17 00:00:00 2001 From: Jolys Enzo Date: Tue, 14 Mar 2023 11:56:37 +0100 Subject: [PATCH 4/9] avancement --- Tetris/app/src/main/AndroidManifest.xml | 4 ++- .../src/main/java/tetrisGame/activity/Game.kt | 5 ++++ .../main/java/tetrisGame/views/ViewsGame.kt | 8 +++++- .../app/src/main/res/layout/activity_game.xml | 28 ++++--------------- 4 files changed, 20 insertions(+), 25 deletions(-) diff --git a/Tetris/app/src/main/AndroidManifest.xml b/Tetris/app/src/main/AndroidManifest.xml index 78bd0dd..c4b2c70 100644 --- a/Tetris/app/src/main/AndroidManifest.xml +++ b/Tetris/app/src/main/AndroidManifest.xml @@ -11,9 +11,11 @@ android:supportsRtl="true" android:theme="@style/Theme.Tetris" tools:targetApi="31"> - + diff --git a/Tetris/app/src/main/java/tetrisGame/activity/Game.kt b/Tetris/app/src/main/java/tetrisGame/activity/Game.kt index 73aec77..cf9eee9 100644 --- a/Tetris/app/src/main/java/tetrisGame/activity/Game.kt +++ b/Tetris/app/src/main/java/tetrisGame/activity/Game.kt @@ -1,16 +1,21 @@ package tetrisGame.activity +import android.graphics.Canvas import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import android.view.View import android.widget.ImageView import androidx.core.content.ContextCompat import but.androidstudio.tetris.R +import tetrisGame.views.ViewsGame class Game : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_game) + + val canvaViews = findViewById(R.id.tabGame) } } \ No newline at end of file diff --git a/Tetris/app/src/main/java/tetrisGame/views/ViewsGame.kt b/Tetris/app/src/main/java/tetrisGame/views/ViewsGame.kt index 6b1af05..c86b019 100644 --- a/Tetris/app/src/main/java/tetrisGame/views/ViewsGame.kt +++ b/Tetris/app/src/main/java/tetrisGame/views/ViewsGame.kt @@ -2,11 +2,17 @@ package tetrisGame.views import android.content.Context import android.graphics.Canvas +import android.graphics.Color +import android.graphics.Paint import android.view.View class ViewsGame(context:Context) : View(context) { - override fun onDraw(canvas: Canvas?) { + val myPaint:Paint = Paint() + override fun onDraw(canvas: Canvas) { super.onDraw(canvas) + + myPaint.color = Color.BLACK + canvas.drawRect(0F,0F,50F,50F,myPaint) } } \ 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 e038eab..4836bed 100644 --- a/Tetris/app/src/main/res/layout/activity_game.xml +++ b/Tetris/app/src/main/res/layout/activity_game.xml @@ -1,33 +1,15 @@ - - - + \ No newline at end of file From bb98e747fb3e9e195e7cdd7d2c5a72383aef038e Mon Sep 17 00:00:00 2001 From: Jolys Enzo Date: Thu, 16 Mar 2023 21:07:51 +0100 Subject: [PATCH 5/9] =?UTF-8?q?affichage=20r=C3=A9ussi=20tableau=20et=202?= =?UTF-8?q?=20button?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/tetrisGame/activity/Game.kt | 2 +- .../main/java/tetrisGame/views/ViewsGame.kt | 7 +++-- .../app/src/main/res/drawable/button_left.xml | 7 +++++ .../app/src/main/res/layout/activity_game.xml | 28 ++++++++++++++++--- 4 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 Tetris/app/src/main/res/drawable/button_left.xml diff --git a/Tetris/app/src/main/java/tetrisGame/activity/Game.kt b/Tetris/app/src/main/java/tetrisGame/activity/Game.kt index cf9eee9..c202c2b 100644 --- a/Tetris/app/src/main/java/tetrisGame/activity/Game.kt +++ b/Tetris/app/src/main/java/tetrisGame/activity/Game.kt @@ -15,7 +15,7 @@ class Game : AppCompatActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_game) - val canvaViews = findViewById(R.id.tabGame) + val view = findViewById(R.id.tabGame) } } \ No newline at end of file diff --git a/Tetris/app/src/main/java/tetrisGame/views/ViewsGame.kt b/Tetris/app/src/main/java/tetrisGame/views/ViewsGame.kt index c86b019..72cd9d8 100644 --- a/Tetris/app/src/main/java/tetrisGame/views/ViewsGame.kt +++ b/Tetris/app/src/main/java/tetrisGame/views/ViewsGame.kt @@ -4,15 +4,16 @@ import android.content.Context import android.graphics.Canvas import android.graphics.Color import android.graphics.Paint +import android.util.AttributeSet import android.view.View -class ViewsGame(context:Context) : View(context) { +class ViewsGame(context:Context, attrs: AttributeSet?) : View(context, attrs) { val myPaint:Paint = Paint() override fun onDraw(canvas: Canvas) { super.onDraw(canvas) - myPaint.color = Color.BLACK - canvas.drawRect(0F,0F,50F,50F,myPaint) + myPaint.color = Color.WHITE + canvas.drawRect(5F,5F,1000F,1000F,myPaint) } } \ No newline at end of file diff --git a/Tetris/app/src/main/res/drawable/button_left.xml b/Tetris/app/src/main/res/drawable/button_left.xml new file mode 100644 index 0000000..1f57bf9 --- /dev/null +++ b/Tetris/app/src/main/res/drawable/button_left.xml @@ -0,0 +1,7 @@ + + + + + + \ 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 4836bed..929ddaa 100644 --- a/Tetris/app/src/main/res/layout/activity_game.xml +++ b/Tetris/app/src/main/res/layout/activity_game.xml @@ -6,10 +6,30 @@ android:layout_height="match_parent" tools:context="tetrisGame.activity.Game"> - + + + + +