kylefang/GitHawk
1
0
Fork 0
mirror of https://github.com/zhigang1992/GitHawk.git synced 2026-05-13 01:51:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

tweak close behavior

Browse Source
This commit is contained in:
Ryan Nystrom
2017-08-27 22:51:34 -07:00
parent 9a165556ee
commit 72d2de0c2e
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Classes/Issues/GithubClient+Issues.swift
View File

@@ -163,9 +163,9 @@ extension GithubClient {
completion: @escaping (Result<CloseStatus>) -> ()
) {
request(Request(
path: "repos/\(owner)/\(repo)/issue/\(number)",
method: .post,
parameters: [ "status": status.rawValue ],
path: "repos/\(owner)/\(repo)/issues/\(number)",
method: .patch,
parameters: [ "state": status.rawValue ],
completion: { (response, _) in
if response.value != nil {
completion(.success(status))

13
Classes/Issues/IssuesViewController.swift
View File

@@ -202,7 +202,7 @@ IssueTextActionsViewDelegate {
}
func shareAction(sender: UIBarButtonItem) -> UIAlertAction {
return UIAlertAction(title: NSLocalizedString("Share...", comment: ""), style: .default) { [weak self] _ in
return UIAlertAction(title: NSLocalizedString("Send To", comment: ""), style: .default) { [weak self] _ in
guard let strongSelf = self else { return }
let safariActivity = TUSafariActivity()
let controller = UIActivityViewController(activityItems: [strongSelf.externalURL], applicationActivities: [safariActivity])
@@ -221,11 +221,11 @@ IssueTextActionsViewDelegate {
func closeAction() -> UIAlertAction? {
guard current?.viewerCanUpdate == true,
let status = current?.status.status,
let status = localStatusChange?.model.status ?? current?.status.status,
status != .merged
else { return nil }
let close = status == .closed
let close = status == .open
let title = close ? NSLocalizedString("Close", comment: "") : NSLocalizedString("Reopen", comment: "")
return UIAlertAction(title: title, style: .default, handler: { [weak self] _ in
self?.setStatus(close: close)
@@ -234,6 +234,11 @@ IssueTextActionsViewDelegate {
func onMore(sender: UIBarButtonItem) {
let alert = UIAlertController()
if let close = closeAction() {
alert.addAction(close)
}
alert.addAction(shareAction(sender: sender))
alert.addAction(safariAction())
alert.addAction(UIAlertAction(title: Strings.cancel, style: .cancel, handler: nil))
@@ -291,7 +296,7 @@ IssueTextActionsViewDelegate {
)
let localEvent = IssueStatusEventModel(
id: UUID().uuidString,
actor: "TODO",
actor: client.sessionManager.focusedUserSession?.username ?? Strings.unknown,
commitHash: nil,
date: Date(),
status: close ? .closed : .reopened,

2
Resources/Info.plist
View File

@@ -32,7 +32,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1536</string>
<string>1542</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>