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 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 } } 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) }