Bla Bla Crade > BlaBlaClean

app/src/androidTest/java/fr/wcs/ateliercode/ExampleInstrumentedTest.java

@@ -0,0 +1,26 @@
+package fr.wcs.ateliercode;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("fr.wcs.ateliercode", appContext.getPackageName());
+    }
+}

app/src/main/AndroidManifest.xml

@@ -20,7 +20,7 @@
             </intent-filter>
         </activity>
         <activity android:name="fr.wcs.blablacrade.SearchItineraryActivity" android:label="@string/search_text" />
-        <activity android:name="fr.wcs.blablacrade.ViewSearchItineraryResultsListActivity" />
+        <activity android:name="fr.wcs.blablacrade.SearchItineraryListActivity" />
     </application>
 
 </manifest>

app/src/main/java/fr/wcs/blablacrade/MainActivity.java

@@ -13,15 +13,18 @@ public class MainActivity extends AppCompatActivity {
     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);
+        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 goToItineraryActivity = new Intent(MainActivity.this, SearchItineraryActivity.class);
+                startActivity(goToItineraryActivity);
+            }
+        });
     }
 }

app/src/main/java/fr/wcs/blablacrade/SearchItineraryActivity.java

@@ -21,61 +21,64 @@ 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 editDeparture = (EditText) findViewById(R.id.edit_departure);
+        final EditText editDestination = (EditText) findViewById(R.id.edit_destination);
+        final EditText editDate = (EditText) findViewById(R.id.edit_date);
+        Button searchList = (Button) findViewById(R.id.button_search_list);
 
-        // clicq action
-        buttonSearch.setOnClickListener(new View.OnClickListener() {
+        searchList.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()
-                        ) {
-                    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);
-
-                        SearchItineraryActivity.this.startActivity(intent);
+                String textDeparture = editDeparture.getText().toString();
+                String textDestination = editDestination.getText().toString();
+                String textDate = editDate.getText().toString();
+
+                if (textDeparture.isEmpty() || textDestination.isEmpty()) {
+
+                    Toast errorToast = Toast.makeText(getApplicationContext(), getResources().getString(R.string.form_error), Toast.LENGTH_SHORT);
+                    errorToast.show();
+
+                }else {
+                    Intent goToItineraryListActivity = new Intent(SearchItineraryActivity.this, SearchItineraryListActivity.class);
+                    SearchRequestModel searchRequest = new SearchRequestModel(textDeparture, textDestination, textDate);
+                    goToItineraryListActivity.putExtra("searchRequest", searchRequest);
+
+                    SearchItineraryActivity.this.startActivity(goToItineraryListActivity);
                 }
             }
         });
 
-        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);
-            }};
-
-        edit3.setOnClickListener(new View.OnClickListener() {
+            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);
+            }
+        };
+
+        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)
+                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";
+    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()));
+    }
 }

app/src/main/java/fr/wcs/blablacrade/SearchItineraryListActivity.java

@@ -0,0 +1,41 @@
+package fr.wcs.blablacrade;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.widget.ListView;
+import android.widget.Toast;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+
+public class SearchItineraryListActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_view_search_itinerary_results_list);
+
+        SearchRequestModel results = getIntent().getParcelableExtra("searchRequest");
+        String departureString = results.getDeparture();
+        String destinationString = results.getDestination();
+        String dateString = results.getDate();
+
+        Toast.makeText(this, dateString, Toast.LENGTH_LONG).show();
+
+        setTitle(departureString + " >> " + destinationString);
+
+        ListView listView = (ListView) findViewById(R.id.listViewSearchResults);
+        ArrayList<TripResultModel> arrayResults = new ArrayList<>();
+        SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy-hh:mm");
+        try {
+            arrayResults.add(new TripResultModel("Bernard", sdf.parse("21/02/2017-15:30"), 15));
+            arrayResults.add(new TripResultModel("Jean-Jacques", sdf.parse("21/02/2017-16:00"), 20));
+            arrayResults.add(new TripResultModel("Bertrand", sdf.parse("21/02/2017-16:30"), 16));
+            arrayResults.add(new TripResultModel("Gertrude", sdf.parse("21/02/2017-17:00"), 40));
+        } catch (ParseException e) {
+        }
+        TripResultAdapter adapter = new TripResultAdapter(this, arrayResults);
+        listView.setAdapter(adapter);
+    }
+}

app/src/main/java/fr/wcs/blablacrade/SearchRequestModel.java

@@ -9,55 +9,61 @@
 
 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 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 date) {
+        this.departure = departure;
+        this.destination = destination;
+        this.date = date;
     }
 
-        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
     public int describeContents() {
+
         return 0;
     }
 
     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 createFromParcel(Parcel in) {
+
+                return new SearchRequestModel(in);
+
+            }
+
+            @Override
+            public SearchRequestModel[] newArray(int size) {
+
+                return new SearchRequestModel[size];
+
+            }
     };
 
-    public String getQuan() {
-        return quan;
+    public String getDate() {
+        return date;
     }
 }

app/src/main/java/fr/wcs/blablacrade/TripResultAdapter.java

@@ -36,34 +36,30 @@ public Object getItem(int position) {
 
     @Override
     public long getItemId(int position) {
+
         return 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.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 departureResults = (TextView) convertView.findViewById(R.id.text_departure);
+        TextView firstnameResults = (TextView) convertView.findViewById(R.id.text_firstname);
+        TextView price = (TextView) convertView.findViewById(R.id.text_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()));
+        departureResults.setText(currentItem.getDeparture().toString());
+        firstnameResults.setText(currentItem.getFirstname());
+        price.setText(String.valueOf(currentItem.getPrice()));
 
-        // returns the view for the current row
         return convertView;
     }
 }