Update remove()

Author: muukii

Cartfile.resolved

@@ -1,2 +1,2 @@
-github "nakiostudio/EasyPeasy" "1.4.1"
 github "devxoul/Then" "2.1.0"
+github "nakiostudio/EasyPeasy" "1.4.2"

RevealServer.framework/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>16B2555</string>
+	<string>16E195</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -17,31 +17,31 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7</string>
+	<string>8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>iPhoneOS</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9558</string>
+	<string>9667</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>14C89</string>
+	<string>14E269</string>
 	<key>DTPlatformName</key>
 	<string>iphoneos</string>
 	<key>DTPlatformVersion</key>
-	<string>10.2</string>
+	<string>10.3</string>
 	<key>DTSDKBuild</key>
-	<string>14C89</string>
+	<string>14E269</string>
 	<key>DTSDKName</key>
-	<string>iphoneos10.2</string>
+	<string>iphoneos10.3</string>
 	<key>DTXcode</key>
-	<string>0821</string>
+	<string>0830</string>
 	<key>DTXcodeBuild</key>
-	<string>8C1002</string>
+	<string>8E162</string>
 	<key>MinimumOSVersion</key>
 	<string>8.0</string>
 	<key>UIDeviceFamily</key>

RevealServer.framework/RevealServer

@@ -10,7 +10,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		mRYRWnn89cvA0oOFg/OtVl0TKqA=
+		LQTBZDrBuFWf//dKyd0gwtMMTv0=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>

RevealServer.framework/_CodeSignature/CodeResources

@@ -89,13 +89,20 @@ class ViewController: UIViewController {
   private var stackScrollView = StackScrollView()
 }
 
-class LabelStackViewCell: UIView {
+class LabelStackViewCell: UIView, StackScrollViewCellType {
+
+  let button = UIButton(type: .system)
+  let titleLabel = UILabel()
+  let detailLabel = UILabel()
 
   init() {
     super.init(frame: .zero)
 
+    button.setTitle("Remove", for: .normal)
+
     addSubview(titleLabel)
     addSubview(detailLabel)
+    addSubview(button)
 
     titleLabel <- [
       Left(8),
@@ -106,6 +113,13 @@ class LabelStackViewCell: UIView {
       Right(8),
       CenterY(),
     ]
+
+    button <- [
+      CenterX(),
+      CenterY(),
+    ]
+
+    button.addTarget(self, action: #selector(tap), for: .touchUpInside)
   }
 
   override var intrinsicContentSize : CGSize {
@@ -116,8 +130,10 @@ class LabelStackViewCell: UIView {
     fatalError("init(coder:) has not been implemented")
   }
 
-  let titleLabel = UILabel()
-  let detailLabel = UILabel()
+  @objc private func tap() {
+
+    remove()
+  }
 }
 
 class SwitchStackViewCell: UIView, StackScrollViewCellType {
@@ -157,10 +173,10 @@ class SwitchStackViewCell: UIView, StackScrollViewCellType {
     ]
 
     label <- [
-      Top().with(.mediumPriority),
+      Top().with(.medium),
       Right(),
       Left(),
-      Bottom().with(.mediumPriority),
+      Bottom().with(.medium),
       CenterY(),
     ]
 

StackScrollView-Demo/ViewController.swift

@@ -33,10 +33,10 @@ open class StackScrollView: UICollectionView, UICollectionViewDataSource, UIColl
   }
 
   open var views: [UIView] {
-    return source.map { $0.0 }
+    return source
   }
 
-  private var source: [(UIView, String)] = []
+  private var source: [UIView] = []
 
   public convenience init() {
     self.init(frame: .zero)
@@ -73,11 +73,7 @@ open class StackScrollView: UICollectionView, UICollectionViewDataSource, UIColl
 
   open func append(view: UIView) {
 
-    let key = UUID().uuidString
-    source.append((view, key))
-
-    register(Cell.self, forCellWithReuseIdentifier: key)
-
+    source.append(view)
     reloadData()
   }
 
@@ -91,9 +87,36 @@ open class StackScrollView: UICollectionView, UICollectionViewDataSource, UIColl
 
   open func remove(view: UIView, animated: Bool) {
 
-    if let index = source.map({ $0.0 }).index(of: view) {
+    if let index = source.index(of: view) {
       source.remove(at: index)
-      view.removeFromSuperview()
+      if animated {
+        UIView.animate(
+          withDuration: 0.5,
+          delay: 0,
+          usingSpringWithDamping: 1,
+          initialSpringVelocity: 0,
+          options: [
+            .beginFromCurrentState,
+            .allowUserInteraction,
+            .overrideInheritedCurve,
+            .overrideInheritedOptions,
+            .overrideInheritedDuration
+          ],
+          animations: {
+            self.performBatchUpdates({
+              self.deleteItems(at: [IndexPath.init(item: index, section: 0)])
+            }, completion: nil)
+        }) { (finish) in
+          
+        }
+
+      } else {
+        UIView.performWithoutAnimation {
+          performBatchUpdates({
+            self.deleteItems(at: [IndexPath.init(item: index, section: 0)])
+          }, completion: nil)
+        }
+      }
     }
   }
 
@@ -104,7 +127,7 @@ open class StackScrollView: UICollectionView, UICollectionViewDataSource, UIColl
   }
 
   open func scroll(to view: UIView, at position: UICollectionViewScrollPosition, animated: Bool) {
-    if let index = source.map({ $0.0 }).index(of: view) {
+    if let index = source.index(of: view) {
       scrollToItem(at: IndexPath(item: index, section: 0), at: position, animated: animated)
     }
   }
@@ -123,9 +146,9 @@ open class StackScrollView: UICollectionView, UICollectionViewDataSource, UIColl
 
   public func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
 
-    let cell = collectionView.dequeueReusableCell(withReuseIdentifier: source[indexPath.item].1, for: indexPath)
+    let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "Cell", for: indexPath)
 
-    let view = source[indexPath.item].0
+    let view = source[indexPath.item]
 
     if view.superview == cell.contentView {
       return cell
@@ -163,7 +186,7 @@ open class StackScrollView: UICollectionView, UICollectionViewDataSource, UIColl
 
   public func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
 
-    let view = source[indexPath.item].0
+    let view = source[indexPath.item]
 
     let width: NSLayoutConstraint = {
 

StackScrollView/StackScrollView.swift

@@ -51,4 +51,8 @@ extension StackScrollViewCellType where Self: UIView {
     invalidateIntrinsicContentSize()
     stackScrollView?.updateLayout(animated: animated)
   }
+
+  public func remove() {
+    stackScrollView?.remove(view: self, animated: true)
+  }
 }