Skip to content

Commit

Permalink
Merge pull request #29 from faberNovel/feature/layout-edge
Browse files Browse the repository at this point in the history
Feature/layout edge
  • Loading branch information
alexandre-pod authored Nov 8, 2023
2 parents 4e0ea5d + c1be9a5 commit 1c95763
Show file tree
Hide file tree
Showing 6 changed files with 100 additions and 0 deletions.
8 changes: 8 additions & 0 deletions ADUtils.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/* Begin PBXBuildFile section */
0C8CFF10242B69BA0009FA88 /* AutoSizingCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C8CFF0F242B69BA0009FA88 /* AutoSizingCollectionView.swift */; };
0C8CFF12242B6A510009FA88 /* SimpleAutoSizingCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C8CFF11242B6A510009FA88 /* SimpleAutoSizingCollectionView.swift */; };
0F2654AB0B93FF9FEB86A1FE /* NSDirectionalRectEdgeTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11CA673B2E1192F220168486 /* NSDirectionalRectEdgeTest.swift */; };
2A6E273122B2834500B31F40 /* MKMapViewDequeuingTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A6E273022B2834500B31F40 /* MKMapViewDequeuingTest.swift */; };
42CDDA9C8179B9F9824C64F2 /* Pods_ADUtilsApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28EFE73855C87585926C10E6 /* Pods_ADUtilsApp.framework */; };
47E17214F9A4009CF12359D7 /* Pods_ADUtilsTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D06C6332AC4E8FBA4930E980 /* Pods_ADUtilsTests.framework */; };
Expand Down Expand Up @@ -67,6 +68,7 @@
ECB627001DE3395100951346 /* ChildInsertionTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECB626FF1DE3395100951346 /* ChildInsertionTest.swift */; };
ECB627021DE33C1100951346 /* ViewInsertionWithMarginTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECB627011DE33C1100951346 /* ViewInsertionWithMarginTest.swift */; };
ECB627061DE33F2200951346 /* AttributedStringTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECB627051DE33F2200951346 /* AttributedStringTest.swift */; };
F12A754809FE724A783EF192 /* UIRectEdgeTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6423630AD4B44DC50EA87D8A /* UIRectEdgeTest.swift */; };
F2F326C12448431300BB5700 /* NSDirectionalEdgeInsetsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2F326C02448431300BB5700 /* NSDirectionalEdgeInsetsTests.swift */; };
/* End PBXBuildFile section */

