some staff

badetitou
1 parent c8a73f2c
Showing 17 changed files with 506 additions and 46 deletions Show diff stats
app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/CreateEvent.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/DeleteEvent.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/EventFragment.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/ModifyEvent.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/MyEventRecyclerViewAdapter.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/PaiementEvent.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/LoginActivity.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/MainActivity.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/ModifyConsommation.java
app/src/main/java/net/plil/clubinfo/etunicorn/utils/VolleyUtils.java
app/src/main/res/layout/fragment_create_event.xml
app/src/main/res/layout/fragment_delete_event.xml
app/src/main/res/layout/fragment_event_list.xml
app/src/main/res/layout/fragment_modify_consommation.xml
app/src/main/res/layout/fragment_modify_event.xml
app/src/main/res/values-fr/strings.xml
app/src/main/res/values/strings.xml
@@ -0,0 +1,86 @@
+package net.plil.clubinfo.etunicorn.app.event;
+
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.support.v7.app.AlertDialog;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ProgressBar;
+
+import com.android.volley.Request;
+import com.android.volley.Response;
+import com.android.volley.VolleyError;
+import com.android.volley.toolbox.JsonObjectRequest;
+
+import net.plil.clubinfo.etunicorn.R;
+import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+
+public class CreateEvent extends DialogFragment {
+
+    EditText mName;
+    EditText mPrice;
+    EditText mDate;
+    ProgressBar mProgressBar;
+
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        // Use the Builder class for convenient dialog construction
+        LayoutInflater inflater = getActivity().getLayoutInflater();
+        View view = inflater.inflate(R.layout.fragment_create_event, null);
+        mName = (EditText) view.findViewById(R.id.create_event_name);
+        mPrice = (EditText) view.findViewById(R.id.create_event_price);
+        mDate = (EditText) view.findViewById(R.id.create_event_date);
+        mProgressBar = (ProgressBar) view.findViewById(R.id.create_event_progress_bar);
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder
+                .setTitle(R.string.create_event)
+                .setView(view)
+                .setPositiveButton(R.string.valid, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+
+                        mProgressBar.setVisibility(View.VISIBLE);
+                        mPrice.setVisibility(View.GONE);
+                        mName.setVisibility(View.GONE);
+                        JSONObject jsonObject = new JSONObject();
+                        try {
+                            jsonObject.put("nomEvenement", mName.getText().toString());
+                            jsonObject.put("prix", Double.parseDouble(mPrice.getText().toString()));
+                            jsonObject.put("date", mDate.getText().toString());
+                        } catch (JSONException e){
+                            e.printStackTrace();
+                        }
+                        JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.POST, VolleyUtils.baseUri + "/evenement"   ,jsonObject , new Response.Listener<JSONObject>() {
+                            @Override
+                            public void onResponse(JSONObject response) {
+                                mProgressBar.setVisibility(View.GONE);
+                            }
+                        }, new Response.ErrorListener() {
+                            @Override
+                            public void onErrorResponse(VolleyError error) {
+                                mProgressBar.setVisibility(View.GONE);
+                            }
+                        }
+                        );
+
+                        VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest);
+                    }
+                })
+                .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+                        // User cancelled the dialog
+                    }
+                });
+        // Create the AlertDialog object and return it
+        return builder.create();
+    }
+
+
+}
@@ -0,0 +1,96 @@
+package net.plil.clubinfo.etunicorn.app.event;
+
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.support.v7.app.AlertDialog;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ProgressBar;
+import android.widget.Toast;
+
+import com.android.volley.Request;
+import com.android.volley.Response;
+import com.android.volley.VolleyError;
+import com.android.volley.toolbox.JsonObjectRequest;
+
+import net.plil.clubinfo.etunicorn.R;
+import net.plil.clubinfo.etunicorn.data.Consommation;
+import net.plil.clubinfo.etunicorn.data.Event;
+import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
+
+import org.json.JSONObject;
+
+
+public class DeleteEvent extends DialogFragment {
+
+    ProgressBar mProgressBar;
+
+    public DeleteEvent(){}
+
+    /**
+     * Create a new instance of MyDialogFragment, providing "num"
+     * as an argument.
+     */
+    public static DeleteEvent newInstance(Event event) {
+        DeleteEvent f = new DeleteEvent();
+
+        // Supply num input as an argument.
+        Bundle args = new Bundle();
+        args.putSerializable("evenement", event);
+        f.setArguments(args);
+
+        return f;
+    }
+
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        // Use the Builder class for convenient dialog construction
+        LayoutInflater inflater = getActivity().getLayoutInflater();
+        View view = inflater.inflate(R.layout.fragment_delete_event, null);
+
+        mProgressBar = (ProgressBar) view.findViewById(R.id.delete_consommation_progress_bar);
+        final Event event = (Event) getArguments().getSerializable("event");
+
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder
+                .setTitle(R.string.verif_delete_event)
+                .setView(view)
+                .setPositiveButton(R.string.delete, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        mProgressBar.setVisibility(View.VISIBLE);
+
+                        JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.DELETE, VolleyUtils.baseUri + "/evenement/" + event.getIdEvent(), null, new Response.Listener<JSONObject>() {
+                            @Override
+                            public void onResponse(JSONObject response) {
+                                mProgressBar.setVisibility(View.GONE);
+                                Toast.makeText(getContext(), R.string.delete_done, Toast.LENGTH_LONG).show();
+                                dismiss();
+                            }
+                        }, new Response.ErrorListener() {
+                            @Override
+                            public void onErrorResponse(VolleyError error) {
+                                mProgressBar.setVisibility(View.GONE);
+                                Toast.makeText(getContext(), R.string.delete_refused, Toast.LENGTH_LONG).show();
+                                dismiss();
+                            }
+                        }
+                        );
+
+                        VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest);
+                    }
+                })
+                .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+
+                    }
+                });
+        return builder.create();
+    }
+
+
+}
-package net.plil.clubinfo.etunicorn.app.Event;
+package net.plil.clubinfo.etunicorn.app.event;
 import android.content.Context;
 import android.os.Bundle;
