diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/FeedsViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/FeedsViewHolder.java index 114c0716..e46a606e 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/FeedsViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/FeedsViewHolder.java @@ -214,7 +214,7 @@ public class FeedsViewHolder extends BaseViewHolder { int size = commits != null ? commits.size() : -1; SpannableBuilder spanCommits = SpannableBuilder.builder(); if (size > 0) { - if (size != 1) spanCommits.append(String.valueOf(eventsModel.getPayload().getSize())).append(" new commits").append("\n"); + if (size != 1) spanCommits.append(String.valueOf(eventsModel.getPayload().getSize())).append(" more commits").append("\n"); else spanCommits.append("1 new commit").append("\n"); int max = 5; int appended = 0; @@ -224,7 +224,7 @@ public class FeedsViewHolder extends BaseViewHolder { if (TextUtils.isEmpty(sha)) continue; sha = sha.length() > 7 ? sha.substring(0, 7) : sha; spanCommits.url(sha).append(" ") - .append(commit.getMessage() != null ? commit.getMessage().replaceAll("\\r?\\n|\\r"," ") : "") + .append(commit.getMessage() != null ? commit.getMessage().replaceAll("\\r?\\n|\\r", " ") : "") .append("\n"); appended++; if (appended == max) break; @@ -255,7 +255,7 @@ public class FeedsViewHolder extends BaseViewHolder { .bold("#") .bold(String.valueOf(pullRequest.getNumber())); if (comment.getBody() != null) { - MarkDownProvider.stripMdText(description, comment.getBody().replaceAll("\\r?\\n|\\r"," ")); + MarkDownProvider.stripMdText(description, comment.getBody().replaceAll("\\r?\\n|\\r", " ")); description.setVisibility(View.VISIBLE); } else { description.setText(""); @@ -280,7 +280,7 @@ public class FeedsViewHolder extends BaseViewHolder { .bold(String.valueOf(issue.getNumber())); if ("opened".equals(action) || "closed".equals(action)) { if (issue.getTitle() != null) { - MarkDownProvider.stripMdText(description, issue.getTitle().replaceAll("\\r?\\n|\\r"," ")); + MarkDownProvider.stripMdText(description, issue.getTitle().replaceAll("\\r?\\n|\\r", " ")); description.setVisibility(View.VISIBLE); } else { description.setText(""); @@ -325,7 +325,7 @@ public class FeedsViewHolder extends BaseViewHolder { .bold("#") .bold(String.valueOf(issue.getNumber())); if (issue.getTitle() != null) { - MarkDownProvider.stripMdText(description, issue.getTitle().replaceAll("\\r?\\n|\\r"," ")); + MarkDownProvider.stripMdText(description, issue.getTitle().replaceAll("\\r?\\n|\\r", " ")); description.setVisibility(View.VISIBLE); } else { description.setText(""); @@ -348,7 +348,7 @@ public class FeedsViewHolder extends BaseViewHolder { .bold("#") .bold(String.valueOf(issue.getNumber())); if (comment.getBody() != null) { - MarkDownProvider.stripMdText(description, comment.getBody().replaceAll("\\r?\\n|\\r"," ")); + MarkDownProvider.stripMdText(description, comment.getBody().replaceAll("\\r?\\n|\\r", " ")); description.setVisibility(View.VISIBLE); } else { description.setText(""); @@ -420,7 +420,7 @@ public class FeedsViewHolder extends BaseViewHolder { .append(" ") .append(eventsModel.getRepo().getName()); if (payloadModel.getDescription() != null) { - MarkDownProvider.stripMdText(description, payloadModel.getDescription().replaceAll("\\r?\\n|\\r"," ")); + MarkDownProvider.stripMdText(description, payloadModel.getDescription().replaceAll("\\r?\\n|\\r", " ")); description.setVisibility(View.VISIBLE); } else { description.setText(""); @@ -445,13 +445,12 @@ public class FeedsViewHolder extends BaseViewHolder { .append(" ") .bold("commit") .append(" ") - .url(commitId != null ? commitId : "") - .append(" ") .bold("in") .append(" ") - .append(eventsModel.getRepo().getName()); + .append(eventsModel.getRepo().getName()) + .url(commitId != null ? "@" + commitId : ""); if (comment != null && comment.getBody() != null) { - MarkDownProvider.stripMdText(description, comment.getBody().replaceAll("\\r?\\n|\\r"," ")); + MarkDownProvider.stripMdText(description, comment.getBody().replaceAll("\\r?\\n|\\r", " ")); description.setVisibility(View.VISIBLE); } else { description.setText(""); diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerActivity.java b/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerActivity.java index ad2512fb..e3f3dbfb 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerActivity.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerActivity.java @@ -501,6 +501,12 @@ public class RepoPagerActivity extends BaseActivity implements Rep @Override public void onMenuItemSelect(@IdRes int id, int position, boolean fromUser) { if (id == R.id.issues && (getRepo() != null && !getRepo().isHasIssues())) { - sendToView(view -> view.showMessage(R.string.error, R.string.repo_issues_is_disabled)); + sendToView(RepoPagerMvp.View::disableIssueTab); return; } if (getView() != null && isViewAttached() && fromUser) { diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/code/prettifier/ViewerFragment.java b/app/src/main/java/com/fastaccess/ui/modules/repos/code/prettifier/ViewerFragment.java index 1d8061f7..3e51335e 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/code/prettifier/ViewerFragment.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/code/prettifier/ViewerFragment.java @@ -101,6 +101,7 @@ public class ViewerFragment extends BaseFragment implements ViewerMvp throwable.printStackTrace(); int code = RestProvider.getErrorCode(throwable); if (code == 404) { - sendToView(view -> view.onShowError(isRepo ? R.string.no_readme_found : R.string.no_file_found)); + if (!isRepo) { + sendToView(view -> view.onShowError(R.string.no_file_found)); + } } else { if (code == 406) { sendToView(view -> view.openUrl(url)); diff --git a/app/src/main/res/layouts/main_layouts/layout/title_header_layout.xml b/app/src/main/res/layouts/main_layouts/layout/title_header_layout.xml index a6481c39..7e070f4c 100644 --- a/app/src/main/res/layouts/main_layouts/layout/title_header_layout.xml +++ b/app/src/main/res/layouts/main_layouts/layout/title_header_layout.xml @@ -32,6 +32,7 @@