bastienapp · Sijey31 · Mar 15, 2018
diff --git 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
@@ -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
@@ -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
@@ -14,68 +14,76 @@
 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);
                 }
             }
         });
 
-        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
@@ -7,57 +7,59 @@
  * 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
     public int describeContents() {
         return 0;
     }
 
-    public static final Creator<SearchRequestModel> CREATOR = new Creator<SearchRequestModel>() {
-                @Override
-                public SearchRequestModel createFromParcel(Parcel in) {
-            return new SearchRequestModel(in);
-        }
+    public static final Creator<SearchRequestModel> CREATOR = new Creator<SearchRequestModel>()
+        {
+            @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
@@ -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<TripResultModel> items; //data source of the list adapter
 
-    //public constructor 
-    public TripResultAdapter(Context context, ArrayList<TripResultModel> items) {
+
+    public TripResultAdapter(Context context, ArrayList<TripResultModel> 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
@@ -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;}
 }