+import android.support.design.widget.FloatingActionButton;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -46,22 +47,29 @@ public class EventFragment extends FragmentNFC {
         View view = inflater.inflate(R.layout.fragment_event_list, container, false);
         // Set the adapter
-        if (view instanceof RecyclerView) {
-            Context context = view.getContext();
-            RecyclerView recyclerView = (RecyclerView) view;
-            recyclerView.setLayoutManager(new LinearLayoutManager(context));
-
-            List<Event> events = new ArrayList<>();
-            for (int i = 0; i< 150; ++i){
-                Event ev = new Event();
-                ev.setNomEvent("Hello " + i);
-                ev.setPrice(15.52);
-                ev.setDate(new Date(Calendar.getInstance().getTimeInMillis()));
-                events.add(ev);
+        Context context = view.getContext();
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.event_list);
+        recyclerView.setLayoutManager(new LinearLayoutManager(context));
+
+        List<Event> events = new ArrayList<>();
+        for (int i = 0; i< 150; ++i) {
+            Event ev = new Event();
+            ev.setNomEvent("Hello " + i);
+            ev.setPrice(15.52);
+            ev.setDate(new Date(Calendar.getInstance().getTimeInMillis()));
+            events.add(ev);
+        }
+
+        FloatingActionButton fAB = (FloatingActionButton) view.findViewById(R.id.event_add);
+        fAB.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                CreateEvent newFragment = new CreateEvent();
+                newFragment.show(getFragmentManager(), "CreateEvent");
             }
+        });
-            recyclerView.setAdapter(new MyEventRecyclerViewAdapter(events, mListener, getActivity()));
-        }
+        recyclerView.setAdapter(new MyEventRecyclerViewAdapter(events, mListener, getActivity()));
         return view;
     }
