remove some invalid code

iwecon · iwecon · commit 9cbed672ae6b · 2022-09-08T17:30:51.000+08:00
diff --git a/Sources/StackKit/HStackView.swift b/Sources/StackKit/HStackView.swift
@@ -80,7 +80,7 @@ open class HStackView: UIView {
     
     private func tryResizeStackView() {
         subviews.forEach { fitSize in
-            fitSize._fitSize(with: fitSize.stackKitFitType)
+            fitSize._fitSize(with: fitSize._stackKit_fitType)
         }
     }
     
diff --git a/Sources/StackKit/UIView+StackKit/UIView+FitSize.swift b/Sources/StackKit/UIView+StackKit/UIView+FitSize.swift
@@ -1,6 +1,6 @@
 import UIKit
 
-var _FitTypeKey = "_FitTypeKey"
+var _StackKit_FitTypeKey = "_StackKit_FitTypeKey"
 
 public enum FitType {
     case content
@@ -22,26 +22,26 @@ public enum FitType {
 }
 
 protocol FitSize {
-    var stackKitFitType: FitType { get set }
+    var _stackKit_fitType: FitType { get set }
     func _fitSize(with fitType: FitType)
 }
 
 extension UIView: FitSize {
     
-    var stackKitFitType: FitType {
+    var _stackKit_fitType: FitType {
         get {
-            guard let fitType = objc_getAssociatedObject(self, &_FitTypeKey) as? FitType else {
+            guard let fitType = objc_getAssociatedObject(self, &_StackKit_FitTypeKey) as? FitType else {
                 return .content
             }
             return fitType
         }
         set {
-            objc_setAssociatedObject(self, &_FitTypeKey, newValue, .OBJC_ASSOCIATION_COPY_NONATOMIC)
+            objc_setAssociatedObject(self, &_StackKit_FitTypeKey, newValue, .OBJC_ASSOCIATION_COPY_NONATOMIC)
         }
     }
     
     func fitSize(with fitType: FitType) -> Self {
-        self.stackKitFitType = fitType
+        self._stackKit_fitType = fitType
         return self
     }
     
@@ -118,10 +118,10 @@ extension UIView: FitSize {
     }
     
     private func _fixedSize(_ size: inout Size) {
-        if let w = _width {
+        if let w = _stackKit_width {
             size.width = w
         }
-        if let h = _height {
+        if let h = _stackKit_height {
             size.height = h
         }
     }
@@ -140,10 +140,10 @@ extension UIView {
     
     func resolveSize() -> Size {
         var size = Size()
-        if let _width = _width {
+        if let _width = _stackKit_width {
             size.width = _width
         }
-        if let _height = _height {
+        if let _height = _stackKit_height {
             size.height = _height
         }
         return size
@@ -153,12 +153,12 @@ extension UIView {
         var result = width
         
         // Handle minWidth
-        if let minWidth = _minWidth, minWidth > (result ?? 0) {
+        if let minWidth = _stackKit_minWidth, minWidth > (result ?? 0) {
             result = minWidth
         }
         
         // Handle maxWidth
-        if let maxWidth = _maxWidth, maxWidth < (result ?? CGFloat.greatestFiniteMagnitude) {
+        if let maxWidth = _stackKit_maxWidth, maxWidth < (result ?? CGFloat.greatestFiniteMagnitude) {
             result = maxWidth
         }
         return result
@@ -168,12 +168,12 @@ extension UIView {
         var result = height
         
         // Handle minWidth
-        if let minWidth = _minHeight, minWidth > (result ?? 0) {
+        if let minWidth = _stackKit_minHeight, minWidth > (result ?? 0) {
             result = minWidth
         }
         
         // Handle maxWidth
-        if let maxWidth = _maxHeight, maxWidth < (result ?? CGFloat.greatestFiniteMagnitude) {
+        if let maxWidth = _stackKit_maxHeight, maxWidth < (result ?? CGFloat.greatestFiniteMagnitude) {
             result = maxWidth
         }
         
diff --git a/Sources/StackKit/UIView+StackKit/UIView+StackKitCompatibleProvider.swift b/Sources/StackKit/UIView+StackKit/UIView+StackKitCompatibleProvider.swift
@@ -15,60 +15,60 @@ extension StackKitCompatible where Base: UIView {
     
     @discardableResult
     public func width(_ value: CGFloat?) -> Self {
-        view._width = value
+        view._stackKit_width = value
         return self
     }
     @discardableResult
     public func height(_ value: CGFloat?) -> Self {
-        view._height = value
+        view._stackKit_height = value
         return self
     }
     
     @discardableResult
     public func maxWidth(_ value: CGFloat?) -> Self {
-        view._maxWidth = value
+        view._stackKit_maxWidth = value
         return self
     }
     @discardableResult
     public func maxHeight(_ value: CGFloat?) -> Self {
-        view._maxHeight = value
+        view._stackKit_maxHeight = value
         return self
     }
     @discardableResult
     public func minWidth(_ value: CGFloat?) -> Self {
-        view._minWidth = value
+        view._stackKit_minWidth = value
         return self
     }
     @discardableResult
     public func minHeight(_ value: CGFloat?) -> Self {
-        view._minHeight = value
+        view._stackKit_minHeight = value
         return self
     }
     
     @discardableResult
     public func size(_ length: CGFloat) -> Self {
-        view._width = length
-        view._height = length
+        view._stackKit_width = length
+        view._stackKit_height = length
         return self
     }
     
     @discardableResult
     public func size(_ width: CGFloat, _ height: CGFloat) -> Self {
-        view._width = width
-        view._height = height
+        view._stackKit_width = width
+        view._stackKit_height = height
         return self
     }
     
     @discardableResult
     public func size(_ size: CGSize) -> Self {
-        view._width = size.width
-        view._height = size.height
+        view._stackKit_width = size.width
+        view._stackKit_height = size.height
         return self
     }
     
     @discardableResult
     public func sizeToFit(_ fitType: FitType = .content) -> Self {
-        view.stackKitFitType = fitType
+        view._stackKit_fitType = fitType
         return self
     }
     
diff --git a/Sources/StackKit/UIView+StackKit/_UIView_StackKitProvider.swift b/Sources/StackKit/UIView+StackKit/_UIView_StackKitProvider.swift
@@ -12,81 +12,64 @@ struct _UIView_StackKitKeys {
 }
 
 protocol _UIView_StackKitProvider {
-    var _width: CGFloat? { get set }
-    var _height: CGFloat? { get set }
+    var _stackKit_width: CGFloat? { get set }
+    var _stackKit_height: CGFloat? { get set }
     
-    var _minWidth: CGFloat? { get set }
-    var _maxWidth: CGFloat? { get set }
+    var _stackKit_minWidth: CGFloat? { get set }
+    var _stackKit_maxWidth: CGFloat? { get set }
     
-    var _minHeight: CGFloat? { get set }
-    var _maxHeight: CGFloat? { get set }
+    var _stackKit_minHeight: CGFloat? { get set }
+    var _stackKit_maxHeight: CGFloat? { get set }
 }
 
 extension UIView: _UIView_StackKitProvider {
-    var _width: CGFloat? {
+    
+    var _stackKit_width: CGFloat? {
         get {
-            guard let value = Runtime.getCGFloatProperty(self, key: &_UIView_StackKitKeys.widthKey) else {
-                return nil
-            }
-            return value
+            Runtime.getCGFloatProperty(self, key: &_UIView_StackKitKeys.widthKey)
         }
         set {
             Runtime.setCGFloatProperty(self, key: &_UIView_StackKitKeys.widthKey, newValue)
         }
     }
-    var _height: CGFloat? {
+    var _stackKit_height: CGFloat? {
         get {
-            guard let value = Runtime.getCGFloatProperty(self, key: &_UIView_StackKitKeys.heightKey) else {
-                return nil
-            }
-            return value
+            Runtime.getCGFloatProperty(self, key: &_UIView_StackKitKeys.heightKey)
         }
         set {
             Runtime.setCGFloatProperty(self, key: &_UIView_StackKitKeys.heightKey, newValue)
         }
     }
-    var _minWidth: CGFloat? {
+    var _stackKit_minWidth: CGFloat? {
         get {
-            guard let value = Runtime.getCGFloatProperty(self, key: &_UIView_StackKitKeys.minWidthKey) else {
-                return nil
-            }
-            return value
+            Runtime.getCGFloatProperty(self, key: &_UIView_StackKitKeys.minWidthKey)
         }
         set {
             Runtime.setCGFloatProperty(self, key: &_UIView_StackKitKeys.minWidthKey, newValue)
         }
     }
     
-    var _maxWidth: CGFloat? {
+    var _stackKit_maxWidth: CGFloat? {
         get {
-            guard let value = Runtime.getCGFloatProperty(self, key: &_UIView_StackKitKeys.maxWidthKey) else {
-                return nil
-            }
-            return value
+            Runtime.getCGFloatProperty(self, key: &_UIView_StackKitKeys.maxWidthKey)
         }
         set {
             Runtime.setCGFloatProperty(self, key: &_UIView_StackKitKeys.maxWidthKey, newValue)
         }
     }
     
-    var _minHeight: CGFloat? {
+    var _stackKit_minHeight: CGFloat? {
         get {
-            guard let value = Runtime.getCGFloatProperty(self, key: &_UIView_StackKitKeys.minHeightKey) else {
-                return nil
-            }
-            return value
+            Runtime.getCGFloatProperty(self, key: &_UIView_StackKitKeys.minHeightKey)
         }
         set {
             Runtime.setCGFloatProperty(self, key: &_UIView_StackKitKeys.minHeightKey, newValue)
         }
     }
     
-    var _maxHeight: CGFloat? {
+    var _stackKit_maxHeight: CGFloat? {
         get {
-            guard let value = Runtime.getCGFloatProperty(self, key: &_UIView_StackKitKeys.maxHeightKey) else {
-                return nil
-            }
-            return value
+            Runtime.getCGFloatProperty(self, key: &_UIView_StackKitKeys.maxHeightKey)
         }
         set {
             Runtime.setCGFloatProperty(self, key: &_UIView_StackKitKeys.maxHeightKey, newValue)
diff --git a/Sources/StackKit/VStackView.swift b/Sources/StackKit/VStackView.swift
@@ -80,7 +80,7 @@ open class VStackView: UIView {
     
     private func tryResizeStackView() {
         subviews.forEach { fitSize in
-            fitSize._fitSize(with: fitSize.stackKitFitType)
+            fitSize._fitSize(with: fitSize._stackKit_fitType)
         }
     }
     

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ open class HStackView: UIView {`
`80`	`80`
`81`	`81`	`private func tryResizeStackView() {`
`82`	`82`	`subviews.forEach { fitSize in`
`83`		`- fitSize._fitSize(with: fitSize.stackKitFitType)`
	`83`	`+ fitSize._fitSize(with: fitSize._stackKit_fitType)`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import UIKit`
`2`	`2`
`3`		`-var _FitTypeKey = "_FitTypeKey"`
	`3`	`+var _StackKit_FitTypeKey = "_StackKit_FitTypeKey"`
`4`	`4`
`5`	`5`	`public enum FitType {`
`6`	`6`	`case content`
`@@ -22,26 +22,26 @@ public enum FitType {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`protocol FitSize {`
`25`		`- var stackKitFitType: FitType { get set }`
	`25`	`+ var _stackKit_fitType: FitType { get set }`
`26`	`26`	`func _fitSize(with fitType: FitType)`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`extension UIView: FitSize {`
`30`	`30`
`31`		`- var stackKitFitType: FitType {`
	`31`	`+ var _stackKit_fitType: FitType {`
`32`	`32`	`get {`
`33`		`- guard let fitType = objc_getAssociatedObject(self, &_FitTypeKey) as? FitType else {`
	`33`	`+ guard let fitType = objc_getAssociatedObject(self, &_StackKit_FitTypeKey) as? FitType else {`
`34`	`34`	`return .content`
`35`	`35`	`}`
`36`	`36`	`return fitType`
`37`	`37`	`}`
`38`	`38`	`set {`
`39`		`- objc_setAssociatedObject(self, &_FitTypeKey, newValue, .OBJC_ASSOCIATION_COPY_NONATOMIC)`
	`39`	`+ objc_setAssociatedObject(self, &_StackKit_FitTypeKey, newValue, .OBJC_ASSOCIATION_COPY_NONATOMIC)`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`func fitSize(with fitType: FitType) -> Self {`
`44`		`- self.stackKitFitType = fitType`
	`44`	`+ self._stackKit_fitType = fitType`
`45`	`45`	`return self`
`46`	`46`	`}`
`47`	`47`
`@@ -118,10 +118,10 @@ extension UIView: FitSize {`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`private func _fixedSize(_ size: inout Size) {`
`121`		`- if let w = _width {`
	`121`	`+ if let w = _stackKit_width {`
`122`	`122`	`size.width = w`
`123`	`123`	`}`
`124`		`- if let h = _height {`
	`124`	`+ if let h = _stackKit_height {`
`125`	`125`	`size.height = h`
`126`	`126`	`}`
`127`	`127`	`}`
`@@ -140,10 +140,10 @@ extension UIView {`
`140`	`140`
`141`	`141`	`func resolveSize() -> Size {`
`142`	`142`	`var size = Size()`
`143`		`- if let _width = _width {`
	`143`	`+ if let _width = _stackKit_width {`
`144`	`144`	`size.width = _width`
`145`	`145`	`}`
`146`		`- if let _height = _height {`
	`146`	`+ if let _height = _stackKit_height {`
`147`	`147`	`size.height = _height`
`148`	`148`	`}`
`149`	`149`	`return size`
`@@ -153,12 +153,12 @@ extension UIView {`
`153`	`153`	`var result = width`
`154`	`154`
`155`	`155`	`// Handle minWidth`
`156`		`- if let minWidth = _minWidth, minWidth > (result ?? 0) {`
	`156`	`+ if let minWidth = _stackKit_minWidth, minWidth > (result ?? 0) {`
`157`	`157`	`result = minWidth`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`// Handle maxWidth`
`161`		`- if let maxWidth = _maxWidth, maxWidth < (result ?? CGFloat.greatestFiniteMagnitude) {`
	`161`	`+ if let maxWidth = _stackKit_maxWidth, maxWidth < (result ?? CGFloat.greatestFiniteMagnitude) {`
`162`	`162`	`result = maxWidth`
`163`	`163`	`}`
`164`	`164`	`return result`
`@@ -168,12 +168,12 @@ extension UIView {`
`168`	`168`	`var result = height`
`169`	`169`
`170`	`170`	`// Handle minWidth`
`171`		`- if let minWidth = _minHeight, minWidth > (result ?? 0) {`
	`171`	`+ if let minWidth = _stackKit_minHeight, minWidth > (result ?? 0) {`
`172`	`172`	`result = minWidth`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`// Handle maxWidth`
`176`		`- if let maxWidth = _maxHeight, maxWidth < (result ?? CGFloat.greatestFiniteMagnitude) {`
	`176`	`+ if let maxWidth = _stackKit_maxHeight, maxWidth < (result ?? CGFloat.greatestFiniteMagnitude) {`
`177`	`177`	`result = maxWidth`
`178`	`178`	`}`
`179`	`179`
Original file line number	Diff line number	Diff line change
`@@ -12,81 +12,64 @@ struct _UIView_StackKitKeys {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`protocol _UIView_StackKitProvider {`
`15`		`- var _width: CGFloat? { get set }`
`16`		`- var _height: CGFloat? { get set }`
	`15`	`+ var _stackKit_width: CGFloat? { get set }`
	`16`	`+ var _stackKit_height: CGFloat? { get set }`
`17`	`17`
`18`		`- var _minWidth: CGFloat? { get set }`
`19`		`- var _maxWidth: CGFloat? { get set }`
	`18`	`+ var _stackKit_minWidth: CGFloat? { get set }`
	`19`	`+ var _stackKit_maxWidth: CGFloat? { get set }`
`20`	`20`
`21`		`- var _minHeight: CGFloat? { get set }`
`22`		`- var _maxHeight: CGFloat? { get set }`
	`21`	`+ var _stackKit_minHeight: CGFloat? { get set }`
	`22`	`+ var _stackKit_maxHeight: CGFloat? { get set }`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`extension UIView: _UIView_StackKitProvider {`
`26`		`- var _width: CGFloat? {`
	`26`	`+`
	`27`	`+ var _stackKit_width: CGFloat? {`
`27`	`28`	`get {`
`28`		`- guard let value = Runtime.getCGFloatProperty(self, key: &_UIView_StackKitKeys.widthKey) else {`
`29`		`- return nil`
`30`		`- }`
`31`		`- return value`
	`29`	`+ Runtime.getCGFloatProperty(self, key: &_UIView_StackKitKeys.widthKey)`
`32`	`30`	`}`
`33`	`31`	`set {`
`34`	`32`	`Runtime.setCGFloatProperty(self, key: &_UIView_StackKitKeys.widthKey, newValue)`
`35`	`33`	`}`
`36`	`34`	`}`
`37`		`- var _height: CGFloat? {`
	`35`	`+ var _stackKit_height: CGFloat? {`
`38`	`36`	`get {`
`39`		`- guard let value = Runtime.getCGFloatProperty(self, key: &_UIView_StackKitKeys.heightKey) else {`
`40`		`- return nil`
`41`		`- }`
`42`		`- return value`
	`37`	`+ Runtime.getCGFloatProperty(self, key: &_UIView_StackKitKeys.heightKey)`
`43`	`38`	`}`
`44`	`39`	`set {`
`45`	`40`	`Runtime.setCGFloatProperty(self, key: &_UIView_StackKitKeys.heightKey, newValue)`
`46`	`41`	`}`
`47`	`42`	`}`
`48`		`- var _minWidth: CGFloat? {`
	`43`	`+ var _stackKit_minWidth: CGFloat? {`
`49`	`44`	`get {`
`50`		`- guard let value = Runtime.getCGFloatProperty(self, key: &_UIView_StackKitKeys.minWidthKey) else {`
`51`		`- return nil`
`52`		`- }`
`53`		`- return value`
	`45`	`+ Runtime.getCGFloatProperty(self, key: &_UIView_StackKitKeys.minWidthKey)`
`54`	`46`	`}`
`55`	`47`	`set {`
`56`	`48`	`Runtime.setCGFloatProperty(self, key: &_UIView_StackKitKeys.minWidthKey, newValue)`
`57`	`49`	`}`
`58`	`50`	`}`
`59`	`51`
`60`		`- var _maxWidth: CGFloat? {`
	`52`	`+ var _stackKit_maxWidth: CGFloat? {`
`61`	`53`	`get {`
`62`		`- guard let value = Runtime.getCGFloatProperty(self, key: &_UIView_StackKitKeys.maxWidthKey) else {`
`63`		`- return nil`
`64`		`- }`
`65`		`- return value`
	`54`	`+ Runtime.getCGFloatProperty(self, key: &_UIView_StackKitKeys.maxWidthKey)`
`66`	`55`	`}`
`67`	`56`	`set {`
`68`	`57`	`Runtime.setCGFloatProperty(self, key: &_UIView_StackKitKeys.maxWidthKey, newValue)`
`69`	`58`	`}`
`70`	`59`	`}`
`71`	`60`
`72`		`- var _minHeight: CGFloat? {`
	`61`	`+ var _stackKit_minHeight: CGFloat? {`
`73`	`62`	`get {`
`74`		`- guard let value = Runtime.getCGFloatProperty(self, key: &_UIView_StackKitKeys.minHeightKey) else {`
`75`		`- return nil`
`76`		`- }`
`77`		`- return value`
	`63`	`+ Runtime.getCGFloatProperty(self, key: &_UIView_StackKitKeys.minHeightKey)`
`78`	`64`	`}`
`79`	`65`	`set {`
`80`	`66`	`Runtime.setCGFloatProperty(self, key: &_UIView_StackKitKeys.minHeightKey, newValue)`
`81`	`67`	`}`
`82`	`68`	`}`
`83`	`69`
`84`		`- var _maxHeight: CGFloat? {`
	`70`	`+ var _stackKit_maxHeight: CGFloat? {`
`85`	`71`	`get {`
`86`		`- guard let value = Runtime.getCGFloatProperty(self, key: &_UIView_StackKitKeys.maxHeightKey) else {`
`87`		`- return nil`
`88`		`- }`
`89`		`- return value`
	`72`	`+ Runtime.getCGFloatProperty(self, key: &_UIView_StackKitKeys.maxHeightKey)`
`90`	`73`	`}`
`91`	`74`	`set {`
`92`	`75`	`Runtime.setCGFloatProperty(self, key: &_UIView_StackKitKeys.maxHeightKey, newValue)`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ open class VStackView: UIView {`
`80`	`80`
`81`	`81`	`private func tryResizeStackView() {`
`82`	`82`	`subviews.forEach { fitSize in`
`83`		`- fitSize._fitSize(with: fitSize.stackKitFitType)`
	`83`	`+ fitSize._fitSize(with: fitSize._stackKit_fitType)`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`