more of timeline implemented

Author: nbhuiyan

app/src/main/java/com/cmput301f17t11/cupofjava/Controllers/EventFilteringHelper.java

@@ -1,5 +1,6 @@
 package com.cmput301f17t11.cupofjava.Controllers;
 
+import com.cmput301f17t11.cupofjava.Models.Habit;
 import com.cmput301f17t11.cupofjava.Models.HabitEvent;
 
 import java.util.ArrayList;
@@ -30,4 +31,26 @@ else if (o1.getHabitEventDate().getTime() == o2.getHabitEventDate().getTime()){
         });
         return events;
     }
+
+    public static ArrayList<HabitEvent> filterByComment(ArrayList<HabitEvent> events, String str){
+        ArrayList<HabitEvent> filteredEvents = new ArrayList<>();
+        for(int i = 0; i < events.size(); i++){
+            if (events.get(i).getComment().contains(str)){
+                filteredEvents.add(events.get(i));
+            }
+        }
+        return filteredEvents;
+    }
+
+    public static ArrayList<HabitEvent> filterByType(ArrayList<HabitEvent> events, String habitTitle){
+        ArrayList<HabitEvent> filteredEvents = new ArrayList<>();
+
+        for (int i = 0; i < events.size(); i++){
+            if (events.get(i).getHabitTitle().equals(habitTitle)){
+                filteredEvents.add(events.get(i));
+            }
+        }
+
+        return filteredEvents;
+    }
 }

app/src/main/java/com/cmput301f17t11/cupofjava/Views/HabitEventTimeLineActivity.java

@@ -10,6 +10,7 @@
 
 package com.cmput301f17t11.cupofjava.Views;
 
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.location.Location;
@@ -133,7 +134,7 @@ public void onClick(View v) {
             @Override
             public void onClick(final View v) {
                 AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
-                builder.setTitle("Filter Events by Comment").setMessage("Enter Comment to search");
+                builder.setTitle("Search events by comment").setMessage("Enter comment:");
 
                 final EditText input = new EditText(getContext());
                 LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
@@ -147,6 +148,20 @@ public void onClick(final View v) {
                     public void onClick(DialogInterface dialog, int which) {
 
                         String comment = input.getText().toString();
+                        if (comment.length() == 0){
+                            String text = "Error: Cannot search for empty string!";
+                            int length = Toast.LENGTH_SHORT;
+                            Context context = getContext();
+                            Toast toast = Toast.makeText(context,text, length);
+                            toast.show();
+                            dialog.dismiss();
+                        }
+
+                        events = EventFilteringHelper.filterByComment(events, comment);
+                        events = EventFilteringHelper.reverseChronological(events);
+                        updateTextView(events.size());
+                        updateListView(events);
+
                     }
                 })
                         .setNegativeButton("CANCEL", new DialogInterface.OnClickListener() {
@@ -367,20 +382,4 @@ public int compare(HabitEvent o1, HabitEvent o2) {
         });
         return events;
     }
-
-
-    /* Not Working
-    public ArrayList<HabitEvent> filterByComment(ArrayList<HabitEvent> events, String comment) {
-        ArrayList<HabitEvent> finalEvents = new ArrayList<>();
-
-        for (int i=0; i < events.size(); i++) {
-            HabitEvent event = events.get(i);
-            String checkComment = event.getComment();
-            if (checkComment.contains(comment)) {
-                finalEvents.add(event);
-            }
-        }
-        return finalEvents;
-    }
-    */
 }

app/src/main/res/layout/activity_habit_time_line.xml

@@ -67,7 +67,7 @@
                     android:gravity="center"
                     android:paddingLeft="8dp"
                     android:paddingRight="8dp"
-                    android:text="BY COMMENT" />
+                    android:text="BY COMMENT"/>
 
             </LinearLayout>
 
@@ -79,18 +79,20 @@
                 <android.support.v7.widget.AppCompatSpinner
                     android:id="@+id/Filter_by_habit"
                     style="@android:style/Widget.Holo.Light.Spinner"
-                    android:layout_width="wrap_content"
+                    android:layout_width="251dp"
                     android:layout_height="48dp"
                     android:layout_gravity="center_horizontal"
                     android:layout_marginBottom="8dp"
                     android:layout_marginLeft="16dp"
                     android:layout_marginRight="16dp"
                     android:layout_weight="1"
                     android:backgroundTint="@color/colorAccentL"
+                    android:contentDescription="Select Habit"
                     android:paddingLeft="8dp"
                     android:paddingRight="8dp"
+                    android:popupBackground="@drawable/common_google_signin_btn_icon_light"
                     android:prompt="@id/Filter_by_habit"
-                    android:text="BY HABIT" />
+                    android:text="BY HABIT"/>
 
                 <Button
                     android:id="@+id/viewMapButton"