Connexion et NFC sur fragment séparé+snack d'info

JLo'w
1 parent efd095eb
Showing 13 changed files with 174 additions and 176 deletions Show diff stats
PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment5.java -> PremiereActivite/app/src/main/java/com/example/app_10p5/ConnectionFragment.java
PremiereActivite/app/src/main/java/com/example/app_10p5/MainActivite.java
PremiereActivite/app/src/main/java/com/example/app_10p5/CarteActivite.java -> PremiereActivite/app/src/main/java/com/example/app_10p5/NFCFragment.java
PremiereActivite/app/src/main/java/com/example/app_10p5/PagerAdapter.java
PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment1.java
PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment2.java
PremiereActivite/app/src/main/java/com/example/app_10p5/main_tab_frag.java
PremiereActivite/app/src/main/res/layout/layout_main.xml
PremiereActivite/app/src/main/res/layout/tab_fragment_1.xml
PremiereActivite/app/src/main/res/layout/tab_fragment_2.xml
PremiereActivite/app/src/main/res/layout/tab_fragment_3.xml
PremiereActivite/app/src/main/res/layout/tab_fragment_4.xml
PremiereActivite/app/src/main/res/layout/tab_fragment_5.xml
 package com.example.app_10p5;
-import android.os.Bundle;
 import android.app.Fragment;
+import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 /**
- * Created by beaus on 24/04/2016.
+ * Created by beaus on 05/05/2016.
  */
+public class ConnectionFragment extends Fragment {
+    @Override
+    public void onCreate(Bundle savedInstanceState){
+        super.onCreate(savedInstanceState);
+    }
-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);
+        View ret = inflater.inflate(R.layout.layout_connection, container, false);
+        return ret;
     }
-}
 \ No newline at end of file
+}
 package com.example.app_10p5;
 import android.app.Activity;
+import android.app.Fragment;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
-import android.content.Context;
+import android.app.PendingIntent;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.ColorDrawable;
+import android.nfc.NfcAdapter;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.design.widget.Snackbar;
 import android.support.v4.view.ViewPager;
 import android.text.TextUtils;
-import android.view.Gravity;
-import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-import android.widget.PopupMenu;
-import android.widget.PopupWindow;
+import android.widget.EditText;;
 import android.widget.Toast;
 import org.json.JSONObject;
@@ -54,6 +48,8 @@ public class MainActivite extends Activity implements ASyncResponse, main_tab_fr
     private long mTimeToken;
     private String mUser;
+    private NfcAdapter mNfcAdapter;
+
     @Override
     protected void onCreate(Bundle savedInstanceState){
         super.onCreate(savedInstanceState);
@@ -67,11 +63,12 @@ public class MainActivite extends Activity implements ASyncResponse, main_tab_fr
         mToken = null;
         getActionBar().setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.colorPrimary)));
+        mNfcAdapter = NfcAdapter.getDefaultAdapter(getApplicationContext());
         if(savedInstanceState == null){
             FragmentManager fragmentManager = getFragmentManager();
             FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
-            main_tab_frag fragment = new main_tab_frag();
+            ConnectionFragment fragment = new ConnectionFragment();
             fragmentTransaction.add(R.id.fragment_container, fragment);
             fragmentTransaction.commit();
         }
@@ -120,6 +117,39 @@ public class MainActivite extends Activity implements ASyncResponse, main_tab_fr
         super.onSaveInstanceState(savedInstanceState);
     }
