Modify Consommation

badetitou
1 parent 0730f2b3
Showing 15 changed files with 222 additions and 98 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/MainActivity.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/ConsommationRecyclerViewAdapter.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/DeleteConsommation.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/FragmentConsommation.java
app/src/main/res/drawable/selected_row.xml
app/src/main/res/layout/activity_main.xml
app/src/main/res/layout/fragment_consomation_item.xml
app/src/main/res/layout/fragment_delete_consomation.xml
app/src/main/res/menu/menu_main.xml
app/src/main/res/menu/option_list.xml
app/src/main/res/values-fr/strings.xml
app/src/main/res/values/colors.xml
app/src/main/res/values/strings.xml
@@ -22,19 +22,8 @@ import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
-/**
- * A simple {@link Fragment} subclass.
- * Activities that contain this fragment must implement the
- * {@link Crediter.OnFragmentInteractionListener} interface
- * to handle interaction events.
- * Use the {@link Crediter#newInstance} factory method to
- * create an instance of this fragment.
- */
 public class Crediter extends FragmentNFC {
-
-    private OnFragmentInteractionListener mListener;
-
     private EditText mMoneyEditText;
     private ProgressBar mProgressBar;
@@ -66,18 +55,11 @@ public class Crediter extends FragmentNFC {
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        if (context instanceof OnFragmentInteractionListener) {
-            mListener = (OnFragmentInteractionListener) context;
-        } else {
-            throw new RuntimeException(context.toString()
-                    + " must implement OnFragmentInteractionListener");
-        }
     }
     @Override
     public void onDetach() {
         super.onDetach();
-        mListener = null;
     }
     @Override
@@ -106,19 +88,4 @@ public class Crediter extends FragmentNFC {
         VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest);
     }
-
-
-    /**
-     * 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 OnFragmentInteractionListener {
-        void onFragmentInteraction(Uri uri);
-    }
 }
@@ -27,21 +27,12 @@ import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
-/**
- * A simple {@link Fragment} subclass.
- * Activities that contain this fragment must implement the
- * {@link Debiter.OnFragmentInteractionListener} interface
- * to handle interaction events.
- * Use the {@link Debiter#newInstance} factory method to
- * create an instance of this fragment.
- */
 public class Debiter extends FragmentNFC {
     private EditText mMoneyEditText;
     private ProgressBar mProgressBar;
-    private OnFragmentInteractionListener mListener;
     public Debiter() {
         // Required empty public constructor
@@ -71,18 +62,11 @@ public class Debiter extends FragmentNFC {
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        if (context instanceof OnFragmentInteractionListener) {
-            mListener = (OnFragmentInteractionListener) context;
-        } else {
-            throw new RuntimeException(context.toString()
-                    + " must implement OnFragmentInteractionListener");
-        }
     }
     @Override
     public void onDetach() {
         super.onDetach();
-        mListener = null;
     }
     @Override
@@ -111,19 +95,4 @@ public class Debiter extends FragmentNFC {
         VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest);
     }
-
-    /**
-     * 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 OnFragmentInteractionListener {
-        // TODO: Update argument type and name
-        void onFragmentInteraction(Uri uri);
-    }
 }
@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.nfc.NfcAdapter;
 import android.os.Bundle;
+import android.support.design.widget.AppBarLayout;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
@@ -14,14 +15,19 @@ 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 net.plil.clubinfo.etunicorn.R;
 import net.plil.clubinfo.etunicorn.app.consommation.FragmentConsommation;
 import net.plil.clubinfo.etunicorn.app.consommation.PaiementConsommation;
 import net.plil.clubinfo.etunicorn.data.Consommation;
+import java.util.ArrayList;
+import java.util.List;
-public class MainActivity extends AppCompatActivity implements Crediter.OnFragmentInteractionListener, Debiter.OnFragmentInteractionListener, FragmentConsommation.OnListFragmentInteractionListener{
+
+public class MainActivity extends AppCompatActivity implements FragmentConsommation.OnListFragmentInteractionListener{
     /**
      * The {@link android.support.v4.view.PagerAdapter} that will provide
@@ -37,7 +43,10 @@ public class MainActivity extends AppCompatActivity implements Crediter.OnFragme
      * The {@link ViewPager} that will host the section contents.
      */
     private ViewPager mViewPager;
+    private Toolbar toolbar;
+    private AppBarLayout appBarLayout;
+    private List<Consommation> consommationsToModify = new ArrayList<>();
     NfcAdapter mAdapter;
     PendingIntent mPendingIntent;
@@ -47,8 +56,11 @@ public class MainActivity extends AppCompatActivity implements Crediter.OnFragme
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        appBarLayout = (AppBarLayout) findViewById(R.id.appbar);
+
+        toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
+
         // Create the adapter that will return a fragment for each of the three
         // primary sections of the activity.
         mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
@@ -116,11 +128,6 @@ public class MainActivity extends AppCompatActivity implements Crediter.OnFragme
         }
     }
