From c8059613464db0432f4d6db3c801c745c431b032 Mon Sep 17 00:00:00 2001
From: JLo'w <Jean-Loup.Beaussart@polytech-lille.net>
Date: Sun, 24 Apr 2016 19:20:07 +0200
Subject: [PATCH] Re-fonte de l'app et elle marche

---
 PremiereActivite/.idea/gradle.xml                                                 | 11 ++++++-----
 PremiereActivite/.idea/inspectionProfiles/Project_Default.xml                     |  6 ++++++
 PremiereActivite/.idea/inspectionProfiles/profiles_settings.xml                   |  7 +++++++
 PremiereActivite/.idea/modules.xml                                                |  4 ++--
 PremiereActivite/app/build.gradle                                                 |  5 +++--
 PremiereActivite/app/src/main/AndroidManifest.xml                                 | 18 +++++++++++++-----
 PremiereActivite/app/src/main/java/com/example/app_10p5/CarteActivite.java        | 16 ++++++++++++++++
 PremiereActivite/app/src/main/java/com/example/app_10p5/MainActivite.java         | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 PremiereActivite/app/src/main/java/com/example/app_10p5/PagerAdapter.java         | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment1.java         | 14 ++++++++++++++
 PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment2.java         | 15 +++++++++++++++
 PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment3.java         | 16 ++++++++++++++++
 PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment4.java         | 14 ++++++++++++++
 PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment5.java         | 14 ++++++++++++++
 PremiereActivite/app/src/main/java/com/example/florian/premiereactivite/Menu.java | 49 -------------------------------------------------
 PremiereActivite/app/src/main/res/layout/activity_menu.xml                        | 34 ----------------------------------
 PremiereActivite/app/src/main/res/layout/content_menu.xml                         | 19 -------------------
 PremiereActivite/app/src/main/res/layout/layout_carte.xml                         | 20 ++++++++++++++++++++
 PremiereActivite/app/src/main/res/layout/layout_commande.xml                      | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 PremiereActivite/app/src/main/res/layout/layout_connection.xml                    | 36 ++++++++++++++++++++++++++++++++++++
 PremiereActivite/app/src/main/res/layout/layout_creation.xml                      | 42 ++++++++++++++++++++++++++++++++++++++++++
 PremiereActivite/app/src/main/res/layout/layout_main.xml                          | 37 +++++++++++++++++++++++++++++++++++++
 PremiereActivite/app/src/main/res/layout/layout_rechargement.xml                  | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 PremiereActivite/app/src/main/res/layout/layout_vidange.xml                       | 13 +++++++++++++
 PremiereActivite/app/src/main/res/layout/premiere.xml                             | 32 --------------------------------
 PremiereActivite/app/src/main/res/layout/tab_fragment_1.xml                       |  9 +++++++++
 PremiereActivite/app/src/main/res/layout/tab_fragment_2.xml                       |  9 +++++++++
 PremiereActivite/app/src/main/res/layout/tab_fragment_3.xml                       |  9 +++++++++
 PremiereActivite/app/src/main/res/layout/tab_fragment_4.xml                       |  9 +++++++++
 PremiereActivite/app/src/main/res/layout/tab_fragment_5.xml                       |  9 +++++++++
 PremiereActivite/app/src/main/res/menu/menu_menu.xml                              | 10 ----------
 PremiereActivite/app/src/main/res/values/colors.xml                               |  2 +-
 PremiereActivite/app/src/main/res/values/strings.xml                              | 12 ++++++++++++
 33 files changed, 551 insertions(+), 159 deletions(-)
 create mode 100644 PremiereActivite/.idea/inspectionProfiles/Project_Default.xml
 create mode 100644 PremiereActivite/.idea/inspectionProfiles/profiles_settings.xml
 create mode 100644 PremiereActivite/app/src/main/java/com/example/app_10p5/CarteActivite.java
 create mode 100644 PremiereActivite/app/src/main/java/com/example/app_10p5/MainActivite.java
 create mode 100644 PremiereActivite/app/src/main/java/com/example/app_10p5/PagerAdapter.java
 create mode 100644 PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment1.java
 create mode 100644 PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment2.java
 create mode 100644 PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment3.java
 create mode 100644 PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment4.java
 create mode 100644 PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment5.java
 delete mode 100644 PremiereActivite/app/src/main/java/com/example/florian/premiereactivite/Menu.java
 delete mode 100644 PremiereActivite/app/src/main/res/layout/activity_menu.xml
 delete mode 100644 PremiereActivite/app/src/main/res/layout/content_menu.xml
 create mode 100644 PremiereActivite/app/src/main/res/layout/layout_carte.xml
 create mode 100644 PremiereActivite/app/src/main/res/layout/layout_commande.xml
 create mode 100644 PremiereActivite/app/src/main/res/layout/layout_connection.xml
 create mode 100644 PremiereActivite/app/src/main/res/layout/layout_creation.xml
 create mode 100644 PremiereActivite/app/src/main/res/layout/layout_main.xml
 create mode 100644 PremiereActivite/app/src/main/res/layout/layout_rechargement.xml
 create mode 100644 PremiereActivite/app/src/main/res/layout/layout_vidange.xml
 delete mode 100644 PremiereActivite/app/src/main/res/layout/premiere.xml
 create mode 100644 PremiereActivite/app/src/main/res/layout/tab_fragment_1.xml
 create mode 100644 PremiereActivite/app/src/main/res/layout/tab_fragment_2.xml
 create mode 100644 PremiereActivite/app/src/main/res/layout/tab_fragment_3.xml
 create mode 100644 PremiereActivite/app/src/main/res/layout/tab_fragment_4.xml
 create mode 100644 PremiereActivite/app/src/main/res/layout/tab_fragment_5.xml
 delete mode 100644 PremiereActivite/app/src/main/res/menu/menu_menu.xml