@@ -0,0 +1,112 @@
+package net.plil.clubinfo.etunicorn.app.event;
+
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.support.v7.app.AlertDialog;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ProgressBar;
+import android.widget.Toast;
+
+import com.android.volley.Request;
+import com.android.volley.Response;
+import com.android.volley.VolleyError;
+import com.android.volley.toolbox.JsonObjectRequest;
+
+import net.plil.clubinfo.etunicorn.R;
+import net.plil.clubinfo.etunicorn.data.Event;
+import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Locale;
+
+
+public class ModifyEvent extends DialogFragment {
+
+    EditText mNom;
+    EditText mPrice;
+    EditText mDate;
+    ProgressBar mProgressBar;
+
+    public static ModifyEvent newInstance(Event event) {
+        ModifyEvent f = new ModifyEvent();
+
+        // Supply num input as an argument.
+        Bundle args = new Bundle();
+        args.putSerializable("event", event);
+        f.setArguments(args);
+
+        return f;
+    }
+
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        // Use the Builder class for convenient dialog construction
+        LayoutInflater inflater = getActivity().getLayoutInflater();
+        View view = inflater.inflate(R.layout.fragment_modify_event, null);
+        mNom = (EditText) view.findViewById(R.id.modify_event_name);
+        mPrice = (EditText) view.findViewById(R.id.modify_event_price);
+        mDate = (EditText) view.findViewById(R.id.modify_event_date);
+        mProgressBar = (ProgressBar) view.findViewById(R.id.modify_event_progress_bar);
+
+        final Event event = (Event) getArguments().getSerializable("event");
+
+        mNom.setText(event.getNomEvent());
+        mPrice.setText(String.format(Locale.FRANCE, "%.2f",  event.getPrice()));
+        mDate.setText(event.getDate().toString());
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder
+                .setTitle(R.string.modify)
+                .setView(view)
+                .setPositiveButton(R.string.modify, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+
+                        mProgressBar.setVisibility(View.VISIBLE);
+                        mPrice.setVisibility(View.GONE);
+                        mNom.setVisibility(View.GONE);
+                        JSONObject jsonObject = new JSONObject();
+                        try {
+                            jsonObject.put("nomEvenement", mNom.getText().toString());
+                            jsonObject.put("prix", Double.parseDouble(mPrice.getText().toString()));
+                            jsonObject.put("date", mDate.getText().toString());
+                        } catch (JSONException e){
+                            e.printStackTrace();
+                        }
+                        JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.POST, VolleyUtils.baseUri + "/evenement/" + event.getIdEvent() ,jsonObject , new Response.Listener<JSONObject>() {
+                            @Override
+                            public void onResponse(JSONObject response) {
+                                mProgressBar.setVisibility(View.GONE);
+                                Toast.makeText(getContext(), R.string.modify_done, Toast.LENGTH_LONG).show();
+
+                            }
+                        }, new Response.ErrorListener() {
+                            @Override
+                            public void onErrorResponse(VolleyError error) {
+                                mProgressBar.setVisibility(View.GONE);
+                                Toast.makeText(getContext(), R.string.modify_refused, Toast.LENGTH_LONG).show();
+
+                            }
+                        }
+                        );
+
+                        VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest);
+                    }
+                })
+                .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+                        // User cancelled the dialog
+                    }
+                });
+        // Create the AlertDialog object and return it
+        return builder.create();
+    }
+
+
+}
-package net.plil.clubinfo.etunicorn.app.Event;
+package net.plil.clubinfo.etunicorn.app.event;
 import android.content.Context;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.PopupMenu;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
@@ -56,6 +59,35 @@ public class MyEventRecyclerViewAdapter extends RecyclerView.Adapter&lt;MyEventRecy
                 return true;
             }
         });
+
+        holder.mButtonView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                final PopupMenu popup = new PopupMenu(v.getContext(), holder.mButtonView);
+                //inflating menu from xml resource
+                popup.inflate(R.menu.option_list);
+                //adding click listener
+                popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+                    @Override
+                    public boolean onMenuItemClick(MenuItem item) {
+                        switch (item.getItemId()) {
+                            case R.id.delete:
+                                DeleteEvent deleteEvent = DeleteEvent.newInstance(holder.mItem);
+                                deleteEvent.show(((AppCompatActivity) context).getSupportFragmentManager(), "deleteConsommation");
+                                break;
+                            case R.id.modify:
+                                ModifyEvent modifyEvent = ModifyEvent.newInstance(holder.mItem);
+                                modifyEvent.show(((AppCompatActivity) context).getSupportFragmentManager(), "modifyConsommation");
+                                break;
+                        }
+                        return false;
+                    }
+                });
+                //displaying the popup
+                popup.show();
+            }
+        });
+
     }
     @Override
-package net.plil.clubinfo.etunicorn.app.Event;
+package net.plil.clubinfo.etunicorn.app.event;
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -17,7 +17,6 @@ import com.android.volley.VolleyError;
 import com.android.volley.toolbox.JsonObjectRequest;
 import net.plil.clubinfo.etunicorn.R;
-import net.plil.clubinfo.etunicorn.data.Consommation;
 import net.plil.clubinfo.etunicorn.data.Event;
 import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
