diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/EventFragment.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/EventFragment.java index 05724b6..cf33065 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/EventFragment.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/EventFragment.java @@ -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; diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/PaiementEvent.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/PaiementEvent.java index 26fbfdd..bd96bb9 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/PaiementEvent.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/PaiementEvent.java @@ -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; diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/FragmentNFC.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/FragmentNFC.java deleted file mode 100644 index 0cd3508..0000000 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/FragmentNFC.java +++ /dev/null @@ -1,12 +0,0 @@ -package net.plil.clubinfo.etunicorn.app; - -import android.support.v4.app.Fragment; -import android.view.View; - -/** - * Created by badetitou on 28/01/2017. - */ - -public abstract class FragmentNFC extends Fragment { - public abstract void processNFC(String idCardUser); -} diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/MainActivity.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/MainActivity.java index 8c5d20d..a6e692f 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/MainActivity.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/MainActivity.java @@ -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())); } } diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/NFCSupport.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/NFCSupport.java new file mode 100644 index 0000000..fc67748 --- /dev/null +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/NFCSupport.java @@ -0,0 +1,10 @@ +package net.plil.clubinfo.etunicorn.app; + +/** + * Created by badetitou on 05/02/2017. + */ + +public interface NFCSupport { + + void processNFC(String idCard); +} diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/FragmentConsommation.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/FragmentConsommation.java index 631dfe7..aa70253 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/FragmentConsommation.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/FragmentConsommation.java @@ -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; diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/PaiementConsommation.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/PaiementConsommation.java index 936a58d..387e005 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/PaiementConsommation.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/PaiementConsommation.java @@ -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 { diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/credit/Crediter.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/credit/Crediter.java index 6a0d071..23f13e8 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/credit/Crediter.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/credit/Crediter.java @@ -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; diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/debit/Debiter.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/debit/Debiter.java index 92e28f1..1506d62 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/debit/Debiter.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/debit/Debiter.java @@ -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; diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/CreatePersonne.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/CreatePersonne.java index c0aa37d..d3ee477 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/CreatePersonne.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/CreatePersonne.java @@ -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); + } } diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/ModifyPersonne.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/ModifyPersonne.java index 5ad005a..03caca2 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/ModifyPersonne.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/ModifyPersonne.java @@ -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); + } } diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/MyPersonneRecyclerViewAdapter.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/MyPersonneRecyclerViewAdapter.java index 8821869..6cfd875 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/MyPersonneRecyclerViewAdapter.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/MyPersonneRecyclerViewAdapter.java @@ -74,11 +74,11 @@ public class MyPersonneRecyclerViewAdapter extends RecyclerView.Adapter 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)); + } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 04cf615..6f08c1c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -59,4 +59,7 @@ Birthday Need a login or a carte ID Need a login or a carte ID + createPersonne + modifyPersonne + deletePersonne -- libgit2 0.21.2