-    @Override
-    public void onFragmentInteraction(Uri uri) {
-
-    }
-
     @Override
     public void onListFragmentInteraction(Consommation item) {
@@ -128,6 +135,11 @@ public class MainActivity extends AppCompatActivity implements Crediter.OnFragme
         paiementConsommation.show(getSupportFragmentManager(), "paiementConsommation");
     }
+    @Override
+    public void onListFragmentInteractionLong(Consommation item) {
+
+    }
+
     /**
      * A {@link FragmentPagerAdapter} that returns a fragment corresponding to
      * one of the sections/tabs/pages.
 package net.plil.clubinfo.etunicorn.app.consommation;
+import android.app.Activity;
+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.ContextMenu;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
@@ -17,10 +23,12 @@ public class ConsommationRecyclerViewAdapter extends RecyclerView.Adapter&lt;Consom
     private final List<Consommation> mValues;
     private final FragmentConsommation.OnListFragmentInteractionListener mListener;
+    private final Context context;
-    public ConsommationRecyclerViewAdapter(List<Consommation> items, FragmentConsommation.OnListFragmentInteractionListener listener) {
+    public ConsommationRecyclerViewAdapter(List<Consommation> items, FragmentConsommation.OnListFragmentInteractionListener listener, Context context) {
         mValues = items;
         mListener = listener;
+        this.context = context;
     }
     @Override
@@ -50,10 +58,37 @@ public class ConsommationRecyclerViewAdapter extends RecyclerView.Adapter&lt;Consom
         holder.mView.setOnLongClickListener(new View.OnLongClickListener() {
             @Override
             public boolean onLongClick(View v) {
-                holder.mView.setSelected(!holder.mView.isSelected());
+                mListener.onListFragmentInteractionLong(holder.mItem);
                 return true;
             }
         });
+
+        holder.mButtonMenu.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                final PopupMenu popup = new PopupMenu(v.getContext(), holder.mButtonMenu);
+                //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:
+                                DeleteConsommation paiementConsommation = DeleteConsommation.newInstance(holder.mItem);
+                                paiementConsommation.show(((AppCompatActivity) context).getSupportFragmentManager(), "deleteConsommation");
+                                break;
+                            case R.id.modify:
+                                //handle menu2 click
+                                break;
+                        }
+                        return false;
+                    }
+                });
+                //displaying the popup
+                popup.show();
+            }
+        });
     }
     @Override
@@ -66,6 +101,7 @@ public class ConsommationRecyclerViewAdapter extends RecyclerView.Adapter&lt;Consom
         public final TextView mIdView;
         public final TextView mContentView;
         public final TextView mPriceView;
+        public final TextView mButtonMenu;
         public Consommation mItem;
         public ViewHolder(View view) {
@@ -74,6 +110,7 @@ public class ConsommationRecyclerViewAdapter extends RecyclerView.Adapter&lt;Consom
             mIdView = (TextView) view.findViewById(R.id.consomation_id);
             mContentView = (TextView) view.findViewById(R.id.consomation_name);
             mPriceView = (TextView) view.findViewById(R.id.consomation_price);
+            mButtonMenu = (TextView) view.findViewById(R.id.consomation_options);
         }
         @Override
@@ -0,0 +1,99 @@
+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 DeleteConsommation extends DialogFragment {
+
+    ProgressBar mProgressBar;
+
+    public DeleteConsommation(){}
+
+    /**
+     * Create a new instance of MyDialogFragment, providing "num"
+     * as an argument.
+     */
+    public static DeleteConsommation newInstance(Consommation consommation) {
+        DeleteConsommation f = new DeleteConsommation();
+
+        // 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_delete_consomation, null);
+
+        mProgressBar = (ProgressBar) view.findViewById(R.id.delete_consommation_progress_bar);
+        final Consommation consommation = (Consommation) getArguments().getSerializable("consommation");
+
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder
+                .setTitle(R.string.verif_delete_consomation)
+                .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 + "/consomation/" + consommation.getIdConsomation(), 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();
+    }
+
+
+}
@@ -10,18 +10,9 @@ 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.Consommation;
-import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
-
-import org.json.JSONException;
-import org.json.JSONObject;
 import java.util.ArrayList;
 import java.util.List;
