Ajout de Consomation

badetitou
1 parent d6367fe9
Showing 13 changed files with 186 additions and 30 deletions Show diff stats
app/build.gradle
app/src/main/java/net/plil/clubinfo/etunicorn/app/MainActivity.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/ConsomationRecyclerViewAdapter.java -> app/src/main/java/net/plil/clubinfo/etunicorn/app/consomation/ConsomationRecyclerViewAdapter.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/consomation/CreateConsomation.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/FragmentConsomation.java -> app/src/main/java/net/plil/clubinfo/etunicorn/app/consomation/FragmentConsomation.java
app/src/main/res/drawable/selected_row.xml
app/src/main/res/layout/activity_main.xml
app/src/main/res/layout/fragment_consomation_item.xml
app/src/main/res/layout/fragment_consomation_item_list.xml
app/src/main/res/layout/fragment_create_consomation.xml
app/src/main/res/values-fr/strings.xml
app/src/main/res/values/colors.xml
app/src/main/res/values/strings.xml
@@ -30,6 +30,6 @@ dependencies {
     compile 'com.google.code.gson:gson:2.4'
     compile 'com.android.support:support-v4:24.2.1'
     compile 'com.android.support:recyclerview-v7:24.2.1'
-    testCompile 'junit:junit:4.12'
     compile 'com.android.support:gridlayout-v7:24.2.1'
+    testCompile 'junit:junit:4.12'
 }
@@ -14,8 +14,10 @@ import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 import net.plil.clubinfo.etunicorn.R;
+import net.plil.clubinfo.etunicorn.app.consomation.FragmentConsomation;
 import net.plil.clubinfo.etunicorn.data.Consomation;
-package net.plil.clubinfo.etunicorn.app;
+package net.plil.clubinfo.etunicorn.app.consomation;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import android.widget.Toast;
 import net.plil.clubinfo.etunicorn.R;
 import net.plil.clubinfo.etunicorn.data.Consomation;
@@ -30,6 +31,7 @@ public class ConsomationRecyclerViewAdapter extends RecyclerView.Adapter&lt;Consoma
         return new ViewHolder(view);
     }
+
     @Override
     public void onBindViewHolder(final ViewHolder holder, int position) {
         holder.mItem = mValues.get(position);
@@ -41,12 +43,18 @@ public class ConsomationRecyclerViewAdapter extends RecyclerView.Adapter&lt;Consoma
             @Override
             public void onClick(View v) {
                 if (null != mListener) {
-                    // Notify the active callbacks interface (the activity, if the
-                    // fragment is attached to one) that an item has been selected.
                     mListener.onListFragmentInteraction(holder.mItem);
                 }
             }
         });
+
+        holder.mView.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                holder.mView.setSelected(!holder.mView.isSelected());
+                return true;
+            }
+        });
     }
     @Override
@@ -0,0 +1,87 @@
+package net.plil.clubinfo.etunicorn.app.consomation;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+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 CreateConsomation extends DialogFragment {
+
+    EditText mNomConsomation;
+    EditText mPrice;
+    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_consomation, null);
+        mNomConsomation = (EditText) view.findViewById(R.id.create_consomation_name);
+        mPrice = (EditText) view.findViewById(R.id.create_consomation_price);
+        mProgressBar = (ProgressBar) view.findViewById(R.id.create_consomation_progress_bar);
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder
+                .setTitle(R.string.create_consomation)
+                .setView(view)
+                .setPositiveButton(R.string.valid, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+
+                        mProgressBar.setVisibility(View.VISIBLE);
+                        mPrice.setVisibility(View.GONE);
+                        mNomConsomation.setVisibility(View.GONE);
+                        JSONObject jsonObject = new JSONObject();
+                        try {
+                            jsonObject.put("nomConsomation", mNomConsomation.getText().toString());
+                            jsonObject.put("prix", Double.parseDouble(mPrice.getText().toString()));
+                        } catch (JSONException e){
+                            e.printStackTrace();
+                        }
+                        JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.POST, VolleyUtils.baseUri + "/transaction/debit"   ,jsonObject , new Response.Listener<JSONObject>() {
+                            @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();
+    }
+
+
+}
-package net.plil.clubinfo.etunicorn.app;
+package net.plil.clubinfo.etunicorn.app.consomation;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.GridLayoutManager;
+import android.support.design.widget.FloatingActionButton;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 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.data.Consomation;
 import java.util.ArrayList;
