diff --git a/README b/README index 47b0d9e..14112b2 100644 --- a/README +++ b/README @@ -1,3 +1,14 @@ -## BLA BLA CRADE +## BLA BLA CLEAN -Paske c notre projé ! +Besoin d'un transport pour coder proprement ? Bla Bla Clean est là pour vous ! D'un simple clic +sur votre téléphone, trouvez un covoitureur développeur à n'importe quel moment. Sélectionnez votre +ville de départ, celle d'arrivée, ainsi que la date et l'heure de votre voyage, et nous nous occupons +du reste. Nous vous trouvons les meilleurs chauffeurs-codeurs de votre région et nous vous mettons en +relation avec eux. + +Vous ferez de belles rencontres et pourrez pester ensemble contre ces noobs qui produisent du trop +mauvais code plutôt que contre les embouteillages. + +Bla Bla Clean, avec nos chauffeurs-codeurs très disciplinés, vous ne verrez pas passer les kilomètres. + +A la prochaine ! (Signalez-nous les éventuels bugs que vous rencontrez) diff --git a/app/src/main/java/fr/wcs/blablacrade/MainActivity.java b/app/src/main/java/fr/wcs/blablacrade/MainActivity.java index 6bce270..b068540 100644 --- a/app/src/main/java/fr/wcs/blablacrade/MainActivity.java +++ b/app/src/main/java/fr/wcs/blablacrade/MainActivity.java @@ -16,12 +16,14 @@ 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.btn_search); 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..5712287 100644 --- a/app/src/main/java/fr/wcs/blablacrade/SearchItineraryActivity.java +++ b/app/src/main/java/fr/wcs/blablacrade/SearchItineraryActivity.java @@ -21,61 +21,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); + final EditText departure = (EditText) findViewById(R.id.departure); + final EditText destination = (EditText) findViewById(R.id.destination); + final EditText date = (EditText) findViewById(R.id.date); 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(); - - if (text1.isEmpty() || text2.isEmpty() - ) { + String departureValue = departure.getText().toString(); + String destinationValue = destination.getText().toString(); + String dateValue = date.getText().toString(); + if (departureValue.isEmpty() || destinationValue.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); + } + else { + Intent intent = new Intent(SearchItineraryActivity.this, ViewSearchItineraryResultsListActivity.class); + SearchRequestModel searchRequest=new SearchRequestModel(departureValue, destinationValue, dateValue); + intent.putExtra("searchRequest", searchRequest); + SearchItineraryActivity.this.startActivity(intent); - 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(date, calendar); }}; - edit3.setOnClickListener(new View.OnClickListener() { + date.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); + 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())); + } - 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..a2032f3 100644 --- a/app/src/main/java/fr/wcs/blablacrade/SearchRequestModel.java +++ b/app/src/main/java/fr/wcs/blablacrade/SearchRequestModel.java @@ -3,41 +3,38 @@ 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 SearchRequestModel(String departure, String destination, String date) { + this.departure = departure; + this.destination = destination; + this.date = date; } - - public String getOùilva() { - return oùilva; + public String getDeparture() { + return departure; } - public SearchRequestModel(String depare, String oùilva, String quan) { - this.depare = depare; - this.oùilva = oùilva; - this.quan = quan; + public String getDestination() { + return destination; } - protected SearchRequestModel(Parcel in) { - depare = in.readString(); - oùilva = in.readString(); - quan = in.readString(); - } + protected SearchRequestModel(Parcel in) { + departure = in.readString(); + destination = in.readString(); + date = 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(date); + } @Override @@ -46,8 +43,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 +54,7 @@ public SearchRequestModel[] newArray(int size) { } }; - public String getQuan() { - return quan; + public String getDate() { + return date; } } diff --git a/app/src/main/java/fr/wcs/blablacrade/TripResultAdapter.java b/app/src/main/java/fr/wcs/blablacrade/TripResultAdapter.java index 9fc3867..afe887e 100644 --- a/app/src/main/java/fr/wcs/blablacrade/TripResultAdapter.java +++ b/app/src/main/java/fr/wcs/blablacrade/TripResultAdapter.java @@ -9,16 +9,10 @@ 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 items; //data source of the list adapter + private Context context; + private ArrayList items; - //public constructor public TripResultAdapter(Context context, ArrayList items) { this.context = context; this.items = items; @@ -26,12 +20,12 @@ public TripResultAdapter(Context context, ArrayList items) { @Override public int getCount() { - return items.size(); //returns total of items in the list + return items.size(); } @Override public Object getItem(int position) { - return items.get(position); //returns list item at the specified position + return items.get(position); } @Override @@ -41,29 +35,17 @@ public long getItemId(int 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). - inflate(R.layout.trip_item, parent, false); + convertView = LayoutInflater.from(context).inflate(R.layout.item_trip, parent, false); } - - // get current item to be displayed TripResultModel currentItem = (TripResultModel) getItem(position); + TextView departure = convertView.findViewById(R.id.texteresu1); + TextView firstname = convertView.findViewById(R.id.textres2); + TextView price = convertView.findViewById(R.id.txt); + departure.setText(currentItem.getDate().toString()); + firstname.setText(currentItem.getFirstname()); + price.setText(String.valueOf(currentItem.getPrice())); - // 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 return convertView; } } \ No newline at end of file diff --git a/app/src/main/java/fr/wcs/blablacrade/TripResultModel.java b/app/src/main/java/fr/wcs/blablacrade/TripResultModel.java index a6960ae..e8af75e 100644 --- a/app/src/main/java/fr/wcs/blablacrade/TripResultModel.java +++ b/app/src/main/java/fr/wcs/blablacrade/TripResultModel.java @@ -2,26 +2,29 @@ import java.util.Date; -/** - * Created by wilder on 13/09/17. - */ public class TripResultModel { - public Date getDepare() { - return depare; + private Date date; + private String firstname; + private int price; + + public TripResultModel(String firstname, Date date, int price) { + this.firstname = firstname; + this.date = date; + this.price = price; + } + + public Date getDate() { + return date; } - public int getPri() { - return pri; + public int getPrice() { + return price; } - 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 String getFirstname() { + return firstname; } - private Date depare; - public String getPrénom() {return prénom;} } diff --git a/app/src/main/java/fr/wcs/blablacrade/ViewSearchItineraryResultsListActivity.java b/app/src/main/java/fr/wcs/blablacrade/ViewSearchItineraryResultsListActivity.java index 546ae80..22bdc17 100644 --- a/app/src/main/java/fr/wcs/blablacrade/ViewSearchItineraryResultsListActivity.java +++ b/app/src/main/java/fr/wcs/blablacrade/ViewSearchItineraryResultsListActivity.java @@ -16,25 +16,28 @@ 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 searchTrip = getIntent().getParcelableExtra("searchRequest"); + String departure = searchTrip.getDeparture(); + String destination = searchTrip.getDestination(); + String date = searchTrip.getDate(); + ListView searchResult = (ListView) findViewById(R.id.listViewSearchResults); + ArrayList listTrip = new ArrayList<>();SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy-hh:mm"); + + Toast.makeText(this, date, Toast.LENGTH_LONG).show(); + setTitle(departure + " >> " + destination); + + try { + listTrip.add(new TripResultModel("Bernard", sdf.parse("21/02/2017-15:30"), 15)); + listTrip.add(new TripResultModel("Jean-Jacques", sdf.parse("21/02/2017-16:00"), 20)); + listTrip.add(new TripResultModel("Bertrand", sdf.parse("21/02/2017-16:30"), 16)); + listTrip.add(new TripResultModel("Gertrude", sdf.parse("21/02/2017-17:00"), 40)); + } + catch (ParseException e) { + } + + TripResultAdapter adapter = new TripResultAdapter(this, listTrip); + searchResult.setAdapter(adapter); + } } diff --git a/app/src/main/res/layout/activity_search_itinerary.xml b/app/src/main/res/layout/activity_search_itinerary.xml index 5e8e7ca..ac483b4 100644 --- a/app/src/main/res/layout/activity_search_itinerary.xml +++ b/app/src/main/res/layout/activity_search_itinerary.xml @@ -6,47 +6,46 @@ android:padding="20dp" tools:context="fr.wcs.blablacrade.SearchItineraryActivity"> - + + android:hint="@string/departure" + android:layout_below="@+id/textView1" /> + android:text="@string/destination" + android:layout_below="@+id/departure" /> - + android:text="@string/date" + android:layout_below="@+id/destination" /> - + + +