Add payment consommation

badetitou
1 parent 73b70b1e
Showing 12 changed files with 213 additions and 52 deletions Show diff stats
app/src/main/java/net/plil/clubinfo/etunicorn/app/Crediter.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/MainActivity.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/consomation/CreateConsomation.java -> app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/CreateConsommation.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/consomation/FragmentConsomation.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/Consomation.java -> app/src/main/java/net/plil/clubinfo/etunicorn/data/Consommation.java
app/src/main/res/layout/fragment_consomation_item_list.xml
app/src/main/res/layout/fragment_create_consomation.xml
app/src/main/res/layout/fragment_paiment_consomation.xml
app/src/main/res/values-fr/strings.xml
app/src/main/res/values/strings.xml
@@ -119,7 +119,6 @@ public class Crediter extends FragmentNFC {
      * >Communicating with Other Fragments</a> for more information.
      */
     public interface OnFragmentInteractionListener {
-        // TODO: Update argument type and name
         void onFragmentInteraction(Uri uri);
     }
 }
@@ -14,14 +14,14 @@ import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
 import net.plil.clubinfo.etunicorn.R;
-import net.plil.clubinfo.etunicorn.app.consomation.FragmentConsomation;
-import net.plil.clubinfo.etunicorn.data.Consomation;
+import net.plil.clubinfo.etunicorn.app.consommation.FragmentConsommation;
+import net.plil.clubinfo.etunicorn.app.consommation.PaiementConsommation;
+import net.plil.clubinfo.etunicorn.data.Consommation;
-public class MainActivity extends AppCompatActivity implements Crediter.OnFragmentInteractionListener, Debiter.OnFragmentInteractionListener, FragmentConsomation.OnListFragmentInteractionListener{
+public class MainActivity extends AppCompatActivity implements Crediter.OnFragmentInteractionListener, Debiter.OnFragmentInteractionListener, FragmentConsommation.OnListFragmentInteractionListener{
     /**
      * The {@link android.support.v4.view.PagerAdapter} that will provide
@@ -121,9 +121,11 @@ public class MainActivity extends AppCompatActivity implements Crediter.OnFragme
     }
-    @Override
-    public void onListFragmentInteraction(Consomation item) {
+    @Override
+    public void onListFragmentInteraction(Consommation item) {
+        PaiementConsommation paiementConsommation = PaiementConsommation.newInstance(item);
+        paiementConsommation.show(getSupportFragmentManager(), "paiementConsommation");
     }
     /**
@@ -143,7 +145,7 @@ public class MainActivity extends AppCompatActivity implements Crediter.OnFragme
             else if (position == Action.DEBITER.getValue())
                 return Debiter.newInstance();
             else if (position == Action.CONSOMATION.getValue())
-                return FragmentConsomation.newInstance();
+                return FragmentConsommation.newInstance();
             else
                 return null;
         }
@@ -160,7 +162,7 @@ public class MainActivity extends AppCompatActivity implements Crediter.OnFragme
             else if (position == Action.CREDITER.getValue())
                 return "Crediter";
             else if (position == Action.CONSOMATION.getValue())
-                return "Consomation";
+                return "Consommation";
             return null;
         }
     }
-package net.plil.clubinfo.etunicorn.app.consomation;
+package net.plil.clubinfo.etunicorn.app.consommation;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import android.widget.Toast;
 import net.plil.clubinfo.etunicorn.R;
-import net.plil.clubinfo.etunicorn.data.Consomation;
+import net.plil.clubinfo.etunicorn.data.Consommation;
 import java.util.List;
 import java.util.Locale;
-public class ConsomationRecyclerViewAdapter extends RecyclerView.Adapter<ConsomationRecyclerViewAdapter.ViewHolder> {
+public class ConsommationRecyclerViewAdapter extends RecyclerView.Adapter<ConsommationRecyclerViewAdapter.ViewHolder> {
-    private final List<net.plil.clubinfo.etunicorn.data.Consomation> mValues;
-    private final FragmentConsomation.OnListFragmentInteractionListener mListener;
+    private final List<Consommation> mValues;
+    private final FragmentConsommation.OnListFragmentInteractionListener mListener;
-    public ConsomationRecyclerViewAdapter(List<net.plil.clubinfo.etunicorn.data.Consomation> items, FragmentConsomation.OnListFragmentInteractionListener listener) {
+    public ConsommationRecyclerViewAdapter(List<Consommation> items, FragmentConsommation.OnListFragmentInteractionListener listener) {
         mValues = items;
         mListener = listener;
     }
@@ -37,7 +36,7 @@ public class ConsomationRecyclerViewAdapter extends RecyclerView.Adapter&lt;Consoma
         holder.mItem = mValues.get(position);
         holder.mIdView.setText(String.format(Locale.FRANCE, "%d", mValues.get(position).getIdConsomation()));
         holder.mContentView.setText(mValues.get(position).getNomConsomation());
-        holder.mPriceView.setText(String.format(Locale.FRANCE, "%f",mValues.get(position).getPrix()));
+        holder.mPriceView.setText(String.format(Locale.FRANCE, "%.2f",mValues.get(position).getPrix()));
         holder.mView.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -67,7 +66,7 @@ public class ConsomationRecyclerViewAdapter extends RecyclerView.Adapter&lt;Consoma
         public final TextView mIdView;
         public final TextView mContentView;
         public final TextView mPriceView;
-        public Consomation mItem;
+        public Consommation mItem;
         public ViewHolder(View view) {
             super(view);
-package net.plil.clubinfo.etunicorn.app.consomation;
+package net.plil.clubinfo.etunicorn.app.consommation;
 import android.app.Dialog;
-import android.content.Context;
 import android.content.DialogInterface;
-import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.ProgressBar;
@@ -26,7 +22,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
-public class CreateConsomation extends DialogFragment {
+public class CreateConsommation extends DialogFragment {
     EditText mNomConsomation;
     EditText mPrice;
@@ -43,7 +39,7 @@ public class CreateConsomation extends DialogFragment {
         mProgressBar = (ProgressBar) view.findViewById(R.id.create_consomation_progress_bar);
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder
-                .setTitle(R.string.create_consomation)
+                .setTitle(R.string.create_consumable)
                 .setView(view)
                 .setPositiveButton(R.string.valid, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
-package net.plil.clubinfo.etunicorn.app.consomation;
+package net.plil.clubinfo.etunicorn.app.consommation;
 import android.content.Context;
 import android.os.Bundle;
@@ -10,9 +10,18 @@ import android.view.View;
 import android.view.ViewGroup;
 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.app.FragmentNFC;
-import net.plil.clubinfo.etunicorn.data.Consomation;
+import net.plil.clubinfo.etunicorn.data.Consommation;
+import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
+
+import org.json.JSONException;
+import org.json.JSONObject;
 import java.util.ArrayList;
 import java.util.List;
@@ -23,7 +32,7 @@ import java.util.List;
  * Activities containing this fragment MUST implement the {@link OnListFragmentInteractionListener}
  * interface.
  */
-public class FragmentConsomation extends FragmentNFC {
+public class FragmentConsommation extends FragmentNFC {
     private OnListFragmentInteractionListener mListener;
@@ -31,11 +40,11 @@ public class FragmentConsomation extends FragmentNFC {
      * Mandatory empty constructor for the fragment manager to instantiate the
      * fragment (e.g. upon screen orientation changes).
      */
-    public FragmentConsomation() {
+    public FragmentConsommation() {
     }
-    public static FragmentConsomation newInstance() {
-        return new FragmentConsomation();
+    public static FragmentConsommation newInstance() {
+        return new FragmentConsommation();
     }
     @Override
@@ -53,27 +62,27 @@ public class FragmentConsomation extends FragmentNFC {
         recyclerView.setLayoutManager(new LinearLayoutManager(context));
-        List<Consomation> consomationList = new ArrayList<>();
-        Consomation c1 = new Consomation();
+        List<Consommation> consommationList = new ArrayList<>();
+        Consommation c1 = new Consommation();
         c1.setIdConsomation(1);
         c1.setNomConsomation("Hello");
         c1.setPrix(12.5);
-        consomationList.add(c1);
+        consommationList.add(c1);
         for (int i = 0; i< 100; ++i){
-            c1 = new Consomation();
+            c1 = new Consommation();
             c1.setIdConsomation(i);
             c1.setNomConsomation("World");
             c1.setPrix(42.407);
-            consomationList.add(c1);
+            consommationList.add(c1);
         }
-        recyclerView.setAdapter(new ConsomationRecyclerViewAdapter(consomationList,  mListener));
+        recyclerView.setAdapter(new ConsommationRecyclerViewAdapter(consommationList,  mListener));
         FloatingActionButton fAB = (FloatingActionButton) view.findViewById(R.id.consomation_add);
         fAB.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                CreateConsomation newFragment = new CreateConsomation();
-                newFragment.show(getFragmentManager(), "CreateConsomation");
+                CreateConsommation newFragment = new CreateConsommation();
+                newFragment.show(getFragmentManager(), "CreateConsommation");
             }
         });
@@ -101,6 +110,13 @@ public class FragmentConsomation extends FragmentNFC {
     @Override
     public void processNFC() {
+        PaiementConsommation paiementConsommation = (PaiementConsommation) getFragmentManager().findFragmentByTag("paiementConsommation");
+        if (paiementConsommation == null){
+            Toast.makeText(getContext(), R.string.payment_consomation_alert_no_selection, Toast.LENGTH_LONG).show();
+        }
+        else {
+            paiementConsommation.processNFC();
+        }
     }
     /**
@@ -114,6 +130,6 @@ public class FragmentConsomation extends FragmentNFC {
      * >Communicating with Other Fragments</a> for more information.
      */
     public interface OnListFragmentInteractionListener {
-        void onListFragmentInteraction(Consomation item);
+        void onListFragmentInteraction(Consommation item);
     }
 }
@@ -0,0 +1,113 @@
+package net.plil.clubinfo.etunicorn.app.consommation;
+
+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.utils.VolleyUtils;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Locale;
+
+
+public class PaiementConsommation extends DialogFragment {
+
+    ProgressBar mProgressBar;
+    TextView mPaiementConsommationName;
+    TextView mPaiementConsommationPrice;
+    int consommationId;
+
+    public PaiementConsommation(){}
+
+    /**
+     * Create a new instance of MyDialogFragment, providing "num"
+     * as an argument.
+     */
+    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);
+
+        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_consomation, null);
+        mProgressBar = (ProgressBar) view.findViewById(R.id.paiment_consommation_progress_bar);
+        mPaiementConsommationName = (TextView) view.findViewById(R.id.paiment_consommation_name);
+        mPaiementConsommationPrice = (TextView) view.findViewById(R.id.paiment_consommation_price);
+
+
+        Consommation consommation = (Consommation) getArguments().getSerializable("consommation");
+        mPaiementConsommationName.setText(consommation.getNomConsomation());
+        mPaiementConsommationPrice.setText(String.format(Locale.FRANCE, "%.2f €", consommation.getPrix()));
+
+        consommationId = consommation.getIdConsomation();
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder
+                .setTitle(R.string.payment_consumable)
+                .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", consommationId);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.POST, VolleyUtils.baseUri + "/transaction/consommation", 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);
+    }
+}
 package net.plil.clubinfo.etunicorn.data;
+import java.io.Serializable;
+
 /**
  * Created by badetitou on 29/01/2017.
  */
-public class Consomation {
+public class Consommation implements Serializable{
+
     private int idConsomation;
     private String nomConsomation;
     private double prix;
-    public Consomation() {
+    public Consommation() {
     }
     public int getIdConsomation() {
@@ -14,7 +14,7 @@
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
         app:layoutManager="LinearLayoutManager"
-        tools:context="net.plil.clubinfo.etunicorn.app.consomation.FragmentConsomation"
+        tools:context="net.plil.clubinfo.etunicorn.app.consommation.FragmentConsommation"
         tools:listitem="@layout/fragment_consomation_item"
         />
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="net.plil.clubinfo.etunicorn.app.consomation.CreateConsomation"
+    tools:context="net.plil.clubinfo.etunicorn.app.consommation.CreateConsommation"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -11,12 +11,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/create_consomation_name"
-        android:hint="@string/create_consomation_name"/>
+        android:hint="@string/create_consumable_name"/>
     <EditText
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:hint="@string/create_consomation_price"
+        android:hint="@string/create_consumable_price"
         android:id="@+id/create_consomation_price"
         android:inputType="numberSigned|numberDecimal"
         android:maxLines="1" />
@@ -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_consommation_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_consommation_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_consommation_progress_bar"
+        android:visibility="gone"/>
+
+</LinearLayout>
@@ -9,10 +9,11 @@
     <string name="prompt_username">Nom d\'utilisateur</string>
     <string name="action_settings">Paramètres</string>
     <string name="cancel">Annuler</string>
-    <string name="create_consomation">Créer une consomation</string>
-    <string name="create_consomation_name">Nom</string>
-    <string name="create_consomation_price">Prix</string>
+    <string name="create_consumable">Créer une consommation</string>
+    <string name="create_consumable_name">Nom</string>
+    <string name="create_consumable_price">Prix</string>
     <string name="enter_money">Entrer une valeur</string>
     <string name="valid">OK</string>
     <string name="title_activity_main">Etunicorn - Bonjour</string>
+    <string name="payment_consumable">Paiement d\'un Consommable</string>
 </resources>
 \ No newline at end of file
@@ -13,8 +13,12 @@
     <string name="enter_money">Enter value</string>
     <string name="valid">OK</string>
     <string name="cancel">Cancel</string>
-    <string name="create_consomation">Create Consomation</string>
-    <string name="create_consomation_name">Name</string>
-    <string name="create_consomation_price">Price</string>
+    <string name="create_consumable">Create Consumable</string>
+    <string name="create_consumable_name">Name</string>
+    <string name="create_consumable_price">Price</string>
     <string name="title_activity_main">Etunicorn - Hello</string>
+    <string name="payment_consumable">Consumable Payment</string>
+    <string name="payment_consomation_alert_no_selection">Select a product before paying</string>
+    <string name="payment_done">Payment done</string>
+    <string name="payment_refused">Payment refused</string>
 </resources>