Expand All @@ -84,6 +86,7 @@
0C8CFF0F242B69BA0009FA88 /* AutoSizingCollectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingCollectionView.swift; sourceTree = "<group>"; };
0C8CFF11242B6A510009FA88 /* SimpleAutoSizingCollectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SimpleAutoSizingCollectionView.swift; sourceTree = "<group>"; };
0DA2083431F4C16E69ED219E /* Pods-ADUtilsApp.preproduction.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ADUtilsApp.preproduction.xcconfig"; path = "Pods/Target Support Files/Pods-ADUtilsApp/Pods-ADUtilsApp.preproduction.xcconfig"; sourceTree = "<group>"; };
11CA673B2E1192F220168486 /* NSDirectionalRectEdgeTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSDirectionalRectEdgeTest.swift; sourceTree = "<group>"; };
28EFE73855C87585926C10E6 /* Pods_ADUtilsApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ADUtilsApp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
2A6E273022B2834500B31F40 /* MKMapViewDequeuingTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MKMapViewDequeuingTest.swift; sourceTree = "<group>"; };
32D3D6308F00B6B8059A24E8 /* Pods-ADUtilsTests.production.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ADUtilsTests.production.xcconfig"; path = "Pods/Target Support Files/Pods-ADUtilsTests/Pods-ADUtilsTests.production.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -124,6 +127,7 @@
57F7ECC31BB0042D0095AEEC /* Localizable.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; path = Localizable.strings; sourceTree = "<group>"; };
57F7ECC51BB004500095AEEC /* InfoPlist.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; path = InfoPlist.strings; sourceTree = "<group>"; };
5DE795FD4906461A70860D2B /* Pods-ADUtilsApp.production.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ADUtilsApp.production.xcconfig"; path = "Pods/Target Support Files/Pods-ADUtilsApp/Pods-ADUtilsApp.production.xcconfig"; sourceTree = "<group>"; };
6423630AD4B44DC50EA87D8A /* UIRectEdgeTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIRectEdgeTest.swift; sourceTree = "<group>"; };
7A0EC64F1535D8ED00E5F54A /* ADUtilsApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ADUtilsApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
7A0EC6531535D8ED00E5F54A /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
7A0EC6551535D8ED00E5F54A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -248,6 +252,8 @@
495682D625DAD8EC00001624 /* UIImageColorTests.swift */,
495682EE25DBA8F800001624 /* UIButtonBackgroundColorTests.swift */,
494C99842601FA5A00A1E098 /* StackViewBuilderTests.swift */,
6423630AD4B44DC50EA87D8A /* UIRectEdgeTest.swift */,
11CA673B2E1192F220168486 /* NSDirectionalRectEdgeTest.swift */,
);
path = ADUtilsTests;
sourceTree = "<group>";
Expand Down Expand Up @@ -713,6 +719,8 @@
491BC3C323C47D29001A3B82 /* StackViewUtilsTests.swift in Sources */,
49CEC4A51EFA484900675EC4 /* NavigationControllerObserverTest.swift in Sources */,
921907DF21F7AE4400EF2B67 /* ADLayoutGuideTestsObjc.m in Sources */,
F12A754809FE724A783EF192 /* UIRectEdgeTest.swift in Sources */,
0F2654AB0B93FF9FEB86A1FE /* NSDirectionalRectEdgeTest.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
26 changes: 26 additions & 0 deletions ADUtilsTests/NSDirectionalRectEdgeTest.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//
// NSDirectionalRectEdgeTest.swift
// ADUtils
//
// Created by Gaétan Zanella on 18/11/21.
//
//

import Foundation
import Quick
import Nimble
import ADUtils

class NSDirectionalRectEdgeTest: QuickSpec {

override class func spec() {

it("should only contain vertical values") {
expect(NSDirectionalRectEdge.vertical).to(equal([.top, .bottom]))
}

it("should only contain horizontal values") {
expect(NSDirectionalRectEdge.horizontal).to(equal([.trailing, .leading]))
}
}
}
26 changes: 26 additions & 0 deletions ADUtilsTests/UIRectEdgeTest.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//
// UIRectEdgeTest.swift
// ADUtils
//
// Created by Gaétan Zanella on 18/11/21.
//
//

import Foundation
import Quick
import Nimble
import ADUtils

class UIRectEdgeTest: QuickSpec {

override class func spec() {

it("should only contain vertical values") {
expect(UIRectEdge.vertical).to(equal([.top, .bottom]))
}

it("should only contain horizontal values") {
expect(UIRectEdge.horizontal).to(equal([.left, .right]))
}
}
}
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ All notable changes to this project will be documented in this file.

### Added
- Add Swift Concurrency support
- Add `UIRectEdge.horizontal` and `UIRectEdge.vertical` utility static variables.
- Add `NSDirectionalRectEdge.horizontal` and `NSDirectionalRectEdge.vertical` utility static variables.

### Removed
- Drop support for iOS 11, 12 and 13
Expand Down
19 changes: 19 additions & 0 deletions Modules/ADUtils/NSDirectionalRectEdge+Utilities.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//
// NSDirectionalRectEdge+Utilities.swift
// ADUtils
//
// Created by Gaétan Zanella on 23/11/2021.
//

import UIKit

extension NSDirectionalRectEdge {

public static var horizontal: NSDirectionalRectEdge {
[.leading, .trailing]
}

public static var vertical: NSDirectionalRectEdge {
[.bottom, .top]
}
}
19 changes: 19 additions & 0 deletions Modules/ADUtils/UIRectEdge+Utilities.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//
// UIRectEdge+Utilities.swift
// ADUtils
//
// Created by Gaétan Zanella on 18/11/2021.
//

import UIKit

extension UIRectEdge {

public static var horizontal: UIRectEdge {
[.right, .left]
}

public static var vertical: UIRectEdge {
[.bottom, .top]
}
}

0 comments on commit 1c95763

Please sign in to comment.