Cleaning code

badetitou
1 parent 515eb393
Showing 10 changed files with 50 additions and 79 deletions Show diff stats
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/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/personne/CreatePersonne.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/MyPersonneRecyclerViewAdapter.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/PersonOverviewFragment.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/PersonneFragment.java
app/src/main/res/layout/fragment_personne_list.xml
@@ -116,6 +116,5 @@ public class EventFragment extends Fragment implements NFCSupport {
      */
     public interface OnListFragmentInteractionListener {
         void onListFragmentInteraction(Event item);
-        void onListFragmentInteractionLong(Event item);
     }
 }
@@ -52,14 +52,6 @@ public class MyEventRecyclerViewAdapter extends RecyclerView.Adapter&lt;MyEventRecy
             }
         });
-        holder.mView.setOnLongClickListener(new View.OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View v) {
-                mListener.onListFragmentInteractionLong(holder.mItem);
-                return true;
-            }
-        });
-
         holder.mButtonView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -36,8 +36,7 @@ import net.plil.clubinfo.etunicorn.utils.ConvertBytesToString;
 public class MainActivity extends AppCompatActivity
         implements FragmentConsommation.OnListFragmentInteractionListener,
         EventFragment.OnListFragmentInteractionListener,
-        PersonneFragment.OnListFragmentInteractionListener,
-        PersonOverviewFragment.OnFragmentInteractionListener
+        PersonneFragment.OnListFragmentInteractionListener
 {
     /**
@@ -172,38 +171,18 @@ public class MainActivity extends AppCompatActivity
     }
     @Override
-    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) {
-
-    }
-
-    @Override
     public void onListFragmentInteraction(Personne personne) {
         PersonOverviewFragment personOverviewFragment = PersonOverviewFragment.newInstance(personne);
         personOverviewFragment.show(getSupportFragmentManager(), "overviewPersonne");
     }
-    @Override
-    public void onListFragmentInteractionLong(Personne personne) {
-
-    }
-
-    @Override
-    public void onFragmentInteraction(Uri uri) {
-
-    }
-
     /**
      * A {@link FragmentPagerAdapter} that returns a fragment corresponding to
      * one of the sections/tabs/pages.
@@ -55,14 +55,6 @@ public class ConsommationRecyclerViewAdapter extends RecyclerView.Adapter&lt;Consom
             }
         });
-        holder.mView.setOnLongClickListener(new View.OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View v) {
-                mListener.onListFragmentInteractionLong(holder.mItem);
-                return true;
-            }
-        });
-
         holder.mButtonMenu.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -122,6 +122,5 @@ public class FragmentConsommation extends Fragment implements NFCSupport {
      */
     public interface OnListFragmentInteractionListener {
         void onListFragmentInteraction(Consommation item);
-        void onListFragmentInteractionLong(Consommation item);
     }
 }
@@ -48,6 +48,7 @@ import java.util.Map;
 public class CreatePersonne extends DialogFragment implements NFCSupport {
+    private DialogInterface.OnDismissListener onDismissListener;
     Calendar myCalendar = Calendar.getInstance();
@@ -124,8 +125,10 @@ public class CreatePersonne extends DialogFragment implements NFCSupport {
                             mRole.setVisibility(View.GONE);
                             JSONObject jsonObject = new JSONObject();
                             try {
-                                jsonObject.put("login", mLogin.getText().toString());
-                                jsonObject.put("carte", mCarte.getText().toString());
+                                if (!mLogin.getText().toString().isEmpty())
+                                    jsonObject.put("login", mLogin.getText().toString());
+                                if(!mCarte.getText().toString().isEmpty())
+                                    jsonObject.put("carte", mCarte.getText().toString());
                                 jsonObject.put("role", JsonConverter.convertToJSONObject(mRole.getSelectedItem()));
                                 if (!mNaissance.getSelectedItem().equals(getString(R.string.create_personne_naissance)))
                                     jsonObject.put("naissance", mNaissance.getSelectedItem());
@@ -136,7 +139,6 @@ public class CreatePersonne extends DialogFragment implements NFCSupport {
                                 @Override
                                 public void onResponse(JSONObject response) {
                                     mProgressBar.setVisibility(View.GONE);
-                                    Toast.makeText(getContext(), response.toString(), Toast.LENGTH_LONG).show();
                                     dismiss();
                                 }
                             }, new Response.ErrorListener() {
@@ -241,4 +243,17 @@ public class CreatePersonne 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);
+        }
+    }
 }
