Remove BulletinBoard

pull/2/head
Michael Scoff 7 years ago
parent f5ab92339d
commit 14d99ce6d4
  1. 1
      Podfile
  2. 10
      Podfile.lock
  3. 10
      Trust.xcodeproj/project.pbxproj
  4. 1
      Trust/UI/Button.swift
  5. 99
      Trust/UI/PageItem.swift

@ -22,7 +22,6 @@ target 'Trust' do
pod 'BonMot'
pod 'VENTouchLock'
pod '1PasswordExtension'
pod 'BulletinBoard', :git=>'https://github.com/alexaubry/BulletinBoard'
pod 'Lokalise'
pod 'Moya'
pod 'JavaScriptKit'

@ -4,7 +4,6 @@ PODS:
- APIKit (3.1.1):
- Result (~> 3.0)
- BonMot (4.3.1)
- BulletinBoard (1.2.0)
- EAIntroView (2.10.0):
- EARestrictedScrollView (~> 1.1.0)
- EARestrictedScrollView (1.1.0)
@ -45,7 +44,6 @@ DEPENDENCIES:
- 1PasswordExtension
- APIKit
- BonMot
- BulletinBoard (from `https://github.com/alexaubry/BulletinBoard`)
- EAIntroView
- Eureka (from `https://github.com/xmartlabs/Eureka.git`, branch `feature/Xcode9-Swift3_2`)
- Geth
@ -64,8 +62,6 @@ DEPENDENCIES:
- VENTouchLock
EXTERNAL SOURCES:
BulletinBoard:
:git: https://github.com/alexaubry/BulletinBoard
Eureka:
:branch: feature/Xcode9-Swift3_2
:git: https://github.com/xmartlabs/Eureka.git
@ -76,9 +72,6 @@ EXTERNAL SOURCES:
:git: https://github.com/seedco/StackViewController.git
CHECKOUT OPTIONS:
BulletinBoard:
:commit: c0c9300580cef4c8f3f057ae795697babd457134
:git: https://github.com/alexaubry/BulletinBoard
Eureka:
:commit: 170433bedb6db4228da60eb6c866156b6b29e666
:git: https://github.com/xmartlabs/Eureka.git
@ -94,7 +87,6 @@ SPEC CHECKSUMS:
Alamofire: 2d95912bf4c34f164fdfc335872e8c312acaea4a
APIKit: 7460983f490d3bde6aaaaa4164d18c9865a6f91d
BonMot: 043bb5a8834cc6d74e9d624742272b92385e0a27
BulletinBoard: 54365043ff1ad71a6cfc3ec796a5c1ce507d71ea
EAIntroView: 3494b7bbd1212e3a4f7e8d16194a1b00e7b9abb2
EARestrictedScrollView: b0c2a3f92fb2610bb44d71c5e4893777c89e45ef
Eureka: 5b9418d7bfdc21ca977d69d124a6409f3e9af2c7
@ -118,6 +110,6 @@ SPEC CHECKSUMS:
VENTouchLock: 20d378b9c6173e2c054448aeb3fb2f40822a9f3f
zipzap: 940162d9c9c60472c2eab341385e4214da0fdf1c
PODFILE CHECKSUM: 10a263537b8126abe5f63cfb6cd5f8a3d6ffa100
PODFILE CHECKSUM: ac2e35db14313615c79e407a02ca61480aea6341
COCOAPODS: 1.3.1

