Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,15 @@

# Change Log

## [1.10.2](https://github.com/layoutBox/PinLayout/releases/tag/1.10.2)
Released on 2022-02-01

#### Renamed property `pin.keyboardMargins` -> `pin.keyboardArea`

This new name better represent what `UIKit`'s `UIView.keyboardLayoutGuide` is

Added by [Luc Dion](https://github.com/lucdion) in Pull Request [#243](https://github.com/layoutBox/PinLayout/pull/243)

## [1.10.1](https://github.com/layoutBox/PinLayout/releases/tag/1.10.1)
Released on 2022-02-01

Expand Down
3 changes: 1 addition & 2 deletions Example/PinLayoutSample/UI/Menu/MenuView.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,8 +83,7 @@ extension MenuView {
// Compilation validation
#if compiler(>=5.5) // Xcode 13+
// iOS 15+
_ = tableView.pin.keyboardMargins
_ = tableView.pin.keyboardArea
#endif
}

}
2 changes: 1 addition & 1 deletion PinLayout.podspec
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@

Pod::Spec.new do |spec|
spec.name = "PinLayout"
spec.version = "1.10.1"
spec.version = "1.10.2"
spec.summary = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast."
spec.description = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast. Concise syntax, intuitive, readable & chainable. [iOS/macOS/tvOS/CALayer]"
spec.homepage = "https://github.com/layoutBox/PinLayout"
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ Extremely Fast views layouting without auto layout. No magic, pure code, full co
* Xcode 13 / 12 / 11 / 10

