From 8297290c3136d346e828d8448acffe43c6cf494a Mon Sep 17 00:00:00 2001
From: martins <clement.martins@etu.u-pec.fr>
Date: Wed, 22 Mar 2023 10:30:43 +0100
Subject: [PATCH] ok

---
 app/.idea/.gitignore                           |  3 +++
 app/.idea/gradle.xml                           | 13 +++++++++++++
 app/.idea/misc.xml                             |  9 +++++++++
 app/.idea/modules.xml                          |  8 ++++++++
 app/.idea/modules/app.iml                      | 18 ++++++++++++++++++
 app/.idea/vcs.xml                              |  6 ++++++
 app/local.properties                           |  8 ++++++++
 app/src/main/AndroidManifest.xml               |  3 +++
 .../mastermind/setting/SettingActivity.java    | 14 ++++++++++++++
 app/src/main/res/layout/activity_menu.xml      | 16 ++++++++--------
 app/src/main/res/layout/activity_setting.xml   |  9 +++++++++
 build.gradle                                   |  4 ++--
 local.properties                               |  8 ++++++++
 13 files changed, 109 insertions(+), 10 deletions(-)
 create mode 100644 app/.idea/.gitignore
 create mode 100644 app/.idea/gradle.xml
 create mode 100644 app/.idea/misc.xml
 create mode 100644 app/.idea/modules.xml
 create mode 100644 app/.idea/modules/app.iml
 create mode 100644 app/.idea/vcs.xml
 create mode 100644 app/local.properties
 create mode 100644 app/src/main/java/com/example/mastermind/vue/mastermind/setting/SettingActivity.java
 create mode 100644 app/src/main/res/layout/activity_setting.xml
 create mode 100644 local.properties

diff --git a/app/.idea/.gitignore b/app/.idea/.gitignore
new file mode 100644
index 0000000..26d3352
--- /dev/null
+++ b/app/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/app/.idea/gradle.xml b/app/.idea/gradle.xml
new file mode 100644
index 0000000..b4ab341
--- /dev/null
+++ b/app/.idea/gradle.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="testRunner" value="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="/usr/share/java/gradle" />
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/.idea/misc.xml b/app/.idea/misc.xml
new file mode 100644
index 0000000..2671b80
--- /dev/null
+++ b/app/.idea/misc.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/.idea/modules.xml b/app/.idea/modules.xml
new file mode 100644
index 0000000..e1f9e1c
--- /dev/null
+++ b/app/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app.iml" filepath="$PROJECT_DIR$/.idea/modules/app.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/.idea/modules/app.iml b/app/.idea/modules/app.iml
new file mode 100644
index 0000000..5b2d407
--- /dev/null
+++ b/app/.idea/modules/app.iml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
+        <option name="LAST_KNOWN_AGP_VERSION" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../.." />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/app/.idea/vcs.xml b/app/.idea/vcs.xml
new file mode 100644
index 0000000..6c0b863
--- /dev/null
+++ b/app/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/local.properties b/app/local.properties
new file mode 100644
index 0000000..986bf72
--- /dev/null
+++ b/app/local.properties
@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Mon Mar 20 10:22:46 CET 2023
+sdk.dir=/opt/android-sdk
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3b848c9..f2ee054 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,6 +11,9 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.MasterMind"
         tools:targetApi="31">
+        <activity
+            android:name=".SettingActivity"
+            android:exported="false" />
         <activity
             android:name=".MasterMindActivity"
             android:exported="false" />
diff --git a/app/src/main/java/com/example/mastermind/vue/mastermind/setting/SettingActivity.java b/app/src/main/java/com/example/mastermind/vue/mastermind/setting/SettingActivity.java
new file mode 100644
index 0000000..71bf33a
--- /dev/null
+++ b/app/src/main/java/com/example/mastermind/vue/mastermind/setting/SettingActivity.java
@@ -0,0 +1,14 @@
+package com.example.mastermind.vue.mastermind.setting;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+
+public class SettingActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_setting);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_menu.xml b/app/src/main/res/layout/activity_menu.xml
index 0c7a6d4..0a7853e 100644
--- a/app/src/main/res/layout/activity_menu.xml
+++ b/app/src/main/res/layout/activity_menu.xml
@@ -21,7 +21,7 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentRight="true"
         android:textAlignment="center"
-        android:layout_above="@+id/unJoeur"
+        android:layout_above="@+id/unJoueur"
         android:layout_alignParentTop="true"
         android:gravity="center"
         android:editable="false"
@@ -29,30 +29,30 @@
 
 
     <Button
-        android:id="@+id/unJoeur"
+        android:id="@+id/unJoueur"
         android:layout_width="0dp"
         android:layout_alignParentRight="true"
         android:layout_alignParentLeft="true"
-        android:textSize="38dp"
+        android:textSize="30dp"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:layout_marginHorizontal="40dp"
         android:background="@color/marron"
-        android:text="Un Joeur"/>
+        android:text="Un Joueur"/>
 
     <Button
-        android:id="@+id/deuxJoeur"
+        android:id="@+id/deuxJoueur"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_alignParentLeft="true"
         android:layout_centerInParent="true"
         android:layout_marginTop="50dp"
-        android:layout_below="@+id/unJoeur"
+        android:layout_below="@+id/unJoueur"
         android:layout_marginHorizontal="40dp"
         android:background="@color/marron"
-        android:textSize="38dp"
-        android:text="Deux Joeur"/>
+        android:textSize="30dp"
+        android:text="Deux Joueur"/>
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
new file mode 100644
index 0000000..aa4d77b
--- /dev/null
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -0,0 +1,9 @@
+<?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=".vue.mastermind.setting.SettingActivity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index ab2b874..8a496f1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '7.4.2' apply false
+    id 'com.android.application' version '7.2.1' apply false
+    id 'com.android.library' version '7.2.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
 }
\ No newline at end of file
diff --git a/local.properties b/local.properties
new file mode 100644
index 0000000..ca62d85
--- /dev/null
+++ b/local.properties
@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Mon Mar 20 10:18:57 CET 2023
+sdk.dir=/opt/android-sdk