Merge branch 'master' into fdroid

# Conflicts:
#	.gitlab-ci.yml
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/commit451/gitlab/App.java

app/src/main/java/com/commit451/gitlab/fragment/BuildsFragment.java

@@ -15,18 +15,18 @@ import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 import android.widget.TextView;
-import com.commit451.gitlab.LabCoatApp;
+import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.activity.ProjectActivity;
 import com.commit451.gitlab.adapter.BuildsAdapter;
 import com.commit451.gitlab.adapter.DividerItemDecoration;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.event.BuildChangedEvent;
 import com.commit451.gitlab.event.ProjectReloadEvent;
 import com.commit451.gitlab.model.api.Build;
 import com.commit451.gitlab.model.api.Project;
-import com.commit451.gitlab.navigation.NavigationManager;
+import com.commit451.gitlab.navigation.Navigator;
 import com.commit451.gitlab.util.PaginationUtil;
 import com.squareup.otto.Subscribe;
@@ -82,7 +82,7 @@ public class BuildsFragment extends ButterKnifeFragment {
         @Override
         public void onBuildClicked(Build build) {
             if (mProject != null) {
-                NavigationManager.navigateToBuild(getActivity(), mProject, build);
+                Navigator.navigateToBuild(getActivity(), mProject, build);
             } else {
                 Snackbar.make(mRoot, getString(R.string.wait_for_project_to_load), Snackbar.LENGTH_SHORT)
                         .show();
@@ -104,7 +104,7 @@ public class BuildsFragment extends ButterKnifeFragment {
     private final EasyCallback<List<Build>> mLoadCallback = new EasyCallback<List<Build>>() {
         @Override
-        public void onResponse(@NonNull List<Build> response) {
+        public void success(@NonNull List<Build> response) {
             mLoading = false;
             if (getView() == null) {
                 return;
@@ -120,7 +120,7 @@ public class BuildsFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             mLoading = false;
             Timber.e(t, null);
             if (getView() == null) {
@@ -128,7 +128,7 @@ public class BuildsFragment extends ButterKnifeFragment {
             }
             mSwipeRefreshLayout.setRefreshing(false);
             mMessageView.setVisibility(View.VISIBLE);
-            mMessageView.setText(R.string.connection_error_issues);
+            mMessageView.setText(R.string.failed_to_load_builds);
             mBuildsAdapter.setValues(null);
             mNextPageUrl = null;
         }
@@ -136,7 +136,7 @@ public class BuildsFragment extends ButterKnifeFragment {
     private final EasyCallback<List<Build>> mMoreCallback = new EasyCallback<List<Build>>() {
         @Override
-        public void onResponse(@NonNull List<Build> response) {
+        public void success(@NonNull List<Build> response) {
             mLoading = false;
             mBuildsAdapter.setLoading(false);
             mNextPageUrl = PaginationUtil.parse(getResponse()).getNext();
@@ -144,7 +144,7 @@ public class BuildsFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mLoading = false;
             mBuildsAdapter.setLoading(false);
@@ -168,7 +168,7 @@ public class BuildsFragment extends ButterKnifeFragment {
         super.onViewCreated(view, savedInstanceState);
         mEventReceiver = new EventReceiver();
-        LabCoatApp.bus().register(mEventReceiver);
+        App.bus().register(mEventReceiver);
         mBuildsAdapter = new BuildsAdapter(mAdapterListener);
         mLayoutManagerBuilds = new LinearLayoutManager(getActivity());
@@ -199,7 +199,7 @@ public class BuildsFragment extends ButterKnifeFragment {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        LabCoatApp.bus().unregister(mEventReceiver);
+        App.bus().unregister(mEventReceiver);
     }
     @Override

app/src/main/java/com/commit451/gitlab/fragment/CommitsFragment.java

@@ -11,17 +11,17 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import com.commit451.gitlab.LabCoatApp;
+import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.activity.ProjectActivity;
 import com.commit451.gitlab.adapter.CommitsAdapter;
 import com.commit451.gitlab.adapter.DividerItemDecoration;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.event.ProjectReloadEvent;
 import com.commit451.gitlab.model.api.Project;
 import com.commit451.gitlab.model.api.RepositoryCommit;
-import com.commit451.gitlab.navigation.NavigationManager;
+import com.commit451.gitlab.navigation.Navigator;
 import com.squareup.otto.Subscribe;
 import java.util.List;
@@ -62,7 +62,7 @@ public class CommitsFragment extends ButterKnifeFragment {
     private final EasyCallback<List<RepositoryCommit>> mCommitsCallback = new EasyCallback<List<RepositoryCommit>>() {
         @Override
-        public void onResponse(@NonNull List<RepositoryCommit> response) {
+        public void success(@NonNull List<RepositoryCommit> response) {
             mLoading = false;
             if (getView() == null) {
                 return;
@@ -81,7 +81,7 @@ public class CommitsFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             mLoading = false;
             Timber.e(t, null);
             if (getView() == null) {
@@ -97,7 +97,7 @@ public class CommitsFragment extends ButterKnifeFragment {
     private final EasyCallback<List<RepositoryCommit>> mMoreCommitsCallback = new EasyCallback<List<RepositoryCommit>>() {
         @Override
-        public void onResponse(@NonNull List<RepositoryCommit> response) {
+        public void success(@NonNull List<RepositoryCommit> response) {
             mLoading = false;
             if (getView() == null) {
                 return;
@@ -111,7 +111,7 @@ public class CommitsFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             mLoading = false;
             Timber.e(t, null);
             if (getView() == null) {
@@ -124,7 +124,7 @@ public class CommitsFragment extends ButterKnifeFragment {
     private final CommitsAdapter.Listener mCommitsAdapterListener = new CommitsAdapter.Listener() {
         @Override
         public void onCommitClicked(RepositoryCommit commit) {
-            NavigationManager.navigateToDiffActivity(getActivity(), mProject, commit);
+            Navigator.navigateToDiffActivity(getActivity(), mProject, commit);
         }
     };
@@ -138,7 +138,7 @@ public class CommitsFragment extends ButterKnifeFragment {
         super.onViewCreated(view, savedInstanceState);
         mEventReceiver = new EventReceiver();
-        LabCoatApp.bus().register(mEventReceiver);
+        App.bus().register(mEventReceiver);
         mCommitsAdapter = new CommitsAdapter(mCommitsAdapterListener);
         mCommitsLayoutManager = new LinearLayoutManager(getActivity());
@@ -166,7 +166,7 @@ public class CommitsFragment extends ButterKnifeFragment {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        LabCoatApp.bus().unregister(mEventReceiver);
+        App.bus().unregister(mEventReceiver);
     }
     @Override

app/src/main/java/com/commit451/gitlab/fragment/FeedFragment.java

@@ -11,15 +11,15 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import com.commit451.gitlab.LabCoatApp;
+import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.DividerItemDecoration;
 import com.commit451.gitlab.adapter.FeedAdapter;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.rss.Entry;
 import com.commit451.gitlab.model.rss.Feed;
-import com.commit451.gitlab.navigation.NavigationManager;
+import com.commit451.gitlab.navigation.Navigator;
 import com.novoda.simplechromecustomtabs.SimpleChromeCustomTabs;
 import butterknife.BindView;
@@ -54,7 +54,7 @@ public class FeedFragment extends ButterKnifeFragment {
     private final EasyCallback<Feed> mUserFeedCallback = new EasyCallback<Feed>() {
         @Override
-        public void onResponse(@NonNull Feed response) {
+        public void success(@NonNull Feed response) {
             if (getView() == null) {
                 return;
             }
@@ -70,7 +70,7 @@ public class FeedFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             if (getView() == null) {
                 return;
@@ -85,7 +85,7 @@ public class FeedFragment extends ButterKnifeFragment {
     private final FeedAdapter.Listener mFeedAdapterListener = new FeedAdapter.Listener() {
         @Override
         public void onFeedEntryClicked(Entry entry) {
-            NavigationManager.navigateToUrl(getActivity(), entry.getLink().getHref(), GitLabClient.getAccount());
+            Navigator.navigateToUrl(getActivity(), entry.getLink().getHref(), GitLabClient.getAccount());
         }
     };
@@ -105,7 +105,7 @@ public class FeedFragment extends ButterKnifeFragment {
         super.onViewCreated(view, savedInstanceState);
         mEventReceiver = new EventReceiver();
-        LabCoatApp.bus().register(mEventReceiver);
+        App.bus().register(mEventReceiver);
         mFeedAdapter = new FeedAdapter(mFeedAdapterListener);
         mEntryListView.setLayoutManager(new LinearLayoutManager(getActivity()));
@@ -139,7 +139,7 @@ public class FeedFragment extends ButterKnifeFragment {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        LabCoatApp.bus().unregister(mEventReceiver);
+        App.bus().unregister(mEventReceiver);
     }
     @Override

app/src/main/java/com/commit451/gitlab/fragment/FilesFragment.java

@@ -15,18 +15,18 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import com.commit451.gitlab.LabCoatApp;
+import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.activity.ProjectActivity;
 import com.commit451.gitlab.adapter.BreadcrumbAdapter;
 import com.commit451.gitlab.adapter.DividerItemDecoration;
 import com.commit451.gitlab.adapter.FilesAdapter;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.event.ProjectReloadEvent;
 import com.commit451.gitlab.model.api.Project;
 import com.commit451.gitlab.model.api.RepositoryTreeObject;
-import com.commit451.gitlab.navigation.NavigationManager;
+import com.commit451.gitlab.navigation.Navigator;
 import com.commit451.gitlab.util.IntentUtil;
 import com.squareup.otto.Subscribe;
@@ -63,7 +63,7 @@ public class FilesFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onResponse(@NonNull List<RepositoryTreeObject> response) {
+        public void success(@NonNull List<RepositoryTreeObject> response) {
             if (getView() == null) {
                 return;
             }
@@ -83,7 +83,7 @@ public class FilesFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             if (getView() == null) {
                 return;
@@ -106,7 +106,7 @@ public class FilesFragment extends ButterKnifeFragment {
         @Override
         public void onFileClicked(RepositoryTreeObject treeItem) {
             String path = mCurrentPath + treeItem.getName();
-            NavigationManager.navigateToFile(getActivity(), mProject.getId(), path, mBranchName);
+            Navigator.navigateToFile(getActivity(), mProject.getId(), path, mBranchName);
         }
         @Override
@@ -141,7 +141,7 @@ public class FilesFragment extends ButterKnifeFragment {
         super.onViewCreated(view, savedInstanceState);
         mEventReceiver = new EventReceiver();
-        LabCoatApp.bus().register(mEventReceiver);
+        App.bus().register(mEventReceiver);
         mFilesAdapter = new FilesAdapter(mFilesAdapterListener);
         mFilesListView.setLayoutManager(new LinearLayoutManager(getActivity()));
@@ -171,7 +171,7 @@ public class FilesFragment extends ButterKnifeFragment {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        LabCoatApp.bus().unregister(mEventReceiver);
+        App.bus().unregister(mEventReceiver);
     }
     @Override

app/src/main/java/com/commit451/gitlab/fragment/GroupMembersFragment.java

@@ -11,16 +11,16 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import com.commit451.gitlab.LabCoatApp;
+import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.GroupMembersAdapter;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.dialog.AccessDialog;
 import com.commit451.gitlab.event.MemberAddedEvent;
 import com.commit451.gitlab.model.api.Group;
 import com.commit451.gitlab.model.api.Member;
-import com.commit451.gitlab.navigation.NavigationManager;
+import com.commit451.gitlab.navigation.Navigator;
 import com.commit451.gitlab.viewHolder.ProjectMemberViewHolder;
 import com.squareup.otto.Subscribe;
@@ -65,7 +65,7 @@ public class GroupMembersFragment extends ButterKnifeFragment {
     private final EasyCallback<List<Member>> mGroupMembersCallback = new EasyCallback<List<Member>>() {
         @Override
-        public void onResponse(@NonNull List<Member> response) {
+        public void success(@NonNull List<Member> response) {
             if (getView() == null) {
                 return;
             }
@@ -79,7 +79,7 @@ public class GroupMembersFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             if (getView() == null) {
                 return;
@@ -94,7 +94,7 @@ public class GroupMembersFragment extends ButterKnifeFragment {
     private final EasyCallback<Void> mRemoveMemberCallback = new EasyCallback<Void>() {
         @Override
-        public void onResponse(@NonNull Void response) {
+        public void success(@NonNull Void response) {
             if (getView() == null) {
                 return;
             }
@@ -102,7 +102,7 @@ public class GroupMembersFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             if (getView() == null) {
                 return;
@@ -115,7 +115,7 @@ public class GroupMembersFragment extends ButterKnifeFragment {
     private final GroupMembersAdapter.Listener mListener = new GroupMembersAdapter.Listener() {
         @Override
         public void onUserClicked(Member member, ProjectMemberViewHolder holder) {
-            NavigationManager.navigateToUser(getActivity(), holder.mImageView, member);
+            Navigator.navigateToUser(getActivity(), holder.mImageView, member);
         }
         @Override
@@ -148,7 +148,7 @@ public class GroupMembersFragment extends ButterKnifeFragment {
         super.onViewCreated(view, savedInstanceState);
         mEventReceiver = new EventReceiver();
-        LabCoatApp.bus().register(mEventReceiver);
+        App.bus().register(mEventReceiver);
         mGroupMembersAdapter = new GroupMembersAdapter(mListener);
         mRecyclerView.setLayoutManager(new GridLayoutManager(getActivity(), 2));
@@ -167,12 +167,12 @@ public class GroupMembersFragment extends ButterKnifeFragment {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        LabCoatApp.bus().unregister(mEventReceiver);
+        App.bus().unregister(mEventReceiver);
     }
     @OnClick(R.id.add_user_button)
     public void onAddUserClick(View fab) {
-        NavigationManager.navigateToAddGroupMember(getActivity(), fab, mGroup);
+        Navigator.navigateToAddGroupMember(getActivity(), fab, mGroup);
     }
     public void loadData() {

app/src/main/java/com/commit451/gitlab/fragment/IssuesFragment.java

@@ -15,12 +15,12 @@ import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 import android.widget.TextView;
-import com.commit451.gitlab.LabCoatApp;
+import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.activity.ProjectActivity;
 import com.commit451.gitlab.adapter.DividerItemDecoration;
 import com.commit451.gitlab.adapter.IssuesAdapter;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.event.IssueChangedEvent;
 import com.commit451.gitlab.event.IssueCreatedEvent;
@@ -28,7 +28,7 @@ import com.commit451.gitlab.event.IssueReloadEvent;
 import com.commit451.gitlab.event.ProjectReloadEvent;
 import com.commit451.gitlab.model.api.Issue;
 import com.commit451.gitlab.model.api.Project;
-import com.commit451.gitlab.navigation.NavigationManager;
+import com.commit451.gitlab.navigation.Navigator;
 import com.commit451.gitlab.util.PaginationUtil;
 import com.squareup.otto.Subscribe;
@@ -82,7 +82,7 @@ public class IssuesFragment extends ButterKnifeFragment {
         @Override
         public void onIssueClicked(Issue issue) {
             if (mProject != null) {
-                NavigationManager.navigateToIssue(getActivity(), mProject, issue);
+                Navigator.navigateToIssue(getActivity(), mProject, issue);
             } else {
                 Snackbar.make(mRoot, getString(R.string.wait_for_project_to_load), Snackbar.LENGTH_SHORT)
                         .show();
@@ -104,7 +104,7 @@ public class IssuesFragment extends ButterKnifeFragment {
     private final EasyCallback<List<Issue>> mIssuesCallback = new EasyCallback<List<Issue>>() {
         @Override
-        public void onResponse(@NonNull List<Issue> response) {
+        public void success(@NonNull List<Issue> response) {
             mLoading = false;
             if (getView() == null) {
                 return;
@@ -120,7 +120,7 @@ public class IssuesFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             mLoading = false;
             Timber.e(t, null);
             if (getView() == null) {
@@ -136,7 +136,7 @@ public class IssuesFragment extends ButterKnifeFragment {
     private final EasyCallback<List<Issue>> mMoreIssuesCallback = new EasyCallback<List<Issue>>() {
         @Override
-        public void onResponse(@NonNull List<Issue> response) {
+        public void success(@NonNull List<Issue> response) {
             mLoading = false;
             mIssuesAdapter.setLoading(false);
             mNextPageUrl = PaginationUtil.parse(getResponse()).getNext();
@@ -144,7 +144,7 @@ public class IssuesFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mLoading = false;
             mIssuesAdapter.setLoading(false);
@@ -168,7 +168,7 @@ public class IssuesFragment extends ButterKnifeFragment {
         super.onViewCreated(view, savedInstanceState);
         mEventReceiver = new EventReceiver();
-        LabCoatApp.bus().register(mEventReceiver);
+        App.bus().register(mEventReceiver);
         mIssuesAdapter = new IssuesAdapter(mIssuesAdapterListener);
         mIssuesLayoutManager = new LinearLayoutManager(getActivity());
@@ -198,13 +198,13 @@ public class IssuesFragment extends ButterKnifeFragment {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        LabCoatApp.bus().unregister(mEventReceiver);
+        App.bus().unregister(mEventReceiver);
     }
     @OnClick(R.id.add_issue_button)
     public void onAddIssueClick(View fab) {
         if (mProject != null) {
-            NavigationManager.navigateToAddIssue(getActivity(), fab, mProject);
+            Navigator.navigateToAddIssue(getActivity(), fab, mProject);
         } else {
             Snackbar.make(mRoot, getString(R.string.wait_for_project_to_load), Snackbar.LENGTH_SHORT)
                     .show();
@@ -247,7 +247,7 @@ public class IssuesFragment extends ButterKnifeFragment {
         mLoading = true;
         Timber.d("loadMore called for " + mNextPageUrl);
-        GitLabClient.instance().getIssues(mNextPageUrl.toString(), mState).enqueue(mMoreIssuesCallback);
+        GitLabClient.instance().getIssues(mNextPageUrl.toString()).enqueue(mMoreIssuesCallback);
     }
     private class EventReceiver {

app/src/main/java/com/commit451/gitlab/fragment/MergeRequestCommitsFragment.java

@@ -11,17 +11,17 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import com.commit451.gitlab.LabCoatApp;
+import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.CommitsAdapter;
 import com.commit451.gitlab.adapter.DividerItemDecoration;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.event.MergeRequestChangedEvent;
 import com.commit451.gitlab.model.api.MergeRequest;
 import com.commit451.gitlab.model.api.Project;
 import com.commit451.gitlab.model.api.RepositoryCommit;
-import com.commit451.gitlab.navigation.NavigationManager;
+import com.commit451.gitlab.navigation.Navigator;
 import com.squareup.otto.Subscribe;
 import org.parceler.Parcels;
@@ -76,7 +76,7 @@ public class MergeRequestCommitsFragment extends ButterKnifeFragment {
     private final EasyCallback<List<RepositoryCommit>> mCommitsCallback = new EasyCallback<List<RepositoryCommit>>() {
         @Override
-        public void onResponse(@NonNull List<RepositoryCommit> response) {
+        public void success(@NonNull List<RepositoryCommit> response) {
             mLoading = false;
             if (getView() == null) {
                 return;
@@ -95,7 +95,7 @@ public class MergeRequestCommitsFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             mLoading = false;
             Timber.e(t, null);
             if (getView() == null) {
@@ -111,7 +111,7 @@ public class MergeRequestCommitsFragment extends ButterKnifeFragment {
     private final EasyCallback<List<RepositoryCommit>> mMoreCommitsCallback = new EasyCallback<List<RepositoryCommit>>() {
         @Override
-        public void onResponse(@NonNull List<RepositoryCommit> response) {
+        public void success(@NonNull List<RepositoryCommit> response) {
             mLoading = false;
             mCommitsAdapter.setLoading(false);
             if (response.isEmpty()) {
@@ -122,7 +122,7 @@ public class MergeRequestCommitsFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             mLoading = false;
             Timber.e(t, null);
             mCommitsAdapter.setLoading(false);
@@ -132,7 +132,7 @@ public class MergeRequestCommitsFragment extends ButterKnifeFragment {
     private final CommitsAdapter.Listener mCommitsAdapterListener = new CommitsAdapter.Listener() {
         @Override
         public void onCommitClicked(RepositoryCommit commit) {
-            NavigationManager.navigateToDiffActivity(getActivity(), mProject, commit);
+            Navigator.navigateToDiffActivity(getActivity(), mProject, commit);
         }
     };
@@ -167,13 +167,13 @@ public class MergeRequestCommitsFragment extends ButterKnifeFragment {
         });
         loadData();
         mEventReceiver = new EventReceiver();
-        LabCoatApp.bus().register(mEventReceiver);
+        App.bus().register(mEventReceiver);
     }
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        LabCoatApp.bus().unregister(mEventReceiver);
+        App.bus().unregister(mEventReceiver);
     }
     @Override

app/src/main/java/com/commit451/gitlab/fragment/MergeRequestDiscussionFragment.java

@@ -12,10 +12,10 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import com.commit451.gitlab.LabCoatApp;
+import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.MergeRequestDetailAdapter;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.event.MergeRequestChangedEvent;
 import com.commit451.gitlab.model.api.MergeRequest;
@@ -88,7 +88,7 @@ public class MergeRequestDiscussionFragment extends ButterKnifeFragment {
     private EasyCallback<List<Note>> mNotesCallback = new EasyCallback<List<Note>>() {
         @Override
-        public void onResponse(@NonNull List<Note> response) {
+        public void success(@NonNull List<Note> response) {
             if (getView() == null) {
                 return;
             }
@@ -99,7 +99,7 @@ public class MergeRequestDiscussionFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             mLoading = false;
             Timber.e(t, null);
             if (getView() == null) {
@@ -114,7 +114,7 @@ public class MergeRequestDiscussionFragment extends ButterKnifeFragment {
     private EasyCallback<List<Note>> mMoreNotesCallback = new EasyCallback<List<Note>>() {
         @Override
-        public void onResponse(@NonNull List<Note> response) {
+        public void success(@NonNull List<Note> response) {
             if (getView() == null) {
                 return;
             }
@@ -125,7 +125,7 @@ public class MergeRequestDiscussionFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             if (getView() == null) {
                 return;
             }
@@ -140,7 +140,7 @@ public class MergeRequestDiscussionFragment extends ButterKnifeFragment {
     private EasyCallback<Note> mPostNoteCallback = new EasyCallback<Note>() {
         @Override
-        public void onResponse(@NonNull Note response) {
+        public void success(@NonNull Note response) {
             if (getView() == null) {
                 return;
             }
@@ -150,7 +150,7 @@ public class MergeRequestDiscussionFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             if (getView() == null) {
                 return;
             }
@@ -210,13 +210,13 @@ public class MergeRequestDiscussionFragment extends ButterKnifeFragment {
         loadNotes();
         mEventReceiver = new EventReceiver();
-        LabCoatApp.bus().register(mEventReceiver);
+        App.bus().register(mEventReceiver);
     }
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        LabCoatApp.bus().unregister(mEventReceiver);
+        App.bus().unregister(mEventReceiver);
     }
     private void loadNotes() {

app/src/main/java/com/commit451/gitlab/fragment/MergeRequestsFragment.java

@@ -14,17 +14,17 @@ import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 import android.widget.TextView;
-import com.commit451.gitlab.LabCoatApp;
+import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.activity.ProjectActivity;
 import com.commit451.gitlab.adapter.DividerItemDecoration;
 import com.commit451.gitlab.adapter.MergeRequestAdapter;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.event.ProjectReloadEvent;
 import com.commit451.gitlab.model.api.MergeRequest;
 import com.commit451.gitlab.model.api.Project;
-import com.commit451.gitlab.navigation.NavigationManager;
+import com.commit451.gitlab.navigation.Navigator;
 import com.commit451.gitlab.util.PaginationUtil;
 import com.squareup.otto.Subscribe;
@@ -68,7 +68,7 @@ public class MergeRequestsFragment extends ButterKnifeFragment {
     private final MergeRequestAdapter.Listener mMergeRequestAdapterListener = new MergeRequestAdapter.Listener() {
         @Override
         public void onMergeRequestClicked(MergeRequest mergeRequest) {
-            NavigationManager.navigateToMergeRequest(getActivity(), mProject, mergeRequest);
+            Navigator.navigateToMergeRequest(getActivity(), mProject, mergeRequest);
         }
     };
@@ -87,7 +87,7 @@ public class MergeRequestsFragment extends ButterKnifeFragment {
     private final EasyCallback<List<MergeRequest>> mCallback = new EasyCallback<List<MergeRequest>>() {
         @Override
-        public void onResponse(@NonNull List<MergeRequest> response) {
+        public void success(@NonNull List<MergeRequest> response) {
             mLoading = false;
             if (getView() == null) {
                 return;
@@ -103,7 +103,7 @@ public class MergeRequestsFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             mLoading = false;
             Timber.e(t, null);
             if (getView() == null) {
@@ -119,7 +119,7 @@ public class MergeRequestsFragment extends ButterKnifeFragment {
     private final EasyCallback<List<MergeRequest>> mMoreIssuesCallback = new EasyCallback<List<MergeRequest>>() {
         @Override
-        public void onResponse(@NonNull List<MergeRequest> response) {
+        public void success(@NonNull List<MergeRequest> response) {
             mLoading = false;
             mMergeRequestAdapter.setLoading(false);
             mNextPageUrl = PaginationUtil.parse(getResponse()).getNext();
@@ -127,7 +127,7 @@ public class MergeRequestsFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mMergeRequestAdapter.setLoading(false);
             mLoading = false;
@@ -151,7 +151,7 @@ public class MergeRequestsFragment extends ButterKnifeFragment {
         super.onViewCreated(view, savedInstanceState);
         mEventReceiver = new EventReceiver();
-        LabCoatApp.bus().register(mEventReceiver);
+        App.bus().register(mEventReceiver);
         mMergeRequestAdapter = new MergeRequestAdapter(mMergeRequestAdapterListener);
         mMergeLayoutManager = new LinearLayoutManager(getActivity());
@@ -181,7 +181,7 @@ public class MergeRequestsFragment extends ButterKnifeFragment {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        LabCoatApp.bus().unregister(mEventReceiver);
+        App.bus().unregister(mEventReceiver);
     }
     @Override

app/src/main/java/com/commit451/gitlab/fragment/MilestonesFragment.java

@@ -15,19 +15,19 @@ import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 import android.widget.TextView;
-import com.commit451.gitlab.LabCoatApp;
+import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.activity.ProjectActivity;
 import com.commit451.gitlab.adapter.DividerItemDecoration;
 import com.commit451.gitlab.adapter.MilestoneAdapter;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.event.MilestoneChangedEvent;
 import com.commit451.gitlab.event.MilestoneCreatedEvent;
 import com.commit451.gitlab.event.ProjectReloadEvent;
 import com.commit451.gitlab.model.api.Milestone;
 import com.commit451.gitlab.model.api.Project;
-import com.commit451.gitlab.navigation.NavigationManager;
+import com.commit451.gitlab.navigation.Navigator;
 import com.commit451.gitlab.util.PaginationUtil;
 import com.squareup.otto.Subscribe;
@@ -67,7 +67,7 @@ public class MilestonesFragment extends ButterKnifeFragment {
     @OnClick(R.id.add)
     public void onAddClicked(View fab) {
         if (mProject != null) {
-            NavigationManager.navigateToAddMilestone(getActivity(), fab, mProject);
+            Navigator.navigateToAddMilestone(getActivity(), fab, mProject);
         } else {
             Snackbar.make(mRoot, getString(R.string.wait_for_project_to_load), Snackbar.LENGTH_SHORT)
                     .show();
@@ -89,7 +89,7 @@ public class MilestonesFragment extends ButterKnifeFragment {
     private final MilestoneAdapter.Listener mMilestoneListener = new MilestoneAdapter.Listener() {
         @Override
         public void onMilestoneClicked(Milestone milestone) {
-            NavigationManager.navigateToMilestone(getActivity(), mProject, milestone);
+            Navigator.navigateToMilestone(getActivity(), mProject, milestone);
         }
     };
@@ -108,7 +108,7 @@ public class MilestonesFragment extends ButterKnifeFragment {
     private final EasyCallback<List<Milestone>> mCallback = new EasyCallback<List<Milestone>>() {
         @Override
-        public void onResponse(@NonNull List<Milestone> response) {
+        public void success(@NonNull List<Milestone> response) {
             mLoading = false;
             if (getView() == null) {
                 return;
@@ -124,7 +124,7 @@ public class MilestonesFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             mLoading = false;
             Timber.e(t, null);
             if (getView() == null) {
@@ -140,7 +140,7 @@ public class MilestonesFragment extends ButterKnifeFragment {
     private final EasyCallback<List<Milestone>> mMoreMilestonesCallback = new EasyCallback<List<Milestone>>() {
         @Override
-        public void onResponse(@NonNull List<Milestone> response) {
+        public void success(@NonNull List<Milestone> response) {
             mLoading = false;
             mMilestoneAdapter.setLoading(false);
             mNextPageUrl = PaginationUtil.parse(getResponse()).getNext();
@@ -148,7 +148,7 @@ public class MilestonesFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mMilestoneAdapter.setLoading(false);
             mLoading = false;
@@ -172,7 +172,7 @@ public class MilestonesFragment extends ButterKnifeFragment {
         super.onViewCreated(view, savedInstanceState);
         mEventReceiver = new EventReceiver();
-        LabCoatApp.bus().register(mEventReceiver);
+        App.bus().register(mEventReceiver);
         mMilestoneAdapter = new MilestoneAdapter(mMilestoneListener);
         mMilestoneLayoutManager = new LinearLayoutManager(getActivity());
@@ -181,7 +181,7 @@ public class MilestonesFragment extends ButterKnifeFragment {
         mRecyclerView.setAdapter(mMilestoneAdapter);
         mRecyclerView.addOnScrollListener(mOnScrollListener);
-        mSpinner.setAdapter(new ArrayAdapter<>(getActivity(), android.R.layout.simple_list_item_1, android.R.id.text1, getResources().getStringArray(R.array.merge_request_state_names)));
+        mSpinner.setAdapter(new ArrayAdapter<>(getActivity(), android.R.layout.simple_list_item_1, android.R.id.text1, getResources().getStringArray(R.array.milestone_state_names)));
         mSpinner.setOnItemSelectedListener(mSpinnerItemSelectedListener);
         mSwipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@@ -202,7 +202,7 @@ public class MilestonesFragment extends ButterKnifeFragment {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        LabCoatApp.bus().unregister(mEventReceiver);
+        App.bus().unregister(mEventReceiver);
     }
     @Override
@@ -225,7 +225,7 @@ public class MilestonesFragment extends ButterKnifeFragment {
         });
         mNextPageUrl = null;
         mLoading = true;
-        GitLabClient.instance().getMilestones(mProject.getId()).enqueue(mCallback);
+        GitLabClient.instance().getMilestones(mProject.getId(), mState).enqueue(mCallback);
     }
     private void loadMore() {
@@ -261,7 +261,7 @@ public class MilestonesFragment extends ButterKnifeFragment {
         }
         @Subscribe
-        public void onIssueChanged(MilestoneChangedEvent event) {
+        public void onMilestoneChanged(MilestoneChangedEvent event) {
             mMilestoneAdapter.updateIssue(event.mMilestone);
         }
     }

app/src/main/java/com/commit451/gitlab/fragment/ProjectFragment.java

@@ -14,17 +14,17 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import com.commit451.bypasspicassoimagegetter.BypassPicassoImageGetter;
-import com.commit451.gitlab.LabCoatApp;
+import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.activity.ProjectActivity;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.api.exception.HttpException;
 import com.commit451.gitlab.event.ProjectReloadEvent;
 import com.commit451.gitlab.model.api.Project;
 import com.commit451.gitlab.model.api.RepositoryFile;
 import com.commit451.gitlab.model.api.RepositoryTreeObject;
-import com.commit451.gitlab.navigation.NavigationManager;
+import com.commit451.gitlab.navigation.Navigator;
 import com.commit451.gitlab.observable.DecodeObservableFactory;
 import com.squareup.otto.Subscribe;
@@ -68,9 +68,9 @@ public class ProjectFragment extends ButterKnifeFragment {
     void onCreatorClick() {
         if (mProject != null) {
             if (mProject.belongsToGroup()) {
-                NavigationManager.navigateToGroup(getActivity(), mProject.getNamespace().getId());
+                Navigator.navigateToGroup(getActivity(), mProject.getNamespace().getId());
             } else {
-                NavigationManager.navigateToUser(getActivity(), mProject.getOwner());
+                Navigator.navigateToUser(getActivity(), mProject.getOwner());
             }
         }
     }
@@ -91,7 +91,7 @@ public class ProjectFragment extends ButterKnifeFragment {
     private final EasyCallback<List<RepositoryTreeObject>> mFilesCallback = new EasyCallback<List<RepositoryTreeObject>>() {
         @Override
-        public void onResponse(@NonNull List<RepositoryTreeObject> response) {
+        public void success(@NonNull List<RepositoryTreeObject> response) {
             if (getView() == null) {
                 return;
             }
@@ -106,7 +106,7 @@ public class ProjectFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             if (getView() == null) {
                 return;
@@ -118,7 +118,7 @@ public class ProjectFragment extends ButterKnifeFragment {
     private EasyCallback<RepositoryFile> mFileCallback = new EasyCallback<RepositoryFile>() {
         @Override
-        public void onResponse(@NonNull final RepositoryFile response) {
+        public void success(@NonNull final RepositoryFile response) {
             if (getView() == null) {
                 return;
             }
@@ -128,38 +128,43 @@ public class ProjectFragment extends ButterKnifeFragment {
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe(new Subscriber<byte[]>() {
                         @Override
-                        public void onCompleted() {}
+                        public void onCompleted() {
+                        }
                         @Override
                         public void onError(Throwable e) {
-                            Snackbar.make(mSwipeRefreshLayout, R.string.failed_to_load, Snackbar.LENGTH_SHORT)
-                                    .show();
+                            if (getView() != null) {
+                                Snackbar.make(mSwipeRefreshLayout, R.string.failed_to_load, Snackbar.LENGTH_SHORT)
+                                        .show();
+                            }
                         }
                         @Override
                         public void onNext(byte[] bytes) {
-                            String text = new String(bytes);
-                            switch (getReadmeType(response.getFileName())) {
-                                case README_TYPE_MARKDOWN:
-                                    mOverviewVew.setText(mBypass.markdownToSpannable(text,
-                                            new BypassPicassoImageGetter(mOverviewVew, GitLabClient.getPicasso())));
-                                    break;
-                                case README_TYPE_HTML:
-                                    mOverviewVew.setText(Html.fromHtml(text));
-                                    break;
-                                case README_TYPE_TEXT:
-                                    mOverviewVew.setText(text);
-                                    break;
-                                case README_TYPE_NO_EXTENSION:
-                                    mOverviewVew.setText(text);
-                                    break;
+                            if (getView() != null) {
+                                String text = new String(bytes);
+                                switch (getReadmeType(response.getFileName())) {
+                                    case README_TYPE_MARKDOWN:
+                                        mOverviewVew.setText(mBypass.markdownToSpannable(text,
+                                                new BypassPicassoImageGetter(mOverviewVew, GitLabClient.getPicasso())));
+                                        break;
+                                    case README_TYPE_HTML:
+                                        mOverviewVew.setText(Html.fromHtml(text));
+                                        break;
+                                    case README_TYPE_TEXT:
+                                        mOverviewVew.setText(text);
+                                        break;
+                                    case README_TYPE_NO_EXTENSION:
+                                        mOverviewVew.setText(text);
+                                        break;
+                                }
                             }
                         }
                     });
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             if (getView() == null) {
                 return;
@@ -171,7 +176,7 @@ public class ProjectFragment extends ButterKnifeFragment {
     private EasyCallback<Void> mForkCallback = new EasyCallback<Void>() {
         @Override
-        public void onResponse(@NonNull Void response) {
+        public void success(@NonNull Void response) {
             if (getView() == null) {
                 return;
             }
@@ -180,7 +185,7 @@ public class ProjectFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             if (getView() == null) {
                 return;
             }
@@ -191,7 +196,7 @@ public class ProjectFragment extends ButterKnifeFragment {
     private EasyCallback<Project> mStarCallback = new EasyCallback<Project>() {
         @Override
-        public void onResponse(@NonNull Project response) {
+        public void success(@NonNull Project response) {
             if (getView() == null) {
                 return;
             }
@@ -200,7 +205,7 @@ public class ProjectFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             if (getView() == null) {
                 return;
             }
@@ -224,7 +229,7 @@ public class ProjectFragment extends ButterKnifeFragment {
     private EasyCallback<Project> mUnstarProjectCallback = new EasyCallback<Project>() {
         @Override
-        public void onResponse(@NonNull Project response) {
+        public void success(@NonNull Project response) {
             if (getView() == null) {
                 return;
             }
@@ -233,7 +238,7 @@ public class ProjectFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             if (getView() == null) {
                 return;
             }
@@ -259,7 +264,7 @@ public class ProjectFragment extends ButterKnifeFragment {
         super.onViewCreated(view, savedInstanceState);
         mEventReceiver = new EventReceiver();
-        LabCoatApp.bus().register(mEventReceiver);
+        App.bus().register(mEventReceiver);
         mOverviewVew.setMovementMethod(LinkMovementMethod.getInstance());
@@ -283,7 +288,7 @@ public class ProjectFragment extends ButterKnifeFragment {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        LabCoatApp.bus().unregister(mEventReceiver);
+        App.bus().unregister(mEventReceiver);
     }
     @Override

app/src/main/java/com/commit451/gitlab/fragment/ProjectMembersFragment.java

@@ -13,18 +13,18 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import com.commit451.gitlab.LabCoatApp;
+import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.activity.ProjectActivity;
 import com.commit451.gitlab.adapter.MemberAdapter;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.dialog.AccessDialog;
 import com.commit451.gitlab.event.MemberAddedEvent;
 import com.commit451.gitlab.event.ProjectReloadEvent;
 import com.commit451.gitlab.model.api.Member;
 import com.commit451.gitlab.model.api.Project;
-import com.commit451.gitlab.navigation.NavigationManager;
+import com.commit451.gitlab.navigation.Navigator;
 import com.commit451.gitlab.util.PaginationUtil;
 import com.commit451.gitlab.viewHolder.ProjectMemberViewHolder;
 import com.squareup.otto.Subscribe;
@@ -78,7 +78,7 @@ public class ProjectMembersFragment extends ButterKnifeFragment {
     private final MemberAdapter.Listener mMemberAdapterListener = new MemberAdapter.Listener() {
         @Override
         public void onProjectMemberClicked(Member member, ProjectMemberViewHolder memberGroupViewHolder) {
-            NavigationManager.navigateToUser(getActivity(), memberGroupViewHolder.mImageView, member);
+            Navigator.navigateToUser(getActivity(), memberGroupViewHolder.mImageView, member);
         }
         @Override
@@ -96,13 +96,13 @@ public class ProjectMembersFragment extends ButterKnifeFragment {
         @Override
         public void onSeeGroupClicked() {
-            NavigationManager.navigateToGroup(getActivity(), mProject.getNamespace().getId());
+            Navigator.navigateToGroup(getActivity(), mProject.getNamespace().getId());
         }
     };
     private final EasyCallback<List<Member>> mProjectMembersCallback = new EasyCallback<List<Member>>() {
         @Override
-        public void onResponse(@NonNull List<Member> response) {
+        public void success(@NonNull List<Member> response) {
             mLoading = false;
             if (getView() == null) {
                 return;
@@ -129,7 +129,7 @@ public class ProjectMembersFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             mLoading = false;
             Timber.e(t, null);
             if (getView() == null) {
@@ -146,7 +146,7 @@ public class ProjectMembersFragment extends ButterKnifeFragment {
     private final EasyCallback<Void> mRemoveMemberCallback = new EasyCallback<Void>() {
         @Override
-        public void onResponse(@NonNull Void response) {
+        public void success(@NonNull Void response) {
             if (getView() == null) {
                 return;
             }
@@ -154,7 +154,7 @@ public class ProjectMembersFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             if (getView() == null) {
                 return;
@@ -174,7 +174,7 @@ public class ProjectMembersFragment extends ButterKnifeFragment {
         super.onViewCreated(view, savedInstanceState);
         mEventReceiver = new EventReceiver();
-        LabCoatApp.bus().register(mEventReceiver);
+        App.bus().register(mEventReceiver);
         mAdapter = new MemberAdapter(mMemberAdapterListener);
         mProjectLayoutManager = new GridLayoutManager(getActivity(), 2);
@@ -202,12 +202,12 @@ public class ProjectMembersFragment extends ButterKnifeFragment {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        LabCoatApp.bus().unregister(mEventReceiver);
+        App.bus().unregister(mEventReceiver);
     }
     @OnClick(R.id.add_user_button)
     public void onAddUserClick(View fab) {
-        NavigationManager.navigateToAddProjectMember(getActivity(), fab, mProject.getId());
+        Navigator.navigateToAddProjectMember(getActivity(), fab, mProject.getId());
     }
     @Override

app/src/main/java/com/commit451/gitlab/fragment/ProjectsFragment.java

@@ -14,11 +14,11 @@ import android.widget.TextView;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.DividerItemDecoration;
 import com.commit451.gitlab.adapter.ProjectsAdapter;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.Group;
 import com.commit451.gitlab.model.api.Project;
-import com.commit451.gitlab.navigation.NavigationManager;
+import com.commit451.gitlab.navigation.Navigator;
 import com.commit451.gitlab.util.PaginationUtil;
 import org.parceler.Parcels;
@@ -94,7 +94,7 @@ public class ProjectsFragment extends ButterKnifeFragment {
     private final EasyCallback<List<Project>> mProjectsCallback = new EasyCallback<List<Project>>() {
         @Override
-        public void onResponse(@NonNull List<Project> response) {
+        public void success(@NonNull List<Project> response) {
             mLoading = false;
             if (getView() == null) {
                 return;
@@ -110,7 +110,7 @@ public class ProjectsFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             mLoading = false;
             Timber.e(t, null);
             if (getView() == null) {
@@ -126,7 +126,7 @@ public class ProjectsFragment extends ButterKnifeFragment {
     private final EasyCallback<List<Project>> mMoreProjectsCallback = new EasyCallback<List<Project>>() {
         @Override
-        public void onResponse(@NonNull List<Project> response) {
+        public void success(@NonNull List<Project> response) {
             mLoading = false;
             if (getView() == null) {
                 return;
@@ -138,7 +138,7 @@ public class ProjectsFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             mLoading = false;
             Timber.e(t, null);
@@ -152,7 +152,7 @@ public class ProjectsFragment extends ButterKnifeFragment {
     private final ProjectsAdapter.Listener mProjectsListener = new ProjectsAdapter.Listener() {
         @Override
         public void onProjectClicked(Project project) {
-            NavigationManager.navigateToProject(getActivity(), project);
+            Navigator.navigateToProject(getActivity(), project);
         }
     };

app/src/main/java/com/commit451/gitlab/fragment/SnippetsFragment.java

+package com.commit451.gitlab.fragment;
+
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.design.widget.Snackbar;
+import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import com.commit451.gitlab.App;
+import com.commit451.gitlab.R;
+import com.commit451.gitlab.activity.ProjectActivity;
+import com.commit451.gitlab.adapter.DividerItemDecoration;
+import com.commit451.gitlab.adapter.SnippetAdapter;
+import com.commit451.easycallback.EasyCallback;
+import com.commit451.gitlab.api.GitLabClient;
+import com.commit451.gitlab.event.ProjectReloadEvent;
+import com.commit451.gitlab.model.api.Project;
+import com.commit451.gitlab.model.api.Snippet;
+import com.commit451.gitlab.navigation.Navigator;
+import com.commit451.gitlab.util.PaginationUtil;
+import com.squareup.otto.Subscribe;
+
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.OnClick;
+import timber.log.Timber;
+
+public class SnippetsFragment extends ButterKnifeFragment {
+
+    public static SnippetsFragment newInstance() {
+        return new SnippetsFragment();
+    }
+
+    @BindView(R.id.root)
+    ViewGroup mRoot;
+    @BindView(R.id.swipe_layout)
+    SwipeRefreshLayout mSwipeRefreshLayout;
+    @BindView(R.id.list)
+    RecyclerView mRecyclerView;
+    @BindView(R.id.message_text)
+    TextView mMessageView;
+    @BindView(R.id.state_spinner)
+    Spinner mSpinner;
+
+    private Project mProject;
+    private EventReceiver mEventReceiver;
+    private SnippetAdapter mSnippetAdapter;
+    private LinearLayoutManager mMilestoneLayoutManager;
+
+    private String mState;
+    private String[] mStates;
+    private boolean mLoading = false;
+    private Uri mNextPageUrl;
+
+    @OnClick(R.id.add)
+    public void onAddClicked(View fab) {
+        if (mProject != null) {
+            Navigator.navigateToAddMilestone(getActivity(), fab, mProject);
+        } else {
+            Snackbar.make(mRoot, getString(R.string.wait_for_project_to_load), Snackbar.LENGTH_SHORT)
+                    .show();
+        }
+    }
+
+    private final AdapterView.OnItemSelectedListener mSpinnerItemSelectedListener = new AdapterView.OnItemSelectedListener() {
+        @Override
+        public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+            mState = mStates[position];
+            loadData();
+        }
+
+        @Override
+        public void onNothingSelected(AdapterView<?> parent) {
+        }
+    };
+
+    private final SnippetAdapter.Listener mMilestoneListener = new SnippetAdapter.Listener() {
+
+        @Override
+        public void onSnippetClicked(Snippet snippet) {
+
+        }
+    };
+
+    private final RecyclerView.OnScrollListener mOnScrollListener = new RecyclerView.OnScrollListener() {
+        @Override
+        public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+            super.onScrolled(recyclerView, dx, dy);
+            int visibleItemCount = mMilestoneLayoutManager.getChildCount();
+            int totalItemCount = mMilestoneLayoutManager.getItemCount();
+            int firstVisibleItem = mMilestoneLayoutManager.findFirstVisibleItemPosition();
+            if (firstVisibleItem + visibleItemCount >= totalItemCount && !mLoading && mNextPageUrl != null) {
+                loadMore();
+            }
+        }
+    };
+
+    private final EasyCallback<List<Snippet>> mCallback = new EasyCallback<List<Snippet>>() {
+        @Override
+        public void success(@NonNull List<Snippet> response) {
+            mLoading = false;
+            if (getView() == null) {
+                return;
+            }
+            mSwipeRefreshLayout.setRefreshing(false);
+            if (response.isEmpty()) {
+                mMessageView.setVisibility(View.VISIBLE);
+                mMessageView.setText(R.string.no_milestones);
+            }
+            mSnippetAdapter.setData(response);
+            mNextPageUrl = PaginationUtil.parse(getResponse()).getNext();
+            Timber.d("Next page url %s", mNextPageUrl);
+        }
+
+        @Override
+        public void failure(Throwable t) {
+            mLoading = false;
+            Timber.e(t, null);
+            if (getView() == null) {
+                return;
+            }
+            mSwipeRefreshLayout.setRefreshing(false);
+            mMessageView.setVisibility(View.VISIBLE);
+            mMessageView.setText(R.string.connection_error_milestones);
+            mSnippetAdapter.setData(null);
+            mNextPageUrl = null;
+        }
+    };
+
+    private final EasyCallback<List<Snippet>> mMoreMilestonesCallback = new EasyCallback<List<Snippet>>() {
+        @Override
+        public void success(@NonNull List<Snippet> response) {
+            mLoading = false;
+            mSnippetAdapter.setLoading(false);
+            mNextPageUrl = PaginationUtil.parse(getResponse()).getNext();
+            mSnippetAdapter.addData(response);
+        }
+
+        @Override
+        public void failure(Throwable t) {
+            Timber.e(t, null);
+            mSnippetAdapter.setLoading(false);
+            mLoading = false;
+        }
+    };
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mState = getResources().getString(R.string.milestone_state_value_default);
+        mStates = getResources().getStringArray(R.array.milestone_state_values);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_snippets, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        mEventReceiver = new EventReceiver();
+        App.bus().register(mEventReceiver);
+
+        mSnippetAdapter = new SnippetAdapter(mMilestoneListener);
+        mMilestoneLayoutManager = new LinearLayoutManager(getActivity());
+        mRecyclerView.setLayoutManager(mMilestoneLayoutManager);
+        mRecyclerView.addItemDecoration(new DividerItemDecoration(getActivity()));
+        mRecyclerView.setAdapter(mSnippetAdapter);
+        mRecyclerView.addOnScrollListener(mOnScrollListener);
+
+        mSpinner.setAdapter(new ArrayAdapter<>(getActivity(), android.R.layout.simple_list_item_1, android.R.id.text1, getResources().getStringArray(R.array.milestone_state_names)));
+        mSpinner.setOnItemSelectedListener(mSpinnerItemSelectedListener);
+
+        mSwipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                loadData();
+            }
+        });
+
+        if (getActivity() instanceof ProjectActivity) {
+            mProject = ((ProjectActivity) getActivity()).getProject();
+            loadData();
+        } else {
+            throw new IllegalStateException("Incorrect parent activity");
+        }
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        App.bus().unregister(mEventReceiver);
+    }
+
+    @Override
+    protected void loadData() {
+        if (getView() == null) {
+            return;
+        }
+        if (mProject == null) {
+            mSwipeRefreshLayout.setRefreshing(false);
+            return;
+        }
+        mMessageView.setVisibility(View.GONE);
+        mSwipeRefreshLayout.post(new Runnable() {
+            @Override
+            public void run() {
+                if (mSwipeRefreshLayout != null) {
+                    mSwipeRefreshLayout.setRefreshing(true);
+                }
+            }
+        });
+        mNextPageUrl = null;
+        mLoading = true;
+        GitLabClient.instance().getSnippets(mProject.getId()).enqueue(mCallback);
+    }
+
+    private void loadMore() {
+        if (getView() == null) {
+            return;
+        }
+
+        if (mNextPageUrl == null) {
+            return;
+        }
+
+        mLoading = true;
+        mSnippetAdapter.setLoading(true);
+
+        Timber.d("loadMore called for %s", mNextPageUrl);
+        GitLabClient.instance().getSnippets(mNextPageUrl.toString()).enqueue(mMoreMilestonesCallback);
+    }
+
+    private class EventReceiver {
+        @Subscribe
+        public void onProjectReload(ProjectReloadEvent event) {
+            mProject = event.mProject;
+            loadData();
+        }
+    }
+}

app/src/main/java/com/commit451/gitlab/fragment/UsersFragment.java

@@ -13,13 +13,13 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import com.commit451.gitlab.LabCoatApp;
+import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.UsersAdapter;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.UserBasic;
-import com.commit451.gitlab.navigation.NavigationManager;
+import com.commit451.gitlab.navigation.Navigator;
 import com.commit451.gitlab.util.PaginationUtil;
 import com.commit451.gitlab.viewHolder.UserViewHolder;
@@ -79,13 +79,13 @@ public class UsersFragment extends ButterKnifeFragment {
     private final UsersAdapter.Listener mUsersAdapterListener = new UsersAdapter.Listener() {
         @Override
         public void onUserClicked(UserBasic user, UserViewHolder userViewHolder) {
-            NavigationManager.navigateToUser(getActivity(), userViewHolder.mImageView, user);
+            Navigator.navigateToUser(getActivity(), userViewHolder.mImageView, user);
         }
     };
     public EasyCallback<List<UserBasic>> mSearchCallback = new EasyCallback<List<UserBasic>>() {
         @Override
-        public void onResponse(@NonNull List<UserBasic> response) {
+        public void success(@NonNull List<UserBasic> response) {
             if (getView() == null) {
                 return;
             }
@@ -100,7 +100,7 @@ public class UsersFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mLoading = false;
             if (getView() == null) {
@@ -115,7 +115,7 @@ public class UsersFragment extends ButterKnifeFragment {
     public EasyCallback<List<UserBasic>> mMoreUsersCallback = new EasyCallback<List<UserBasic>>() {
         @Override
-        public void onResponse(@NonNull List<UserBasic> response) {
+        public void success(@NonNull List<UserBasic> response) {
             mLoading = false;
             if (getView() == null) {
                 return;
@@ -126,7 +126,7 @@ public class UsersFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mLoading = false;
             if (getView() == null) {
@@ -153,7 +153,7 @@ public class UsersFragment extends ButterKnifeFragment {
         super.onViewCreated(view, savedInstanceState);
         mEventReceiver = new EventReceiver();
-        LabCoatApp.bus().register(mEventReceiver);
+        App.bus().register(mEventReceiver);
         mUsersAdapter = new UsersAdapter(mUsersAdapterListener);
         mUserLinearLayoutManager = new GridLayoutManager(getActivity(), 2);
@@ -175,7 +175,7 @@ public class UsersFragment extends ButterKnifeFragment {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        LabCoatApp.bus().unregister(mEventReceiver);
+        App.bus().unregister(mEventReceiver);
     }
     @Override

app/src/main/java/com/commit451/gitlab/model/Account.java

 package com.commit451.gitlab.model;
-import com.google.gson.annotations.SerializedName;
+import android.content.Context;
+import android.net.Uri;
+import android.support.annotation.NonNull;
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
 import com.commit451.gitlab.data.Prefs;
 import com.commit451.gitlab.model.api.UserFull;
 import com.commit451.gitlab.util.ObjectUtil;
 import org.parceler.Parcel;
-import android.content.Context;
-import android.net.Uri;
-import android.support.annotation.NonNull;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 @Parcel
+@JsonObject
 public class Account implements Comparable<Account>{
+    @NonNull
     public static List<Account> getAccounts(Context context) {
         List<Account> accounts = new ArrayList<>(Prefs.getAccounts(context));
         Collections.sort(accounts);
@@ -27,21 +29,21 @@ public class Account implements Comparable<Account>{
         return accounts;
     }
-    @SerializedName("server_url")
+    @JsonField(name = "server_url")
     Uri mServerUrl;
-    @SerializedName("authorization_header")
+    @JsonField(name = "authorization_header")
     String mAuthorizationHeader;
-    @SerializedName("private_token")
+    @JsonField(name = "private_token")
     String mPrivateToken;
-    @SerializedName("trusted_certificate")
+    @JsonField(name = "trusted_certificate")
     String mTrustedCertificate;
-    @SerializedName("trusted_hostname")
+    @JsonField(name = "trusted_hostname")
     String mTrustedHostname;
-    @SerializedName("private_key_alias")
+    @JsonField(name = "private_key_alias")
     String mPrivateKeyAlias;
-    @SerializedName("user")
+    @JsonField(name = "user")
     UserFull mUser;
-    @SerializedName("last_used")
+    @JsonField(name = "last_used")
     Date mLastUsed;
     public Account() {}

app/src/main/java/com/commit451/gitlab/model/api/Artifact.java

 package com.commit451.gitlab.model.api;
-import com.google.gson.annotations.SerializedName;
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
 import org.parceler.Parcel;
@@ -8,8 +9,9 @@ import org.parceler.Parcel;
  * Artifact from a build
  */
 @Parcel
+@JsonObject
 public class Artifact {
-    @SerializedName("name")
+    @JsonField(name = "name")
     String mName;
     public String getName() {

app/src/main/java/com/commit451/gitlab/model/api/Branch.java

 package com.commit451.gitlab.model.api;
-import com.google.gson.annotations.SerializedName;
-
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
 import com.commit451.gitlab.util.ObjectUtil;
 import org.parceler.Parcel;
 @Parcel
+@JsonObject
 public class Branch {
-    @SerializedName("name")
+    @JsonField(name = "name")
     String mName;
-    @SerializedName("protected")
+    @JsonField(name = "protected")
     boolean mProtected;
     public Branch() {}

app/src/main/java/com/commit451/gitlab/model/api/Build.java

 package com.commit451.gitlab.model.api;
-import com.google.gson.annotations.SerializedName;
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
 import org.parceler.Parcel;
@@ -10,35 +11,36 @@ import java.util.Date;
  * Represents a build
  */
 @Parcel
+@JsonObject
 public class Build {
-    @SerializedName("commit")
+    @JsonField(name = "commit")
     RepositoryCommit mCommit;
-    @SerializedName("coverage")
+    @JsonField(name = "coverage")
     String mCoverage;
-    @SerializedName("created_at")
+    @JsonField(name = "created_at")
     Date mCreatedAt;
-    @SerializedName("artifacts_file")
+    @JsonField(name = "artifacts_file")
     String mArtifactsFile;
-    @SerializedName("finished_at")
+    @JsonField(name = "finished_at")
     Date mFinishedAt;
-    @SerializedName("id")
+    @JsonField(name = "id")
     long mId;
-    @SerializedName("name")
+    @JsonField(name = "name")
     String mName;
-    @SerializedName("ref")
+    @JsonField(name = "ref")
     String mRef;
-    @SerializedName("runner")
+    @JsonField(name = "runner")
     Runner mRunner;
-    @SerializedName("stage")
+    @JsonField(name = "stage")
     String mStage;
-    @SerializedName("started_at")
+    @JsonField(name = "started_at")
     Date mStartedAt;
-    @SerializedName("status")
+    @JsonField(name = "status")
     String mStatus;
-    @SerializedName("tag")
+    @JsonField(name = "tag")
     boolean mTag;
-    @SerializedName("user")
+    @JsonField(name = "user")
     User mUser;
     public RepositoryCommit getCommit() {

app/src/main/java/com/commit451/gitlab/model/api/Contributor.java

 package com.commit451.gitlab.model.api;
-import com.google.gson.annotations.SerializedName;
-
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
 import com.commit451.gitlab.util.ObjectUtil;
 import org.parceler.Parcel;
@@ -12,16 +12,17 @@ import java.util.List;
 import java.util.Set;
 @Parcel
+@JsonObject
 public class Contributor {
-    @SerializedName("name")
+    @JsonField(name = "name")
     String mName;
-    @SerializedName("email")
+    @JsonField(name = "email")
     String mEmail;
-    @SerializedName("commits")
+    @JsonField(name = "commits")
     int mCommits;
-    @SerializedName("additions")
+    @JsonField(name = "additions")
     int mAdditions;
-    @SerializedName("deletions")
+    @JsonField(name = "deletions")
     int mDeletions;
     public Contributor() {}