Adding Event fragment

badetitou
1 parent 68348eda
Showing 18 changed files with 485 additions and 18 deletions Show diff stats
app/src/main/java/net/plil/clubinfo/etunicorn/app/Crediter.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/Debiter.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/EventFragment.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/FragmentNFC.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/MainActivity.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/ConsommationRecyclerViewAdapter.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/FragmentConsommation.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/PaiementConsommation.java
app/src/main/java/net/plil/clubinfo/etunicorn/data/Event.java
app/src/main/java/net/plil/clubinfo/etunicorn/utils/ConvertBytesToString.java
app/src/main/res/layout/fragment_crediter.xml
app/src/main/res/layout/fragment_debiter.xml
app/src/main/res/layout/fragment_event.xml
app/src/main/res/layout/fragment_event_list.xml
app/src/main/res/layout/fragment_paiment_event.xml
app/src/main/res/values/strings.xml
@@ -63,7 +63,7 @@ public class Crediter extends FragmentNFC {
     }
     @Override
-    public void processNFC() {
+    public void processNFC(String idCardUser) {
         mProgressBar.setVisibility(View.VISIBLE);
         JSONObject jsonObject = new JSONObject();
         try {
@@ -70,9 +70,10 @@ public class Debiter extends FragmentNFC {
     }
     @Override
-    public void processNFC() {
+    public void processNFC(String iDCardUser) {
         mProgressBar.setVisibility(View.VISIBLE);
         JSONObject jsonObject = new JSONObject();
+        //TODO verifier champ complet avant de construire la requete
         try {
             jsonObject.put("participant", 1);
             jsonObject.put("acteur", 2);
@@ -0,0 +1,105 @@
+package net.plil.clubinfo.etunicorn.app.Event;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import net.plil.clubinfo.etunicorn.R;
+import net.plil.clubinfo.etunicorn.app.FragmentNFC;
+import net.plil.clubinfo.etunicorn.data.Event;
+
+import java.sql.Date;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
+/**
+ * A fragment representing a list of Items.
+ * <p/>
+ * Activities containing this fragment MUST implement the {@link OnListFragmentInteractionListener}
+ * interface.
+ */
+public class EventFragment extends FragmentNFC {
+
+    private OnListFragmentInteractionListener mListener;
+
+    public EventFragment() {
+    }
+
+
+    public static EventFragment newInstance() {
+        return new EventFragment();
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        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);
+            }
+
+            recyclerView.setAdapter(new MyEventRecyclerViewAdapter(events, mListener, getActivity()));
+        }
+        return view;
+    }
+
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof OnListFragmentInteractionListener) {
+            mListener = (OnListFragmentInteractionListener) context;
+        } else {
+            throw new RuntimeException(context.toString()
+                    + " must implement OnListFragmentInteractionListener");
+        }
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        mListener = null;
+    }
+
+    @Override
+    public void processNFC(String idCardUser) {
+
+    }
+
+    /**
+     * This interface must be implemented by activities that contain this
+     * fragment to allow an interaction in this fragment to be communicated
+     * to the activity and potentially other fragments contained in that
+     * activity.
+     * <p/>
+     * See the Android Training lesson <a href=
+     * "http://developer.android.com/training/basics/fragments/communicating.html"
+     * >Communicating with Other Fragments</a> for more information.
+     */
+    public interface OnListFragmentInteractionListener {
+        void onListFragmentInteraction(Event item);
+        void onListFragmentInteractionLong(Event item);
+    }
+}
@@ -0,0 +1,83 @@
+package net.plil.clubinfo.etunicorn.app.Event;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import net.plil.clubinfo.etunicorn.R;
+import net.plil.clubinfo.etunicorn.data.Event;
+
+import java.util.List;
+import java.util.Locale;
+
+
+public class MyEventRecyclerViewAdapter extends RecyclerView.Adapter<MyEventRecyclerViewAdapter.ViewHolder> {
+
+    private final List<Event> mEvents;
+    private final EventFragment.OnListFragmentInteractionListener mListener;
+    private final Context context;
+
+    public MyEventRecyclerViewAdapter(List<Event> items, EventFragment.OnListFragmentInteractionListener listener, Context context) {
+        mEvents = items;
+        mListener = listener;
+        this.context = context;
+    }
+
+    @Override
+    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.fragment_event, parent, false);
+        return new ViewHolder(view);
+    }
+
+    @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.FRANCE, "%.2f", mEvents.get(position).getPrice()));
+        holder.mId = mEvents.get(position).getIdEvent();
+
+        holder.mView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (null != mListener) {
+                    mListener.onListFragmentInteraction(holder.mItem);
+                }
+            }
+        });
+
+        holder.mView.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                mListener.onListFragmentInteractionLong(holder.mItem);
+                return true;
+            }
+        });
+    }
+
+    @Override
+    public int getItemCount() {
+        return mEvents.size();
+    }
+
+    class ViewHolder extends RecyclerView.ViewHolder {
+        final View mView;
+        int mId;
+        final TextView mContentView;
+        final TextView mPriceView;
+        final TextView mButtonView;
+        Event mItem;
+
+        public ViewHolder(View view) {
+            super(view);
+            mView = view;
+            mContentView = (TextView) view.findViewById(R.id.event_name);
+            mPriceView = (TextView) view.findViewById(R.id.event_price);
+            mButtonView = (TextView) view.findViewById(R.id.event_options);
+        }
+
+    }
+}
@@ -0,0 +1,107 @@
+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.TextView;
+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.JSONException;
+import org.json.JSONObject;
+
+import java.util.Locale;
+
+
+public class PaiementEvent extends DialogFragment {
+
+    ProgressBar mProgressBar;
+    TextView mPaiementEventName;
+    TextView mPaiementEventPrice;
+    int eventId;
+
+    public PaiementEvent(){}
+
+    public static PaiementEvent newInstance(Event event) {
+        PaiementEvent f = new PaiementEvent();
+        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_paiment_event, null);
+        mProgressBar = (ProgressBar) view.findViewById(R.id.paiment_event_progress_bar);
+        mPaiementEventName = (TextView) view.findViewById(R.id.paiment_event_name);
+        mPaiementEventPrice = (TextView) view.findViewById(R.id.paiment_event_price);
+
+
+        Event event = (Event) getArguments().getSerializable("event");
+        mPaiementEventName.setText(event.getNomEvent());
+        mPaiementEventPrice.setText(String.format(Locale.FRANCE, "%.2f €", event.getPrice()));
+
+        eventId = event.getIdEvent();
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder
+                .setTitle(R.string.payment_event)
+                .setView(view)
+                .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();
+    }
+
+
+    public void processNFC() {
+        mProgressBar.setVisibility(View.VISIBLE);
+        JSONObject jsonObject = new JSONObject();
+        try {
+            jsonObject.put("participant", 1);
+            jsonObject.put("acteur", 2);
+            jsonObject.put("id", eventId);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.POST, VolleyUtils.baseUri + "/transaction/evenement", jsonObject, new Response.Listener<JSONObject>() {
+            @Override
+            public void onResponse(JSONObject response) {
+                mProgressBar.setVisibility(View.GONE);
+                Toast.makeText(getContext(), R.string.payment_done, Toast.LENGTH_LONG).show();
+                dismiss();
+            }
+        }, new Response.ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError error) {
+                mProgressBar.setVisibility(View.GONE);
+                Toast.makeText(getContext(), R.string.payment_refused, Toast.LENGTH_LONG).show();
+                dismiss();
+            }
+        }
+        );
+
+        VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest);
+    }
+}
@@ -8,5 +8,5 @@ import android.view.View;
  */
 public abstract class FragmentNFC extends Fragment {
-    public abstract void processNFC();
+    public abstract void processNFC(String idCardUser);
 }
