diff --git a/app/build.gradle b/app/build.gradle
deleted file mode 100644
index 6dea5f6..0000000
--- a/app/build.gradle
+++ /dev/null
@@ -1,39 +0,0 @@
-plugins {
- id 'com.android.application'
-}
-
-android {
- namespace 'com.example.jmastermind'
- compileSdk 33
-
- defaultConfig {
- applicationId "com.example.jmastermind"
- minSdk 19
- targetSdk 33
- versionCode 1
- versionName "1.0"
-
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
-}
-
-dependencies {
-
- implementation 'androidx.appcompat:appcompat:1.6.1'
- implementation 'com.google.android.material:material:1.8.0'
- implementation 'androidx.preference:preference:1.2.0'
- testImplementation 'junit:junit:4.13.2'
- androidTestImplementation 'androidx.test.ext:junit:1.1.5'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/jmastermind/Events/ColorSelectorEvent.java b/app/src/main/java/com/example/jmastermind/Events/ColorSelectorEvent.java
index 2fcbef6..edc9644 100644
--- a/app/src/main/java/com/example/jmastermind/Events/ColorSelectorEvent.java
+++ b/app/src/main/java/com/example/jmastermind/Events/ColorSelectorEvent.java
@@ -2,11 +2,11 @@ package com.example.jmastermind.Events;
import android.content.SharedPreferences;
import android.graphics.Color;
+import android.preference.PreferenceManager;
import android.util.Log;
import android.view.View;
import android.widget.TextView;
import androidx.appcompat.app.AppCompatActivity;
-import androidx.preference.PreferenceManager;
import com.example.jmastermind.Deck.Deck;
import com.example.jmastermind.Deck.DeckCheck;
import com.example.jmastermind.Deck.DeckLambda;
diff --git a/app/src/main/java/com/example/jmastermind/Events/RulesEvent.java b/app/src/main/java/com/example/jmastermind/Events/RulesEvent.java
new file mode 100644
index 0000000..c461974
--- /dev/null
+++ b/app/src/main/java/com/example/jmastermind/Events/RulesEvent.java
@@ -0,0 +1,26 @@
+package com.example.jmastermind.Events;
+
+import android.content.Intent;
+import android.view.View;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.example.jmastermind.Menu.Menu;
+
+public class RulesEvent implements View.OnClickListener {
+ private AppCompatActivity context;
+
+ /**
+ * L'evenement pour cliquer sur les regles et retourner directement au menu
+ * @param context Le contexte.
+ * */
+ public RulesEvent(AppCompatActivity context) {
+ this.context = context;
+ }
+
+ @Override
+ public void onClick(View view) {
+ Intent i = new Intent(this.context, Menu.class);
+ this.context.startActivity(i);
+ }
+}
diff --git a/app/src/main/java/com/example/jmastermind/Menu/Menu.java b/app/src/main/java/com/example/jmastermind/Menu/Menu.java
index 1d88286..672a60b 100644
--- a/app/src/main/java/com/example/jmastermind/Menu/Menu.java
+++ b/app/src/main/java/com/example/jmastermind/Menu/Menu.java
@@ -4,6 +4,8 @@ import android.media.MediaPlayer;
import android.os.Bundle;
import android.widget.Button;
import android.widget.CheckBox;
+import android.widget.LinearLayout;
+
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import com.example.jmastermind.Events.CanVoidEvent;
diff --git a/app/src/main/java/com/example/jmastermind/Rules/Rules.java b/app/src/main/java/com/example/jmastermind/Rules/Rules.java
index c6a14d2..eb6978b 100644
--- a/app/src/main/java/com/example/jmastermind/Rules/Rules.java
+++ b/app/src/main/java/com/example/jmastermind/Rules/Rules.java
@@ -2,8 +2,12 @@ package com.example.jmastermind.Rules;
import android.content.Intent;
import android.os.Bundle;
+import android.widget.LinearLayout;
+
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
+
+import com.example.jmastermind.Events.RulesEvent;
import com.example.jmastermind.Menu.Menu;
import com.example.jmastermind.R;
@@ -16,6 +20,8 @@ public class Rules extends AppCompatActivity {
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.rules);
+ LinearLayout rulescont = findViewById(R.id.rulescontainer);
+ rulescont.setOnClickListener(new RulesEvent(this));
}
@Override
diff --git a/app/src/main/res/drawable/combimode.PNG b/app/src/main/res/drawable/combimode.PNG
new file mode 100644
index 0000000..d211ad0
Binary files /dev/null and b/app/src/main/res/drawable/combimode.PNG differ
diff --git a/app/src/main/res/drawable/multimode.PNG b/app/src/main/res/drawable/multimode.PNG
new file mode 100644
index 0000000..836f959
Binary files /dev/null and b/app/src/main/res/drawable/multimode.PNG differ
diff --git a/app/src/main/res/drawable/pionvidemode.PNG b/app/src/main/res/drawable/pionvidemode.PNG
new file mode 100644
index 0000000..40caecd
Binary files /dev/null and b/app/src/main/res/drawable/pionvidemode.PNG differ
diff --git a/app/src/main/res/drawable/solomode.PNG b/app/src/main/res/drawable/solomode.PNG
new file mode 100644
index 0000000..181ddc3
Binary files /dev/null and b/app/src/main/res/drawable/solomode.PNG differ
diff --git a/app/src/main/res/layout/rules.xml b/app/src/main/res/layout/rules.xml
index f0d8ef9..a2902dd 100644
--- a/app/src/main/res/layout/rules.xml
+++ b/app/src/main/res/layout/rules.xml
@@ -9,38 +9,61 @@
android:orientation="vertical"
>
-
+ android:scrollbars="vertical"
+ android:layout_height="wrap_content">
+
-
+
-
+
-
+
+
+
+
+
\ No newline at end of file