### Recent changes/features
* :star: Add [`pin.keyboardMargins`](#safeAreaInsets) property [iOS 15+]
* :star: Add [`pin.keyboardArea`](#safeAreaInsets) property [iOS 15+]
* :star: New chainable Objective-C syntax. See [PinLayout using Objective-C](#objective_c_interface)
* :star: Automatic Sizing, use PinLayout to compute view size. See [Automatic sizing](#automatic_sizing)
* :star: Add methods to position a view between two other views. See [Layout between other views](#layout_between).
Expand DownExpand Up@@ -1230,7 +1230,7 @@ PinLayout expose them using these properties:
1. **`UIView.pin.safeArea`**: Expose UIKit `UIView.safeAreaInsets` / `UIView.safeAreaLayoutGuide`.
2. **`UIView.pin.readableMargins`**: Expose UIKit `UIView.readableContentGuide`.
3. **`UIView.pin.layoutMargins`**: Expose UIKit `UIView.layoutMargins` / `UIView.layoutMarginsGuide`.
4. **`UIView.pin.keyboardMargins`**: Expose UIKit `UIView.keyboardLayoutGuide`. [iOS 15+]
4. **`UIView.pin.keyboardArea`**: Expose UIKit `UIView.keyboardLayoutGuide`. [iOS 15+]

The following image display the 3 areas on an iPad in landscape mode. (safeArea, readableMargins, layoutMargins)

Expand DownExpand Up@@ -1362,15 +1362,15 @@ PinLayout's `UIView.pin.layoutMargins` property expose directly the value of UIK

<br/>

### 4. pin.keyboardMargins:
### 4. pin.keyboardArea:

##### Property:
* **`pin.keyboardMargins: UIEdgeInset` [iOS 15+]**
PinLayout's `UIView.pin.keyboardMargins` property expose directly the value of UIKit[`UIView.keyboardLayoutGuide`](https://developer.apple.com/documentation/uikit/keyboards_and_input/adjusting_your_layout_with_keyboard_layout_guide). This is really useful when layout adjustment due to the keyboard is required. [iOS 15+]
* **`pin.keyboardArea: CGRect` [iOS 15+]**
The property expose the `UIKit` value [`UIView.keyboardLayoutGuide`](https://developer.apple.com/documentation/uikit/keyboards_and_input/adjusting_your_layout_with_keyboard_layout_guide). It represents the area (`CGRect`) of the keyboard that is covering the view. Useful to adjust the layout when the keyboard is visible. [iOS 15+]

##### Usage example:
```swift
container.pin.bottom(view.pin.keyboardMargins.top)
container.pin.bottom(view.pin.keyboardArea.top)
```


Expand Down
10 changes: 2 additions & 8 deletions Sources/PinLayout.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,17 +116,11 @@ public class PinLayout<View: Layoutable> {
#endif

#if os(iOS) && compiler(>=5.5) // Xcode 13+
public var keyboardMargins: PEdgeInsets {
public var keyboardArea: CGRect {
guard #available(iOS 15.0, *) else { return .zero }
guard let view = view as? UIView else { return .zero }

let layoutFrame = view.keyboardLayoutGuide.layoutFrame
guard !layoutFrame.isEmpty else { return .zero }

return UIEdgeInsets(top: layoutFrame.origin.y,
left: layoutFrame.origin.x,
bottom: view.frame.height - layoutFrame.origin.y - layoutFrame.height,
right: view.frame.width - layoutFrame.origin.x - layoutFrame.width)
return view.keyboardLayoutGuide.layoutFrame
}
#endif

Expand Down
5 changes: 3 additions & 2 deletions Tests/iOS/ReadableLayoutMarginsSpec.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,14 +110,15 @@ class ReadableLayoutMargins: QuickSpec {
}

#if os(iOS) && compiler(>=5.5)
describe("Using pin.keyboardMargins") {
describe("Using pin.keyboardArea") {
it("test") {
setupWindow(with: viewController)

rootView.pin.top(0).horizontally()
rootView.pin.bottom(rootView.pin.keyboardMargins.top)
rootView.pin.bottom(rootView.pin.keyboardArea.minY)

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)))
}
}
#endif
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,15 @@

# Change Log

## [1.10.2](https://github.com/layoutBox/PinLayout/releases/tag/1.10.2)
Released on 2022-02-01

#### Renamed property `pin.keyboardMargins` -> `pin.keyboardArea`

This new name better represent what `UIKit`'s `UIView.keyboardLayoutGuide` is

Added by [Luc Dion](https://github.com/lucdion) in Pull Request [#243](https://github.com/layoutBox/PinLayout/pull/243)

## [1.10.1](https://github.com/layoutBox/PinLayout/releases/tag/1.10.1)
Released on 2022-02-01

Expand Down
3 changes: 1 addition & 2 deletions Example/PinLayoutSample/UI/Menu/MenuView.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,8 +83,7 @@ extension MenuView {
// Compilation validation
#if compiler(>=5.5) // Xcode 13+
// iOS 15+
_ = tableView.pin.keyboardMargins
_ = tableView.pin.keyboardArea
#endif
}

}
2 changes: 1 addition & 1 deletion PinLayout.podspec
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@

Pod::Spec.new do |spec|
spec.name = "PinLayout"
spec.version = "1.10.1"
spec.version = "1.10.2"
spec.summary = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast."
spec.description = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast. Concise syntax, intuitive, readable & chainable. [iOS/macOS/tvOS/CALayer]"
spec.homepage = "https://github.com/layoutBox/PinLayout"
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ Extremely Fast views layouting without auto layout. No magic, pure code, full co
* Xcode 13 / 12 / 11 / 10

### Recent changes/features
* :star: Add [`pin.keyboardMargins`](#safeAreaInsets) property [iOS 15+]
* :star: Add [`pin.keyboardArea`](#safeAreaInsets) property [iOS 15+]
* :star: New chainable Objective-C syntax. See [PinLayout using Objective-C](#objective_c_interface)
* :star: Automatic Sizing, use PinLayout to compute view size. See [Automatic sizing](#automatic_sizing)
* :star: Add methods to position a view between two other views. See [Layout between other views](#layout_between).
Expand DownExpand Up@@ -1230,7 +1230,7 @@ PinLayout expose them using these properties:
1. **`UIView.pin.safeArea`**: Expose UIKit `UIView.safeAreaInsets` / `UIView.safeAreaLayoutGuide`.
2. **`UIView.pin.readableMargins`**: Expose UIKit `UIView.readableContentGuide`.
3. **`UIView.pin.layoutMargins`**: Expose UIKit `UIView.layoutMargins` / `UIView.layoutMarginsGuide`.
4. **`UIView.pin.keyboardMargins`**: Expose UIKit `UIView.keyboardLayoutGuide`. [iOS 15+]
4. **`UIView.pin.keyboardArea`**: Expose UIKit `UIView.keyboardLayoutGuide`. [iOS 15+]

The following image display the 3 areas on an iPad in landscape mode. (safeArea, readableMargins, layoutMargins)

Expand DownExpand Up@@ -1362,15 +1362,15 @@ PinLayout's `UIView.pin.layoutMargins` property expose directly the value of UIK

<br/>

### 4. pin.keyboardMargins:
### 4. pin.keyboardArea:

##### Property:
* **`pin.keyboardMargins: UIEdgeInset` [iOS 15+]**
PinLayout's `UIView.pin.keyboardMargins` property expose directly the value of UIKit[`UIView.keyboardLayoutGuide`](https://developer.apple.com/documentation/uikit/keyboards_and_input/adjusting_your_layout_with_keyboard_layout_guide). This is really useful when layout adjustment due to the keyboard is required. [iOS 15+]
* **`pin.keyboardArea: CGRect` [iOS 15+]**
The property expose the `UIKit` value [`UIView.keyboardLayoutGuide`](https://developer.apple.com/documentation/uikit/keyboards_and_input/adjusting_your_layout_with_keyboard_layout_guide). It represents the area (`CGRect`) of the keyboard that is covering the view. Useful to adjust the layout when the keyboard is visible. [iOS 15+]

##### Usage example:
```swift
container.pin.bottom(view.pin.keyboardMargins.top)
container.pin.bottom(view.pin.keyboardArea.top)
```


Expand Down
10 changes: 2 additions & 8 deletions Sources/PinLayout.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,17 +116,11 @@ public class PinLayout<View: Layoutable> {
#endif

#if os(iOS) && compiler(>=5.5) // Xcode 13+
public var keyboardMargins: PEdgeInsets {
public var keyboardArea: CGRect {
guard #available(iOS 15.0, *) else { return .zero }
guard let view = view as? UIView else { return .zero }

let layoutFrame = view.keyboardLayoutGuide.layoutFrame
guard !layoutFrame.isEmpty else { return .zero }

return UIEdgeInsets(top: layoutFrame.origin.y,
left: layoutFrame.origin.x,
bottom: view.frame.height - layoutFrame.origin.y - layoutFrame.height,
right: view.frame.width - layoutFrame.origin.x - layoutFrame.width)
return view.keyboardLayoutGuide.layoutFrame
}
#endif

Expand Down
5 changes: 3 additions & 2 deletions Tests/iOS/ReadableLayoutMarginsSpec.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,14 +110,15 @@ class ReadableLayoutMargins: QuickSpec {
}

#if os(iOS) && compiler(>=5.5)
describe("Using pin.keyboardMargins") {
describe("Using pin.keyboardArea") {
it("test") {
setupWindow(with: viewController)

rootView.pin.top(0).horizontally()
rootView.pin.bottom(rootView.pin.keyboardMargins.top)
rootView.pin.bottom(rootView.pin.keyboardArea.minY)

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)))
}
}
#endif
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,15 @@

# Change Log

## [1.10.2](https://github.com/layoutBox/PinLayout/releases/tag/1.10.2)
Released on 2022-02-01

#### Renamed property `pin.keyboardMargins` -> `pin.keyboardArea`

This new name better represent what `UIKit`'s `UIView.keyboardLayoutGuide` is

Added by [Luc Dion](https://github.com/lucdion) in Pull Request [#243](https://github.com/layoutBox/PinLayout/pull/243)

## [1.10.1](https://github.com/layoutBox/PinLayout/releases/tag/1.10.1)
Released on 2022-02-01

Expand Down
3 changes: 1 addition & 2 deletions Example/PinLayoutSample/UI/Menu/MenuView.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,8 +83,7 @@ extension MenuView {
// Compilation validation
#if compiler(>=5.5) // Xcode 13+
// iOS 15+
_ = tableView.pin.keyboardMargins
_ = tableView.pin.keyboardArea
#endif
}

}
2 changes: 1 addition & 1 deletion PinLayout.podspec
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@

Pod::Spec.new do |spec|
spec.name = "PinLayout"
spec.version = "1.10.1"
spec.version = "1.10.2"
spec.summary = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast."
spec.description = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast. Concise syntax, intuitive, readable & chainable. [iOS/macOS/tvOS/CALayer]"
spec.homepage = "https://github.com/layoutBox/PinLayout"
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ Extremely Fast views layouting without auto layout. No magic, pure code, full co
* Xcode 13 / 12 / 11 / 10

### Recent changes/features
* :star: Add [`pin.keyboardMargins`](#safeAreaInsets) property [iOS 15+]
* :star: Add [`pin.keyboardArea`](#safeAreaInsets) property [iOS 15+]
* :star: New chainable Objective-C syntax. See [PinLayout using Objective-C](#objective_c_interface)
* :star: Automatic Sizing, use PinLayout to compute view size. See [Automatic sizing](#automatic_sizing)
* :star: Add methods to position a view between two other views. See [Layout between other views](#layout_between).
Expand DownExpand Up@@ -1230,7 +1230,7 @@ PinLayout expose them using these properties:
1. **`UIView.pin.safeArea`**: Expose UIKit `UIView.safeAreaInsets` / `UIView.safeAreaLayoutGuide`.
2. **`UIView.pin.readableMargins`**: Expose UIKit `UIView.readableContentGuide`.
3. **`UIView.pin.layoutMargins`**: Expose UIKit `UIView.layoutMargins` / `UIView.layoutMarginsGuide`.
4. **`UIView.pin.keyboardMargins`**: Expose UIKit `UIView.keyboardLayoutGuide`. [iOS 15+]
4. **`UIView.pin.keyboardArea`**: Expose UIKit `UIView.keyboardLayoutGuide`. [iOS 15+]

The following image display the 3 areas on an iPad in landscape mode. (safeArea, readableMargins, layoutMargins)

Expand DownExpand Up@@ -1362,15 +1362,15 @@ PinLayout's `UIView.pin.layoutMargins` property expose directly the value of UIK

<br/>

### 4. pin.keyboardMargins:
### 4. pin.keyboardArea:

##### Property:
* **`pin.keyboardMargins: UIEdgeInset` [iOS 15+]**
PinLayout's `UIView.pin.keyboardMargins` property expose directly the value of UIKit[`UIView.keyboardLayoutGuide`](https://developer.apple.com/documentation/uikit/keyboards_and_input/adjusting_your_layout_with_keyboard_layout_guide). This is really useful when layout adjustment due to the keyboard is required. [iOS 15+]
* **`pin.keyboardArea: CGRect` [iOS 15+]**
The property expose the `UIKit` value [`UIView.keyboardLayoutGuide`](https://developer.apple.com/documentation/uikit/keyboards_and_input/adjusting_your_layout_with_keyboard_layout_guide). It represents the area (`CGRect`) of the keyboard that is covering the view. Useful to adjust the layout when the keyboard is visible. [iOS 15+]

##### Usage example:
```swift
container.pin.bottom(view.pin.keyboardMargins.top)
container.pin.bottom(view.pin.keyboardArea.top)
```


Expand Down
10 changes: 2 additions & 8 deletions Sources/PinLayout.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,17 +116,11 @@ public class PinLayout<View: Layoutable> {
#endif

#if os(iOS) && compiler(>=5.5) // Xcode 13+
public var keyboardMargins: PEdgeInsets {
public var keyboardArea: CGRect {
guard #available(iOS 15.0, *) else { return .zero }
guard let view = view as? UIView else { return .zero }

let layoutFrame = view.keyboardLayoutGuide.layoutFrame
guard !layoutFrame.isEmpty else { return .zero }

return UIEdgeInsets(top: layoutFrame.origin.y,
left: layoutFrame.origin.x,
bottom: view.frame.height - layoutFrame.origin.y - layoutFrame.height,
right: view.frame.width - layoutFrame.origin.x - layoutFrame.width)
return view.keyboardLayoutGuide.layoutFrame
}
#endif

Expand Down
5 changes: 3 additions & 2 deletions Tests/iOS/ReadableLayoutMarginsSpec.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,14 +110,15 @@ class ReadableLayoutMargins: QuickSpec {
}

#if os(iOS) && compiler(>=5.5)
describe("Using pin.keyboardMargins") {
describe("Using pin.keyboardArea") {
it("test") {
setupWindow(with: viewController)

rootView.pin.top(0).horizontally()
rootView.pin.bottom(rootView.pin.keyboardMargins.top)
rootView.pin.bottom(rootView.pin.keyboardArea.minY)

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)))
}
}
#endif
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,15 @@

# Change Log

## [1.10.2](https://github.com/layoutBox/PinLayout/releases/tag/1.10.2)
Released on 2022-02-01

#### Renamed property `pin.keyboardMargins` -> `pin.keyboardArea`

This new name better represent what `UIKit`'s `UIView.keyboardLayoutGuide` is

Added by [Luc Dion](https://github.com/lucdion) in Pull Request [#243](https://github.com/layoutBox/PinLayout/pull/243)

## [1.10.1](https://github.com/layoutBox/PinLayout/releases/tag/1.10.1)
Released on 2022-02-01

Expand Down
3 changes: 1 addition & 2 deletions Example/PinLayoutSample/UI/Menu/MenuView.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,8 +83,7 @@ extension MenuView {
// Compilation validation
#if compiler(>=5.5) // Xcode 13+
// iOS 15+
_ = tableView.pin.keyboardMargins
_ = tableView.pin.keyboardArea
#endif
}

}
2 changes: 1 addition & 1 deletion PinLayout.podspec
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@

Pod::Spec.new do |spec|
spec.name = "PinLayout"
spec.version = "1.10.1"
spec.version = "1.10.2"
spec.summary = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast."
spec.description = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast. Concise syntax, intuitive, readable & chainable. [iOS/macOS/tvOS/CALayer]"
spec.homepage = "https://github.com/layoutBox/PinLayout"
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ Extremely Fast views layouting without auto layout. No magic, pure code, full co
* Xcode 13 / 12 / 11 / 10

### Recent changes/features
* :star: Add [`pin.keyboardMargins`](#safeAreaInsets) property [iOS 15+]
* :star: Add [`pin.keyboardArea`](#safeAreaInsets) property [iOS 15+]
* :star: New chainable Objective-C syntax. See [PinLayout using Objective-C](#objective_c_interface)
* :star: Automatic Sizing, use PinLayout to compute view size. See [Automatic sizing](#automatic_sizing)
* :star: Add methods to position a view between two other views. See [Layout between other views](#layout_between).
Expand DownExpand Up@@ -1230,7 +1230,7 @@ PinLayout expose them using these properties:
1. **`UIView.pin.safeArea`**: Expose UIKit `UIView.safeAreaInsets` / `UIView.safeAreaLayoutGuide`.
2. **`UIView.pin.readableMargins`**: Expose UIKit `UIView.readableContentGuide`.
3. **`UIView.pin.layoutMargins`**: Expose UIKit `UIView.layoutMargins` / `UIView.layoutMarginsGuide`.
4. **`UIView.pin.keyboardMargins`**: Expose UIKit `UIView.keyboardLayoutGuide`. [iOS 15+]
4. **`UIView.pin.keyboardArea`**: Expose UIKit `UIView.keyboardLayoutGuide`. [iOS 15+]

The following image display the 3 areas on an iPad in landscape mode. (safeArea, readableMargins, layoutMargins)

Expand DownExpand Up@@ -1362,15 +1362,15 @@ PinLayout's `UIView.pin.layoutMargins` property expose directly the value of UIK

<br/>

### 4. pin.keyboardMargins:
### 4. pin.keyboardArea:

##### Property:
* **`pin.keyboardMargins: UIEdgeInset` [iOS 15+]**
PinLayout's `UIView.pin.keyboardMargins` property expose directly the value of UIKit[`UIView.keyboardLayoutGuide`](https://developer.apple.com/documentation/uikit/keyboards_and_input/adjusting_your_layout_with_keyboard_layout_guide). This is really useful when layout adjustment due to the keyboard is required. [iOS 15+]
* **`pin.keyboardArea: CGRect` [iOS 15+]**
The property expose the `UIKit` value [`UIView.keyboardLayoutGuide`](https://developer.apple.com/documentation/uikit/keyboards_and_input/adjusting_your_layout_with_keyboard_layout_guide). It represents the area (`CGRect`) of the keyboard that is covering the view. Useful to adjust the layout when the keyboard is visible. [iOS 15+]

##### Usage example:
```swift
container.pin.bottom(view.pin.keyboardMargins.top)
container.pin.bottom(view.pin.keyboardArea.top)
```


Expand Down
10 changes: 2 additions & 8 deletions Sources/PinLayout.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,17 +116,11 @@ public class PinLayout<View: Layoutable> {
#endif

#if os(iOS) && compiler(>=5.5) // Xcode 13+
public var keyboardMargins: PEdgeInsets {
public var keyboardArea: CGRect {
guard #available(iOS 15.0, *) else { return .zero }
guard let view = view as? UIView else { return .zero }

let layoutFrame = view.keyboardLayoutGuide.layoutFrame
guard !layoutFrame.isEmpty else { return .zero }

return UIEdgeInsets(top: layoutFrame.origin.y,
left: layoutFrame.origin.x,
bottom: view.frame.height - layoutFrame.origin.y - layoutFrame.height,
right: view.frame.width - layoutFrame.origin.x - layoutFrame.width)
return view.keyboardLayoutGuide.layoutFrame
}
#endif

Expand Down
5 changes: 3 additions & 2 deletions Tests/iOS/ReadableLayoutMarginsSpec.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,14 +110,15 @@ class ReadableLayoutMargins: QuickSpec {
}

#if os(iOS) && compiler(>=5.5)
describe("Using pin.keyboardMargins") {
describe("Using pin.keyboardArea") {
it("test") {
setupWindow(with: viewController)

rootView.pin.top(0).horizontally()
rootView.pin.bottom(rootView.pin.keyboardMargins.top)
rootView.pin.bottom(rootView.pin.keyboardArea.minY)

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)))
}
}
#endif
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,15 @@

# Change Log

## [1.10.2](https://github.com/layoutBox/PinLayout/releases/tag/1.10.2)
Released on 2022-02-01

#### Renamed property `pin.keyboardMargins` -> `pin.keyboardArea`

This new name better represent what `UIKit`'s `UIView.keyboardLayoutGuide` is

Added by [Luc Dion](https://github.com/lucdion) in Pull Request [#243](https://github.com/layoutBox/PinLayout/pull/243)

## [1.10.1](https://github.com/layoutBox/PinLayout/releases/tag/1.10.1)
Released on 2022-02-01

Expand Down
3 changes: 1 addition & 2 deletions Example/PinLayoutSample/UI/Menu/MenuView.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,8 +83,7 @@ extension MenuView {
// Compilation validation
#if compiler(>=5.5) // Xcode 13+
// iOS 15+
_ = tableView.pin.keyboardMargins
_ = tableView.pin.keyboardArea
#endif
}

}
2 changes: 1 addition & 1 deletion PinLayout.podspec
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@

Pod::Spec.new do |spec|
spec.name = "PinLayout"
spec.version = "1.10.1"
spec.version = "1.10.2"
spec.summary = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast."
spec.description = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast. Concise syntax, intuitive, readable & chainable. [iOS/macOS/tvOS/CALayer]"
spec.homepage = "https://github.com/layoutBox/PinLayout"
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ Extremely Fast views layouting without auto layout. No magic, pure code, full co
* Xcode 13 / 12 / 11 / 10

### Recent changes/features
* :star: Add [`pin.keyboardMargins`](#safeAreaInsets) property [iOS 15+]
* :star: Add [`pin.keyboardArea`](#safeAreaInsets) property [iOS 15+]
* :star: New chainable Objective-C syntax. See [PinLayout using Objective-C](#objective_c_interface)
* :star: Automatic Sizing, use PinLayout to compute view size. See [Automatic sizing](#automatic_sizing)
* :star: Add methods to position a view between two other views. See [Layout between other views](#layout_between).
Expand DownExpand Up@@ -1230,7 +1230,7 @@ PinLayout expose them using these properties:
1. **`UIView.pin.safeArea`**: Expose UIKit `UIView.safeAreaInsets` / `UIView.safeAreaLayoutGuide`.
2. **`UIView.pin.readableMargins`**: Expose UIKit `UIView.readableContentGuide`.
3. **`UIView.pin.layoutMargins`**: Expose UIKit `UIView.layoutMargins` / `UIView.layoutMarginsGuide`.
4. **`UIView.pin.keyboardMargins`**: Expose UIKit `UIView.keyboardLayoutGuide`. [iOS 15+]
4. **`UIView.pin.keyboardArea`**: Expose UIKit `UIView.keyboardLayoutGuide`. [iOS 15+]

The following image display the 3 areas on an iPad in landscape mode. (safeArea, readableMargins, layoutMargins)

Expand DownExpand Up@@ -1362,15 +1362,15 @@ PinLayout's `UIView.pin.layoutMargins` property expose directly the value of UIK

<br/>

### 4. pin.keyboardMargins:
### 4. pin.keyboardArea:

##### Property:
* **`pin.keyboardMargins: UIEdgeInset` [iOS 15+]**
PinLayout's `UIView.pin.keyboardMargins` property expose directly the value of UIKit[`UIView.keyboardLayoutGuide`](https://developer.apple.com/documentation/uikit/keyboards_and_input/adjusting_your_layout_with_keyboard_layout_guide). This is really useful when layout adjustment due to the keyboard is required. [iOS 15+]
* **`pin.keyboardArea: CGRect` [iOS 15+]**
The property expose the `UIKit` value [`UIView.keyboardLayoutGuide`](https://developer.apple.com/documentation/uikit/keyboards_and_input/adjusting_your_layout_with_keyboard_layout_guide). It represents the area (`CGRect`) of the keyboard that is covering the view. Useful to adjust the layout when the keyboard is visible. [iOS 15+]

##### Usage example:
```swift
container.pin.bottom(view.pin.keyboardMargins.top)
container.pin.bottom(view.pin.keyboardArea.top)
```


Expand Down
10 changes: 2 additions & 8 deletions Sources/PinLayout.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,17 +116,11 @@ public class PinLayout<View: Layoutable> {
#endif

#if os(iOS) && compiler(>=5.5) // Xcode 13+
public var keyboardMargins: PEdgeInsets {
public var keyboardArea: CGRect {
guard #available(iOS 15.0, *) else { return .zero }
guard let view = view as? UIView else { return .zero }

let layoutFrame = view.keyboardLayoutGuide.layoutFrame
guard !layoutFrame.isEmpty else { return .zero }

return UIEdgeInsets(top: layoutFrame.origin.y,
left: layoutFrame.origin.x,
bottom: view.frame.height - layoutFrame.origin.y - layoutFrame.height,
right: view.frame.width - layoutFrame.origin.x - layoutFrame.width)
return view.keyboardLayoutGuide.layoutFrame
}
#endif

Expand Down
5 changes: 3 additions & 2 deletions Tests/iOS/ReadableLayoutMarginsSpec.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,14 +110,15 @@ class ReadableLayoutMargins: QuickSpec {
}

#if os(iOS) && compiler(>=5.5)
describe("Using pin.keyboardMargins") {
describe("Using pin.keyboardArea") {
it("test") {
setupWindow(with: viewController)

rootView.pin.top(0).horizontally()
rootView.pin.bottom(rootView.pin.keyboardMargins.top)
rootView.pin.bottom(rootView.pin.keyboardArea.minY)

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)))
}
}
#endif
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,15 @@

# Change Log

## [1.10.2](https://github.com/layoutBox/PinLayout/releases/tag/1.10.2)
Released on 2022-02-01

#### Renamed property `pin.keyboardMargins` -> `pin.keyboardArea`

This new name better represent what `UIKit`'s `UIView.keyboardLayoutGuide` is

Added by [Luc Dion](https://github.com/lucdion) in Pull Request [#243](https://github.com/layoutBox/PinLayout/pull/243)

## [1.10.1](https://github.com/layoutBox/PinLayout/releases/tag/1.10.1)
Released on 2022-02-01

Expand Down
3 changes: 1 addition & 2 deletions Example/PinLayoutSample/UI/Menu/MenuView.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,8 +83,7 @@ extension MenuView {
// Compilation validation
#if compiler(>=5.5) // Xcode 13+
// iOS 15+
_ = tableView.pin.keyboardMargins
_ = tableView.pin.keyboardArea
#endif
}

}
2 changes: 1 addition & 1 deletion PinLayout.podspec
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@

Pod::Spec.new do |spec|
spec.name = "PinLayout"
spec.version = "1.10.1"
spec.version = "1.10.2"
spec.summary = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast."
spec.description = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast. Concise syntax, intuitive, readable & chainable. [iOS/macOS/tvOS/CALayer]"
spec.homepage = "https://github.com/layoutBox/PinLayout"
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ Extremely Fast views layouting without auto layout. No magic, pure code, full co
* Xcode 13 / 12 / 11 / 10

### Recent changes/features
* :star: Add [`pin.keyboardMargins`](#safeAreaInsets) property [iOS 15+]
* :star: Add [`pin.keyboardArea`](#safeAreaInsets) property [iOS 15+]
* :star: New chainable Objective-C syntax. See [PinLayout using Objective-C](#objective_c_interface)
* :star: Automatic Sizing, use PinLayout to compute view size. See [Automatic sizing](#automatic_sizing)
* :star: Add methods to position a view between two other views. See [Layout between other views](#layout_between).
Expand DownExpand Up@@ -1230,7 +1230,7 @@ PinLayout expose them using these properties:
1. **`UIView.pin.safeArea`**: Expose UIKit `UIView.safeAreaInsets` / `UIView.safeAreaLayoutGuide`.
2. **`UIView.pin.readableMargins`**: Expose UIKit `UIView.readableContentGuide`.
3. **`UIView.pin.layoutMargins`**: Expose UIKit `UIView.layoutMargins` / `UIView.layoutMarginsGuide`.
4. **`UIView.pin.keyboardMargins`**: Expose UIKit `UIView.keyboardLayoutGuide`. [iOS 15+]
4. **`UIView.pin.keyboardArea`**: Expose UIKit `UIView.keyboardLayoutGuide`. [iOS 15+]

The following image display the 3 areas on an iPad in landscape mode. (safeArea, readableMargins, layoutMargins)

Expand DownExpand Up@@ -1362,15 +1362,15 @@ PinLayout's `UIView.pin.layoutMargins` property expose directly the value of UIK

<br/>

### 4. pin.keyboardMargins:
### 4. pin.keyboardArea:

##### Property:
* **`pin.keyboardMargins: UIEdgeInset` [iOS 15+]**
PinLayout's `UIView.pin.keyboardMargins` property expose directly the value of UIKit[`UIView.keyboardLayoutGuide`](https://developer.apple.com/documentation/uikit/keyboards_and_input/adjusting_your_layout_with_keyboard_layout_guide). This is really useful when layout adjustment due to the keyboard is required. [iOS 15+]
* **`pin.keyboardArea: CGRect` [iOS 15+]**
The property expose the `UIKit` value [`UIView.keyboardLayoutGuide`](https://developer.apple.com/documentation/uikit/keyboards_and_input/adjusting_your_layout_with_keyboard_layout_guide). It represents the area (`CGRect`) of the keyboard that is covering the view. Useful to adjust the layout when the keyboard is visible. [iOS 15+]

##### Usage example:
```swift
container.pin.bottom(view.pin.keyboardMargins.top)
container.pin.bottom(view.pin.keyboardArea.top)
```


Expand Down
10 changes: 2 additions & 8 deletions Sources/PinLayout.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,17 +116,11 @@ public class PinLayout<View: Layoutable> {
#endif

#if os(iOS) && compiler(>=5.5) // Xcode 13+
public var keyboardMargins: PEdgeInsets {
public var keyboardArea: CGRect {
guard #available(iOS 15.0, *) else { return .zero }
guard let view = view as? UIView else { return .zero }

let layoutFrame = view.keyboardLayoutGuide.layoutFrame
guard !layoutFrame.isEmpty else { return .zero }

return UIEdgeInsets(top: layoutFrame.origin.y,
left: layoutFrame.origin.x,
bottom: view.frame.height - layoutFrame.origin.y - layoutFrame.height,
right: view.frame.width - layoutFrame.origin.x - layoutFrame.width)
return view.keyboardLayoutGuide.layoutFrame
}
#endif

Expand Down
5 changes: 3 additions & 2 deletions Tests/iOS/ReadableLayoutMarginsSpec.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,14 +110,15 @@ class ReadableLayoutMargins: QuickSpec {
}

#if os(iOS) && compiler(>=5.5)
describe("Using pin.keyboardMargins") {
describe("Using pin.keyboardArea") {
it("test") {
setupWindow(with: viewController)

rootView.pin.top(0).horizontally()
rootView.pin.bottom(rootView.pin.keyboardMargins.top)
rootView.pin.bottom(rootView.pin.keyboardArea.minY)

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)))
}
}
#endif
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,15 @@

# Change Log

## [1.10.2](https://github.com/layoutBox/PinLayout/releases/tag/1.10.2)
Released on 2022-02-01

#### Renamed property `pin.keyboardMargins` -> `pin.keyboardArea`

This new name better represent what `UIKit`'s `UIView.keyboardLayoutGuide` is

Added by [Luc Dion](https://github.com/lucdion) in Pull Request [#243](https://github.com/layoutBox/PinLayout/pull/243)

## [1.10.1](https://github.com/layoutBox/PinLayout/releases/tag/1.10.1)
Released on 2022-02-01

Expand Down
3 changes: 1 addition & 2 deletions Example/PinLayoutSample/UI/Menu/MenuView.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,8 +83,7 @@ extension MenuView {
// Compilation validation
#if compiler(>=5.5) // Xcode 13+
// iOS 15+
_ = tableView.pin.keyboardMargins
_ = tableView.pin.keyboardArea
#endif
}

}
2 changes: 1 addition & 1 deletion PinLayout.podspec
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@

Pod::Spec.new do |spec|
spec.name = "PinLayout"
spec.version = "1.10.1"
spec.version = "1.10.2"
spec.summary = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast."
spec.description = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast. Concise syntax, intuitive, readable & chainable. [iOS/macOS/tvOS/CALayer]"
spec.homepage = "https://github.com/layoutBox/PinLayout"
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ Extremely Fast views layouting without auto layout. No magic, pure code, full co
* Xcode 13 / 12 / 11 / 10

### Recent changes/features
* :star: Add [`pin.keyboardMargins`](#safeAreaInsets) property [iOS 15+]
* :star: Add [`pin.keyboardArea`](#safeAreaInsets) property [iOS 15+]
* :star: New chainable Objective-C syntax. See [PinLayout using Objective-C](#objective_c_interface)
* :star: Automatic Sizing, use PinLayout to compute view size. See [Automatic sizing](#automatic_sizing)
* :star: Add methods to position a view between two other views. See [Layout between other views](#layout_between).
Expand DownExpand Up@@ -1230,7 +1230,7 @@ PinLayout expose them using these properties:
1. **`UIView.pin.safeArea`**: Expose UIKit `UIView.safeAreaInsets` / `UIView.safeAreaLayoutGuide`.
2. **`UIView.pin.readableMargins`**: Expose UIKit `UIView.readableContentGuide`.
3. **`UIView.pin.layoutMargins`**: Expose UIKit `UIView.layoutMargins` / `UIView.layoutMarginsGuide`.
4. **`UIView.pin.keyboardMargins`**: Expose UIKit `UIView.keyboardLayoutGuide`. [iOS 15+]
4. **`UIView.pin.keyboardArea`**: Expose UIKit `UIView.keyboardLayoutGuide`. [iOS 15+]

The following image display the 3 areas on an iPad in landscape mode. (safeArea, readableMargins, layoutMargins)

Expand DownExpand Up@@ -1362,15 +1362,15 @@ PinLayout's `UIView.pin.layoutMargins` property expose directly the value of UIK

<br/>

### 4. pin.keyboardMargins:
### 4. pin.keyboardArea:

##### Property:
* **`pin.keyboardMargins: UIEdgeInset` [iOS 15+]**
PinLayout's `UIView.pin.keyboardMargins` property expose directly the value of UIKit[`UIView.keyboardLayoutGuide`](https://developer.apple.com/documentation/uikit/keyboards_and_input/adjusting_your_layout_with_keyboard_layout_guide). This is really useful when layout adjustment due to the keyboard is required. [iOS 15+]
* **`pin.keyboardArea: CGRect` [iOS 15+]**
The property expose the `UIKit` value [`UIView.keyboardLayoutGuide`](https://developer.apple.com/documentation/uikit/keyboards_and_input/adjusting_your_layout_with_keyboard_layout_guide). It represents the area (`CGRect`) of the keyboard that is covering the view. Useful to adjust the layout when the keyboard is visible. [iOS 15+]

##### Usage example:
```swift
container.pin.bottom(view.pin.keyboardMargins.top)
container.pin.bottom(view.pin.keyboardArea.top)
```


Expand Down
10 changes: 2 additions & 8 deletions Sources/PinLayout.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,17 +116,11 @@ public class PinLayout<View: Layoutable> {
#endif

#if os(iOS) && compiler(>=5.5) // Xcode 13+
public var keyboardMargins: PEdgeInsets {
public var keyboardArea: CGRect {
guard #available(iOS 15.0, *) else { return .zero }
guard let view = view as? UIView else { return .zero }

let layoutFrame = view.keyboardLayoutGuide.layoutFrame
guard !layoutFrame.isEmpty else { return .zero }

return UIEdgeInsets(top: layoutFrame.origin.y,
left: layoutFrame.origin.x,
bottom: view.frame.height - layoutFrame.origin.y - layoutFrame.height,
right: view.frame.width - layoutFrame.origin.x - layoutFrame.width)
return view.keyboardLayoutGuide.layoutFrame
}
#endif

Expand Down
5 changes: 3 additions & 2 deletions Tests/iOS/ReadableLayoutMarginsSpec.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,14 +110,15 @@ class ReadableLayoutMargins: QuickSpec {
}

#if os(iOS) && compiler(>=5.5)
describe("Using pin.keyboardMargins") {
describe("Using pin.keyboardArea") {
it("test") {
setupWindow(with: viewController)

rootView.pin.top(0).horizontally()
rootView.pin.bottom(rootView.pin.keyboardMargins.top)
rootView.pin.bottom(rootView.pin.keyboardArea.minY)

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)))
}
}
#endif
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,15 @@

# Change Log

## [1.10.2](https://github.com/layoutBox/PinLayout/releases/tag/1.10.2)
Released on 2022-02-01

#### Renamed property `pin.keyboardMargins` -> `pin.keyboardArea`

This new name better represent what `UIKit`'s `UIView.keyboardLayoutGuide` is

Added by [Luc Dion](https://github.com/lucdion) in Pull Request [#243](https://github.com/layoutBox/PinLayout/pull/243)

## [1.10.1](https://github.com/layoutBox/PinLayout/releases/tag/1.10.1)
Released on 2022-02-01

Expand Down
3 changes: 1 addition & 2 deletions Example/PinLayoutSample/UI/Menu/MenuView.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,8 +83,7 @@ extension MenuView {
// Compilation validation
#if compiler(>=5.5) // Xcode 13+
// iOS 15+
_ = tableView.pin.keyboardMargins
_ = tableView.pin.keyboardArea
#endif
}

}
2 changes: 1 addition & 1 deletion PinLayout.podspec
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@

Pod::Spec.new do |spec|
spec.name = "PinLayout"
spec.version = "1.10.1"
spec.version = "1.10.2"
spec.summary = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast."
spec.description = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast. Concise syntax, intuitive, readable & chainable. [iOS/macOS/tvOS/CALayer]"
spec.homepage = "https://github.com/layoutBox/PinLayout"
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ Extremely Fast views layouting without auto layout. No magic, pure code, full co
* Xcode 13 / 12 / 11 / 10

### Recent changes/features
* :star: Add [`pin.keyboardMargins`](#safeAreaInsets) property [iOS 15+]
* :star: Add [`pin.keyboardArea`](#safeAreaInsets) property [iOS 15+]
* :star: New chainable Objective-C syntax. See [PinLayout using Objective-C](#objective_c_interface)
* :star: Automatic Sizing, use PinLayout to compute view size. See [Automatic sizing](#automatic_sizing)
* :star: Add methods to position a view between two other views. See [Layout between other views](#layout_between).
Expand DownExpand Up@@ -1230,7 +1230,7 @@ PinLayout expose them using these properties:
1. **`UIView.pin.safeArea`**: Expose UIKit `UIView.safeAreaInsets` / `UIView.safeAreaLayoutGuide`.
2. **`UIView.pin.readableMargins`**: Expose UIKit `UIView.readableContentGuide`.
3. **`UIView.pin.layoutMargins`**: Expose UIKit `UIView.layoutMargins` / `UIView.layoutMarginsGuide`.
4. **`UIView.pin.keyboardMargins`**: Expose UIKit `UIView.keyboardLayoutGuide`. [iOS 15+]
4. **`UIView.pin.keyboardArea`**: Expose UIKit `UIView.keyboardLayoutGuide`. [iOS 15+]

The following image display the 3 areas on an iPad in landscape mode. (safeArea, readableMargins, layoutMargins)

Expand DownExpand Up@@ -1362,15 +1362,15 @@ PinLayout's `UIView.pin.layoutMargins` property expose directly the value of UIK

<br/>

### 4. pin.keyboardMargins:
### 4. pin.keyboardArea:

##### Property:
* **`pin.keyboardMargins: UIEdgeInset` [iOS 15+]**
PinLayout's `UIView.pin.keyboardMargins` property expose directly the value of UIKit[`UIView.keyboardLayoutGuide`](https://developer.apple.com/documentation/uikit/keyboards_and_input/adjusting_your_layout_with_keyboard_layout_guide). This is really useful when layout adjustment due to the keyboard is required. [iOS 15+]
* **`pin.keyboardArea: CGRect` [iOS 15+]**
The property expose the `UIKit` value [`UIView.keyboardLayoutGuide`](https://developer.apple.com/documentation/uikit/keyboards_and_input/adjusting_your_layout_with_keyboard_layout_guide). It represents the area (`CGRect`) of the keyboard that is covering the view. Useful to adjust the layout when the keyboard is visible. [iOS 15+]

##### Usage example:
```swift
container.pin.bottom(view.pin.keyboardMargins.top)
container.pin.bottom(view.pin.keyboardArea.top)
```


Expand Down
10 changes: 2 additions & 8 deletions Sources/PinLayout.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,17 +116,11 @@ public class PinLayout<View: Layoutable> {
#endif

#if os(iOS) && compiler(>=5.5) // Xcode 13+
public var keyboardMargins: PEdgeInsets {
public var keyboardArea: CGRect {
guard #available(iOS 15.0, *) else { return .zero }
guard let view = view as? UIView else { return .zero }

let layoutFrame = view.keyboardLayoutGuide.layoutFrame
guard !layoutFrame.isEmpty else { return .zero }

return UIEdgeInsets(top: layoutFrame.origin.y,
left: layoutFrame.origin.x,
bottom: view.frame.height - layoutFrame.origin.y - layoutFrame.height,
right: view.frame.width - layoutFrame.origin.x - layoutFrame.width)
return view.keyboardLayoutGuide.layoutFrame
}
#endif

Expand Down
5 changes: 3 additions & 2 deletions Tests/iOS/ReadableLayoutMarginsSpec.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,14 +110,15 @@ class ReadableLayoutMargins: QuickSpec {
}

#if os(iOS) && compiler(>=5.5)
describe("Using pin.keyboardMargins") {
describe("Using pin.keyboardArea") {
it("test") {
setupWindow(with: viewController)

rootView.pin.top(0).horizontally()
rootView.pin.bottom(rootView.pin.keyboardMargins.top)
rootView.pin.bottom(rootView.pin.keyboardArea.minY)

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)))
}
}
#endif
Expand Down