Atelier qualité du code_Destruel

README

@@ -1,3 +1,4 @@
 ## BLA BLA CRADE
 
-Paske c notre projé !
+L'application permet de trouver des trajets (nom de la personne, l'heure et le prix du trajet)
+en fonction du départ, de la destination et de la date.

app/src/main/java/fr/wcs/blablacrade/MainActivity.java

@@ -13,15 +13,16 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        //bouton cherché
-        Button Search = (Button) findViewById(R.id.gogogo);
-        Search.setOnClickListener(new View.OnClickListener() {
+        Button search = (Button) findViewById(R.id.search_itinerary);
+        search.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view){
-                Intent intent=new Intent(MainActivity.this, SearchItineraryActivity.class);startActivity(intent);
+                Intent intentItinerary = new Intent(MainActivity.this, SearchItineraryActivity.class);
+                startActivity(intentItinerary);
             }});
     }
 }

app/src/main/java/fr/wcs/blablacrade/SearchItineraryActivity.java

@@ -9,7 +9,6 @@
 import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.Toast;
-
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Locale;
@@ -21,61 +20,59 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_search_itinerary);
 
-            final EditText edit1 = (EditText) findViewById(R.id.editText1);
-        final EditText edit2 = (EditText) findViewById(R.id.editText2);
-        final EditText edit3 = (EditText) findViewById(R.id.editText3);
-        Button buttonSearch = (Button) findViewById(R.id.push);
+        final EditText editDepart = (EditText) findViewById(R.id.editText_depart);
+        final EditText editDestination = (EditText) findViewById(R.id.editText_destination);
+        final EditText editDate = (EditText) findViewById(R.id.editText_date);
+
+        Button buttonSearch = (Button) findViewById(R.id.button_search);
 
-        // clicq action
         buttonSearch.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                String text1 = edit1.getText().toString();
-                    String text2 = edit2.getText().toString();
-                String texte = edit3.getText().toString();
+                String textDepart = editDepart.getText().toString();
+                String textDestination = editDestination.getText().toString();
+                String textDate = editDate.getText().toString();
 
-                if (text1.isEmpty() || text2.isEmpty()
-                        ) {
-                    Toast painGrillé = Toast.makeText(getApplicationContext(), getResources().getString(R.string.form_error), Toast.LENGTH_SHORT);
-                    painGrillé.show();
-                }else {Intent intent = new Intent(SearchItineraryActivity.this, ViewSearchItineraryResultsListActivity.class);
-                        SearchRequestModel searchRequest=new SearchRequestModel(text1, text2, texte); intent.putExtra("searchRequest", searchRequest);
+                if (textDepart.isEmpty() || textDestination.isEmpty()) {
 
-                        SearchItineraryActivity.this.startActivity(intent);
+                    Toast textEmpty = Toast.makeText(getApplicationContext(), getResources().getString(R.string.form_error), Toast.LENGTH_SHORT);
+                    textEmpty.show();
+                }
+
+                else {
+
+                    Intent intent = new Intent(SearchItineraryActivity.this, ViewSearchItineraryResultsListActivity.class);
+                    SearchRequestModel searchRequest = new SearchRequestModel(textDepart, textDestination, textDate);
+                    intent.putExtra("searchRequest", searchRequest);
+                    SearchItineraryActivity.this.startActivity(intent);
                 }
             }
         });
 
-        final Calendar calandréi = Calendar.getInstance();
+        final Calendar calendar = Calendar.getInstance();
         final DatePickerDialog.OnDateSetListener dateListener = new DatePickerDialog.OnDateSetListener() {
 
             @Override
-            public void onDateSet(DatePicker view,int ané,int moi,int joure){
-                        calandréi.set(Calendar.YEAR, ané);
-                        calandréi.set(Calendar.MONTH, moi);
-                    calandréi.set(Calendar.DAY_OF_MONTH, joure);
-                UpdateLabel(edit3, calandréi);
+            public void onDateSet(DatePicker view,int year,int month,int day){
+                calendar.set(Calendar.YEAR, year);
+                calendar.set(Calendar.MONTH, month);
+                calendar.set(Calendar.DAY_OF_MONTH, day);
+                UpdateLabel(editDate, calendar);
             }};
 
-        edit3.setOnClickListener(new View.OnClickListener() {
+        editDate.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                new DatePickerDialog(SearchItineraryActivity.this,
-                        dateListener,
-                        calandréi.get(Calendar.YEAR),
-                        calandréi.get(Calendar.MONTH),
-                        calandréi.get(Calendar.DAY_OF_MONTH)
-                ).show();
+                new DatePickerDialog(SearchItineraryActivity.this, dateListener, calendar.get(Calendar.YEAR),
+                        calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH)).show();
             }
         });
     }
 
             private void UpdateLabel(EditText editText, Calendar myCalendar) {
                 String myFormat = "dd/MM/yyyy";
 
-
                 SimpleDateFormat sdf = new SimpleDateFormat(myFormat, Locale.FRANCE);
-
                 editText.setText(sdf.format(myCalendar.getTime()));
             }
 }