@@ -24,7 +25,6 @@ import java.util.List;
  */
 public class FragmentConsomation extends FragmentNFC {
-    private int mColumnCount = 1;
     private OnListFragmentInteractionListener mListener;
     /**
@@ -50,22 +50,15 @@ public class FragmentConsomation extends FragmentNFC {
         RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.consomation_list);
         // Set the adapter
         Context context = recyclerView.getContext();
-        if (mColumnCount <= 1) {
-            recyclerView.setLayoutManager(new LinearLayoutManager(context));
-        } else {
-            recyclerView.setLayoutManager(new GridLayoutManager(context, mColumnCount));
-        }
+
+        recyclerView.setLayoutManager(new LinearLayoutManager(context));
+
         List<Consomation> consomationList = new ArrayList<>();
         Consomation c1 = new Consomation();
         c1.setIdConsomation(1);
         c1.setNomConsomation("Hello");
         c1.setPrix(12.5);
         consomationList.add(c1);
-        c1 = new Consomation();
-        c1.setIdConsomation(2);
-        c1.setNomConsomation("World");
-        c1.setPrix(42.407);
-        consomationList.add(c1);
         for (int i = 0; i< 100; ++i){
             c1 = new Consomation();
             c1.setIdConsomation(i);
@@ -75,6 +68,15 @@ public class FragmentConsomation extends FragmentNFC {
         }
         recyclerView.setAdapter(new ConsomationRecyclerViewAdapter(consomationList,  mListener));
+        FloatingActionButton fAB = (FloatingActionButton) view.findViewById(R.id.consomation_add);
+        fAB.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                CreateConsomation newFragment = new CreateConsomation();
+                newFragment.show(getFragmentManager(), "CreateConsomation");
+            }
+        });
+
         return view;
     }
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_selected="true">
+        <color android:color="#EEEEEE"/>
+    </item>
+    <item android:state_selected="false">
+        <color android:color="#FFFFFF"/>
+    </item>
+</selector>
 \ No newline at end of file
@@ -18,10 +18,10 @@
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/AppTheme.PopupOverlay">
+            app:layout_scrollFlags="enterAlways"
+            app:popupTheme="@style/AppTheme.PopupOverlay"
+            android:layout_height="64dp">
         </android.support.v7.widget.Toolbar>
@@ -35,7 +35,7 @@
     <android.support.v4.view.ViewPager
         android:id="@+id/container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
@@ -2,7 +2,9 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:foreground="?attr/selectableItemBackground"
+    android:background="@drawable/selected_row">
     <TextView
         android:id="@+id/consomation_id"
@@ -14,8 +14,9 @@
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
         app:layoutManager="LinearLayoutManager"
-        tools:context="net.plil.clubinfo.etunicorn.app.FragmentConsomation"
-        tools:listitem="@layout/fragment_consomation_item" />
+        tools:context="net.plil.clubinfo.etunicorn.app.consomation.FragmentConsomation"
+        tools:listitem="@layout/fragment_consomation_item"
+        />
     <android.support.design.widget.FloatingActionButton
         android:layout_width="wrap_content"
@@ -31,6 +32,6 @@
         app:rippleColor="@color/colorAccent"
         app:layout_anchor="@id/consomation_list"
         app:layout_anchorGravity="bottom|right|end"
-        app:layout_behavior="net.plil.clubinfo.etunicorn.utils.ScrollAwareFABBehavior"/>
+        app:layout_behavior="net.plil.clubinfo.etunicorn.utils.ScrollAwareFABBehavior" />
 </android.support.design.widget.CoordinatorLayout>
 \ No newline at end of file
@@ -0,0 +1,32 @@
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="net.plil.clubinfo.etunicorn.app.consomation.CreateConsomation"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/create_consomation_name"
+        android:hint="@string/create_consomation_name"/>
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:hint="@string/create_consomation_price"
+        android:id="@+id/create_consomation_price"
+        android:inputType="numberSigned|numberDecimal"
+        android:maxLines="1" />
+
+    <ProgressBar
+        style="?android:attr/progressBarStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/create_consomation_progress_bar"
+        android:visibility="gone"/>
+
+</LinearLayout>
+
@@ -7,4 +7,12 @@
     <string name="error_invalid_password">Mot de passe invalide</string>
     <string name="prompt_password">Mot de passe</string>
     <string name="prompt_username">Nom d\'utilisateur</string>
+    <string name="action_settings">Paramètres</string>
+    <string name="cancel">Annuler</string>
+    <string name="create_consomation">Créer une consomation</string>
+    <string name="create_consomation_name">Nom</string>
+    <string name="create_consomation_price">Prix</string>
+    <string name="enter_money">Entrer une valeur</string>
+    <string name="valid">OK</string>
+    <string name="title_activity_main">Etunicorn - Bonjour</string>
 </resources>
 \ No newline at end of file
@@ -3,4 +3,7 @@
     <color name="colorPrimary">#F44336</color>
     <color name="colorPrimaryDark">#C62828</color>
     <color name="colorAccent">#2196F3</color>
+
+    <color name="pressed_color">#4d90fe</color>
+    <color name="default_color">#ffffff</color>
 </resources>
@@ -8,11 +8,13 @@
     <string name="error_incorrect_password">This password is incorrect</string>
     <string name="error_field_required">This field is required</string>
     <string name="prompt_username">Username</string>
-    <string name="title_activity_main">MainActivity</string>
     <string name="action_settings">Settings</string>
-    <string name="section_format">Hello World from section: %1$d</string>
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="enter_money">Enter value</string>
+    <string name="valid">OK</string>
+    <string name="cancel">Cancel</string>
+    <string name="create_consomation">Create Consomation</string>
+    <string name="create_consomation_name">Name</string>
+    <string name="create_consomation_price">Price</string>
+    <string name="title_activity_main">Etunicorn - Hello</string>
 </resources>