Skip to content

Commit

Permalink
Merge pull request #3 from fermoya/feat/update-swift5
Browse files Browse the repository at this point in the history 
Update Swift5
  • Loading branch information
@fermoya
fermoya authored Feb 5, 2020
2 parents d2f2ece + f1f7867 commit 9b8fad7
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 30 deletions.
Binary file modified BubbleShowCase.framework.zip
View file
Binary file not shown.
11 changes: 7 additions & 4 deletions BubbleShowCase/BubbleShowCase.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = B0EE5286213E89F7003E84EC;
productRefGroup = B0EE5291213E89F7003E84EC /* Products */;
Expand Down Expand Up @@ -193,12 +194,13 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.4;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand Down Expand Up @@ -250,11 +252,12 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.4;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 5.0;
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand Down Expand Up @@ -283,7 +286,7 @@
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -309,7 +312,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.elconfidencial.BubbleShowCase-iOS";
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand Down
2 changes: 1 addition & 1 deletion BubbleShowCase/BubbleShowCase/BubbleShowCase.podspec
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "BubbleShowCase"
s.version = "1.1.0"
s.version = "1.2.0"
s.summary = "A wonderful way to show case your users your App features"

s.description = <<-DESC
Expand Down
63 changes: 38 additions & 25 deletions BubbleShowCase/BubbleShowCase/BubbleShowCase.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,7 @@ public class BubbleShowCase: UIView {

// Updates bubble top and bottom constraints to make fit the bubble into the screen. It should be called once the subviews have been rendered.
private func updateSideConstraints() {
guard let bubble = bubble else { return }
let topAvailableSpace = screenshotContainer.frame.midY - margins
let bottomAvailableSpace = screenWindow.frame.height - screenshotContainer.frame.midY - margins
if topAvailableSpace < bubble.frame.height / 2 {
Expand Down Expand Up @@ -598,12 +599,15 @@ public class BubbleShowCase: UIView {
bubbleTrailing?.constant = (bubbleTrailing?.constant ?? 0) - safeAreaMargins.left
case .portraitUpsideDown, .faceUp, .faceDown, .unknown:
break
@unknown default:
break
}
}

// Creates a button, draws a cross inside and places it at the top right of the bubble
private func drawCross() {
cross = UIButton()
let cross = UIButton()
self.cross = cross
cross.addTarget(self, action: #selector(crossDidTap), for: .touchUpInside)
cross.translatesAutoresizingMaskIntoConstraints = false
bubble.addSubview(cross)
Expand Down Expand Up @@ -638,7 +642,8 @@ public class BubbleShowCase: UIView {
private func drawArrow() {
guard arrowDirection != .none else { return }

arrow = UIView()
let arrow = UIView()
self.arrow = arrow
arrow.translatesAutoresizingMaskIntoConstraints = false
bubble.addSubview(arrow)

Expand Down Expand Up @@ -725,10 +730,10 @@ public class BubbleShowCase: UIView {
arrow2.translatesAutoresizingMaskIntoConstraints = false
bubble.addSubview(arrow2)

let bottom2 = NSLayoutConstraint(item: arrow2, attribute: .bottom, relatedBy: .equal, toItem: bubble, attribute: .bottom, multiplier: 1, constant: arrowSize)
let centerX2 = NSLayoutConstraint(item: arrow2, attribute: .centerX, relatedBy: .equal, toItem: self, attribute: .centerX, multiplier: 1, constant: -arrowSize)
let height2 = NSLayoutConstraint(item: arrow2, attribute: .height, relatedBy: .equal, toItem: nil, attribute: .height, multiplier: 1, constant: arrowSize)
let width2 = NSLayoutConstraint(item: arrow2, attribute: .width, relatedBy: .equal, toItem: nil, attribute: .width, multiplier: 1, constant: 2 * arrowSize)
let bottom2 = NSLayoutConstraint(item: arrow2!, attribute: .bottom, relatedBy: .equal, toItem: bubble, attribute: .bottom, multiplier: 1, constant: arrowSize)
let centerX2 = NSLayoutConstraint(item: arrow2!, attribute: .centerX, relatedBy: .equal, toItem: self, attribute: .centerX, multiplier: 1, constant: -arrowSize)
let height2 = NSLayoutConstraint(item: arrow2!, attribute: .height, relatedBy: .equal, toItem: nil, attribute: .height, multiplier: 1, constant: arrowSize)
let width2 = NSLayoutConstraint(item: arrow2!, attribute: .width, relatedBy: .equal, toItem: nil, attribute: .width, multiplier: 1, constant: 2 * arrowSize)

bubble.addConstraint(bottom2)
addConstraint(centerX2)
Expand Down Expand Up @@ -758,10 +763,10 @@ public class BubbleShowCase: UIView {
arrow2.translatesAutoresizingMaskIntoConstraints = false
bubble.addSubview(arrow2)

let centerY2 = NSLayoutConstraint(item: arrow2, attribute: .centerY, relatedBy: .equal, toItem: self, attribute: .centerY, multiplier: 1, constant: -arrowSize)
let trailing2 = NSLayoutConstraint(item: arrow2, attribute: .trailing, relatedBy: .equal, toItem: bubble, attribute: .trailing, multiplier: 1, constant: arrowSize)
let height2 = NSLayoutConstraint(item: arrow2, attribute: .height, relatedBy: .equal, toItem: nil, attribute: .height, multiplier: 1, constant: 2 * arrowSize)
let width2 = NSLayoutConstraint(item: arrow2, attribute: .width, relatedBy: .equal, toItem: nil, attribute: .width, multiplier: 1, constant: arrowSize)
let centerY2 = NSLayoutConstraint(item: arrow2!, attribute: .centerY, relatedBy: .equal, toItem: self, attribute: .centerY, multiplier: 1, constant: -arrowSize)
let trailing2 = NSLayoutConstraint(item: arrow2!, attribute: .trailing, relatedBy: .equal, toItem: bubble, attribute: .trailing, multiplier: 1, constant: arrowSize)
let height2 = NSLayoutConstraint(item: arrow2!, attribute: .height, relatedBy: .equal, toItem: nil, attribute: .height, multiplier: 1, constant: 2 * arrowSize)
let width2 = NSLayoutConstraint(item: arrow2!, attribute: .width, relatedBy: .equal, toItem: nil, attribute: .width, multiplier: 1, constant: arrowSize)

bubble.addConstraint(trailing2)
addConstraint(centerY2)
Expand Down Expand Up @@ -956,7 +961,8 @@ public class BubbleShowCase: UIView {

// Embeds the screenshot in the show case
private func embedScreenshot() {
screenshotContainer = UIView()
let screenshotContainer = UIView()
self.screenshotContainer = screenshotContainer
screenshotContainer.translatesAutoresizingMaskIntoConstraints = false
addSubview(screenshotContainer)
addGestureRecognizersToScreenshot()
Expand Down Expand Up @@ -1037,7 +1043,8 @@ public class BubbleShowCase: UIView {

// Embeds the bubble in the show case view and places it next to the target according to the arrow direction
private func embedBubble() {
bubble = UIView()
let bubble = UIView()
self.bubble = bubble
bubble.layer.cornerRadius = 5
bubble.clipsToBounds = false
bubble.translatesAutoresizingMaskIntoConstraints = false
Expand All @@ -1057,7 +1064,8 @@ public class BubbleShowCase: UIView {
}

private func embedSkipButton() {
skipLabel = UILabel()
let skipLabel = UILabel()
self.skipLabel = skipLabel
skipLabel.textColor = UIColor.white
skipLabel.text = skipButtonText
skipLabel.textAlignment = .center
Expand All @@ -1079,7 +1087,6 @@ public class BubbleShowCase: UIView {

addConstraint(centerX)
addConstraint(bottom)

}

private func addGestureRecognizerToSkipButton() {
Expand All @@ -1095,6 +1102,7 @@ public class BubbleShowCase: UIView {

// Constraints the bubble to the target for both leftAndSide and upAndDown arrow directions
private func constraintBubbleForDoubleDirections() {
guard let bubble = bubble else { return }
let centerY = NSLayoutConstraint(item: bubble, attribute: .centerY, relatedBy: .equal, toItem: self, attribute: .centerY, multiplier: 1, constant: 0)
let centerX = NSLayoutConstraint(item: bubble, attribute: .centerX, relatedBy: .equal, toItem: self, attribute: .centerX, multiplier: 1, constant: 0)
addConstraints([centerY, centerX])
Expand All @@ -1112,6 +1120,7 @@ public class BubbleShowCase: UIView {

// Constraints the bubble to the target for both left and right arrow directions
private func contraintBubbleForSideDirections() {
guard let bubble = bubble else { return }
let centerY = NSLayoutConstraint(item: bubble, attribute: .centerY, relatedBy: .equal, toItem: screenshotContainer, attribute: .centerY, multiplier: 1, constant: 0)
addConstraint(centerY)
sideShowCaseCenterY = centerY
Expand Down Expand Up @@ -1143,6 +1152,7 @@ public class BubbleShowCase: UIView {

// Constraints the bubble to the target for both up and down arrow directions
private func constraintBubbleForTopDirections() {
guard let bubble = bubble else { return }
if arrowDirection == .up {
let topConstant = margins + padding
let top = NSLayoutConstraint(item: bubble, attribute: .top, relatedBy: .equal, toItem: screenshotContainer, attribute: .bottom, multiplier: 1, constant: topConstant)
Expand Down Expand Up @@ -1193,14 +1203,16 @@ public class BubbleShowCase: UIView {

// Embeds both the title and description into the show case
private func embedLabels() {
titleLabel = UILabel()
let titleLabel = UILabel()
self.titleLabel = titleLabel
titleLabel.numberOfLines = 0
titleLabel.text = titleText
titleLabel.font = titleFont
titleLabel.translatesAutoresizingMaskIntoConstraints = false
bubble.addSubview(titleLabel)

descriptionLabel = UILabel()
let descriptionLabel = UILabel()
self.descriptionLabel = descriptionLabel
descriptionLabel.numberOfLines = 0
descriptionLabel.text = descriptionText
descriptionLabel.font = descriptionFont
Expand All @@ -1222,20 +1234,21 @@ public class BubbleShowCase: UIView {

// Embeds the icon in the show case, shifting the labels rightwards
private func embedImage() {
icon = UIImageView(image: image)
icon?.translatesAutoresizingMaskIntoConstraints = false
bubble.addSubview(icon!)
let icon = UIImageView(image: image)
self.icon = icon
icon.translatesAutoresizingMaskIntoConstraints = false
bubble.addSubview(icon)

let height = NSLayoutConstraint(item: icon!, attribute: .height, relatedBy: .equal, toItem: nil, attribute: .height, multiplier: 1, constant: imageSize.height)
let width = NSLayoutConstraint(item: icon!, attribute: .width, relatedBy: .equal, toItem: nil, attribute: .width, multiplier: 1, constant: imageSize.width)
icon?.addConstraints([height, width])
let height = NSLayoutConstraint(item: icon, attribute: .height, relatedBy: .equal, toItem: nil, attribute: .height, multiplier: 1, constant: imageSize.height)
let width = NSLayoutConstraint(item: icon, attribute: .width, relatedBy: .equal, toItem: nil, attribute: .width, multiplier: 1, constant: imageSize.width)
icon.addConstraints([height, width])

let leading = NSLayoutConstraint(item: icon!, attribute: .leading, relatedBy: .equal, toItem: bubble, attribute: .leading, multiplier: 1, constant: bubblePadding.left)
let centerY = NSLayoutConstraint(item: icon!, attribute: .centerY, relatedBy: .equal, toItem: bubble, attribute: .centerY, multiplier: 1, constant: 0)
let leading = NSLayoutConstraint(item: icon, attribute: .leading, relatedBy: .equal, toItem: bubble, attribute: .leading, multiplier: 1, constant: bubblePadding.left)
let centerY = NSLayoutConstraint(item: icon, attribute: .centerY, relatedBy: .equal, toItem: bubble, attribute: .centerY, multiplier: 1, constant: 0)
bubble.addConstraints([leading, centerY])

bubble.removeConstraint(descriptionLeading)
descriptionLeading = NSLayoutConstraint(item: descriptionLabel, attribute: .leading, relatedBy: .equal, toItem: icon!, attribute: .trailing, multiplier: 1, constant: 15)
descriptionLeading = NSLayoutConstraint(item: descriptionLabel!, attribute: .leading, relatedBy: .equal, toItem: icon, attribute: .trailing, multiplier: 1, constant: 15)
bubble.addConstraint(descriptionLeading)
}

Expand Down

0 comments on commit 9b8fad7

Please sign in to comment.