Test Add new type Fave

rustamburger-mrustaa · rustamburger-mrustaa · commit 0fbd931c7816 · 2022-04-11T05:12:44.000+03:00
diff --git a/Example/ButtonClickStyle/UI/Button/JustPink/JustPinkButtonView.swift b/Example/ButtonClickStyle/UI/Button/JustPink/JustPinkButtonView.swift
@@ -90,6 +90,9 @@ class JustPinkButtonView: BtnView {
 //       views = nil
       views = [subMainView]
      }
+     if type == ButtonClick._Style.fave.rawValue {
+       views = [mainDetailsView, gradientView]
+     }
      
      mainDetailsView.setNeedsLayout()
      mainShadowView.setNeedsLayout()
diff --git a/Example/ButtonClickStyle/UI/Screen/ButtonList/ButtonListViewController.storyboard b/Example/ButtonClickStyle/UI/Screen/ButtonList/ButtonListViewController.storyboard
diff --git a/Example/ButtonClickStyle/UI/Screen/ButtonList/ButtonListViewController.swift b/Example/ButtonClickStyle/UI/Screen/ButtonList/ButtonListViewController.swift
@@ -12,13 +12,21 @@ class ButtonListViewController: StoryboardController {
   @IBOutlet var buttonLayerExampleView: ButtonLayerExampleView?
   @IBOutlet var buttonTypePicker: UIPickerView!
   @IBOutlet var animationTypePicker: UIPickerView!
-  var colorSelected: UIColor?
   
   @IBOutlet var animationValueLabel: UILabel!
   @IBOutlet var animationValueSlider: UISlider!
   var animationTypeLast: Int = 0
   var buttonTypeLast: Int = 0
   
+  
+  
+  @IBOutlet var colorClearButton: UIButton!
+  var colorChanging: Bool = false
+  @IBOutlet var colorDesignableView: DesignableView!
+  var colorSelected: UIColor?
+  let colorPicker = UIColorPickerViewController()
+  
+  
   let buttonTypes = [
     "JustPink",
     "No shadow",
@@ -40,6 +48,25 @@ class ButtonListViewController: StoryboardController {
   ]
   
   
+  @IBAction func colorPickerAction(_ sender: Any) {
+    resetAllColorChangeFlags()
+    colorChanging = true
+    present(colorPicker, animated: true, completion: nil)
+  }
+  
+  @IBAction func buttonColorClear(_ sender: Any) {
+    colorSelected = nil
+    colorClearButton.isHidden = true
+    colorDesignableView.fillColor = .clear
+    colorDesignableView.setNeedsLayout()
+    updateButtons()
+  }
+  
+  
+  @IBAction func buttonReloadAction(_ sender: Any) {
+    updateButtons()
+  }
+  
   //MARK: - viewDidAppear
   
   @IBAction func exampleButtonsScreenButtonAction(_ sender: UIButton) {
@@ -78,6 +105,8 @@ class ButtonListViewController: StoryboardController {
   override func viewDidLoad() {
     super.viewDidLoad()
     
+    colorPicker.delegate = self
+    
     animationValueSlider.addTarget(self, action: #selector(onSliderValChanged(slider:event:)), for: .valueChanged)
     
     buttonTypePicker.delegate = self
@@ -348,3 +377,31 @@ extension ButtonListViewController: UIPickerViewDelegate {
     updateButtons()
   }
 }
+
+
+extension ButtonListViewController: UIColorPickerViewControllerDelegate {
+  
+  func colorPickerViewControllerDidSelectColor(_ viewController: UIColorPickerViewController) {
+    
+    if colorChanging
+    {
+      colorSelected = viewController.selectedColor
+    }
+    colorClearButton.isHidden = (colorSelected == nil) || (colorSelected == .clear)
+  }
+  
+  func colorPickerViewControllerDidFinish(_ viewController: UIColorPickerViewController)
+  {
+    updateButtons()
+    colorDesignableView.fillColor = colorSelected
+    colorDesignableView.setNeedsLayout()
+    resetAllColorChangeFlags()
+    
+  } // ends colorPickerViewControllerDidFinish
+  
+  func resetAllColorChangeFlags()
+  {
+    colorChanging = false
+    
+  } // ends resetAllColorChangeFlags
+}
diff --git a/Example/ButtonClickStyle/UI/Screen/ExampleClickStyleAnimations/ExampleAnimationsViewController.storyboard b/Example/ButtonClickStyle/UI/Screen/ExampleClickStyleAnimations/ExampleAnimationsViewController.storyboard
@@ -4,14 +4,15 @@
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!-- -->
         <scene sceneID="xg4-tC-VA3">
             <objects>
-                <viewController storyboardIdentifier="ExampleAnimationsViewController" title=" " useStoryboardIdentifierAsRestorationIdentifier="YES" id="t78-RV-KY0" customClass="ExampleAnimationsViewController" customModule="ButtonClickStyle" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="ExampleAnimationsViewController" title=" " useStoryboardIdentifierAsRestorationIdentifier="YES" id="t78-RV-KY0" customClass="ExampleAnimationsViewController" customModule="ButtonClickStyle_Example" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="9Ed-Au-iL3">
                         <rect key="frame" x="0.0" y="0.0" width="1366" height="1024"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -110,7 +111,7 @@
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gyc-WS-Y1V">
                                         <rect key="frame" x="20" y="188" width="210" height="31"/>
                                         <subviews>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7KF-CK-r9N" customClass="DesignableView" customModule="ButtonClickStyle" customModuleProvider="target">
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7KF-CK-r9N" customClass="DesignableView" customModule="ButtonClickStyle_Example" customModuleProvider="target">
                                                 <rect key="frame" x="161" y="0.5" width="51" height="30"/>
                                                 <subviews>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ESl-Gn-TeW">
@@ -254,6 +255,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="0Fv-fj-hvd"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstAttribute="bottom" secondItem="1t5-3Y-2I6" secondAttribute="bottom" constant="30" id="03u-ZG-9wi"/>
diff --git a/Source/ButtonClickStyle/Animations/UIView+AnimationPulsate.swift b/Source/ButtonClickStyle/Animations/UIView+AnimationPulsate.swift
@@ -7,6 +7,102 @@
 
 import UIKit
 
+
+
+extension UIView {
+  
+  public func buttonClickStyleFave(mainView: UIView, secondView: UIView, color: UIColor? = nil, value: CGFloat, duration: CGFloat) {
+    let maxSize = max(mainView.wwidth, mainView.hheight)
+    let _y = (mainView.hheight / 2) - (maxSize / 2)
+    let _x = (mainView.wwidth  / 2) - (maxSize / 2)
+    
+    mainView.transform = CGAffineTransform(scaleX: 0.01, y: 0.01)
+    
+    let clr = color ?? UIColor.black
+    
+    let circle = UIView(frame: .init(x: _x, y: _y, width: maxSize, height: maxSize))
+    circle.layer.cornerRadius = maxSize / 2
+    circle.backgroundColor = .clear // color ?? UIColor.black
+    circle.layer.borderWidth = maxSize / 2
+    circle.layer.borderColor = clr.cgColor
+    circle.alpha = 0.35
+
+    
+    
+    secondView .addSubview(circle)
+    
+    main(delay: 0.25) {
+      
+      let borderWidthAnimation: CABasicAnimation = CABasicAnimation(keyPath: "borderWidth")
+      borderWidthAnimation.fromValue = circle.layer.borderWidth
+      borderWidthAnimation.toValue = 0
+      borderWidthAnimation.duration = 0.15
+      circle.layer.add(borderWidthAnimation, forKey: "borderWidth")
+      circle.layer.borderWidth = 0
+      
+    }
+    
+//    let pulse = CASpringAnimation(keyPath: "transform.scale")
+//    pulse.duration = 0.45
+//    pulse.fromValue = 0.01
+//    pulse.toValue = 1.0
+//    pulse.autoreverses = true
+//    pulse.repeatCount = 2
+//    pulse.initialVelocity = 6.0
+//    pulse.damping = 0.4
+//    circle.layer.add(pulse, forKey: "pulse")
+    
+        circle.transform = CGAffineTransform(scaleX: 0.01, y: 0.01)
+    
+//    UIView.animate(withDuration: 0.12) {
+//      circle.transform = .identity
+//    }
+    
+    UIView.animate(withDuration: 0.45,
+                   delay: 0.0,
+                   usingSpringWithDamping: 0.8,
+                   initialSpringVelocity: 6,
+                   options: [.curveEaseOut],
+                   animations: {
+      circle.transform = .identity
+//      circle.alpha = 0.65
+    }, completion: nil)
+    
+  
+    
+    
+    
+    
+//    UIView.animate(withDuration: 0.15, // 0.4,
+//                   delay: 0,
+//                   usingSpringWithDamping: 0.8,
+//                   initialSpringVelocity: 6.0,
+//                   options: [.allowUserInteraction],
+//                   animations: {
+//      circle.transform = .identity
+//      circle.alpha = 0.65
+//    }, completion: { fin in
+//
+//    })
+    
+    UIView.animate(withDuration: 0.35, // 0.4,
+                   delay: 0.32,
+                   usingSpringWithDamping: 0.38,
+                   initialSpringVelocity: 10.0,
+                   options: [.allowUserInteraction],
+                   animations: {
+      mainView.transform = .identity
+      mainView.alpha = 1.0
+      circle.alpha =  0.0
+    }, completion: { fin in
+      
+      
+      circle.removeFromSuperview()
+    })
+  }
+}
+
+
 extension UIView {
   
   
diff --git a/Source/ButtonClickStyle/ButtonClickStyleAddViewsAnimation.swift b/Source/ButtonClickStyle/ButtonClickStyleAddViewsAnimation.swift
@@ -185,11 +185,19 @@ extension UIButton {
     }
     
     switch style {
+    case .fave(let power, let color):
+      if event == .touchDown {
+        if views.count > 1 {
+          self.buttonClickStyleFave(mainView: views[1], secondView: views[0], color: color, value: power, duration: dur)
+        }
+      }
+      
     case .press(let power):
       
       if views.count > 0 {
         views[0].buttonClickStylePress(duration: dur, cornRadius: radius, value: power, shadow: false, visible: event != .touchDown)
       }
+      
 //      if views.count > 1 {
 //        views[1].press(duration: dur, cornRadius: radius, value: 0.5, shadow: true, visible: event != .touchDown)
 //      }
diff --git a/Source/ButtonClickStyle/Style/ButtonClickStyle.swift b/Source/ButtonClickStyle/Style/ButtonClickStyle.swift
@@ -23,6 +23,7 @@ extension ButtonClick {
     case pulsate(         _ power: CGFloat = vDef, new:  Bool = false)          // MOVE Pulsate
     case shake(           _ power: CGFloat = vDef, new:  Bool = false)          // MOVE Shake
     case androidClickable(_ alpha: CGFloat = vDef, color: UIColor? = nil)       // ADD  Android Clickable
+    case fave(            _ power: CGFloat = vDef, color: UIColor? = nil)   // Fave
     
     //MARK: All Cases, Indxs & Names
     
@@ -43,6 +44,7 @@ extension ButtonClick {
       .shake(new: true),
       .androidClickable(),
       .androidClickable(color: .random()),
+      .fave(vDef, color: .random())
     ]
     
     public func typeEasy() -> _Style {
@@ -74,6 +76,7 @@ extension ButtonClick {
                                                         : "Shake"
       case .androidClickable(_, let color): return color == nil ? "AndroidClickable"
                                                         : "AndroidClickable Color"
+      case .fave(_,_):                        return "Fave"
       }
     }
     
@@ -89,7 +92,8 @@ extension ButtonClick {
       case .pulsate(_,_),
           .press(_),
           .shake(_,_): return .move
-      case .androidClickable(_,_): return .android
+      case .androidClickable(_,_): return .tapGesture
+      case .fave(_,_): return .tapGesture
       }
     }
     
@@ -116,6 +120,7 @@ extension ButtonClick {
                                                        : 10
       case .androidClickable(_, let color):   return color == nil ? 11
                                                        : 12
+      case .fave(_, _):                   return         13
       }
     }
     
@@ -132,6 +137,7 @@ extension ButtonClick {
       case .color(_, _):             return 0.3              // .ms300
       case .colorFlat(_, _):         return 0.3              // .ms300
       case .androidClickable(_, _):  return 1.0              // .s1
+      case .fave(_, _):              return 0.4
       }
     }
     
@@ -164,6 +170,7 @@ extension ButtonClick {
         case 10:  return .shake(a ?? 0.15, new: true)
         case 11: return .androidClickable(v, color: nil)
         case 12: return .androidClickable(v, color: color ?? UIColor.random())
+        case 13: return .fave(v, color: color ?? UIColor.random())
         default: return .alpha(v)
         }
       }()
diff --git a/Source/ButtonClickStyle/Style/ButtonClickStyleBase.swift b/Source/ButtonClickStyle/Style/ButtonClickStyleBase.swift
@@ -14,7 +14,7 @@ extension ButtonClick {
     case move = "Move"
     case add = "Add"
     case addHide = "Add & Hide"
-    case android = "TapGesture.Pulse"
+    case tapGesture = "TapGesture.Pulse"
     case none = "❌"
   }
 }
diff --git a/Source/ButtonClickStyle/Style/ButtonClickStyleEmoji.swift b/Source/ButtonClickStyle/Style/ButtonClickStyleEmoji.swift
@@ -20,6 +20,8 @@ extension ButtonClick.Style {
     case .pulsate(_, let new):              return new ? "🆕"  :  ""
     case .shake(_, let new):                return new ? "🆕"  :  ""
     case .androidClickable(_, let color):   return color == nil ? ""  : ""
+    case .fave(_, _): return "🆕"
+       
     }
   }
   
@@ -34,6 +36,7 @@ extension ButtonClick.Style {
     case .pulsate(_, _):            return "💢"
     case .shake(_, _):              return "🔛"
     case .androidClickable(_, _):   return "🧿"
+    case .fave(_, _): return "✨"
     }
   }
   
@@ -48,6 +51,7 @@ extension ButtonClick.Style {
     case .pulsate(_, _):                 return "♻️"
     case .shake(_, _):                   return "♻️"
     case .androidClickable(_, _):        return ""
+    case .fave(_, _): return ""
     }
   }
   
