Updated

Author: VladK9

Assets/UIFloatMenu-Banner.png

@@ -31,6 +31,7 @@
    - TextFieldCell
    - SwitchCell
    - SegmentCell
+   - CustomCell
    ```
 
    Action item color
@@ -89,12 +90,14 @@ let actions: [UIFloatMenuAction] = [
     .init(item: .ActionCell(icon: UIImage(systemName: "arrow.right.square.fill")!, title: "Title", subtitle: "Test subtitle", layout: .Icon_Title), itemColor: .filled(.systemPurple), action: { _ in
         print("Action")
     }),
-    .init(item: .HorizontalCell(items: h_actions, height: .standard))
+    .init(item: .HorizontalCell(items: h_actions, height: .standard)),
+    .init(item: .CustomCell(view: CustomViewRow(title: "Custom rows", subtitle: "View custom rows", icon: UIImage(systemName: "tablecells")!)), action: { _ in
+    })
 ]
 
 let menu = UIFloatMenu.setup(actions: actions)
 menu.header.title = "UIFloatMenu title"
-menu.header.subTitle = "UIFloatMenu subtitle"
+menu.header.subtitle = "UIFloatMenu subtitle"
 menu.header.showHeader = true
 menu.header.showLine = true
 menu.header.lineInset = 15
@@ -127,7 +130,11 @@ menu.delegate.textField = self
 ```
 
 ```swift
-func UIFloatMenuGetTextFieldData(_ data: [String]) {
-    print("TextField -", data)
+func UIFloatMenuGetTextFieldData(_ rows: [TextFieldRow]) {
+    let login = UIFloatMenuHelper.find(rows, by: "Login")
+    let password = UIFloatMenuHelper.find(rows, by: "Password")
+
+    print("Login -", login)
+    print("Password -", password)
 }
 ```

README.md

@@ -5,6 +5,18 @@
 
 import UIKit
 