app/src/main/java/fr/wcs/blablacrade/SearchRequestModel.java

@@ -3,51 +3,47 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 
-/**
- * Created by bastienwcs on 21/09/17.
- */
-
 public class SearchRequestModel implements Parcelable {
 
-    private String depare;
-    private String oùilva;
-    private String quan;
+    private String departure;
+    private String destination;
+    private String date;
 
-    public String getDepare() {
-        return depare;
+    public String getDeparture() {
+        return departure;
     }
 
-    public String getOùilva() {
-        return oùilva;
+    public String getDestination() {
+        return destination;
     }
 
-    public SearchRequestModel(String depare, String oùilva, String quan) {
-        this.depare = depare;
-        this.oùilva = oùilva;
-        this.quan = quan;
+    public SearchRequestModel(String departure, String destination, String date) {
+        this.departure = departure;
+        this.destination = destination;
+        this.date = date;
     }
 
-        protected SearchRequestModel(Parcel in) {
-            depare = in.readString();
-            oùilva = in.readString();
-            quan = in.readString();
-        }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(depare);
-        dest.writeString(oùilva);
-        dest.writeString(quan);
+    protected SearchRequestModel(Parcel in) {
+        departure = in.readString();
+        destination = in.readString();
+        date = in.readString();
     }
 
-    @Override
-    public int describeContents() {
-        return 0;
-    }
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeString(departure);
+            dest.writeString(destination);
+            dest.writeString(date);
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
 
     public static final Creator<SearchRequestModel> CREATOR = new Creator<SearchRequestModel>() {
-                @Override
-                public SearchRequestModel createFromParcel(Parcel in) {
+        @Override
+        public SearchRequestModel createFromParcel(Parcel in) {
             return new SearchRequestModel(in);
         }
 
@@ -57,7 +53,7 @@ public SearchRequestModel[] newArray(int size) {
         }
     };
 
-    public String getQuan() {
-        return quan;
+    public String getDate() {
+        return date;
     }
 }

app/src/main/java/fr/wcs/blablacrade/TripResultAdapter.java

@@ -9,61 +9,44 @@
 
 import java.util.ArrayList;
 
-/**
- * Created by wilder on 13/09/17.
- */
-
-// This is the adapter lol
 public class TripResultAdapter extends BaseAdapter {
-    private Context context; //context
-    private ArrayList<TripResultModel> items; //data source of the list adapter
+    private Context context;
+    private ArrayList<TripResultModel> items;
 
-    //public constructor 
     public TripResultAdapter(Context context, ArrayList<TripResultModel> items) {
         this.context = context;
         this.items = items;
     }
 
-    @Override
-    public int getCount() {
-        return items.size(); //returns total of items in the list
+        @Override
+        public int getCount() {
+            return items.size(); //returns total of items in the list
     }
 
-    @Override
-    public Object getItem(int position) {
-        return items.get(position); //returns list item at the specified position
+        @Override
+        public Object getItem(int position) {
+            return items.get(position); //returns list item at the specified position
     }
 
-    @Override
-    public long getItemId(int position) {
-        return position;
+        @Override
+        public long getItemId(int position) {
+            return position;
     }
 
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        // inflate the layout for each list row
-        if (convertView == null) {
-            convertView = LayoutInflater.from(context).
+        @Override
+            public View getView(int position, View convertView, ViewGroup parent) {
+                if (convertView == null) {
+                    convertView = LayoutInflater.from(context).
                     inflate(R.layout.trip_item, parent, false);
-        }
-
-        // get current item to be displayed
+                }
         TripResultModel currentItem = (TripResultModel) getItem(position);
+        TextView textDeparture = convertView.findViewById(R.id.text_view_departure);
+        TextView textFirstname = convertView.findViewById(R.id.text_view_firstname);
+        TextView textPrice = convertView.findViewById(R.id.text_view_price);
 
-        // get the TextView for item name and item description
-        TextView departure = (TextView)
-                convertView.findViewById(R.id.texteresu1);
-        TextView firstname = (TextView)
-                convertView.findViewById(R.id.textres2);
-        TextView price = (TextView)
-                convertView.findViewById(R.id.txt);
-
-        //sets the text for item name and item description from the current item object
-        departure.setText(currentItem.getDepare().toString());
-        firstname.setText(currentItem.getPrénom());
-        price.setText(String.valueOf(currentItem.getPri()));
-
-        // returns the view for the current row
+        textDeparture.setText(currentItem.getDate().toString());
+        textFirstname.setText(currentItem.getName());
+        textPrice.setText(String.valueOf(currentItem.getPrice()));
         return convertView;
     }
 }

app/src/main/java/fr/wcs/blablacrade/TripResultModel.java

@@ -2,26 +2,28 @@
 
 import java.util.Date;
 
-/**
- * Created by wilder on 13/09/17.
- */
-
 public class TripResultModel {
 
-    public Date getDepare() {
-        return depare;
+    private String name;
+    private int price;
+    private Date date;
+
+    public TripResultModel(String name, int price, Date date) {
+        this.name = name;
+        this.price = price;
+        this.date = date;
     }
 
-    public int getPri() {
-        return pri;
+    public String getName() {
+        return name;
     }
-    private String prénom;
-    private int pri;
 
-    public TripResultModel(String prénom, Date depare, int pri) {
-        this.prénom = prénom;this.depare = depare;this.pri = pri;
+    public int getPrice() {
+        return price;
     }
-    private Date depare;
 
-    public String getPrénom() {return prénom;}
+    public Date getDate() {
+        return date;
+    }
 }
+

app/src/main/java/fr/wcs/blablacrade/ViewSearchItineraryResultsListActivity.java

@@ -16,25 +16,30 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_view_search_itinerary_results_list);
 
-        SearchRequestModel truc = getIntent().getParcelableExtra("searchRequest");
-        String text1 = truc.getDepare();
-            String TEXTEDEUX = truc.getOùilva();
-        String texte3 = truc.getQuan();
-
-        Toast.makeText(this, texte3, Toast.LENGTH_LONG).show();
-
-        setTitle(text1 + " >> " + TEXTEDEUX);
-
-        // TODO : add résult to tableau
-            ListView résultat = (ListView) findViewById(R.id.listViewSearchResults);
-            ArrayList<TripResultModel> tableau = new ArrayList<>();SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy-hh:mm");
-            try {
-                        tableau.add(new TripResultModel("Bernard", sdf.parse("21/02/2017-15:30"), 15));
-                        tableau.add(new TripResultModel("Jean-Jacques", sdf.parse("21/02/2017-16:00"), 20));
-                        tableau.add(new TripResultModel("Bertrand", sdf.parse("21/02/2017-16:30"), 16));
-                         tableau.add(new TripResultModel("Gertrude", sdf.parse("21/02/2017-17:00"), 40));
-            } catch (ParseException e) {
+        SearchRequestModel searchRequest = getIntent().getParcelableExtra("searchRequest");
+        String departure = searchRequest.getDeparture();
+        String destination = searchRequest.getDestination();
+        String date = searchRequest.getDate();
+
+        Toast.makeText(this, date, Toast.LENGTH_LONG).show();
+
+        setTitle(departure + " >> " + destination);
+
+        ListView results = (ListView) findViewById(R.id.listViewSearchResults);
+        ArrayList<TripResultModel> resultModels = new ArrayList<>();
+        SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy-hh:mm");
+
+        try {
+                        resultModels.add(new TripResultModel("Bernard", 15, sdf.parse("21/02/2017-15:30")));
+                        resultModels.add(new TripResultModel("Jean-Jacques", 20, sdf.parse("21/02/2017-16:00")));
+                        resultModels.add(new TripResultModel("Bertrand", 16, sdf.parse("21/02/2017-16:30")));
+                        resultModels.add(new TripResultModel("Gertrude", 40, sdf.parse("21/02/2017-17:00")));
             }
-        TripResultAdapter adapteur = new TripResultAdapter(this, tableau);résultat.setAdapter(adapteur);
+
+        catch (ParseException e) {
+
+        }
+
+        TripResultAdapter resultAdapter = new TripResultAdapter(this, resultModels);results.setAdapter(resultAdapter);
     }
 }