diff --git a/PremiereActivite/.idea/gradle.xml b/PremiereActivite/.idea/gradle.xml
index 7f82275..ee6ddd0 100644
--- a/PremiereActivite/.idea/gradle.xml
+++ b/PremiereActivite/.idea/gradle.xml
@@ -3,18 +3,19 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.10" />
         <option name="modules">
           <set>
-            <option value="$USER_HOME$/Documents/Polytech/Club Info/2016/10p5-android/PremiereActivite" />
-            <option value="$USER_HOME$/Documents/Polytech/Club Info/2016/10p5-android/PremiereActivite/app" />
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
         <option name="myModules">
           <set>
-            <option value="$USER_HOME$/Documents/Polytech/Club Info/2016/10p5-android/PremiereActivite" />
-            <option value="$USER_HOME$/Documents/Polytech/Club Info/2016/10p5-android/PremiereActivite/app" />
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
       </GradleProjectSettings>
diff --git a/PremiereActivite/.idea/inspectionProfiles/Project_Default.xml b/PremiereActivite/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..9c52622
--- /dev/null
+++ b/PremiereActivite/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="AndroidLintPrivateResource" enabled="false" level="WARNING" enabled_by_default="false" />
+  </profile>
+</component>
\ No newline at end of file
diff --git a/PremiereActivite/.idea/inspectionProfiles/profiles_settings.xml b/PremiereActivite/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..3b31283
--- /dev/null
+++ b/PremiereActivite/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,7 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="PROJECT_PROFILE" value="Project Default" />
+    <option name="USE_PROJECT_PROFILE" value="true" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/PremiereActivite/.idea/modules.xml b/PremiereActivite/.idea/modules.xml
index 78d0b82..7ba7470 100644
--- a/PremiereActivite/.idea/modules.xml
+++ b/PremiereActivite/.idea/modules.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$USER_HOME$/Documents/Polytech/Club Info/2016/10p5-android/PremiereActivite/PremiereActivite.iml" filepath="$USER_HOME$/Documents/Polytech/Club Info/2016/10p5-android/PremiereActivite/PremiereActivite.iml" />
-      <module fileurl="file://$USER_HOME$/Documents/Polytech/Club Info/2016/10p5-android/PremiereActivite/app/app.iml" filepath="$USER_HOME$/Documents/Polytech/Club Info/2016/10p5-android/PremiereActivite/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/PremiereActivite.iml" filepath="$PROJECT_DIR$/PremiereActivite.iml" />
+      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/PremiereActivite/app/build.gradle b/PremiereActivite/app/build.gradle
index 4686834..a78f188 100644
--- a/PremiereActivite/app/build.gradle
+++ b/PremiereActivite/app/build.gradle
@@ -5,8 +5,8 @@ android {
     buildToolsVersion "23.0.3"
 
     defaultConfig {
-        applicationId "com.example.florian.premiereactivite"
-        minSdkVersion 15
+        applicationId "com.example.app_10p5"
+        minSdkVersion 20
         targetSdkVersion 23
         versionCode 1
         versionName "1.0"
@@ -24,4 +24,5 @@ dependencies {
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:23.2.1'
     compile 'com.android.support:design:23.2.1'
+
 }
diff --git a/PremiereActivite/app/src/main/AndroidManifest.xml b/PremiereActivite/app/src/main/AndroidManifest.xml
index 045a2fe..7e131f1 100644
--- a/PremiereActivite/app/src/main/AndroidManifest.xml
+++ b/PremiereActivite/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.florian.premiereactivite">
+    package="com.example.app_10p5">
 
     <application
         android:allowBackup="true"
@@ -9,15 +9,23 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".Menu"
-            android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:name="com.example.app_10p5.MainActivite"
+            android:label="10p5">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name="com.example.app_10p5.CarteActivite"
+            android:label="CarteActivite"
+            android:parentActivityName="com.example.app_10p5.MainActivite" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="com.example.app_10p5.MainActivite" />
+        </activity>
+
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/PremiereActivite/app/src/main/java/com/example/app_10p5/CarteActivite.java b/PremiereActivite/app/src/main/java/com/example/app_10p5/CarteActivite.java
new file mode 100644
index 0000000..75b0c34
--- /dev/null
+++ b/PremiereActivite/app/src/main/java/com/example/app_10p5/CarteActivite.java
@@ -0,0 +1,16 @@
+package com.example.app_10p5;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+/**
+ * Created by beaus on 24/04/2016.
+ */
+public class CarteActivite extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.layout_carte);
+    }
+
+}
diff --git a/PremiereActivite/app/src/main/java/com/example/app_10p5/MainActivite.java b/PremiereActivite/app/src/main/java/com/example/app_10p5/MainActivite.java
new file mode 100644
index 0000000..a29f90c
--- /dev/null
+++ b/PremiereActivite/app/src/main/java/com/example/app_10p5/MainActivite.java
@@ -0,0 +1,58 @@
+package com.example.app_10p5;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.Fragment;
+import android.support.v4.view.ViewPager;
+import android.view.View;
+
+/**
+ * Created by beaus on 24/04/2016.
+ */
+public class MainActivite extends FragmentActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState){
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.layout_main);
+        TabLayout tabLayout = (TabLayout) findViewById(R.id.tab_layout);
+        tabLayout.setTabMode(TabLayout.MODE_SCROLLABLE);
+        tabLayout.addTab(tabLayout.newTab().setText("Commande"));
+        tabLayout.addTab(tabLayout.newTab().setText("Rechargement"));
+        tabLayout.addTab(tabLayout.newTab().setText("Création"));
+        tabLayout.addTab(tabLayout.newTab().setText("Vidange"));
+        tabLayout.addTab(tabLayout.newTab().setText("Admin"));
+        tabLayout.setTabGravity(TabLayout.GRAVITY_FILL);
+
+        final ViewPager viewPager = (ViewPager) findViewById(R.id.pager);
+        final PagerAdapter adapter = new PagerAdapter
+                (getSupportFragmentManager(), tabLayout.getTabCount());
+        viewPager.setAdapter(adapter);
+        viewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
+        tabLayout.setOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                viewPager.setCurrentItem(tab.getPosition());
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+
+            }
+        });
+    }
+
+    public void valideCommande(View v)
+    {
+        Intent intent = new Intent(this, CarteActivite.class);
+        startActivity(intent);
+    }
+}
diff --git a/PremiereActivite/app/src/main/java/com/example/app_10p5/PagerAdapter.java b/PremiereActivite/app/src/main/java/com/example/app_10p5/PagerAdapter.java
new file mode 100644
index 0000000..9268443
--- /dev/null
+++ b/PremiereActivite/app/src/main/java/com/example/app_10p5/PagerAdapter.java
@@ -0,0 +1,46 @@
+package com.example.app_10p5;
+
+/**
+ * Created by beaus on 24/04/2016.
+ */
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+
+public class PagerAdapter extends FragmentStatePagerAdapter {
+    int mNumOfTabs;
+
+    public PagerAdapter(FragmentManager fm, int NumOfTabs) {
+        super(fm);
+        this.mNumOfTabs = NumOfTabs;
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+
+        switch (position) {
+            case 0:
+                TabFragment1 tab1 = new TabFragment1();
+                return tab1;
+            case 1:
+                TabFragment2 tab2 = new TabFragment2();
+                return tab2;
+            case 2:
+                TabFragment3 tab3 = new TabFragment3();
+                return tab3;
+            case 3:
+                TabFragment4 tab4 = new TabFragment4();
+                return tab4;
+            case 4:
+                TabFragment5 tab5 = new TabFragment5();
+                return tab5;
+            default:
+                return null;
+        }
+    }
+
+    @Override
+    public int getCount() {
+        return mNumOfTabs;
+    }
+}
diff --git a/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment1.java b/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment1.java
new file mode 100644
index 0000000..afcc70a
--- /dev/null
+++ b/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment1.java
@@ -0,0 +1,14 @@
+package com.example.app_10p5;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+public class TabFragment1 extends Fragment {
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.tab_fragment_1, container, false);
+    }
+}
\ No newline at end of file
diff --git a/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment2.java b/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment2.java
new file mode 100644
index 0000000..e3d5fc3
--- /dev/null
+++ b/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment2.java
@@ -0,0 +1,15 @@
+package com.example.app_10p5;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+public class TabFragment2 extends Fragment {
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.tab_fragment_2, container, false);
+    }
+}
diff --git a/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment3.java b/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment3.java
new file mode 100644
index 0000000..dbf5212
--- /dev/null
+++ b/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment3.java
@@ -0,0 +1,16 @@
+package com.example.app_10p5;
+
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+public class TabFragment3 extends Fragment {
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.tab_fragment_3, container, false);
+    }
+}
diff --git a/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment4.java b/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment4.java
new file mode 100644
index 0000000..5bb97a7
--- /dev/null
+++ b/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment4.java
@@ -0,0 +1,14 @@
+package com.example.app_10p5;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+public class TabFragment4 extends Fragment {
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.tab_fragment_4, container, false);
+    }
+}
\ No newline at end of file
diff --git a/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment5.java b/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment5.java
new file mode 100644
index 0000000..271258b
--- /dev/null
+++ b/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment5.java
@@ -0,0 +1,14 @@
+package com.example.app_10p5;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+public class TabFragment5 extends Fragment {
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.tab_fragment_5, container, false);
+    }
+}
\ No newline at end of file
diff --git a/PremiereActivite/app/src/main/java/com/example/florian/premiereactivite/Menu.java b/PremiereActivite/app/src/main/java/com/example/florian/premiereactivite/Menu.java
deleted file mode 100644
index 1d49778..0000000
--- a/PremiereActivite/app/src/main/java/com/example/florian/premiereactivite/Menu.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.example.florian.premiereactivite;
-
-
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.text.InputType;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.view.MotionEvent;
-import android.view.View.OnTouchListener;
-import android.view.View.OnClickListener;
-
-public class Menu extends AppCompatActivity implements View.OnTouchListener, View.OnClickListener {
-    private Button valider = null;
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_menu);
-        TextView text = new TextView(this);
-        text.setText("Veuillez entrer les informations suivantes:");
-        setContentView(text);
-        // l'utilisateur entre un identifiant
-        EditText identifiant = new EditText(this);
-        identifiant.setHint(R.string.identifiant);
-        identifiant.setInputType(InputType.TYPE_TEXT_FLAG_MULTI_LINE);
-        identifiant.setLines(2);
-        // l'utilisateur entre un mot de passe
-        EditText password = new EditText(this);
-        password.setHint(R.string.password);
-        password.setInputType(InputType.TYPE_TEXT_FLAG_MULTI_LINE);
-        password.setLines(2);
-        //element de validation
-        valider = (Button) findViewById(R.id.boutton);
-        valider.setOnTouchListener(this);
-        valider.setOnClickListener(this);
-    }
-    @Override
-    public boolean onTouch(View v, MotionEvent event){
-        /*reagir au toucher */
-        return true;
-    }
-    @Override
-    public void onClick(View v){
-        /* reagir au clic */
-    }
-
-}
diff --git a/PremiereActivite/app/src/main/res/layout/activity_menu.xml b/PremiereActivite/app/src/main/res/layout/activity_menu.xml
deleted file mode 100644
index 1fdc5a1..0000000
--- a/PremiereActivite/app/src/main/res/layout/activity_menu.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout 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"
-    android:fitsSystemWindows="true"
-    tools:context="com.example.florian.premiereactivite.Menu">
-
-    <android.support.design.widget.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
-
-    </android.support.design.widget.AppBarLayout>
-
-    <include layout="@layout/content_menu" />
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        android:src="@android:drawable/ic_dialog_email" />
-
-</android.support.design.widget.CoordinatorLayout>
diff --git a/PremiereActivite/app/src/main/res/layout/content_menu.xml b/PremiereActivite/app/src/main/res/layout/content_menu.xml
deleted file mode 100644
index 2a0e128..0000000
--- a/PremiereActivite/app/src/main/res/layout/content_menu.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout 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"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="com.example.florian.premiereactivite.Menu"
-    tools:showIn="@layout/activity_menu">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!" />
-</RelativeLayout>
diff --git a/PremiereActivite/app/src/main/res/layout/layout_carte.xml b/PremiereActivite/app/src/main/res/layout/layout_carte.xml
new file mode 100644
index 0000000..26a5113
--- /dev/null
+++ b/PremiereActivite/app/src/main/res/layout/layout_carte.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/passCarte"
+        android:id="@+id/textView2"
+        android:layout_gravity="center_horizontal"
+        android:enabled="true"
+        android:inputType="text"
+        android:textAlignment="center"
+        android:textSize="50dp"
+        android:layout_marginTop="40dp" />
+</LinearLayout>
\ No newline at end of file
diff --git a/PremiereActivite/app/src/main/res/layout/layout_commande.xml b/PremiereActivite/app/src/main/res/layout/layout_commande.xml
new file mode 100644
index 0000000..3e53f89
--- /dev/null
+++ b/PremiereActivite/app/src/main/res/layout/layout_commande.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:baselineAligned="false"
+    android:weightSum="1"
+    android:nestedScrollingEnabled="true">
+
+
+    <EditText
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:inputType="number"
+        android:ems="15"
+        android:id="@+id/nb"
+        android:editable="true"
+        android:elegantTextHeight="true"
+        android:enabled="true"
+        android:focusableInTouchMode="true"
+        android:focusable="true"
+        android:numeric="integer"
+        android:width="300dp"
+        android:hint="@string/quant"
+        android:textAlignment="center"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="30dp"
+        android:allowUndo="false"
+        android:height="150dp"
+        android:minHeight="30dp"
+        android:maxHeight="500dp"
+        android:minWidth="120dp"
+        android:layout_weight="0.04" />
+
+    <EditText
+        android:layout_width="wrap_content"
+        android:layout_height="58dp"
+        android:inputType="number"
+        android:ems="10"
+        android:id="@+id/editText2"
+        android:editable="true"
+        android:elegantTextHeight="true"
+        android:enabled="true"
+        android:focusableInTouchMode="true"
+        android:focusable="true"
+        android:numeric="decimal"
+        android:width="300dp"
+        android:hint="@string/prix"
+        android:textAlignment="center"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="50dp"
+        android:allowUndo="false"
+        android:height="250dp"
+        android:minHeight="80dp"
+        android:maxHeight="500dp" />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/validate"
+        android:id="@+id/button"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="40dp"
+        android:width="150dp"
+        android:height="80dp"
+        android:onClick="valideCommande"
+        android:nestedScrollingEnabled="false" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/PremiereActivite/app/src/main/res/layout/layout_connection.xml b/PremiereActivite/app/src/main/res/layout/layout_connection.xml
new file mode 100644
index 0000000..4fbf031
--- /dev/null
+++ b/PremiereActivite/app/src/main/res/layout/layout_connection.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Bonjours, veuillez entrez les informations suivantes"
+        android:id="@+id/mainText"
+        android:inputType="none"
+        android:textAlignment="center"
+        android:textAppearance="@android:color/primary_text_light"
+        android:textColor="@color/abc_input_method_navigation_guard"
+        android:textSize="@dimen/abc_text_size_large_material"
+        android:textStyle="bold" />
+
+    <AutoCompleteTextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Identifiant"
+        android:id="@+id/identifiant_principal" />
+
+    <MultiAutoCompleteTextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="password"
+        android:id="@+id/password_principal" />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Validez"
+        android:id="@+id/validation_principal" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/PremiereActivite/app/src/main/res/layout/layout_creation.xml b/PremiereActivite/app/src/main/res/layout/layout_creation.xml
new file mode 100644
index 0000000..970f3a7
--- /dev/null
+++ b/PremiereActivite/app/src/main/res/layout/layout_creation.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <EditText
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:inputType="numberDecimal"
+        android:ems="10"
+        android:id="@+id/editText"
+        android:layout_gravity="center_horizontal"
+        android:editable="true"
+        android:elegantTextHeight="true"
+        android:enabled="true"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:minHeight="80dp"
+        android:minWidth="200dp"
+        android:numeric="decimal"
+        android:width="250dp"
+        android:layout_marginTop="80dp"
+        android:hint="@string/montant"
+        android:textAlignment="center" />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/validate"
+        android:id="@+id/button3"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="80dp"
+        android:elegantTextHeight="true"
+        android:enabled="true"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:height="80dp"
+        android:minHeight="80dp"
+        android:minWidth="150dp"
+        android:textAlignment="center"
+        android:width="200dp" />
+</LinearLayout>
\ No newline at end of file
diff --git a/PremiereActivite/app/src/main/res/layout/layout_main.xml b/PremiereActivite/app/src/main/res/layout/layout_main.xml
new file mode 100644
index 0000000..8754a45
--- /dev/null
+++ b/PremiereActivite/app/src/main/res/layout/layout_main.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivite"
+    android:orientation="vertical">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:background="?attr/colorPrimary"
+        android:elevation="6dp"
+        android:minHeight="?attr/actionBarSize"
+        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+
+    <android.support.design.widget.TabLayout
+        android:id="@+id/tab_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/toolbar"
+        android:background="?attr/colorPrimary"
+        android:elevation="6dp"
+        android:minHeight="?attr/actionBarSize"
+        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/pager"
+        android:layout_width="match_parent"
+        android:layout_height="fill_parent"
+        android:layout_below="@id/tab_layout"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/PremiereActivite/app/src/main/res/layout/layout_rechargement.xml b/PremiereActivite/app/src/main/res/layout/layout_rechargement.xml
new file mode 100644
index 0000000..8eb6bf7
--- /dev/null
+++ b/PremiereActivite/app/src/main/res/layout/layout_rechargement.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal">
+
+    <EditText
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:inputType="numberDecimal"
+        android:ems="10"
+        android:id="@+id/montant"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="80dp"
+        android:editable="true"
+        android:elegantTextHeight="true"
+        android:enabled="true"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:height="200dp"
+        android:maxHeight="500dp"
+        android:maxLength="10"
+        android:maxWidth="600dp"
+        android:minHeight="80dp"
+        android:numeric="decimal"
+        android:width="300dp"
+        android:hint="@string/montant"
+        android:textAlignment="center" />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/validate"
+        android:id="@+id/button2"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="80dp"
+        android:layout_gravity="center_horizontal"
+        android:minWidth="150dp"
+        android:minHeight="50dp"
+        android:textAlignment="center"
+        android:width="150dp"
+        android:elegantTextHeight="true"
+        android:enabled="true"
+        android:focusable="true"
+        android:focusableInTouchMode="true" />
+</LinearLayout>
\ No newline at end of file
diff --git a/PremiereActivite/app/src/main/res/layout/layout_vidange.xml b/PremiereActivite/app/src/main/res/layout/layout_vidange.xml
new file mode 100644
index 0000000..3eec50a
--- /dev/null
+++ b/PremiereActivite/app/src/main/res/layout/layout_vidange.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/vidange"
+        android:id="@+id/textView"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="50dp" />
+</LinearLayout>
\ No newline at end of file
diff --git a/PremiereActivite/app/src/main/res/layout/premiere.xml b/PremiereActivite/app/src/main/res/layout/premiere.xml
deleted file mode 100644
index 00d0d12..0000000
--- a/PremiereActivite/app/src/main/res/layout/premiere.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.example.florian.premiereactivite.Menu">
-
-    <EditText
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/principale"
-        android:text="Bonjours, veuillez entrez les informations suivantes" />
-
-    <AutoCompleteTextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="identifiant"
-        android:id="@+id/identifiant_principal" />
-
-    <MultiAutoCompleteTextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="password"
-        android:id="@+id/password_principal" />
-
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Validez"
-        android:id="@+id/validation_principal" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/PremiereActivite/app/src/main/res/layout/tab_fragment_1.xml b/PremiereActivite/app/src/main/res/layout/tab_fragment_1.xml
new file mode 100644
index 0000000..b5eefa3
--- /dev/null
+++ b/PremiereActivite/app/src/main/res/layout/tab_fragment_1.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include layout="@layout/layout_commande"></include>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/PremiereActivite/app/src/main/res/layout/tab_fragment_2.xml b/PremiereActivite/app/src/main/res/layout/tab_fragment_2.xml
new file mode 100644
index 0000000..96af496
--- /dev/null
+++ b/PremiereActivite/app/src/main/res/layout/tab_fragment_2.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include layout="@layout/layout_rechargement"></include>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/PremiereActivite/app/src/main/res/layout/tab_fragment_3.xml b/PremiereActivite/app/src/main/res/layout/tab_fragment_3.xml
new file mode 100644
index 0000000..5455b40
--- /dev/null
+++ b/PremiereActivite/app/src/main/res/layout/tab_fragment_3.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include layout="@layout/layout_creation"></include>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/PremiereActivite/app/src/main/res/layout/tab_fragment_4.xml b/PremiereActivite/app/src/main/res/layout/tab_fragment_4.xml
new file mode 100644
index 0000000..092bc4e
--- /dev/null
+++ b/PremiereActivite/app/src/main/res/layout/tab_fragment_4.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include layout="@layout/layout_vidange"></include>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/PremiereActivite/app/src/main/res/layout/tab_fragment_5.xml b/PremiereActivite/app/src/main/res/layout/tab_fragment_5.xml
new file mode 100644
index 0000000..ebd6681
--- /dev/null
+++ b/PremiereActivite/app/src/main/res/layout/tab_fragment_5.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include layout="@layout/layout_connection"></include>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/PremiereActivite/app/src/main/res/menu/menu_menu.xml b/PremiereActivite/app/src/main/res/menu/menu_menu.xml
deleted file mode 100644
index 3ed5d55..0000000
--- a/PremiereActivite/app/src/main/res/menu/menu_menu.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<menu 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"
-    tools:context="com.example.florian.premiereactivite.Menu">
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:title="@string/action_settings"
-        app:showAsAction="never" />
-</menu>
diff --git a/PremiereActivite/app/src/main/res/values/colors.xml b/PremiereActivite/app/src/main/res/values/colors.xml
index 3ab3e9c..4d44345 100644
--- a/PremiereActivite/app/src/main/res/values/colors.xml
+++ b/PremiereActivite/app/src/main/res/values/colors.xml
@@ -2,5 +2,5 @@
 <resources>
     <color name="colorPrimary">#3F51B5</color>
     <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="colorAccent">#ff4081</color>
 </resources>
diff --git a/PremiereActivite/app/src/main/res/values/strings.xml b/PremiereActivite/app/src/main/res/values/strings.xml
index ea6933a..804d9df 100644
--- a/PremiereActivite/app/src/main/res/values/strings.xml
+++ b/PremiereActivite/app/src/main/res/values/strings.xml
@@ -3,4 +3,16 @@
     <string name="action_settings">Settings</string>
     <string name="identifiant" />
     <string name="password" />
+    <string name="menu_search">Test1</string>
+    <string name="menu_refresh">Test2</string>
+    <string name="menu_about">Test4</string>
+    <string name="menu_settings">Test5</string>
+    <string name="menu_help">Test3</string>
+    <string name="validate">Valider</string>
+    <string name="quant">Quantité</string>
+    <string name="montant">Montant</string>
+    <string name="prix">Prix</string>
+    <string name="vidange">Vidange</string>
+    <string name="passCarte">Passez la carte</string>
+
 </resources>
--
libgit2 0.21.2