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 new file mode 100644 index 0000000..29d45f0 --- /dev/null +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/CreatePersonne.java @@ -0,0 +1,90 @@ +package net.plil.clubinfo.etunicorn.app.personne; + +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.EditText; +import android.widget.ProgressBar; + +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.utils.VolleyUtils; + +import org.json.JSONException; +import org.json.JSONObject; + + +public class CreatePersonne extends DialogFragment { + + EditText mLogin; + EditText mCarte; + EditText mNaissance; + EditText mRole; + ProgressBar mProgressBar; + + + @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_create_personne, null); + mLogin = (EditText) view.findViewById(R.id.create_personne_login); + mCarte = (EditText) view.findViewById(R.id.create_personne_carte); + mRole = (EditText) view.findViewById(R.id.create_personne_role); + mNaissance = (EditText) view.findViewById(R.id.create_personne_naissance); + mProgressBar = (ProgressBar) view.findViewById(R.id.create_personne_progress_bar); + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + builder + .setTitle(R.string.create_personne) + .setView(view) + .setPositiveButton(R.string.valid, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + + mProgressBar.setVisibility(View.VISIBLE); + mLogin.setVisibility(View.GONE); + mCarte.setVisibility(View.GONE); + mNaissance.setVisibility(View.GONE); + JSONObject jsonObject = new JSONObject(); + try { + jsonObject.put("login", mLogin.getText().toString()); + jsonObject.put("carte", mCarte.getText().toString()); + jsonObject.put("role", mRole.getText().toString()); + jsonObject.put("naissance", mNaissance.getText().toString()); + } catch (JSONException e){ + e.printStackTrace(); + } + JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.POST, VolleyUtils.baseUri + "/personne" ,jsonObject , new Response.Listener() { + @Override + public void onResponse(JSONObject response) { + mProgressBar.setVisibility(View.GONE); + } + }, new Response.ErrorListener() { + @Override + public void onErrorResponse(VolleyError error) { + mProgressBar.setVisibility(View.GONE); + } + } + ); + + VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest); + } + }) + .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + // User cancelled the dialog + } + }); + // Create the AlertDialog object and return it + return builder.create(); + } + + +} diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/PersonneFragment.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/PersonneFragment.java index 250a4da..0745441 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/PersonneFragment.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/PersonneFragment.java @@ -2,6 +2,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.v7.widget.LinearLayoutManager; import android.support.v7.widget.ListPopupWindow; import android.support.v7.widget.RecyclerView; @@ -61,11 +62,19 @@ public class PersonneFragment extends FragmentNFC { p.setLoginPoly("bverhaeg"); p.setNaissance(new Date(System.currentTimeMillis())); p.setSolde(45); - personneList.add(p); - - recyclerView.setAdapter(new MyPersonneRecyclerViewAdapter(personneList, mListener, getActivity())); } + recyclerView.setAdapter(new MyPersonneRecyclerViewAdapter(personneList, mListener, getActivity())); + + FloatingActionButton fAB = (FloatingActionButton) view.findViewById(R.id.personne_add); + fAB.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + CreatePersonne newFragment = new CreatePersonne(); + newFragment.show(getFragmentManager(), "CreateEvent"); + } + }); + return view; } diff --git a/app/src/main/res/layout/fragment_consomation_item_list.xml b/app/src/main/res/layout/fragment_consomation_item_list.xml index 71e5682..67d5428 100644 --- a/app/src/main/res/layout/fragment_consomation_item_list.xml +++ b/app/src/main/res/layout/fragment_consomation_item_list.xml @@ -25,12 +25,8 @@ android:layout_gravity="bottom|end" android:layout_margin="24dp" android:id="@+id/consomation_add" - app:fabSize="auto" - app:srcCompat="@android:drawable/ic_menu_add" - app:backgroundTint="@color/colorPrimaryDark" - app:elevation="6dp" - app:rippleColor="@color/colorAccent" - app:layout_anchor="@id/consomation_list" + app:srcCompat="@android:drawable/ic_input_add" + android:tint="@android:color/white" app:layout_anchorGravity="bottom|right|end" app:layout_behavior="net.plil.clubinfo.etunicorn.utils.ScrollAwareFABBehavior" /> diff --git a/app/src/main/res/layout/fragment_create_personne.xml b/app/src/main/res/layout/fragment_create_personne.xml new file mode 100644 index 0000000..728c160 --- /dev/null +++ b/app/src/main/res/layout/fragment_create_personne.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_event_list.xml b/app/src/main/res/layout/fragment_event_list.xml index 212a8f5..2b57d41 100644 --- a/app/src/main/res/layout/fragment_event_list.xml +++ b/app/src/main/res/layout/fragment_event_list.xml @@ -1,37 +1,35 @@ - - + android:layout_height="match_parent"> + + - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_personne_list.xml b/app/src/main/res/layout/fragment_personne_list.xml index 7786fad..acaa452 100644 --- a/app/src/main/res/layout/fragment_personne_list.xml +++ b/app/src/main/res/layout/fragment_personne_list.xml @@ -21,16 +21,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:clickable="true" - android:layout_gravity="bottom|end" android:layout_margin="24dp" + android:layout_gravity="end|bottom" android:id="@+id/personne_add" - app:fabSize="auto" - app:srcCompat="@android:drawable/ic_menu_add" - app:backgroundTint="@color/colorPrimaryDark" - app:elevation="6dp" - app:rippleColor="@color/colorAccent" - app:layout_anchor="@id/personne_list" - app:layout_anchorGravity="bottom|right|end" + app:srcCompat="@android:drawable/ic_input_add" + android:tint="@android:color/white" + app:layout_anchorGravity="bottom|end" app:layout_behavior="net.plil.clubinfo.etunicorn.utils.ScrollAwareFABBehavior" /> \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 781e0c4..8a726e4 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -35,4 +35,5 @@ Personne Are you sure ? Are you sure ?? !! + Créer une personne \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 09bba0f..be00ac7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -36,4 +36,9 @@ Create event Person Are You Sure ?? !!! + Create person + Login + Carte ID + Birthday + Role -- libgit2 0.21.2