Skip to content

projet blabla crade nettoyé #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yosh970 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

projet blabla crade nettoyé #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
## BLA BLA CRADE

Paske c notre projé !
Bla Bla Propre
7 changes: 4 additions & 3 deletions app/src/main/java/fr/wcs/blablacrade/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}});
}
}
60 changes: 32 additions & 28 deletions app/src/main/java/fr/wcs/blablacrade/SearchItineraryActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}
}
46 changes: 23 additions & 23 deletions app/src/main/java/fr/wcs/blablacrade/SearchRequestModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -46,8 +46,8 @@ public int describeContents() {
}

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);
}

Expand All @@ -57,7 +57,7 @@ public SearchRequestModel[] newArray(int size) {
}
};

public String getQuan() {
return quan;
public String getDepartureDate() {
return departureDate;
}
}
18 changes: 9 additions & 9 deletions app/src/main/java/fr/wcs/blablacrade/TripResultAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<TripResultModel> items; //data source of the list adapter
private Context context;
private ArrayList<TripResultModel> items;

//public constructor
public TripResultAdapter(Context context, ArrayList<TripResultModel> items) {
Expand Down Expand Up @@ -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;
Expand Down
39 changes: 28 additions & 11 deletions app/src/main/java/fr/wcs/blablacrade/TripResultModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
40 changes: 20 additions & 20 deletions app/src/main/java/fr/wcs/blablacrade/ViewSearchItineraryResultsListActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<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) {
}
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<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) {
}
TripResultAdapter adapteur = new TripResultAdapter(this, tableau);result.setAdapter(adapteur);
}
}
8 changes: 4 additions & 4 deletions app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
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"
tools:context="fr.wcs.blablacrade.MainActivity">

<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
Expand Down
Loading