diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a4e49d26d03899a68c5c327c44081b121586c340..0ef3e80114b07c59a9a9b9fb2c81e55221347895 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="AutoImportSettings">
- <option name="autoReloadType" value="NONE" />
- </component>
-<<<<<<< HEAD
<component name="BranchesTreeState">
<expand>
<path>
@@ -25,16 +21,13 @@
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
<item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
<item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
- <item name="BRANCH:origin/master" type="e8cecc67:BranchNodeDescriptor" />
</path>
</select>
</component>
<component name="ChangeListManager">
- <list default="true" id="5e2ff150-42f0-4d72-8788-81b80423622d" name="Default Changelist" comment="" />
-=======
- <component name="ChangeListManager">
- <list default="true" id="64bd18de-33b7-4999-b0e7-236767785eb9" name="Default Changelist" comment="" />
->>>>>>> origin/master
+ <list default="true" id="c794d68b-a3cf-40c5-82fe-f16c01933d82" name="Default Changelist" comment="essai commit">
+ <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ </list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -43,11 +36,7 @@
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
-<<<<<<< HEAD
- <component name="ProjectId" id="1kNIEPc8y8sZQngiENEScODm3Kn" />
-=======
- <component name="ProjectId" id="1kNKdXam2EXOa69grvkmAI3uqiq" />
->>>>>>> origin/master
+ <component name="ProjectId" id="1kNJK0hSnr9qd93thPiy2X4ljxW" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
@@ -55,48 +44,27 @@
<component name="PropertiesComponent">
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+ <property name="settings.editor.selected.configurable" value="AndroidSdkUpdater" />
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
-<<<<<<< HEAD
- <changelist id="5e2ff150-42f0-4d72-8788-81b80423622d" name="Default Changelist" comment="" />
- <created>1605534509914</created>
+ <changelist id="c794d68b-a3cf-40c5-82fe-f16c01933d82" name="Default Changelist" comment="" />
+ <created>1605535047857</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
- <updated>1605534509914</updated>
+ <updated>1605535047857</updated>
</task>
- <task id="LOCAL-00001" summary="gautier a réussi a se connecter">
- <created>1605534760099</created>
+ <task id="LOCAL-00001" summary="essai commit">
+ <created>1605537018345</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
- <updated>1605534760099</updated>
- </task>
- <task id="LOCAL-00002" summary="gautier a réussi a se connecter">
- <created>1605535067920</created>
- <option name="number" value="00002" />
- <option name="presentableId" value="LOCAL-00002" />
- <option name="project" value="LOCAL" />
- <updated>1605535067920</updated>
- </task>
- <task id="LOCAL-00003" summary="gautier a réussi a se connecter">
- <created>1605535281983</created>
- <option name="number" value="00003" />
- <option name="presentableId" value="LOCAL-00003" />
- <option name="project" value="LOCAL" />
- <updated>1605535281983</updated>
- </task>
- <task id="LOCAL-00004" summary="gautier a réussi a se connecter">
- <created>1605535405961</created>
- <option name="number" value="00004" />
- <option name="presentableId" value="LOCAL-00004" />
- <option name="project" value="LOCAL" />
- <updated>1605535405961</updated>
+ <updated>1605537018345</updated>
</task>
- <option name="localTasksCounter" value="5" />
+ <option name="localTasksCounter" value="2" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
@@ -104,75 +72,24 @@
<map>
<entry key="MAIN">
<value>
- <State>
- <option name="FILTERS">
- <map>
- <entry key="branch">
- <value>
- <list>
- <option value="origin/master" />
- </list>
- </value>
- </entry>
- </map>
- </option>
- </State>
+ <State />
</value>
</entry>
</map>
</option>
</component>
<component name="VcsManagerConfiguration">
- <MESSAGE value="gautier a réussi a se connecter" />
- <option name="LAST_COMMIT_MESSAGE" value="gautier a réussi a se connecter" />
+ <MESSAGE value="essai commit" />
+ <option name="LAST_COMMIT_MESSAGE" value="essai commit" />
</component>
<component name="WindowStateProjectService">
- <state x="395" y="0" key="CommitChangelistDialog2" timestamp="1605535405222">
- <screen x="0" y="0" width="1536" height="824" />
- </state>
- <state x="395" y="0" key="CommitChangelistDialog2/0.0.1536.824@0.0.1536.824" timestamp="1605535405222" />
- <state x="147" y="65" key="MergeDialog" timestamp="1605535344980">
+ <state x="361" y="145" key="Vcs.Push.Dialog.v2" timestamp="1605537057012">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state x="147" y="65" key="MergeDialog/0.0.1536.824@0.0.1536.824" timestamp="1605535344980" />
- <state x="407" y="174" key="MultipleFileMergeDialog" timestamp="1605535344986">
+ <state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1605537057012" />
+ <state x="579" y="326" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1605538069420">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state x="407" y="174" key="MultipleFileMergeDialog/0.0.1536.824@0.0.1536.824" timestamp="1605535344986" />
- <state x="361" y="145" key="Vcs.Push.Dialog.v2" timestamp="1605535408847">
- <screen x="0" y="0" width="1536" height="824" />
- </state>
- <state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1605535408847" />
-=======
- <changelist id="64bd18de-33b7-4999-b0e7-236767785eb9" name="Default Changelist" comment="" />
- <created>1605535696879</created>
- <option name="number" value="Default" />
- <option name="presentableId" value="Default" />
- <updated>1605535696879</updated>
- </task>
- <task id="LOCAL-00001" summary="Version Martin">
- <created>1605536606438</created>
- <option name="number" value="00001" />
- <option name="presentableId" value="LOCAL-00001" />
- <option name="project" value="LOCAL" />
- <updated>1605536606438</updated>
- </task>
- <option name="localTasksCounter" value="2" />
- <servers />
- </component>
- <component name="VcsManagerConfiguration">
- <MESSAGE value="Version Martin" />
- <option name="LAST_COMMIT_MESSAGE" value="Version Martin" />
- </component>
- <component name="WindowStateProjectService">
- <state x="398" y="0" key="CommitChangelistDialog2" timestamp="1605536604696">
- <screen x="0" y="0" width="1600" height="860" />
- </state>
- <state x="398" y="0" key="CommitChangelistDialog2/0.0.1600.860@0.0.1600.860" timestamp="1605536604696" />
- <state x="510" y="327" key="git4idea.remote.GitConfigureRemotesDialog" timestamp="1605536500191">
- <screen x="0" y="0" width="1600" height="860" />
- </state>
- <state x="510" y="327" key="git4idea.remote.GitConfigureRemotesDialog/0.0.1600.860@0.0.1600.860" timestamp="1605536500191" />
->>>>>>> origin/master
+ <state x="579" y="326" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1536.824@0.0.1536.824" timestamp="1605538069420" />
</component>
</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/cw_app/MainActivity.java b/app/src/main/java/com/example/cw_app/MainActivity.java
index c7e84e5b5c4f4cacd3eeec34d1d90e7c6dfbd562..db3753595dbefcb644ce0f13fe02ae36414d57be 100644
--- a/app/src/main/java/com/example/cw_app/MainActivity.java
+++ b/app/src/main/java/com/example/cw_app/MainActivity.java
@@ -20,6 +20,7 @@ import androidx.appcompat.widget.Toolbar;
//c'est moi gautier qui ai update
// Martin
+//felix la grosse chiasse
public class MainActivity extends AppCompatActivity {
private AppBarConfiguration mAppBarConfiguration;