Merge pull request #2 from MaximeCrp/test-print-date

fix: change date print for humans
MaximeCrp · Dec 1, 2018 · 8f3d085 · 8f3d085
2 parents e9a561c + 7a02e87
commit 8f3d085
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/Samva/app/src/main/java/com/example/utilisateur/samva/DetailsFragment.java b/Samva/app/src/main/java/com/example/utilisateur/samva/DetailsFragment.java
@@ -54,7 +54,11 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         Context context = getContext();
 
         title.setText(event.getTitle());
-        date.setText(event.getTimetable());
+        String text="";
+        for(int i=0 ; i<event.getDate().length ; i++) {
+            text+= event.getDate()[i][0] + "\n" + event.getDate()[i][1] + "\n";
+        }
+        date.setText(text);
         placename.setText(event.getPlacename());
         address.setText(event.getAddress());
         Picasso.with(context).load("http://jackjack.fr/wp-content/uploads/2017/04/bandeau_programmation.jpg").into(image);

diff --git a/Samva/app/src/main/java/com/example/utilisateur/samva/Event.java b/Samva/app/src/main/java/com/example/utilisateur/samva/Event.java
@@ -21,6 +21,7 @@ public class Event implements Serializable, ClusterItem {
     private ArrayList<Double> latlon = new ArrayList<Double>();
 
 
+
     Event() {}
 
     @Override
@@ -45,6 +46,11 @@ public String getTimetable() {
         return timetable;
     }
 
+    public void setTimetable(String timetable) {
+        this.timetable = timetable;
+        putDate(timetable);
+    }
+
     public String getAddress() {
         return address;
     }
@@ -95,6 +101,7 @@ public void putDate(String timetable){
         else {
             enter[0] = timetable;
         }
+        String[][] enter2 = new String[enter.length][2];
         this.date = new String[enter.length][2];
 
         for (int i = 0; i < enter.length; i++) {

diff --git a/Samva/app/src/main/java/com/example/utilisateur/samva/EventAdapter.java b/Samva/app/src/main/java/com/example/utilisateur/samva/EventAdapter.java
@@ -36,7 +36,7 @@ public void onBindViewHolder(@NonNull EventViewHolder holder, int position) {
         holder.txvName.setText(eventToDisplay.getTitle());
         String text="";
         for(int i=0 ; i<eventToDisplay.getDate().length ; i++) {
-            text+= eventToDisplay.getDate()[i][0] + " - " + eventToDisplay.getDate()[i][1] + "\n";
+            text += "Début : " + eventToDisplay.getDate()[i][0] + "\nFin : " + eventToDisplay.getDate()[i][1] + "\n";
         }
         holder.txvDate.setText(text);