Skip to content

Commit

Permalink
Downgraded snapkit from beta version
Browse files Browse the repository at this point in the history
  • Loading branch information
bmoliveira committed Jul 21, 2016
1 parent ef588b3 commit 8734b02
Show file tree
Hide file tree
Showing 39 changed files with 1,736 additions and 2,184 deletions.
2 changes: 1 addition & 1 deletion BOShareComposer.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ any composer to send direct messages

s.source_files = 'BOShareComposer/Classes/**/*'

s.dependency 'SnapKit', '= 0.30.0.beta2'
s.dependency 'SnapKit', '= 0.21.1'
s.dependency 'Kanna', '~> 1.1'
end
52 changes: 26 additions & 26 deletions BOShareComposer/Classes/ShareViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@ import UIKit
import SnapKit
import WebKit

public extension BOShareViewController {
public extension ShareViewController {
public static func presentShareViewController(from viewController: UIViewController,
shareContent: ShareContent,
options: ShareOptions = ShareOptions(),
completion: ((Bool, ShareContent?) -> ())) {

viewController.navigationController?.modalPresentationStyle = .OverCurrentContext
viewController.modalPresentationStyle = .OverCurrentContext
let shareViewController = BOShareViewController()
let shareViewController = ShareViewController()
shareViewController.completion = completion
shareViewController.options = options
shareViewController.shareContent = shareContent
viewController.presentViewController(shareViewController, animated: false, completion: nil)
}
}

public class BOShareViewController: UIViewController {
public class ShareViewController: UIViewController {

private var metadataImageViewSize = CGSize(width: 70, height: 70)

Expand Down Expand Up @@ -76,7 +76,7 @@ public class BOShareViewController: UIViewController {
return
}
let size = showMetadata ? metadataImageViewSize : CGSize.zero
metadataImageView.snp.updateConstraints { make in
metadataImageView.snp_updateConstraints { make in
make.height.equalTo(size.height)
make.width.equalTo(size.width)
}
Expand Down Expand Up @@ -177,7 +177,7 @@ public class BOShareViewController: UIViewController {
}
}

extension BOShareViewController: WKNavigationDelegate {
extension ShareViewController: WKNavigationDelegate {
public func webView(webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!,
withError error: NSError) {
print("failed navigation")
Expand All @@ -195,7 +195,7 @@ extension BOShareViewController: WKNavigationDelegate {

}

extension BOShareViewController {
extension ShareViewController {

private func loadMetadata(shareContent: ShareContent) {
guard let link = shareContent.link where self.showMetadata else {
Expand Down Expand Up @@ -243,80 +243,80 @@ extension BOShareViewController {
private func setupViews() {
view.backgroundColor = UIColor.whiteColor()
view.addSubview(backgroundView)
backgroundView.snp.makeConstraints { make in
backgroundView.snp_makeConstraints { make in
make.edges.equalTo(self.view)
}

view.addSubview(containerView)

containerView.snp.makeConstraints { make in
containerView.snp_makeConstraints { make in
make.top.equalTo(backgroundView).inset(60)
make.left.equalTo(backgroundView).inset(16)
make.right.equalTo(backgroundView).inset(16)
}

let contentView = containerView.contentView
contentView.addSubview(dismissButton)
dismissButton.snp.makeConstraints { make in
dismissButton.snp_makeConstraints { make in
make.top.equalTo(contentView).inset(4)
make.left.equalTo(contentView).inset(8)
}

contentView.addSubview(confirmButton)
confirmButton.snp.makeConstraints { make in
confirmButton.snp_makeConstraints { make in
make.top.equalTo(contentView).inset(4)
make.right.equalTo(contentView).inset(8)
}

contentView.addSubview(titleDivider)
titleDivider.snp.makeConstraints { make in
make.top.equalTo(dismissButton.snp.bottom)
titleDivider.snp_makeConstraints { make in
make.top.equalTo(dismissButton.snp_bottom)
make.left.equalTo(contentView)
make.right.equalTo(contentView)
make.height.equalTo(1)
}

contentView.addSubview(popupTitle)
popupTitle.snp.makeConstraints { make in
popupTitle.snp_makeConstraints { make in
make.top.equalTo(contentView)
make.bottom.equalTo(titleDivider.snp.top)
make.bottom.equalTo(titleDivider.snp_top)
make.centerX.equalTo(contentView)
make.left.equalTo(dismissButton.snp.right).priorityLow()
make.right.equalTo(confirmButton.snp.left).priorityLow()
make.left.equalTo(dismissButton.snp_right).priorityLow()
make.right.equalTo(confirmButton.snp_left).priorityLow()
}

let dummyContentView = UIView()
contentView.addSubview(dummyContentView)
dummyContentView.snp.makeConstraints { make in
make.top.equalTo(titleDivider.snp.bottom)
dummyContentView.snp_makeConstraints { make in
make.top.equalTo(titleDivider.snp_bottom)
make.left.equalTo(contentView).inset(8)
make.right.equalTo(contentView).inset(8)
make.bottom.equalTo(contentView).inset(8)
make.height.equalTo(140)
}

dummyContentView.addSubview(metadataImageView)
metadataImageView.snp.makeConstraints { make in
metadataImageView.snp_makeConstraints { make in
make.right.equalTo(dummyContentView)
make.height.equalTo(showMetadata ? metadataImageViewSize.height : 0)
make.width.equalTo(showMetadata ? metadataImageViewSize.width : 0)
make.centerY.equalTo(dummyContentView)
}

dummyContentView.addSubview(popupBody)
popupBody.snp.makeConstraints { make in
popupBody.snp_makeConstraints { make in
make.top.equalTo(dummyContentView)
make.left.equalTo(dummyContentView)
make.right.equalTo(metadataImageView.snp.left)
make.right.equalTo(metadataImageView.snp_left)
make.bottom.equalTo(dummyContentView)
}

view.addSubview(metadataWebView)
metadataWebView.snp.makeConstraints { make in
make.top.equalTo(view.snp.bottom)
make.left.equalTo(view.snp.right)
make.height.equalTo(view.snp.width)
make.width.equalTo(view.snp.width)
metadataWebView.snp_makeConstraints { make in
make.top.equalTo(view.snp_bottom)
make.left.equalTo(view.snp_right)
make.height.equalTo(view.snp_width)
make.width.equalTo(view.snp_width)
}
}
}
6 changes: 3 additions & 3 deletions Example/BOShareComposer/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class ViewController: UIViewController {
}

@IBAction func shareWithoutData(sender: AnyObject) {
BOShareViewController
ShareViewController
.presentShareViewController(from: self,
shareContent: shareContentWithoutMetaData,
options: shareOptionsNoMetadata) { (completed, shareContent) in
Expand All @@ -50,7 +50,7 @@ class ViewController: UIViewController {
}

@IBAction func shareWithoutMetadata(sender: AnyObject) {
BOShareViewController
ShareViewController
.presentShareViewController(from: self,
shareContent: shareContentWithoutMetaData,
options: shareOptions) { (completed, shareContent) in
Expand All @@ -59,7 +59,7 @@ class ViewController: UIViewController {
}

@IBAction func share(sender: AnyObject) {
BOShareViewController
ShareViewController
.presentShareViewController(from: self,
shareContent: shareContentWithMetaData,
options: shareOptions) { (completed, shareContent) in
Expand Down
10 changes: 5 additions & 5 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
PODS:
- BOShareComposer (0.1.0):
- BOShareComposer (0.2.1):
- Kanna (~> 1.1)
- SnapKit (= 0.30.0.beta2)
- SnapKit (= 0.21.1)
- Kanna (1.1.0)
- SnapKit (0.30.0.beta2)
- SnapKit (0.21.1)

DEPENDENCIES:
- BOShareComposer (from `../`)
Expand All @@ -13,9 +13,9 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
BOShareComposer: 1f0feb84ce5c5583cd35b32d18a3e4938f3849bf
BOShareComposer: 325010e86fb2040802bd14e3b3a71b185200ec53
Kanna: 355ed0193e5d8caf4fd996856b5bc98d586c11b6
SnapKit: c4bb32b1d3c5d18ff63bf95ffcbc599d2bab964c
SnapKit: bbad04cb016c7cead63965f16b00c09318d271ee

PODFILE CHECKSUM: 34105de0c22ed3618df2454faee766a693725c3d

Expand Down
6 changes: 3 additions & 3 deletions Example/Pods/Local Podspecs/BOShareComposer.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Example/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 8734b02

Please sign in to comment.