From 55d468d938a36faf3946455536b6e6ccc052dff4 Mon Sep 17 00:00:00 2001 From: heoblitz Date: Sat, 28 Jun 2025 15:16:23 +0900 Subject: [PATCH 01/13] Update CI --- .github/workflows/github-actions-ci.yml | 178 ++++++++++++++++++------ 1 file changed, 135 insertions(+), 43 deletions(-) diff --git a/.github/workflows/github-actions-ci.yml b/.github/workflows/github-actions-ci.yml index 1db39a7..f39e686 100644 --- a/.github/workflows/github-actions-ci.yml +++ b/.github/workflows/github-actions-ci.yml @@ -1,68 +1,160 @@ name: Run CI on: [push, pull_request] +env: + XCODE_VERSION: "16.4.0" + IOS_SIMULATOR_DEVICE: "iPhone 16" + IOS_SIMULATOR_OS: "18.4" + TVOS_SIMULATOR_DEVICE: "Apple TV 4K (3rd generation)" + TVOS_SIMULATOR_OS: "18.4" + jobs: CI: - runs-on: macos-latest - + runs-on: macos-15 + # ℹī¸ Available GitHub Actions Runner Images # https://github.com/actions/runner-images steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - - run: bundle install - - run: pod install --repo-update + - name: Setup CocoaPods + run: pod install --repo-update - - name: Set Xcode Version 14.2.0 (iOS 16.2) - run: sudo xcode-select -s /Applications/Xcode_14.2.0.app + - name: Set Xcode Version + run: sudo xcode-select -s /Applications/Xcode_${{ env.XCODE_VERSION }}.app - name: Build PinLayout-iOS - run: set -o pipefail && xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-iOS -sdk iphonesimulator16.2 -destination 'platform=iOS Simulator,name=iPhone SE (3rd generation),OS=16.2' | xcpretty + run: | + set -o pipefail && xcodebuild build \ + -project PinLayout.xcodeproj \ + -scheme PinLayout-iOS \ + -sdk iphonesimulator \ + -destination "platform=iOS Simulator,name=${{ env.IOS_SIMULATOR_DEVICE }},OS=${{ env.IOS_SIMULATOR_OS }}" \ + | xcpretty - name: Build PinLayout-tvOS - run: set -o pipefail && xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-tvOS -sdk appletvsimulator16.1 -destination 'platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=16.1' | xcpretty + run: | + set -o pipefail && xcodebuild build \ + -project PinLayout.xcodeproj \ + -scheme PinLayout-tvOS \ + -sdk appletvsimulator \ + -destination "platform=tvOS Simulator,name=${{ env.TVOS_SIMULATOR_DEVICE }},OS=${{ env.TVOS_SIMULATOR_OS }}" \ + | xcpretty - name: Build PinLayout-macOS - run: set -o pipefail && xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-macOS -sdk macosx13.1 | xcpretty - - - name: Build PinLayoutSample - iOS 16.2 - run: set -o pipefail && xcodebuild build -workspace PinLayout.xcworkspace -scheme PinLayoutSample -sdk iphonesimulator16.2 -destination 'platform=iOS Simulator,name=iPhone SE (3rd generation),OS=16.2' | xcpretty - - - name: iOS unit tests - run: set -o pipefail && xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS -sdk iphonesimulator16.2 -destination 'platform=iOS Simulator,name=iPhone SE (3rd generation),OS=16.2' | xcpretty - - # # - name: tvOS unit tests - # # run: set -o pipefail && xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-tvOS -sdk appletvos16.1 -destination 'platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=16.2' | xcpretty - - # # - name: macOS unit tests - # # run: set -o pipefail && xcodebuild test -workspace PinLayout.xcworkspace -scheme PinLayout-macOS -sdk macosx12.1 -destination 'platform=macOS,name=Any Mac' | xcpretty - - - name: Cocoapods - iOS Empty project - run: set -o pipefail && cd TestProjects/cocoapods/ios && arch -x86_64 pod install && xcodebuild build -workspace PinLayout-iOS.xcworkspace -scheme PinLayout-iOS -sdk iphonesimulator16.2 -destination 'platform=iOS Simulator,name=iPhone SE (3rd generation),OS=16.2' | xcpretty && cd ../../.. - - # - name: Cocoapods - macOS Empty project - # run: set -o pipefail && cd TestProjects/cocoapods/macos && arch -x86_64 pod install && xcodebuild build -workspace PinLayout-macOS.xcworkspace -scheme PinLayout-macOS -sdk macosx12.1 | xcpretty && cd ../../.. - - # - name: Cocoapods - tvOS Empty project - # run: set -o pipefail && cd TestProjects/cocoapods/tvos && arch -x86_64 pod install && xcodebuild build -workspace PinLayout-tvOS.xcworkspace -scheme PinLayout-tvOS -sdk appletvsimulator16.1 -destination 'platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=16.1' | xcpretty && cd ../../.. - - # - name: Carthage - iOS Empty project - # run: set -o pipefail && cd TestProjects/carthage/ios && rm Cartfile && echo "git \"file:///$BASEDIR\"" > Cartfile && carthage update --use-ssh --platform iOS --use-xcframeworks && xcodebuild build -project PinLayout-Carthage-iOS.xcodeproj -scheme PinLayout-Carthage-iOS -sdk iphonesimulator16.2 -destination 'platform=iOS Simulator,name=iPhone SE (3rd generation),OS=16.2' | xcpretty && rm Cartfile.resolved && cd ../../.. + run: | + set -o pipefail && xcodebuild build \ + -project PinLayout.xcodeproj \ + -scheme PinLayout-macOS \ + -sdk macosx \ + | xcpretty + + - name: Build PinLayoutSample + run: | + set -o pipefail && xcodebuild build \ + -workspace PinLayout.xcworkspace \ + -scheme PinLayoutSample \ + -sdk iphonesimulator \ + -destination "platform=iOS Simulator,name=${{ env.IOS_SIMULATOR_DEVICE }},OS=${{ env.IOS_SIMULATOR_OS }}" \ + | xcpretty + + - name: iOS Unit Tests + run: | + set -o pipefail && xcodebuild build test \ + -workspace PinLayout.xcworkspace \ + -scheme PinLayout-iOS \ + -sdk iphonesimulator \ + -destination "platform=iOS Simulator,name=${{ env.IOS_SIMULATOR_DEVICE }},OS=${{ env.IOS_SIMULATOR_OS }}" \ + | xcpretty + + # - name: tvOS Unit Tests + # run: | + # set -o pipefail && xcodebuild build test \ + # -workspace PinLayout.xcworkspace \ + # -scheme PinLayout-tvOS \ + # -sdk appletvsimulator \ + # -destination "platform=tvOS Simulator,name=${{ env.TVOS_SIMULATOR_DEVICE }},OS=${{ env.TVOS_SIMULATOR_OS }}" \ + # | xcpretty + + # - name: macOS Unit Tests + # run: | + # set -o pipefail && xcodebuild test \ + # -workspace PinLayout.xcworkspace \ + # -scheme PinLayout-macOS \ + # -sdk macosx \ + # -destination "platform=macOS,name=Any Mac" \ + # | xcpretty + + - name: Test CocoaPods Integration + run: | + echo "Testing CocoaPods integration..." + cd TestProjects/cocoapods/ios + arch -x86_64 pod install + set -o pipefail && xcodebuild build \ + -workspace PinLayout-iOS.xcworkspace \ + -scheme PinLayout-iOS \ + -sdk iphonesimulator \ + -destination "platform=iOS Simulator,name=${{ env.IOS_SIMULATOR_DEVICE }},OS=${{ env.IOS_SIMULATOR_OS }}" \ + | xcpretty + cd ../../.. + + # - name: Test CocoaPods macOS Integration + # run: | + # cd TestProjects/cocoapods/macos + # arch -x86_64 pod install + # set -o pipefail && xcodebuild build \ + # -workspace PinLayout-macOS.xcworkspace \ + # -scheme PinLayout-macOS \ + # -sdk macosx \ + # | xcpretty + # cd ../../.. + + # - name: Test CocoaPods tvOS Integration + # run: | + # cd TestProjects/cocoapods/tvos + # arch -x86_64 pod install + # set -o pipefail && xcodebuild build \ + # -workspace PinLayout-tvOS.xcworkspace \ + # -scheme PinLayout-tvOS \ + # -sdk appletvsimulator \ + # -destination "platform=tvOS Simulator,name=${{ env.TVOS_SIMULATOR_DEVICE }},OS=${{ env.TVOS_SIMULATOR_OS }}" \ + # | xcpretty + # cd ../../.. + + # - name: Test Carthage Integration + # run: | + # cd TestProjects/carthage/ios + # rm Cartfile + # echo "git \"file:///$GITHUB_WORKSPACE\"" > Cartfile + # carthage update --use-ssh --platform iOS --use-xcframeworks + # set -o pipefail && xcodebuild build \ + # -project PinLayout-Carthage-iOS.xcodeproj \ + # -scheme PinLayout-Carthage-iOS \ + # -sdk iphonesimulator \ + # -destination "platform=iOS Simulator,name=${{ env.IOS_SIMULATOR_DEVICE }},OS=${{ env.IOS_SIMULATOR_OS }}" \ + # | xcpretty + # rm Cartfile.resolved + # cd ../../.. - name: Swift Package Manager - iOS Empty project - run: set -o pipefail && cd TestProjects/swift-package-manager/ios && rm -rf .build && xcodebuild build -project PinLayout-SPM-iOS.xcodeproj -scheme PinLayout-SPM-iOS -sdk iphonesimulator16.2 -destination 'platform=iOS Simulator,name=iPhone SE (3rd generation),OS=16.2' | xcpretty && cd ../../.. - - - name: Set XCode Version 13.4.1 (iOS 15.5) - run: sudo xcode-select -s /Applications/Xcode_13.4.1.app - - name: Build PinLayoutSample - iOS 15.5 - run: set -o pipefail && xcodebuild clean build -workspace PinLayout.xcworkspace -scheme PinLayoutSample -sdk iphonesimulator15.5 -destination 'platform=iOS Simulator,name=iPhone 8,OS=15.5' | xcpretty - - - name: Pod lib lint + run: | + cd TestProjects/swift-package-manager/ios + rm -rf .build + set -o pipefail && xcodebuild build \ + -project PinLayout-SPM-iOS.xcodeproj \ + -scheme PinLayout-SPM-iOS \ + -sdk iphonesimulator \ + -destination "platform=iOS Simulator,name=${{ env.IOS_SIMULATOR_DEVICE }},OS=${{ env.IOS_SIMULATOR_OS }}" \ + | xcpretty + cd ../../.. + + - name: Pod Lib Lint run: set -o pipefail && bundle exec pod lib lint --allow-warnings - name: Codecov run: bash <(curl -s https://codecov.io/bash) -D /tmp/PinLayout - - run: echo "🍏 This job's status is ${{ job.status }}." + - name: Job Status + run: echo "🍏 This job's status is ${{ job.status }}." \ No newline at end of file From 5de301faefc13ad99f95afd2d9c2c20fbae24a35 Mon Sep 17 00:00:00 2001 From: heoblitz Date: Sat, 28 Jun 2025 17:19:55 +0900 Subject: [PATCH 02/13] Fix testOpaqueNavigationBar test case --- Tests/iOS/PinSafeAreaTests.swift | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Tests/iOS/PinSafeAreaTests.swift b/Tests/iOS/PinSafeAreaTests.swift index 8f11316..b0b60e4 100644 --- a/Tests/iOS/PinSafeAreaTests.swift +++ b/Tests/iOS/PinSafeAreaTests.swift @@ -55,6 +55,12 @@ class PinSafeAreaSpec: QuickSpec { describe("using opaque NavigationBar") { it("testOpaqueNavigationBar") { let mainView = viewController.mainView + mainView.layoutOffsetViewClosure = { _, _ in } + navigationController.navigationBar.isTranslucent = true + + setupWindow(with: navigationController) + let safeAreaInsetsWhenTranslucent = mainView.safeAreaInsets + let screenSizeWhenTranslucent = mainView.frame.size mainView.layoutOffsetViewClosure = { (_ offsetView: UIView, _ parent: UIView) in offsetView.pin.top(10).width(100).height(100) @@ -62,21 +68,16 @@ class PinSafeAreaSpec: QuickSpec { navigationController.navigationBar.isTranslucent = false setupWindow(with: navigationController) - - let expectedSafeAreaInsets = UIEdgeInsets.zero + + let expectedSafeAreaInsets = mainView.safeAreaInsets let expectedOffsetViewSafeAreaInsets = UIEdgeInsets.zero - if #available(iOS 11.0, tvOS 11.0, *) { - expect(viewController.view.safeAreaInsets).to(equal(expectedSafeAreaInsets)) - expect(mainView.offsetView.safeAreaInsets).to(equal(expectedOffsetViewSafeAreaInsets)) - } - expect(mainView.pin.safeArea).to(equal(expectedSafeAreaInsets)) expect(mainView.offsetView.pin.safeArea).to(equal(expectedOffsetViewSafeAreaInsets)) - expect(mainView.safeAreaInsetsDidChangeCalledCount).to(equal(0)) + expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0 let screenSize = mainView.frame.size - expect(mainView.frame).to(equal(CGRect(x: 0, y: 44, width: screenSize.width, height: screenSize.height))) + expect(mainView.frame).to(equal(CGRect(x: 0, y: safeAreaInsetsWhenTranslucent.top, width: screenSize.width, height: screenSizeWhenTranslucent.height - safeAreaInsetsWhenTranslucent.top))) expect(mainView.offsetView.frame).to(equal(CGRect(x: 0, y: 10, width: 100, height: 100))) } } From 074869e7b21c82335287f35893bdae5a20a640c2 Mon Sep 17 00:00:00 2001 From: heoblitz Date: Sat, 28 Jun 2025 17:24:41 +0900 Subject: [PATCH 03/13] Fix using translucent NavigationBar default test case --- Tests/iOS/PinSafeAreaTests.swift | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Tests/iOS/PinSafeAreaTests.swift b/Tests/iOS/PinSafeAreaTests.swift index b0b60e4..be06b65 100644 --- a/Tests/iOS/PinSafeAreaTests.swift +++ b/Tests/iOS/PinSafeAreaTests.swift @@ -90,23 +90,19 @@ class PinSafeAreaSpec: QuickSpec { offsetView.pin.all().margin(parent.pin.safeArea) } - let expectedSafeAreaInsets = UIEdgeInsets(top: 44, left: 0, bottom: 0, right: 0) - let expectedOffsetViewSafeAreaInsets = UIEdgeInsets.zero - navigationController.navigationBar.isTranslucent = true setupWindow(with: navigationController) - if #available(iOS 11.0, tvOS 11.0, *) { - XCTAssertEqual(viewController.view.safeAreaInsets, expectedSafeAreaInsets) - XCTAssertEqual(mainView.offsetView.safeAreaInsets, expectedOffsetViewSafeAreaInsets) - } + let expectedSafeAreaInsets = mainView.safeAreaInsets + let expectedOffsetViewSafeAreaInsets = UIEdgeInsets.zero + XCTAssertEqual(mainView.pin.safeArea, expectedSafeAreaInsets) XCTAssertEqual(mainView.offsetView.pin.safeArea, expectedOffsetViewSafeAreaInsets) expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0 - + let screenSize = mainView.frame.size XCTAssertEqual(mainView.frame, CGRect(x: 0, y: 0, width: screenSize.width, height: screenSize.height)) - XCTAssertEqual(mainView.offsetView.frame, CGRect(x: 0, y: 44, width: screenSize.width, height: screenSize.height - 44)) + XCTAssertEqual(mainView.offsetView.frame, CGRect(x: 0, y: expectedSafeAreaInsets.top, width: screenSize.width, height: screenSize.height - (expectedSafeAreaInsets.top + expectedSafeAreaInsets.bottom))) } it("with OffsetView") { From e4afefab47322921646b60f6d4d0d81a50fb01c2 Mon Sep 17 00:00:00 2001 From: heoblitz Date: Sat, 28 Jun 2025 17:31:06 +0900 Subject: [PATCH 04/13] Fix using translucent NavigationBar with OffsetView test case --- Tests/iOS/PinSafeAreaTests.swift | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Tests/iOS/PinSafeAreaTests.swift b/Tests/iOS/PinSafeAreaTests.swift index be06b65..dedca88 100644 --- a/Tests/iOS/PinSafeAreaTests.swift +++ b/Tests/iOS/PinSafeAreaTests.swift @@ -106,28 +106,30 @@ class PinSafeAreaSpec: QuickSpec { } it("with OffsetView") { + let offsetViewTop = CGFloat(10) let mainView = viewController.mainView mainView.layoutOffsetViewClosure = { (_ offsetView: UIView, _ parent: UIView) in - offsetView.pin.top(10).width(100).height(100) + offsetView.pin.top(offsetViewTop).width(100).height(100) } - let expectedSafeAreaInsets = UIEdgeInsets(top: 44, left: 0, bottom: 0, right: 0) - let expectedOffsetViewSafeAreaInsets = UIEdgeInsets(top: 34, left: 0, bottom: 0, right: 0) - navigationController.navigationBar.isTranslucent = true setupWindow(with: navigationController) + + let expectedSafeAreaInsets = mainView.safeAreaInsets + let expectedOffsetViewSafeAreaInsets = UIEdgeInsets( + top: mainView.safeAreaInsets.top - offsetViewTop, + left: .zero, + bottom: .zero, + right: .zero + ) - if #available(iOS 11.0, tvOS 11.0, *) { - XCTAssertEqual(viewController.view.safeAreaInsets, expectedSafeAreaInsets) - XCTAssertEqual(mainView.offsetView.safeAreaInsets, expectedOffsetViewSafeAreaInsets) - } XCTAssertEqual(mainView.pin.safeArea, expectedSafeAreaInsets) XCTAssertEqual(mainView.offsetView.pin.safeArea, expectedOffsetViewSafeAreaInsets) let screenSize = mainView.frame.size XCTAssertEqual(mainView.frame, CGRect(x: 0, y: 0, width: screenSize.width, height: screenSize.height)) - XCTAssertEqual(mainView.offsetView.frame, CGRect(x: 0, y: 10, width: 100, height: 100)) + XCTAssertEqual(mainView.offsetView.frame, CGRect(x: 0, y: offsetViewTop, width: 100, height: 100)) expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0 } From 2936dd5e7ad2cd897904d96bde3f47837b893518 Mon Sep 17 00:00:00 2001 From: heoblitz Date: Sun, 29 Jun 2025 18:31:40 +0900 Subject: [PATCH 05/13] Fix using translucent NavigationBar with OffsetView and AdditionalSafeAreaInsets test cases --- Tests/iOS/PinSafeAreaTests.swift | 58 ++++++++++++-------------------- 1 file changed, 22 insertions(+), 36 deletions(-) diff --git a/Tests/iOS/PinSafeAreaTests.swift b/Tests/iOS/PinSafeAreaTests.swift index dedca88..c52a7f8 100644 --- a/Tests/iOS/PinSafeAreaTests.swift +++ b/Tests/iOS/PinSafeAreaTests.swift @@ -141,30 +141,19 @@ class PinSafeAreaSpec: QuickSpec { } navigationController.navigationBar.isTranslucent = true + viewController.additionalSafeAreaInsets = UIEdgeInsets(top: 10, left: 10, bottom: 30, right: 0) setupWindow(with: navigationController) - let expectedSafeAreaInsets: UIEdgeInsets - let expectedOffsetViewSafeAreaInsets: UIEdgeInsets - let expectedOffsetViewFrame: CGRect let screenSize = mainView.frame.size + let expectedSafeAreaInsets = mainView.safeAreaInsets + let expectedOffsetViewSafeAreaInsets = UIEdgeInsets.zero + let expectedOffsetViewFrame = CGRect( + x: expectedSafeAreaInsets.left, + y: expectedSafeAreaInsets.top, + width: screenSize.width - (expectedSafeAreaInsets.left + expectedSafeAreaInsets.right), + height: screenSize.height - (expectedSafeAreaInsets.top + expectedSafeAreaInsets.bottom) + ) - if #available(iOS 11.0, tvOS 11.0, *) { - viewController.additionalSafeAreaInsets = UIEdgeInsets(top: 10, left: 10, bottom: 30, right: 0) - expectedSafeAreaInsets = UIEdgeInsets(top: 54, left: 10, bottom: 30, right: 0) - expectedOffsetViewSafeAreaInsets = UIEdgeInsets.zero - expectedOffsetViewFrame = CGRect(x: 0, y: 44, width: screenSize.width, - height: screenSize.height - 44) - } else { - expectedSafeAreaInsets = UIEdgeInsets(top: 44, left: 0, bottom: 0, right: 0) - expectedOffsetViewSafeAreaInsets = UIEdgeInsets.zero - expectedOffsetViewFrame = CGRect(x: 0, y: 44, width: screenSize.width, - height: screenSize.height - expectedSafeAreaInsets.top) - } - - if #available(iOS 11.0, tvOS 11.0, *) { - XCTAssertEqual(viewController.view.safeAreaInsets, expectedSafeAreaInsets) - XCTAssertEqual(mainView.offsetView.safeAreaInsets, expectedOffsetViewSafeAreaInsets) - } XCTAssertEqual(mainView.pin.safeArea, expectedSafeAreaInsets) XCTAssertEqual(mainView.offsetView.pin.safeArea, expectedOffsetViewSafeAreaInsets) expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0 @@ -175,29 +164,26 @@ class PinSafeAreaSpec: QuickSpec { it("with OffsetView and AdditionalSafeAreaInsets 2") { let mainView = viewController.mainView + let offsetViewTop = CGFloat(10) mainView.layoutOffsetViewClosure = { (_ offsetView: UIView, _ parent: UIView) in - offsetView.pin.top(10).width(100).height(100) - } - - let expectedSafeAreaInsets: UIEdgeInsets - let expectedOffsetViewSafeAreaInsets: UIEdgeInsets - if #available(iOS 11.0, tvOS 11.0, *) { - viewController.additionalSafeAreaInsets = UIEdgeInsets(top: 10, left: 10, bottom: 30, right: 0) - expectedSafeAreaInsets = UIEdgeInsets(top: 54, left: 10, bottom: 30, right: 0) - expectedOffsetViewSafeAreaInsets = UIEdgeInsets(top: 44, left: 10, bottom: 0, right: 0) - } else { - expectedSafeAreaInsets = UIEdgeInsets(top: 44, left: 0, bottom: 0, right: 0) - expectedOffsetViewSafeAreaInsets = UIEdgeInsets(top: 34, left: 0, bottom: 0, right: 0) + offsetView.pin.top(offsetViewTop).width(100).height(100) } navigationController.navigationBar.isTranslucent = true setupWindow(with: navigationController) + + let expectedSafeAreaInsets = mainView.safeAreaInsets + let expectedOffsetViewSafeAreaInsets = UIEdgeInsets( + top: expectedSafeAreaInsets.top - offsetViewTop, + left: .zero, + bottom: .zero, + right: .zero + ) - if #available(iOS 11.0, tvOS 11.0, *) { - XCTAssertEqual(viewController.view.safeAreaInsets, expectedSafeAreaInsets) - XCTAssertEqual(mainView.offsetView.safeAreaInsets, expectedOffsetViewSafeAreaInsets) - } + XCTAssertEqual(viewController.view.safeAreaInsets, expectedSafeAreaInsets) + XCTAssertEqual(mainView.offsetView.safeAreaInsets, expectedOffsetViewSafeAreaInsets) + XCTAssertEqual(mainView.pin.safeArea, expectedSafeAreaInsets) XCTAssertEqual(mainView.offsetView.pin.safeArea, expectedOffsetViewSafeAreaInsets) expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0 From 8873478f3726ad07dbeb9d9bc852365c2a573374 Mon Sep 17 00:00:00 2001 From: heoblitz Date: Sun, 29 Jun 2025 18:49:05 +0900 Subject: [PATCH 06/13] Fix navigationbar + subview transluscent navigationbar test cases --- Tests/iOS/PinSafeAreaTests.swift | 102 +++++++++++++++++++++++-------- 1 file changed, 76 insertions(+), 26 deletions(-) diff --git a/Tests/iOS/PinSafeAreaTests.swift b/Tests/iOS/PinSafeAreaTests.swift index c52a7f8..ade38fb 100644 --- a/Tests/iOS/PinSafeAreaTests.swift +++ b/Tests/iOS/PinSafeAreaTests.swift @@ -261,113 +261,163 @@ class PinSafeAreaMoreTestsSpec: QuickSpec { describe("navigationbar + subview") { it("transluscent navigationbar 1") { let mainView = viewController.mainView - + let subViewTop = CGFloat(10) + mainView.layoutOffsetViewClosure = { (_ subView: UIView, _ parent: UIView) in - subView.pin.top(10).left(10).size(100) + subView.pin.top(subViewTop).left(10).size(100) } navigationController.navigationBar.isTranslucent = true setupWindow(with: navigationController) + + let expectedSafeAreaInsets = mainView.safeAreaInsets + let expectedSubViewSafeAreaInsets = UIEdgeInsets( + top: expectedSafeAreaInsets.top - subViewTop, + left: .zero, + bottom: .zero, + right: .zero + ) // MATCH safeAreaInsets! expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0 expect(mainView.subView.safeAreaInsetsDidChangeCalledCount) > 0 - expect(mainView.pin.safeArea).to(equal(UIEdgeInsets(top: 44.0, left: 0.0, bottom: 0.0, right: 0.0))) - expect(mainView.subView.pin.safeArea).to(equal(UIEdgeInsets(top: 34.0, left: 0.0, bottom: 0.0, right: 0.0))) + expect(mainView.pin.safeArea).to(equal(expectedSafeAreaInsets)) + expect(mainView.subView.pin.safeArea).to(equal(expectedSubViewSafeAreaInsets)) expect(mainView.subView.subViewB!.pin.safeArea).to(equal(UIEdgeInsets(top: 0.0, left: 0.0, bottom: 0.0, right: 0.0))) expect(mainView.subView.frame).to(equal(CGRect(x: 10, y: 10, width: 100, height: 100))) - expect(mainView.subView.subViewB!.frame).to(equal(CGRect(x: 0, y: 34, width: 40, height: 40))) + expect(mainView.subView.subViewB!.frame).to(equal(CGRect(x: 0, y: expectedSubViewSafeAreaInsets.top, width: 40, height: 40))) } it("transluscent navigationbar 2") { let mainView = viewController.mainView + let subViewTop = CGFloat(10) + let subViewLeft = CGFloat(-10) mainView.layoutOffsetViewClosure = { (_ subView: UIView, _ parent: UIView) in - subView.pin.top(10).left(-10).size(100) + subView.pin.top(subViewTop).left(subViewLeft).size(100) } navigationController.navigationBar.isTranslucent = true setupWindow(with: navigationController) + + let expectedSafeAreaInsets = mainView.safeAreaInsets + let expectedSubViewSafeAreaInsets = UIEdgeInsets( + top: expectedSafeAreaInsets.top - subViewTop, + left: .zero, + bottom: .zero, + right: .zero + ) // MATCH safeAreaInsets! expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0 expect(mainView.subView.safeAreaInsetsDidChangeCalledCount) > 0 - expect(mainView.pin.safeArea).to(equal(UIEdgeInsets(top: 44.0, left: 0.0, bottom: 0.0, right: 0.0))) - expect(mainView.subView.pin.safeArea).to(equal(UIEdgeInsets(top: 34.0, left: 0.0, bottom: 0.0, right: 0.0))) + expect(mainView.pin.safeArea).to(equal(expectedSafeAreaInsets)) + expect(mainView.subView.pin.safeArea).to(equal(expectedSubViewSafeAreaInsets)) expect(mainView.subView.subViewB!.pin.safeArea).to(equal(UIEdgeInsets(top: 0.0, left: 0.0, bottom: 0.0, right: 0.0))) - expect(mainView.subView.frame).to(equal(CGRect(x: -10, y: 10, width: 100, height: 100))) - expect(mainView.subView.subViewB!.frame).to(equal(CGRect(x: 0, y: 34, width: 40, height: 40))) + expect(mainView.subView.frame).to(equal(CGRect(x: subViewLeft, y: subViewTop, width: 100, height: 100))) + expect(mainView.subView.subViewB!.frame).to(equal(CGRect(x: 0, y: expectedSubViewSafeAreaInsets.top, width: 40, height: 40))) } it("transluscent navigationbar 3") { let mainView = viewController.mainView + let subViewTop = CGFloat(10) + let subViewRight = CGFloat(10) mainView.layoutOffsetViewClosure = { (_ subView: UIView, _ parent: UIView) in - subView.pin.top(10).right(10).size(100) + subView.pin.top(subViewTop).right(subViewRight).size(100) } navigationController.navigationBar.isTranslucent = true setupWindow(with: navigationController) + + let expectedSafeAreaInsets = mainView.safeAreaInsets + let expectedSubViewSafeAreaInsets = UIEdgeInsets( + top: expectedSafeAreaInsets.top - subViewTop, + left: .zero, + bottom: .zero, + right: .zero + ) // MATCH safeAreaInsets! expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0 expect(mainView.subView.safeAreaInsetsDidChangeCalledCount) > 0 - expect(mainView.pin.safeArea).to(equal(UIEdgeInsets(top: 44.0, left: 0.0, bottom: 0.0, right: 0.0))) - expect(mainView.subView.pin.safeArea).to(equal(UIEdgeInsets(top: 34.0, left: 0.0, bottom: 0.0, right: 0.0))) + expect(mainView.pin.safeArea).to(equal(expectedSafeAreaInsets)) + expect(mainView.subView.pin.safeArea).to(equal(expectedSubViewSafeAreaInsets)) expect(mainView.subView.subViewB!.pin.safeArea).to(equal(UIEdgeInsets(top: 0.0, left: 0.0, bottom: 0.0, right: 0.0))) let screenSize = mainView.frame.size - expect(mainView.subView.frame).to(equal(CGRect(x: screenSize.width - 100 - 10, y: 10, width: 100, height: 100))) - expect(mainView.subView.subViewB!.frame).to(equal(CGRect(x: 0, y: 34, width: 40, height: 40))) + expect(mainView.subView.frame).to(equal(CGRect(x: screenSize.width - 100 - subViewRight, y: subViewTop, width: 100, height: 100))) + expect(mainView.subView.subViewB!.frame).to(equal(CGRect(x: 0, y: expectedSubViewSafeAreaInsets.top, width: 40, height: 40))) } it("transluscent navigationbar 4") { let mainView = viewController.mainView - + let subViewTop = CGFloat(10) + let subViewRight = CGFloat(-10) + mainView.layoutOffsetViewClosure = { (_ subView: UIView, _ parent: UIView) in - subView.pin.top(10).right(-10).size(100) + subView.pin.top(subViewTop).right(subViewRight).size(100) } navigationController.navigationBar.isTranslucent = true setupWindow(with: navigationController) + + let expectedSafeAreaInsets = mainView.safeAreaInsets + let expectedSubViewSafeAreaInsets = UIEdgeInsets( + top: expectedSafeAreaInsets.top - subViewTop, + left: .zero, + bottom: .zero, + right: .zero + ) // MATCH safeAreaInsets! expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0 expect(mainView.subView.safeAreaInsetsDidChangeCalledCount) > 0 - expect(mainView.pin.safeArea).to(equal(UIEdgeInsets(top: 44.0, left: 0.0, bottom: 0.0, right: 0.0))) - expect(mainView.subView.pin.safeArea).to(equal(UIEdgeInsets(top: 34.0, left: 0.0, bottom: 0.0, right: 0.0))) + expect(mainView.pin.safeArea).to(equal(expectedSafeAreaInsets)) + expect(mainView.subView.pin.safeArea).to(equal(expectedSubViewSafeAreaInsets)) expect(mainView.subView.subViewB!.pin.safeArea).to(equal(UIEdgeInsets(top: 0.0, left: 0.0, bottom: 0.0, right: 0.0))) let screenSize = mainView.frame.size - expect(mainView.subView.frame).to(equal(CGRect(x: screenSize.width - 100 + 10, y: 10, width: 100, height: 100))) - expect(mainView.subView.subViewB!.frame).to(equal(CGRect(x: 0, y: 34, width: 40, height: 40))) + expect(mainView.subView.frame).to(equal(CGRect(x: screenSize.width - 100 - subViewRight, y: subViewTop, width: 100, height: 100))) + expect(mainView.subView.subViewB!.frame).to(equal(CGRect(x: 0, y: expectedSubViewSafeAreaInsets.top, width: 40, height: 40))) } it("transluscent navigationbar 5") { let mainView = viewController.mainView + let subViewTop = CGFloat(-20) + let subViewLeft = CGFloat(-10) + mainView.layoutOffsetViewClosure = { (_ subView: UIView, _ parent: UIView) in - subView.pin.top(-20).left(-10).size(100) + subView.pin.top(subViewTop).left(subViewLeft).size(100) } navigationController.navigationBar.isTranslucent = true setupWindow(with: navigationController) + + let expectedSafeAreaInsets = mainView.safeAreaInsets + let expectedSubViewSafeAreaInsets = UIEdgeInsets( + top: expectedSafeAreaInsets.top, + left: .zero, + bottom: .zero, + right: .zero + ) // MATCH safeAreaInsets! expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0 expect(mainView.subView.safeAreaInsetsDidChangeCalledCount) > 0 - expect(mainView.pin.safeArea).to(equal(UIEdgeInsets(top: 44.0, left: 0.0, bottom: 0.0, right: 0.0))) - expect(mainView.subView.pin.safeArea).to(equal(UIEdgeInsets(top: 44.0, left: 0.0, bottom: 0.0, right: 0.0))) + expect(mainView.pin.safeArea).to(equal(expectedSafeAreaInsets)) + expect(mainView.subView.pin.safeArea).to(equal(expectedSubViewSafeAreaInsets)) expect(mainView.subView.subViewB!.pin.safeArea).to(equal(UIEdgeInsets(top: 0.0, left: 0.0, bottom: 0.0, right: 0.0))) - expect(mainView.subView.frame).to(equal(CGRect(x: -10, y: -20, width: 100, height: 100))) - expect(mainView.subView.subViewB!.frame).to(equal(CGRect(x: 0, y: 44, width: 40, height: 40))) + expect(mainView.subView.frame).to(equal(CGRect(x: subViewLeft, y: subViewTop, width: 100, height: 100))) + expect(mainView.subView.subViewB!.frame).to(equal(CGRect(x: 0, y: expectedSubViewSafeAreaInsets.top, width: 40, height: 40))) } } } From 0094cb760a4516109523516ccdd11a54f03edd17 Mon Sep 17 00:00:00 2001 From: heoblitz Date: Sun, 29 Jun 2025 18:53:20 +0900 Subject: [PATCH 07/13] Fix PinSafeAreaWithOptInModeSpec --- Tests/iOS/PinSafeAreaTests.swift | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/Tests/iOS/PinSafeAreaTests.swift b/Tests/iOS/PinSafeAreaTests.swift index ade38fb..0619bfc 100644 --- a/Tests/iOS/PinSafeAreaTests.swift +++ b/Tests/iOS/PinSafeAreaTests.swift @@ -456,14 +456,24 @@ class PinSafeAreaWithOptInModeSpec: QuickSpec { describe("using Pin.safeAreaInsetsDidChangeMode = .optIn") { it("should not call safeAreaInsetsDidChange()") { let mainView = viewController.mainView + let subViewTop = CGFloat(10) + let subViewLeft = CGFloat(10) mainView.layoutOffsetViewClosure = { (_ subView: UIView, _ parent: UIView) in - subView.pin.top(10).left(10).size(100) + subView.pin.top(subViewTop).left(subViewLeft).size(100) } navigationController.navigationBar.isTranslucent = true setupWindow(with: navigationController) - + + let expectedSafeAreaInsets = mainView.safeAreaInsets + let expectedSubViewSafeAreaInsets = UIEdgeInsets( + top: expectedSafeAreaInsets.top - subViewTop, + left: .zero, + bottom: .zero, + right: .zero + ) + // MATCH safeAreaInsets! if #available(iOS 11.0, tvOS 11.0, *) { expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0 @@ -476,12 +486,15 @@ class PinSafeAreaWithOptInModeSpec: QuickSpec { expect(mainView.subView.safeAreaInsetsDidChangeCalledCount) == 0 } - expect(mainView.pin.safeArea).to(equal(UIEdgeInsets(top: 44.0, left: 0.0, bottom: 0.0, right: 0.0))) - expect(mainView.subView.pin.safeArea).to(equal(UIEdgeInsets(top: 34.0, left: 0.0, bottom: 0.0, right: 0.0))) + expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0 + expect(mainView.subView.safeAreaInsetsDidChangeCalledCount) > 0 + + expect(mainView.pin.safeArea).to(equal(expectedSafeAreaInsets)) + expect(mainView.subView.pin.safeArea).to(equal(expectedSubViewSafeAreaInsets)) expect(mainView.subView.subViewB!.pin.safeArea).to(equal(UIEdgeInsets(top: 0.0, left: 0.0, bottom: 0.0, right: 0.0))) - expect(mainView.subView.frame).to(equal(CGRect(x: 10, y: 10, width: 100, height: 100))) - expect(mainView.subView.subViewB!.frame).to(equal(CGRect(x: 0, y: 34, width: 40, height: 40))) + expect(mainView.subView.frame).to(equal(CGRect(x: subViewLeft, y: subViewTop, width: 100, height: 100))) + expect(mainView.subView.subViewB!.frame).to(equal(CGRect(x: 0, y: expectedSubViewSafeAreaInsets.top, width: 40, height: 40))) } } } From 2c48e9672428d84d5994c4e898470b033687d4ac Mon Sep 17 00:00:00 2001 From: heoblitz Date: Sun, 29 Jun 2025 18:54:54 +0900 Subject: [PATCH 08/13] Fix PinSafeAreaWithOptInInsetsUpdateModeSpec --- Tests/iOS/PinSafeAreaTests.swift | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/Tests/iOS/PinSafeAreaTests.swift b/Tests/iOS/PinSafeAreaTests.swift index 0619bfc..b147831 100644 --- a/Tests/iOS/PinSafeAreaTests.swift +++ b/Tests/iOS/PinSafeAreaTests.swift @@ -533,24 +533,34 @@ class PinSafeAreaWithOptInInsetsUpdateModeSpec: QuickSpec { Pin.safeAreaInsetsDidChangeMode = .optIn let mainView = viewController.mainView - + let subViewTop = CGFloat(10) + let subViewLeft = CGFloat(10) + mainView.layoutOffsetViewClosure = { (_ subView: UIView, _ parent: UIView) in - subView.pin.top(10).left(10).size(100) + subView.pin.top(subViewTop).left(subViewLeft).size(100) } navigationController.navigationBar.isTranslucent = true setupWindow(with: navigationController) + + let expectedSafeAreaInsets = mainView.safeAreaInsets + let expectedSubViewSafeAreaInsets = UIEdgeInsets( + top: expectedSafeAreaInsets.top - subViewTop, + left: .zero, + bottom: .zero, + right: .zero + ) // MATCH safeAreaInsets! expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0 -// expect(mainView.subView.safeAreaInsetsDidChangeCalledCount) > 0 + expect(mainView.subView.safeAreaInsetsDidChangeCalledCount) > 0 - expect(mainView.pin.safeArea).to(equal(UIEdgeInsets(top: 44.0, left: 0.0, bottom: 0.0, right: 0.0))) - expect(mainView.subView.pin.safeArea).to(equal(UIEdgeInsets(top: 34.0, left: 0.0, bottom: 0.0, right: 0.0))) + expect(mainView.pin.safeArea).to(equal(expectedSafeAreaInsets)) + expect(mainView.subView.pin.safeArea).to(equal(expectedSubViewSafeAreaInsets)) expect(mainView.subView.subViewB!.pin.safeArea).to(equal(UIEdgeInsets(top: 0.0, left: 0.0, bottom: 0.0, right: 0.0))) expect(mainView.subView.frame).to(equal(CGRect(x: 10, y: 10, width: 100, height: 100))) - expect(mainView.subView.subViewB!.frame).to(equal(CGRect(x: 0, y: 34, width: 40, height: 40))) + expect(mainView.subView.subViewB!.frame).to(equal(CGRect(x: 0, y: expectedSubViewSafeAreaInsets.top, width: 40, height: 40))) } } } From bc1b1b114f711b962e3e8ffda5f8065dd8c04160 Mon Sep 17 00:00:00 2001 From: heoblitz Date: Sun, 29 Jun 2025 18:57:25 +0900 Subject: [PATCH 09/13] Fix PinSafeAreaTabBarControllerSpec --- Tests/iOS/PinSafeAreaTests.swift | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/Tests/iOS/PinSafeAreaTests.swift b/Tests/iOS/PinSafeAreaTests.swift index b147831..9340d7c 100644 --- a/Tests/iOS/PinSafeAreaTests.swift +++ b/Tests/iOS/PinSafeAreaTests.swift @@ -604,27 +604,36 @@ class PinSafeAreaTabBarControllerSpec: QuickSpec { describe("navigationbar + tabbar + subview") { it("translucent navigation bar") { let mainView = viewController.mainView + let subViewTop = CGFloat(10) + let subViewLeft = CGFloat(10) mainView.layoutOffsetViewClosure = { (_ subView: UIView, _ parent: UIView) in - subView.pin.top(10).left(10).size(100) + subView.pin.top(subViewTop).left(subViewLeft).size(100) } -// navigationController.navigationBar.barStyle = .blackTranslucent navigationController.navigationBar.isTranslucent = true setupWindow(with: navigationController) + + let expectedSafeAreaInsets = mainView.safeAreaInsets + let expectedSubViewSafeAreaInsets = UIEdgeInsets( + top: expectedSafeAreaInsets.top - subViewTop, + left: .zero, + bottom: .zero, + right: .zero + ) // MATCH safeAreaInsets! expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0 expect(mainView.subView.safeAreaInsetsDidChangeCalledCount) > 0 - expect(mainView.pin.safeArea).to(equal(UIEdgeInsets(top: 44.0, left: 0.0, bottom: 49.0, right: 0.0))) - expect(mainView.subView.pin.safeArea).to(equal(UIEdgeInsets(top: 34.0, left: 0.0, bottom: 0.0, right: 0.0))) + expect(mainView.pin.safeArea).to(equal(expectedSafeAreaInsets)) + expect(mainView.subView.pin.safeArea).to(equal(expectedSubViewSafeAreaInsets)) expect(mainView.subView.subViewB!.pin.safeArea).to(equal(UIEdgeInsets(top: 0.0, left: 0.0, bottom: 0.0, right: 0.0))) let screenSize = mainView.frame.size expect(mainView.frame).to(equal(CGRect(x: 0, y: 0, width: screenSize.width, height: screenSize.height))) - expect(mainView.subView.frame).to(equal(CGRect(x: 10, y: 10, width: 100, height: 100))) - expect(mainView.subView.subViewB!.frame).to(equal(CGRect(x: 0, y: 34, width: 40, height: 40))) + expect(mainView.subView.frame).to(equal(CGRect(x: subViewLeft, y: subViewTop, width: 100, height: 100))) + expect(mainView.subView.subViewB!.frame).to(equal(CGRect(x: 0, y: expectedSubViewSafeAreaInsets.top, width: 40, height: 40))) } } @@ -638,18 +647,21 @@ class PinSafeAreaTabBarControllerSpec: QuickSpec { navigationController.navigationBar.isTranslucent = true setupWindow(with: navigationController) + + let expectedSafeAreaInsets = mainView.safeAreaInsets + let expectedSubViewSafeAreaInsets = expectedSafeAreaInsets // MATCH safeAreaInsets! expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0 expect(mainView.subView.safeAreaInsetsDidChangeCalledCount) > 0 - expect(mainView.pin.safeArea).to(equal(UIEdgeInsets(top: 44.0, left: 0.0, bottom: 49.0, right: 0.0))) - expect(mainView.subView.pin.safeArea).to(equal(UIEdgeInsets(top: 44.0, left: 0.0, bottom: 49.0, right: 0.0))) + expect(mainView.pin.safeArea).to(equal(expectedSafeAreaInsets)) + expect(mainView.subView.pin.safeArea).to(equal(expectedSubViewSafeAreaInsets)) expect(mainView.subView.subViewB!.pin.safeArea).to(equal(UIEdgeInsets(top: 0.0, left: 0.0, bottom: 0.0, right: 0.0))) let screenSize = mainView.frame.size expect(mainView.subView.frame).to(equal(CGRect(x: 0, y: 0, width: screenSize.width, height: screenSize.height))) - expect(mainView.subView.subViewB!.frame).to(equal(CGRect(x: 0, y: 44, width: 40, height: 40))) + expect(mainView.subView.subViewB!.frame).to(equal(CGRect(x: 0, y: expectedSubViewSafeAreaInsets.top, width: 40, height: 40))) } } } From 8502ef74d89b173fcfab675e79c910ecb525ce97 Mon Sep 17 00:00:00 2001 From: heoblitz Date: Sun, 29 Jun 2025 18:58:46 +0900 Subject: [PATCH 10/13] Fix PinSafeAreaScrollViewControllerSpec --- Tests/iOS/PinSafeAreaTests.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Tests/iOS/PinSafeAreaTests.swift b/Tests/iOS/PinSafeAreaTests.swift index 9340d7c..74b11ca 100644 --- a/Tests/iOS/PinSafeAreaTests.swift +++ b/Tests/iOS/PinSafeAreaTests.swift @@ -703,12 +703,14 @@ class PinSafeAreaScrollViewControllerSpec: QuickSpec { navigationController.navigationBar.isTranslucent = true setupWindow(with: navigationController) + + let expectedSafeAreaInsets = mainView.safeAreaInsets // MATCH safeAreaInsets! expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0 expect(mainView.subView.safeAreaInsetsDidChangeCalledCount).to(equal(0)) - expect(mainView.pin.safeArea).to(equal(UIEdgeInsets(top: 44.0, left: 0.0, bottom: 0.0, right: 0.0))) + expect(mainView.pin.safeArea).to(equal(expectedSafeAreaInsets)) // subView is inside a UIScrollView, its safeArea should be .zero expect(mainView.subView.pin.safeArea).to(equal(UIEdgeInsets(top: 0.0, left: 0.0, bottom: 0.0, right: 0.0))) From 4ec55dfb569b252cffe5886dc506c6626e348548 Mon Sep 17 00:00:00 2001 From: heoblitz Date: Sun, 29 Jun 2025 21:26:56 +0900 Subject: [PATCH 11/13] Fix ReadableLayoutMargins --- Tests/iOS/ReadableLayoutMarginsSpec.swift | 51 ++++++++++++++--------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/Tests/iOS/ReadableLayoutMarginsSpec.swift b/Tests/iOS/ReadableLayoutMarginsSpec.swift index d03099b..deaaac3 100644 --- a/Tests/iOS/ReadableLayoutMarginsSpec.swift +++ b/Tests/iOS/ReadableLayoutMarginsSpec.swift @@ -82,14 +82,8 @@ class ReadableLayoutMargins: QuickSpec { setupWindow(with: viewController) aView.pin.all(rootView.pin.readableMargins) - - #if os(iOS) - expect(aView.frame).to(equal(CGRect(x: 8, y: 8, width: 384.0, height: 384.0))) - #elseif os(tvOS) - expect(aView.frame).to(equal(CGRect(x: 88, y: 68, width: 304.0, height: 324.0))) - #else - expect(aView.frame).to(equal(CGRect(x: 98, y: 68, width: 294.0, height: 324.0))) - #endif + + expect(aView.frame).to(equal(rootView.readableContentGuide.layoutFrame)) } } @@ -98,27 +92,44 @@ class ReadableLayoutMargins: QuickSpec { setupWindow(with: viewController) aView.pin.all(rootView.pin.layoutMargins) - - #if os(iOS) - expect(aView.frame).to(equal(CGRect(x: 8, y: 8, width: 384.0, height: 384.0))) - #elseif os(tvOS) - expect(aView.frame).to(equal(CGRect(x: 88, y: 68, width: 304.0, height: 324.0))) - #else - expect(aView.frame).to(equal(CGRect(x: 98, y: 68, width: 294.0, height: 324.0))) - #endif + + let layoutMargins = rootView.layoutMargins + let aViewFrame = CGRect( + x: layoutMargins.left, + y: layoutMargins.top, + width: rootView.frame.width - (layoutMargins.left + layoutMargins.right), + height: rootView.frame.height - (layoutMargins.top + layoutMargins.bottom) + ) + expect(aView.frame).to(equal(aViewFrame)) } } - #if os(iOS) && compiler(>=5.5) + #if os(iOS) describe("Using pin.keyboardArea") { it("test") { setupWindow(with: viewController) rootView.pin.top(0).horizontally() - rootView.pin.bottom(rootView.pin.keyboardArea.minY) + rootView.pin.bottom(rootView.pin.keyboardArea.height) + + let keyboardLayoutFrame: CGRect + + if #available(iOS 15, *) { + keyboardLayoutFrame = rootView.keyboardLayoutGuide.layoutFrame + } else { + keyboardLayoutFrame = .zero + } + + let screenSize = viewController.view.frame + let expectedRootViewFrame = CGRect( + x: .zero, + y: .zero, + width: screenSize.width, + height: screenSize.height - keyboardLayoutFrame.height + ) - expect(rootView.frame).to(equal(CGRect(x: 0, y: 267, width: 375, height: 400))) - expect(rootView.pin.keyboardArea).to(equal(CGRect(x: 0, y: 0, width: 0, height: 0))) + expect(rootView.frame).to(equal(expectedRootViewFrame)) + expect(rootView.pin.keyboardArea).to(equal(keyboardLayoutFrame)) } } #endif From 8b1af463fe7d7141290808a65e2c621fa6b3507e Mon Sep 17 00:00:00 2001 From: heoblitz Date: Sun, 29 Jun 2025 23:06:06 +0900 Subject: [PATCH 12/13] Remove x86 arch command --- .github/workflows/github-actions-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/github-actions-ci.yml b/.github/workflows/github-actions-ci.yml index f39e686..efb0e4f 100644 --- a/.github/workflows/github-actions-ci.yml +++ b/.github/workflows/github-actions-ci.yml @@ -91,7 +91,7 @@ jobs: run: | echo "Testing CocoaPods integration..." cd TestProjects/cocoapods/ios - arch -x86_64 pod install + pod install set -o pipefail && xcodebuild build \ -workspace PinLayout-iOS.xcworkspace \ -scheme PinLayout-iOS \ @@ -103,7 +103,7 @@ jobs: # - name: Test CocoaPods macOS Integration # run: | # cd TestProjects/cocoapods/macos - # arch -x86_64 pod install + # pod install # set -o pipefail && xcodebuild build \ # -workspace PinLayout-macOS.xcworkspace \ # -scheme PinLayout-macOS \ @@ -114,7 +114,7 @@ jobs: # - name: Test CocoaPods tvOS Integration # run: | # cd TestProjects/cocoapods/tvos - # arch -x86_64 pod install + # pod install # set -o pipefail && xcodebuild build \ # -workspace PinLayout-tvOS.xcworkspace \ # -scheme PinLayout-tvOS \ From db4fde9e0e6270697b0c6c500342f85e50c08756 Mon Sep 17 00:00:00 2001 From: heoblitz Date: Sun, 20 Jul 2025 18:03:53 +0900 Subject: [PATCH 13/13] Change to use the pod installed on the CI --- .github/workflows/github-actions-ci.yml | 2 +- .ruby-version_old | 1 - Gemfile | 2 - Gemfile.lock | 97 ------------------------- 4 files changed, 1 insertion(+), 101 deletions(-) delete mode 100644 .ruby-version_old delete mode 100644 Gemfile delete mode 100644 Gemfile.lock diff --git a/.github/workflows/github-actions-ci.yml b/.github/workflows/github-actions-ci.yml index efb0e4f..5507b3d 100644 --- a/.github/workflows/github-actions-ci.yml +++ b/.github/workflows/github-actions-ci.yml @@ -151,7 +151,7 @@ jobs: cd ../../.. - name: Pod Lib Lint - run: set -o pipefail && bundle exec pod lib lint --allow-warnings + run: set -o pipefail && pod lib lint --allow-warnings - name: Codecov run: bash <(curl -s https://codecov.io/bash) -D /tmp/PinLayout diff --git a/.ruby-version_old b/.ruby-version_old deleted file mode 100644 index f6ab44e..0000000 --- a/.ruby-version_old +++ /dev/null @@ -1 +0,0 @@ -ruby-2.6.6 diff --git a/Gemfile b/Gemfile deleted file mode 100644 index d994460..0000000 --- a/Gemfile +++ /dev/null @@ -1,2 +0,0 @@ -source 'https://rubygems.org' -gem 'cocoapods', '~> 1.7' diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 374dfa5..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,97 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - CFPropertyList (3.0.6) - rexml - activesupport (7.0.7.2) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) - addressable (2.8.1) - public_suffix (>= 2.0.2, < 6.0) - algoliasearch (1.27.5) - httpclient (~> 2.8, >= 2.8.3) - json (>= 1.5.1) - atomos (0.1.3) - claide (1.1.0) - cocoapods (1.12.0) - addressable (~> 2.8) - claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.12.0) - cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.6.0, < 2.0) - cocoapods-plugins (>= 1.0.0, < 2.0) - cocoapods-search (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.6.0, < 2.0) - cocoapods-try (>= 1.1.0, < 2.0) - colored2 (~> 3.1) - escape (~> 0.0.4) - fourflusher (>= 2.3.0, < 3.0) - gh_inspector (~> 1.0) - molinillo (~> 0.8.0) - nap (~> 1.0) - ruby-macho (>= 2.3.0, < 3.0) - xcodeproj (>= 1.21.0, < 2.0) - cocoapods-core (1.12.0) - activesupport (>= 5.0, < 8) - addressable (~> 2.8) - algoliasearch (~> 1.0) - concurrent-ruby (~> 1.1) - fuzzy_match (~> 2.0.4) - nap (~> 1.0) - netrc (~> 0.11) - public_suffix (~> 4.0) - typhoeus (~> 1.0) - cocoapods-deintegrate (1.0.5) - cocoapods-downloader (1.6.3) - cocoapods-plugins (1.0.0) - nap - cocoapods-search (1.0.1) - cocoapods-trunk (1.6.0) - nap (>= 0.8, < 2.0) - netrc (~> 0.11) - cocoapods-try (1.2.0) - colored2 (3.1.2) - concurrent-ruby (1.2.2) - escape (0.0.4) - ethon (0.16.0) - ffi (>= 1.15.0) - ffi (1.15.5) - fourflusher (2.3.1) - fuzzy_match (2.0.4) - gh_inspector (1.1.3) - httpclient (2.8.3) - i18n (1.14.1) - concurrent-ruby (~> 1.0) - json (2.6.3) - minitest (5.19.0) - molinillo (0.8.0) - nanaimo (0.3.0) - nap (1.1.0) - netrc (0.11.0) - public_suffix (4.0.7) - rexml (3.2.5) - ruby-macho (2.5.1) - typhoeus (1.4.0) - ethon (>= 0.9.0) - tzinfo (2.0.6) - concurrent-ruby (~> 1.0) - xcodeproj (1.22.0) - CFPropertyList (>= 2.3.3, < 4.0) - atomos (~> 0.1.3) - claide (>= 1.0.2, < 2.0) - colored2 (~> 3.1) - nanaimo (~> 0.3.0) - rexml (~> 3.2.4) - -PLATFORMS - arm64-darwin-22 - universal-darwin-21 - x86_64-linux - -DEPENDENCIES - cocoapods (~> 1.7) - -BUNDLED WITH - 2.2.33