NFCSupport Update

badetitou
1 parent 97f92a02
Showing 13 changed files with 53 additions and 30 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/PaiementEvent.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/MainActivity.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/FragmentNFC.java -> app/src/main/java/net/plil/clubinfo/etunicorn/app/NFCSupport.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/app/credit/Crediter.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/debit/Debiter.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/CreatePersonne.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/res/values/strings.xml
@@ -3,6 +3,7 @@ package net.plil.clubinfo.etunicorn.app.event;
 import android.content.Context;
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
+import android.support.v4.app.Fragment;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -11,7 +12,7 @@ import android.view.ViewGroup;
 import android.widget.Toast;
 import net.plil.clubinfo.etunicorn.R;
-import net.plil.clubinfo.etunicorn.app.FragmentNFC;
+import net.plil.clubinfo.etunicorn.app.NFCSupport;
 import net.plil.clubinfo.etunicorn.data.Event;
 import java.sql.Date;
@@ -25,7 +26,7 @@ import java.util.List;
  * Activities containing this fragment MUST implement the {@link OnListFragmentInteractionListener}
  * interface.
  */
-public class EventFragment extends FragmentNFC {
+public class EventFragment extends Fragment implements NFCSupport {
     private OnListFragmentInteractionListener mListener;
@@ -17,6 +17,7 @@ import com.android.volley.VolleyError;
 import com.android.volley.toolbox.JsonObjectRequest;
 import net.plil.clubinfo.etunicorn.R;
+import net.plil.clubinfo.etunicorn.app.NFCSupport;
 import net.plil.clubinfo.etunicorn.data.Event;
 import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
@@ -26,7 +27,7 @@ import org.json.JSONObject;
 import java.util.Locale;
-public class PaiementEvent extends DialogFragment {
+public class PaiementEvent extends DialogFragment implements NFCSupport {
     ProgressBar mProgressBar;
     TextView mPaiementEventName;
@@ -145,7 +145,7 @@ public class MainActivity extends AppCompatActivity
         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());
+            NFCSupport fNFC = (NFCSupport) getSupportFragmentManager().getFragments().get(mViewPager.getCurrentItem());
             fNFC.processNFC(ConvertBytesToString.bytesToHexString(myTag.getId()));
         }
     }
 package net.plil.clubinfo.etunicorn.app;
-import android.support.v4.app.Fragment;
-import android.view.View;
-
 /**
- * Created by badetitou on 28/01/2017.
+ * Created by badetitou on 05/02/2017.
  */
-public abstract class FragmentNFC extends Fragment {
-    public abstract void processNFC(String idCardUser);
+public interface NFCSupport {
+
+    void processNFC(String idCard);
 }
@@ -3,6 +3,7 @@ package net.plil.clubinfo.etunicorn.app.consommation;
 import android.content.Context;
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
+import android.support.v4.app.Fragment;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -11,7 +12,7 @@ import android.view.ViewGroup;
 import android.widget.Toast;
 import net.plil.clubinfo.etunicorn.R;
-import net.plil.clubinfo.etunicorn.app.FragmentNFC;
+import net.plil.clubinfo.etunicorn.app.NFCSupport;
 import net.plil.clubinfo.etunicorn.data.Consommation;
 import java.util.ArrayList;
@@ -23,7 +24,7 @@ import java.util.List;
  * Activities containing this fragment MUST implement the {@link OnListFragmentInteractionListener}
  * interface.
  */
-public class FragmentConsommation extends FragmentNFC {
+public class FragmentConsommation extends Fragment implements NFCSupport {
     private OnListFragmentInteractionListener mListener;
@@ -18,6 +18,7 @@ import com.android.volley.VolleyError;
 import com.android.volley.toolbox.JsonObjectRequest;
 import net.plil.clubinfo.etunicorn.R;
+import net.plil.clubinfo.etunicorn.app.NFCSupport;
 import net.plil.clubinfo.etunicorn.app.event.PaiementEvent;
 import net.plil.clubinfo.etunicorn.data.Consommation;
 import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
@@ -28,7 +29,7 @@ import org.json.JSONObject;
 import java.util.Locale;
-public class PaiementConsommation extends DialogFragment {
+public class PaiementConsommation extends DialogFragment implements NFCSupport {
     ProgressBar mProgressBar;
     TextView mPaiementConsommationName;
@@ -84,7 +85,7 @@ public class PaiementConsommation extends DialogFragment {
     public void processNFC(String idCardUser) {
-        Toast.makeText(getContext(), "Hello " + idCardUser, Toast.LENGTH_LONG).show();
+        Toast.makeText(getContext(), idCardUser, Toast.LENGTH_LONG).show();
         mProgressBar.setVisibility(View.VISIBLE);
         JSONObject jsonObject = new JSONObject();
         try {
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.os.Bundle;
 import android.support.design.widget.CoordinatorLayout;
 import android.support.design.widget.Snackbar;
+import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -16,14 +17,14 @@ 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.app.NFCSupport;
 import net.plil.clubinfo.etunicorn.data.Personne;
 import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
-public class Crediter extends FragmentNFC {
+public class Crediter extends Fragment implements NFCSupport{
     private EditText mMoneyEditText;
     private ProgressBar mProgressBar;
@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.support.design.widget.CoordinatorLayout;
 import android.support.design.widget.Snackbar;
 import android.support.design.widget.TextInputEditText;
+import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -16,14 +17,14 @@ 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.app.NFCSupport;
 import net.plil.clubinfo.etunicorn.data.Personne;
 import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
-public class Debiter extends FragmentNFC {
+public class Debiter extends Fragment implements NFCSupport {
     private TextInputEditText mMoneyEditText;
@@ -24,9 +24,9 @@ import com.android.volley.Response;
 import com.android.volley.VolleyError;
 import com.android.volley.toolbox.JsonArrayRequest;
 import com.android.volley.toolbox.JsonObjectRequest;
-import com.google.gson.Gson;
 import net.plil.clubinfo.etunicorn.R;
+import net.plil.clubinfo.etunicorn.app.NFCSupport;
 import net.plil.clubinfo.etunicorn.app.MainActivity;
 import net.plil.clubinfo.etunicorn.data.Role;
 import net.plil.clubinfo.etunicorn.utils.ConvertBytesToString;
@@ -46,7 +46,7 @@ import java.util.Locale;
 import java.util.Map;
-public class CreatePersonne extends DialogFragment {
+public class CreatePersonne extends DialogFragment implements NFCSupport {
     Calendar myCalendar = Calendar.getInstance();
@@ -236,4 +236,9 @@ public class CreatePersonne extends DialogFragment {
         dismissAllowingStateLoss();
         super.onStop();
     }
+
+    @Override
+    public void processNFC(String idCard) {
+        mCarte.setText(idCard);
+    }
 }
@@ -24,12 +24,9 @@ import com.android.volley.Response;
 import com.android.volley.VolleyError;
 import com.android.volley.toolbox.JsonArrayRequest;
 import com.android.volley.toolbox.JsonObjectRequest;
-import com.google.gson.Gson;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
 import net.plil.clubinfo.etunicorn.R;
+import net.plil.clubinfo.etunicorn.app.NFCSupport;
 import net.plil.clubinfo.etunicorn.app.MainActivity;
 import net.plil.clubinfo.etunicorn.data.Personne;
 import net.plil.clubinfo.etunicorn.data.Role;
@@ -50,7 +47,7 @@ import java.util.Locale;
 import java.util.Map;
-public class ModifyPersonne extends DialogFragment {
+public class ModifyPersonne extends DialogFragment implements NFCSupport {
     Calendar myCalendar = Calendar.getInstance();
@@ -271,4 +268,10 @@ public class ModifyPersonne extends DialogFragment {
         jsonArrayRequest.setTag(ModifyPersonne.class);
         VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonArrayRequest);
     }
+
+
+    @Override
+    public void processNFC(String idCard) {
+        mCarte.setText(idCard);
+    }
 }
@@ -74,11 +74,11 @@ public class MyPersonneRecyclerViewAdapter extends RecyclerView.Adapter&lt;MyPerson
                         switch (item.getItemId()) {
                             case R.id.delete:
                                 DeletePersonne deletePersonne = DeletePersonne.newInstance(holder.mItem);
-                                deletePersonne.show(((AppCompatActivity) context).getSupportFragmentManager(), "deleteConsommation");
+                                deletePersonne.show(((AppCompatActivity) context).getSupportFragmentManager(), context.getString(R.string.tag_delete_personne));
                                 break;
                             case R.id.modify:
                                 ModifyPersonne modifyPersonne = ModifyPersonne.newInstance(holder.mItem);
-                                modifyPersonne.show(((AppCompatActivity) context).getSupportFragmentManager(), "modifyConsommation");
+                                modifyPersonne.show(((AppCompatActivity) context).getSupportFragmentManager(), context.getString(R.string.tag_modify_personne));
                                 break;
                         }
                         return false;
@@ -3,6 +3,7 @@ package net.plil.clubinfo.etunicorn.app.personne;
 import android.content.Context;
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
+import android.support.v4.app.Fragment;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -17,7 +18,7 @@ import com.android.volley.VolleyError;
 import com.android.volley.toolbox.JsonArrayRequest;
 import net.plil.clubinfo.etunicorn.R;
-import net.plil.clubinfo.etunicorn.app.FragmentNFC;
+import net.plil.clubinfo.etunicorn.app.NFCSupport;
 import net.plil.clubinfo.etunicorn.app.MainActivity;
 import net.plil.clubinfo.etunicorn.data.Personne;
 import net.plil.clubinfo.etunicorn.utils.ConvertBytesToString;
@@ -37,7 +38,7 @@ import java.util.Map;
  * Activities containing this fragment MUST implement the {@link OnListFragmentInteractionListener}
  * interface.
  */
-public class PersonneFragment extends FragmentNFC {
+public class PersonneFragment extends Fragment implements NFCSupport {
     private OnListFragmentInteractionListener mListener;
     private ArrayList<Personne> personnes = new ArrayList<>();
@@ -76,7 +77,7 @@ public class PersonneFragment extends FragmentNFC {
             @Override
             public void onClick(View v) {
                 CreatePersonne newFragment = new CreatePersonne();
-                newFragment.show(getFragmentManager(), "CreateEvent");
+                newFragment.show(getFragmentManager(), getString(R.string.tag_create_personne));
             }
         });
@@ -136,6 +137,13 @@ public class PersonneFragment extends FragmentNFC {
     @Override
     public void processNFC(String idCardUser) {
+        CreatePersonne createPersonne = (CreatePersonne) getFragmentManager().findFragmentByTag(getString(R.string.tag_create_personne));
+        if (createPersonne != null){
+            createPersonne.processNFC(idCardUser);
+        }
+        else {
+            ModifyPersonne modifyPersonne = (ModifyPersonne) getFragmentManager().findFragmentByTag(getString(R.string.tag_modify_personne));
+        }
     }
@@ -59,4 +59,7 @@
     <string name="modify_personne_hint_date">Birthday</string>
     <string name="error_create_personne_login">Need a login or a carte ID</string>
     <string name="error_create_personne_login_carte">Need a login or a carte ID</string>
+    <string name="tag_create_personne">createPersonne</string>
+    <string name="tag_modify_personne">modifyPersonne</string>
+    <string name="tag_delete_personne">deletePersonne</string>
 </resources>