@@ -171,26 +171,27 @@ public class LoginActivity extends AppCompatActivity {
         user.setUsername(username);
         JsonObjectRequest jsonObjectRequest = null;
         try {
-            jsonObjectRequest = new JsonObjectRequest(Request.Method.POST, VolleyUtils.baseUri , new JSONObject(new Gson().toJson(user)), new Response.Listener<JSONObject>() {
+            jsonObjectRequest = new JsonObjectRequest(Request.Method.POST, VolleyUtils.baseUri + "/login" , new JSONObject(new Gson().toJson(user)), new Response.Listener<JSONObject>() {
                 @Override
                 public void onResponse(JSONObject response) {
                     showProgress(false);
-                        Intent intent = new Intent(getApplicationContext(), MainActivity.class);
-                        startActivity(intent);
+
+                        Toast.makeText(getApplicationContext(),  response.toString(), Toast.LENGTH_LONG).show();
+                        //Intent intent = new Intent(getApplicationContext(), MainActivity.class);
+                        //startActivity(intent);
                 }
             }, new Response.ErrorListener() {
                 @Override
                 public void onErrorResponse(VolleyError error) {
                     showProgress(false);
-                    Toast.makeText(getApplicationContext(), error.getMessage(), Toast.LENGTH_SHORT).show();
-
-                    //TODO remove this line
+                    Toast.makeText(getApplicationContext(), "error : " + error.getCause(), Toast.LENGTH_SHORT).show();
                     Intent intent = new Intent(getApplicationContext(), MainActivity.class);
                     startActivity(intent);
                     // END
                 }
             }
             );
+            Toast.makeText(getApplicationContext(), new Gson().toJson(user), Toast.LENGTH_LONG).show();
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -2,7 +2,6 @@ package net.plil.clubinfo.etunicorn.app;
 import android.app.PendingIntent;
 import android.content.Intent;
-import android.net.Uri;
 import android.nfc.NfcAdapter;
 import android.nfc.Tag;
 import android.os.Bundle;
@@ -16,13 +15,10 @@ import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.Toast;
 import net.plil.clubinfo.etunicorn.R;
-import net.plil.clubinfo.etunicorn.app.Event.EventFragment;
-import net.plil.clubinfo.etunicorn.app.Event.PaiementEvent;
+import net.plil.clubinfo.etunicorn.app.event.EventFragment;
+import net.plil.clubinfo.etunicorn.app.event.PaiementEvent;
 import net.plil.clubinfo.etunicorn.app.consommation.FragmentConsommation;
 import net.plil.clubinfo.etunicorn.app.consommation.PaiementConsommation;
 import net.plil.clubinfo.etunicorn.data.Consommation;
@@ -23,6 +23,8 @@ import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
+import java.util.Locale;
+
 public class ModifyConsommation extends DialogFragment {
@@ -46,13 +48,16 @@ public class ModifyConsommation extends DialogFragment {
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         // Use the Builder class for convenient dialog construction
         LayoutInflater inflater = getActivity().getLayoutInflater();
-        View view = inflater.inflate(R.layout.fragment_create_consomation, null);
-        mNomConsomation = (EditText) view.findViewById(R.id.create_consomation_name);
-        mPrice = (EditText) view.findViewById(R.id.create_consomation_price);
-        mProgressBar = (ProgressBar) view.findViewById(R.id.create_consomation_progress_bar);
+        View view = inflater.inflate(R.layout.fragment_modify_consommation, null);
+        mNomConsomation = (EditText) view.findViewById(R.id.modify_consommation_name);
+        mPrice = (EditText) view.findViewById(R.id.modify_consommation_price);
+        mProgressBar = (ProgressBar) view.findViewById(R.id.modify_consommation_progress_bar);
         final Consommation consommation = (Consommation) getArguments().getSerializable("consommation");
+        mNomConsomation.setText(consommation.getNomConsomation());
+        mPrice.setText(String.format(Locale.FRANCE,"%.2f", consommation.getPrix()));
+
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder
                 .setTitle(R.string.modify)
@@ -70,7 +75,7 @@ public class ModifyConsommation extends DialogFragment {
                         } catch (JSONException e){
                             e.printStackTrace();
                         }
-                        JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.POST, VolleyUtils.baseUri + "/consomation/" + consommation.getIdConsomation() ,jsonObject , new Response.Listener<JSONObject>() {
+                        JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.PUT, VolleyUtils.baseUri + "/consomation/" + consommation.getIdConsomation() ,jsonObject , new Response.Listener<JSONObject>() {
                             @Override
                             public void onResponse(JSONObject response) {
                                 mProgressBar.setVisibility(View.GONE);
@@ -12,10 +12,10 @@ import com.android.volley.toolbox.Volley;
 public class VolleyUtils {
-    private static final String uri = "https://etunicorn.plil.net/";
+    private static final String uri = "http://192.168.0.21:8080/";
     private static final String version = "v1";
-    public static final String baseUri = VolleyUtils.uri + VolleyUtils.version + "/";
+    public static final String baseUri = VolleyUtils.uri + VolleyUtils.version ;
     private static VolleyUtils mInstance;
     private RequestQueue  mRequestQueue;
@@ -0,0 +1,39 @@
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="net.plil.clubinfo.etunicorn.app.consommation.CreateConsommation"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/create_event_name"
+        android:hint="@string/create_event_name"/>
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/create_consumable_price"
+        android:id="@+id/create_event_price"
+        android:inputType="numberSigned|numberDecimal"
+        android:maxLines="1" />
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/create_event_date"
+        android:id="@+id/create_event_date"
+        android:inputType="datetime" />
+
+    <ProgressBar
+        style="?android:attr/progressBarStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/create_event_progress_bar"
+        android:visibility="gone"/>
+
+</LinearLayout>
+
@@ -0,0 +1,17 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="net.plil.clubinfo.etunicorn.app.consommation.DeleteConsommation"
+    android:orientation="vertical">
+
+
+    <ProgressBar
+        style="?android:attr/progressBarStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/delete_event_progress_bar"
+        android:visibility="gone"
+        android:layout_gravity="center" />
+    
+</LinearLayout>
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.RecyclerView 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:id="@+id/list"
+<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.support.v7.widget.RecyclerView
+    android:id="@+id/event_list"
     android:name="net.plil.clubinfo.etunicorn.app.Event.EventFragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_marginLeft="16dp"
     android:layout_marginRight="16dp"
     app:layoutManager="LinearLayoutManager"
-    tools:context="net.plil.clubinfo.etunicorn.app.Event.EventFragment"
-    tools:listitem="@layout/fragment_event" />
+    tools:context="net.plil.clubinfo.etunicorn.app.event.EventFragment"
+    tools:listitem="@layout/fragment_event"
+    />
+
+<android.support.design.widget.FloatingActionButton
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:clickable="true"
+    android:layout_gravity="bottom|end"
+    android:layout_margin="24dp"
+    android:id="@+id/event_add"
+    app:fabSize="auto"
+    app:srcCompat="@android:drawable/ic_menu_add"
+    app:backgroundTint="@color/colorPrimaryDark"
+    app:elevation="6dp"
+    app:rippleColor="@color/colorAccent"
+    app:layout_anchor="@id/event_list"
+    app:layout_anchorGravity="bottom|right|end"
+    app:layout_behavior="net.plil.clubinfo.etunicorn.utils.ScrollAwareFABBehavior" />
+
+</android.support.design.widget.CoordinatorLayout>
 \ No newline at end of file
@@ -6,12 +6,12 @@
     android:orientation="vertical">
     <EditText
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/modify_consommation_name" />
     <EditText
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/modify_consommation_price"/>
@@ -20,7 +20,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/modify_consommation_progress_bar"
-        android:layout_gravity="center"/>
+        android:layout_gravity="center"
+        android:visibility="gone"/>
 </LinearLayout>
@@ -0,0 +1,35 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="net.plil.clubinfo.etunicorn.app.event.ModifyEvent"
+    android:orientation="vertical">
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/modify_event_name" />
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/modify_event_price"/>
+
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/modify_event_date"
+        android:inputType="date" />
+
+
+    <ProgressBar
+        style="?android:attr/progressBarStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/modify_event_progress_bar"
+        android:layout_gravity="center"
+        android:visibility="gone"/>
+
+
+</LinearLayout>
@@ -27,4 +27,9 @@
     <string name="modify_done">Modification effectué</string>
     <string name="modify_refused">Modification refusé</string>
     <string name="verif_delete_consomation">Etes-vous sûr ?</string>
+    <string name="create_event">Créer un évenement</string>
+    <string name="create_event_date">Date</string>
+    <string name="create_event_name">Nom</string>
+    <string name="event">Evenement</string>
+    <string name="payment_event">Paiement d\'un evenement</string>
 </resources>
 \ No newline at end of file
@@ -24,10 +24,14 @@
     <string name="modify">Modify</string>
     <string name="delete">Delete</string>
     <string name="verif_delete_consomation">Are you sure ?</string>
+    <string name="verif_delete_event">Are you sure ?</string>
     <string name="delete_done">Delete done</string>
     <string name="delete_refused">Delete refused</string>
     <string name="modify_done">Modify done</string>
     <string name="modify_refused">Modify refused</string>
     <string name="event">Event</string>
     <string name="payment_event">Event payment</string>
+    <string name="create_event_date">Date</string>
+    <string name="create_event_name">Name</string>
+    <string name="create_event">Create event</string>
 </resources>