From 8eb7cbdf9382c53849ea6bc8aa22cd9be00b99e1 Mon Sep 17 00:00:00 2001 From: abeyuya Date: Tue, 28 Nov 2017 15:59:25 +0900 Subject: [PATCH 1/2] splist PDFBarButton-generate method --- Pod/Classes/Renderer/PDFViewController.swift | 39 +++++++++++++------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/Pod/Classes/Renderer/PDFViewController.swift b/Pod/Classes/Renderer/PDFViewController.swift index 9a964a2..56a11b9 100644 --- a/Pod/Classes/Renderer/PDFViewController.swift +++ b/Pod/Classes/Renderer/PDFViewController.swift @@ -197,24 +197,13 @@ open class PDFViewController: UIViewController { var buttons: [UIBarButtonItem] = [] if allowsSharing { - - let shareFormBarButtonItem = PDFBarButton( - image: UIImage.bundledImage("share"), - toggled: false, - target: self, - action: #selector(PDFViewController.shareDocument) - ) + let shareFormBarButtonItem = buildShareFormBarButtonItem() buttons.append(shareFormBarButtonItem) self.shareBarButtonItem = shareFormBarButtonItem } - buttons.append(PDFBarButton( - image: UIImage.bundledImage("thumbs"), - toggled: false, - target: self, - action: #selector(PDFViewController.showThumbnailView) - ) - ) + let thumbsBarButtonItem = buildThumbsBarButtonItem() + buttons.append(thumbsBarButtonItem) if allowsAnnotations { @@ -237,6 +226,28 @@ open class PDFViewController: UIViewController { return buttons } + private func buildShareFormBarButtonItem() -> PDFBarButton { + let shareFormBarButtonItem = PDFBarButton( + image: UIImage.bundledImage("share"), + toggled: false, + target: self, + action: #selector(PDFViewController.shareDocument) + ) + + return shareFormBarButtonItem + } + + private func buildThumbsBarButtonItem() -> PDFBarButton { + let thumbsBarButtonItem = PDFBarButton( + image: UIImage.bundledImage("thumbs"), + toggled: false, + target: self, + action: #selector(PDFViewController.showThumbnailView) + ) + + return thumbsBarButtonItem + } + func toggleAnnotations(_ button: PDFBarButton) { showingAnnotations = !showingAnnotations reloadBarButtons() From f1a6f94b25f14796e80e4b2955e303cac75a1a28 Mon Sep 17 00:00:00 2001 From: abeyuya Date: Tue, 28 Nov 2017 16:11:02 +0900 Subject: [PATCH 2/2] change share and thumb image to accessable --- Pod/Classes/Renderer/PDFViewController.swift | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Pod/Classes/Renderer/PDFViewController.swift b/Pod/Classes/Renderer/PDFViewController.swift index 56a11b9..79e51d0 100644 --- a/Pod/Classes/Renderer/PDFViewController.swift +++ b/Pod/Classes/Renderer/PDFViewController.swift @@ -45,6 +45,12 @@ open class PDFViewController: UIViewController { /// A reference to the share button var shareBarButtonItem: UIBarButtonItem? + /// The share button icon + open lazy var shareBarButtonIcon: UIImage? = UIImage.bundledImage("share") + + /// The thumbs button icon + open lazy var thumbsBarButtonIcon: UIImage? = UIImage.bundledImage("thumbs") + /// A closure that defines an action to take upon selecting the share button. /// The default action brings up a UIActivityViewController open lazy var shareBarButtonAction: () -> () = { self.showActivitySheet() } @@ -228,7 +234,7 @@ open class PDFViewController: UIViewController { private func buildShareFormBarButtonItem() -> PDFBarButton { let shareFormBarButtonItem = PDFBarButton( - image: UIImage.bundledImage("share"), + image: shareBarButtonIcon, toggled: false, target: self, action: #selector(PDFViewController.shareDocument) @@ -239,7 +245,7 @@ open class PDFViewController: UIViewController { private func buildThumbsBarButtonItem() -> PDFBarButton { let thumbsBarButtonItem = PDFBarButton( - image: UIImage.bundledImage("thumbs"), + image: thumbsBarButtonIcon, toggled: false, target: self, action: #selector(PDFViewController.showThumbnailView)