@@ -4,6 +4,7 @@ import android.app.PendingIntent;
 import android.content.Intent;
 import android.net.Uri;
 import android.nfc.NfcAdapter;
+import android.nfc.Tag;
 import android.os.Bundle;
 import android.support.design.widget.AppBarLayout;
 import android.support.design.widget.TabLayout;
@@ -17,17 +18,22 @@ 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.consommation.FragmentConsommation;
 import net.plil.clubinfo.etunicorn.app.consommation.PaiementConsommation;
 import net.plil.clubinfo.etunicorn.data.Consommation;
+import net.plil.clubinfo.etunicorn.data.Event;
+import net.plil.clubinfo.etunicorn.utils.ConvertBytesToString;
 import java.util.ArrayList;
 import java.util.List;
-public class MainActivity extends AppCompatActivity implements FragmentConsommation.OnListFragmentInteractionListener{
+public class MainActivity extends AppCompatActivity implements FragmentConsommation.OnListFragmentInteractionListener, EventFragment.OnListFragmentInteractionListener{
     /**
      * The {@link android.support.v4.view.PagerAdapter} that will provide
@@ -109,8 +115,9 @@ public class MainActivity extends AppCompatActivity implements FragmentConsommat
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
         if (NfcAdapter.ACTION_TAG_DISCOVERED.equals(intent.getAction())) {
+            Tag myTag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
             FragmentNFC fNFC = (FragmentNFC) getSupportFragmentManager().getFragments().get(mViewPager.getCurrentItem());
-            fNFC.processNFC();
+            fNFC.processNFC(ConvertBytesToString.bytesToHexString(myTag.getId()));
         }
     }
@@ -136,7 +143,18 @@ public class MainActivity extends AppCompatActivity implements FragmentConsommat
     }
     @Override
-    public void onListFragmentInteractionLong(Consommation item) {
+    public void onListFragmentInteractionLong(Consommation consommation) {
+
+    }
+
+    @Override
+    public void onListFragmentInteraction(Event item) {
+        PaiementEvent paiementEvent = PaiementEvent.newInstance(item);
+        paiementEvent.show(getSupportFragmentManager(), "paiementEvent");
+    }
+
+    @Override
+    public void onListFragmentInteractionLong(Event item) {
     }
@@ -158,13 +176,15 @@ public class MainActivity extends AppCompatActivity implements FragmentConsommat
                 return Debiter.newInstance();
             else if (position == Action.CONSOMATION.getValue())
                 return FragmentConsommation.newInstance();
+            else if (position == Action.EVENT.getValue())
+                return EventFragment.newInstance();
             else
                 return null;
         }
         @Override
         public int getCount() {
-            return 3;
+            return 4;
         }
         @Override
@@ -175,12 +195,14 @@ public class MainActivity extends AppCompatActivity implements FragmentConsommat
                 return "Crediter";
             else if (position == Action.CONSOMATION.getValue())
                 return "Consommation";
+            else if(position == Action.EVENT.getValue())
+                return getString(R.string.event);
             return null;
         }
     }
     private enum Action {
-        DEBITER(0), CREDITER(1), CONSOMATION(2);
+        DEBITER(0), CREDITER(1), CONSOMATION(2), EVENT(3);
         private final int value;
         Action(int value) {
@@ -114,9 +114,5 @@ public class ConsommationRecyclerViewAdapter extends RecyclerView.Adapter&lt;Consom
             mButtonMenu = (TextView) view.findViewById(R.id.consomation_options);
         }
-        @Override
-        public String toString() {
-            return super.toString() + " '" + mContentView.getText() + "'";
-        }
     }
 }
@@ -99,8 +99,7 @@ public class FragmentConsommation extends FragmentNFC {
     }
     @Override
-    public void processNFC() {
-
+    public void processNFC(String idCardUser) {
         PaiementConsommation paiementConsommation = (PaiementConsommation) getFragmentManager().findFragmentByTag("paiementConsommation");
         if (paiementConsommation == null){
             Toast.makeText(getContext(), R.string.payment_consumable_alert_no_selection, Toast.LENGTH_LONG).show();
@@ -41,8 +41,6 @@ public class PaiementConsommation extends DialogFragment {
      */
     public static PaiementConsommation newInstance(Consommation consommation) {
         PaiementConsommation f = new PaiementConsommation();
-
-        // Supply num input as an argument.
         Bundle args = new Bundle();
         args.putSerializable("consommation", consommation);
         f.setArguments(args);
@@ -0,0 +1,51 @@
+package net.plil.clubinfo.etunicorn.data;
+
+import java.io.Serializable;
+import java.sql.Date;
+
+/**
+ * Created by badetitou on 04/02/2017.
+ */
+
+public class Event implements Serializable{
+
+    private int idEvent;
+    private String nomEvent;
+    private double price;
+    private Date date;
+
+    public Event() {
+    }
+
+    public int getIdEvent() {
+        return idEvent;
+    }
+
+    public void setIdEvent(int idEvent) {
+        this.idEvent = idEvent;
+    }
+
+    public String getNomEvent() {
+        return nomEvent;
+    }
+
+    public void setNomEvent(String nomEvent) {
+        this.nomEvent = nomEvent;
+    }
+
+    public double getPrice() {
+        return price;
+    }
+
+    public void setPrice(double price) {
+        this.price = price;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+}
@@ -0,0 +1,26 @@
+package net.plil.clubinfo.etunicorn.utils;
+
+/**
+ * Created by badetitou on 04/02/2017.
+ */
+
+public class ConvertBytesToString {
+
+    public static String bytesToHexString(byte[] bytes){
+        StringBuilder stringBuilder = new StringBuilder("");
+        if (bytes == null || bytes.length <= 0) {
+            return null;
+        }
+
+        char[] buffer = new char[2];
+        for (int i = 0; i < bytes.length; i++) {
+            buffer[0] = Character.forDigit((bytes[i] >>> 4) & 0x0F, 16);
+            buffer[1] = Character.forDigit(bytes[i] & 0x0F, 16);
+            System.out.println(buffer);
+            stringBuilder.append(buffer);
+        }
+
+        return stringBuilder.toString();
+    }
+
+}
@@ -5,7 +5,7 @@
     tools:context="net.plil.clubinfo.etunicorn.app.Crediter">
     <EditText
-        android:inputType="numberSigned"
+        android:inputType="numberSigned|numberDecimal"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:hint="@string/enter_money"
@@ -6,7 +6,7 @@
     <EditText
-        android:inputType="numberSigned"
+        android:inputType="numberSigned|numberDecimal"
         android:ems="10"
         android:id="@+id/debiter_edit_text_money"
         android:gravity="center"
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
+    android:foreground="?attr/selectableItemBackground">
+
+    <TextView
+        android:id="@+id/event_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/text_margin"
+        android:textAppearance="?attr/textAppearanceListItem" />
+
+    <TextView
+        android:id="@+id/event_price"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/text_margin"
+        android:textAppearance="?attr/textAppearanceListItem"
+        android:layout_toRightOf="@id/event_name"/>
+
+    <TextView
+        android:id="@+id/event_options"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_alignParentRight="true"
+        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>
@@ -0,0 +1,13 @@
+<?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: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" />
@@ -0,0 +1,28 @@
+<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.PaiementConsommation"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/paiment_event_name"
+        android:layout_gravity="center"
+        android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/paiment_event_price"
+        android:layout_gravity="center"
+        android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+
+    <ProgressBar
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/paiment_event_progress_bar"
+        android:visibility="gone"/>
+
+</LinearLayout>
@@ -28,4 +28,6 @@
     <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>
 </resources>