From 6b16e19a71e807012b26efabdf1d57453f4387e4 Mon Sep 17 00:00:00 2001 From: Jolys Enzo Date: Fri, 3 Mar 2023 15:20:22 +0100 Subject: [PATCH 1/3] =?UTF-8?q?cr=C3=A9ation=20des=20activity=20menu,=20ga?= =?UTF-8?q?me=20et=20des=20layouts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tetris/app/build.gradle | 1 + Tetris/app/src/main/AndroidManifest.xml | 8 +++-- Tetris/app/src/main/java/activity/Game.kt | 15 ++++++++ Tetris/app/src/main/java/modele/Draw.kt | 12 +++++++ .../app/src/main/res/layout/activity_game.xml | 7 ++++ .../app/src/main/res/layout/activity_menu.xml | 34 ++++++++++++++++--- Tetris/build.gradle | 2 +- 7 files changed, 70 insertions(+), 9 deletions(-) create mode 100644 Tetris/app/src/main/java/activity/Game.kt create mode 100644 Tetris/app/src/main/java/modele/Draw.kt create mode 100644 Tetris/app/src/main/res/layout/activity_game.xml diff --git a/Tetris/app/build.gradle b/Tetris/app/build.gradle index ba3fe66..97d1d9b 100644 --- a/Tetris/app/build.gradle +++ b/Tetris/app/build.gradle @@ -38,6 +38,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.8.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.core:core-ktx:+' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' diff --git a/Tetris/app/src/main/AndroidManifest.xml b/Tetris/app/src/main/AndroidManifest.xml index 12fd643..2f6b1fd 100644 --- a/Tetris/app/src/main/AndroidManifest.xml +++ b/Tetris/app/src/main/AndroidManifest.xml @@ -11,11 +11,13 @@ android:supportsRtl="true" android:theme="@style/Theme.Tetris" tools:targetApi="31"> - - - + + + diff --git a/Tetris/app/src/main/java/activity/Game.kt b/Tetris/app/src/main/java/activity/Game.kt new file mode 100644 index 0000000..817aaf7 --- /dev/null +++ b/Tetris/app/src/main/java/activity/Game.kt @@ -0,0 +1,15 @@ +package activity + +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import but.androidstudio.tetris.R + +class Game : AppCompatActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_game) + } + + +} \ No newline at end of file diff --git a/Tetris/app/src/main/java/modele/Draw.kt b/Tetris/app/src/main/java/modele/Draw.kt new file mode 100644 index 0000000..16186d7 --- /dev/null +++ b/Tetris/app/src/main/java/modele/Draw.kt @@ -0,0 +1,12 @@ +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/res/layout/activity_game.xml b/Tetris/app/src/main/res/layout/activity_game.xml new file mode 100644 index 0000000..972c55c --- /dev/null +++ b/Tetris/app/src/main/res/layout/activity_game.xml @@ -0,0 +1,7 @@ + + \ 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 6c3f41d..05137dc 100644 --- a/Tetris/app/src/main/res/layout/activity_menu.xml +++ b/Tetris/app/src/main/res/layout/activity_menu.xml @@ -2,14 +2,20 @@ + android:layout_width="wrap_content" + android:layout_height="wrap_content" + 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"> + + + + + + + \ No newline at end of file diff --git a/Tetris/build.gradle b/Tetris/build.gradle index 7cadbe8..f23bc2f 100644 --- a/Tetris/build.gradle +++ b/Tetris/build.gradle @@ -2,5 +2,5 @@ plugins { id 'com.android.application' version '7.4.0' apply false id 'com.android.library' version '7.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.21' apply false + id 'org.jetbrains.kotlin.android' version '1.8.20-Beta' apply false } \ No newline at end of file -- 2.36.3 From c9919afa5cef97545be95ba884fa09fb26d9986a Mon Sep 17 00:00:00 2001 From: Jolys Enzo Date: Fri, 3 Mar 2023 15:20:22 +0100 Subject: [PATCH 2/3] =?UTF-8?q?cr=C3=A9ation=20des=20activity=20menu,=20ga?= =?UTF-8?q?me=20et=20des=20layouts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tetris/app/build.gradle | 1 + .../app/src/main/res/layout/activity_game.xml | 31 ++----------------- Tetris/build.gradle | 2 +- 3 files changed, 4 insertions(+), 30 deletions(-) diff --git a/Tetris/app/build.gradle b/Tetris/app/build.gradle index ba3fe66..97d1d9b 100644 --- a/Tetris/app/build.gradle +++ b/Tetris/app/build.gradle @@ -38,6 +38,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.8.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.core:core-ktx:+' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' diff --git a/Tetris/app/src/main/res/layout/activity_game.xml b/Tetris/app/src/main/res/layout/activity_game.xml index 6c2c868..972c55c 100644 --- a/Tetris/app/src/main/res/layout/activity_game.xml +++ b/Tetris/app/src/main/res/layout/activity_game.xml @@ -1,34 +1,7 @@ - - - - - - - - - \ No newline at end of file + tools:context="activity.game"/> \ No newline at end of file diff --git a/Tetris/build.gradle b/Tetris/build.gradle index 7cadbe8..f23bc2f 100644 --- a/Tetris/build.gradle +++ b/Tetris/build.gradle @@ -2,5 +2,5 @@ plugins { id 'com.android.application' version '7.4.0' apply false id 'com.android.library' version '7.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.21' apply false + id 'org.jetbrains.kotlin.android' version '1.8.20-Beta' apply false } \ No newline at end of file -- 2.36.3 From cbbd4094d8e2f2ff35f1ea6b34ef80b219b400e4 Mon Sep 17 00:00:00 2001 From: Jolys Enzo Date: Fri, 10 Mar 2023 15:28:24 +0100 Subject: [PATCH 3/3] =?UTF-8?q?Ajout=20d'un=20canva=20avec=20un=20paint=20?= =?UTF-8?q?(=20faut=20ajouter=20de=20bitmap=20pour=20cr=C3=A9e=20les=20pie?= =?UTF-8?q?ces?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tetris/app/build.gradle | 1 + Tetris/app/src/main/AndroidManifest.xml | 14 +------ Tetris/app/src/main/java/activity/Game.kt | 8 +++- Tetris/app/src/main/java/activity/Option.kt | 2 - Tetris/app/src/main/java/modele/CanvaView.kt | 39 +++++++++++++++++++ Tetris/app/src/main/java/modele/Draw.kt | 3 +- .../app/src/main/res/layout/activity_game.xml | 6 ++- Tetris/build.gradle | 2 +- 8 files changed, 55 insertions(+), 20 deletions(-) create mode 100644 Tetris/app/src/main/java/modele/CanvaView.kt diff --git a/Tetris/app/build.gradle b/Tetris/app/build.gradle index 97d1d9b..3e36356 100644 --- a/Tetris/app/build.gradle +++ b/Tetris/app/build.gradle @@ -39,6 +39,7 @@ dependencies { implementation 'com.google.android.material:material:1.8.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.core:core-ktx:+' + implementation 'androidx.core:core-ktx:+' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' diff --git a/Tetris/app/src/main/AndroidManifest.xml b/Tetris/app/src/main/AndroidManifest.xml index e9a4d06..5493402 100644 --- a/Tetris/app/src/main/AndroidManifest.xml +++ b/Tetris/app/src/main/AndroidManifest.xml @@ -12,19 +12,7 @@ android:theme="@style/Theme.Tetris" tools:targetApi="31"> - - - - - - - - diff --git a/Tetris/app/src/main/java/activity/Game.kt b/Tetris/app/src/main/java/activity/Game.kt index ff6cd48..788a13b 100644 --- a/Tetris/app/src/main/java/activity/Game.kt +++ b/Tetris/app/src/main/java/activity/Game.kt @@ -5,13 +5,17 @@ import android.os.Bundle import android.widget.ImageView import androidx.core.content.ContextCompat import but.androidstudio.tetris.R +import modele.CanvaView class Game : AppCompatActivity() { + val canvaView:CanvaView = TODO() + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_game) - } - + // Mettre le canva ici + //canvaView.findViewById() + } } \ No newline at end of file diff --git a/Tetris/app/src/main/java/activity/Option.kt b/Tetris/app/src/main/java/activity/Option.kt index 23a0386..2493d8c 100644 --- a/Tetris/app/src/main/java/activity/Option.kt +++ b/Tetris/app/src/main/java/activity/Option.kt @@ -8,7 +8,5 @@ class Option : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_option) - - } } \ No newline at end of file diff --git a/Tetris/app/src/main/java/modele/CanvaView.kt b/Tetris/app/src/main/java/modele/CanvaView.kt new file mode 100644 index 0000000..fb6cc5f --- /dev/null +++ b/Tetris/app/src/main/java/modele/CanvaView.kt @@ -0,0 +1,39 @@ +package modele + +import android.content.Context +import android.graphics.Bitmap +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.Matrix +import android.graphics.Paint +import android.graphics.Rect +import android.view.View + +class CanvaView(context : Context) : View(context) { + + val paint = Paint() + + // Pour drawBitmap, mais a voir + val piece = Array(size = 16){ 0 } + + + init { + paint.color = Color.BLACK + paint.strokeWidth = 8F + paint.style = Paint.Style.FILL + } + + override fun onDraw(canvas: Canvas) { + super.onDraw(canvas) + + // Utiliser drawBitmap pour dessiner nos piece + canvas.drawBitmap() + + val matrix = Bitmap() + + + + } + +} + diff --git a/Tetris/app/src/main/java/modele/Draw.kt b/Tetris/app/src/main/java/modele/Draw.kt index d4cfe30..f6f1716 100644 --- a/Tetris/app/src/main/java/modele/Draw.kt +++ b/Tetris/app/src/main/java/modele/Draw.kt @@ -6,5 +6,6 @@ import android.graphics.Paint import android.graphics.Path import android.view.View -class Draw { +class DrawView { + } \ 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 972c55c..3e9a26c 100644 --- a/Tetris/app/src/main/res/layout/activity_game.xml +++ b/Tetris/app/src/main/res/layout/activity_game.xml @@ -4,4 +4,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="activity.game"/> \ No newline at end of file + tools:context="activity.Game"> + + + + \ No newline at end of file diff --git a/Tetris/build.gradle b/Tetris/build.gradle index f23bc2f..1532027 100644 --- a/Tetris/build.gradle +++ b/Tetris/build.gradle @@ -2,5 +2,5 @@ plugins { id 'com.android.application' version '7.4.0' apply false id 'com.android.library' version '7.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.8.20-Beta' apply false + id 'org.jetbrains.kotlin.android' version '1.8.20-RC' apply false } \ No newline at end of file -- 2.36.3