Merge pull request #218 from pulsejet/patch28

Fix multiple bugs

.idea/vcs.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file

app/build.gradle

@@ -11,7 +11,6 @@ android {
         versionCode 17
         versionName "1.0.12-beta"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        resValue "string", "google_maps_key", (project.findProperty("GOOGLE_MAPS_API_KEY") ?: "")
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {

app/src/main/java/app/insti/Constants.java

@@ -53,9 +53,4 @@ public class Constants {
     public static final double MAP_Xn = 19.134417, MAP_Yn = 72.901229, MAP_Zn = 1757, MAP_Zyn = 501;
     public static final double[] MAP_WEIGHTS_X = {-11.392001766454612, -36.31634553309953, 73.91269388324432, -24.14021153064087, 3.4508817531539115, -0.1462262375477863, 5.532505074667804, -1.542391995870977, 36.14211738142935};
     public static final double[] MAP_WEIGHTS_Y = {0.09738953520399705, -4.519868444089616, 62.38493718381985, 16.664561869057696, -2.168377988768651, 0.0919143297622087, 0.32304266159540823, 0.21688067854428716, -12.81393255320748};
-
-    public static final String resizeImageUrl(String url, Integer dim) {
-        if (url == null) { return url; }
-        return url.replace("api.insti.app/static/", "img.insti.app/static/" + dim.toString() + "/");
-    }
 }

app/src/main/java/app/insti/InstiAppFirebaseMessagingService.java

@@ -138,7 +138,7 @@ public class InstiAppFirebaseMessagingService extends FirebaseMessagingService {
                 Bitmap largeIcon = null;
                 if (largeIconUrl != null) {
                      largeIcon = getCroppedBitmap(
-                             Picasso.get().load(Constants.resizeImageUrl(largeIconUrl, 200)).get(), 200);
+                             Picasso.get().load(Utils.resizeImageUrl(largeIconUrl)).get(), 200);
                 }
                 bitmaps = new Bitmap[]{image, largeIcon};
             } catch (IOException e) {

app/src/main/java/app/insti/UpdatableList.java

+package app.insti;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class UpdatableList<T> extends ArrayList<T> {
+    private List<T> cache = new ArrayList<>();
+
+    public List<T> getCache() {
+        return cache;
+    }
+
+    public void setCache(List<T> mCache) {
+        cache = mCache;
+    }
+
+    /** Update existing or add */
+    public void updateCache(T t) {
+        for (int i = 0; i < cache.size(); i++) {
+            T cachedT = cache.get(i);
+            if (cachedT.equals(t)) {
+                cache.set(i, t);
+                return;
+            }
+        }
+        cache.add(t);
+    }
+}

app/src/main/java/app/insti/Utils.java

+package app.insti;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentTransaction;
+import android.widget.ImageView;
+
+import com.google.gson.Gson;
+import com.squareup.picasso.Callback;
+import com.squareup.picasso.Picasso;
+
+import app.insti.api.RetrofitInterface;
+import app.insti.api.model.Body;
+import app.insti.api.model.Event;
+import app.insti.api.model.User;
+import app.insti.fragment.BodyFragment;
+import app.insti.fragment.EventFragment;
+import app.insti.fragment.UserFragment;
+
+public final class Utils {
+    private static String sessionId;
+    private static RetrofitInterface retrofitInterface;
+    public static UpdatableList<Event> eventCache = new UpdatableList<>();
+
+    public static final void loadImageWithPlaceholder(final ImageView imageView, final String url) {
+        Picasso.get()
+            .load(resizeImageUrl(url))
+            .into(imageView, new Callback() {
+                @Override
+                public void onSuccess() {
+                    Picasso.get()
+                            .load(url)
+                            .placeholder(imageView.getDrawable())
+                            .into(imageView);
+                }
+                @Override
+                public void onError(Exception ex) {}
+            });
+    }
+
+    public static final String resizeImageUrl(String url) {
+        return resizeImageUrl(url, 200);
+    }
+
+    public static final String resizeImageUrl(String url, Integer dim) {
+        if (url == null) { return url; }
+        return url.replace("api.insti.app/static/", "img.insti.app/static/" + dim.toString() + "/");
+    }
+
+    /** Update the open fragment */
+    public static final void updateFragment(Fragment fragment, FragmentActivity fragmentActivity) {
+        FragmentTransaction ft = fragmentActivity.getSupportFragmentManager().beginTransaction();
+        ft.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_left, R.anim.slide_in_right, R.anim.slide_out_right);
+        ft.replace(R.id.framelayout_for_fragment, fragment, fragment.getTag());
+        ft.addToBackStack(fragment.getTag());
+        ft.commit();
+    }
+
+    public static void openBodyFragment(Body body, FragmentActivity fragmentActivity) {
+        Bundle bundle = new Bundle();
+        bundle.putString(Constants.BODY_JSON, new Gson().toJson(body));
+        BodyFragment bodyFragment = new BodyFragment();
+        bodyFragment.setArguments(bundle);
+        updateFragment(bodyFragment, fragmentActivity);
+    }
+
+    public static void openEventFragment(Event event, FragmentActivity fragmentActivity) {
+        String eventJson = new Gson().toJson(event);
+        Bundle bundle = new Bundle();
+        bundle.putString(Constants.EVENT_JSON, eventJson);
+        EventFragment eventFragment = new EventFragment();
+        eventFragment.setArguments(bundle);
+        updateFragment(eventFragment, fragmentActivity);
+    }
+
+    public static void openUserFragment(User user, FragmentActivity fragmentActivity) {
+        Bundle bundle = new Bundle();
+        bundle.putString(Constants.USER_ID, user.getUserID());
+        UserFragment userFragment = new UserFragment();
+        userFragment.setArguments(bundle);
+        updateFragment(userFragment, fragmentActivity);
+    }
+
+    public static void setSessionId(String sessionId1) {
+        sessionId = sessionId1;
+    }
+
+    public static String getSessionIDHeader() {
+        return "sessionid=" + sessionId;
+    }
+
+    public static RetrofitInterface getRetrofitInterface() {
+        return retrofitInterface;
+    }
+
+    public static void setRetrofitInterface(RetrofitInterface retrofitInterface) {
+        Utils.retrofitInterface = retrofitInterface;
+    }
+}

app/src/main/java/app/insti/activity/MainActivity.java

@@ -15,6 +15,7 @@ import android.os.Bundle;
 import android.support.design.widget.NavigationView;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.view.GravityCompat;
@@ -43,6 +44,7 @@ import java.util.List;
 import app.insti.Constants;
 import app.insti.R;
 import app.insti.SessionManager;
+import app.insti.Utils;
 import app.insti.api.EmptyCallback;
 import app.insti.api.RetrofitInterface;
 import app.insti.api.ServiceGenerator;
@@ -90,15 +92,10 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
     private boolean showNotifications = false;
     private BackHandledFragment selectedFragment;
     private Menu menu;
-    private RetrofitInterface retrofitInterface;
 
     /** which menu item should be checked on activity start */
     private int initMenuChecked = R.id.nav_feed;
 
-    public RetrofitInterface getRetrofitInterface() {
-        return retrofitInterface;
-    }
-
     public static void hideKeyboard(Activity activity) {
         InputMethodManager imm = (InputMethodManager) activity.getSystemService(Activity.INPUT_METHOD_SERVICE);
         //Find the currently focused view, so we can grab the correct window token from it.
@@ -115,7 +112,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         super.onCreate(savedInstanceState);
 
         ServiceGenerator serviceGenerator = new ServiceGenerator(getApplicationContext());
-        this.retrofitInterface = serviceGenerator.getRetrofitInterface();
+        Utils.setRetrofitInterface(serviceGenerator.getRetrofitInterface());
 
         /* Make notification channel on oreo */
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
@@ -151,8 +148,8 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
     }
 
     private void fetchNotifications() {
-        RetrofitInterface retrofitInterface = getRetrofitInterface();
-        retrofitInterface.getNotifications(getSessionIDHeader()).enqueue(new EmptyCallback<List<Notification>>() {
+        RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
+        retrofitInterface.getNotifications(Utils.getSessionIDHeader()).enqueue(new EmptyCallback<List<Notification>>() {
             @Override
             public void onResponse(Call<List<Notification>> call, Response<List<Notification>> response) {
                 if (response.isSuccessful()) {
@@ -181,7 +178,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
     private void checkLatestVersion() {
         final int versionCode = getCurrentVersion();
         if (versionCode == 0) { return; }
-        RetrofitInterface retrofitInterface = getRetrofitInterface();
+        RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
         retrofitInterface.getLatestVersion().enqueue(new EmptyCallback<JsonObject>() {
             @Override
             public void onResponse(Call<JsonObject> call, Response<JsonObject> response) {
@@ -247,7 +244,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         /* Mark the notification read */
         final String notificationId = bundle.getString(FCM_BUNDLE_NOTIFICATION_ID);
         if (notificationId != null) {
-            getRetrofitInterface().markNotificationRead(getSessionIDHeader(), notificationId).enqueue(new EmptyCallback<Void>());
+            Utils.getRetrofitInterface().markNotificationRead(Utils.getSessionIDHeader(), notificationId).enqueue(new EmptyCallback<Void>());
         }
 
         /* Follow the notification */
@@ -316,22 +313,17 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
     /** Open the body fragment from given id */
     private void openBodyFragment(String id) {
-        Body body = new Body(id);
-        BodyFragment bodyFragment = BodyFragment.newInstance(body);
-        updateFragment(bodyFragment);
+        Utils.openBodyFragment(new Body(id), this);
     }
 
     /** Open the event fragment from the provided id */
     private void openEventFragment(String id) {
-        RetrofitInterface retrofitInterface = getRetrofitInterface();
-        retrofitInterface.getEvent(getSessionIDHeader(), id).enqueue(new EmptyCallback<Event>() {
+        RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
+        final FragmentActivity self = this;
+        retrofitInterface.getEvent(Utils.getSessionIDHeader(), id).enqueue(new EmptyCallback<Event>() {
             @Override
             public void onResponse(Call<Event> call, Response<Event> response) {
-                EventFragment eventFragment = new EventFragment();
-                Bundle bundle = new Bundle();
-                bundle.putString(Constants.EVENT_JSON, response.body().toString());
-                eventFragment.setArguments(bundle);
-                updateFragment(eventFragment);
+                Utils.openEventFragment(response.body(), self);
             }
         });
     }
@@ -366,6 +358,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         super.onStart();
         initNavigationView();
         if (session.isLoggedIn()) {
+            Utils.setSessionId(session.getSessionID());
             currentUser = User.fromString(session.pref.getString(Constants.CURRENT_USER, ""));
             updateNavigationView();
             updateFCMId();
@@ -380,9 +373,9 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
             @Override
             public void onSuccess(InstanceIdResult instanceIdResult) {
                 final String fcmId = instanceIdResult.getToken();
-                RetrofitInterface retrofitInterface = getRetrofitInterface();
+                RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
 
-                retrofitInterface.patchUserMe(getSessionIDHeader(), new UserFCMPatchRequest(fcmId, getCurrentVersion())).enqueue(new EmptyCallback<User>() {
+                retrofitInterface.patchUserMe(Utils.getSessionIDHeader(), new UserFCMPatchRequest(fcmId, getCurrentVersion())).enqueue(new EmptyCallback<User>() {
                     @Override
                     public void onResponse(Call<User> call, Response<User> response) {
                         if (response.isSuccessful()) {
@@ -411,11 +404,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         header.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Bundle bundle = new Bundle();
-                bundle.putString(Constants.USER_ID, currentUser.getUserID());
-                UserFragment userFragment = new UserFragment();
-                userFragment.setArguments(bundle);
-                updateFragment(userFragment);
+                openUserFragment(currentUser.getUserID());
                 DrawerLayout drawer = findViewById(R.id.drawer_layout);
                 drawer.closeDrawer(GravityCompat.START);
             }
@@ -597,10 +586,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         }
     }
 
-    public String getSessionIDHeader() {
-        return "sessionid=" + session.getSessionID();
-    }
-
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);

app/src/main/java/app/insti/adapter/BodyAdapter.java

 package app.insti.adapter;
 
 import android.content.Context;
+import android.support.v4.app.Fragment;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -12,21 +13,20 @@ import com.squareup.picasso.Picasso;
 
 import java.util.List;
 
-import app.insti.Constants;
-import app.insti.interfaces.ItemClickListener;
 import app.insti.R;
+import app.insti.Utils;
 import app.insti.api.model.Body;
 
 
 public class BodyAdapter extends RecyclerView.Adapter<BodyAdapter.ViewHolder> {
 
     private List<Body> bodyList;
-    private ItemClickListener itemClickListener;
     private Context context;
+    private Fragment fragment;
 
-    public BodyAdapter(List<Body> bodyList, ItemClickListener itemClickListener) {
+    public BodyAdapter(List<Body> bodyList, Fragment mFragment) {
         this.bodyList = bodyList;
-        this.itemClickListener = itemClickListener;
+        fragment = mFragment;
     }
 
     @Override
@@ -39,7 +39,7 @@ public class BodyAdapter extends RecyclerView.Adapter<BodyAdapter.ViewHolder> {
         v.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                itemClickListener.onItemClick(view, postViewHolder.getAdapterPosition());
+                Utils.openBodyFragment(bodyList.get(postViewHolder.getAdapterPosition()), fragment.getActivity());
             }
         });
 
@@ -53,7 +53,7 @@ public class BodyAdapter extends RecyclerView.Adapter<BodyAdapter.ViewHolder> {
         holder.name.setText(body.getBodyName());
         holder.description.setText(body.getBodyShortDescription());
         Picasso.get().load(
-                Constants.resizeImageUrl(body.getBodyImageURL(), 200)
+                Utils.resizeImageUrl(body.getBodyImageURL())
         ).into(holder.image);
 
     }

app/src/main/java/app/insti/adapter/FeedAdapter.java

 package app.insti.adapter;
 
 import android.content.Context;
+import android.support.v4.app.Fragment;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -12,14 +13,12 @@ import com.squareup.picasso.Picasso;
 
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
-import java.util.Calendar;
-
 
-import app.insti.Constants;
-import app.insti.interfaces.ItemClickListener;
 import app.insti.R;
+import app.insti.Utils;
 import app.insti.api.model.Event;
 import app.insti.api.model.Venue;
 
@@ -27,11 +26,11 @@ public class FeedAdapter extends RecyclerView.Adapter<FeedAdapter.ViewHolder> {
 
     private List<Event> events;
     private Context context;
-    private ItemClickListener itemClickListener;
+    private Fragment mFragment;
 
-    public FeedAdapter(List<Event> events, ItemClickListener itemClickListener) {
+    public FeedAdapter(List<Event> events, Fragment fragment) {
         this.events = events;
-        this.itemClickListener = itemClickListener;
+        mFragment = fragment;
     }
 
     public void getSubtitle(ViewHolder viewHolder, Event currentEvent)
@@ -90,7 +89,7 @@ public class FeedAdapter extends RecyclerView.Adapter<FeedAdapter.ViewHolder> {
     }
 
     @Override
-    public ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
+    public ViewHolder onCreateViewHolder(ViewGroup viewGroup, final int i) {
         context = viewGroup.getContext();
         LayoutInflater inflater = LayoutInflater.from(context);
         View postView = inflater.inflate(R.layout.feed_card, viewGroup, false);
@@ -98,8 +97,8 @@ public class FeedAdapter extends RecyclerView.Adapter<FeedAdapter.ViewHolder> {
         final ViewHolder postViewHolder = new ViewHolder(postView);
         postView.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View v) {
-                itemClickListener.onItemClick(v, postViewHolder.getAdapterPosition());
+            public void onClick(View view) {
+                Utils.openEventFragment(events.get(postViewHolder.getAdapterPosition()), mFragment.getActivity());
             }
         });
 
@@ -116,10 +115,10 @@ public class FeedAdapter extends RecyclerView.Adapter<FeedAdapter.ViewHolder> {
         if (currentEvent.isEventBigImage()) {
             viewHolder.eventBigPicture.setVisibility(View.VISIBLE);
             viewHolder.eventPicture.setVisibility(View.GONE);
-            Picasso.get().load(currentEvent.getEventImageURL()).into(viewHolder.eventBigPicture);
+            Utils.loadImageWithPlaceholder(viewHolder.eventBigPicture, currentEvent.getEventImageURL());
         } else {
             Picasso.get().load(
-                    Constants.resizeImageUrl(currentEvent.getEventImageURL(), 200)
+                    Utils.resizeImageUrl(currentEvent.getEventImageURL())
             ).into(viewHolder.eventPicture);
         }
     }

app/src/main/java/app/insti/adapter/NewsAdapter.java

@@ -16,12 +16,12 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
-import app.insti.interfaces.ItemClickListener;
 import app.insti.R;
-import app.insti.interfaces.Readable;
-import app.insti.interfaces.Writable;
 import app.insti.api.model.NewsArticle;
 import app.insti.fragment.NewsFragment;
+import app.insti.interfaces.ItemClickListener;
+import app.insti.interfaces.Readable;
+import app.insti.interfaces.Writable;
 import ru.noties.markwon.Markwon;
 
 public class NewsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements Readable<NewsArticle>,Writable<NewsArticle> {

app/src/main/java/app/insti/adapter/NotificationsAdapter.java

@@ -13,13 +13,13 @@ import com.squareup.picasso.Picasso;
 
 import java.util.List;
 
-import app.insti.Constants;
-import app.insti.interfaces.ItemClickListener;
 import app.insti.R;
+import app.insti.Utils;
 import app.insti.api.model.Event;
 import app.insti.api.model.NewsArticle;
 import app.insti.api.model.Notification;
 import app.insti.api.model.PlacementBlogPost;
+import app.insti.interfaces.ItemClickListener;
 
 public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdapter.Viewholder> {
     private List<Notification> notifications;
@@ -55,13 +55,13 @@ public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdap
         if (appNotification.getNotificationActorType().contains("event")) {
             Event event = gson.fromJson(gson.toJson(appNotification.getNotificationActor()), Event.class);
             Picasso.get().load(
-                    Constants.resizeImageUrl(event.getEventImageURL(), 200)
+                    Utils.resizeImageUrl(event.getEventImageURL())
             ).into(viewholder.notificationPicture);
             viewholder.notificationTitle.setText(event.getEventName());
         } else if (appNotification.getNotificationActorType().contains("newsentry")) {
             NewsArticle article = gson.fromJson(gson.toJson(appNotification.getNotificationActor()), NewsArticle.class);
             Picasso.get().load(
-                    Constants.resizeImageUrl(article.getBody().getBodyImageURL(), 200)
+                    Utils.resizeImageUrl(article.getBody().getBodyImageURL())
             ).into(viewholder.notificationPicture);
             viewholder.notificationTitle.setText(article.getTitle());
         } else if (appNotification.getNotificationActorType().contains("blogentry")) {

app/src/main/java/app/insti/adapter/PlacementBlogAdapter.java

@@ -15,10 +15,10 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
-import app.insti.interfaces.ItemClickListener;
 import app.insti.R;
 import app.insti.api.model.PlacementBlogPost;
 import app.insti.fragment.PlacementBlogFragment;
+import app.insti.interfaces.ItemClickListener;
 import app.insti.interfaces.Readable;
 import app.insti.interfaces.Writable;
 import ru.noties.markwon.Markwon;

app/src/main/java/app/insti/adapter/RoleAdapter.java

@@ -13,10 +13,10 @@ import com.squareup.picasso.Picasso;
 
 import java.util.List;
 
-import app.insti.interfaces.ItemClickListener;
 import app.insti.R;
 import app.insti.api.model.Body;
 import app.insti.api.model.Role;
+import app.insti.interfaces.ItemClickListener;
 
 
 public class RoleAdapter extends RecyclerView.Adapter<RoleAdapter.ViewHolder> {

app/src/main/java/app/insti/adapter/TrainingBlogAdapter.java

@@ -15,10 +15,10 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
-import app.insti.interfaces.ItemClickListener;
 import app.insti.R;
 import app.insti.api.model.TrainingBlogPost;
 import app.insti.fragment.TrainingBlogFragment;
+import app.insti.interfaces.ItemClickListener;
 import app.insti.interfaces.Readable;
 import app.insti.interfaces.Writable;
 import ru.noties.markwon.Markwon;

app/src/main/java/app/insti/adapter/UserAdapter.java

 package app.insti.adapter;
 
 import android.content.Context;
+import android.support.v4.app.Fragment;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -12,19 +13,19 @@ import com.squareup.picasso.Picasso;
 
 import java.util.List;
 
-import app.insti.interfaces.ItemClickListener;
 import app.insti.R;
+import app.insti.Utils;
 import app.insti.api.model.User;
 
 public class UserAdapter extends RecyclerView.Adapter<UserAdapter.ViewHolder> {
 
     private List<User> userList;
-    private ItemClickListener itemClickListener;
     private Context context;
+    private Fragment fragment;
 
-    public UserAdapter(List<User> userList, ItemClickListener itemClickListener) {
+    public UserAdapter(List<User> userList, Fragment mFragment) {
         this.userList = userList;
-        this.itemClickListener = itemClickListener;
+        fragment = mFragment;
     }
 
     @Override
@@ -37,7 +38,7 @@ public class UserAdapter extends RecyclerView.Adapter<UserAdapter.ViewHolder> {
         v.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                itemClickListener.onItemClick(view, postViewHolder.getAdapterPosition());
+                Utils.openUserFragment(userList.get(postViewHolder.getAdapterPosition()), fragment.getActivity());
             }
         });
 

app/src/main/java/app/insti/api/RetrofitInterface.java

@@ -4,14 +4,6 @@ import com.google.gson.JsonObject;
 
 import java.util.List;
 
-import app.insti.api.request.EventCreateRequest;
-import app.insti.api.response.EventCreateResponse;
-import app.insti.api.response.ExploreResponse;
-import app.insti.api.request.ImageUploadRequest;
-import app.insti.api.response.ImageUploadResponse;
-import app.insti.api.response.LoginResponse;
-import app.insti.api.response.NewsFeedResponse;
-import app.insti.api.request.UserFCMPatchRequest;
 import app.insti.api.model.Event;
 import app.insti.api.model.HostelMessMenu;
 import app.insti.api.model.NewsArticle;
@@ -20,6 +12,14 @@ import app.insti.api.model.PlacementBlogPost;
 import app.insti.api.model.TrainingBlogPost;
 import app.insti.api.model.User;
 import app.insti.api.model.Venue;
+import app.insti.api.request.EventCreateRequest;
+import app.insti.api.request.ImageUploadRequest;
+import app.insti.api.request.UserFCMPatchRequest;
+import app.insti.api.response.EventCreateResponse;
+import app.insti.api.response.ExploreResponse;
+import app.insti.api.response.ImageUploadResponse;
+import app.insti.api.response.LoginResponse;
+import app.insti.api.response.NewsFeedResponse;
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.GET;

app/src/main/java/app/insti/api/model/Event.java

@@ -7,6 +7,7 @@ import com.google.gson.annotations.SerializedName;
 
 import java.sql.Timestamp;
 import java.util.List;
+import java.util.Objects;
 
 public class Event {
     @NonNull()
@@ -223,4 +224,17 @@ public class Event {
     public void setEventBigImage(boolean eventBigImage) {
         this.eventBigImage = eventBigImage;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Event event = (Event) o;
+        return Objects.equals(eventID, event.eventID);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(eventID);
+    }
 }

app/src/main/java/app/insti/fragment/AddEventFragment.java

@@ -26,7 +26,7 @@ import com.google.gson.Gson;
 
 import app.insti.Constants;
 import app.insti.R;
-import app.insti.activity.MainActivity;
+import app.insti.Utils;
 import app.insti.api.RetrofitInterface;
 import app.insti.api.model.Body;
 import app.insti.api.model.Event;
@@ -77,7 +77,7 @@ public class AddEventFragment extends BaseFragment {
             webView.setWebViewClient(new MyWebViewClient());
 
             CookieManager cookieManager = CookieManager.getInstance();
-            String cookieString = ((MainActivity) getActivity()).getSessionIDHeader();
+            String cookieString = Utils.getSessionIDHeader();
             cookieManager.setCookie(host, cookieString);
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
                 CookieManager.getInstance().flush();
@@ -166,8 +166,8 @@ public class AddEventFragment extends BaseFragment {
             if (url.contains("/event/")) {
                 url = url.substring(url.lastIndexOf("/") + 1);
 
-                RetrofitInterface retrofitInterface = ((MainActivity) getActivity()).getRetrofitInterface();
-                retrofitInterface.getEvent(((MainActivity) getActivity()).getSessionIDHeader(), url).enqueue(new Callback<Event>() {
+                RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
+                retrofitInterface.getEvent(Utils.getSessionIDHeader(), url).enqueue(new Callback<Event>() {
                     @Override
                     public void onResponse(Call<Event> call, Response<Event> response) {
                         if (response.isSuccessful()) {
@@ -184,8 +184,8 @@ public class AddEventFragment extends BaseFragment {
             } else if (url.contains("/org/")) {
                 url = url.substring(url.lastIndexOf("/") + 1);
 
-                RetrofitInterface retrofitInterface = ((MainActivity) getActivity()).getRetrofitInterface();
-                retrofitInterface.getBody(((MainActivity) getActivity()).getSessionIDHeader(), url).enqueue(new Callback<Body>() {
+                RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
+                retrofitInterface.getBody(Utils.getSessionIDHeader(), url).enqueue(new Callback<Body>() {
                     @Override
                     public void onResponse(Call<Body> call, Response<Body> response) {
                         if (response.isSuccessful()) {

app/src/main/java/app/insti/fragment/BodyFragment.java

@@ -13,7 +13,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
 import android.support.v4.widget.NestedScrollView;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
@@ -30,15 +29,14 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.gson.Gson;
-import com.squareup.picasso.Picasso;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import app.insti.Constants;
-import app.insti.interfaces.ItemClickListener;
 import app.insti.R;
 import app.insti.ShareURLMaker;
+import app.insti.Utils;
 import app.insti.activity.MainActivity;
 import app.insti.adapter.BodyAdapter;
 import app.insti.adapter.FeedAdapter;
@@ -148,8 +146,8 @@ public class BodyFragment extends BackHandledFragment {
     }
 
     private void updateBody() {
-        RetrofitInterface retrofitInterface = ((MainActivity) getActivity()).getRetrofitInterface();
-        retrofitInterface.getBody(((MainActivity) getActivity()).getSessionIDHeader(), min_body.getBodyID()).enqueue(new Callback<Body>() {
+        RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
+        retrofitInterface.getBody(Utils.getSessionIDHeader(), min_body.getBodyID()).enqueue(new Callback<Body>() {
             @Override
             public void onResponse(Call<Body> call, Response<Body> response) {
                 if (response.isSuccessful()) {
@@ -200,7 +198,7 @@ public class BodyFragment extends BackHandledFragment {
 
         /* Set body information */
         bodyName.setText(body.getBodyName());
-        Picasso.get().load(body.getBodyImageURL()).into(bodyPicture);
+        Utils.loadImageWithPlaceholder(bodyPicture, body.getBodyImageURL());
 
         bodyPicture.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -225,8 +223,8 @@ public class BodyFragment extends BackHandledFragment {
         followButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                RetrofitInterface retrofitInterface = ((MainActivity) getActivity()).getRetrofitInterface();
-                retrofitInterface.updateBodyFollowing(((MainActivity) getActivity()).getSessionIDHeader(), body.getBodyID(), body.getBodyUserFollows() ? 0 : 1).enqueue(new Callback<Void>() {
+                RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
+                retrofitInterface.updateBodyFollowing(Utils.getSessionIDHeader(), body.getBodyID(), body.getBodyUserFollows() ? 0 : 1).enqueue(new Callback<Void>() {
                     @Override
                     public void onResponse(Call<Void> call, Response<Void> response) {
                         if (response.isSuccessful()) {
@@ -276,21 +274,7 @@ public class BodyFragment extends BackHandledFragment {
         /* Initialize events */
         final List<Event> eventList = body.getBodyEvents();
         RecyclerView eventRecyclerView = (RecyclerView) getActivity().findViewById(R.id.event_card_recycler_view);
-        FeedAdapter eventAdapter = new FeedAdapter(eventList, new ItemClickListener() {
-            @Override
-            public void onItemClick(View v, int position) {
-                Event event = eventList.get(position);
-                Bundle bundle = new Bundle();
-                bundle.putString(Constants.EVENT_JSON, new Gson().toJson(event));
-                EventFragment eventFragment = new EventFragment();
-                eventFragment.setArguments(bundle);
-                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-                ft.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_left, R.anim.slide_in_right, R.anim.slide_out_right);
-                ft.replace(R.id.framelayout_for_fragment, eventFragment, eventFragment.getTag());
-                ft.addToBackStack(eventFragment.getTag());
-                ft.commit();
-            }
-        });
+        FeedAdapter eventAdapter =  new FeedAdapter(eventList, this);
         eventRecyclerView.setAdapter(eventAdapter);
         eventRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
@@ -308,43 +292,19 @@ public class BodyFragment extends BackHandledFragment {
 
         /* Initialize People */
         RecyclerView userRecyclerView = (RecyclerView) getActivity().findViewById(R.id.people_card_recycler_view);
-        UserAdapter userAdapter = new UserAdapter(users, new ItemClickListener() {
-            @Override
-            public void onItemClick(View v, int position) {
-                User user = users.get(position);
-                Bundle bundle = new Bundle();
-                bundle.putString(Constants.USER_ID, user.getUserID());
-                UserFragment userFragment = new UserFragment();
-                userFragment.setArguments(bundle);
-                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-                ft.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_left, R.anim.slide_in_right, R.anim.slide_out_right);
-                ft.replace(R.id.framelayout_for_fragment, userFragment, userFragment.getTag());
-                ft.addToBackStack(userFragment.getTag());
-                ft.commit();
-            }
-        });
+        UserAdapter userAdapter = new UserAdapter(users, this);
         userRecyclerView.setAdapter(userAdapter);
         userRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
         /* Initialize Parent bodies */
         RecyclerView parentsRecyclerView = (RecyclerView) getActivity().findViewById(R.id.parentorg_card_recycler_view);
-        BodyAdapter parentAdapter = new BodyAdapter(body.getBodyParents(), new ItemClickListener() {
-            @Override
-            public void onItemClick(View v, int position) {
-                openBody(body.getBodyParents().get(position));
-            }
-        });
+        BodyAdapter parentAdapter = new BodyAdapter(body.getBodyParents(), this);
         parentsRecyclerView.setAdapter(parentAdapter);
         parentsRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
         /* Initialize child bodies */
         RecyclerView childrenRecyclerView = (RecyclerView) getActivity().findViewById(R.id.org_card_recycler_view);
-        BodyAdapter childrenAdapter = new BodyAdapter(body.getBodyChildren(), new ItemClickListener() {
-            @Override
-            public void onItemClick(View v, int position) {
-                openBody(body.getBodyChildren().get(position));
-            }
-        });
+        BodyAdapter childrenAdapter = new BodyAdapter(body.getBodyChildren(), this);
         childrenRecyclerView.setAdapter(childrenAdapter);
         childrenRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
@@ -353,7 +313,7 @@ public class BodyFragment extends BackHandledFragment {
         /* Show update button if role */
         if (((MainActivity) getActivity()).editBodyAccess(body)) {
             final FloatingActionButton fab = (FloatingActionButton) getView().findViewById(R.id.edit_fab);
-            fab.setVisibility(View.VISIBLE);
+            fab.show();
             NestedScrollView nsv = (NestedScrollView) getView().findViewById(R.id.body_scrollview);
             nsv.setOnScrollChangeListener(new NestedScrollView.OnScrollChangeListener() {
                 @Override
@@ -376,21 +336,6 @@ public class BodyFragment extends BackHandledFragment {
         }
     }
 
-    /**
-     * Open body fragment for a body
-     */
-    private void openBody(Body body) {
-        Bundle bundle = new Bundle();
-        bundle.putString(Constants.BODY_JSON, new Gson().toJson(body));
-        BodyFragment bodyFragment = new BodyFragment();
-        bodyFragment.setArguments(bundle);
-        FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-        ft.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_left, R.anim.slide_in_right, R.anim.slide_out_right);
-        ft.replace(R.id.framelayout_for_fragment, bodyFragment, bodyFragment.getTag());
-        ft.addToBackStack(bodyFragment.getTag());
-        ft.commit();
-    }
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {

app/src/main/java/app/insti/fragment/BodyRecyclerViewFragment.java

@@ -3,7 +3,6 @@ package app.insti.fragment;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -16,7 +15,6 @@ import com.google.gson.reflect.TypeToken;
 import java.util.List;
 
 import app.insti.Constants;
-import app.insti.interfaces.ItemClickListener;
 import app.insti.R;
 import app.insti.adapter.BodyAdapter;
 import app.insti.api.model.Body;
@@ -65,21 +63,7 @@ public class BodyRecyclerViewFragment extends Fragment {
         super.onStart();
 
         recyclerView = (RecyclerView) getActivity().findViewById(R.id.body_recycler_view);
-        bodyAdapter = new BodyAdapter(bodyList, new ItemClickListener() {
-            @Override
-            public void onItemClick(View v, int position) {
-                Body body = bodyList.get(position);
-                BodyFragment bodyFragment = new BodyFragment();
-                Bundle arguments = getArguments();
-                arguments.putString(Constants.BODY_JSON, new Gson().toJson(body));
-                bodyFragment.setArguments(getArguments());
-                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-                ft.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_left, R.anim.slide_in_right, R.anim.slide_out_right);
-                ft.replace(R.id.framelayout_for_fragment, bodyFragment, bodyFragment.getTag());
-                ft.addToBackStack(bodyFragment.getTag());
-                ft.commit();
-            }
-        });
+        bodyAdapter = new BodyAdapter(bodyList, this);
         recyclerView.setAdapter(bodyAdapter);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 

app/src/main/java/app/insti/fragment/CalendarFragment.java

@@ -4,7 +4,6 @@ package app.insti.fragment;
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
@@ -15,8 +14,6 @@ import android.widget.CalendarView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.google.gson.Gson;
-
 import java.sql.Timestamp;
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -27,14 +24,13 @@ import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
 
-import app.insti.Constants;
-import app.insti.interfaces.ItemClickListener;
 import app.insti.R;
+import app.insti.Utils;
 import app.insti.activity.MainActivity;
 import app.insti.adapter.FeedAdapter;
 import app.insti.api.RetrofitInterface;
-import app.insti.api.response.NewsFeedResponse;
 import app.insti.api.model.Event;
+import app.insti.api.response.NewsFeedResponse;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -46,9 +42,10 @@ public class CalendarFragment extends BaseFragment {
 
     FloatingActionButton fab;
     private View view;
-    private Toast toast;
+    private FeedAdapter feedAdapter = null;
     private List<Event> events;
 
+
     public CalendarFragment() {
         // Required empty public constructor
     }
@@ -92,7 +89,7 @@ public class CalendarFragment extends BaseFragment {
             }
         });
         if (((MainActivity) getActivity()).createEventAccess()) {
-            fab.setVisibility(View.VISIBLE);
+            fab.show();
         }
 
         updateEvents();
@@ -116,8 +113,8 @@ public class CalendarFragment extends BaseFragment {
         final String oneMonthBack = isoFormatter.format(oneMonthBackDate).toString();
         final String oneMonthOn = isoFormatter.format(oneMonthOnDate).toString();
 
-        RetrofitInterface retrofitInterface = ((MainActivity) getActivity()).getRetrofitInterface();
-        retrofitInterface.getEventsBetweenDates(((MainActivity) getActivity()).getSessionIDHeader(), oneMonthBack, oneMonthOn).enqueue(new Callback<NewsFeedResponse>() {
+        RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
+        retrofitInterface.getEventsBetweenDates(Utils.getSessionIDHeader(), oneMonthBack, oneMonthOn).enqueue(new Callback<NewsFeedResponse>() {
             @Override
             public void onResponse(Call<NewsFeedResponse> call, Response<NewsFeedResponse> response) {
                 if (response.isSuccessful()) {
@@ -165,23 +162,20 @@ public class CalendarFragment extends BaseFragment {
         }
 
         RecyclerView eventRecyclerView = (RecyclerView) getActivity().findViewById(R.id.calendar_event_card_recycler_view);
-        FeedAdapter eventAdapter = new FeedAdapter(filteredEvents, new ItemClickListener() {
-            @Override
-            public void onItemClick(View v, int position) {
-                Event event = filteredEvents.get(position);
-                Bundle bundle = new Bundle();
-                bundle.putString(Constants.EVENT_JSON, new Gson().toJson(event));
-                EventFragment eventFragment = new EventFragment();
-                eventFragment.setArguments(bundle);
-                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-                ft.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_left, R.anim.slide_in_right, R.anim.slide_out_right);
-                ft.replace(R.id.framelayout_for_fragment, eventFragment, eventFragment.getTag());
-                ft.addToBackStack(eventFragment.getTag());
-                ft.commit();
-            }
-        });
-        eventRecyclerView.setAdapter(eventAdapter);
-        eventRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+
+        // Initialize or refresh adapter
+        if (feedAdapter == null) {
+            feedAdapter = new FeedAdapter(filteredEvents, this);
+        } else {
+            feedAdapter.setEvents(filteredEvents);
+            feedAdapter.notifyDataSetChanged();
+        }
+
+        // Initialize recycler view
+        if (eventRecyclerView.getAdapter() != feedAdapter) {
+            eventRecyclerView.setAdapter(feedAdapter);
+            eventRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        }
 
         getActivity().findViewById(R.id.loadingPanel).setVisibility(View.GONE);
     }

app/src/main/java/app/insti/fragment/EventFragment.java

@@ -13,7 +13,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
 import android.support.v4.widget.NestedScrollView;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -34,7 +33,6 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.gson.Gson;
-import com.squareup.picasso.Picasso;
 
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
@@ -42,9 +40,9 @@ import java.util.Date;
 import java.util.List;
 
 import app.insti.Constants;
-import app.insti.interfaces.ItemClickListener;
 import app.insti.R;
 import app.insti.ShareURLMaker;
+import app.insti.Utils;
 import app.insti.activity.MainActivity;
 import app.insti.adapter.BodyAdapter;
 import app.insti.api.RetrofitInterface;
@@ -154,7 +152,8 @@ public class EventFragment extends BackHandledFragment {
         webEventButton = getActivity().findViewById(R.id.web_event_button);
         shareEventButton = getActivity().findViewById(R.id.share_event_button);
 
-        Picasso.get().load(event.getEventImageURL()).into(eventPicture);
+        Utils.loadImageWithPlaceholder(eventPicture, event.getEventImageURL());
+
         eventTitle.setText(event.getEventName());
         Markwon.setMarkdown(eventDescription, event.getEventDescription());
         Timestamp timestamp = event.getEventStartTime();
@@ -171,18 +170,7 @@ public class EventFragment extends BackHandledFragment {
 
         final List<Body> bodyList = event.getEventBodies();
         bodyRecyclerView = (RecyclerView) getActivity().findViewById(R.id.body_card_recycler_view);
-        BodyAdapter bodyAdapter = new BodyAdapter(bodyList, new ItemClickListener() {
-            @Override
-            public void onItemClick(View v, int position) {
-                Body body = bodyList.get(position);
-                BodyFragment bodyFragment = BodyFragment.newInstance(body);
-                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-                ft.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_left, R.anim.slide_in_right, R.anim.slide_out_right);
-                ft.replace(R.id.framelayout_for_fragment, bodyFragment, bodyFragment.getTag());
-                ft.addToBackStack(bodyFragment.getTag());
-                ft.commit();
-            }
-        });
+        BodyAdapter bodyAdapter = new BodyAdapter(bodyList, this);
         bodyRecyclerView.setAdapter(bodyAdapter);
         bodyRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
@@ -250,7 +238,7 @@ public class EventFragment extends BackHandledFragment {
         final FloatingActionButton fab = (FloatingActionButton) getView().findViewById(R.id.edit_fab);
 
         if (((MainActivity) getActivity()).editEventAccess(event)) {
-            fab.setVisibility(View.VISIBLE);
+            fab.show();
             NestedScrollView nsv = (NestedScrollView) getView().findViewById(R.id.event_scrollview);
             nsv.setOnScrollChangeListener(new NestedScrollView.OnScrollChangeListener() {
                 @Override
@@ -287,8 +275,8 @@ public class EventFragment extends BackHandledFragment {
             @Override
             public void onClick(View view) {
                 final int endStatus = event.getEventUserUes() == status ? 0 : status;
-                RetrofitInterface retrofitInterface = ((MainActivity) getActivity()).getRetrofitInterface();
-                retrofitInterface.updateUserEventStatus(((MainActivity) getActivity()).getSessionIDHeader(), event.getEventID(), endStatus).enqueue(new Callback<Void>() {
+                RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
+                retrofitInterface.updateUserEventStatus(Utils.getSessionIDHeader(), event.getEventID(), endStatus).enqueue(new Callback<Void>() {
                     @Override
                     public void onResponse(Call<Void> call, Response<Void> response) {
                         if (response.isSuccessful()) {
@@ -318,6 +306,9 @@ public class EventFragment extends BackHandledFragment {
 
                             event.setEventUserUes(endStatus);
                             setFollowButtonColors(endStatus);
+
+                            // Update global memory cache
+                            Utils.eventCache.updateCache(event);
                         }
                     }
 

app/src/main/java/app/insti/fragment/EventRecyclerViewFragment.java

@@ -2,7 +2,6 @@ package app.insti.fragment;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -15,7 +14,6 @@ import com.google.gson.reflect.TypeToken;
 import java.util.List;
 
 import app.insti.Constants;
-import app.insti.interfaces.ItemClickListener;
 import app.insti.R;
 import app.insti.adapter.FeedAdapter;
 import app.insti.api.model.Event;
@@ -63,21 +61,7 @@ public class EventRecyclerViewFragment extends Fragment {
         super.onStart();
 
         recyclerView = (RecyclerView) getActivity().findViewById(R.id.event_recycler_view);
-        feedAdapter = new FeedAdapter(eventList, new ItemClickListener() {
-            @Override
-            public void onItemClick(View v, int position) {
-                Event event = eventList.get(position);
-                EventFragment eventFragment = new EventFragment();
-                Bundle arguments = getArguments();
-                arguments.putString(Constants.EVENT_JSON, new Gson().toJson(event));
-                eventFragment.setArguments(getArguments());
-                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-                ft.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_left, R.anim.slide_in_right, R.anim.slide_out_right);
-                ft.replace(R.id.framelayout_for_fragment, eventFragment, eventFragment.getTag());
-                ft.addToBackStack(eventFragment.getTag());
-                ft.commit();
-            }
-        });
+        feedAdapter = new FeedAdapter(eventList, this);
         recyclerView.setAdapter(feedAdapter);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 

app/src/main/java/app/insti/fragment/ExploreFragment.java

@@ -3,7 +3,6 @@ package app.insti.fragment;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
@@ -14,25 +13,21 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
 
-import com.google.gson.Gson;
-
 import java.util.ArrayList;
 import java.util.List;
 
-import app.insti.Constants;
-import app.insti.interfaces.ItemClickListener;
 import app.insti.R;
-import app.insti.activity.MainActivity;
+import app.insti.Utils;
 import app.insti.adapter.BodyAdapter;
 import app.insti.adapter.FeedAdapter;
 import app.insti.adapter.UserAdapter;
+import app.insti.api.EmptyCallback;
 import app.insti.api.RetrofitInterface;
-import app.insti.api.response.ExploreResponse;
 import app.insti.api.model.Body;
 import app.insti.api.model.Event;
 import app.insti.api.model.User;
+import app.insti.api.response.ExploreResponse;
 import retrofit2.Call;
-import retrofit2.Callback;
 import retrofit2.Response;
 
 /**
@@ -43,15 +38,17 @@ import retrofit2.Response;
 public class ExploreFragment extends Fragment {
 
     private String sessionId;
-    private List<Body> allBodies = new ArrayList<>();
-    private List<Body> bodies = new ArrayList<>();
-    private List<Event> events = new ArrayList<>();
-    private List<User> users = new ArrayList<>();
+    private static List<Body> allBodies = new ArrayList<>();
+    private static List<Body> bodies = new ArrayList<>();
+    private static List<Event> events = new ArrayList<>();
+    private static List<User> users = new ArrayList<>();
 
     private BodyAdapter bodyAdapter;
     private FeedAdapter eventsAdapter;
     private UserAdapter userAdapter;
 
+    private String currentQuery = null;
+
     public ExploreFragment() {
         // Required empty public constructor
     }
@@ -78,7 +75,7 @@ public class ExploreFragment extends Fragment {
         super.onStart();
 
         // Initialize
-        sessionId = ((MainActivity) getActivity()).getSessionIDHeader();
+        sessionId = Utils.getSessionIDHeader();
         initRecyclerViews();
 
         Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
@@ -86,20 +83,17 @@ public class ExploreFragment extends Fragment {
 
         // Get all bodies
         if (allBodies.size() == 0) {
-            RetrofitInterface retrofitInterface = ((MainActivity) getActivity()).getRetrofitInterface();
-            retrofitInterface.getAllBodies(sessionId).enqueue(new Callback<List<Body>>() {
+            RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
+            retrofitInterface.getAllBodies(sessionId).enqueue(new EmptyCallback<List<Body>>() {
                 @Override
                 public void onResponse(Call<List<Body>> call, Response<List<Body>> response) {
                     allBodies = response.body();
                     bodies = allBodies;
-                    updateAdapters(bodies, new ArrayList<Event>(), new ArrayList<User>());
-                }
-
-                @Override
-                public void onFailure(Call<List<Body>> call, Throwable t) {
+                    updateAdapters(allBodies, new ArrayList<Event>(), new ArrayList<User>());
                 }
             });
         } else {
+            updateAdapters(bodies, events, users);
             getView().findViewById(R.id.loadingPanel).setVisibility(View.GONE);
         }
 
@@ -107,20 +101,17 @@ public class ExploreFragment extends Fragment {
         final EditText searchEditText = getView().findViewById(R.id.explore_search);
         searchEditText.addTextChangedListener(new TextWatcher() {
             @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-            }
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
 
             @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-            }
+            public void onTextChanged(CharSequence s, int start, int before, int count) {}
 
             @Override
             public void afterTextChanged(Editable s) {
                 if (searchEditText.getText().length() >= 3) {
                     doSearch(searchEditText.getText().toString());
                 } else if (searchEditText.getText().length() == 0) {
-                    bodies = allBodies;
-                    updateAdapters(bodies, new ArrayList<Event>(), new ArrayList<User>());
+                    updateAdapters(allBodies, new ArrayList<Event>(), new ArrayList<User>());
                 }
             }
         });
@@ -133,28 +124,31 @@ public class ExploreFragment extends Fragment {
         return inflater.inflate(R.layout.fragment_explore, container, false);
     }
 
-    public void doSearch(String query) {
+    public void doSearch(final String query) {
         if (getActivity() == null || getView() == null) return;
 
         // Show loading spinner
         getView().findViewById(R.id.loadingPanel).setVisibility(View.VISIBLE);
 
+        // Set the lastest query
+        currentQuery = query;
+
         // Make request
-        RetrofitInterface retrofitInterface = ((MainActivity) getActivity()).getRetrofitInterface();
-        retrofitInterface.search(sessionId, query).enqueue(new Callback<ExploreResponse>() {
+        RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
+        retrofitInterface.search(sessionId, query).enqueue(new EmptyCallback<ExploreResponse>() {
             @Override
             public void onResponse(Call<ExploreResponse> call, Response<ExploreResponse> response) {
+                // Check if we already have a new query pending
+                if (!currentQuery.equals(query)) {
+                    return;
+                }
+
                 // Get data
                 bodies = response.body().getBodies();
                 events = response.body().getEvents();
                 users = response.body().getUsers();
                 updateAdapters(bodies, events, users);
             }
-
-            @Override
-            public void onFailure(Call<ExploreResponse> call, Throwable t) {
-                // Request failed
-            }
         });
     }
 
@@ -178,53 +172,20 @@ public class ExploreFragment extends Fragment {
         if (getActivity() == null || getView() == null) return;
         // Bodies
         RecyclerView bodiesRecyclerView = getView().findViewById(R.id.explore_body_recycler_view);
-        bodyAdapter = new BodyAdapter(bodies, new ItemClickListener() {
-            @Override
-            public void onItemClick(View v, int position) {
-                Bundle bundle = new Bundle();
-                bundle.putString(Constants.BODY_JSON, new Gson().toJson(bodies.get(position)));
-                updateFragment(new BodyFragment(), bundle);
-            }
-        });
+        bodyAdapter = new BodyAdapter(bodies, this);
         bodiesRecyclerView.setAdapter(bodyAdapter);
         bodiesRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
         // Events
         RecyclerView eventsRecyclerView = getView().findViewById(R.id.explore_event_recycler_view);
-        eventsAdapter = new FeedAdapter(events, new ItemClickListener() {
-            @Override
-            public void onItemClick(View v, int position) {
-                Event event = events.get(position);
-                Bundle bundle = new Bundle();
-                bundle.putString(Constants.EVENT_JSON, new Gson().toJson(event));
-                updateFragment(new EventFragment(), bundle);
-            }
-        });
+        eventsAdapter = new FeedAdapter(events, this);
         eventsRecyclerView.setAdapter(eventsAdapter);
         eventsRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
         // Users
         RecyclerView usersRecyclerView = getView().findViewById(R.id.explore_user_recycler_view);
-        userAdapter = new UserAdapter(users, new ItemClickListener() {
-            @Override
-            public void onItemClick(View v, int position) {
-                User user = users.get(position);
-                Bundle bundle = new Bundle();
-                bundle.putString(Constants.USER_ID, user.getUserID());
-                updateFragment(new UserFragment(), bundle);
-            }
-        });
+        userAdapter = new UserAdapter(users, this);
         usersRecyclerView.setAdapter(userAdapter);
         usersRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
     }
-
-    public void updateFragment(Fragment fragment, Bundle bundle) {
-        MainActivity.hideKeyboard(getActivity());
-        fragment.setArguments(bundle);
-        FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-        ft.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_left, R.anim.slide_in_right, R.anim.slide_out_right);
-        ft.replace(R.id.framelayout_for_fragment, fragment, fragment.getTag());
-        ft.addToBackStack(fragment.getTag());
-        ft.commit();
-    }
 }

app/src/main/java/app/insti/fragment/FeedFragment.java

@@ -5,8 +5,6 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -15,19 +13,16 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.google.gson.Gson;
-
 import java.util.List;
 
 import app.insti.ActivityBuffer;
-import app.insti.Constants;
-import app.insti.interfaces.ItemClickListener;
 import app.insti.R;
+import app.insti.Utils;
 import app.insti.activity.MainActivity;
 import app.insti.adapter.FeedAdapter;
 import app.insti.api.RetrofitInterface;
-import app.insti.api.response.NewsFeedResponse;
 import app.insti.api.model.Event;
+import app.insti.api.response.NewsFeedResponse;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -40,14 +35,14 @@ public class FeedFragment extends BaseFragment {
     private RecyclerView feedRecyclerView;
     private SwipeRefreshLayout feedSwipeRefreshLayout;
     private FloatingActionButton fab;
-    private boolean freshEventsDisplayed = false;
     LinearLayoutManager mLayoutManager;
     public static int index = -1, top = -1;
+    private FeedAdapter feedAdapter = null;
+
     public FeedFragment() {
         // Required empty public constructor
     }
 
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -74,8 +69,14 @@ public class FeedFragment extends BaseFragment {
     @Override
     public void onStart() {
         super.onStart();
-        fab = (FloatingActionButton) getView().findViewById(R.id.fab);
-        updateFeed();
+        fab = getView().findViewById(R.id.fab);
+
+        // Initialize the feed
+        if (Utils.eventCache.getCache() == null || Utils.eventCache.getCache().size() == 0) {
+            updateFeed();
+        } else {
+            displayEvents(Utils.eventCache.getCache());
+        }
     }
 
 
@@ -92,23 +93,20 @@ public class FeedFragment extends BaseFragment {
     public void onResume()
     {
         super.onResume();
-        if(index != -1)
-        {
+        if(index != -1) {
             mLayoutManager.scrollToPositionWithOffset( index, top);
         }
     }
 
     private void updateFeed() {
 
-        RetrofitInterface retrofitInterface = ((MainActivity) getActivity()).getRetrofitInterface();
-        retrofitInterface.getNewsFeed("sessionid=" + getArguments().getString(Constants.SESSION_ID)).enqueue(new Callback<NewsFeedResponse>() {
+        RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
+        retrofitInterface.getNewsFeed(Utils.getSessionIDHeader()).enqueue(new Callback<NewsFeedResponse>() {
             @Override
             public void onResponse(Call<NewsFeedResponse> call, Response<NewsFeedResponse> response) {
                 if (response.isSuccessful()) {
-                    NewsFeedResponse newsFeedResponse = response.body();
-                    List<Event> events = newsFeedResponse.getEvents();
-                    freshEventsDisplayed = true;
-                    displayEvents(events);
+                    Utils.eventCache.setCache(response.body().getEvents());
+                    displayEvents(Utils.eventCache.getCache());
                 }
                 //Server Error
                 feedSwipeRefreshLayout.setRefreshing(false);
@@ -122,12 +120,10 @@ public class FeedFragment extends BaseFragment {
         });
     }
 
-    private void displayEvents(final List<Event> events) {
-        /* Skip if we're already destroyed */
-        if (getActivity() == null || getView() == null) return;
-
+    /** Initialize the add event fab if the user has permission */
+    private void initFab() {
         if (((MainActivity) getActivity()).createEventAccess()) {
-            fab.setVisibility(View.VISIBLE);
+            fab.show();
             fab.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -145,43 +141,48 @@ public class FeedFragment extends BaseFragment {
                 }
             });
         }
+    }
+
+    private void displayEvents(final List<Event> events) {
+        /* Skip if we're already destroyed */
+        if (getActivity() == null || getView() == null) return;
+
+        /* Initialize */
+        initFab();
 
         /* Make first event image big */
         if (events.size() > 1) {
             events.get(0).setEventBigImage(true);
         }
 
-        final FeedAdapter feedAdapter = new FeedAdapter(events, new ItemClickListener() {
-            @Override
-            public void onItemClick(View v, int position) {
-                String eventJson = new Gson().toJson(events.get(position));
-                Bundle bundle = getArguments();
-                if (bundle == null)
-                    bundle = new Bundle();
-                bundle.putString(Constants.EVENT_JSON, eventJson);
-                EventFragment eventFragment = new EventFragment();
-                eventFragment.setArguments(bundle);
-                FragmentManager manager = getActivity().getSupportFragmentManager();
-                FragmentTransaction transaction = manager.beginTransaction();
-                transaction.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_left, R.anim.slide_in_right, R.anim.slide_out_right);
-                transaction.replace(R.id.framelayout_for_fragment, eventFragment, eventFragment.getTag());
-                transaction.addToBackStack(eventFragment.getTag()).commit();
-            }
-        });
+        // Initialize adapter
+        if (feedAdapter == null) {
+            feedAdapter = new FeedAdapter(events, this);
+        } else {
+            feedAdapter.setEvents(events);
+            feedAdapter.notifyDataSetChanged();
+        }
+
+        // Initialize RecyclerView if necessary
+        if (feedRecyclerView.getAdapter() != feedAdapter) {
+            initRecyclerView();
+        }
+
+        View view = getActivity().findViewById(R.id.loadingPanel);
+        if (view != null)
+            view.setVisibility(View.GONE);
+    }
+
+    private void initRecyclerView() {
         getActivityBuffer().safely(new ActivityBuffer.IRunnable() {
             @Override
             public void run(Activity pActivity) {
                 try {
                     feedRecyclerView.setAdapter(feedAdapter);
-                    //feedRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-
                 } catch (NullPointerException e) {
                     e.printStackTrace();
                 }
             }
         });
-        View view = getActivity().findViewById(R.id.loadingPanel);
-        if (view != null)
-            view.setVisibility(View.GONE);
     }
 }

app/src/main/java/app/insti/fragment/MapFragment.java

@@ -87,6 +87,7 @@ import java.util.regex.Pattern;
 
 import app.insti.Constants;
 import app.insti.R;
+import app.insti.Utils;
 import app.insti.activity.MainActivity;
 import app.insti.api.RetrofitInterface;
 import app.insti.api.model.Venue;
@@ -227,7 +228,7 @@ public class MapFragment extends Fragment implements TextWatcher,
     }
 
     private void getAPILocations() {
-        RetrofitInterface retrofitInterface = ((MainActivity) getActivity()).getRetrofitInterface();
+        RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
         retrofitInterface.getAllVenues().enqueue(new Callback<List<Venue>>() {
             @Override
             public void onResponse(Call<List<Venue>> call, Response<List<Venue>> response) {

app/src/main/java/app/insti/fragment/MessMenuFragment.java

@@ -23,7 +23,7 @@ import java.util.Locale;
 import app.insti.ActivityBuffer;
 import app.insti.Constants;
 import app.insti.R;
-import app.insti.activity.MainActivity;
+import app.insti.Utils;
 import app.insti.adapter.MessMenuAdapter;
 import app.insti.api.RetrofitInterface;
 import app.insti.api.model.HostelMessMenu;
@@ -107,8 +107,8 @@ public class MessMenuFragment extends BaseFragment {
     }
 
     private void updateMessMenu(final String hostel) {
-        RetrofitInterface retrofitInterface = ((MainActivity) getActivity()).getRetrofitInterface();
-        retrofitInterface.getInstituteMessMenu("sessionid=" + getArguments().getString(Constants.SESSION_ID)).enqueue(new Callback<List<HostelMessMenu>>() {
+        RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
+        retrofitInterface.getInstituteMessMenu(Utils.getSessionIDHeader()).enqueue(new Callback<List<HostelMessMenu>>() {
             @Override
             public void onResponse(Call<List<HostelMessMenu>> call, Response<List<HostelMessMenu>> response) {
                 if (response.isSuccessful()) {

app/src/main/java/app/insti/fragment/NewsFragment.java

@@ -11,7 +11,6 @@ import android.view.ViewGroup;
 import java.util.List;
 
 import app.insti.R;
-import app.insti.activity.MainActivity;
 import app.insti.adapter.NewsAdapter;
 import app.insti.api.RetrofitInterface;
 import app.insti.api.model.NewsArticle;
@@ -56,7 +55,7 @@ public class NewsFragment extends RecyclerViewFragment<NewsArticle, NewsAdapter>
     }
 
     @Override
-    Call<List<NewsArticle>> getCall(RetrofitInterface retrofitInterface, String sessionIDHeader) {
-        return retrofitInterface.getNews(sessionIDHeader, getPostCount(), 20, searchQuery);
+    Call<List<NewsArticle>> getCall(RetrofitInterface retrofitInterface, String sessionIDHeader, int postCount) {
+        return retrofitInterface.getNews(sessionIDHeader, postCount, 20, searchQuery);
     }
 }

app/src/main/java/app/insti/fragment/NotificationsFragment.java

@@ -3,8 +3,6 @@ package app.insti.fragment;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
@@ -16,15 +14,15 @@ import com.google.gson.Gson;
 
 import java.util.List;
 
-import app.insti.Constants;
-import app.insti.interfaces.ItemClickListener;
 import app.insti.R;
-import app.insti.activity.MainActivity;
+import app.insti.Utils;
 import app.insti.adapter.NotificationsAdapter;
 import app.insti.api.EmptyCallback;
 import app.insti.api.RetrofitInterface;
+import app.insti.api.model.Event;
 import app.insti.api.model.Notification;
 import app.insti.api.model.PlacementBlogPost;
+import app.insti.interfaces.ItemClickListener;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -57,8 +55,8 @@ public class NotificationsFragment extends BaseFragment {
         Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
         toolbar.setTitle("Notifications");
 
-        RetrofitInterface retrofitInterface = ((MainActivity) getActivity()).getRetrofitInterface();
-        retrofitInterface.getNotifications(((MainActivity) getActivity()).getSessionIDHeader()).enqueue(new Callback<List<Notification>>() {
+        RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
+        retrofitInterface.getNotifications(Utils.getSessionIDHeader()).enqueue(new Callback<List<Notification>>() {
             @Override
             public void onResponse(Call<List<Notification>> call, Response<List<Notification>> response) {
                 if (response.isSuccessful()) {
@@ -87,51 +85,27 @@ public class NotificationsFragment extends BaseFragment {
                 Notification notification = notifications.get(position);
 
                 /* Mark notification read */
-                RetrofitInterface retrofitInterface = ((MainActivity) getActivity()).getRetrofitInterface();
-                String sessId = ((MainActivity) getActivity()).getSessionIDHeader();
+                RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
+                String sessId = Utils.getSessionIDHeader();
                 retrofitInterface.markNotificationRead(sessId, notification.getNotificationId().toString()).enqueue(new EmptyCallback<Void>());
 
-                FragmentManager manager = getActivity().getSupportFragmentManager();
-                FragmentTransaction transaction = manager.beginTransaction();
-                String tag = "";
-
-                Bundle bundle = getArguments();
-                if (bundle == null) {
-                    bundle = new Bundle();
-                }
-                bundle.putString(Constants.SESSION_ID, ((MainActivity) getActivity()).getSessionIDHeader());
-
                 /* Open event */
                 if (notification.getNotificationActorType().contains("event")) {
-                    String eventJson = new Gson().toJson(notification.getNotificationActor());
-                    bundle.putString(Constants.EVENT_JSON, eventJson);
-                    EventFragment eventFragment = new EventFragment();
-                    eventFragment.setArguments(bundle);
-                    tag = eventFragment.getTag();
-                    transaction.replace(R.id.framelayout_for_fragment, eventFragment, tag);
+                    Gson gson = new Gson();
+                    Event event = gson.fromJson(gson.toJson(notification.getNotificationActor()), Event.class) ;
+                    Utils.openEventFragment(event, getActivity());
                 } else if (notification.getNotificationActorType().contains("newsentry")) {
                     NewsFragment newsFragment = new NewsFragment();
-                    tag = newsFragment.getTag();
-                    transaction.replace(R.id.framelayout_for_fragment, newsFragment, tag);
-                    newsFragment.setArguments(bundle);
+                    Utils.updateFragment(newsFragment, getActivity());
                 } else if (notification.getNotificationActorType().contains("blogentry")) {
                     Gson gson = new Gson();
                     PlacementBlogPost post = gson.fromJson(gson.toJson(notification.getNotificationActor()), PlacementBlogPost.class);
                     if (post.getLink().contains("training")) {
-                        TrainingBlogFragment trainingBlogFragment = new TrainingBlogFragment();
-                        trainingBlogFragment.setArguments(bundle);
-                        tag = trainingBlogFragment.getTag();
-                        transaction.replace(R.id.framelayout_for_fragment, trainingBlogFragment, tag);
+                        Utils.updateFragment(new TrainingBlogFragment(), getActivity());
                     } else {
-                        PlacementBlogFragment placementBlogFragment = new PlacementBlogFragment();
-                        placementBlogFragment.setArguments(bundle);
-                        tag = placementBlogFragment.getTag();
-                        transaction.replace(R.id.framelayout_for_fragment, placementBlogFragment, tag);
+                        Utils.updateFragment(new PlacementBlogFragment(), getActivity());
                     }
                 }
-
-                transaction.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_left, R.anim.slide_in_right, R.anim.slide_out_right);
-                transaction.addToBackStack(tag).commit();
             }
         });
         notificationsRecyclerView = (RecyclerView) getActivity().findViewById(R.id.notifications_recycler_view);

app/src/main/java/app/insti/fragment/PlacementBlogFragment.java

 package app.insti.fragment;
 
 
-import android.app.Activity;
-import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SearchView;
 import android.support.v7.widget.Toolbar;
-import android.text.TextUtils;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import app.insti.ActivityBuffer;
-import app.insti.Constants;
-import app.insti.interfaces.ItemClickListener;
 import app.insti.R;
-import app.insti.activity.MainActivity;
 import app.insti.adapter.PlacementBlogAdapter;
 import app.insti.api.RetrofitInterface;
 import app.insti.api.model.PlacementBlogPost;
 import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
 
 /**
  * A simple {@link Fragment} subclass.
@@ -73,7 +56,7 @@ public class PlacementBlogFragment extends RecyclerViewFragment<PlacementBlogPos
     }
 
     @Override
-    Call<List<PlacementBlogPost>> getCall(RetrofitInterface retrofitInterface, String sessionIDHeader) {
-        return retrofitInterface.getPlacementBlogFeed(sessionIDHeader, getPostCount(), 20, searchQuery);
+    Call<List<PlacementBlogPost>> getCall(RetrofitInterface retrofitInterface, String sessionIDHeader, int postCount) {
+        return retrofitInterface.getPlacementBlogFeed(sessionIDHeader, postCount, 20, searchQuery);
     }
 }

app/src/main/java/app/insti/fragment/RecyclerViewFragment.java

@@ -15,15 +15,17 @@ import android.view.View;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
+import java.util.Objects;
 
 import app.insti.ActivityBuffer;
+import app.insti.R;
+import app.insti.Utils;
+import app.insti.activity.MainActivity;
 import app.insti.api.RetrofitInterface;
 import app.insti.interfaces.Browsable;
 import app.insti.interfaces.ItemClickListener;
-import app.insti.R;
 import app.insti.interfaces.Readable;
 import app.insti.interfaces.Writable;
-import app.insti.activity.MainActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -38,14 +40,33 @@ public abstract class RecyclerViewFragment<T extends Browsable, S extends Recycl
     protected SwipeRefreshLayout swipeRefreshLayout;
     protected String searchQuery;
     private S adapter = null;
+    boolean loading = false;
+    private boolean allLoaded = false;
 
+    /** Update the data clearing existing */
     protected void updateData() {
-        String sessionIDHeader = ((MainActivity) getActivity()).getSessionIDHeader();
-        RetrofitInterface retrofitInterface = ((MainActivity) getActivity()).getRetrofitInterface();
-        Call<List<T>> call = getCall(retrofitInterface, sessionIDHeader);
+        // Skip if we're already destroyed
+        if (getActivity() == null || getView() == null) return;
+
+        // Clear variables
+        allLoaded = false;
+
+        // Keep current search query
+        final String requestSearchQuery = searchQuery;
+
+        // Make the request
+        String sessionIDHeader = Utils.getSessionIDHeader();
+        RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
+        Call<List<T>> call = getCall(retrofitInterface, sessionIDHeader, 0);
         call.enqueue(new Callback<List<T>>() {
             @Override
             public void onResponse(Call<List<T>> call, Response<List<T>> response) {
+                // Check if search query was changed in the meanwhile
+                if (!Objects.equals(requestSearchQuery, searchQuery)) {
+                    return;
+                }
+
+                // Update display
                 if (response.isSuccessful()) {
                     List<T> posts = response.body();
                     displayData(posts);
@@ -60,12 +81,24 @@ public abstract class RecyclerViewFragment<T extends Browsable, S extends Recycl
         });
     }
 
-    abstract Call<List<T>> getCall(RetrofitInterface retrofitInterface, String sessionIDHeader);
+    abstract Call<List<T>> getCall(RetrofitInterface retrofitInterface, String sessionIDHeader, int postCount);
 
     private void displayData(final List<T> result) {
         /* Skip if we're already destroyed */
         if (getActivity() == null || getView() == null) return;
 
+        if (adapter == null) {
+            initAdapter(result);
+        } else {
+            adapter.setPosts(result);
+            adapter.notifyDataSetChanged();
+        }
+
+        getActivity().findViewById(R.id.loadingPanel).setVisibility(GONE);
+    }
+
+    /** Initialize the adapter */
+    private void initAdapter(final List<T> result) {
         try {
             adapter = adapterType.getDeclaredConstructor(List.class, ItemClickListener.class).newInstance(result, new ItemClickListener() {
                 @Override
@@ -75,53 +108,58 @@ public abstract class RecyclerViewFragment<T extends Browsable, S extends Recycl
                         openWebURL(link);
                 }
             });
-            getActivityBuffer().safely(new ActivityBuffer.IRunnable() {
-                @Override
-                public void run(Activity pActivity) {
-                    recyclerView.setAdapter(adapter);
-                    recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-                    recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
-                        boolean loading = false;
-
-                        @Override
-                        public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
-                            if (dy > 0) {
-                                LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
-                                if (((layoutManager.getChildCount() + layoutManager.findFirstVisibleItemPosition()) > (layoutManager.getItemCount() - 5)) && (!loading)) {
-                                    loading = true;
-                                    String sessionIDHeader = ((MainActivity) getActivity()).getSessionIDHeader();
-                                    RetrofitInterface retrofitInterface = ((MainActivity) getActivity()).getRetrofitInterface();
-                                    Call<List<T>> call = getCall(retrofitInterface, sessionIDHeader);
-                                    call.enqueue(new Callback<List<T>>() {
-                                        @Override
-                                        public void onResponse(Call<List<T>> call, Response<List<T>> response) {
-                                            if (response.isSuccessful()) {
-                                                loading = false;
-                                                List<T> posts = adapter.getPosts();
-                                                posts.addAll(response.body());
-                                                if (response.body().size() == 0) {
-                                                    showLoader = false;
-                                                }
-                                                adapter.setPosts(posts);
-                                                adapter.notifyDataSetChanged();
+            initRecyclerView();
+
+        } catch (java.lang.InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /** Initialize scrolling on the adapter */
+    private void initRecyclerView() {
+        getActivityBuffer().safely(new ActivityBuffer.IRunnable() {
+            @Override
+            public void run(Activity pActivity) {
+                recyclerView.setAdapter(adapter);
+                recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+                recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+                    @Override
+                    public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+                        if (dy > 0) {
+                            LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
+                            if (((layoutManager.getChildCount() + layoutManager.findFirstVisibleItemPosition()) > (layoutManager.getItemCount() - 5)) && (!loading) && (!allLoaded)) {
+                                loading = true;
+                                String sessionIDHeader = Utils.getSessionIDHeader();
+                                RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
+                                Call<List<T>> call = getCall(retrofitInterface, sessionIDHeader, getPostCount());
+                                call.enqueue(new Callback<List<T>>() {
+                                    @Override
+                                    public void onResponse(Call<List<T>> call, Response<List<T>> response) {
+                                        if (getActivity() == null || getView() == null) return;
+                                        loading = false;
+                                        if (response.isSuccessful()) {
+                                            List<T> posts = adapter.getPosts();
+                                            posts.addAll(response.body());
+                                            if (response.body().size() == 0) {
+                                                showLoader = false;
+                                                allLoaded = true;
                                             }
+                                            adapter.setPosts(posts);
+                                            adapter.notifyDataSetChanged();
                                         }
+                                    }
 
-                                        @Override
-                                        public void onFailure(Call<List<T>> call, Throwable t) {
-                                            loading = false;
-                                        }
-                                    });
-                                }
+                                    @Override
+                                    public void onFailure(Call<List<T>> call, Throwable t) {
+                                        loading = false;
+                                    }
+                                });
                             }
                         }
-                    });
-                }
-            });
-            getActivity().findViewById(R.id.loadingPanel).setVisibility(GONE);
-        } catch (java.lang.InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
+                    }
+                });
+            }
+        });
     }
 
     protected int getPostCount() {

app/src/main/java/app/insti/fragment/SettingsFragment.java

@@ -5,8 +5,6 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
 import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -20,6 +18,7 @@ import com.squareup.picasso.Picasso;
 import app.insti.Constants;
 import app.insti.R;
 import app.insti.SessionManager;
+import app.insti.Utils;
 import app.insti.activity.LoginActivity;
 import app.insti.activity.MainActivity;
 import app.insti.api.RetrofitInterface;
@@ -57,8 +56,8 @@ public class SettingsFragment extends Fragment {
 
         populateViews();
 
-        RetrofitInterface retrofitInterface = ((MainActivity) getActivity()).getRetrofitInterface();
-        retrofitInterface.getUser("sessionid=" + getArguments().getString(Constants.SESSION_ID), userID).enqueue(new Callback<User>() {
+        RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
+        retrofitInterface.getUser(Utils.getSessionIDHeader(), userID).enqueue(new Callback<User>() {
             @Override
             public void onResponse(Call<User> call, Response<User> response) {
                 if (response.isSuccessful()) {
@@ -123,12 +122,7 @@ public class SettingsFragment extends Fragment {
         aboutButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                AboutFragment aboutFragment = new AboutFragment();
-                FragmentManager manager = getActivity().getSupportFragmentManager();
-                FragmentTransaction transaction = manager.beginTransaction();
-                transaction.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_left, R.anim.slide_in_right, R.anim.slide_out_right);
-                transaction.replace(R.id.framelayout_for_fragment, aboutFragment, aboutFragment.getTag());
-                transaction.addToBackStack(aboutFragment.getTag()).commit();
+                Utils.updateFragment(new AboutFragment(), getActivity());
             }
         });
 
@@ -138,8 +132,8 @@ public class SettingsFragment extends Fragment {
             logoutButton.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    RetrofitInterface retrofitInterface = ((MainActivity) getActivity()).getRetrofitInterface();
-                    retrofitInterface.logout("sessionid=" + getArguments().getString(Constants.SESSION_ID)).enqueue(new Callback<Void>() {
+                    RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
+                    retrofitInterface.logout(Utils.getSessionIDHeader()).enqueue(new Callback<Void>() {
                         @Override
                         public void onResponse(Call<Void> call, Response<Void> response) {
                             if (response.isSuccessful()) {

app/src/main/java/app/insti/fragment/TrainingBlogFragment.java

 package app.insti.fragment;
 
 
-import android.app.Activity;
-import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SearchView;
 import android.support.v7.widget.Toolbar;
-import android.text.TextUtils;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import app.insti.ActivityBuffer;
-import app.insti.Constants;
-import app.insti.interfaces.ItemClickListener;
 import app.insti.R;
-import app.insti.activity.MainActivity;
 import app.insti.adapter.TrainingBlogAdapter;
 import app.insti.api.RetrofitInterface;
 import app.insti.api.model.TrainingBlogPost;
 import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
 
 /**
  * A simple {@link Fragment} subclass.
@@ -73,7 +56,7 @@ public class TrainingBlogFragment extends RecyclerViewFragment<TrainingBlogPost,
     }
 
     @Override
-    Call<List<TrainingBlogPost>> getCall(RetrofitInterface retrofitInterface, String sessionIDHeader) {
-        return retrofitInterface.getTrainingBlogFeed(sessionIDHeader, getPostCount(), 20, searchQuery);
+    Call<List<TrainingBlogPost>> getCall(RetrofitInterface retrofitInterface, String sessionIDHeader, int postCount) {
+        return retrofitInterface.getTrainingBlogFeed(sessionIDHeader, postCount, 20, searchQuery);
     }
 }

app/src/main/java/app/insti/fragment/UserFragment.java

@@ -13,7 +13,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
 import android.support.v4.view.ViewPager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -31,10 +30,9 @@ import com.squareup.picasso.Picasso;
 import java.util.List;
 
 import app.insti.Constants;
-import app.insti.interfaces.ItemClickListener;
 import app.insti.R;
 import app.insti.ShareURLMaker;
-import app.insti.activity.MainActivity;
+import app.insti.Utils;
 import app.insti.adapter.RoleAdapter;
 import app.insti.adapter.TabAdapter;
 import app.insti.api.RetrofitInterface;
@@ -42,6 +40,7 @@ import app.insti.api.model.Body;
 import app.insti.api.model.Event;
 import app.insti.api.model.Role;
 import app.insti.api.model.User;
+import app.insti.interfaces.ItemClickListener;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -107,8 +106,8 @@ public class UserFragment extends BackHandledFragment {
         Bundle bundle = getArguments();
         String userID = bundle.getString(Constants.USER_ID);
 
-        RetrofitInterface retrofitInterface = ((MainActivity) getActivity()).getRetrofitInterface();
-        retrofitInterface.getUser("sessionid=" + getArguments().getString(Constants.SESSION_ID), userID).enqueue(new Callback<User>() {
+        RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
+        retrofitInterface.getUser(Utils.getSessionIDHeader(), userID).enqueue(new Callback<User>() {
             @Override
             public void onResponse(Call<User> call, Response<User> response) {
                 if (response.isSuccessful()) {
@@ -147,12 +146,7 @@ public class UserFragment extends BackHandledFragment {
             public void onItemClick(View v, int position) {
                 Role role = roleList.get(position);
                 Body roleBody = role.getRoleBodyDetails();
-                BodyFragment bodyFragment = BodyFragment.newInstance(roleBody);
-                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-                ft.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_left, R.anim.slide_in_right, R.anim.slide_out_right);
-                ft.replace(R.id.framelayout_for_fragment, bodyFragment, bodyFragment.getTag());
-                ft.addToBackStack(bodyFragment.getTag());
-                ft.commit();
+                Utils.openBodyFragment(roleBody, getActivity());
 
             }
         });

app/src/main/java/com/mrane/zoomview/SubsamplingScaleImageView.java

@@ -32,11 +32,11 @@ import android.graphics.Point;
 import android.graphics.PointF;
 import android.graphics.Rect;
 import android.graphics.RectF;
-import android.support.media.ExifInterface;
 import android.os.AsyncTask;
 import android.os.Build.VERSION;
 import android.os.Handler;
 import android.os.Message;
+import android.support.media.ExifInterface;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.util.Log;

app/src/main/res/drawable-hdpi/bottom_card_background.xml

-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Drop Shadow Stack -->
-
-    <!-- Background -->
-    <item>
-        <shape>
-            <solid android:color="#e5e5e5" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file

app/src/main/res/drawable-hdpi/cardui_background.xml

-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="#30555555" />
-            <corners android:radius="2dp" />
-        </shape>
-    </item>
-
-    <item
-        android:bottom="2dp"
-        android:left="0dp"
-        android:right="0dp"
-        android:top="0dp">
-        <shape android:shape="rectangle">
-            <solid android:color="#FFFFFF" />
-            <corners android:radius="2dp" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file

app/src/main/res/drawable-hdpi/image_background.xml

-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Drop Shadow Stack -->
-    <item>
-        <shape>
-            <padding
-                android:bottom="1dp"
-                android:left="1dp"
-                android:right="1dp"
-                android:top="1dp" />
-            <solid android:color="#00999999" />
-        </shape>
-    </item>
-    <item>
-        <shape>
-            <padding
-                android:bottom="1dp"
-                android:left="1dp"
-                android:right="1dp"
-                android:top="1dp" />
-            <solid android:color="#10999999" />
-        </shape>
-    </item>
-    <item>
-        <shape>
-            <padding
-                android:bottom="1dp"
-                android:left="1dp"
-                android:right="1dp"
-                android:top="1dp" />
-            <solid android:color="#20999999" />
-        </shape>
-    </item>
-    <item>
-        <shape>
-            <padding
-                android:bottom="1dp"
-                android:left="1dp"
-                android:right="1dp"
-                android:top="1dp" />
-            <solid android:color="#10999999" />
-        </shape>
-    </item>
-    <item>
-        <shape>
-            <padding
-                android:bottom="1dp"
-                android:left="1dp"
-                android:right="1dp"
-                android:top="1dp" />
-            <solid android:color="#00999999" />
-        </shape>
-    </item>
-
-    <!-- Background -->
-    <item>
-        <shape>
-            <solid android:color="@android:color/transparent" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file

app/src/main/res/drawable-hdpi/searchbar_background.xml

-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Drop Shadow Stack -->
-    <item>
-        <shape>
-            <padding
-                android:bottom="1dp"
-                android:left="1dp"
-                android:right="1dp"
-                android:top="1dp" />
-            <solid android:color="#00999999" />
-            <corners android:radius="5dp" />
-        </shape>
-    </item>
-    <item>
-        <shape>
-            <padding
-                android:bottom="1dp"
-                android:left="1dp"
-                android:right="1dp"
-                android:top="1dp" />
-            <solid android:color="#00999999" />
-            <corners android:radius="5dp" />
-        </shape>
-    </item>
-    <item>
-        <shape>
-            <padding
-                android:bottom="1dp"
-                android:left="1dp"
-                android:right="1dp"
-                android:top="1dp" />
-            <solid android:color="#00999999" />
-            <corners android:radius="5dp" />
-        </shape>
-    </item>
-    <item>
-        <shape>
-            <padding
-                android:bottom="1dp"
-                android:left="1dp"
-                android:right="1dp"
-                android:top="1dp" />
-            <solid android:color="#00999999" />
-            <corners android:radius="5dp" />
-        </shape>
-    </item>
-    <item>
-        <shape>
-            <padding
-                android:bottom="1dp"
-                android:left="1dp"
-                android:right="1dp"
-                android:top="1dp" />
-            <solid android:color="#00999999" />
-            <corners android:radius="5dp" />
-        </shape>
-    </item>
-
-    <!-- Background -->
-    <item>
-        <shape>
-            <gradient
-                android:angle="90"
-                android:centerColor="#FFf6f6f6"
-                android:centerX="6%"
-                android:endColor="#FFffffff"
-                android:startColor="#FFe4e4e4"
-                android:type="linear" />
-            <corners android:radius="5dp" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file

app/src/main/res/drawable-hdpi/transparent_black_gradient.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <gradient
-        android:angle="270"
-        android:centerColor="#19000000"
-        android:centerX="60%"
-        android:endColor="#FF000000"
-        android:startColor="#00000000"
-        android:type="linear" />
-</shape>
\ No newline at end of file