Add toolbar space to top

Author: kunall17

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

@@ -42,6 +42,7 @@
 
 
 public class MessageListFragment extends Fragment implements MessageListener {
+    private static final int PIXEL_OFFSET_MESSAGE_HEADERS = 24;
     private LinearLayoutManager linearLayoutManager;
 
     /**
@@ -142,7 +143,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         linearLayoutManager = new LinearLayoutManager(getContext());
         recyclerView.setLayoutManager(linearLayoutManager);
         adapter = new RecyclerMessageAdapter(messageList, getActivity(), (filter==null));
-        recyclerView.addItemDecoration(new HeaderSpaceItemDecoration(24));
+        recyclerView.addItemDecoration(new HeaderSpaceItemDecoration(PIXEL_OFFSET_MESSAGE_HEADERS, getContext()));
         recyclerView.setAdapter(adapter);
         registerForContextMenu(recyclerView);
         recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {

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

@@ -42,7 +42,7 @@ public class RecyclerMessageAdapter extends RecyclerView.Adapter<RecyclerView.Vi
 
     public static final int VIEWTYPE_MESSAGE_HEADER = 1;
     private static final int VIEWTYPE_MESSAGE = 2;
-    private static final int VIEWTYPE_HEADER = 3; //At position 0
+    public static final int VIEWTYPE_HEADER = 3; //At position 0
     private static final int VIEWTYPE_FOOTER = 4; //At end position
     private boolean startedFromFilter;
     private static String privateHuddleText;

app/src/main/java/com/zulip/android/viewholders/HeaderSpaceItemDecoration.java

@@ -1,7 +1,9 @@
 package com.zulip.android.viewholders;
 
+import android.content.Context;
 import android.graphics.Rect;
 import android.support.v7.widget.RecyclerView;
+import android.util.TypedValue;
 import android.view.View;
 
 import com.zulip.android.activities.RecyclerMessageAdapter;
@@ -10,8 +12,14 @@ public class HeaderSpaceItemDecoration extends RecyclerView.ItemDecoration {
 
     private final int verticalMargin;
 
-    public HeaderSpaceItemDecoration(int verticalMargin) {
+    private int toolbarHeight;
+
+    public HeaderSpaceItemDecoration(int verticalMargin, Context context) {
         this.verticalMargin = verticalMargin;
+        TypedValue tv = new TypedValue();
+        if (context.getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true)) {
+            toolbarHeight = TypedValue.complexToDimensionPixelSize(tv.data, context.getResources().getDisplayMetrics());
+        }
     }
 
     @Override
@@ -23,6 +31,8 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent,
         int viewType = parent.getAdapter().getItemViewType(position);
         if (viewType == RecyclerMessageAdapter.VIEWTYPE_MESSAGE_HEADER && position != 0) {
             outRect.top = verticalMargin;
+        } else if (viewType == RecyclerMessageAdapter.VIEWTYPE_HEADER) {
+            outRect.top = toolbarHeight;
         }
     }
 }