From 7113cbc23ef6ca555c0f54e1e19eb59a6124187b Mon Sep 17 00:00:00 2001
From: Alexis1663 <92861778+Alexis1663@users.noreply.github.com>
Date: Thu, 9 Mar 2023 13:23:49 +0100
Subject: [PATCH] ajout menu option + redirection sur celle-ci + ajout spinner
 difficulty avec son adaptateur

---
 Tetris/app/src/main/AndroidManifest.xml       | 12 ++++--
 Tetris/app/src/main/java/activity/Menu.kt     | 14 ++++++-
 Tetris/app/src/main/java/activity/Option.kt   | 39 +++++++++++++++++++
 .../src/main/res/layout/activity_option.xml   | 32 +++++++++++++++
 4 files changed, 91 insertions(+), 6 deletions(-)
 create mode 100644 Tetris/app/src/main/java/activity/Option.kt
 create mode 100644 Tetris/app/src/main/res/layout/activity_option.xml

diff --git a/Tetris/app/src/main/AndroidManifest.xml b/Tetris/app/src/main/AndroidManifest.xml
index f35f69d..9519b36 100644
--- a/Tetris/app/src/main/AndroidManifest.xml
+++ b/Tetris/app/src/main/AndroidManifest.xml
@@ -11,15 +11,19 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Tetris"
         tools:targetApi="31">
-        <activity android:name="activity.Menu"
-            android:exported="true">
+        <activity android:name="activity.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="activity.Game"
-            android:exported="true">
+        <activity android:name="activity.Game" 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="activity.Option" android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/Tetris/app/src/main/java/activity/Menu.kt b/Tetris/app/src/main/java/activity/Menu.kt
index 81f3763..a3606a6 100644
--- a/Tetris/app/src/main/java/activity/Menu.kt
+++ b/Tetris/app/src/main/java/activity/Menu.kt
@@ -15,11 +15,21 @@ class Menu : AppCompatActivity() {
 
         val appName:TextView = findViewById(R.id.appName)
         appName.setText(R.string.app_name)
+    }
+
+    override fun onResume() {
+        super.onResume()
 
         val buttonStart:Button = findViewById(R.id.buttonStart)
         buttonStart.setOnClickListener {
-            val intent = Intent(this,Game::class.java)
-            startActivity(intent)
+            val intentStart = Intent(this,Game::class.java)
+            startActivity(intentStart)
+        }
+
+        val buttonOption:Button = findViewById(R.id.buttonOption)
+        buttonOption.setOnClickListener {
+            val intentOption = Intent(this,Option::class.java)
+            startActivity(intentOption)
         }
     }
 }
\ 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
new file mode 100644
index 0000000..485f166
--- /dev/null
+++ b/Tetris/app/src/main/java/activity/Option.kt
@@ -0,0 +1,39 @@
+package activity
+
+import android.os.Bundle
+import android.view.View
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.Spinner
+import androidx.appcompat.app.AppCompatActivity
+import but.androidstudio.tetris.R
+
+class Option : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_option)
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        val spinnerDifficulty:Spinner = findViewById(R.id.spinnerDifficulty)
+        val difficulty = arrayOf("Facile","Intermédiaire","Difficile")
+
+        val adaptateurSpinnerDifficulty = ArrayAdapter(this,android.R.layout.simple_spinner_dropdown_item,difficulty)
+        spinnerDifficulty.adapter = adaptateurSpinnerDifficulty
+
+        spinnerDifficulty.setOnItemSelectedListener(object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) {
+                val selectedItem = parent.getItemAtPosition(position).toString()
+                // Faites quelque chose avec l'élément sélectionné
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>) {
+                // Ne rien faire si aucun élément n'est sélectionné
+            }
+        })
+
+
+    }
+}
\ No newline at end of file
diff --git a/Tetris/app/src/main/res/layout/activity_option.xml b/Tetris/app/src/main/res/layout/activity_option.xml
new file mode 100644
index 0000000..2fd06b3
--- /dev/null
+++ b/Tetris/app/src/main/res/layout/activity_option.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="activity.Menu">
+
+    <LinearLayout
+        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">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Difficulty"/>
+
+        <Spinner
+            android:id="@+id/spinnerDifficulty"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="1mm"
+            />
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file