+//MARK: - selectionConfig
+public enum selectionConfig {
+    case multi(isSelected: Bool = false, selectedIcon: UIImage?, selectedTitle: String, defaultIcon: UIImage?, defaultTitle: String)
+    case `default`(icon: UIImage? = nil, title: String)
+}
+
+//MARK: - transition_style
+public enum transition_style {
+    case `default`(animated: Bool = true)
+    case fade
+}
+
 //MARK: - h_heightStyle
 public enum h_heightStyle {
     case compact
@@ -53,18 +65,20 @@ public enum spacerType {
     case divider
 }
 
+
+
 //MARK: - itemSetup
 public enum itemSetup {
     /**
     UIFloatMenu: ActionCell
 
-    - Parameter icon: Optional
-    - Parameter title: Title
+    - Parameter selection: selectionConfig **(.multi - with 2 state, .default)**
     - Parameter subtitle: Optional
     - Parameter layout: Loyout of cell (**.Title_Icon**, **.Icon_Title**), Default: **.Title_Icon**.
     - Parameter height: Height of cell (**.standard**,  **.compact**), Default: **.standard**.
     */
-    case ActionCell(icon: UIImage? = nil, title: String, subtitle: String = "", layout: cellLayout = .Title_Icon, height: heightStyle = .standard)
+    case ActionCell(selection: selectionConfig, subtitle: String = "", itemColor: itemColor = .standard,
+                    layout: cellLayout = .Icon_Title, height: heightStyle = .standard)
 
     /**
     UIFloatMenu: Title
@@ -101,7 +115,7 @@ public enum itemSetup {
     - Parameter keyboard: UIKeyboardType
     */
     case TextFieldCell(title: String = "", placeholder: String, isResponder: Bool = false,
-                       isSecure: Bool = false, content: UITextContentType? = nil, keyboard: UIKeyboardType = .default)
+                       isSecure: Bool = false, content: UITextContentType? = nil, keyboard: UIKeyboardType = .default, identifier: String = "")
 
     /**
     UIFloatMenu: SwitchCell
@@ -110,7 +124,7 @@ public enum itemSetup {
     - Parameter title: Title
     - Parameter isOn: Is On at start
     - Parameter tintColor: Tint color
-    - Parameter action: Action for Switch
+    - Parameter action: Selector for Switch
     */
     case SwitchCell(icon: UIImage? = nil, title: String, isOn: Bool = false, tintColor: UIColor = .systemBlue, action: Selector)
 
@@ -120,16 +134,25 @@ public enum itemSetup {
     - Parameter title: Optional
     - Parameter items: Items **[UIImage, String]**
     - Parameter selected: Selected item
-    - Parameter action: Action for SegmentControl
+    - Parameter action: Selector for SegmentControl
     */
     case SegmentCell(title: String = "", items: [Any], selected: Int = 0, action: Selector)
 
     /**
     UIFloatMenu: HorizontalCell
 
-    - Parameter items: [UIFloatMenuAction]
+    - Parameter items: actions [UIFloatMenuAction]
+    - Parameter height: h_heightStyle
+    - Parameter layout: h_cellLayout
     */
     case HorizontalCell(items: [UIFloatMenuAction], height: h_heightStyle = .standard, layout: h_cellLayout = .center)
+    
+    /**
+    UIFloatMenu: CustomCell
+    
+    - Parameter view: custom UIView
+    */
+    case CustomCell(view: UIView)
 }
 
 public typealias UIFloatMenuActionHandler = (UIFloatMenuAction) -> Void
@@ -142,11 +165,6 @@ public class UIFloatMenuAction {
     */
     public var item: itemSetup
 
-    /**
-    UIFloatMenu: itemColor
-    */
-    public var itemColor: itemColor
-    
     /**
     UIFloatMenu: closeOnTap
     */
@@ -157,14 +175,16 @@ public class UIFloatMenuAction {
     */
     public var action: UIFloatMenuActionHandler?
 
+    /**
+    UIFloatMenu: isSelected
+    */
+    public var isSelected: Bool?
+    
     public init(item: itemSetup,
-                itemColor: itemColor = .standard,
                 closeOnTap: Bool = true,
                 action: UIFloatMenuActionHandler? = nil) {
         self.item = item
 
-        self.itemColor = itemColor
-        
         self.closeOnTap = closeOnTap
         self.action = action
     }

Sources/UIFloatMenu.swift

@@ -0,0 +1,96 @@
+//
+//  UIFloatMenuAnimation.swift
+//  UIFloatMenu
+//
+
+import UIKit
+import Foundation
+
+extension UIView {
+    
+    public var _matchedTransition_layerAnimations: [CAAnimation] {
+        (layer.animationKeys() ?? []).compactMap {
+            layer.animation(forKey: $0)
+        }
+    }
+
+    public var isAnimatingByPropertyAnimator: Bool {
+        (layer.animationKeys() ?? []).contains(where: {
+            $0.hasPrefix("UIPacingAnimationForAnimatorsKey")
+        })
+    }
+    
+    /**
+     Returns a relative frame in view.
+     */
+    public func _matchedTransition_relativeFrame(in view: UICoordinateSpace, ignoresTransform: Bool) -> CGRect {
+        if ignoresTransform {
+            CATransaction.begin()
+            CATransaction.setDisableActions(true)
+            
+            let currentTransform = transform
+            let currentAlpha = alpha
+            self.transform = .identity
+            self.alpha = 0
+            let rect = self.convert(bounds, to: view)
+            self.transform = currentTransform
+            self.alpha = currentAlpha
+            
+            CATransaction.commit()
+            return rect
+        } else {
+            let rect = self.convert(bounds, to: view)
+            return rect
+        }
+    }
+    
+    fileprivate func setFrameIgnoringTransforming(_ newFrame: CGRect) {
+        bounds.size = newFrame.size
+        center = newFrame.center
+    }
+
+}
+
+extension UIViewPropertyAnimator {
+    
+    public func addMovingAnimation(from fromView: UIView, to toView: UIView, sourceView: UIView, in containerView: UIView) {
+        let fromFrameInContainerView = fromView._matchedTransition_relativeFrame(in: containerView, ignoresTransform: true)
+        let toFrameInContainerView = toView._matchedTransition_relativeFrame(in: containerView, ignoresTransform: true)
+        
+        if toView === sourceView {
+            if toView.isAnimatingByPropertyAnimator == false {
+                toView.transform = Self.makeCGAffineTransform(from: toFrameInContainerView, to: fromFrameInContainerView)
+            }
+        }
+        
+        addAnimations {
+            if fromView === sourceView {
+                // sourceView(`fromView`) moves to `toView`.
+                fromView.transform = Self.makeCGAffineTransform(from: fromFrameInContainerView, to: toFrameInContainerView)
+            } else if toView === sourceView {
+                // sourceView(`toView`) moves back from `fromView`.
+                toView.transform = .identity
+            } else {
+                assertionFailure("sourceView must be either fromView or toView.")
+            }
+        }
+    }
+    
+    private static func makeCGAffineTransform(from: CGRect, to: CGRect) -> CGAffineTransform {
+        return .init(
+            a: to.width / from.width,
+            b: 0,
+            c: 0,
+            d: to.height / from.height,
+            tx: to.midX - from.midX,
+            ty: to.midY - from.midY
+        )
+    }
+
+}
+
+extension CGRect {
+    var center: CGPoint {
+        return .init(x: midX, y: midY)
+    }
+}

Sources/UIFloatMenuAction.swift

@@ -111,7 +111,6 @@ public struct UIFloatMenuHeaderConfig {
      Default: **true**.
     */
     public var showHeader: Bool
-    public var image: UIImage?
 
     /**
      UIFloatMenu: Title of header
@@ -121,7 +120,7 @@ public struct UIFloatMenuHeaderConfig {
     /**
      UIFloatMenu: Subtitle of header (optional)
     */
-    public var subTitle: String?
+    public var subtitle: String?
 
     /**
      UIFloatMenu: Show line under header
@@ -137,13 +136,12 @@ public struct UIFloatMenuHeaderConfig {
     */
     public var lineInset: CGFloat
 
-    public init(showHeader: Bool = true, image: UIImage? = nil, title: String = "", subTitle: String? = "",
+    public init(showHeader: Bool = true, title: String = "", subtitle: String? = "",
                 showLine: Bool = true, lineInset: CGFloat = 15) {
         self.showHeader = showHeader
-        self.image = image
 
         self.title = title
-        self.subTitle = subTitle
+        self.subtitle = subtitle
 
         self.showLine = showLine
         self.lineInset = lineInset
@@ -156,12 +154,14 @@ public struct UIFloatMenuQueue {
 
     public var uuid: Int!
     public var viewHeight: CGFloat!
+    public var header: UIFloatMenuHeaderConfig!
     public var config: UIFloatMenuConfig!
     public var actions: [UIFloatMenuAction]!
 
-    public init(uuid: Int, viewHeight: CGFloat = 0, config: UIFloatMenuConfig, actions: [UIFloatMenuAction]) {
+    public init(uuid: Int, viewHeight: CGFloat = 0, header: UIFloatMenuHeaderConfig, config: UIFloatMenuConfig, actions: [UIFloatMenuAction]) {
         self.uuid = uuid
         self.viewHeight = viewHeight
+        self.header = header
         self.config = config
         self.actions = actions
     }
@@ -174,13 +174,13 @@ class UIFloatMenuID {
     let shared = UIFloatMenuID()
 
     static let backViewID = 100010001
+    static let containerViewID = 11223300332211
 
     static func genUUID(_ count: Int) -> Int {
         if count == 0 {
             return backViewID
-        } else {
-            return backViewID+count
         }
+        return backViewID+count
     }
 
 }
@@ -189,7 +189,16 @@ class UIFloatMenuColors {
 
     let shared = UIFloatMenuColors()
 
-    static let mainColor = UIColor(named: "UIMenuMainColor")
+    //static let mainColor = UIColor(named: "UIMenuMainColor")
     static let revColor = UIColor(named: "UIMenuRevColor")
 
+    static func mainColor() -> UIColor {
+        let light = UIColor(red: 250/255, green: 250/255, blue: 249/255, alpha: 1)
+        let dark = UIColor(red: 39/255, green: 44/255, blue: 49/255, alpha: 1)
+        
+        return UIColor { (trait) -> UIColor in
+            return trait.userInterfaceStyle == .light ? light : dark
+        }
+    }
+    
 }