@@ -63,6 +67,7 @@ extension ButtonClick.Style {
     case .pulsate(_, let new):           return new   ? ""  : ""
     case .shake(_, let new):             return new   ? ""  : ""
     case .androidClickable(_, let color):   return color == nil ? "⚫️"  : "🔵"
+    case .fave(_, _): return "🔵"
     }
   }
   
diff --git a/Source/ButtonClickStyle/Style/ButtonClickStyleShort.swift b/Source/ButtonClickStyle/Style/ButtonClickStyleShort.swift
@@ -25,5 +25,6 @@ extension ButtonClick {
     case shakeNew
     case androidClickable
     case androidClickableDark
+    case fave
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,9 @@ class JustPinkButtonView: BtnView {`
`90`	`90`	`// views = nil`
`91`	`91`	`views = [subMainView]`
`92`	`92`	`}`
	`93`	`+ if type == ButtonClick._Style.fave.rawValue {`
	`94`	`+ views = [mainDetailsView, gradientView]`
	`95`	`+ }`
`93`	`96`
`94`	`97`	`mainDetailsView.setNeedsLayout()`
`95`	`98`	`mainShadowView.setNeedsLayout()`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ extension ButtonClick {`
`23`	`23`	`case pulsate( _ power: CGFloat = vDef, new: Bool = false) // MOVE Pulsate`
`24`	`24`	`case shake( _ power: CGFloat = vDef, new: Bool = false) // MOVE Shake`
`25`	`25`	`case androidClickable(_ alpha: CGFloat = vDef, color: UIColor? = nil) // ADD Android Clickable`
	`26`	`+ case fave( _ power: CGFloat = vDef, color: UIColor? = nil) // Fave`
`26`	`27`
`27`	`28`	`//MARK: All Cases, Indxs & Names`
`28`	`29`
`@@ -43,6 +44,7 @@ extension ButtonClick {`
`43`	`44`	`.shake(new: true),`
`44`	`45`	`.androidClickable(),`
`45`	`46`	`.androidClickable(color: .random()),`
	`47`	`+ .fave(vDef, color: .random())`
`46`	`48`	`]`
`47`	`49`
`48`	`50`	`public func typeEasy() -> _Style {`
`@@ -74,6 +76,7 @@ extension ButtonClick {`
`74`	`76`	`: "Shake"`
`75`	`77`	`case .androidClickable(_, let color): return color == nil ? "AndroidClickable"`
`76`	`78`	`: "AndroidClickable Color"`
	`79`	`+ case .fave(_,_): return "Fave"`
`77`	`80`	`}`
`78`	`81`	`}`
`79`	`82`
`@@ -89,7 +92,8 @@ extension ButtonClick {`
`89`	`92`	`case .pulsate(_,_),`
`90`	`93`	`.press(_),`
`91`	`94`	`.shake(_,_): return .move`
`92`		`- case .androidClickable(_,_): return .android`
	`95`	`+ case .androidClickable(_,_): return .tapGesture`
	`96`	`+ case .fave(_,_): return .tapGesture`
`93`	`97`	`}`
`94`	`98`	`}`
`95`	`99`
`@@ -116,6 +120,7 @@ extension ButtonClick {`
`116`	`120`	`: 10`
`117`	`121`	`case .androidClickable(_, let color): return color == nil ? 11`
`118`	`122`	`: 12`
	`123`	`+ case .fave(_, _): return 13`
`119`	`124`	`}`
`120`	`125`	`}`
`121`	`126`
`@@ -132,6 +137,7 @@ extension ButtonClick {`
`132`	`137`	`case .color(_, _): return 0.3 // .ms300`
`133`	`138`	`case .colorFlat(_, _): return 0.3 // .ms300`
`134`	`139`	`case .androidClickable(_, _): return 1.0 // .s1`
	`140`	`+ case .fave(_, _): return 0.4`
`135`	`141`	`}`
`136`	`142`	`}`
`137`	`143`
`@@ -164,6 +170,7 @@ extension ButtonClick {`
`164`	`170`	`case 10: return .shake(a ?? 0.15, new: true)`
`165`	`171`	`case 11: return .androidClickable(v, color: nil)`
`166`	`172`	`case 12: return .androidClickable(v, color: color ?? UIColor.random())`
	`173`	`+ case 13: return .fave(v, color: color ?? UIColor.random())`
`167`	`174`	`default: return .alpha(v)`
`168`	`175`	`}`
`169`	`176`	`}()`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ extension ButtonClick {`
`14`	`14`	`case move = "Move"`
`15`	`15`	`case add = "Add"`
`16`	`16`	`case addHide = "Add & Hide"`
`17`		`- case android = "TapGesture.Pulse"`
	`17`	`+ case tapGesture = "TapGesture.Pulse"`
`18`	`18`	`case none = "❌"`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ extension ButtonClick.Style {`
`20`	`20`	`case .pulsate(_, let new): return new ? "🆕" : ""`
`21`	`21`	`case .shake(_, let new): return new ? "🆕" : ""`
`22`	`22`	`case .androidClickable(_, let color): return color == nil ? "" : ""`
	`23`	`+ case .fave(_, _): return "🆕"`
	`24`	`+`
`23`	`25`	`}`
`24`	`26`	`}`
`25`	`27`
`@@ -34,6 +36,7 @@ extension ButtonClick.Style {`
`34`	`36`	`case .pulsate(_, _): return "💢"`
`35`	`37`	`case .shake(_, _): return "🔛"`
`36`	`38`	`case .androidClickable(_, _): return "🧿"`
	`39`	`+ case .fave(_, _): return "✨"`
`37`	`40`	`}`
`38`	`41`	`}`
`39`	`42`
`@@ -48,6 +51,7 @@ extension ButtonClick.Style {`
`48`	`51`	`case .pulsate(_, _): return "♻️"`
`49`	`52`	`case .shake(_, _): return "♻️"`
`50`	`53`	`case .androidClickable(_, _): return ""`
	`54`	`+ case .fave(_, _): return ""`
`51`	`55`	`}`
`52`	`56`	`}`
`53`	`57`
`@@ -63,6 +67,7 @@ extension ButtonClick.Style {`
`63`	`67`	`case .pulsate(_, let new): return new ? "" : ""`
`64`	`68`	`case .shake(_, let new): return new ? "" : ""`
`65`	`69`	`case .androidClickable(_, let color): return color == nil ? "⚫️" : "🔵"`
	`70`	`+ case .fave(_, _): return "🔵"`
`66`	`71`	`}`
`67`	`72`	`}`
`68`	`73`
Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,6 @@ extension ButtonClick {`
`25`	`25`	`case shakeNew`
`26`	`26`	`case androidClickable`
`27`	`27`	`case androidClickableDark`
	`28`	`+ case fave`
`28`	`29`	`}`
`29`	`30`	`}`