Skip to content

correction code #4

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
Boulzevard wants to merge 1 commit into
base: master
Choose a base branch
from
Open

correction code #4

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
4 changes: 2 additions & 2 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 @@ -17,11 +17,11 @@ protected void onCreate(Bundle savedInstanceState) {
setSupportActionBar(toolbar);

//bouton cherché
Button Search = (Button) findViewById(R.id.gogogo);
Button Search = (Button) findViewById(R.id.button_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);
}});
}
}
53 changes: 28 additions & 25 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,50 +21,54 @@ 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 stringDepart = editDepart.getText().toString();
String stringDestination = editDestination.getText().toString();
String stringDate = editDate.getText().toString();

if ( stringDepart.isEmpty() || stringDestination.isEmpty() )
{
Toast.makeText(SearchItineraryActivity.this, R.string.form_error, Toast.LENGTH_SHORT).show();
}

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);
else
{
Intent intent = new Intent(SearchItineraryActivity.this, ViewSearchItineraryResultsListActivity.class);

SearchRequestModel searchRequest=new SearchRequestModel(stringDepart, stringDestination, stringDate); intent.putExtra("searchRequest", searchRequest);

SearchItineraryActivity.this.startActivity(intent);
}
}
}
});

final Calendar calandréi = Calendar.getInstance();
final Calendar calendrier = 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);
calendrier.set(Calendar.YEAR, ané);
calendrier.set(Calendar.MONTH, moi);
calendrier.set(Calendar.DAY_OF_MONTH, joure);
UpdateLabel(editDate, calendrier);
}};

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)
calendrier.get(Calendar.YEAR),
calendrier.get(Calendar.MONTH),
calendrier.get(Calendar.DAY_OF_MONTH)
).show();
}
});
Expand All @@ -73,7 +77,6 @@ public void onClick(View view) {
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()));
Expand Down
32 changes: 16 additions & 16 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 @@ -10,44 +10,44 @@
public class SearchRequestModel implements Parcelable {

private String depare;
private String oùilva;
private String quan;
private String destination;
private String date;

public String getDepare() {
return depare;
}

public String getOùilva() {
return oùilva;
public String getDestination() {
return destination;
}

public SearchRequestModel(String depare, String oùilva, String quan) {
public SearchRequestModel(String depare, String destination, String date) {
this.depare = depare;
this.oùilva = oùilva;
this.quan = quan;
this.destination = destination;
this.date = date;
}

protected SearchRequestModel(Parcel in) {
depare = in.readString();
oùilva = in.readString();
quan = 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(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);
}

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

public String getQuan() {
return quan;
public String getDate() {
return date;
}
}
27 changes: 12 additions & 15 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,25 +13,24 @@
* 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
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
Expand All @@ -41,29 +40,27 @@ 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);
}

// get current item to be displayed

TripResultModel currentItem = (TripResultModel) getItem(position);

// get the TextView for item name and item description

TextView departure = (TextView)
convertView.findViewById(R.id.texteresu1);
convertView.findViewById(R.id.textView_departure);
TextView firstname = (TextView)
convertView.findViewById(R.id.textres2);
convertView.findViewById(R.id.textView_firstname);
TextView price = (TextView)
convertView.findViewById(R.id.txt);
convertView.findViewById(R.id.textView_price);

//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()));
price.setText(String.valueOf(currentItem.getPrice()));

// returns the view for the current row
return convertView;
}
}
12 changes: 7 additions & 5 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 @@ -12,15 +12,17 @@ public Date getDepare() {
return depare;
}

public int getPri() {
return pri;
public int getPrice() {
return price;
}

private String prénom;
private int pri;
private int price;

public TripResultModel(String prénom, Date depare, int pri) {
this.prénom = prénom;this.depare = depare;this.pri = pri;
public TripResultModel(String prénom, Date depare, int price) {
this.prénom = prénom;this.depare = depare;this.price = price;
}

private Date depare;

public String getPrénom() {return prénom;}
Expand Down
22 changes: 12 additions & 10 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,27 @@ 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();
SearchRequestModel model = getIntent().getParcelableExtra("searchRequest");
String stringDepart = model.getDepare();
String stringDestination = model.getDestination();
String stringDate = model.getDate();

Toast.makeText(this, texte3, Toast.LENGTH_LONG).show();
Toast.makeText(this, stringDate, Toast.LENGTH_LONG).show();

setTitle(text1 + " >> " + TEXTEDEUX);
setTitle(stringDepart + " >> " + stringDestination);

// TODO : add résult to tableau
ListView résultat = (ListView) findViewById(R.id.listViewSearchResults);
ListView list = (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);

catch (ParseException e) {
}

TripResultAdapter adapteur = new TripResultAdapter(this, tableau);list.setAdapter(adapteur);
}
}
55 changes: 28 additions & 27 deletions app/src/main/res/layout/activity_search_itinerary.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,47 +6,48 @@
android:padding="20dp"
tools:context="fr.wcs.blablacrade.SearchItineraryActivity">

<TextView
android:id="@+id/textView1"
<TextView
android:id="@+id/textView_depart"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/depare" /> <EditText
android:id="@+id/editText1"
android:text="@string/depare" />

<EditText
android:id="@+id/editText_depart"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/depare"
android:layout_below="@+id/textView1"


/>
android:layout_below="@+id/textView_depart" />

<TextView
android:id="@+id/textView2"
android:id="@+id/textView_destination"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/oùilva"
android:layout_below="@+id/editText1" />
android:layout_below="@+id/editText_depart" />

<EditText android:id="@+id/editText2"
<EditText
android:id="@+id/editText_destination"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:hint="@string/oùilva" android:layout_below="@+id/textView2"/><TextView android:id="@+id/tewtView3"
android:hint="@string/oùilva" android:layout_below="@+id/textView_destination"/><TextView android:id="@+id/tewtView3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/quan"
android:layout_below="@+id/editText2" />
android:layout_below="@+id/editText_destination" />

<EditText
android:id="@+id/editText3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/quan"
android:focusable="false"
android:layout_below="@+id/tewtView3"/>
<EditText
android:id="@+id/editText_date"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/quan"
android:focusable="false"
android:layout_below="@+id/tewtView3"/>

<Button
android:id="@+id/button_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/search_text"
android:layout_below="@id/editText_date"/>

<Button
android:id="@+id/push"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/search_text"
android:layout_below="@id/editText3"/>
</RelativeLayout>
</RelativeLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/content_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
android:gravity="center">

<Button
android:id="@+id/gogogo"
android:id="@+id/button_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/search_itinerary"
Expand Down
Loading