From bc751429643197e455c32c92b0f79ce7a8df1e52 Mon Sep 17 00:00:00 2001 From: noeyiz Date: Fri, 3 May 2024 22:39:31 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=EC=95=84=EC=9D=B4=ED=8C=A8=EB=93=9C?= =?UTF-8?q?=20=EB=8C=80=EC=9D=91=20UIActivityController=20popover=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- iBox/Sources/BoxList/BoxListView.swift | 7 +------ iBox/Sources/BoxList/BoxListViewController.swift | 8 ++++++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/iBox/Sources/BoxList/BoxListView.swift b/iBox/Sources/BoxList/BoxListView.swift index abbaba0..da9bbd2 100644 --- a/iBox/Sources/BoxList/BoxListView.swift +++ b/iBox/Sources/BoxList/BoxListView.swift @@ -448,10 +448,7 @@ extension BoxListView: UITableViewDelegate { generator.impactOccurred() } - let activityViewController = UIActivityViewController(activityItems: [url], applicationActivities: nil) - if let viewController = self.delegate as? UIViewController { - viewController.present(activityViewController, animated: true, completion: nil) - } + delegate?.pushViewController(url: url) } let editAction = UIAction(title: "북마크 편집", image: UIImage(systemName: "pencil")) { [weak self] action in @@ -475,8 +472,6 @@ extension BoxListView: UITableViewDelegate { } } - - return UIMenu(title: "", children: [favoriteAction, shareAction, editAction, deleteAction]) } } diff --git a/iBox/Sources/BoxList/BoxListViewController.swift b/iBox/Sources/BoxList/BoxListViewController.swift index 5c95f7b..bde24c3 100644 --- a/iBox/Sources/BoxList/BoxListViewController.swift +++ b/iBox/Sources/BoxList/BoxListViewController.swift @@ -265,6 +265,14 @@ extension BoxListViewController: BoxListViewDelegate { func pushViewController(url: URL?) { guard let url = url else { return } let activityViewController = UIActivityViewController(activityItems: [url], applicationActivities: nil) + + // 아이패드 대응 + if let popoverController = activityViewController.popoverPresentationController { + popoverController.sourceView = self.view + popoverController.sourceRect = CGRect(x: self.view.bounds.midX, y: self.view.bounds.midY, width: 0, height: 0) + popoverController.permittedArrowDirections = [] + } + self.present(activityViewController, animated: true) } From 81c3d293b9a936756350054483b6cc2942d00eab Mon Sep 17 00:00:00 2001 From: noeyiz Date: Fri, 3 May 2024 23:24:05 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=EB=B6=81=EB=A7=88=ED=81=AC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EC=8B=9C=20=ED=8F=B4=EB=8D=94=20=EC=97=86?= =?UTF-8?q?=EC=9D=84=20=EB=95=8C=20=EC=83=89=EC=83=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- iBox/Sources/AddBookmark/AddBookmarkView.swift | 8 +++++++- iBox/Sources/AddBookmark/AddBookmarkViewController.swift | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/iBox/Sources/AddBookmark/AddBookmarkView.swift b/iBox/Sources/AddBookmark/AddBookmarkView.swift index e8d7d99..db2023d 100644 --- a/iBox/Sources/AddBookmark/AddBookmarkView.swift +++ b/iBox/Sources/AddBookmark/AddBookmarkView.swift @@ -20,7 +20,13 @@ class AddBookmarkView: UIView { var selectedFolderName: String? { didSet { - selectedFolderLabel.text = selectedFolderName + if selectedFolderName != nil { + selectedFolderLabel.text = selectedFolderName + selectedFolderLabel.textColor = .systemGray + } else { + selectedFolderLabel.text = "선택된 폴더가 없습니다." + selectedFolderLabel.textColor = .box + } } } diff --git a/iBox/Sources/AddBookmark/AddBookmarkViewController.swift b/iBox/Sources/AddBookmark/AddBookmarkViewController.swift index 0388234..0a91bf3 100644 --- a/iBox/Sources/AddBookmark/AddBookmarkViewController.swift +++ b/iBox/Sources/AddBookmark/AddBookmarkViewController.swift @@ -109,7 +109,7 @@ final class AddBookmarkViewController: UIViewController { if let selectedFolder { addBookmarkView.selectedFolderName = selectedFolder.name } else { - addBookmarkView.selectedFolderName = "선택된 폴더가 없습니다." + addBookmarkView.selectedFolderName = nil } } From 63e2057d4e77c170ff920b85bf7fde57ad89cbfc Mon Sep 17 00:00:00 2001 From: KIM CHANHEE <85754295+chanhihi@users.noreply.github.com> Date: Fri, 3 May 2024 23:32:27 +0900 Subject: [PATCH 3/3] chore: update main version --- Project.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.swift b/Project.swift index 47ebc4e..733fe37 100644 --- a/Project.swift +++ b/Project.swift @@ -14,7 +14,7 @@ protocol ProjectFactory { extension Plist.Value { static var displayName: Plist.Value = "42Box" static var displayShareExtensionName: Plist.Value = "42Box.Share" - static var appVersion: Plist.Value = "1.0.3" + static var appVersion: Plist.Value = "1.1.0" } // MARK: - iBox Factory