@@ -53,14 +53,6 @@ public class MyPersonneRecyclerViewAdapter extends RecyclerView.Adapter&lt;MyPerson
             }
         });
-        holder.mView.setOnLongClickListener(new View.OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View v) {
-                mListener.onListFragmentInteractionLong(holder.mItem);
-                return true;
-            }
-        });
-
         holder.mButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -26,8 +26,6 @@ import java.util.Locale;
  */
 public class PersonOverviewFragment extends DialogFragment{
-    private OnFragmentInteractionListener mListener;
-
     TextView mCarte;
     TextView mNaissance;
     TextView mSolde;
@@ -80,27 +78,4 @@ public class PersonOverviewFragment extends DialogFragment{
         return inflater.inflate(R.layout.fragment_person_overview, container, false);
     }
-
-    @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;
-    }
-
-
-    public interface OnFragmentInteractionListener {
-        // TODO: Update argument type and name
-        void onFragmentInteraction(Uri uri);
-    }
 }
 package net.plil.clubinfo.etunicorn.app.personne;
 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;
@@ -43,6 +45,7 @@ public class PersonneFragment extends Fragment implements NFCSupport {
     private OnListFragmentInteractionListener mListener;
     private ArrayList<Personne> personnes = new ArrayList<>();
     private RecyclerView.Adapter mAdapter;
+    private SwipeRefreshLayout mSwipeRefreshLayout;
     /**
      * Mandatory empty constructor for the fragment manager to instantiate the
@@ -77,10 +80,24 @@ public class PersonneFragment extends Fragment implements NFCSupport {
             @Override
             public void onClick(View v) {
                 CreatePersonne newFragment = new CreatePersonne();
+                newFragment.setOnDismissListener(new DialogInterface.OnDismissListener() {
+                    @Override
+                    public void onDismiss(DialogInterface dialog) {
+                        setPersonnes();
+                    }
+                });
                 newFragment.show(getFragmentManager(), getString(R.string.tag_create_personne));
             }
         });
+        mSwipeRefreshLayout = (SwipeRefreshLayout) view.findViewById(R.id.personne_swipeRefresh);
+        mSwipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                setPersonnes();
+            }
+        });
+
         return view;
     }
@@ -112,6 +129,7 @@ public class PersonneFragment extends Fragment implements NFCSupport {
                         personnes.add(JsonConverter.getConverter().fromJson(String.valueOf(response.getJSONObject(i)), Personne.class));
                     }
                     mAdapter.notifyDataSetChanged();
+                    mSwipeRefreshLayout.setRefreshing(false);
                 } catch (JSONException e) {
                     e.printStackTrace();
                 }
@@ -120,7 +138,10 @@ public class PersonneFragment extends Fragment implements NFCSupport {
         }, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError error) {
-                Toast.makeText(getContext(), ConvertBytesToString.bytesToStringVolLey(error.networkResponse.data), Toast.LENGTH_LONG).show();
+                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();
             }
         }
         ) {
@@ -158,8 +179,6 @@ public class PersonneFragment extends Fragment implements NFCSupport {
      * >Communicating with Other Fragments</a> for more information.
      */
     public interface OnListFragmentInteractionListener {
-        // TODO: Update argument type and name
         void onListFragmentInteraction(Personne personne);
-        void onListFragmentInteractionLong(Personne personne);
     }
 }
@@ -5,6 +5,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
+    <android.support.v4.widget.SwipeRefreshLayout
+        android:id="@+id/personne_swipeRefresh"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+
     <android.support.v7.widget.RecyclerView
         android:id="@+id/personne_list"
         android:name="net.plil.clubinfo.etunicorn.app.personne.PersonneFragment"
@@ -15,7 +21,10 @@
         app:layoutManager="LinearLayoutManager"
         tools:context="net.plil.clubinfo.etunicorn.app.personne.PersonneFragment"
         tools:listitem="@layout/fragment_personne"
+        android:scrollbars="vertical"
         />
+    </android.support.v4.widget.SwipeRefreshLayout>
+
     <android.support.design.widget.FloatingActionButton
         android:layout_width="wrap_content"