From 3d37ec442fe5299d9855b4064b019ca63ccba26c Mon Sep 17 00:00:00 2001 From: DungPham Date: Tue, 17 May 2022 15:06:01 +0700 Subject: [PATCH] Add showShadow param for start sequence --- .../MaterialShowcase/MaterialShowcase.swift | 2 +- .../MaterialShowcaseSequence.swift | 100 +++++++++--------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/Sources/MaterialShowcase/MaterialShowcase.swift b/Sources/MaterialShowcase/MaterialShowcase.swift index ef44b52..7db0465 100644 --- a/Sources/MaterialShowcase/MaterialShowcase.swift +++ b/Sources/MaterialShowcase/MaterialShowcase.swift @@ -216,7 +216,7 @@ extension MaterialShowcase { } /// Shows it over current screen after completing setup process - @objc public func show(animated: Bool = true,hasShadow: Bool = true, hasSkipButton: Bool = false, completion handler: (()-> Void)?) { + @objc public func show(animated: Bool = true, hasShadow: Bool = true, hasSkipButton: Bool = false, completion handler: (()-> Void)?) { initViews() alpha = 0.0 containerView.addSubview(self) diff --git a/Sources/MaterialShowcase/MaterialShowcaseSequence.swift b/Sources/MaterialShowcase/MaterialShowcaseSequence.swift index c0cc146..61791fc 100644 --- a/Sources/MaterialShowcase/MaterialShowcaseSequence.swift +++ b/Sources/MaterialShowcase/MaterialShowcaseSequence.swift @@ -9,59 +9,59 @@ import Foundation public class MaterialShowcaseSequence { - - var showcaseArray : [MaterialShowcase] = [] - var currentCase : Int = 0 - var key : String? - - public init() { } - - public func temp(_ showcase: MaterialShowcase) -> MaterialShowcaseSequence { - showcaseArray.append(showcase) - return self - } - public func start() { - guard !getUserState(key: self.key) else { - return + var showShadow: Bool = false + var showcaseArray : [MaterialShowcase] = [] + var currentCase : Int = 0 + var key : String? + + public init() { } + + public func temp(_ showcase: MaterialShowcase) -> MaterialShowcaseSequence { + showcaseArray.append(showcase) + return self } - showcaseArray.first?.show(completion: increase) - } - func increase() -> Void { - self.currentCase += 1 - } - - /// Set user show retry - public func setKey(key : String? = nil) -> MaterialShowcaseSequence { - guard key != nil else { - return self + public func start() { + guard !getUserState(key: self.key) else { + return + } + showcaseArray.first?.show(hasShadow: showShadow, completion: increase) } - self.key = key - return self - } - - /// Remove user state - public func removeUserState(key : String = MaterialKey._default.rawValue) { - UserDefaults.standard.removeObject(forKey: key) - } - /// Remove user state - func getUserState(key : String?) -> Bool { - guard key != nil else { - return false + func increase() -> Void { + self.currentCase += 1 } - return UserDefaults.standard.bool(forKey: key!) - } - - public func showCaseWillDismis() { - guard self.showcaseArray.count > currentCase else { - //last index - guard self.key != nil else { - return - } - UserDefaults.standard.set(true, forKey: key!) - return + + /// Set user show retry + public func setKey(key : String? = nil) -> MaterialShowcaseSequence { + guard key != nil else { + return self + } + self.key = key + return self } - showcaseArray[currentCase].show(completion: self.increase) - } - + + /// Remove user state + public func removeUserState(key : String = MaterialKey._default.rawValue) { + UserDefaults.standard.removeObject(forKey: key) + } + /// Remove user state + func getUserState(key : String?) -> Bool { + guard key != nil else { + return false + } + return UserDefaults.standard.bool(forKey: key!) + } + + public func showCaseWillDismis() { + guard self.showcaseArray.count > currentCase else { + //last index + guard self.key != nil else { + return + } + UserDefaults.standard.set(true, forKey: key!) + return + } + showcaseArray[currentCase].show(hasShadow: showShadow, completion: self.increase) + } + }