From 905d6496b56d1cc45044ee836b042ca52781d951 Mon Sep 17 00:00:00 2001 From: Yakov Date: Thu, 29 Jun 2017 15:35:31 -0400 Subject: [PATCH 1/4] Correct the wording of closed --- .../provider/timeline/TimelineProvider.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/fastaccess/provider/timeline/TimelineProvider.java b/app/src/main/java/com/fastaccess/provider/timeline/TimelineProvider.java index c4c4dd40..5130aa42 100644 --- a/app/src/main/java/com/fastaccess/provider/timeline/TimelineProvider.java +++ b/app/src/main/java/com/fastaccess/provider/timeline/TimelineProvider.java @@ -32,6 +32,7 @@ public class TimelineProvider { String from = context.getString(R.string.from); String thisString = context.getString(R.string.this_value); String in = context.getString(R.string.in_value); + String commit = context.getString(R.string.commit); if (event == IssueEventType.labeled || event == IssueEventType.unlabeled) { if (issueEventModel.getAssignee() != null && issueEventModel.getAssigner() != null) { spannableBuilder.bold(issueEventModel.getAssigner().getLogin()); @@ -53,11 +54,15 @@ public class TimelineProvider { if (user != null) { spannableBuilder.bold(user.getLogin()); } - if (event == IssueEventType.closed) { + if (event == IssueEventType.closed || event == IssueEventType.reopened) { if (isMerged) { spannableBuilder.append(" ").append(IssueEventType.merged.name()); } else { - spannableBuilder.append(" ").append(event.name().replaceAll("_", " ")); + spannableBuilder + .append(" ") + .append(event.name().replaceAll("_", " ")) + .append(" ") + .append(thisString); } } else if (event == IssueEventType.assigned || event == IssueEventType.unassigned) { spannableBuilder @@ -88,9 +93,7 @@ public class TimelineProvider { } else if (event == IssueEventType.referenced || event == IssueEventType.merged) { spannableBuilder .append(" ") - .append(thisString) - .append(" ") - .append(in) + .append(commit) .append(" ") .url(substring(issueEventModel.getCommitId())); } else if (event == IssueEventType.review_requested) { @@ -99,11 +102,9 @@ public class TimelineProvider { .append(from) .append(" ") .bold(issueEventModel.getRequestedReviewer().getLogin()); - } else if (event == IssueEventType.closed || event == IssueEventType.reopened) { + } else if (event == IssueEventType.closed) { if (issueEventModel.getCommitId() != null) { spannableBuilder - .append(" ") - .append(thisString) .append(" ") .append(in) .append(" ") From 4fb8eae4a28599426814ff4d7bea32a5c4c26bb7 Mon Sep 17 00:00:00 2001 From: Yakov Date: Thu, 29 Jun 2017 15:39:41 -0400 Subject: [PATCH 2/4] Added open in browser from repo menu --- .../com/fastaccess/ui/modules/repos/RepoPagerActivity.java | 3 +++ app/src/main/res/menu/repo_menu.xml | 7 ++++++- app/src/main/res/values/strings.xml | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) 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 b0a31b69..71c3f2c8 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 @@ -536,6 +536,9 @@ public class RepoPagerActivity extends BaseActivity + Two factors OTP is required No issue Copy + Copy repo URL Copied Commit message Error occurred while communicating to the server @@ -394,7 +395,7 @@ Assignee Some checks have failed All checks are pending - All checks are passed + All checks have passed Sort Newest Oldest From a4f741e4e2da0c0bfd3806cecf5070b986bd92fa Mon Sep 17 00:00:00 2001 From: Yakov Date: Fri, 30 Jun 2017 08:21:53 -0400 Subject: [PATCH 3/4] Revert to copy --- app/src/main/res/menu/repo_menu.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/menu/repo_menu.xml b/app/src/main/res/menu/repo_menu.xml index 4ab8e9fb..43e8f0a6 100644 --- a/app/src/main/res/menu/repo_menu.xml +++ b/app/src/main/res/menu/repo_menu.xml @@ -15,7 +15,7 @@ Date: Fri, 30 Jun 2017 08:23:22 -0400 Subject: [PATCH 4/4] Change "copy" to "Copy URL" --- app/src/main/res/values/strings.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bc05a0bb..52ee1739 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -319,8 +319,7 @@ Unauthorized user Two factors OTP is required No issue - Copy - Copy repo URL + Copy URL Copied Commit message Error occurred while communicating to the server