From 16f84094deaaf5ee3d0760814976fc5fc1932981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Pat=C3=A9rac?= Date: Thu, 15 Mar 2018 16:10:05 +0100 Subject: [PATCH] =?UTF-8?q?projet=20nettoy=C3=A9,=20corrig=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README | 3 +- app/build.gradle | 2 +- .../java/fr/wcs/blablacrade/MainActivity.java | 13 +-- .../blablacrade/SearchItineraryActivity.java | 84 ++++++++++--------- .../wcs/blablacrade/SearchRequestModel.java | 76 +++++++++-------- .../fr/wcs/blablacrade/TripResultAdapter.java | 34 ++++---- .../fr/wcs/blablacrade/TripResultModel.java | 24 +++--- ...iewSearchItineraryResultsListActivity.java | 47 ++++++----- app/src/main/res/layout/activity_main.xml | 23 ++--- .../res/layout/activity_search_itinerary.xml | 69 ++++++++------- ...ity_view_search_itinerary_results_list.xml | 5 +- app/src/main/res/layout/content_main.xml | 5 +- app/src/main/res/layout/trip_item.xml | 11 +-- app/src/main/res/values/strings.xml | 9 +- 14 files changed, 217 insertions(+), 188 deletions(-) diff --git a/README b/README index 47b0d9e..9efb178 100644 --- a/README +++ b/README @@ -1,3 +1,4 @@ ## BLA BLA CRADE -Paske c notre projé ! +c'est notre projet !! + diff --git a/app/build.gradle b/app/build.gradle index dce9482..5da825a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 26 - buildToolsVersion "26.0.2" + buildToolsVersion '27.0.3' defaultConfig { applicationId 'fr.wcs.blablacrade' minSdkVersion 15 diff --git a/app/src/main/java/fr/wcs/blablacrade/MainActivity.java b/app/src/main/java/fr/wcs/blablacrade/MainActivity.java index 6bce270..fe857ad 100644 --- a/app/src/main/java/fr/wcs/blablacrade/MainActivity.java +++ b/app/src/main/java/fr/wcs/blablacrade/MainActivity.java @@ -7,18 +7,19 @@ import android.view.View; import android.widget.Button; -public class MainActivity extends AppCompatActivity { - +public class MainActivity extends AppCompatActivity +{ @Override - protected void onCreate(Bundle savedInstanceState) { + 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() { + //Search button + 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); diff --git a/app/src/main/java/fr/wcs/blablacrade/SearchItineraryActivity.java b/app/src/main/java/fr/wcs/blablacrade/SearchItineraryActivity.java index 7a6c121..abaf2e7 100644 --- a/app/src/main/java/fr/wcs/blablacrade/SearchItineraryActivity.java +++ b/app/src/main/java/fr/wcs/blablacrade/SearchItineraryActivity.java @@ -14,31 +14,37 @@ import java.util.Calendar; import java.util.Locale; -public class SearchItineraryActivity extends AppCompatActivity { - +public class SearchItineraryActivity extends AppCompatActivity +{ @Override - protected void onCreate(Bundle savedInstanceState) { + 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 editstart = (EditText) findViewById(R.id.edit_start); + final EditText editdestination = (EditText) findViewById(R.id.edit_destination); + final EditText editdate = (EditText) findViewById(R.id.edit_date); + Button buttonpush = (Button) findViewById(R.id.button_push); - // clicq action - buttonSearch.setOnClickListener(new View.OnClickListener() { + // click action + buttonpush.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(); + public void onClick(View view) + { + String text1 = editstart.getText().toString(); + String text2 = editdestination.getText().toString(); + String texte = editdate.getText().toString(); - if (text1.isEmpty() || text2.isEmpty() - ) { + 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); + } + else + { + Intent intent = new Intent(SearchItineraryActivity.this, ViewSearchItineraryResultsListActivity.class); SearchRequestModel searchRequest=new SearchRequestModel(text1, text2, texte); intent.putExtra("searchRequest", searchRequest); SearchItineraryActivity.this.startActivity(intent); @@ -46,36 +52,38 @@ public void onClick(View view) { } }); - final Calendar calandréi = Calendar.getInstance(); - final DatePickerDialog.OnDateSetListener dateListener = new DatePickerDialog.OnDateSetListener() { + 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) + public void onClick(View view) + { + 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())); - } + 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())); + } } diff --git a/app/src/main/java/fr/wcs/blablacrade/SearchRequestModel.java b/app/src/main/java/fr/wcs/blablacrade/SearchRequestModel.java index 9b20bd2..fd7bfe3 100644 --- a/app/src/main/java/fr/wcs/blablacrade/SearchRequestModel.java +++ b/app/src/main/java/fr/wcs/blablacrade/SearchRequestModel.java @@ -7,37 +7,37 @@ * Created by bastienwcs on 21/09/17. */ -public class SearchRequestModel implements Parcelable { +public class SearchRequestModel implements Parcelable +{ + private String starting; + private String where; + private String when; - private String depare; - private String oùilva; - private String quan; - - public String getDepare() { - return depare; + public String getStarting() { + return starting; } - - public String getOùilva() { - return oùilva; + public String getwhere() { + return where; } - - public SearchRequestModel(String depare, String oùilva, String quan) { - this.depare = depare; - this.oùilva = oùilva; - this.quan = quan; + public SearchRequestModel(String starting, String where, String when) + { + this.starting = starting; + this.where = where; + this.when = when; } - protected SearchRequestModel(Parcel in) { - depare = in.readString(); - oùilva = in.readString(); - quan = in.readString(); - } - + protected SearchRequestModel(Parcel in) + { + starting = in.readString(); + where = in.readString(); + when = in.readString(); + } @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeString(depare); - dest.writeString(oùilva); - dest.writeString(quan); + public void writeToParcel(Parcel dest, int flags) + { + dest.writeString(starting); + dest.writeString(where); + dest.writeString(when); } @Override @@ -45,19 +45,21 @@ public int describeContents() { return 0; } - public static final Creator CREATOR = new Creator() { - @Override - public SearchRequestModel createFromParcel(Parcel in) { - return new SearchRequestModel(in); - } + public static final Creator CREATOR = new Creator() + { + @Override + public SearchRequestModel createFromParcel(Parcel in) + { + return new SearchRequestModel(in); + } - @Override - public SearchRequestModel[] newArray(int size) { - return new SearchRequestModel[size]; - } - }; + @Override + public SearchRequestModel[] newArray(int size) { + return new SearchRequestModel[size]; + } + }; - public String getQuan() { - return quan; + public String getWhen() { + return when; } } diff --git a/app/src/main/java/fr/wcs/blablacrade/TripResultAdapter.java b/app/src/main/java/fr/wcs/blablacrade/TripResultAdapter.java index 9fc3867..b745a06 100644 --- a/app/src/main/java/fr/wcs/blablacrade/TripResultAdapter.java +++ b/app/src/main/java/fr/wcs/blablacrade/TripResultAdapter.java @@ -13,13 +13,14 @@ * 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 - //public constructor - public TripResultAdapter(Context context, ArrayList items) { + + public TripResultAdapter(Context context, ArrayList items) + { this.context = context; this.items = items; } @@ -30,7 +31,8 @@ public int getCount() { } @Override - public Object getItem(int position) { + public Object getItem(int position) + { return items.get(position); //returns list item at the specified position } @@ -40,28 +42,26 @@ public long getItemId(int position) { } @Override - public View getView(int position, View convertView, ViewGroup parent) { + 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); + 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); - TextView firstname = (TextView) - convertView.findViewById(R.id.textres2); - TextView price = (TextView) - convertView.findViewById(R.id.txt); + TextView departure = (TextView) convertView.findViewById(R.id.text_trip_departure); + TextView firstname = (TextView) convertView.findViewById(R.id.text_trip_firstname); + TextView price = (TextView) convertView.findViewById(R.id.text_trip_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())); + 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..3f41f08 100644 --- a/app/src/main/java/fr/wcs/blablacrade/TripResultModel.java +++ b/app/src/main/java/fr/wcs/blablacrade/TripResultModel.java @@ -6,22 +6,24 @@ * Created by wilder on 13/09/17. */ -public class TripResultModel { +public class TripResultModel +{ - public Date getDepare() { - return depare; + public Date getDeparture() { + return departure; } - public int getPri() { - return pri; + public int getPrice() { + return price; } - private String prénom; - private int pri; + private String firstname; + 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.firstname = prénom;this.departure = depare;this.price = price; } - private Date depare; + private Date departure; - public String getPrénom() {return prénom;} + public String getFirstname() {return firstname;} } diff --git a/app/src/main/java/fr/wcs/blablacrade/ViewSearchItineraryResultsListActivity.java b/app/src/main/java/fr/wcs/blablacrade/ViewSearchItineraryResultsListActivity.java index 546ae80..f6a6ba6 100644 --- a/app/src/main/java/fr/wcs/blablacrade/ViewSearchItineraryResultsListActivity.java +++ b/app/src/main/java/fr/wcs/blablacrade/ViewSearchItineraryResultsListActivity.java @@ -9,32 +9,37 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; -public class ViewSearchItineraryResultsListActivity extends AppCompatActivity { +public class ViewSearchItineraryResultsListActivity extends AppCompatActivity +{ @Override - protected void onCreate(Bundle savedInstanceState) { + 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); + String textfirst = truc.getStarting(); + String textsecond = truc.getwhere(); + String textthird = truc.getWhen(); + + Toast.makeText(this, textthird, Toast.LENGTH_LONG).show(); + + setTitle(textfirst + " >> " + textsecond); + + + ListView résultat = (ListView) findViewById(R.id.list_view_search_results); + 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 adapter = new TripResultAdapter(this, tableau);résultat.setAdapter(adapter); } } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index f85c150..bddabf3 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,23 +1,24 @@ - + - + - + diff --git a/app/src/main/res/layout/activity_search_itinerary.xml b/app/src/main/res/layout/activity_search_itinerary.xml index 5e8e7ca..01b0583 100644 --- a/app/src/main/res/layout/activity_search_itinerary.xml +++ b/app/src/main/res/layout/activity_search_itinerary.xml @@ -1,52 +1,57 @@ - - + + + android:hint="@string/departure" + android:layout_below="@+id/text_depart" /> + + + android:hint="@string/where" + android:layout_below="@+id/text_destination"/> - + android:text="@string/when" + android:layout_below="@+id/edit_destination" /> - + -