archive-gh-me/FastHub
1
0
Fork 0
mirror of https://github.com/k0shk0sh/FastHub.git synced 2025-12-08 19:05:54 +00:00
Code Issues Projects Releases Wiki Activity

possible solution to progress not being hidden when we introduced custom error messages.

Browse Source
This commit is contained in:
Kosh 2017-03-26 15:38:53 +08:00
parent e9bbc72f58
commit e2004df297
32 changed files with 326 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/fastaccess/provider/tasks/notification/NotificationSchedulerJobTask.java
View File

@ -107,7 +107,7 @@ public class NotificationSchedulerJobTask extends JobService {
Bitmap largeIcon = BitmapFactory.decodeResource(context.getResources(),
R.mipmap.ic_launcher);
int primaryColor = ViewHelper.getPrimaryColor(context);
android.app.Notification grouped = getNotification(getString(R.string.notifications), getString(R.string.no_unread_notifications))
android.app.Notification grouped = getNotification(getString(R.string.notifications), getString(R.string.unread_notification))
.setLargeIcon(largeIcon)
.setGroup(NOTIFICATION_GROUP_ID)
.setGroupSummary(true)

14
app/src/main/java/com/fastaccess/ui/modules/feeds/FeedsView.java
View File

@ -84,9 +84,19 @@ public class FeedsView extends BaseFragment<FeedsMvp.View, FeedsPresenter> imple
stateLayout.hideProgress();
}
@Override public void showErrorMessage(@NonNull String msgRes) {
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(msgRes);
}
@Override public void onOpenRepoChooser(@NonNull ArrayList<SimpleUrlsModel> models) {

13
app/src/main/java/com/fastaccess/ui/modules/gists/GistsView.java
View File

@ -74,10 +74,19 @@ public class GistsView extends BaseFragment<GistsMvp.View, GistsPresenter> imple
stateLayout.hideProgress();
}
@Override public void showErrorMessage(@NonNull String msgRes) {
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(msgRes);
}
@NonNull @Override public GistsPresenter providePresenter() {

11
app/src/main/java/com/fastaccess/ui/modules/gists/gist/comments/GistCommentsView.java
View File

@ -91,9 +91,18 @@ public class GistCommentsView extends BaseFragment<GistCommentsMvp.View, GistCom
}
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(message);
}
@NonNull @Override public GistCommentsPresenter providePresenter() {

11
app/src/main/java/com/fastaccess/ui/modules/main/issues/MyIssuesView.java
View File

@ -78,9 +78,18 @@ public class MyIssuesView extends BaseFragment<MyIssuesMvp.View, MyIssuesPresent
}
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(message);
}
@NonNull @Override public OnLoadMore<IssueState> getLoadMore() {

11
app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/MyPullRequestView.java
View File

@ -78,9 +78,18 @@ public class MyPullRequestView extends BaseFragment<MyPullRequestsMvp.View, MyPu
}
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(message);
}
@NonNull @Override public OnLoadMore<IssueState> getLoadMore() {

13
app/src/main/java/com/fastaccess/ui/modules/notification/NotificationsView.java
View File

@ -113,10 +113,19 @@ public class NotificationsView extends BaseFragment<NotificationsMvp.View, Notif
stateLayout.hideProgress();
}
@Override public void showErrorMessage(@NonNull String msgRes) {
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(msgRes);
}
@Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {

13
app/src/main/java/com/fastaccess/ui/modules/profile/followers/ProfileFollowersView.java
View File

@ -79,10 +79,19 @@ public class ProfileFollowersView extends BaseFragment<ProfileFollowersMvp.View,
stateLayout.hideProgress();
}
@Override public void showErrorMessage(@NonNull String msgRes) {
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(msgRes);
}
@NonNull @Override public OnLoadMore<String> getLoadMore() {

13
app/src/main/java/com/fastaccess/ui/modules/profile/following/ProfileFollowingView.java
View File

@ -79,10 +79,19 @@ public class ProfileFollowingView extends BaseFragment<ProfileFollowingMvp.View,
stateLayout.hideProgress();
}
@Override public void showErrorMessage(@NonNull String msgRes) {
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(msgRes);
}
@NonNull @Override public OnLoadMore<String> getLoadMore() {

13
app/src/main/java/com/fastaccess/ui/modules/profile/gists/ProfileGistsView.java
View File

@ -84,10 +84,19 @@ public class ProfileGistsView extends BaseFragment<ProfileGistsMvp.View, Profile
stateLayout.hideProgress();
}
@Override public void showErrorMessage(@NonNull String msgRes) {
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(msgRes);
}
@NonNull @Override public ProfileGistsPresenter providePresenter() {

13
app/src/main/java/com/fastaccess/ui/modules/profile/overview/ProfileOverviewView.java
View File

@ -155,9 +155,18 @@ public class ProfileOverviewView extends BaseFragment<ProfileOverviewMvp.View, P
progress.setVisibility(View.GONE);
}
@Override public void showErrorMessage(@NonNull String msgRes) {
@Override public void showErrorMessage(@NonNull String message) {
onHideProgress();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
onHideProgress();
super.showMessage(titleRes, msgRes);
}
private void onHideProgress() {
hideProgress();
super.showErrorMessage(msgRes);
}
private boolean isMeOrOrganization() {

13
app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileReposView.java
View File

@ -79,10 +79,19 @@ public class ProfileReposView extends BaseFragment<ProfileReposMvp.View, Profile
stateLayout.hideProgress();
}
@Override public void showErrorMessage(@NonNull String msgRes) {
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(msgRes);
}
@NonNull @Override public OnLoadMore<String> getLoadMore() {

17
app/src/main/java/com/fastaccess/ui/modules/profile/starred/ProfileStarredView.java
View File

@ -69,7 +69,6 @@ public class ProfileStarredView extends BaseFragment<ProfileStarredMvp.View, Pro
return new ProfileStarredPresenter();
}
@Override public void showProgress(@StringRes int resId) {
stateLayout.showProgress();
@ -80,12 +79,20 @@ public class ProfileStarredView extends BaseFragment<ProfileStarredMvp.View, Pro
stateLayout.hideProgress();
}
@Override public void showErrorMessage(@NonNull String msgRes) {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(msgRes);
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
}
@NonNull @Override public OnLoadMore<String> getLoadMore() {
if (onLoadMore == null) {

15
app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/RepoCommitsView.java
View File

@ -118,11 +118,20 @@ public class RepoCommitsView extends BaseFragment<RepoCommitsMvp.View, RepoCommi
stateLayout.hideProgress();
}
@Override public void showErrorMessage(@NonNull String msgRes) {
hideProgress();
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideBranchesProgress();
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(msgRes);
}
@SuppressWarnings("unchecked") @NonNull @Override public OnLoadMore getLoadMore() {

11
app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/details/comments/CommitCommentsView.java
View File

@ -89,9 +89,18 @@ public class CommitCommentsView extends BaseFragment<CommitCommentsMvp.View, Com
}
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(message);
}
@NonNull @Override public CommitCommentsPresenter providePresenter() {

13
app/src/main/java/com/fastaccess/ui/modules/repos/code/contributors/RepoContributorsView.java
View File

@ -82,10 +82,19 @@ public class RepoContributorsView extends BaseFragment<RepoContributorsMvp.View,
stateLayout.hideProgress();
}
@Override public void showErrorMessage(@NonNull String msgRes) {
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(msgRes);
}
@SuppressWarnings("unchecked") @NonNull @Override public OnLoadMore getLoadMore() {

13
app/src/main/java/com/fastaccess/ui/modules/repos/code/files/RepoFilesView.java
View File

@ -142,10 +142,19 @@ public class RepoFilesView extends BaseFragment<RepoFilesMvp.View, RepoFilesPres
stateLayout.hideProgress();
}
@Override public void showErrorMessage(@NonNull String msgRes) {
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(msgRes);
}
@NonNull @Override public RepoFilesPresenter providePresenter() {

13
app/src/main/java/com/fastaccess/ui/modules/repos/code/files/paths/RepoFilePathView.java
View File

@ -161,9 +161,18 @@ public class RepoFilePathView extends BaseFragment<RepoFilePathMvp.View, RepoFil
branchesProgress.setVisibility(View.GONE);
}
@Override public void showErrorMessage(@NonNull String msgRes) {
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
super.showErrorMessage(msgRes);
}
@Override public void setBranchesData(@NonNull List<BranchesModel> branchesData, boolean firstTime) {

5
app/src/main/java/com/fastaccess/ui/modules/repos/code/prettifier/ViewerView.java
View File

@ -95,6 +95,11 @@ public class ViewerView extends BaseFragment<ViewerMvp.View, ViewerPresenter> im
super.showErrorMessage(msgRes);
}
@Override public void showMessage(int titleRes, int msgRes) {
stateLayout.hideProgress();
super.showMessage(titleRes, msgRes);
}
@Override protected int fragmentLayout() {
return R.layout.general_viewer_layout;
}

13
app/src/main/java/com/fastaccess/ui/modules/repos/code/releases/RepoReleasesView.java
View File

@ -119,10 +119,19 @@ public class RepoReleasesView extends BaseFragment<RepoReleasesMvp.View, RepoRel
stateLayout.hideProgress();
}
@Override public void showErrorMessage(@NonNull String msgRes) {
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(msgRes);
}
@Override public void onDownload(@NonNull Release item) {

13
app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/MilestoneView.java
View File

@ -111,10 +111,19 @@ public class MilestoneView extends BaseFragment<MilestoneMvp.View, MilestonePres
stateLayout.hideProgress();
}
@Override public void showErrorMessage(@NonNull String msgRes) {
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(msgRes);
}
@NonNull @Override public MilestonePresenter providePresenter() {

11
app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoClosedIssuesView.java
View File

@ -100,9 +100,18 @@ public class RepoClosedIssuesView extends BaseFragment<RepoIssuesMvp.View, RepoI
}
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(message);
}
@NonNull @Override public OnLoadMore<IssueState> getLoadMore() {

11
app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoOpenedIssuesView.java
View File

@ -120,9 +120,18 @@ public class RepoOpenedIssuesView extends BaseFragment<RepoIssuesMvp.View, RepoI
}
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(message);
}
@NonNull @Override public OnLoadMore<IssueState> getLoadMore() {

11
app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/comments/IssueCommentsView.java
View File

@ -90,9 +90,18 @@ public class IssueCommentsView extends BaseFragment<IssueCommentsMvp.View, Issue
}
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(message);
}
@NonNull @Override public IssueCommentsPresenter providePresenter() {

13
app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/events/IssueDetailsView.java
View File

@ -79,10 +79,19 @@ public class IssueDetailsView extends BaseFragment<IssueDetailsMvp.View, IssueDe
stateLayout.hideProgress();
}
@Override public void showErrorMessage(@NonNull String msgRes) {
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(msgRes);
}
@SuppressWarnings("unchecked") @NonNull @Override public OnLoadMore getLoadMore() {

11
app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/RepoPullRequestView.java
View File

@ -105,9 +105,18 @@ public class RepoPullRequestView extends BaseFragment<RepoPullRequestMvp.View, R
}
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(message);
}
@NonNull @Override public OnLoadMore<IssueState> getLoadMore() {

13
app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/commits/PullRequestCommitsView.java
View File

@ -84,10 +84,19 @@ public class PullRequestCommitsView extends BaseFragment<PullRequestCommitsMvp.V
stateLayout.hideProgress();
}
@Override public void showErrorMessage(@NonNull String msgRes) {
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(msgRes);
}
@SuppressWarnings("unchecked") @NonNull @Override public OnLoadMore getLoadMore() {

11
app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/events/PullRequestDetailsView.java
View File

@ -81,9 +81,18 @@ public class PullRequestDetailsView extends BaseFragment<PullRequestDetailsMvp.V
}
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(message);
}
@SuppressWarnings("unchecked") @NonNull @Override public OnLoadMore getLoadMore() {

11
app/src/main/java/com/fastaccess/ui/modules/search/code/SearchCodeView.java
View File

@ -79,9 +79,18 @@ public class SearchCodeView extends BaseFragment<SearchCodeMvp.View, SearchCodeP
}
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(message);
}
@Override public void onSetSearchQuery(@NonNull String query) {

11
app/src/main/java/com/fastaccess/ui/modules/search/issues/SearchIssuesView.java
View File

@ -77,9 +77,18 @@ public class SearchIssuesView extends BaseFragment<SearchIssuesMvp.View, SearchI
}
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(message);
}
@Override public void onSetSearchQuery(@NonNull String query) {

11
app/src/main/java/com/fastaccess/ui/modules/search/repos/SearchReposView.java
View File

@ -77,9 +77,18 @@ public class SearchReposView extends BaseFragment<SearchReposMvp.View, SearchRep
}
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(message);
}
@Override public void onSetSearchQuery(@NonNull String query) {

11
app/src/main/java/com/fastaccess/ui/modules/search/users/SearchUsersView.java
View File

@ -76,9 +76,18 @@ public class SearchUsersView extends BaseFragment<SearchUsersMvp.View, SearchUse
}
@Override public void showErrorMessage(@NonNull String message) {
showReload();
super.showErrorMessage(message);
}
@Override public void showMessage(int titleRes, int msgRes) {
showReload();
super.showMessage(titleRes, msgRes);
}
private void showReload() {
hideProgress();
stateLayout.showReload(adapter.getItemCount());
super.showErrorMessage(message);
}
@Override public void onSetSearchQuery(@NonNull String query) {