@@ -75,7 +66,7 @@ public class FragmentConsommation extends FragmentNFC {
             c1.setPrix(42.407);
             consommationList.add(c1);
         }
-        recyclerView.setAdapter(new ConsommationRecyclerViewAdapter(consommationList,  mListener));
+        recyclerView.setAdapter(new ConsommationRecyclerViewAdapter(consommationList,  mListener, this.getActivity()));
         FloatingActionButton fAB = (FloatingActionButton) view.findViewById(R.id.consomation_add);
         fAB.setOnClickListener(new View.OnClickListener() {
@@ -112,7 +103,7 @@ public class FragmentConsommation extends FragmentNFC {
         PaiementConsommation paiementConsommation = (PaiementConsommation) getFragmentManager().findFragmentByTag("paiementConsommation");
         if (paiementConsommation == null){
-            Toast.makeText(getContext(), R.string.payment_consomation_alert_no_selection, Toast.LENGTH_LONG).show();
+            Toast.makeText(getContext(), R.string.payment_consumable_alert_no_selection, Toast.LENGTH_LONG).show();
         }
         else {
             paiementConsommation.processNFC();
@@ -131,5 +122,6 @@ public class FragmentConsommation extends FragmentNFC {
      */
     public interface OnListFragmentInteractionListener {
         void onListFragmentInteraction(Consommation item);
+        void onListFragmentInteractionLong(Consommation item);
     }
 }
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_selected="true">
-        <color android:color="#EEEEEE"/>
-    </item>
-    <item android:state_selected="false">
-        <color android:color="#FFFFFF"/>
-    </item>
-</selector>
 \ No newline at end of file
@@ -21,6 +21,7 @@
             android:background="?attr/colorPrimary"
             app:layout_scrollFlags="enterAlways"
             app:popupTheme="@style/AppTheme.PopupOverlay"
+            android:minHeight="?attr/actionBarSize"
             android:layout_height="64dp">
         </android.support.v7.widget.Toolbar>
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:foreground="?attr/selectableItemBackground"
-    android:background="@drawable/selected_row">
+    android:foreground="?attr/selectableItemBackground">
     <TextView
         android:id="@+id/consomation_id"
@@ -19,7 +19,8 @@
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/text_margin"
         android:textAppearance="?attr/textAppearanceListItem"
-        android:layout_toRightOf="@id/consomation_id"/>
+        android:layout_toRightOf="@id/consomation_id"
+        tools:ignore="RtlHardcoded" />
     <TextView
         android:id="@+id/consomation_price"
@@ -27,6 +28,20 @@
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/text_margin"
         android:textAppearance="?attr/textAppearanceListItem"
-        android:layout_alignParentRight="true"/>
+        android:layout_toRightOf="@id/consomation_name"
+        tools:ignore="RelativeOverlap,RtlHardcoded" />
+
+    <TextView
+        android:id="@+id/consomation_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,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_consommation_progress_bar"
+        android:visibility="gone"
+        android:layout_gravity="center" />
+    
+</LinearLayout>
@@ -2,6 +2,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="net.plil.clubinfo.etunicorn.app.MainActivity">
+
+
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:title="@string/modify"
+        android:id="@+id/modify"/>
+    <item android:title="@string/delete"
+        android:id="@+id/delete"/>
+</menu>
 \ No newline at end of file
@@ -16,4 +16,8 @@
     <string name="valid">OK</string>
     <string name="title_activity_main">Etunicorn - Bonjour</string>
     <string name="payment_consumable">Paiement d\'un Consommable</string>
+    <string name="payment_refused">Paiement accepté</string>
+    <string name="payment_done">Paiement refusé</string>
+    <string name="payment_consumable_alert_no_selection">Selectionné un produit avant de payer</string>
+    <string name="action_delete">Supprimer</string>
 </resources>
 \ No newline at end of file
@@ -3,6 +3,7 @@
     <color name="colorPrimary">#F44336</color>
     <color name="colorPrimaryDark">#C62828</color>
     <color name="colorAccent">#2196F3</color>
+    <color name="colorAccentDark">#1565C0</color>
     <color name="pressed_color">#4d90fe</color>
     <color name="default_color">#ffffff</color>
@@ -18,7 +18,16 @@
     <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_consumable_alert_no_selection">Select a product before paying</string>
     <string name="payment_done">Payment done</string>
     <string name="payment_refused">Payment refused</string>
+    <string name="action_delete">Delete</string>
+    <string name="modify">Modifier</string>
+    <string name="delete">Delete</string>
+
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="verif_delete_consomation">Are you sure ?</string>
+    <string name="delete_done">Delete done</string>
+    <string name="delete_refused">Delete refused</string>
 </resources>