Event ?

badetitou
1 parent 3dc52ca9
Showing 13 changed files with 240 additions and 70 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/personne/DeletePersonne.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/ModifyPersonne.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/MyPersonneRecyclerViewAdapter.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/PersonneFragment.java
app/src/main/java/net/plil/clubinfo/etunicorn/data/Event.java
app/src/main/res/layout/fragment_event.xml
app/src/main/res/layout/fragment_event_list.xml
@@ -41,6 +41,9 @@ import java.util.Map;
 public class CreateEvent extends DialogFragment {
+    private DialogInterface.OnDismissListener onDismissListener;
+
+
     Calendar myCalendar = Calendar.getInstance();
@@ -186,10 +189,22 @@ public class CreateEvent extends DialogFragment {
     }
     private void updateLabel() {
-        String myFormat = "yyyy-MM-dd"; //In which you need put here
+        String myFormat = "yyyy-MM-dd";
         SimpleDateFormat sdf = new SimpleDateFormat(myFormat, Locale.FRANCE);
         arraySpinnerDate[0] = sdf.format(myCalendar.getTime());
         adapterDate.notifyDataSetChanged();
     }
+    public void setOnDismissListener(DialogInterface.OnDismissListener onDismissListener) {
+        this.onDismissListener = onDismissListener;
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        super.onDismiss(dialog);
+        if (onDismissListener != null) {
+            onDismissListener.onDismiss(dialog);
+        }
+    }
+
 }
@@ -31,6 +31,9 @@ import java.util.Map;
 public class DeleteEvent extends DialogFragment {
+    private DialogInterface.OnDismissListener onDismissListener;
+
+
     ProgressBar mProgressBar;
     public DeleteEvent() {
@@ -84,7 +87,7 @@ public class DeleteEvent extends DialogFragment {
                     public void onClick(View v) {
                         mProgressBar.setVisibility(View.VISIBLE);
-                        JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.DELETE, VolleyUtils.baseUri + "/evenement/" + event.getIdEvent(), null, new Response.Listener<JSONObject>() {
+                        JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.DELETE, VolleyUtils.baseUri + "/evenement/" + event.getId(), null, new Response.Listener<JSONObject>() {
                             @Override
                             public void onResponse(JSONObject response) {
                                 mProgressBar.setVisibility(View.GONE);
@@ -122,4 +125,16 @@ public class DeleteEvent extends DialogFragment {
         super.onStop();
     }
+    public void setOnDismissListener(DialogInterface.OnDismissListener onDismissListener) {
+        this.onDismissListener = onDismissListener;
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        super.onDismiss(dialog);
+        if (onDismissListener != null) {
+            onDismissListener.onDismiss(dialog);
+        }
+    }
+
 }
 package net.plil.clubinfo.etunicorn.app.event;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.app.Fragment;
+import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -11,14 +13,31 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
+import com.android.volley.AuthFailureError;
+import com.android.volley.Request;
+import com.android.volley.Response;
+import com.android.volley.VolleyError;
+import com.android.volley.toolbox.JsonArrayRequest;
+
 import net.plil.clubinfo.etunicorn.R;
+import net.plil.clubinfo.etunicorn.app.MainActivity;
 import net.plil.clubinfo.etunicorn.app.NFCSupport;
+import net.plil.clubinfo.etunicorn.app.personne.ModifyPersonne;
 import net.plil.clubinfo.etunicorn.data.Event;
+import net.plil.clubinfo.etunicorn.data.Personne;
+import net.plil.clubinfo.etunicorn.utils.ConvertBytesToString;
+import net.plil.clubinfo.etunicorn.utils.JsonConverter;
+import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
+
+import org.json.JSONArray;
+import org.json.JSONException;
 import java.sql.Date;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 /**
  * A fragment representing a list of Items.
@@ -26,9 +45,13 @@ import java.util.List;
  * Activities containing this fragment MUST implement the {@link OnListFragmentInteractionListener}
  * interface.
  */
-public class EventFragment extends Fragment implements NFCSupport {
+public class EventFragment extends Fragment implements NFCSupport, DialogInterface.OnDismissListener {
     private OnListFragmentInteractionListener mListener;
+    private SwipeRefreshLayout mSwipeRefreshLayout;
+
+    private List<Event> events;
+    private RecyclerView.Adapter mAdapter;
     public EventFragment() {
     }
@@ -48,30 +71,39 @@ public class EventFragment extends Fragment implements NFCSupport {
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_event_list, container, false);
-        // Set the adapter
         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);
-        }
+        events = new ArrayList<>();
+        updateEvents();
+        mAdapter = new MyEventRecyclerViewAdapter(events, mListener, getActivity(), this);
+        recyclerView.setAdapter(mAdapter);
         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.setOnDismissListener(new DialogInterface.OnDismissListener() {
+                    @Override
+                    public void onDismiss(DialogInterface dialog) {
+                        updateEvents();
+                    }
+                });
                 newFragment.show(getFragmentManager(), "CreateEvent");
             }
         });
-        recyclerView.setAdapter(new MyEventRecyclerViewAdapter(events, mListener, getActivity()));
+        mSwipeRefreshLayout = (SwipeRefreshLayout) view.findViewById(R.id.event_swipeRefresh);
+        mSwipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                updateEvents();
+            }
+        });
+
         return view;
     }
