Skip to content

Main Version 1.1.0 🦊 #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion iBox/Sources/AddBookmark/AddBookmarkView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion iBox/Sources/AddBookmark/AddBookmarkViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ final class AddBookmarkViewController: UIViewController {
if let selectedFolder {
addBookmarkView.selectedFolderName = selectedFolder.name
} else {
addBookmarkView.selectedFolderName = "선택된 폴더가 없습니다."
addBookmarkView.selectedFolderName = nil
}
}

Expand Down
7 changes: 1 addition & 6 deletions iBox/Sources/BoxList/BoxListView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -475,8 +472,6 @@ extension BoxListView: UITableViewDelegate {
}
}



return UIMenu(title: "", children: [favoriteAction, shareAction, editAction, deleteAction])
}
}
Expand Down
8 changes: 8 additions & 0 deletions iBox/Sources/BoxList/BoxListViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down