+    @Override
+    public void onPause() {
+        stopForegroundDispatch(this, mNfcAdapter);
+        super.onPause();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        setupForegroundDispatch(this, mNfcAdapter);
+    }
+
+    public static void setupForegroundDispatch(final Activity activity, NfcAdapter adapter){
+        if(adapter != null){
+            final Intent intent = new Intent(activity.getApplicationContext(), activity.getClass());
+            intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+            final PendingIntent pendingIntent = PendingIntent.getActivity(activity.getApplicationContext(), 0, intent, 0);
+            adapter.enableForegroundDispatch(activity, pendingIntent, null, null);
+        }
+        else{
+            Toast.makeText(activity, "Impossible d'initialiser le NFC", Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    public static void stopForegroundDispatch(final Activity activity, NfcAdapter adapter) {
+        if(adapter != null){
+            adapter.disableForegroundDispatch(activity);
+        }
+        else{
+            Toast.makeText(activity, "Impossible d'initialiser le NFC", Toast.LENGTH_SHORT).show();
+        }
+    }
+
     public void valideCreationCompte(View v){
         if((TextUtils.getTrimmedLength(mToken) == 30) && ((System.currentTimeMillis() - mTimeToken) < EXPIRATION)) {
             EditText champMontant = (EditText) findViewById(R.id.creation_montant);
@@ -138,11 +168,16 @@ public class MainActivite extends Activity implements ASyncResponse, main_tab_fr
                         mState = STATE_CREATION_COMPTE;
                         champMontant.setText(null);
-                        Intent intent = new Intent(this, CarteActivite.class);
-                        intent.putExtra("token", mToken);
-                        intent.putExtra("state", mState);
-                        intent.putExtra("montant", montant);
-                        startActivityForResult(intent, mState);
+                        Bundle b = new Bundle();
+                        b.putString("token", mToken);
+                        b.putInt("state", mState);
+                        b.putFloat("montant", montant);
+
+
+                        NFCFragment nfc = new NFCFragment();
+                        nfc.setArguments(b);
+
+                        getFragmentManager().beginTransaction().replace(R.id.fragment_container, nfc).addToBackStack(null).commit();
                     }
                     else{
                         Toast.makeText(this, "Valeur incorrecte.", Toast.LENGTH_LONG).show();
@@ -185,12 +220,16 @@ public class MainActivite extends Activity implements ASyncResponse, main_tab_fr
                 champMontant.setText(null);
                 champQuantite.setText(null);
-                Intent intent = new Intent(this, CarteActivite.class);
-                intent.putExtra("token", mToken);
-                intent.putExtra("state", mState);
-                intent.putExtra("montant", montant);
-                intent.putExtra("quantite", quantite);
-                startActivityForResult(intent, mState);
+                Bundle b = new Bundle();
+                b.putString("token", mToken);
+                b.putInt("state", mState);
+                b.putFloat("montant", montant);
+                b.putInt("quantite", quantite);
+
+                NFCFragment nfc = new NFCFragment();
+                nfc.setArguments(b);
+
+                getFragmentManager().beginTransaction().replace(R.id.fragment_container, nfc).addToBackStack(null).commit();
             }
             else{
                 Toast.makeText(this, "Valeur incorrecte ou droit insuffisant.", Toast.LENGTH_LONG).show();
@@ -221,11 +260,15 @@ public class MainActivite extends Activity implements ASyncResponse, main_tab_fr
                         mState = STATE_RECHARGEMENT;
                         champMontant.setText(null);
-                        Intent intent = new Intent(this, CarteActivite.class);
-                        intent.putExtra("token", mToken);
-                        intent.putExtra("state", mState);
-                        intent.putExtra("montant", montant);
-                        startActivityForResult(intent, mState);
+                        Bundle b = new Bundle();
+                        b.putString("token", mToken);
+                        b.putInt("state", mState);
+                        b.putFloat("montant", montant);
+
+                        NFCFragment nfc = new NFCFragment();
+                        nfc.setArguments(b);
+
+                        getFragmentManager().beginTransaction().replace(R.id.fragment_container, nfc).addToBackStack(null).commit();
                     }
                     else{
                         Toast.makeText(this, "Valeur incorrecte.", Toast.LENGTH_LONG).show();
@@ -288,10 +331,14 @@ public class MainActivite extends Activity implements ASyncResponse, main_tab_fr
             if((mDroit >= 2)){
                 mState = STATE_VIDANGE;
-                Intent intent = new Intent(this, CarteActivite.class);
-                intent.putExtra("token", mToken);
-                intent.putExtra("state", mState);
-                startActivityForResult(intent, mState);
+                Bundle b = new Bundle();
+                b.putString("token", mToken);
+                b.putInt("state", mState);
+
+                NFCFragment nfc = new NFCFragment();
+                nfc.setArguments(b);
+
+                getFragmentManager().beginTransaction().replace(R.id.fragment_container, nfc).addToBackStack(null).commit();
             }
             else{
                 Toast.makeText(this, "Droit insuffisant.", Toast.LENGTH_LONG).show();
@@ -303,55 +350,52 @@ public class MainActivite extends Activity implements ASyncResponse, main_tab_fr
     }
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data){
-        //TODO: faire des choses avec ca
-
-        mState = STATE_RIEN;
-
-        try{
-            JSONObject json = new JSONObject(data.getStringExtra("json"));
-            Toast.makeText(this, "Status: " + json.getString("status"), Toast.LENGTH_SHORT).show();
+    protected void onNewIntent(Intent intent){
+        super.onNewIntent(intent);
+        Fragment frag = getFragmentManager().findFragmentById(R.id.fragment_container);
-        }
-        catch (Throwable t){
-            Toast.makeText(this, "Retour", Toast.LENGTH_SHORT).show();
-        }
-
-
-        switch (requestCode) {
-            case STATE_COMMANDE:
-                break;
-            case STATE_CONNEXION:
-                break;
-            case STATE_CREATION_COMPTE:
-                break;
-            case STATE_RECHARGEMENT:
-                break;
-            case STATE_VIDANGE:
-                break;
-            case STATE_RIEN:
-            default:
-                Toast.makeText(this, "WTF, le cancer est dans l'application!!", Toast.LENGTH_LONG).show();
-                break;
+        if(mState != STATE_RIEN && frag instanceof NFCFragment){
+            NFCFragment nfc = (NFCFragment) frag;
+            nfc.handleIntent(intent);
         }
     }
     /* Retour du network thread */
     @Override
     public void processFinish(JSONObject output) {
+
         if(output.length() != 0){
             try{
                 if(output.get("status").toString().equals("ok")){
-                    mToken = output.get("jeton").toString();
-                    mTimeToken = System.currentTimeMillis();
-                    mDroit = output.getInt("droit");
-                    mUser = output.get("login").toString();
-                    Toast.makeText(this, "Bonjour " + mUser + " vous êtes bien connecté pour " + EXPIRATION / (1000 * 60) + " minutes.", Toast.LENGTH_LONG).show();
-                    final ViewPager viewPager = (ViewPager) findViewById(R.id.pager);
-                    viewPager.setCurrentItem(1);
+                    switch (mState){
+                        case STATE_COMMANDE:
+                            Snackbar.make(findViewById(R.id.coordinator), "Client débité de " + output.get("montant") + "€. " + output.get("soldeAncien") + "€ -> " + output.getString("soldeNouveau") + "€", Snackbar.LENGTH_INDEFINITE).show();
+                            break;
+                        case STATE_CONNEXION:
+                            mToken = output.get("jeton").toString();
+                            mTimeToken = System.currentTimeMillis();
+                            mDroit = output.getInt("droit");
+                            mUser = output.get("login").toString();
+                            Snackbar.make(findViewById(R.id.coordinator), "Bonjour " + mUser + " vous êtes connecté pour " + EXPIRATION / (1000 * 60) + " minutes.", Snackbar.LENGTH_SHORT).show();
+                            getFragmentManager().beginTransaction().replace(R.id.fragment_container, new main_tab_frag()).commit();
+                            break;
+                        case STATE_CREATION_COMPTE:
+                            Snackbar.make(findViewById(R.id.coordinator), "Client créé avec un solde de " + output.get("soldeNouveau") + "€", Snackbar.LENGTH_INDEFINITE).show();
+                            break;
+                        case STATE_RECHARGEMENT:
+                            Snackbar.make(findViewById(R.id.coordinator), "Client rechargé: " + output.get("soldeAncien") + "€ ->" + output.get("soldeNouveau") + "€", Snackbar.LENGTH_INDEFINITE).show();
+                            break;
+                        case STATE_VIDANGE:
+                            Snackbar.make(findViewById(R.id.coordinator), "Client vidé: " + output.get("soldeAncien") + "€ -> 0€", Snackbar.LENGTH_INDEFINITE).show();
+                            break;
+                        case STATE_RIEN:
+                        default:
+                            Toast.makeText(this, "WTF, le cancer est dans l'application!!", Toast.LENGTH_LONG).show();
+                            break;
+                    }
                 }
                 else{
-                    Toast.makeText(this, "Erreur dans la requête: " + output.get("status"), Toast.LENGTH_LONG).show();
+                    Toast.makeText(this, "Erreur: " + output.get("status"), Toast.LENGTH_LONG).show();
                 }
             }
             catch(Throwable t){
@@ -361,6 +405,9 @@ public class MainActivite extends Activity implements ASyncResponse, main_tab_fr
         else{
             Toast.makeText(this, "Impossible de se connecter au serveur", Toast.LENGTH_LONG).show();
         }
+
+        mState = STATE_RIEN;
+        getFragmentManager().popBackStack();
     }
     public String getToken(){
@@ -376,6 +423,7 @@ public class MainActivite extends Activity implements ASyncResponse, main_tab_fr
         mDroit = 0;
         mUser = null;
         mTimeToken = -1;
+        mState = STATE_RIEN;
         Toast.makeText(this, "Veuillez vous reconnecter.", Toast.LENGTH_SHORT).show();
         final ViewPager viewPager = (ViewPager) findViewById(R.id.pager);
 package com.example.app_10p5;
-import android.app.Activity;
-import android.app.PendingIntent;
+import android.app.Fragment;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.graphics.drawable.ColorDrawable;
 import android.nfc.NfcAdapter;
-import android.nfc.Tag;
-import android.nfc.tech.MifareClassic;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.design.widget.Snackbar;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Toast;
-import org.json.JSONObject;
-
 import java.net.URL;
 import java.net.URLEncoder;
 import java.util.HashMap;
 /**
- * Created by beaus on 24/04/2016.
+ * Created by beaus on 05/05/2016.
  */
-public class CarteActivite extends Activity implements ASyncResponse {
-
-    private NfcAdapter mNfcAdapter;
+public class NFCFragment extends Fragment {
     private HashMap<String, String> mParam;
     private String mAPI;
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState){
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.layout_carte);
-        getActionBar().setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.colorPrimary)));
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View ret = inflater.inflate(R.layout.layout_carte, container, false);
         mParam = new HashMap<String, String>();
+        Bundle b = getArguments();
+
         try {
-            switch (getIntent().getIntExtra("state", MainActivite.STATE_RIEN)) {
+            switch (b.getInt("state")) {
                 case MainActivite.STATE_COMMANDE:
                     //TODO: XOR du cancer
                     //mParam.put("quantite", String.valueOf(getIntent().getIntExtra("quantite", -1)));
-                    mParam.put("montant", URLEncoder.encode(String.valueOf(getIntent().getFloatExtra("montant", -1)), "UTF-8"));
-                    mParam.put("jeton", URLEncoder.encode(getIntent().getStringExtra("token"), "UTF-8"));
+                    mParam.put("montant", URLEncoder.encode(String.valueOf(b.getFloat("montant")), "UTF-8"));
+                    mParam.put("jeton", URLEncoder.encode(b.getString("token"), "UTF-8"));
                     mAPI = "api/client/payer";
                     break;
                 case MainActivite.STATE_CREATION_COMPTE:
-                    mParam.put("solde", URLEncoder.encode(String.valueOf(getIntent().getFloatExtra("montant", -1)), "UTF-8"));
-                    mParam.put("jeton", URLEncoder.encode(getIntent().getStringExtra("token"), "UTF-8"));
+                    mParam.put("solde", URLEncoder.encode(String.valueOf(b.getFloat("montant")), "UTF-8"));
+                    mParam.put("jeton", URLEncoder.encode(b.getString("token"), "UTF-8"));
                     mAPI = "api/client/ajouter";
                     break;
                 case MainActivite.STATE_RECHARGEMENT:
                     System.out.println("bite");
-                    mParam.put("montant", URLEncoder.encode(String.valueOf(getIntent().getFloatExtra("montant", -1)), "UTF-8"));
-                    mParam.put("jeton", URLEncoder.encode(getIntent().getStringExtra("token"), "UTF-8"));
+                    mParam.put("montant", URLEncoder.encode(String.valueOf(b.getFloat("montant")), "UTF-8"));
+                    mParam.put("jeton", URLEncoder.encode(b.getString("token"), "UTF-8"));
                     mAPI = "api/client/recharger";
                     break;
                 case MainActivite.STATE_VIDANGE:
-                    mParam.put("jeton", URLEncoder.encode(getIntent().getStringExtra("token"), "UTF-8"));
+                    mParam.put("jeton", URLEncoder.encode(b.getString("token"), "UTF-8"));
                     mAPI = "api/client/vidange";
                     break;
                 case MainActivite.STATE_CONNEXION:  //Impossible c'est pas géré ici
                 case MainActivite.STATE_RIEN:
                 default:
-                    Toast.makeText(this, "WTF, le cancer est dans l'application!!", Toast.LENGTH_LONG).show();
-                    finish();
-                    return;
+                    Snackbar.make(getActivity().findViewById(R.id.coordinator), "WTF, le cancer est dans l'application!!", Snackbar.LENGTH_INDEFINITE).show();
             }
         }
         catch (Throwable t){
             System.out.println("Exception: " + t.toString());
         }
-        mNfcAdapter = NfcAdapter.getDefaultAdapter(this);
-
-        if (mNfcAdapter == null) {
-            // Stop here, we definitely need NFC
-            Toast.makeText(this, "This device doesn't support NFC.", Toast.LENGTH_LONG).show();
-            finish();
-            return;
-        }
-
-        handleIntent(getIntent());
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        setupForegroundDispatch(this, mNfcAdapter);
+        return ret;
     }
     // Convertit l'array de byte en chaîne hexadécimale (si le byte = 0x63, str = "63").
@@ -105,58 +89,28 @@ public class CarteActivite extends Activity implements ASyncResponse {
         return out;
     }
-    @Override
-    protected void onNewIntent(Intent intent) {
-        handleIntent(intent);
-    }
-    @Override
-    protected void onPause() {
-        stopForegroundDispatch(this, mNfcAdapter);
-        super.onPause();
-    }
-    private void handleIntent(Intent intent){
+    public void handleIntent(Intent intent){
         if (NfcAdapter.ACTION_TAG_DISCOVERED.equals(intent.getAction())) {
             String id_carte = ByteArrayToHexString(intent.getByteArrayExtra(NfcAdapter.EXTRA_ID));
             mParam.put("idCarte", id_carte);
             clientAPI();
-            }
         }
-
-    public static void setupForegroundDispatch(final Activity activity, NfcAdapter adapter){
-        final Intent intent = new Intent(activity.getApplicationContext(), activity.getClass());
-        intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-        final PendingIntent pendingIntent = PendingIntent.getActivity(activity.getApplicationContext(), 0, intent, 0);
-        adapter.enableForegroundDispatch(activity, pendingIntent, null, null);
     }
-    public static void stopForegroundDispatch(final Activity activity, NfcAdapter adapter) {
-        adapter.disableForegroundDispatch(activity);
-    }
+
     public void clientAPI() {
         try {
-            SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+            SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext());
             URL url = new URL(settings.getString("server_address", null) + mAPI);
             NetworkThread nt = new NetworkThread(url, mParam);
-            nt.delegate = this;
+            nt.delegate = (MainActivite) getActivity();
             nt.execute();
         }
         catch (Throwable t){
-            Toast.makeText(this, "WTF, le cancer est dans l'application!! " + t.toString(), Toast.LENGTH_LONG).show();
-            finish();
-            return;
+            Toast.makeText(getActivity().getApplicationContext(), "WTF, le cancer est dans l'application!! " + t.toString(), Toast.LENGTH_LONG).show();
         }
     }
-
-
-    /* Retour du NetworkThread */
-    @Override
-    public void processFinish(JSONObject output) {
-        Intent intent = new Intent(this, CarteActivite.class);
-        intent.putExtra("json", output.toString());
-        setResult(0, intent);
-        finish();
-    }
 }
@@ -31,9 +31,6 @@ public class PagerAdapter extends FragmentStatePagerAdapter {
             case 3:
                 TabFragment4 tab4 = new TabFragment4();
                 return tab4;
-            case 4:
-                TabFragment5 tab5 = new TabFragment5();
-                return tab5;
             default:
                 return null;
         }
@@ -2,9 +2,11 @@ package com.example.app_10p5;
 import android.os.Bundle;
 import android.app.Fragment;
+import android.text.InputFilter;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.EditText;
 /**
  * Created by beaus on 24/04/2016.
@@ -13,6 +15,10 @@ 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);
+        View v = inflater.inflate(R.layout.tab_fragment_1, container, false);
+        EditText et = (EditText) v.findViewById(R.id.commande_prix);
+        et.setFilters(new InputFilter[]{new DecimalDigitsInputFilter(3, 2)});
+
+        return v;
     }
 }
 \ No newline at end of file
@@ -2,11 +2,9 @@ package com.example.app_10p5;
 import android.os.Bundle;
 import android.app.Fragment;
-import android.text.InputFilter;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.EditText;
 /**
  * Created by beaus on 24/04/2016.
@@ -16,11 +14,6 @@ public class TabFragment2 extends Fragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.tab_fragment_2, container, false);;
-
-        EditText et = (EditText) v.findViewById(R.id.commande_prix);
-        et.setFilters(new InputFilter[]{new DecimalDigitsInputFilter(3, 2)});
-
-        return v;
+        return inflater.inflate(R.layout.tab_fragment_2, container, false);
     }
 }
@@ -32,7 +32,6 @@ public class main_tab_frag extends Fragment {
         TabLayout tabLayout = (TabLayout) ret.findViewById(R.id.tab_layout);
         tabLayout.setTabMode(TabLayout.MODE_SCROLLABLE);
-        tabLayout.addTab(tabLayout.newTab().setText("Connexion"));
         tabLayout.addTab(tabLayout.newTab().setText("Commande"));
         tabLayout.addTab(tabLayout.newTab().setText("Rechargement"));
         tabLayout.addTab(tabLayout.newTab().setText("Création"));
 <?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/coordinator">
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="?android:attr/detailsElementBackground" />
+</android.support.design.widget.CoordinatorLayout>
@@ -4,6 +4,6 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
-    <include layout="@layout/layout_connection"></include>
+    <include layout="@layout/layout_commande"></include>
 </RelativeLayout>
 \ No newline at end of file
@@ -4,6 +4,6 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
-    <include layout="@layout/layout_commande"></include>
+    <include layout="@layout/layout_rechargement"></include>
 </RelativeLayout>
 \ No newline at end of file
@@ -4,6 +4,6 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
-    <include layout="@layout/layout_rechargement"></include>
+    <include layout="@layout/layout_creation"></include>
 </RelativeLayout>
 \ No newline at end of file
@@ -4,6 +4,6 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
-    <include layout="@layout/layout_creation"></include>
+    <include layout="@layout/layout_vidange"></include>
 </RelativeLayout>
 \ No newline at end of file
@@ -1,9 +0,0 @@
-<?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