Fixes: #264 Implemented One day before

Author: jainkuniya

app/src/androidTest/java/com/zulip/android/activities/RecyclerViewTests.java

@@ -9,7 +9,7 @@
 
 import com.zulip.android.R;
 import com.zulip.android.ZulipApp;
-import com.zulip.android.filters.NarrowFilterToday;
+import com.zulip.android.filters.NarrowFilterByDate;
 import com.zulip.android.helper.ViewAssertions;
 import com.zulip.android.models.MessageType;
 import com.zulip.android.util.ZLog;
@@ -193,7 +193,7 @@ public void checkTodaysFilter() {
             mActivityTestRule.runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
-                    mActivityTestRule.getActivity().doNarrow(new NarrowFilterToday());
+                    mActivityTestRule.getActivity().doNarrow(new NarrowFilterByDate());
                 }
             });
         } catch (Throwable throwable) {

app/src/main/java/com/zulip/android/activities/MessageListFragment.java

@@ -420,6 +420,20 @@ public void onMessages(Message[] messages, LoadPosition pos,
         }
 
         loadingMessages = false;
+        //check size of messageList
+        if (messageList.size()==0)
+            showEmptyView();
+        else
+            showRecyclerView();
+    }
+
+    /**
+     * hides TextView with no message
+     * show recyclerView
+     */
+    private void showRecyclerView() {
+        recyclerView.setVisibility(View.VISIBLE);
+        emptyTextView.setVisibility(View.GONE);
     }
 
     public void onMessageError(LoadPosition pos) {

app/src/main/java/com/zulip/android/activities/ZulipActivity.java

@@ -75,7 +75,7 @@
 import com.zulip.android.filters.NarrowFilterPM;
 import com.zulip.android.filters.NarrowFilterSearch;
 import com.zulip.android.filters.NarrowFilterStream;
-import com.zulip.android.filters.NarrowFilterToday;
+import com.zulip.android.filters.NarrowFilterByDate;
 import com.zulip.android.filters.NarrowListener;
 import com.zulip.android.gcm.GcmBroadcastReceiver;
 import com.zulip.android.gcm.Notifications;
@@ -106,6 +106,7 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -187,6 +188,8 @@ public void onReceive(Context contenxt, Intent intent) {
     private ImageView cameraBtn;
     private String mCurrentPhotoPath;
     private Uri mPhotoURI;
+    private Menu menu;
+    private Calendar calendar;
 
     @Override
     public void removeChatBox(boolean animToRight) {
@@ -543,11 +546,28 @@ public Cursor runQuery(CharSequence charSequence) {
                 handleSentImage(intent);
             }
         }
-
         // if device doesn't have camera, disable camera button
         if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA)) {
             cameraBtn.setEnabled(false);
         }
+        handleOnFragmentChange();
+        calendar = Calendar.getInstance();
+    }
+
+    private void handleOnFragmentChange() {
+        getSupportFragmentManager().addOnBackStackChangedListener(new FragmentManager.OnBackStackChangedListener() {
+            @Override
+            public void onBackStackChanged() {
+                if (menu == null)
+                    return;
+                if (narrowedList==null) {
+                    calendar = Calendar.getInstance();
+                    menu.getItem(2).getSubMenu().getItem(0).setTitle(R.string.menu_today);
+                } else if (narrowedList.filter instanceof NarrowFilterByDate) {
+                    menu.getItem(2).getSubMenu().getItem(0).setTitle(R.string.menu_one_day_before);
+                }
+            }
+        });
     }
 
     /**
@@ -1767,6 +1787,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
         if (this.logged_in) {
             getMenuInflater().inflate(R.menu.options, menu);
             prepareSearchView(menu);
+            this.menu = menu;
             return true;
         }
 
@@ -1857,7 +1878,12 @@ public void onClick(
                 onRefresh();
                 break;
             case R.id.today:
-                doNarrow(new NarrowFilterToday());
+                if (menu != null && menu.getItem(2).getSubMenu().getItem(0).getTitle().equals(getString(R.string.menu_one_day_before))) {
+                    calendar.add(Calendar.DATE, -1);
+                    doNarrow(new NarrowFilterByDate(calendar.getTime()));
+                    break;
+                }
+                doNarrow(new NarrowFilterByDate());
                 break;
             case R.id.logout:
                 logout();

app/src/main/java/com/zulip/android/filters/NarrowFilterByDate.java

@@ -0,0 +1,98 @@
+package com.zulip.android.filters;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.j256.ormlite.stmt.SelectArg;
+import com.j256.ormlite.stmt.Where;
+import com.zulip.android.models.Message;
+import com.zulip.android.models.Stream;
+
+import org.json.JSONException;
+
+import java.sql.SQLException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class NarrowFilterByDate implements NarrowFilter {
+
+    private Date date = new Date();
+
+    public static final Parcelable.Creator<NarrowFilterByDate> CREATOR = new Parcelable.Creator<NarrowFilterByDate>() {
+        public NarrowFilterByDate createFromParcel(Parcel in) {
+
+            return new NarrowFilterByDate();
+        }
+
+        public NarrowFilterByDate[] newArray(int size) {
+            return new NarrowFilterByDate[size];
+        }
+    };
+
+    public NarrowFilterByDate() {
+    }
+
+    public NarrowFilterByDate(Date date) {
+        this.date =date;
+    }
+
+    public int describeContents() {
+        return 0;
+    }
+
+    public void writeToParcel(Parcel dest, int flags) {
+    }
+
+    @Override
+    public Where<Message, Object> modWhere(Where<Message, Object> where)
+            throws SQLException {
+        where.like(Message.TIMESTAMP_FIELD, new SelectArg( date));
+        return where;
+    }
+
+    @Override
+    public boolean matches(Message msg) {
+        return isSameDay(date.getTime(),msg.getTimestamp().getTime());
+    }
+
+    @Override
+    public String getTitle() {
+        return isSameDay(date.getTime(),new Date().getTime()) ?"Today Messages" : "Messages";
+    }
+
+    @Override
+    public String getSubtitle() {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+        return dateFormat.format(date);
+    }
+
+    @Override
+    public Stream getComposeStream() {
+        return null;
+    }
+
+    @Override
+    public String getComposePMRecipient() {
+        return null;
+    }
+
+    @Override
+    public String getJsonFilter() throws JSONException {
+        return "{}";
+    }
+
+    @Override
+    public String toString() {
+        return "{}";
+    }
+
+    /**
+     * Checks two dates are of same day or not
+     * @param date1 long date1 to be compared with date2
+     * @param date2 long date2 to be compared with date1
+     * @return boolean
+     */
+    private static boolean isSameDay(long date1, long date2) {
+        return date1/86400000 == date2/86400000;
+    }
+}

app/src/main/java/com/zulip/android/filters/NarrowFilterToday.java

@@ -114,4 +114,5 @@
     <string name="delete_content_desp">delete</string>
     <string name="cancel_content_desp" tools:ignore="ButtonCase">cancel</string>
     <string name="camera_content_desp">take photo</string>
+    <string name="menu_one_day_before">One Day Before</string>
 </resources>