LeClubInfo / etunicorn-android

Commit 515eb39370b7edfec7abc6bd2a2d4d7c5dcbb5e2

Authored by badetitou
1 parent 97f92a02

NFCSupport Update

Showing 13 changed files with 53 additions and 30 deletions   Show diff stats
Inline Side-by-side
app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/EventFragment.java
  Show/Hide comments   View file @515eb39
... ... @@ -3,6 +3,7 @@ package net.plil.clubinfo.etunicorn.app.event;
3 3 import android.content.Context;
4 4 import android.os.Bundle;
5 5 import android.support.design.widget.FloatingActionButton;
  6 +import android.support.v4.app.Fragment;
6 7 import android.support.v7.widget.LinearLayoutManager;
7 8 import android.support.v7.widget.RecyclerView;
8 9 import android.view.LayoutInflater;
... ... @@ -11,7 +12,7 @@ import android.view.ViewGroup;
11 12 import android.widget.Toast;
12 13  
13 14 import net.plil.clubinfo.etunicorn.R;
14   -import net.plil.clubinfo.etunicorn.app.FragmentNFC;
  15 +import net.plil.clubinfo.etunicorn.app.NFCSupport;
15 16 import net.plil.clubinfo.etunicorn.data.Event;
16 17  
17 18 import java.sql.Date;
... ... @@ -25,7 +26,7 @@ import java.util.List;
25 26 * Activities containing this fragment MUST implement the {@link OnListFragmentInteractionListener}
26 27 * interface.
27 28 */
28   -public class EventFragment extends FragmentNFC {
  29 +public class EventFragment extends Fragment implements NFCSupport {
29 30  
30 31 private OnListFragmentInteractionListener mListener;
31 32  
... ...
app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/PaiementEvent.java
  Show/Hide comments   View file @515eb39
... ... @@ -17,6 +17,7 @@ import com.android.volley.VolleyError;
17 17 import com.android.volley.toolbox.JsonObjectRequest;
18 18  
19 19 import net.plil.clubinfo.etunicorn.R;
  20 +import net.plil.clubinfo.etunicorn.app.NFCSupport;
20 21 import net.plil.clubinfo.etunicorn.data.Event;
21 22 import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
22 23  
... ... @@ -26,7 +27,7 @@ import org.json.JSONObject;
26 27 import java.util.Locale;
27 28  
28 29  
29   -public class PaiementEvent extends DialogFragment {
  30 +public class PaiementEvent extends DialogFragment implements NFCSupport {
30 31  
31 32 ProgressBar mProgressBar;
32 33 TextView mPaiementEventName;
... ...
app/src/main/java/net/plil/clubinfo/etunicorn/app/MainActivity.java
  Show/Hide comments   View file @515eb39
... ... @@ -145,7 +145,7 @@ public class MainActivity extends AppCompatActivity
145 145 super.onNewIntent(intent);
146 146 if (NfcAdapter.ACTION_TAG_DISCOVERED.equals(intent.getAction())) {
147 147 Tag myTag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
148   - FragmentNFC fNFC = (FragmentNFC) getSupportFragmentManager().getFragments().get(mViewPager.getCurrentItem());
  148 + NFCSupport fNFC = (NFCSupport) getSupportFragmentManager().getFragments().get(mViewPager.getCurrentItem());
149 149 fNFC.processNFC(ConvertBytesToString.bytesToHexString(myTag.getId()));
150 150 }
151 151 }
... ...
app/src/main/java/net/plil/clubinfo/etunicorn/app/FragmentNFC.java renamed to app/src/main/java/net/plil/clubinfo/etunicorn/app/NFCSupport.java
  Show/Hide comments   View file @515eb39
1 1 package net.plil.clubinfo.etunicorn.app;
2 2  
3   -import android.support.v4.app.Fragment;
4   -import android.view.View;
5   -
6 3 /**
7   - * Created by badetitou on 28/01/2017.
  4 + * Created by badetitou on 05/02/2017.
8 5 */
9 6  
10   -public abstract class FragmentNFC extends Fragment {
11   - public abstract void processNFC(String idCardUser);
  7 +public interface NFCSupport {
  8 +
  9 + void processNFC(String idCard);
12 10 }
... ...
app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/FragmentConsommation.java
  Show/Hide comments   View file @515eb39
... ... @@ -3,6 +3,7 @@ package net.plil.clubinfo.etunicorn.app.consommation;
3 3 import android.content.Context;
4 4 import android.os.Bundle;
5 5 import android.support.design.widget.FloatingActionButton;
  6 +import android.support.v4.app.Fragment;
6 7 import android.support.v7.widget.LinearLayoutManager;
7 8 import android.support.v7.widget.RecyclerView;
8 9 import android.view.LayoutInflater;
... ... @@ -11,7 +12,7 @@ import android.view.ViewGroup;
11 12 import android.widget.Toast;
12 13  
13 14 import net.plil.clubinfo.etunicorn.R;
14   -import net.plil.clubinfo.etunicorn.app.FragmentNFC;
  15 +import net.plil.clubinfo.etunicorn.app.NFCSupport;
15 16 import net.plil.clubinfo.etunicorn.data.Consommation;
16 17  
17 18 import java.util.ArrayList;
... ... @@ -23,7 +24,7 @@ import java.util.List;
23 24 * Activities containing this fragment MUST implement the {@link OnListFragmentInteractionListener}
24 25 * interface.
25 26 */
26   -public class FragmentConsommation extends FragmentNFC {
  27 +public class FragmentConsommation extends Fragment implements NFCSupport {
27 28  
28 29 private OnListFragmentInteractionListener mListener;
29 30  
... ...
app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/PaiementConsommation.java
  Show/Hide comments   View file @515eb39
... ... @@ -18,6 +18,7 @@ import com.android.volley.VolleyError;
18 18 import com.android.volley.toolbox.JsonObjectRequest;
19 19  
20 20 import net.plil.clubinfo.etunicorn.R;
  21 +import net.plil.clubinfo.etunicorn.app.NFCSupport;
21 22 import net.plil.clubinfo.etunicorn.app.event.PaiementEvent;
22 23 import net.plil.clubinfo.etunicorn.data.Consommation;
23 24 import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
... ... @@ -28,7 +29,7 @@ import org.json.JSONObject;
28 29 import java.util.Locale;
29 30  
30 31  
31   -public class PaiementConsommation extends DialogFragment {
  32 +public class PaiementConsommation extends DialogFragment implements NFCSupport {
32 33  
33 34 ProgressBar mProgressBar;
34 35 TextView mPaiementConsommationName;
... ... @@ -84,7 +85,7 @@ public class PaiementConsommation extends DialogFragment {
84 85  
85 86  
86 87 public void processNFC(String idCardUser) {
87   - Toast.makeText(getContext(), "Hello " + idCardUser, Toast.LENGTH_LONG).show();
  88 + Toast.makeText(getContext(), idCardUser, Toast.LENGTH_LONG).show();
88 89 mProgressBar.setVisibility(View.VISIBLE);
89 90 JSONObject jsonObject = new JSONObject();
90 91 try {
... ...
app/src/main/java/net/plil/clubinfo/etunicorn/app/credit/Crediter.java
  Show/Hide comments   View file @515eb39
... ... @@ -4,6 +4,7 @@ import android.content.Context;
4 4 import android.os.Bundle;
5 5 import android.support.design.widget.CoordinatorLayout;
6 6 import android.support.design.widget.Snackbar;
  7 +import android.support.v4.app.Fragment;
7 8 import android.view.LayoutInflater;
8 9 import android.view.View;
9 10 import android.view.ViewGroup;
... ... @@ -16,14 +17,14 @@ import com.android.volley.VolleyError;
16 17 import com.android.volley.toolbox.JsonObjectRequest;
17 18  
18 19 import net.plil.clubinfo.etunicorn.R;
19   -import net.plil.clubinfo.etunicorn.app.FragmentNFC;
  20 +import net.plil.clubinfo.etunicorn.app.NFCSupport;
20 21 import net.plil.clubinfo.etunicorn.data.Personne;
21 22 import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
22 23  
23 24 import org.json.JSONException;
24 25 import org.json.JSONObject;
25 26  
26   -public class Crediter extends FragmentNFC {
  27 +public class Crediter extends Fragment implements NFCSupport{
27 28  
28 29 private EditText mMoneyEditText;
29 30 private ProgressBar mProgressBar;
... ...
app/src/main/java/net/plil/clubinfo/etunicorn/app/debit/Debiter.java
  Show/Hide comments   View file @515eb39
... ... @@ -5,6 +5,7 @@ import android.os.Bundle;
5 5 import android.support.design.widget.CoordinatorLayout;
6 6 import android.support.design.widget.Snackbar;
7 7 import android.support.design.widget.TextInputEditText;
  8 +import android.support.v4.app.Fragment;
8 9 import android.view.LayoutInflater;
9 10 import android.view.View;
10 11 import android.view.ViewGroup;
... ... @@ -16,14 +17,14 @@ import com.android.volley.VolleyError;
16 17 import com.android.volley.toolbox.JsonObjectRequest;
17 18  
18 19 import net.plil.clubinfo.etunicorn.R;
19   -import net.plil.clubinfo.etunicorn.app.FragmentNFC;
  20 +import net.plil.clubinfo.etunicorn.app.NFCSupport;
20 21 import net.plil.clubinfo.etunicorn.data.Personne;
21 22 import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
22 23  
23 24 import org.json.JSONException;
24 25 import org.json.JSONObject;
25 26  
26   -public class Debiter extends FragmentNFC {
  27 +public class Debiter extends Fragment implements NFCSupport {
27 28  
28 29  
29 30 private TextInputEditText mMoneyEditText;
... ...
app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/CreatePersonne.java
  Show/Hide comments   View file @515eb39
... ... @@ -24,9 +24,9 @@ import com.android.volley.Response;
24 24 import com.android.volley.VolleyError;
25 25 import com.android.volley.toolbox.JsonArrayRequest;
26 26 import com.android.volley.toolbox.JsonObjectRequest;
27   -import com.google.gson.Gson;
28 27  
29 28 import net.plil.clubinfo.etunicorn.R;
  29 +import net.plil.clubinfo.etunicorn.app.NFCSupport;
30 30 import net.plil.clubinfo.etunicorn.app.MainActivity;
31 31 import net.plil.clubinfo.etunicorn.data.Role;
32 32 import net.plil.clubinfo.etunicorn.utils.ConvertBytesToString;
... ... @@ -46,7 +46,7 @@ import java.util.Locale;
46 46 import java.util.Map;
47 47  
48 48  
49   -public class CreatePersonne extends DialogFragment {
  49 +public class CreatePersonne extends DialogFragment implements NFCSupport {
50 50  
51 51  
52 52 Calendar myCalendar = Calendar.getInstance();
... ... @@ -236,4 +236,9 @@ public class CreatePersonne extends DialogFragment {
236 236 dismissAllowingStateLoss();
237 237 super.onStop();
238 238 }
  239 +
  240 + @Override
  241 + public void processNFC(String idCard) {
  242 + mCarte.setText(idCard);
  243 + }
239 244 }
... ...
app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/ModifyPersonne.java
  Show/Hide comments   View file @515eb39
... ... @@ -24,12 +24,9 @@ import com.android.volley.Response;
24 24 import com.android.volley.VolleyError;
25 25 import com.android.volley.toolbox.JsonArrayRequest;
26 26 import com.android.volley.toolbox.JsonObjectRequest;
27   -import com.google.gson.Gson;
28   -import com.google.gson.JsonArray;
29   -import com.google.gson.JsonObject;
30   -import com.google.gson.JsonParser;
31 27  
32 28 import net.plil.clubinfo.etunicorn.R;
  29 +import net.plil.clubinfo.etunicorn.app.NFCSupport;
33 30 import net.plil.clubinfo.etunicorn.app.MainActivity;
34 31 import net.plil.clubinfo.etunicorn.data.Personne;
35 32 import net.plil.clubinfo.etunicorn.data.Role;
... ... @@ -50,7 +47,7 @@ import java.util.Locale;
50 47 import java.util.Map;
51 48  
52 49  
53   -public class ModifyPersonne extends DialogFragment {
  50 +public class ModifyPersonne extends DialogFragment implements NFCSupport {
54 51  
55 52 Calendar myCalendar = Calendar.getInstance();
56 53  
... ... @@ -271,4 +268,10 @@ public class ModifyPersonne extends DialogFragment {
271 268 jsonArrayRequest.setTag(ModifyPersonne.class);
272 269 VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonArrayRequest);
273 270 }
  271 +
  272 +
  273 + @Override
  274 + public void processNFC(String idCard) {
  275 + mCarte.setText(idCard);
  276 + }
274 277 }
... ...
app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/MyPersonneRecyclerViewAdapter.java
  Show/Hide comments   View file @515eb39
... ... @@ -74,11 +74,11 @@ public class MyPersonneRecyclerViewAdapter extends RecyclerView.Adapter<MyPerson
74 74 switch (item.getItemId()) {
75 75 case R.id.delete:
76 76 DeletePersonne deletePersonne = DeletePersonne.newInstance(holder.mItem);
77   - deletePersonne.show(((AppCompatActivity) context).getSupportFragmentManager(), "deleteConsommation");
  77 + deletePersonne.show(((AppCompatActivity) context).getSupportFragmentManager(), context.getString(R.string.tag_delete_personne));
78 78 break;
79 79 case R.id.modify:
80 80 ModifyPersonne modifyPersonne = ModifyPersonne.newInstance(holder.mItem);
81   - modifyPersonne.show(((AppCompatActivity) context).getSupportFragmentManager(), "modifyConsommation");
  81 + modifyPersonne.show(((AppCompatActivity) context).getSupportFragmentManager(), context.getString(R.string.tag_modify_personne));
82 82 break;
83 83 }
84 84 return false;
... ...
app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/PersonneFragment.java
  Show/Hide comments   View file @515eb39
... ... @@ -3,6 +3,7 @@ package net.plil.clubinfo.etunicorn.app.personne;
3 3 import android.content.Context;
4 4 import android.os.Bundle;
5 5 import android.support.design.widget.FloatingActionButton;
  6 +import android.support.v4.app.Fragment;
6 7 import android.support.v7.widget.LinearLayoutManager;
7 8 import android.support.v7.widget.RecyclerView;
8 9 import android.view.LayoutInflater;
... ... @@ -17,7 +18,7 @@ import com.android.volley.VolleyError;
17 18 import com.android.volley.toolbox.JsonArrayRequest;
18 19  
19 20 import net.plil.clubinfo.etunicorn.R;
20   -import net.plil.clubinfo.etunicorn.app.FragmentNFC;
  21 +import net.plil.clubinfo.etunicorn.app.NFCSupport;
21 22 import net.plil.clubinfo.etunicorn.app.MainActivity;
22 23 import net.plil.clubinfo.etunicorn.data.Personne;
23 24 import net.plil.clubinfo.etunicorn.utils.ConvertBytesToString;
... ... @@ -37,7 +38,7 @@ import java.util.Map;
37 38 * Activities containing this fragment MUST implement the {@link OnListFragmentInteractionListener}
38 39 * interface.
39 40 */
40   -public class PersonneFragment extends FragmentNFC {
  41 +public class PersonneFragment extends Fragment implements NFCSupport {
41 42  
42 43 private OnListFragmentInteractionListener mListener;
43 44 private ArrayList<Personne> personnes = new ArrayList<>();
... ... @@ -76,7 +77,7 @@ public class PersonneFragment extends FragmentNFC {
76 77 @Override
77 78 public void onClick(View v) {
78 79 CreatePersonne newFragment = new CreatePersonne();
79   - newFragment.show(getFragmentManager(), "CreateEvent");
  80 + newFragment.show(getFragmentManager(), getString(R.string.tag_create_personne));
80 81 }
81 82 });
82 83  
... ... @@ -136,6 +137,13 @@ public class PersonneFragment extends FragmentNFC {
136 137  
137 138 @Override
138 139 public void processNFC(String idCardUser) {
  140 + CreatePersonne createPersonne = (CreatePersonne) getFragmentManager().findFragmentByTag(getString(R.string.tag_create_personne));
  141 + if (createPersonne != null){
  142 + createPersonne.processNFC(idCardUser);
  143 + }
  144 + else {
  145 + ModifyPersonne modifyPersonne = (ModifyPersonne) getFragmentManager().findFragmentByTag(getString(R.string.tag_modify_personne));
  146 + }
139 147  
140 148 }
141 149  
... ...
app/src/main/res/values/strings.xml
  Show/Hide comments   View file @515eb39
... ... @@ -59,4 +59,7 @@
59 59 <string name="modify_personne_hint_date">Birthday</string>
60 60 <string name="error_create_personne_login">Need a login or a carte ID</string>
61 61 <string name="error_create_personne_login_carte">Need a login or a carte ID</string>
  62 + <string name="tag_create_personne">createPersonne</string>
  63 + <string name="tag_modify_personne">modifyPersonne</string>
  64 + <string name="tag_delete_personne">deletePersonne</string>
62 65 </resources>
... ...