@@ -93,6 +125,43 @@ public class EventFragment extends Fragment implements NFCSupport {
         mListener = null;
     }
+    private void updateEvents(){
+        JsonArrayRequest jsonArrayRequest = new JsonArrayRequest(Request.Method.GET, VolleyUtils.baseUri + "/evenement", null, new Response.Listener<JSONArray>() {
+            @Override
+            public void onResponse(JSONArray response) {
+                try {
+                    events.clear();
+                    for (int i = 0; i < response.length(); ++i) {
+                        events.add(JsonConverter.getConverter().fromJson(String.valueOf(response.getJSONObject(i)), Event.class));
+                    }
+                    mAdapter.notifyDataSetChanged();
+                    mSwipeRefreshLayout.setRefreshing(false);
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+
+            }
+        }, new Response.ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError error) {
+                if (error.networkResponse == null)
+                    Toast.makeText(getActivity(), "Unknow error SORRY", Toast.LENGTH_LONG).show();
+                else
+                    Toast.makeText(getActivity(), ConvertBytesToString.bytesToStringVolLey(error.networkResponse.data), Toast.LENGTH_LONG).show();
+            }
+        }
+        ) {
+            @Override
+            public Map<String, String> getHeaders() throws AuthFailureError {
+                Map<String, String> headers = new HashMap<>();
+                headers.put("Authorization", MainActivity.session.getToken());
+                return headers;
+            }
+        };
+        jsonArrayRequest.setTag(ModifyPersonne.class);
+        VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonArrayRequest);
+    }
+
     @Override
     public void processNFC(String idCardUser) {
         PaiementEvent paiementEvent = (PaiementEvent) getFragmentManager().findFragmentByTag("paiementEvent");
@@ -103,6 +172,11 @@ public class EventFragment extends Fragment implements NFCSupport {
         }
     }
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        updateEvents();
+    }
+
     /**
      * This interface must be implemented by activities that contain this
      * fragment to allow an interaction in this fragment to be communicated
@@ -42,6 +42,9 @@ import java.util.Map;
 public class ModifyEvent extends DialogFragment {
+    private DialogInterface.OnDismissListener onDismissListener;
+
+
     Calendar myCalendar = Calendar.getInstance();
     EditText mNom;
     EditText mPrice;
@@ -100,8 +103,8 @@ public class ModifyEvent extends DialogFragment {
                 R.layout.simple_item_layout, arraySpinnerDate);
         mDate.setAdapter(adapterDate);
-        mNom.setText(event.getNomEvent());
-        mPrice.setText(String.format(Locale.US, "%.2f", event.getPrice()));
+        mNom.setText(event.getNom());
+        mPrice.setText(String.format(Locale.US, "%.2f", event.getPrix()));
         AlertDialog dialog = new AlertDialog.Builder(getActivity())
                 .setTitle(R.string.modify)
@@ -138,14 +141,14 @@ public class ModifyEvent extends DialogFragment {
                         mDate.setVisibility(View.GONE);
                         JSONObject jsonObject = new JSONObject();
                         try {
-                            jsonObject.put("nomEvenement", mNom.getText().toString());
+                            jsonObject.put("nom", mNom.getText().toString());
                             if (!mPrice.getText().toString().isEmpty())
                                 jsonObject.put("prix", Double.parseDouble(mPrice.getText().toString()));
                             jsonObject.put("date", mDate.getSelectedItem());
                         } catch (JSONException e) {
                             e.printStackTrace();
                         }
-                        JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.POST, VolleyUtils.baseUri + "/evenement/" + event.getIdEvent(), jsonObject, new Response.Listener<JSONObject>() {
+                        JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.PUT, VolleyUtils.baseUri + "/evenement/" + event.getId(), jsonObject, new Response.Listener<JSONObject>() {
                             @Override
                             public void onResponse(JSONObject response) {
                                 mProgressBar.setVisibility(View.GONE);
@@ -161,7 +164,6 @@ public class ModifyEvent extends DialogFragment {
                                 mNomInput.setVisibility(View.VISIBLE);
                                 mDate.setVisibility(View.VISIBLE);
                                 Toast.makeText(getContext(), R.string.modify_refused, Toast.LENGTH_LONG).show();
-
                             }
                         }
                         ) {
@@ -196,4 +198,17 @@ public class ModifyEvent extends DialogFragment {
         adapterDate.notifyDataSetChanged();
     }
+    public void setOnDismissListener(DialogInterface.OnDismissListener onDismissListener) {
+        this.onDismissListener = onDismissListener;
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        super.onDismiss(dialog);
+        if (onDismissListener != null) {
+            onDismissListener.onDismiss(dialog);
+        }
+    }
+
+
 }
 \ No newline at end of file
 package net.plil.clubinfo.etunicorn.app.event;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.PopupMenu;
 import android.support.v7.widget.RecyclerView;
@@ -22,11 +23,13 @@ class MyEventRecyclerViewAdapter extends RecyclerView.Adapter&lt;MyEventRecyclerVie
     private final List<Event> mEvents;
     private final EventFragment.OnListFragmentInteractionListener mListener;
     private final Context context;
+    DialogInterface.OnDismissListener mOnDismissListener;
-    MyEventRecyclerViewAdapter(List<Event> items, EventFragment.OnListFragmentInteractionListener listener, Context context) {
+    MyEventRecyclerViewAdapter(List<Event> items, EventFragment.OnListFragmentInteractionListener listener, Context context, DialogInterface.OnDismissListener mOnDismissListener) {
         mEvents = items;
         mListener = listener;
         this.context = context;
+        this.mOnDismissListener = mOnDismissListener;
     }
     @Override
@@ -39,9 +42,9 @@ class MyEventRecyclerViewAdapter extends RecyclerView.Adapter&lt;MyEventRecyclerVie
     @Override
     public void onBindViewHolder(final ViewHolder holder, int position) {
         holder.mItem = mEvents.get(position);
-        holder.mContentView.setText(mEvents.get(position).getNomEvent());
-        holder.mPriceView.setText(String.format(Locale.US, "%.2f", mEvents.get(position).getPrice()));
-        holder.mId = mEvents.get(position).getIdEvent();
+        holder.mContentView.setText(mEvents.get(position).getNom());
+        holder.mPriceView.setText(String.format(Locale.US, "%.2f", mEvents.get(position).getPrix()));
+        holder.mId = mEvents.get(position).getId();
         holder.mView.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -65,10 +68,12 @@ class MyEventRecyclerViewAdapter extends RecyclerView.Adapter&lt;MyEventRecyclerVie
                         switch (item.getItemId()) {
                             case R.id.delete:
                                 DeleteEvent deleteEvent = DeleteEvent.newInstance(holder.mItem);
+                                deleteEvent.setOnDismissListener(mOnDismissListener);
                                 deleteEvent.show(((AppCompatActivity) context).getSupportFragmentManager(), "deleteConsommation");
                                 break;
                             case R.id.modify:
                                 ModifyEvent modifyEvent = ModifyEvent.newInstance(holder.mItem);
+                                modifyEvent.setOnDismissListener(mOnDismissListener);
                                 modifyEvent.show(((AppCompatActivity) context).getSupportFragmentManager(), "modifyConsommation");
                                 break;
                         }
@@ -65,10 +65,10 @@ public class PaiementEvent extends DialogFragment implements NFCSupport {
         Event event = (Event) getArguments().getSerializable("event");
         assert event != null;
-        mPaiementEventName.setText(event.getNomEvent());
-        mPaiementEventPrice.setText(String.format(Locale.US, "%.2f €", event.getPrice()));
+        mPaiementEventName.setText(event.getNom());
+        mPaiementEventPrice.setText(String.format(Locale.US, "%.2f €", event.getPrix()));
-        eventId = event.getIdEvent();
+        eventId = event.getId();
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder
@@ -31,6 +31,9 @@ import java.util.Map;
 public class DeletePersonne extends DialogFragment {
+    private DialogInterface.OnDismissListener onDismissListener;
+
+
     ProgressBar mProgressBar;
     public DeletePersonne() {
@@ -120,4 +123,16 @@ public class DeletePersonne extends DialogFragment {
         super.onStop();
     }
+    public void setOnDismissListener(DialogInterface.OnDismissListener onDismissListener) {
+        this.onDismissListener = onDismissListener;
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        super.onDismiss(dialog);
+        if (onDismissListener != null) {
+            onDismissListener.onDismiss(dialog);
+        }
+    }
+
 }
@@ -50,6 +50,8 @@ import java.util.Map;
 public class ModifyPersonne extends DialogFragment implements NFCSupport {
+    private DialogInterface.OnDismissListener onDismissListener;
+
     Calendar myCalendar = Calendar.getInstance();
     EditText mCarte;
@@ -275,4 +277,17 @@ public class ModifyPersonne extends DialogFragment implements NFCSupport {
     public void processNFC(String idCard) {
         mCarte.setText(idCard);
     }
+
+    public void setOnDismissListener(DialogInterface.OnDismissListener onDismissListener) {
+        this.onDismissListener = onDismissListener;
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        super.onDismiss(dialog);
+        if (onDismissListener != null) {
+            onDismissListener.onDismiss(dialog);
+        }
+    }
+
 }
 package net.plil.clubinfo.etunicorn.app.personne;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.PopupMenu;
 import android.support.v7.widget.RecyclerView;
@@ -18,15 +19,18 @@ import java.util.Locale;
 class MyPersonneRecyclerViewAdapter extends RecyclerView.Adapter<MyPersonneRecyclerViewAdapter.ViewHolder> {
+    private DialogInterface.OnDismissListener mOnDismissListener;
+
     private final List<Personne> mValues;
     private final PersonneFragment.OnListFragmentInteractionListener mListener;
     private final Context context;
-    MyPersonneRecyclerViewAdapter(List<Personne> items, PersonneFragment.OnListFragmentInteractionListener listener, Context context) {
+    MyPersonneRecyclerViewAdapter(List<Personne> items, PersonneFragment.OnListFragmentInteractionListener listener, Context context, DialogInterface.OnDismissListener mOnDismissListener) {
         mValues = items;
         mListener = listener;
         this.context = context;
+        this.mOnDismissListener = mOnDismissListener;
     }
     @Override
@@ -66,10 +70,12 @@ class MyPersonneRecyclerViewAdapter extends RecyclerView.Adapter&lt;MyPersonneRecyc
                         switch (item.getItemId()) {
                             case R.id.delete:
                                 DeletePersonne deletePersonne = DeletePersonne.newInstance(holder.mItem);
+                                deletePersonne.setOnDismissListener(mOnDismissListener);
                                 deletePersonne.show(((AppCompatActivity) context).getSupportFragmentManager(), context.getString(R.string.tag_delete_personne));
                                 break;
                             case R.id.modify:
                                 ModifyPersonne modifyPersonne = ModifyPersonne.newInstance(holder.mItem);
+                                modifyPersonne.setOnDismissListener(mOnDismissListener);
                                 modifyPersonne.show(((AppCompatActivity) context).getSupportFragmentManager(), context.getString(R.string.tag_modify_personne));
                                 break;
                         }
@@ -40,7 +40,7 @@ import java.util.Map;
  * Activities containing this fragment MUST implement the {@link OnListFragmentInteractionListener}
  * interface.
  */