@ -72,7 +72,6 @@
2932488C1F88E689008A9818 /* OnePasswordConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2932488B1F88E689008A9818 /* OnePasswordConverter.swift */; };
2932488E1F88E69F008A9818 /* OnePasswordError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2932488D1F88E69F008A9818 /* OnePasswordError.swift */; };
293248901F897787008A9818 /* OnePasswordCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2932488F1F897787008A9818 /* OnePasswordCoordinator.swift */; };
293248941F89F3C6008A9818 /* PageItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 293248931F89F3C6008A9818 /* PageItem.swift */; };
29336FE71F6B245D005E3BFC /* WelcomeViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29A13E271F6A903500E432A2 /* WelcomeViewModelTests.swift */; };
29358D991F78D1E400925D61 /* SnapshotHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29358D981F78D1E400925D61 /* SnapshotHelper.swift */; };
29358D9F1F78D5B700925D61 /* Screenshots.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29358D9E1F78D5B700925D61 /* Screenshots.swift */; };
@ -97,6 +96,7 @@
2963B6AB1F9818C7003063C1 /* TransactionHeaderViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2963B6AA1F9818C7003063C1 /* TransactionHeaderViewModel.swift */; };
2963B6AD1F981A96003063C1 /* TransactionAppearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2963B6AC1F981A96003063C1 /* TransactionAppearance.swift */; };
2963B6AF1F9823E6003063C1 /* UnconfirmedTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2963B6AE1F9823E6003063C1 /* UnconfirmedTransaction.swift */; };
2963B6B11F9891F5003063C1 /* UIButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2963B6B01F9891F5003063C1 /* UIButton.swift */; };
296421951F70C1EC00EB363B /* LoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 296421941F70C1EC00EB363B /* LoadingView.swift */; };
296421971F70C1F200EB363B /* ErrorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 296421961F70C1F200EB363B /* ErrorView.swift */; };
296421991F70C1F900EB363B /* EmptyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 296421981F70C1F900EB363B /* EmptyView.swift */; };
@ -266,7 +266,6 @@
2932488B1F88E689008A9818 /* OnePasswordConverter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnePasswordConverter.swift; sourceTree = "<group>"; };
2932488D1F88E69F008A9818 /* OnePasswordError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnePasswordError.swift; sourceTree = "<group>"; };
2932488F1F897787008A9818 /* OnePasswordCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnePasswordCoordinator.swift; sourceTree = "<group>"; };
293248931F89F3C6008A9818 /* PageItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PageItem.swift; sourceTree = "<group>"; };
29358D981F78D1E400925D61 /* SnapshotHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SnapshotHelper.swift; path = fastlane/SnapshotHelper.swift; sourceTree = SOURCE_ROOT; };
29358D9E1F78D5B700925D61 /* Screenshots.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Screenshots.swift; sourceTree = "<group>"; };
29358DA81F79FD1C00925D61 /* CALayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CALayer.swift; sourceTree = "<group>"; };
@ -290,6 +289,7 @@
2963B6AA1F9818C7003063C1 /* TransactionHeaderViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionHeaderViewModel.swift; sourceTree = "<group>"; };
2963B6AC1F981A96003063C1 /* TransactionAppearance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionAppearance.swift; sourceTree = "<group>"; };
2963B6AE1F9823E6003063C1 /* UnconfirmedTransaction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnconfirmedTransaction.swift; sourceTree = "<group>"; };
2963B6B01F9891F5003063C1 /* UIButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIButton.swift; sourceTree = "<group>"; };
296421941F70C1EC00EB363B /* LoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingView.swift; sourceTree = "<group>"; };
296421961F70C1F200EB363B /* ErrorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorView.swift; sourceTree = "<group>"; };
296421981F70C1F900EB363B /* EmptyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyView.swift; sourceTree = "<group>"; };
@ -604,7 +604,6 @@
29C9F5F81F720BD30025C494 /* FloatLabelCell.swift */,
29C9F5FA1F720C050025C494 /* FloatLabelTextField.swift */,
29FC0CB71F8299510036089F /* Coordinator.swift */,
293248931F89F3C6008A9818 /* PageItem.swift */,
);
path = UI;
sourceTree = "<group>";
@ -948,6 +947,7 @@
29BBB36A1F7BCEDD006BC91B /* GethBigInt.swift */,
290B2B5E1F9177860053C83E /* UIImage.swift */,
291A1B681F980E3400ADEC80 /* StackViewController.swift */,
2963B6B01F9891F5003063C1 /* UIButton.swift */,
);
path = Extensions;
sourceTree = "<group>";
@ -1491,7 +1491,6 @@
"${BUILT_PRODUCTS_DIR}/APIKit/APIKit.framework",
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
"${BUILT_PRODUCTS_DIR}/BonMot/BonMot.framework",
"${BUILT_PRODUCTS_DIR}/BulletinBoard/BulletinBoard.framework",
"${BUILT_PRODUCTS_DIR}/EAIntroView/EAIntroView.framework",
"${BUILT_PRODUCTS_DIR}/EARestrictedScrollView/EARestrictedScrollView.framework",
"${BUILT_PRODUCTS_DIR}/Eureka/Eureka.framework",
@ -1517,7 +1516,6 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/APIKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BonMot.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BulletinBoard.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/EAIntroView.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/EARestrictedScrollView.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Eureka.framework",
@ -1569,6 +1567,7 @@
files = (
29AD8A041F93D6CD008E10E7 /* Constants.swift in Sources */,
29FF12FE1F75EA3F00AFD326 /* Keystore.swift in Sources */,
2963B6B11F9891F5003063C1 /* UIButton.swift in Sources */,
296106C41F7640C50006164B /* TokenViewCellViewModel.swift in Sources */,
291EC9E21F70565A0004EDD0 /* ParsedTransaction.swift in Sources */,
29B9345D1F88459C009FCABB /* SplashViewController.swift in Sources */,
@ -1626,7 +1625,6 @@
291A1B671F98092F00ADEC80 /* ConfirmPaymentViewController.swift in Sources */,
291EC9DF1F7053C50004EDD0 /* NavigationController.swift in Sources */,
291795011F95F5E200539A30 /* GetBalance.swift in Sources */,
293248941F89F3C6008A9818 /* PageItem.swift in Sources */,
29C9F5F91F720BD30025C494 /* FloatLabelCell.swift in Sources */,
2912CD361F6A853300C6CBE3 /* TransactionsViewModel.swift in Sources */,
297800521F71FDCF003185C1 /* FormAppearance.swift in Sources */,

@ -104,6 +104,7 @@ class Button: UIButton {
setTitleColor(style.textColor, for: .normal)
setTitleColor(style.textColorHighlighted, for: .highlighted)
setBackgroundColor(style.backgroundColorHighlighted, forState: .highlighted)
setBackgroundColor(style.backgroundColorHighlighted, forState: .selected)
titleEdgeInsets = UIEdgeInsets(top: 5, left: 15, bottom: 5, right: 15)
}

@ -1,99 +0,0 @@
// Copyright SIX DAY LLC. All rights reserved.
import Foundation
import BulletinBoard
open class PageItem: BulletinItem {
public init(title: String) {
self.title = title
}
public let title: String
public var image: UIImage?
public var imageAccessibilityLabel: String?
public var descriptionText: String?
public var actionButtonTitle: String?
public var alternativeButtonTitle: String?
public weak var manager: BulletinManager?
public var isDismissable: Bool = true
public var nextItem: BulletinItem?
public let interfaceFactory = BulletinInterfaceFactory()
public var shouldCompactDescriptionText: Bool = false
fileprivate var actionButton: ContainerView<HighlightButton>?
fileprivate var alternativeButton: UIButton?
public var actionHandler: ((PageItem) -> Void)?
public var alternativeHandler: ((PageItem) -> Void)?
@objc open func actionButtonTapped(sender: UIButton) {
actionHandler?(self)
}
@objc open func alternativeButtonTapped(sender: UIButton) {
alternativeHandler?(self)
}
public func makeArrangedSubviews() -> [UIView] {
var arrangedSubviews = [UIView]()
let titleLabel = interfaceFactory.makeTitleLabel()
titleLabel.text = title
arrangedSubviews.append(titleLabel)
if let image = self.image {
let imageView = UIImageView()
imageView.image = image
imageView.contentMode = .scaleAspectFit
imageView.heightAnchor.constraint(lessThanOrEqualToConstant: 128).isActive = true
if let imageAccessibilityLabel = imageAccessibilityLabel {
imageView.isAccessibilityElement = true
imageView.accessibilityLabel = imageAccessibilityLabel
}
arrangedSubviews.append(imageView)
}
if let descriptionText = self.descriptionText {
let descriptionLabel = interfaceFactory.makeDescriptionLabel(isCompact: shouldCompactDescriptionText)
descriptionLabel.text = descriptionText
arrangedSubviews.append(descriptionLabel)
}
let buttonsStack = interfaceFactory.makeGroupStack()
if let actionButtonTitle = self.actionButtonTitle {
let actionButton = interfaceFactory.makeActionButton(title: actionButtonTitle)
buttonsStack.addArrangedSubview(actionButton)
actionButton.contentView.addTarget(self, action: #selector(actionButtonTapped(sender:)), for: .touchUpInside)
self.actionButton = actionButton
}
if let alternativeButtonTitle = self.alternativeButtonTitle {
let alternativeButton = interfaceFactory.makeAlternativeButton(title: alternativeButtonTitle)
buttonsStack.addArrangedSubview(alternativeButton)
alternativeButton.addTarget(self, action: #selector(alternativeButtonTapped(sender:)), for: .touchUpInside)
self.alternativeButton = alternativeButton
}
arrangedSubviews.append(buttonsStack)
return arrangedSubviews
}
public func tearDown() {
actionButton?.contentView.removeTarget(self, action: nil, for: .touchUpInside)
alternativeButton?.removeTarget(self, action: nil, for: .touchUpInside)
actionButton = nil
alternativeButton = nil
}
}
Loading…
Cancel
Save