diff --git a/README b/README index 47b0d9e..9235c25 100644 --- a/README +++ b/README @@ -1,3 +1,3 @@ ## BLA BLA CRADE -Paske c notre projé ! +Bla Bla Propre diff --git a/app/src/main/java/fr/wcs/blablacrade/MainActivity.java b/app/src/main/java/fr/wcs/blablacrade/MainActivity.java index 6bce270..00b6fc7 100644 --- a/app/src/main/java/fr/wcs/blablacrade/MainActivity.java +++ b/app/src/main/java/fr/wcs/blablacrade/MainActivity.java @@ -16,12 +16,13 @@ protected void onCreate(Bundle savedInstanceState) { Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); - //bouton cherché - Button Search = (Button) findViewById(R.id.gogogo); + + Button Search = (Button) findViewById(R.id.searchBtn); Search.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view){ - Intent intent=new Intent(MainActivity.this, SearchItineraryActivity.class);startActivity(intent); + Intent intent=new Intent(MainActivity.this, + SearchItineraryActivity.class);startActivity(intent); }}); } } diff --git a/app/src/main/java/fr/wcs/blablacrade/SearchItineraryActivity.java b/app/src/main/java/fr/wcs/blablacrade/SearchItineraryActivity.java index 7a6c121..4f10e70 100644 --- a/app/src/main/java/fr/wcs/blablacrade/SearchItineraryActivity.java +++ b/app/src/main/java/fr/wcs/blablacrade/SearchItineraryActivity.java @@ -21,61 +21,65 @@ 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); + final EditText departure = (EditText) findViewById(R.id.editText1); + final EditText arrival = (EditText) findViewById(R.id.editText2); + final EditText departureDate = (EditText) findViewById(R.id.editText3); Button buttonSearch = (Button) findViewById(R.id.push); - // 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 departureTxt = departure.getText().toString(); + String arrivalTxt = arrival.getText().toString(); + String departureDateTxt = departureDate.getText().toString(); - if (text1.isEmpty() || text2.isEmpty() + if (departureTxt.isEmpty() || arrivalTxt.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); + Toast unfilledFields = Toast.makeText(getApplicationContext(), + getResources().getString(R.string.form_error), Toast.LENGTH_SHORT); + unfilledFields.show(); + }else {Intent intent = new Intent(SearchItineraryActivity.this, + ViewSearchItineraryResultsListActivity.class); + SearchRequestModel searchRequest=new SearchRequestModel(departureTxt, + arrivalTxt, departureDateTxt); + intent.putExtra("searchRequest", searchRequest); - SearchItineraryActivity.this.startActivity(intent); + SearchItineraryActivity.this.startActivity(intent); } } }); - final Calendar calandréi = Calendar.getInstance(); + final Calendar calendarDeparture = 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 monthOfYear,int dayOfMonth){ + calendarDeparture.set(Calendar.YEAR, year); + calendarDeparture.set(Calendar.MONTH, monthOfYear); + calendarDeparture.set(Calendar.DAY_OF_MONTH, dayOfMonth); + UpdateLabel(departureDate, calendarDeparture); }}; - edit3.setOnClickListener(new View.OnClickListener() { + departureDate.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) + calendarDeparture.get(Calendar.YEAR), + calendarDeparture.get(Calendar.MONTH), + calendarDeparture.get(Calendar.DAY_OF_MONTH) ).show(); } }); } - private void UpdateLabel(EditText editText, Calendar myCalendar) { - String myFormat = "dd/MM/yyyy"; + private void UpdateLabel(EditText editText, Calendar myCalendar) { + String myFormat = "dd/MM/yyyy"; - SimpleDateFormat sdf = new SimpleDateFormat(myFormat, Locale.FRANCE); + SimpleDateFormat sdf = new SimpleDateFormat(myFormat, Locale.FRANCE); - editText.setText(sdf.format(myCalendar.getTime())); - } + editText.setText(sdf.format(myCalendar.getTime())); + } } diff --git a/app/src/main/java/fr/wcs/blablacrade/SearchRequestModel.java b/app/src/main/java/fr/wcs/blablacrade/SearchRequestModel.java index 9b20bd2..78820f5 100644 --- a/app/src/main/java/fr/wcs/blablacrade/SearchRequestModel.java +++ b/app/src/main/java/fr/wcs/blablacrade/SearchRequestModel.java @@ -9,35 +9,35 @@ public class SearchRequestModel implements Parcelable { - private String depare; - private String oùilva; - private String quan; + private String departure; + private String destination; + private String departureDate; - 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 departureDate) { + this.departure = departure; + this.destination = destination; + this.departureDate = departureDate; } - protected SearchRequestModel(Parcel in) { - depare = in.readString(); - oùilva = in.readString(); - quan = in.readString(); - } + protected SearchRequestModel(Parcel in) { + departure = in.readString(); + destination = in.readString(); + departureDate = in.readString(); + } @Override public void writeToParcel(Parcel dest, int flags) { - dest.writeString(depare); - dest.writeString(oùilva); - dest.writeString(quan); + dest.writeString(departure); + dest.writeString(destination); + dest.writeString(departureDate); } @Override @@ -46,8 +46,8 @@ public int describeContents() { } public static final Creator CREATOR = new Creator() { - @Override - public SearchRequestModel createFromParcel(Parcel in) { + @Override + public SearchRequestModel createFromParcel(Parcel in) { return new SearchRequestModel(in); } @@ -57,7 +57,7 @@ public SearchRequestModel[] newArray(int size) { } }; - public String getQuan() { - return quan; + public String getDepartureDate() { + return departureDate; } } diff --git a/app/src/main/java/fr/wcs/blablacrade/TripResultAdapter.java b/app/src/main/java/fr/wcs/blablacrade/TripResultAdapter.java index 9fc3867..197c615 100644 --- a/app/src/main/java/fr/wcs/blablacrade/TripResultAdapter.java +++ b/app/src/main/java/fr/wcs/blablacrade/TripResultAdapter.java @@ -13,10 +13,10 @@ * Created by wilder on 13/09/17. */ -// This is the adapter lol + public class TripResultAdapter extends BaseAdapter { - private Context context; //context - private ArrayList items; //data source of the list adapter + private Context context; + private ArrayList items; //public constructor public TripResultAdapter(Context context, ArrayList items) { @@ -52,16 +52,16 @@ public View getView(int position, View convertView, ViewGroup parent) { // get the TextView for item name and item description TextView departure = (TextView) - convertView.findViewById(R.id.texteresu1); + convertView.findViewById(R.id.departureTxt); TextView firstname = (TextView) - convertView.findViewById(R.id.textres2); + convertView.findViewById(R.id.firstnameTxt); TextView price = (TextView) - convertView.findViewById(R.id.txt); + convertView.findViewById(R.id.priceTxt); //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())); + departure.setText(currentItem.getDeparture().toString()); + firstname.setText(currentItem.getFirstname()); + price.setText(String.valueOf(currentItem.getPrice())); // returns the view for the current row return convertView; diff --git a/app/src/main/java/fr/wcs/blablacrade/TripResultModel.java b/app/src/main/java/fr/wcs/blablacrade/TripResultModel.java index a6960ae..37f12a4 100644 --- a/app/src/main/java/fr/wcs/blablacrade/TripResultModel.java +++ b/app/src/main/java/fr/wcs/blablacrade/TripResultModel.java @@ -8,20 +8,37 @@ public class TripResultModel { - public Date getDepare() { - return depare; + public String firstname; + public Date departure; + public int price; + + public TripResultModel(String firstname, Date departure, int price) { + this.firstname = firstname; + this.departure = departure; + this.price = price; + } + + public String getFirstname() { + return firstname; + } + + public void setFirstname(String firstname) { + this.firstname = firstname; + } + + public Date getDeparture() { + return departure; } - public int getPri() { - return pri; + public void setDeparture(Date departure) { + this.departure = departure; } - 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 void setPrice(int price) { + this.price = price; + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/wcs/blablacrade/ViewSearchItineraryResultsListActivity.java b/app/src/main/java/fr/wcs/blablacrade/ViewSearchItineraryResultsListActivity.java index 546ae80..ee5e8c4 100644 --- a/app/src/main/java/fr/wcs/blablacrade/ViewSearchItineraryResultsListActivity.java +++ b/app/src/main/java/fr/wcs/blablacrade/ViewSearchItineraryResultsListActivity.java @@ -16,25 +16,25 @@ 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 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) { - } - TripResultAdapter adapteur = new TripResultAdapter(this, tableau);résultat.setAdapter(adapteur); + SearchRequestModel search = getIntent().getParcelableExtra("searchRequest"); + String departure = search.getDeparture(); + String destination = search.getDestination(); + String departureDate = search.getDepartureDate(); + + Toast.makeText(this, departureDate, Toast.LENGTH_LONG).show(); + + setTitle(departure + " >> " + destination); + + // TODO : add result to array adapter + ListView result = (ListView) findViewById(R.id.listViewSearchResults); + ArrayList 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) { + } + TripResultAdapter adapteur = new TripResultAdapter(this, tableau);result.setAdapter(adapteur); } } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index f85c150..0cb0a4c 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,9 +1,9 @@ + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context="fr.wcs.blablacrade.MainActivity"> + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="20dp" + tools:context="fr.wcs.blablacrade.SearchItineraryActivity"> - - /> + + + + android:hint="@string/quan" + android:focusable="false" + android:layout_below="@+id/tewtView3"/> - - -