-public class PersonneFragment extends Fragment implements NFCSupport {
+public class PersonneFragment extends Fragment implements NFCSupport, DialogInterface.OnDismissListener {
     private OnListFragmentInteractionListener mListener;
     private ArrayList<Personne> personnes = new ArrayList<>();
@@ -72,9 +72,9 @@ public class PersonneFragment extends Fragment implements NFCSupport {
         Context context = view.getContext();
         RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.personne_list);
         recyclerView.setLayoutManager(new LinearLayoutManager(context));
-        mAdapter = new MyPersonneRecyclerViewAdapter(personnes, mListener, getActivity());
+        mAdapter = new MyPersonneRecyclerViewAdapter(personnes, mListener, getActivity(), this);
         recyclerView.setAdapter(mAdapter);
-        setPersonnes();
+        updatePersonnes();
         FloatingActionButton fAB = (FloatingActionButton) view.findViewById(R.id.personne_add);
         fAB.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -83,7 +83,7 @@ public class PersonneFragment extends Fragment implements NFCSupport {
                 newFragment.setOnDismissListener(new DialogInterface.OnDismissListener() {
                     @Override
                     public void onDismiss(DialogInterface dialog) {
-                        setPersonnes();
+                        updatePersonnes();
                     }
                 });
                 newFragment.show(getFragmentManager(), getString(R.string.tag_create_personne));
@@ -94,7 +94,7 @@ public class PersonneFragment extends Fragment implements NFCSupport {
         mSwipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
             @Override
             public void onRefresh() {
-                setPersonnes();
+                updatePersonnes();
             }
         });
@@ -119,7 +119,7 @@ public class PersonneFragment extends Fragment implements NFCSupport {
         mListener = null;
     }
-    private void setPersonnes() {
+    private void updatePersonnes() {
         JsonArrayRequest jsonArrayRequest = new JsonArrayRequest(Request.Method.GET, VolleyUtils.baseUri + "/personne", null, new Response.Listener<JSONArray>() {
             @Override
             public void onResponse(JSONArray response) {
@@ -170,6 +170,11 @@ public class PersonneFragment extends Fragment implements NFCSupport {
     }
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        updatePersonnes();
+    }
+
     /**
      * This interface must be implemented by activities that contain this
      * fragment to allow an interaction in this fragment to be communicated
@@ -9,36 +9,36 @@ import java.util.Date;
 public class Event implements Serializable{
-    private int idEvent;
-    private String nomEvent;
-    private double price;
+    private int id;
+    private String nom;
+    private double prix;
     private Date date;
     public Event() {
     }
-    public int getIdEvent() {
-        return idEvent;
+    public int getId() {
+        return id;
     }
-    public void setIdEvent(int idEvent) {
-        this.idEvent = idEvent;
+    public void setId(int id) {
+        this.id = id;
     }
-    public String getNomEvent() {
-        return nomEvent;
+    public String getNom() {
+        return nom;
     }
-    public void setNomEvent(String nomEvent) {
-        this.nomEvent = nomEvent;
+    public void setNom(String nom) {
+        this.nom = nom;
     }
-    public double getPrice() {
-        return price;
+    public double getPrix() {
+        return prix;
     }
-    public void setPrice(double price) {
-        this.price = price;
+    public void setPrix(double prix) {
+        this.prix = prix;
     }
     public Date getDate() {
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
@@ -8,30 +8,30 @@
     <TextView
         android:id="@+id/event_name"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_weight="17"
         android:layout_margin="@dimen/text_margin"
         android:textAppearance="?attr/textAppearanceListItem" />
     <TextView
         android:id="@+id/event_price"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/text_margin"
-        android:textAppearance="?attr/textAppearanceListItem"
-        android:layout_toRightOf="@id/event_name"/>
+        android:layout_weight="7"
+        android:textAppearance="?attr/textAppearanceListItem" />
     <TextView
         android:id="@+id/event_options"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_alignParentRight="true"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="20"
+        android:layout_margin="@dimen/text_margin"
         android:paddingRight="@dimen/activity_horizontal_margin"
-        android:layout_alignParentTop="true"
         android:paddingLeft="@dimen/activity_horizontal_margin"
         android:text="&#8942;"
         android:textAppearance="?android:textAppearanceLarge"
         tools:ignore="RtlHardcoded,RtlSymmetry"
-        android:textStyle="normal|bold"
-        android:translationY="10dp" />
-</RelativeLayout>
+        android:textStyle="normal|bold" />
+</LinearLayout>
@@ -6,17 +6,22 @@
     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.support.v4.widget.SwipeRefreshLayout
+        android:id="@+id/event_swipeRefresh"
         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"
-        />
+        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"
+            />
+    </android.support.v4.widget.SwipeRefreshLayout>
     <android.support.design.widget.FloatingActionButton
         android:layout_width="wrap_content"